|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<view class="zxbox">
|
|
|
<view class="navbox">
|
|
|
- <uni-nav-bar color="#ffffff" rightWidth="200rpx" @clickLeft="getBack" title="年度履职报告" :background-color="backgroundColor" :border="false"
|
|
|
+ <uni-nav-bar color="#ffffff" rightWidth="200rpx" title="年度履职报告" :background-color="backgroundColor" :border="false"
|
|
|
statusBar='true' fixed="true">
|
|
|
<!-- <block slot="left">
|
|
|
<view class="topl">
|
|
|
@@ -89,6 +89,26 @@
|
|
|
<view class="txt"><text>{{mapcount.sqmyInfoNum}}</text>件</view>
|
|
|
</view>
|
|
|
<view class="nums bga">
|
|
|
+ <view class="tit flex1">招商数量</view>
|
|
|
+ <view class="txt"><text>{{mapcount.investmentNum}}</text>件</view>
|
|
|
+ </view>
|
|
|
+ <view class="nums bgb">
|
|
|
+ <view class="tit flex1">视察调研活动</view>
|
|
|
+ <view class="txt"><text>{{mapcount.activityScdyNum}}</text>件</view>
|
|
|
+ </view>
|
|
|
+ <view class="nums bga">
|
|
|
+ <view class="tit flex1">政协委员工作室活动</view>
|
|
|
+ <view class="txt"><text>{{mapcount.activityLlzNum}}</text>件</view>
|
|
|
+ </view>
|
|
|
+ <view class="nums bgb">
|
|
|
+ <view class="tit flex1">界别活动</view>
|
|
|
+ <view class="txt"><text>{{mapcount.activityJbNum}}</text>件</view>
|
|
|
+ </view>
|
|
|
+ <view class="nums bga">
|
|
|
+ <view class="tit flex1">为群众办实事活动</view>
|
|
|
+ <view class="txt"><text>{{mapcount.activityBssNum}}</text>件</view>
|
|
|
+ </view>
|
|
|
+ <!-- <view class="nums bga">
|
|
|
<view class="tit flex1">全会</view>
|
|
|
<view class="txt"><text>{{mapcount.plenarySessionNum}}</text>件</view>
|
|
|
</view>
|
|
|
@@ -103,7 +123,7 @@
|
|
|
<view class="nums bgb">
|
|
|
<view class="tit flex1">会议发言</view>
|
|
|
<view class="txt"><text>{{mapcount.speakNum}}</text>件</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
<!-- 雷达图 -->
|
|
|
<view class="mb32">
|
|
|
@@ -113,14 +133,14 @@
|
|
|
<view class="jinfo">
|
|
|
<view class="tit mb14">各项得分</view>
|
|
|
<view class="gsbox">
|
|
|
- <view class="gslist">
|
|
|
+ <!-- <view class="gslist">
|
|
|
<view class="gtit">活动</view>
|
|
|
<view class="gtxt">{{scorecount.activityScore}}</view>
|
|
|
</view>
|
|
|
<view class="gslist">
|
|
|
<view class="gtit">会议</view>
|
|
|
<view class="gtxt">{{scorecount.conferenceScore}}</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
<view class="gslist">
|
|
|
<view class="gtit">社情民意</view>
|
|
|
<view class="gtxt">{{scorecount.sqmyScore}}</view>
|
|
|
@@ -129,14 +149,34 @@
|
|
|
<view class="gtit">政协提案</view>
|
|
|
<view class="gtxt">{{scorecount.proposalScore}}</view>
|
|
|
</view>
|
|
|
+ <view class="gslist">
|
|
|
+ <view class="gtit">招商引资</view>
|
|
|
+ <view class="gtxt">{{scorecount.investmentScore}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="gslist">
|
|
|
+ <view class="gtit">视察调研活动</view>
|
|
|
+ <view class="gtxt">{{scorecount.activityScdyScore}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="gslist">
|
|
|
+ <view class="gtit">政协委员工作室活动</view>
|
|
|
+ <view class="gtxt">{{scorecount.activityLlzScore}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="gslist">
|
|
|
+ <view class="gtit">界别活动</view>
|
|
|
+ <view class="gtxt">{{scorecount.activityJbScore}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="gslist">
|
|
|
+ <view class="gtit">为群众办实事活动</view>
|
|
|
+ <view class="gtxt">{{scorecount.activityBssScore}}</view>
|
|
|
+ </view>
|
|
|
<!-- <view class="gslist">
|
|
|
<view class="gtit">会议发言</view>
|
|
|
<view class="gtxt">{{scorecount.conferenceScore}}</view>
|
|
|
</view> -->
|
|
|
- <view class="gslist">
|
|
|
+ <!-- <view class="gslist">
|
|
|
<view class="gtit">其他</view>
|
|
|
<view class="gtxt">{{scorecount.bonusScore}}</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
</block>
|
|
|
@@ -144,9 +184,16 @@
|
|
|
<view class="list" v-if="tabval!=0">
|
|
|
<view class="zfbox" v-if="tabval==2">个人提案方面总计得分 <text class="znum">{{scorecount.proposalScore||0}}</text> 分</view>
|
|
|
<view class="zfbox" v-if="tabval==3">个人社情民意方面总计得分 <text class="znum">{{scorecount.sqmyScore||0}}</text> 分</view>
|
|
|
- <view class="zfbox" v-if="tabval==4">个人会议参与情况总计得分 <text class="znum">{{scorecount.conferenceScore||0}}</text> 分</view>
|
|
|
- <view class="zfbox" v-if="tabval==5">个人活动参与情况总计得分 <text class="znum">{{scorecount.activityScore||0}}</text> 分</view>
|
|
|
- <report-list :type='tabval' :wtdt="wtdt" :tajdlist="tajdlist" :ztlxlist="ztlxlist" :hylxlist="hylxlist" :hdlxlist="hdlxlist" :datalist="list"></report-list>
|
|
|
+ <!-- <view class="zfbox" v-if="tabval==4">个人会议参与情况总计得分 <text class="znum">{{scorecount.conferenceScore||0}}</text> 分</view>
|
|
|
+ <view class="zfbox" v-if="tabval==5">个人活动参与情况总计得分 <text class="znum">{{scorecount.activityScore||0}}</text> 分</view> -->
|
|
|
+ <view class="zfbox" v-if="tabval==7">个人招商方面总计得分 <text class="znum">{{scorecount.investmentScore||0}}</text> 分</view>
|
|
|
+ <view class="zfbox" v-if="tabval==8">个人视察调研活动总计得分 <text class="znum">{{scorecount.activityScdyScore||0}}</text> 分</view>
|
|
|
+ <view class="zfbox" v-if="tabval==9">个人政协委员工作室活动总计得分 <text class="znum">{{scorecount.activityLlzScore||0}}</text> 分</view>
|
|
|
+ <view class="zfbox" v-if="tabval==10">个人界别活动总计得分 <text class="znum">{{scorecount.activityJbScore||0}}</text> 分</view>
|
|
|
+ <view class="zfbox" v-if="tabval==11">个人为群众办实事活动总计得分 <text class="znum">{{scorecount.activityBssScore||0}}</text> 分</view>
|
|
|
+
|
|
|
+
|
|
|
+ <report-list :type='tabval' :wtdt="wtdt" :tajdlist="tajdlist" :sqjdlist="sqjdlist" :ztlxlist="ztlxlist" :hylxlist="hylxlist" :hdlxlist="hdlxlist" :datalist="list" @getDetail="getDetailFn"></report-list>
|
|
|
<!-- <view class="upmore flexccc">
|
|
|
<image :src="upmimg"></image>
|
|
|
<view>下拉更多</view>
|
|
|
@@ -203,6 +250,12 @@
|
|
|
zxConferenceList:[],//会议集合
|
|
|
zxActivityList:[],//活动集合
|
|
|
zxSpeakList:[],//发言集合
|
|
|
+ zxInvestmentList:[],//招商集合
|
|
|
+ activityScdyList:[],//视察调研集合
|
|
|
+ activityLlzList:[],//联络组活动集合
|
|
|
+ activityJbList:[],//界别集合
|
|
|
+ activityBssList:[],//为群众办实事集合
|
|
|
+ sqjdlist:[],
|
|
|
jblist:[],
|
|
|
dplist:[],
|
|
|
tajdlist:[],
|
|
|
@@ -213,9 +266,13 @@
|
|
|
scorecount:{},
|
|
|
tabval:0,
|
|
|
list:[],
|
|
|
- tabList:[{tit:'履职状况',val:'0'},{tit:'提案方面',val:2},{tit:'社情民意方面',val:3},{tit:'会议参与情况',val:4},{tit:'活动参与情况',val:5},{tit:'会议发言情况',val:6}],
|
|
|
+ tabList:[{tit:'履职状况',val:'0'},{tit:'提案方面',val:2},{tit:'社情民意方面',val:3},{tit:'招商引资',val:7},
|
|
|
+ {tit:'视察调研活动',val:8},{tit:'政协委员工作室活动',val:9},{tit:'界别活动',val:10},
|
|
|
+ {tit:'为群众办实事活动',val:11}
|
|
|
+ // {tit:'会议参与情况',val:4},{tit:'活动参与情况',val:5},{tit:'会议发言情况',val:6},
|
|
|
+ ],
|
|
|
chartData:{
|
|
|
- categories: ["活动","会议","社情民意","政协提案","其他"],
|
|
|
+ categories: ["政协提案","社情民意","招商","视察调研活动","政协委员工作室活动","界别活动","为群众办实事活动",],
|
|
|
series: [],
|
|
|
},
|
|
|
opts: {
|
|
|
@@ -276,7 +333,8 @@
|
|
|
this.getDetail()
|
|
|
},
|
|
|
getTabFn(val){
|
|
|
- this.tabval=val
|
|
|
+ this.tabval=val;
|
|
|
+ this.list=[];
|
|
|
if(val==2){
|
|
|
this.list=this.proposalInfoList
|
|
|
}else if(val==3){
|
|
|
@@ -287,6 +345,30 @@
|
|
|
this.list=this.zxActivityList
|
|
|
}else if(val==6){
|
|
|
this.list=this.zxSpeakList
|
|
|
+ }else if(val==7){
|
|
|
+ this.list=this.zxInvestmentList
|
|
|
+ }else if(val==8){
|
|
|
+ this.list=this.activityScdyList
|
|
|
+ }else if(val==9){
|
|
|
+ this.list=this.activityLlzList
|
|
|
+ }else if(val==10){
|
|
|
+ this.list=this.activityJbList
|
|
|
+ }else if(val==11){
|
|
|
+ this.list=this.activityBssList
|
|
|
+ }
|
|
|
+ },
|
|
|
+ getDetailFn(data){
|
|
|
+ var val=this.tabval;
|
|
|
+ // console.log(data,this.tabval)
|
|
|
+ // return
|
|
|
+ if(val==2){//提案
|
|
|
+ this.$tab.navigateTo('/work/pages/case/details?id='+data)
|
|
|
+ }else if(val==3){//社情
|
|
|
+ this.$tab.navigateTo('/work/pages/sqmyInfo/details?id='+data)
|
|
|
+ }else if(val==7){//招商
|
|
|
+ this.$tab.navigateTo('/work/pages/meeting/zsyzdetails?id='+data)
|
|
|
+ }else{//活动
|
|
|
+ this.$tab.navigateTo('/work/pages/meeting/activedetails?id='+data)
|
|
|
}
|
|
|
},
|
|
|
init(){
|
|
|
@@ -323,6 +405,17 @@
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
+ // 社情进度
|
|
|
+ getDictionaryFn('sqmy_jd').then(res=>{
|
|
|
+ if(res.code==200){
|
|
|
+ this.sqjdlist = res.data.map(v => {
|
|
|
+ return {
|
|
|
+ label: v.dictLabel,
|
|
|
+ value: v.dictValue
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
//主题类型
|
|
|
getDictionaryFn('sqmy_topic_type').then(res=>{
|
|
|
if(res.code==200){
|
|
|
@@ -369,7 +462,7 @@
|
|
|
if(res.data.memberAssessmentInfo){
|
|
|
this.scorecount=JSON.parse(JSON.stringify(res.data.memberAssessmentInfo));
|
|
|
var score=res.data.memberAssessmentInfo
|
|
|
- var newArr=[score.activityScore||0,score.conferenceScore||0,score.sqmyScore||0,score.proposalScore||0,score.bonusScore||0]
|
|
|
+ var newArr=[score.proposalScore||0,score.sqmyScore||0,score.investmentScore||0,score.activityScdyScore||0,score.activityLlzScore||0,score.activityJbScore||0,score.activityBssScore||0,]
|
|
|
var obj={
|
|
|
name:'分值',
|
|
|
data:newArr
|
|
|
@@ -383,11 +476,19 @@
|
|
|
}
|
|
|
|
|
|
|
|
|
- this.proposalInfoList=res.data.proposalInfoList;
|
|
|
- this.sqmyInfoList=res.data.sqmyInfoList;
|
|
|
- this.zxConferenceList=res.data.zxConferenceList;
|
|
|
- this.zxActivityList=res.data.zxActivityList;
|
|
|
- this.zxSpeakList=res.data.zxSpeakList;
|
|
|
+ this.proposalInfoList=res.data.proposalInfoList||[];
|
|
|
+ this.sqmyInfoList=res.data.sqmyInfoList||[];
|
|
|
+ this.zxInvestmentList=res.data.zxInvestmentList||[];
|
|
|
+ this.activityScdyList=res.data.activityScdyList||[];
|
|
|
+ this.activityLlzList=res.data.activityLlzList||[];
|
|
|
+ this.activityJbList=res.data.activityJbList||[];
|
|
|
+ this.activityBssList=res.data.activityBssList||[];
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // this.zxConferenceList=res.data.zxConferenceList;
|
|
|
+ // this.zxActivityList=res.data.zxActivityList;
|
|
|
+ // this.zxSpeakList=res.data.zxSpeakList;
|
|
|
}
|
|
|
})
|
|
|
},
|
zouling