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

.env.development

@@ -1,6 +1,6 @@
 NODE_ENV=development
-VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
+# 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.1.140/api
 # VUE_APP_API_SERVER =  http://192.168.51.36:8080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 VUE_APP_NODE_ENV=dev 

.env.production.sit

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
+# 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.1.140/api
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper

public/index.html

@@ -36,8 +36,8 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
     <script>
-    //  window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
+     window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
-     window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
+    //  window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
        // window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
       // window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
     </script>

src/assets/scss/modules/visual/processAnalyze.scss

@@ -87,9 +87,9 @@
 
   .g-r {
     text-align: center;
-    margin: 40px 19px 20px;
+    margin: 20px 19px 20px;
-    width: calc(100vw - 60px - 800px);
+    width: calc(100vw - 40px - 800px);
-    height: calc(100vh - 160px - 20px);
+    height: calc(100vh - 180px - 20px);
   }
 }
 
@@ -172,40 +172,10 @@
 }
 
 .g-r {
-  .tb {
+  .m-map {
     position: relative;
-    height: calc(100vh - 220px);
+    height: 100%;
-    overflow-y: auto;
+    width: 100%;
-    @include scrollBar;
-
-    .m-pagination {
-      position: absolute;
-      box-sizing: border-box;
-      right: 0;
-      bottom: 0;
-
-      width: 100%;
-      height: 40px;
-      display: flex;
-      justify-content: flex-end;
-
-      /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-        background: #0266d1;
-        color: #000d3f;
-      }
-
-      /deep/ .el-pagination .el-pager li {
-        background: #002e74;
-      }
-
-      /deep/ .el-pagination .btn-prev {
-        background: #002e74;
-      }
-
-      /deep/ .el-pagination .btn-next {
-        background: #002e74;
-      }
-    }
   }
 }
 

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

@@ -54,13 +54,10 @@
         </div>
       </div>
       <div class="g-r">
-        <div class="m-tb">
 
-          <div class="tb">
+        <screen-map class="m-map"
-
+                    ref="map"
-          </div>
+                    :showIconLayer="true"></screen-map>
-
-        </div>
 
       </div>
     </div>
@@ -107,28 +104,12 @@ export default {
         { value: 735, name: '已结案', color: '#3DDA83' },
 
       ],
-      //voting 已转项目：shift_project 已关闭：closed，全部：all
-      stateArray: [
-        {
-          label: '全部',
-          value: 'all'
-        },
-        {
-          label: '表决中',
-          value: 'voting'
-        },
-        {
-          label: '已转项目',
-          value: 'shift_project'
-        },
-        {
-          label: '已关闭',
-          value: 'closed'
-        },
-      ],
 
       dateId: '',
       agencyId: '',
+      status: 'pending',//状态:待处理 pending，结案closed
+      agencyInfo: {},
+      projectList: [],
 
       casOptions: [],
       agencyIdArray: [],
@@ -163,12 +144,34 @@ export default {
 
     },
     async getApiData () {
-      await this.getAgencylist()//获取组织级别
+      await this.getWorkUserInfo()
+      // await this.getAgencylist()//获取组织级别
       await this.getProjectTotal()
+      await this.loadProjectlist()
       await this.getLine()
       // await this.getTable();
     },
 
+    // 获取当前管理员信息
+    getWorkUserInfo () {
+      const url = '/epmetuser/customerstaff/staffbasicinfo'
+      let params = {}
+      window.app.ajax.post(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.agencyInfo = data
+          this.agencyInfo.latitude = 36.072227
+          this.agencyInfo.longitude = 120.389455
+          this.agencyInfo.level = 'street'
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        }
+      )
+
+    },
+
     async getAgencylist () {
       const url = '/gov/org/customeragency/agencylist'
       // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
@@ -229,6 +232,67 @@ export default {
       }
     },
 
