Merge branch 'prod' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into prod

src/views/modules/base/community/buildTable.vue

@@ -180,7 +180,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 220)
+      return (this.clientHeight - 300)
 
     },
 

src/views/modules/base/community/communityTable.vue

@@ -185,7 +185,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 320)
+      return (this.clientHeight - 300)
 
     },
     rowHeight () {

src/views/modules/base/community/roomTable.vue

@@ -63,6 +63,7 @@
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 v-loading="tableLoading"
                 border
+                :height="tableHeight"
                 style="width: 100%">
         <el-table-column prop="houseName"
                          label="房屋名称"
@@ -189,9 +190,12 @@ export default {
 
   },
   computed: {
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
+    tableHeight () {
+
+      return (this.clientHeight - 300)
+
     },
+
     ...mapGetters(['clientHeight'])
   },
   methods: {

src/views/modules/visual/communityGovern/resibuzz.vue

@@ -453,8 +453,8 @@ export default {
             item.status ? item.status : '',
             item.createdTime ? item.createdTime : '',
             item.issueOriginator ? item.issueOriginator : '',
-            item.voteAccount ? item.voteAccount : '',
-            item.supportCount ? item.supportCount : '',
+            item.voteAccount ? item.voteAccount : 0,
+            item.supportCount ? item.supportCount : 0,
             item.oppositionCount ? item.oppositionCount : '',
             { type: "operate", list: ["查看"] },
           ];

src/views/modules/visual/heart/index.vue

@@ -86,7 +86,7 @@ export default {
   name: "heart",
   data() {
     return {
-      agencyId: "",
+      agencyId: this.$store.state.user.agencyId,
       areaCode: "",
 
       monthId: dateFormat(
@@ -202,7 +202,7 @@ export default {
     handleSearch() {},
 
     async getApiData() {
-      await this.getAgencyInfo();
+      //await this.getAgencyInfo();
       this.getTb1();
       this.getTb2();
       this.getTb3();

src/views/modules/visual/measure/volunteer.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="warning-box">
-    <cpt-card >
+    <cpt-card>
       <div class="card-title">
-        <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
+        <img class="title-icon"
+             src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          <el-cascader 
-            v-model="selectAgency"
-            :options="propTree" 
-            :props="{ checkStrictly: true }" 
-            :show-all-levels="false"
-            clearable 
-            @change="handleCascader">
+          <el-cascader v-model="selectAgency"
+                       :options="propTree"
+                       :props="{ checkStrictly: true }"
+                       :show-all-levels="false"
+                       clearable
+                       @change="handleCascader">
           </el-cascader>
         </div>
       </div>
@@ -18,7 +18,7 @@
         <cpt-card class="card-wr">
           <div class="card-title">
             <img class="title-icon"
-                src="../../../../assets/img/shuju/title-tip.png" />
+                 src="../../../../assets/img/shuju/title-tip.png" />
             <div class="title-label">
               志愿者服务情况
             </div>
@@ -43,7 +43,7 @@
               <div class="echart-wr">
                 <!-- <div class="echart-cicle"></div> -->
                 <div id="echartService"
-                    class="echart-org"></div>
+                     class="echart-org"></div>
               </div>
 
             </div>
@@ -69,7 +69,7 @@
               <div class="echart-wr">
                 <!-- <div class="echart-cicle"></div> -->
                 <div id="echartCount"
-                    class="echart-org"></div>
+                     class="echart-org"></div>
               </div>
 
             </div>
@@ -80,7 +80,7 @@
         <cpt-card class="card-wr card-wr-map">
           <div class="card-title">
             <img class="title-icon"
-                src="../../../../assets/img/shuju/title-tip.png" />
+                 src="../../../../assets/img/shuju/title-tip.png" />
             <div class="title-label">
               多元化治理平面图
             </div>
@@ -97,11 +97,11 @@
           <div class="map-tips">
 
             <div class="map-tips-item"
-                v-for="item in legendArray"
-                :key="item.optionValue">
+                 v-for="item in legendArray"
+                 :key="item.optionValue">
 
               <img class="title-icon"
-                  :src="item.url" />
+                   :src="item.url" />
               <div class="map-tips-label">{{item.optionLabel}}</div>
             </div>
 
@@ -351,7 +351,7 @@ export default {
         this.$message.error(msg)
       }
     },
-    async getAgencyList() {
+    async getAgencyList () {
       // const url = "/gov/org/customeragency/staffinagencylist";
       // const url = '/gov/org/customeragency/agencygridtree'
       const url = '/gov/org/customeragency/staffinagencylist'
@@ -372,25 +372,26 @@ export default {
         this.$message.error(msg)
       }
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
         if (item.subAgencyList) {
           if (item.subAgencyList.length === 0) {
-            _item = { 
+            _item = {
               label: item.agencyName,
               value: item.agencyId + '-' + item.level,
               level: item.level,
-              children: undefined 
+              children: undefined
             }
-          } else _item = { 
+          } else _item = {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
-            children: this.getTreeData(item.subAgencyList)}
+            children: this.getTreeData(item.subAgencyList)
+          }
         } else {
-          _item = { 
+          _item = {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
@@ -497,16 +498,16 @@ export default {
 
     },
 
-    handleCascader(val) {
+    handleCascader (val) {
       console.log('val-vvv', val)
       if (val.length > 0) {
         const _arr = val[val.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
         // this.getServicePie(_arr[0], orgType)
         this.getPie(_arr[0])
         this.getMapUnitList(_arr[0])
       }
-      
+
     },
     //加载地图数据
     loadMap () {
@@ -514,7 +515,7 @@ export default {
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
         this.$refs.map.loadMap(this.agencyInfo, null, null, this.distributionsList, this.iconUrlArray, null)
       } else {
-        this.$refs.map.refreshMap(null, this.unitMapList)
+        this.$refs.map.refreshMap(null, this.distributionsList)
 
       }
     },
@@ -641,7 +642,7 @@ export default {
   .title-label {
     font-size: 16px;
     font-weight: 800;
-    
+
     ::v-deep .el-input {
       width: 180px;
       .el-input__inner {
@@ -652,7 +653,7 @@ export default {
         border: 0;
       }
       .el-icon-arrow-down::before {
-          content: "\e790";
+        content: "\e790";
       }
     }
   }