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

src/assets/scss/modules/visual/duoyuanfenxi.scss

@@ -76,7 +76,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100% - 50px);
+      height: calc(100% - 40px);
       overflow-y: auto;
       @include scrollBar;
       /deep/ .table-status {

src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@@ -18,12 +18,12 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" popper-class="cascader-block">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <!-- <span class="block"></span> -->
-                <span>{{ data.agencyName }}</span>
+                <span>{{ data.objectName }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
               </div>
             </template>
           </el-cascader>
@@ -56,19 +56,19 @@
         </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+        <el-table-column fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
-        <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -198,9 +198,9 @@ export default {
       })
     },
     cascaderClick (nodeData) {
-      this.dataForm.agencyId = nodeData.agencyId;
+      this.dataForm.agencyId = nodeData.objectId;
-      this.dataForm.level = nodeData.level
+      this.dataForm.level = nodeData.objectType
-      this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
+      this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
 
@@ -208,17 +208,17 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/customeragency/agencygridtree')
+              .post('/gov/org/icServiceProject/service/serviceScopeTree')
               .then(({ data: res }) => {
                 if (res.code !== 0) {
                   return this.$message.error(res.msg)
                 } else {
                   console.log('获取查询详情成功', res.data)
                   // this.optionsA = res.data
+                  // console.log(this.optionsA);
                   this.optionsA.push(res.data)
-                  this.dataForm.agencyId = res.data.agencyId
+                  this.dataForm.agencyId = res.data.objectId
-                  this.dataForm.level = res.data.level
+                  this.dataForm.level = res.data.objectType
-                  this.getDataList()
                 }
               })
               .catch(() => {

src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue

@@ -149,7 +149,7 @@ export default {
         ],
         header: ['序号', '组织列表', '操作'],
         list: [],
-        pageSize: 10,
+        pageSize: 5,
         pageNo: 1,
         total: 0,
         categoryCode: ''
@@ -216,7 +216,7 @@ export default {
             name: item.categoryName,
             code: item.categoryCode,
             color: item.color, // colorArray[index]
-            selected: index == 0 ? true : false
+            selected: false
           }
           this.pieData.push(ob)
         })
@@ -302,14 +302,21 @@ export default {
       this.clickPie() // this.clickPie(maxIndex)
 
       let fun = function (params) {
-        _that.clickPie(params.dataIndex)
+        _that.clickPie(params)
       }
       this.$refs.pieChart.handleClick(fun)
     },
 
-    clickPie (seriesIndex) {
+    clickPie (params) {
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 2) { // 点击中心
+        dataIndex = -1
+        this.categoryCode = ''
+        this.$refs.pieChart.clear()
+      }
       this.pieData.forEach((element, index) => {
-        if (index === seriesIndex) {
+        if (index === dataIndex) {
           element.label = {
             show: true,
           }
@@ -320,9 +327,6 @@ export default {
             }
           }
           this.categoryCode = element.code
-          this.demand.pageNo = 1
-          this.getTable()
-          this.getMapData()
         } else {
           element.label = {
             show: false,
@@ -339,6 +343,9 @@ export default {
       this.pieOption.series[1].data = this.pieData
       // this.$refs.pieChart.hideLoading()
       this.$refs.pieChart.setOption(this.pieOption)
+      this.demand.pageNo = 1
+      this.getTable()
+      this.getMapData()
     },
 
     toUserInfo (uid) {
@@ -738,11 +745,11 @@ export default {
 .map-tips {
   width: 100%;
   display: flex;
-  // justify-content: center;
+  justify-content: center;
   align-items: center;
   flex-wrap: wrap;
   box-sizing: border-box;
-  padding: 6px 0 0 100px;
+  // padding: 6px 0 0 100px;
   // padding-top: 10px;
   // padding-bottom: 10px;
 

src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js

@@ -74,7 +74,7 @@ export function pieOption (_charts) {
           avoidLabelOverlap: false,
           // top: top + '%',
           // height: '80%',
-          // selectedMode: 'single',
+          selectedMode: 'single',
           left: 'center',
           width: 480,
           label: {

src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@@ -636,9 +636,9 @@ export default {
 
           };
           // element.selected = !element.selected
-          // isSelected = element.selected
         } else {
 
+
           element.selected = false
           element.label = {
             show: false,

src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js

@@ -1,10 +1,10 @@
 
 export function pieOption (_charts) {
-  const center= ['50%', '120px']
+  const center= ['50%', '140px']
     return {
       title: {
         text: '0',
-        top: 95,
+        top: 115,
         left: 'center',
         textStyle: {
           width: '100%',
@@ -94,7 +94,7 @@ export function pieOption (_charts) {
                 padding: [0, 6, 0, 6]
               },
               a: {
-                fontSize: 25,
+                fontSize: 18,
                 color: '#fff',
                 padding: [0, 6, 6, 6]
               },
@@ -110,7 +110,7 @@ export function pieOption (_charts) {
           labelLine: {
             show: false,
             smooth: 0.2,
-            length: 40,
+            length: 20,
             length2: 0,
             maxSurfaceAngle: 80
           },

src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

@@ -508,16 +508,22 @@ export default {
       this.clickPie() // this.clickPie(maxIndex)
 
       let fun = function (params) {
-        _that.clickPie(params.dataIndex)
+        _that.clickPie(params)
       }
       this.$refs.pieChart.handleClick(fun)
 
     },
 
-    clickPie (seriesIndex) {
+    clickPie (params) {
-      let isSelected = false
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 2) { // 点击中心
+        dataIndex = -1
+        this.categoryCode = ''
+        this.$refs.pieChart.clear()
+      }
       this.pieData.forEach((element, index) => {
-        if (index === seriesIndex) {
+        if (index === dataIndex) {
           element.label = {
             show: true,
           }
@@ -529,12 +535,6 @@ export default {
           }
           this.categoryCode = element.categoryCode
           element.selected = !element.selected
-          isSelected = element.selected
-          // if (isSelected) {
-          //   this.categoryCode = element.categoryCode
-          // } else {
-          //   this.categoryCode = ''
-          // }          
         } else {
           element.label = {
             show: false,
@@ -600,15 +600,23 @@ export default {
       this.clickGridPie() // this.clickGridPie(maxIndex)
 
       let fun = function (params) {
-        _that.clickGridPie(params.dataIndex)
+        _that.clickGridPie(params)
       }
       this.$refs.gridPieChart.handleClick(fun)
 
     },
 
-    clickGridPie (seriesIndex) {
+    clickGridPie (params) {
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 2) { // 点击中心
+        dataIndex = -1
+        this.tableOrgId = ''
+        this.tableOrgType = ''
+        this.$refs.gridPieChart.clear()
+      }
       this.gridPieData.forEach((element, index) => {
-        if (index === seriesIndex) {
+        if (index === dataIndex) {
           element.label = {
             show: true,
           }

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

@@ -524,6 +524,7 @@ const vueGis = {
       }
       this.centerPoint = []
 
+
       //如果存在中心点（返回时赋值）
       if (this.center && this.center.length > 0) {
         this.centerPoint = this.center
@@ -532,8 +533,6 @@ const vueGis = {
 
       } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
         this.centerFlag = 'flag_polygon'
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
 
       } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
         this.centerPoint.push(this.mapInfo.longitude)
@@ -544,7 +543,6 @@ const vueGis = {
         this.centerPoint = centerPointGlobal
         this.centerFlag = 'point'
       }
-
       // debugger
       if (this.centerFlag === 'flag_parent') {
         let parentFeatures = parentLayer.getSource().getFeatures()[0]
@@ -564,6 +562,7 @@ const vueGis = {
       }
       mapView.setZoom(this.zoom);
 
+      
     },
     firstCentermap () {
       if (this.mapInfo.longitude && this.mapInfo.latitude) {