+    //加载项目
+    async loadProjectlist () {
+      // const url = "/data/aggregator/project/projectstatuslist";
+      const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectstatuslist";
+      let params = {
+        agencyId: '',
+        dateId: this.dateId,
+        status: this.status
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+
+      if (code === 0) {
+
+
+        // this.projectList = [...data]
+
+        this.projectList = [
+          {
+            agencyId: '',
+            projectId: '',
+            origin: '',
+            status: '',
+            title: '南宁第二网格南宁第二网格',
+            latitude: 36.072227,
+            longitude: 120.389455,
+          },
+          {
+            agencyId: '',
+            projectId: '',
+            origin: '',
+            status: '',
+            latitude: 36.072227,
+            longitude: 120.389455,
+            title: "南宁第二网格",
+          },
+          {
+            agencyId: '',
+            projectId: '',
+            origin: '',
+            status: '',
+            id: "2a278c0ceb863359d263fda7aabf6742",
+            latitude: 36.072227,
+            longitude: 120.389455,
+            title: "南宁第一网格",
+          }
+        ]
+        let iconUrlArray = [
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+        ]
+        //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
+        this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, iconUrlArray)
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
     pieInitOk (dom) {
       console.log('pie准备好了')
       this.pieChartS = dom

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

@@ -1,15 +1,12 @@
 <template>
-  <div style="position: relative">
+  <div class="div_content_map">
-
     <div class="div_map"
          id="map"
          ref="map">
       <!-- <div id="map"
              class="map"></div> -->
     </div>
-
   </div>
-
 </template>
 
 <script>
@@ -113,13 +110,7 @@ const vueGis = {
       minZoom: 1,//最小缩放
 
       mapInfo: {
-        agencyLevel: "community",
+
-        coordinates: "120.37342346270151,36.0950221490494,120.39931465567633,36.09693067926868,120.39740612545705,36.09113306860255,120.39762218548188,36.08911650837086,120.39999884575495,36.0859836380109,120.4010071258708,36.080978247435795,120.39258078490263,36.08094223743166,120.38537878407514,36.08303081767163,120.37616022301596,36.082382637597156,120.37342346270151,36.0950221490494",
-        id: "6e511da6816e53af4cda952365a26eb9",
-        latitude: 36.072227,
-        level: "agency",
-        longitude: 120.389455,
-        name: "南宁社区",
       },
 
       polygonArray: [
@@ -153,27 +144,7 @@ const vueGis = {
       ],
 
       iconArrays: [
-        {
+
-          id: "2a278c0ceb863359d263fda7aabf6752",
-          latitude: 36.072227,
-          longitude: 120.389455,
-          level: "grid",
-          name: "第三网格",
-        },
-        {
-          id: "2a278c0ceb863359d263fda7aabf6753",
-          latitude: 36.072227,
-          longitude: 120.389455,
-          level: "grid",
-          name: "南宁第二网格",
-        },
-        {
-          id: "2a278c0ceb863359d263fda7aabf6742",
-          latitude: 36.072227,
-          longitude: 120.389455,
-          level: "grid",
-          name: "南宁第一网格",
-        }
       ],
 
       //policon图标样式
@@ -183,11 +154,7 @@ const vueGis = {
         'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
       ],
       //icon图标样式
-      iconUrlArray: [
+      iconUrlArray: [],
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
-      ],
 
     }
   },
@@ -197,8 +164,12 @@ const vueGis = {
   },
   methods: {
     //加载地图
-    loadMap (mapInfo) {
+    loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray) {
       this.mapInfo = mapInfo
+      this.polygonArray = polygonArray
+      this.polIconUrlArray = polIconUrlArray
+      this.iconArrays = iconArrays
+      this.iconUrlArray = iconUrlArray
 
       //初始化地图
       this.initMap()
@@ -360,7 +331,7 @@ const vueGis = {
             id: oneIcon.id,
             properties: {
               type: "icon",
-              id: oneIcon.id
+              info: { ...oneIcon.info }
             }
           });
 
@@ -438,16 +409,16 @@ const vueGis = {
         this.centerPoint.push(this.mapInfo.latitude)
       }
 
-      this.setZoom(this.mapInfo.agencyLevel)
+      this.setZoom(this.mapInfo.level)
     },
 
     //根据组织层级设置缩放级别
-    setZoom (agencyLevel) {
+    setZoom (level) {
-      if (agencyLevel === 'district') {
+      if (level === 'district') {
         this.zoom = 14
-      } else if (agencyLevel === 'street') {
+      } else if (level === 'street') {
         this.zoom = 15
-      } else if (agencyLevel === 'community') {
+      } else if (level === 'community') {
         this.zoom = 16
       }
 
@@ -597,16 +568,20 @@ export default vueGis;
 ></style>
 
 <style lang="scss" >
-.div_content {
+.div_content_map {
   .ol-viewport {
     border-radius: 5px;
   }
+  .div_map {
+    box-sizing: border-box;
+    width: 100%;
+    // padding: 10px 5px 13px;
+    // margin-top: 8px;
+    height: 100%;
+    color: #fff;
+  }
 }
 .ol-overlaycontainer-stopevent {
   display: none;
 }
-
-.el-scrollbar__wrap {
-  overflow-x: hidden !important;
-}
 </style>