Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

src/views/dataBoard/overview/components/MapDialog/DemandList.vue

@@ -104,7 +104,7 @@ export default {
     }
   },
   mounted() {
-
+    this.typeChange(this.type)
   },
   watch: {
     categoryCode() {

src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue

@@ -225,7 +225,7 @@ export default {
               this.type === '4' ? 3 :
                   this.type === 'staffGrid' ? 4 :
                       this.type === 'publicWelfareNum' ? 5 : ''
-      this.$refs.MapResourceInfo.open(type === 3 ? data.agencyId : data.id, type)
+      this.$refs.MapResourceInfo.open(type === 3 ? data.orgId : data.id, type)
     },
     typeChange(val) {
       this.type = val

src/views/dataBoard/overview/components/MapDialog/index.vue

@@ -58,7 +58,7 @@
                 <DifficultyCharts v-if="catVal === 1" :currentLevelData="currentLevelData"
                                   style="margin-bottom: 56px;"/>
                 <DisputeDispatch v-if="catVal === 2" :currentLevelData="currentLevelData" style="margin-bottom: 56px;"/>
-                <Njjwtqk :catVal="catVal"/>
+                <Njjwtqk :currentLevelData="currentLevelData" :catVal="catVal"/>
               </template>
 
               <template v-if="type === 'bmysxqk'">
@@ -134,7 +134,7 @@ export default {
         children: 'children',
         label: 'label'
       },
-      catVal: '',
+      catVal: 1,
       catValSub: '',
       catLabel: '',
       totalCount: [],

src/views/dataBoard/overview/components/MapResourceInfoMore.vue

@@ -268,7 +268,7 @@ export default {
       this.education = data.education;
       this.hobby = data.hobby;
       this.dialogVisible = true
-      this.queryParams.serviceType =
+      this.queryParams.serviceOrgType =
           data.type === 1 ? 'ic_user_volunteer' :
               data.type === 2 ? 'party_unit' :
                   data.type === 3 ? 'community_org' :

src/views/dataBoard/overview/components/ResourceInfo.vue

@@ -175,6 +175,7 @@ export default {
       this.rowData = rowData
     },
     handleSure() {
+      this.handleClose()
       this.$emit('ok',this.rowData)
     },
     getData(type) {

src/views/dataBoard/overview/components/ResourceScheduling.vue

@@ -175,9 +175,10 @@ export default {
     getList() {
       this.loading = true;
       console.log(this.currentLevelData, 'this.currentLevelData')
+      const {level,orgId} = this.$store.state.chooseArea.chooseName
       this.$http.get("/actual/base/streetOverview/queryPersonnelGroup" +
-          "?level=" + this.currentLevelData.orgLevel +
-          "&orgId=" + this.currentLevelData.orgId +
+          "?level=" + (this.currentLevelData.orgLevel || level) +
+          "&orgId=" + (this.currentLevelData.orgId || orgId) +
           "&personnelType=" + this.peopleType)
           .then(({data: {data}}) => {
             this.loading = false;

src/views/dataBoard/overview/components/jdjs.vue

@@ -16,7 +16,7 @@
         element-loading-text="加载中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0,0,0,0.5)"
-        style="height: 130px"
+        style="height: 135px;margin-top: 10px"
       />
     </div>
     <title-small text="不满意风险人员">
@@ -277,7 +277,7 @@ export default {
                 fontSize: 12
               },
               align: 'right',
-              padding: [6, 5, 5, 5],
+              padding: [0, 5, -5, 5],
             },
             axisLabel: {
               show: true,
@@ -405,6 +405,6 @@ export default {
   margin-top: 20px;
 }
 .f-darkGray{
-  margin-top: 15px;
+  margin-top: 5px;
 }
 </style>

src/views/dataBoard/renfang/cpts/jmPieOption.js

@@ -4,24 +4,21 @@ export function pieOption() {
     const center = ["50%", "170px"];
     return {
         color: ["#1A95FF", "#FFAA00", "#04C790"],
-       /* title: {
-            text: "0",
-            top: 45,
-            left: "center",
+        title: {
+            text: "",
+            subtext: '总数',
+            left: '45%',
+            top: '35%',
+            textAlign :'center',
             textStyle: {
-                width: "100%",
-                fontSize: 24,
-                color: "#FFFFFF",
-                fontWeight: 400,
+                color: '#7FCEFF',
+                fontSize: 18,
             },
-            itemGap: 5,
-            // subtext: "总数",
-            // subtextStyle: {
-            //   fontSize: 20,
-            //   color: "#fff",
-            //   fontWeight: 400,
-            // },
-        },*/
+            subtextStyle: {
+                fontSize: 12,
+                color: '#A3B9DA'
+            },
+        },
         tooltip: {
             show: false,
         },
@@ -47,7 +44,7 @@ export function pieOption() {
                     show: false
                 },
                 data: [],
-                label: {
+             /*   label: {
                     show: false,
                     position: 'center',
                     formatter:  data => {
@@ -75,7 +72,7 @@ export function pieOption() {
                         fontSize: '14',
                         fontWeight: 'normal'
                     }
-                },
+                },*/
              /*   label: {
                     show: false,
                     position: 'center'

src/views/dataBoard/renfang/cpts/jmgl.vue

@@ -180,6 +180,7 @@ export default {
       this.pieOption = pieOption();
       const {pandectData} = this;
       console.log(pandectData)
+      this.pieOption.title.text = pandectData.totalResidents;
       this.pieData = [
         {value: pandectData.permanentResiCount, name: "常住人口"},
         {value: pandectData.floatingResiCount, name: "流动人口"},
@@ -187,7 +188,7 @@ export default {
       this.pieOption.series[0].data = this.pieData;
       this.$refs.pieChart.setOption(this.pieOption);
       this.$refs.pieChart.myChart.setOption(this.pieOption);
-      this.$refs.pieChart.myChart.on('mouseover', (params) => {
+      /*this.$refs.pieChart.myChart.on('mouseover', (params) => {
         var oldIndex = currentIndex;
         var currentIndex = params.dataIndex;
         this.highlightPie(currentIndex, oldIndex);
@@ -195,7 +196,7 @@ export default {
 
       setTimeout(() => {
         this.highlightPie(0, 1);
-      }, 50)
+      }, 50)*/
     },
     highlightPie(currentIndex, oldIndex) {
       this.$refs.pieChart.myChart.dispatchAction({

src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue

@@ -24,7 +24,7 @@
     <div class="table">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0,0,0,0.5)"
                 element-loading-spinner="el-icon-loading" element-loading-text="加载中...">
-        <el-table-column label="序号" type="index" width="50"/>
+        <el-table-column label="序号" type="index" width="80"/>
         <el-table-column label="联系方式" prop="mobile">
           <template slot-scope="scope">
             {{ $sensitive(scope.row.mobile, 3, 7) }}

src/views/dataBoard/satisfactionEval/modules/DissatisfiedReason/index.vue

@@ -33,6 +33,7 @@ export default {
       this.myChart = echarts.init(div);
       var getname = data.map(item => item.dissatisfactionReasonName); // 课程名
       var getNum = data.map(item => item.qty);
+      var total = eval(getNum.join('+'))
 
       var data = [];
       for (var i = 0; i < getname.length; i++) {
@@ -90,10 +91,10 @@ export default {
           avoidLabelOverlap: false,
 
           label: {
-            show: false,
+            show: true,
             position: "center",
             color: "rgba(13, 17, 29,0)",
-            formatter: `{primary|{d}%}\n{point|占比}}`,
+            formatter: `{primary|${total}}\n{point|总数}}`,
             rich: {
               primary: {
                 fontSize: 24,