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

.env.development

@@ -1,7 +1,9 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_API_SERVER =  http://192.168.1.140/api
-# VUE_APP_API_SERVER =  http://192.168.51.36:8080/api
+
+#家中开发连级的后端服务
+# VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 VUE_APP_NODE_ENV=dev 
 #项目根路径

src/assets/scss/modules/visual/issue-info.scss

@@ -74,7 +74,7 @@
     display: flex;
     padding-left: 15px;
     .info-title-2 {
-      width: 90px;
+      width: 100px;
       flex: 0 0 1;
       font-size: 14px;
     }

src/assets/scss/modules/visual/resibuzz.scss

@@ -52,9 +52,10 @@
     }
   }
   .status-select {
-    position: absolute;
-    top: 20px;
-    right: 10px;
+    margin-left: 10px;
+    // position: absolute;
+    // top: 20px;
+    // right: 10px;
   }
   .second-select:last-child {
     margin-left: 0;

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/basicinfo/basicInfoMain.vue

@@ -114,7 +114,7 @@ import BasicInfoCommunity from "./basicInfoCommunity";
 import PeopleSearch from "./peopleSearch";
 import People from "./people";
 import cptCard from "@/views/modules/visual/cpts/card";
-
+var centerPointGlobal = [120.38945519, 36.0722275]
 
 let loading;//加载动画
 
@@ -532,11 +532,15 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
-      this.centerPoint = []
+
 
       if (this.orgData.longitude && this.orgData.latitude) {
+        this.centerPoint = []
         this.centerPoint.push(this.orgData.longitude)
         this.centerPoint.push(this.orgData.latitude)
+      } else {
+
+        this.centerPoint = centerPointGlobal
       }
 
       this.setZoom(this.orgData.agencyLevel)
@@ -545,11 +549,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 14
+        this.zoom = 12
       } else if (agencyLevel === 'street') {
-        this.zoom = 15
+        this.zoom = 13
       } else if (agencyLevel === 'community') {
-        this.zoom = 16
+        this.zoom = 14
       }
 
     },

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

@@ -349,8 +349,9 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
+
         this.legendArray = []
-        if (data.above) {
+        if (data.under) {
           this.under = data.under
           this.legendArray.push(
             {
@@ -396,8 +397,7 @@ export default {
                 if (item.count < this.under || item.count === this.under) {
                   item.color = this.colorArray[0]
                   item.fillColor = this.colorFillArray[0]
-                }
-
+                } else {
                   if (this.above) {
                     if (item.count > this.under && item.count < this.above) {
                       item.color = this.colorArray[1]
@@ -408,6 +408,9 @@ export default {
                     }
                   }
                 }
+
+
+              }
               break
             }
 

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

@@ -424,7 +424,8 @@ export default {
     loadMap () {
       if (this.isfirstInit) {
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
-        this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+        // this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+        this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle)
       } else {
         this.$refs.map.refreshMap(null, this.projectList)
       }

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

@@ -279,6 +279,7 @@ export default {
       let params = {
         orgId: this.orgId,
         orgType: this.orgType,
+        status: this.status,
 
       };
 
@@ -405,8 +406,10 @@ export default {
 
     },
 
-    handleChangeState (index) {
-      this.getTable()
+    async handleChangeState (index) {
+      await this.getApiData()
+      this.assignPieChart()
+
     },
 
     async handleChangeAgency (value) {
@@ -454,8 +457,8 @@ export default {
             item.createdTime ? item.createdTime : '',
             item.issueOriginator ? item.issueOriginator : '',
             item.voteAccount ? item.voteAccount : '',
-            item.supportCount ? item.supportCount : '',
-            item.oppositionCount ? item.oppositionCount : '',
+            item.supportCount ? item.supportCount : 0,
+            item.oppositionCount ? item.oppositionCount : 0,
             { type: "operate", list: ["查看"] },
           ];
         });

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

@@ -2,7 +2,7 @@
   <cpt-card>
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
-      <span>事件分类分析</span>
+      <span>项目分类分析</span>
 
       <div class="second-select cascader">
 
@@ -123,10 +123,7 @@ export default {
             align: "center",
             width: "5%",
           },
-          {
-            align: "center",
-            width: "10%",
-          },
+
           {
             align: "center",
             width: "10%",
@@ -145,7 +142,7 @@ export default {
           },
           {
             align: "center",
-            width: "20%",
+            width: "30%",
           },
           {
             align: "center",
@@ -156,7 +153,7 @@ export default {
             width: "10%",
           },
         ],
-        header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
+        header: ["序号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
         list: [],
         pageSize: 10,
         pageNo: 1,
@@ -427,7 +424,7 @@ export default {
             item.statusShow = item.status === 'pending' ? '待处理' : '已结案'
             return [
               { type: "index" },
-              item.projectCode ? item.projectCode : '',
+              // item.projectCode ? item.projectCode : '',
               item.categoryNames.join(','),
               item.originShow ? item.originShow : '',
               item.gridName ? item.gridName : '',

src/views/modules/visual/components/screen-map/index.vue

@@ -37,7 +37,7 @@ import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
 
 import { requestPost } from "@/js/dai/request";
-
+var centerPointGlobal = [120.38945519, 36.0722275]
 
 
 let loading;//加载动画
@@ -433,11 +433,15 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
-      this.centerPoint = []
+
 
       if (this.mapInfo.longitude && this.mapInfo.latitude) {
+        this.centerPoint = []
         this.centerPoint.push(this.mapInfo.longitude)
         this.centerPoint.push(this.mapInfo.latitude)
+      } else {
+
+        this.centerPoint = centerPointGlobal
       }
 
       this.setZoom(this.mapInfo.level)
@@ -446,11 +450,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (level) {
       if (level === 'district') {
-        this.zoom = 14
+        this.zoom = 11
       } else if (level === 'street') {
-        this.zoom = 15
+        this.zoom = 12
       } else if (level === 'community') {
-        this.zoom = 16
+        this.zoom = 13
       }
 
     },

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,11 +1,11 @@
 <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"
+          <el-cascader v-model="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"
                        :show-all-levels="false"
@@ -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,7 +372,7 @@ export default {
         this.$message.error(msg)
       }
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
@@ -388,7 +388,8 @@ export default {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
-            children: this.getTreeData(item.subAgencyList)}
+            children: this.getTreeData(item.subAgencyList)
+          }
         } else {
           _item = {
             label: item.agencyName,
@@ -497,11 +498,11 @@ 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])
@@ -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)
 
       }
     },

src/views/modules/workSys/mapConfig.vue

@@ -67,7 +67,7 @@ import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
 
-
+var centerPointGlobal = [120.38945519, 36.0722275]
 let loading;//加载动画
 
 let x = 1500
@@ -374,11 +374,14 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
-      this.centerPoint = []
 
       if (this.orgData.longitude && this.orgData.latitude) {
+        this.centerPoint = []
         this.centerPoint.push(this.orgData.longitude)
         this.centerPoint.push(this.orgData.latitude)
+      } else {
+
+        this.centerPoint = centerPointGlobal
       }
 
       this.setZoom(this.orgData.agencyLevel)
@@ -387,11 +390,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 13
+        this.zoom = 12
       } else if (agencyLevel === 'street') {
-        this.zoom = 14
+        this.zoom = 13
       } else if (agencyLevel === 'community') {
-        this.zoom = 15
+        this.zoom = 14
       }
 
     },