From a687ef97e3d1c0275a4a09493163fdd4664d82ab Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 6 Jun 2022 09:17:36 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      |   2 +-
 src/views/modules/base/community/roomForm.vue | 504 +++++++++---------
 .../modules/base/community/roomTable.vue      |   2 +-
 3 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 43a4c7bb8..434728447 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -48,7 +48,7 @@
 
               </el-input>
             </el-form-item>
-            <el-form-item label="房主手机"
+            <el-form-item label="联系方式"
                           prop="ownerPhone">
               <el-input v-model="ownerPhone"
                         class="item_width_2"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 0c1f73415..e425cd561 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -91,13 +91,13 @@
                     v-model="dataForm.ownerName">
           </el-input>
         </el-form-item>
-        <el-form-item label="房主电话"
+        <el-form-item label="联系方式"
                       prop="ownerPhone"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     type='number'
-                    placeholder="请输入房主电话"
+                    placeholder="请输入联系方式"
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
@@ -136,260 +136,260 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
-    import { requestPost, requestGet } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      unitList: [],
+
+      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: 0,
+      dataForm: {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: ''
+      },
+
+      keyWords: '',
+      agencyObj: {},
 
+    }
+  },
+  components: {},
+  mounted () {
 
-    let loading // 加载动画
-    export default {
-        data () {
-            return {
-                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-                btnDisable: false,
-                unitList: [],
+  },
 
-                houseId: '', //房屋ID
-                houseType: '1',
-                purpose: '1',
-                rentFlag: 0,
-                dataForm: {
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '',//房屋类型【楼房，平房，别墅】
-                    purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: ''
-                },
-
-                keyWords: '',
-                agencyObj: {},
-
-            }
-        },
-        components: {},
-        mounted () {
-
-        },
-
-        methods: {
-            async initForm (type, row, agencyObj) {
-
-                this.$refs.ref_form.resetFields();
-                this.agencyObj = agencyObj
-                this.formType = type
-                if (row) {
-
-                    this.houseId = row.houseId
-                    await this.loadHouseInfo()
-                    // this.dataForm = JSON.parse(JSON.stringify(row))
-                    // this.houseId = this.dataForm.houseId
-
-                    // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-                    // this.dataForm = { ...  this.dataForm }
-                    // this.houseType = this.dataForm.houseTypeKey
-                    // this.purpose = this.dataForm.purposeKey
-                    // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-
-                } else {
-
-                    this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-                    this.dataForm.buildingId = this.agencyObj.id
-                }
-
-
-                await this.loadUnitList()
-
-            },
-
-            async loadHouseInfo () {
-
-                const url = "/gov/org/ichouse/" + this.houseId
-
-                const { data, code, msg } = await requestGet(url)
-
-                if (code === 0) {
-                    // debugger
-                    this.dataForm = { ...data }
-
-                    this.houseType = this.dataForm.houseType
-                    this.purpose = this.dataForm.purpose
-                    this.rentFlag = parseInt(this.dataForm.rentFlag)
-
-
-                } else {
-                    this.$message.error(msg)
-                }
-
-            },
-
-            //加载单元
-            async loadUnitList () {
-                const url = '/gov/org/building/buildingunitlist'
-
-                let params = {
-                    buildingId: this.dataForm.buildingId
-                }
-
-                const { data, code, msg } = await requestPost(url, params)
-
-                if (code === 0) {
-                    this.unitList = data
-                } else {
-                    this.$message.error(msg)
-                }
-            },
-
-            async handleComfirm () {
-                this.btnDisable = true
-                setTimeout(() => {
-                    this.btnDisable = false
-                }, 10000)
-
-                this.dataForm.houseType = this.houseType
-                this.dataForm.purpose = this.purpose
-                this.dataForm.rentFlag = this.rentFlag
-                this.$refs['ref_form'].validate((valid, messageObj) => {
-                    if (!valid) {
-                        this.btnDisable = false
-                        app.util.validateRule(messageObj)
-                    } else {
-                        this.addRoom()
-                    }
-
-                })
-            },
-
-            async addRoom () {
-                const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-                if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
-                    this.btnDisable = false
-                    this.$message({
-                        type: 'warning',
-                        message: '请输入正确的身份证号码'
-                    })
-                    return false;
-                }
-                const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-                if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
-                    this.btnDisable = false
-                    this.$message({
-                        type: 'warning',
-                        message: '请输入正确的手机号码'
-                    })
-                    return false;
-                }
-
-                let url = ''
-
-                if (this.formType === 'add') {
-                    url = '/gov/org/house/houseadd'
-                } else {
-                    url = '/gov/org/house/houseupdate'
-                    this.dataForm.houseId = this.houseId
-                }
-
-                const { data, code, msg } = await requestPost(url, this.dataForm)
-                this.btnDisable = false
-                if (code === 0) {
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功'
-                    })
-                    this.resetData()
-                    this.$emit('dialogOk')
-
-                } else {
-
-                    this.$message.error(msg)
-                }
-
-            },
-
-            handleCancle () {
-                this.resetData()
-                this.$emit('dialogCancle')
-
-            },
-
-            resetData () {
-                this.houseId = '' //房屋ID
-                this.houseType = '1'
-                this.purpose = '1'
-                this.rentFlag = 0
-                this.dataForm = {
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '1',//房屋类型【楼房，平房，别墅】
-                    purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//是否出租【是：1，否：0】
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: '' // 备注
-                }
-
-            },
-            // 开启加载动画
-            startLoading () {
-                loading = Loading.service({
-                    lock: true, // 是否锁定
-                    text: '正在加载……', // 加载中需要显示的文字
-                    background: 'rgba(0,0,0,.7)' // 背景颜色
-                })
-            },
-            // 结束加载动画
-            endLoading () {
-                // clearTimeout(timer);
-                if (loading) {
-                    loading.close()
-                }
-            }
-        },
-        computed: {
-            dataRule () {
-                return {
-                    buildingUnitId: [
-                        { required: true, message: '所属单元不能为空', trigger: 'blur' },
-                    ],
-                    doorName: [
-                        { required: true, message: '门牌号不能为空', trigger: 'blur' }
-                    ],
-                    houseType: [
-                        { required: true, message: '房屋类型不能为空', trigger: 'blur' }
-                    ],
-                    purpose: [
-                        { required: true, message: '房屋用途不能为空', trigger: 'blur' }
-                    ],
-                    rentFlag: [
-                        { required: true, message: '是否出租不能为空', trigger: 'blur' }
-                    ],
-                    ownerPhone: [
-                        { required: false }
-                    ],
-                    ownerName: [
-                        { required: false }
-                    ],
-                    ownerIdCard: [
-                        { required: false }
-                    ],
-                    remark: [
-                        { required: false }
-                    ],
-                }
-            },
-
-        },
-        props: {}
+  methods: {
+    async initForm (type, row, agencyObj) {
+
+      this.$refs.ref_form.resetFields();
+      this.agencyObj = agencyObj
+      this.formType = type
+      if (row) {
+
+        this.houseId = row.houseId
+        await this.loadHouseInfo()
+        // this.dataForm = JSON.parse(JSON.stringify(row))
+        // this.houseId = this.dataForm.houseId
+
+        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        // this.dataForm = { ...  this.dataForm }
+        // this.houseType = this.dataForm.houseTypeKey
+        // this.purpose = this.dataForm.purposeKey
+        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+
+      } else {
+
+        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        this.dataForm.buildingId = this.agencyObj.id
+      }
+
+
+      await this.loadUnitList()
+
+    },
+
+    async loadHouseInfo () {
+
+      const url = "/gov/org/ichouse/" + this.houseId
+
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        // debugger
+        this.dataForm = { ...data }
+
+        this.houseType = this.dataForm.houseType
+        this.purpose = this.dataForm.purpose
+        this.rentFlag = parseInt(this.dataForm.rentFlag)
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载单元
+    async loadUnitList () {
+      const url = '/gov/org/building/buildingunitlist'
+
+      let params = {
+        buildingId: this.dataForm.buildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          this.btnDisable = false
+          app.util.validateRule(messageObj)
+        } else {
+          this.addRoom()
+        }
+
+      })
+    },
+
+    async addRoom () {
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+      let url = ''
+
+      if (this.formType === 'add') {
+        url = '/gov/org/house/houseadd'
+      } else {
+        url = '/gov/org/house/houseupdate'
+        this.dataForm.houseId = this.houseId
+      }
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+      this.btnDisable = false
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.houseId = '' //房屋ID
+      this.houseType = '1'
+      this.purpose = '1'
+      this.rentFlag = 0
+      this.dataForm = {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
     }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingUnitId: [
+          { required: true, message: '所属单元不能为空', trigger: 'blur' },
+        ],
+        doorName: [
+          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {}
+}
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 4f87e3f31..c2fef85e4 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -102,7 +102,7 @@
                          width="90">
         </el-table-column>
         <el-table-column prop="ownerPhone"
-                         label="房主电话"
+                         label="联系方式"
                          width="110">
         </el-table-column>
         <el-table-column prop="ownerIdCard"

From 30c0b1fa3214ce973fe424e30a04fb3770046c67 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 6 Jun 2022 15:14:26 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      |  4 +-
 .../visual/components/screen-map/index.vue    | 40 +++++++++----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 434728447..c19f811cf 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -269,7 +269,7 @@ export default {
 
     await this.loadOrgData()
     await this.loadTree()
-    await this.loadOpenNode()
+    // await this.loadOpenNode()
 
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
     if (this.treeData.length > 0) {
@@ -347,6 +347,8 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+        this.openNodes = []
+        this.openNodes.push(data[0].id)
 
         this.treeData = data
         if (!isRefresh && data.length > 0) {
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index bf2870126..54d0204de 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -32,7 +32,7 @@
          class="ol-popup-closer"></a>
       <div id="popup-content"
            class="popup-content"></div>
-      <a href="#" 
+      <a href="#"
          id="popup-goMore"
          class="popup-goMore">更多>>>></a>
     </div>
@@ -107,9 +107,9 @@ let polygonColorArray = [
   'rgba(183, 185, 0, 0.16)'
 ];
 
- //icon文字样式
+//icon文字样式
 let createTextStyle = function (feature) {
-  
+
   if (iconTextsStyle) {
     let iconTextsStyles = { ...iconTextsStyle }
     iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name
@@ -224,11 +224,11 @@ const vueGis = {
       // iconArrays.forEach(item => {
       //   console.log(item.type, item.urlIndex, item.latitude, item.longitude)
       // });
-      
+
 
       //初始化地图
       this.initMap()
-      
+
       if (this.showPolIconLayer) {
         console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
         //初始化多边形标注图层
@@ -242,7 +242,7 @@ const vueGis = {
         //加载当前园区的标注
         this.loadPolygon()
       }
-      
+
 
       if (this.showIconLayer) {
         //初始化icon图层
@@ -262,14 +262,14 @@ const vueGis = {
     //刷新地图
     async refreshMap (mapInfo, polygonArray, iconArrays) {
       this.mapInfo = mapInfo
-      this.polygonArray  = []
+      this.polygonArray = []
       this.polygonArray = polygonArray
       this.iconArrays = iconArrays
       iconSource.clear()
       polygonSource.clear()
       polIconSource.clear()
       this.initPolIconLayer()
-      
+
       if (this.showPolygonLayer) {
         this.initPolygonLayer()
         //加载当前园区的标注
@@ -287,7 +287,7 @@ const vueGis = {
       }
       this.setMapLocation()
       // gaodeMapLayer.getSource().changed()
-      
+
     },
 
     //加载区域多边形
@@ -305,7 +305,7 @@ const vueGis = {
 
             oneData = {
               type: 'Feature',
-        
+
               properties: { ...polygonItem },
               geometry: {
                 type: 'Polygon',
@@ -345,7 +345,7 @@ const vueGis = {
         if (this.showPolIconLayer) {
           this.loadPolIcon(feature)
         }
-        
+
 
       }
 
@@ -549,9 +549,9 @@ const vueGis = {
       }
       mapView.setZoom(this.zoom);
 
-      
+
     },
-    firstCentermap() {
+    firstCentermap () {
       if (this.mapInfo.longitude && this.mapInfo.latitude) {
         this.centerPoint = []
         this.centerPoint.push(this.mapInfo.longitude)
@@ -743,14 +743,14 @@ const vueGis = {
       this.overlay.getElement().parentNode.parentNode.style.display = 'block'
       content.innerHTML = showData;
       this.overlay.setPosition(coordinate);
-       //把 overlay 显示到指定的 x,y坐标
-      
+      //把 overlay 显示到指定的 x,y坐标
+
     },
     // 关闭弹窗
-    handleClosePopup() {
-        this.overlay.setPosition(undefined);
-        document.getElementById("popup-closer").blur();
-        return false;
+    handleClosePopup () {
+      this.overlay.setPosition(undefined);
+      document.getElementById("popup-closer").blur();
+      return false;
     },
 
     //取随机数
@@ -895,7 +895,7 @@ export default vueGis;
 .popup-content {
   width: 300px;
 }
-.popup-goMore{
+.popup-goMore {
   margin: 20px 0;
 }
 .ol-popup-closer:after {

From 6ad7505d2ac8b51b9b4cde4851563b243cf87068 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 6 Jun 2022 15:21:54 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityTable.vue | 80 +++++++++++++++++--
 1 file changed, 75 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 5eb4596f7..147411a2f 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -66,7 +66,7 @@
       <el-button style="margin-left:10px"
                  class="diy-button--reset"
                  size="small"
-                 @click="handleExport">导出</el-button>
+                 @click="handleExportOpen">导出</el-button>
       <el-button v-if="agencyObj.level == 'community'"
                  style="margin-left:10px"
                  class="diy-button--qrcode"
@@ -76,11 +76,11 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
-      <el-button style=";margin-left:10px"
+      <!-- <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
                  :disabled="yihuyidangDisabled"
-                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+                 @click="handleExportYihuyidang()">导出一户一档</el-button> -->
 
     </div>
 
@@ -183,6 +183,31 @@
                       @dialogOk="addFormOk"></community-form>
     </el-dialog>
 
+    <el-dialog
+        title="导出"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+        <div>
+          <el-button class="diy-button--reset"
+                 size="small"
+                 @click="handleExport">导出房屋数据</el-button>
+          <el-button class="diy-button--export"
+                 size="small"
+                 :disabled="yihuyidangDisabled"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+          <el-button class="diy-button--qrcode"
+                 size="small"
+                 :disabled="yihuyimaDisabled"
+                 :loading="exportBtn"
+                 @click="handleExportYihuyima()">导出一户一码</el-button>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -225,7 +250,9 @@ export default {
       fileName: "",
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
       yihuyidangDisabled: false,
-
+      yihuyimaDisabled: false,
+      exportBtn: false,
+      dialogVisible: false // 导出
     }
   },
   components: {
@@ -486,7 +513,11 @@ export default {
         // this.download(res.data, '1.png')
       })
     },
-    //导出表格
+    // 导出按钮点击事件
+    handleExportOpen () {
+      this.dialogVisible = true
+    },
+    //导出表格 以前是导出 现在改成导出房屋数据
     async handleExport () {
       let title = this.agencyObj.label
       title = title + '—小区列表'
@@ -512,6 +543,10 @@ export default {
 
     },
 
+    handleClose(done) {
+      this.dialogVisible = false
+    },
+
     // 下载文件
     download (data, downFileName) {
       if (!data) {
@@ -609,6 +644,41 @@ export default {
     },
 
 
+    // 导出一户一码
+
+    handleExportYihuyima () {
+      this.exportBtn = true
+      this.yihuyimaDisabled = true
+      let title = this.agencyObj.label
+      title = title + '-一户一码'
+      let url = "/gov/org/house/downloadZip"
+
+
+      let params = {
+        level: this.agencyObj.level,
+        id: this.agencyObj.id
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.Zip')
+          this.exportBtn = false
+          this.yihuyimaDisabled = false
+        },
+        (rspMsg, data) => {
+          this.exportBtn = false
+          this.yihuyimaDisabled = false
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+
 
     // 上传文件之前的钩子
     beforeUpload (file, type) {

From e460c1ef1cca55e15f7c70798c66227b0ee07d81 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 7 Jun 2022 09:18:35 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomForm.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 0c1f73415..4f5e75f81 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -40,6 +40,19 @@
           </el-input>
         </el-form-item>
 
+        <el-form-item label="房屋编码"
+                      prop="houseCode"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="30"
+                    v-model="dataForm.houseCode">
+          </el-input>
+        </el-form-item>
+        <div v-if="formType === 'detail'" style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank" download="logo.png">下载</a>
+        </div>
         <el-form-item label="房屋类型"
                       prop="houseType"
                       label-width="150px"
@@ -351,6 +364,9 @@
                 if (loading) {
                     loading.close()
                 }
+            },
+            clickQrcodeUrl (url) {
+                window.URL.revokeObjectURL(url);
             }
         },
         computed: {

From db1e3ea7aac6cd23855b3ac2a10740f57906438b Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 7 Jun 2022 09:36:57 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomForm.vue | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 4f5e75f81..6d0abc1fe 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -40,18 +40,20 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="房屋编码"
-                      prop="houseCode"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="30"
-                    v-model="dataForm.houseCode">
-          </el-input>
-        </el-form-item>
-        <div v-if="formType === 'detail'" style="display: flex;flex-direction: column;">
-            <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
-            <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank" download="logo.png">下载</a>
+        <div v-if="formType === 'detail'">
+            <el-form-item label="房屋编码"
+                        prop="houseCode"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                        maxlength="30"
+                        v-model="dataForm.houseCode">
+            </el-input>
+            </el-form-item>
+            <div style="display: flex;flex-direction: column;">
+                <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
+                <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank">下载</a>
+            </div>
         </div>
         <el-form-item label="房屋类型"
                       prop="houseType"

From 212a1c0eb6deb7c65c5c2d6752559ed1b0db3239 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 7 Jun 2022 17:02:59 +0800
Subject: [PATCH 06/19] 111

---
 .../modules/communityService/fuwujilu/addForm.vue    | 12 ++++++------
 .../shequzhili/event/cpts/process-form-demand.vue    | 11 ++++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 69c6f42b2..8cb7c9c7e 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -122,10 +122,10 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="500"
+                    maxlength="1000"
                     show-word-limit
                     :rows="3"
-                    placeholder="请输入备注，不超过500字"
+                    placeholder="请输入备注，不超过1000字"
                     v-model="formData.remark"></el-input>
         </el-form-item>
         <el-form-item label="直接反馈"
@@ -162,10 +162,10 @@
                         style="display: block">
             <el-input class="item_width_1"
                       type="textarea"
-                      maxlength="500"
+                      maxlength="1000"
                       show-word-limit
                       :rows="3"
-                      placeholder="请输入服务目标，不超过500字"
+                      placeholder="请输入服务目标，不超过1000字"
                       v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
@@ -175,10 +175,10 @@
                         style="display: block">
             <el-input class="item_width_1"
                       type="textarea"
-                      maxlength="500"
+                      maxlength="1000"
                       show-word-limit
                       :rows="3"
-                      placeholder="请输入服务效果，不超过500字"
+                      placeholder="请输入服务效果，不超过1000字"
                       v-model="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 3423c3d89..795668e7e 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -470,9 +470,14 @@ export default {
 
     handleServiceChange (type, val) {
       if (val === "social_org") {
-        if (type === "add") this.getServiceuserList(val, "add_demand");
-        else this.getServiceuserList(val, "query_demand");
-      } else this.getServiceuserList(val, "");
+        if (type === "add") {
+          this.getServiceuserList(val, "add_demand");
+        } else {
+          this.getServiceuserList(val, "query_demand");
+        }
+      } else {
+        this.getServiceuserList(val, "");
+      }
     },
 
     async getServiceuserList (serviceType, query) {

From b1a27989479916b6e07967b12014738facb097e2 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 7 Jun 2022 17:39:05 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E4=B8=80=E6=88=B7?=
 =?UTF-8?q?=E4=B8=80=E7=A0=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityTable.vue | 47 ++++++++++++++++++-
 src/views/modules/base/community/roomForm.vue |  2 +-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 147411a2f..43a90947e 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -2,6 +2,12 @@
   <div>
 
     <div class="div_btn">
+      <el-button v-if="showYhymInfo"
+                      style=""
+                      class="diy-button--reset"
+                      size="small"
+                      :loading="yhymLoading"
+                      @click="handleYhymInfo">补全一户一码信息</el-button>
       <el-button style=""
                  class="diy-button--add"
                  size="small"
@@ -204,7 +210,7 @@
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <!-- <el-button type="primary" @click="dialogVisible = false">确 定</el-button> -->
         </span>
     </el-dialog>
 
@@ -233,6 +239,9 @@ export default {
       tableLoading: true,
 
       showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
+      roleList: [],//角色列表
+      showYhymInfo: false, // 是否显示补全一户一码信息按钮
+      yhymLoading: false,
 
       agencyObj: {},//树所选的组织对象
 
@@ -273,7 +282,13 @@ export default {
 
     async loadTable (fromTree, treeObj) {
       console.log(111, this.staffAgencyId)
-
+      // 是否显示补全一户一码信息按钮
+      this.roleList = localStorage.getItem('roleList')
+      if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) {
+        this.showYhymInfo = true
+      } else {
+        this.showYhymInfo = false
+      }
       this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
@@ -357,6 +372,34 @@ export default {
       })
     },
 
+    // 补全一户一码点击事件
+    async handleYhymInfo () {
+      this.yhymLoading = true
+      const url = "/gov/org/house/createBatchHouseCodeAndUrl"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.yhymLoading = false
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+      } else if (code > 8000) {
+        this.yhymLoading = false
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+      } else {
+        this.yhymLoading = false
+        this.$message.error(msg)
+      }
+    },
+
     handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 6d0abc1fe..9786631f8 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -50,7 +50,7 @@
                         v-model="dataForm.houseCode">
             </el-input>
             </el-form-item>
-            <div style="display: flex;flex-direction: column;">
+            <div v-if="dataForm.houseQrcodeUrl" style="display: flex;flex-direction: column;">
                 <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
                 <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank">下载</a>
             </div>

From d53be79e37861a803946bc8151243e9e64658821 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 7 Jun 2022 18:00:40 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/communityTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 43a90947e..1c50a46c6 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -385,7 +385,7 @@ export default {
         this.yhymLoading = false
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "批量生成成功"
         });
       } else if (code > 8000) {
         this.yhymLoading = false

From 9235a43f4fdb42a7507686eb8bb2408f185103ee Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 8 Jun 2022 11:05:00 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/event/cpts/add.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index 3bc967854..b53caf480 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -312,6 +312,7 @@ export default {
 
       //地图相关
       keyWords: '',
+      isFirst: true,//地图是否首次加载，首次加载不给地址赋值
 
       //图片相关  oss/file/uploadvariedfile
       dialogImageUrl: 'oss/file/uploadvariedfile',
@@ -620,7 +621,7 @@ export default {
         this.handleMoveCenter()
       })
       this.handleMoveCenter()
-      this.convert()
+      // this.convert()
     },
 
     setMarker (lat, lng) {
@@ -699,8 +700,14 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          this.formData.address = result.result.address
-          // 显示搜索到的地址
+
+          if (!this.isFirst) {//再次查询时再赋值
+            this.formData.address = result.result.address
+          }
+
+          if (this.isFirst) {
+            this.isFirst = false
+          }
         });
     },
 

From c16e84f48cc798b8f979f0f28411357362ab9428 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 8 Jun 2022 13:41:53 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwuxiangmu/cpts/edit.vue       | 10 +++++-----
 .../modules/communityService/fuwuzuzhi/cpts/edit.vue | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
index 26cbf4e3a..3331aa6df 100644
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
@@ -29,7 +29,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.serviceCategory || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceCategory || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -47,7 +47,7 @@
             v-model="fmData.serviceName"
           >
           </el-input>
-          <div v-else>{{ fmData.serviceName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -66,7 +66,7 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.serviceContent"
           ></el-input>
-          <div v-else>{{ fmData.serviceContent || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceContent || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -89,7 +89,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.policyLevelName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.policyLevelName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -108,7 +108,7 @@
             placeholder="请输入政策依据，不超过1000字"
             v-model="fmData.policyGround"
           ></el-input>
-          <div v-else>{{ fmData.policyGround || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.policyGround || "--" }}</div>
         </el-form-item>
 
         <el-form-item
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index 687957979..5e1287abc 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -30,7 +30,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.serviceTypeName }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceTypeName }}</div>
         </el-form-item>
 
         <el-form-item
@@ -48,7 +48,7 @@
             v-model="fmData.orgName"
           >
           </el-input>
-          <div v-else>{{ fmData.orgName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.orgName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -67,7 +67,7 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.orgDescribe"
           ></el-input>
-          <div v-else>{{ fmData.orgDescribe || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.orgDescribe || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -84,7 +84,7 @@
             placeholder="请输入负责人姓名"
             v-model="fmData.principalName"
           ></el-input>
-          <div v-else>{{ fmData.principalName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.principalName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -101,7 +101,7 @@
             placeholder="请输入联系方式"
             v-model="fmData.principalMobile"
           ></el-input>
-          <div v-else>{{ fmData.principalMobile || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.principalMobile || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -165,7 +165,7 @@
             placeholder="请输入备注，不超过500字"
             v-model="fmData.remark"
           ></el-input>
-          <div v-else>{{ fmData.remark || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.remark || "--" }}</div>
         </el-form-item>
       </el-form>
     </div>

From ded6d48f9c70bbd2ebbc1f19befcb25268b388c3 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 8 Jun 2022 14:51:48 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duoyuanfuwu/duoyuanDialog.vue             |  9 +++++++-
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
index eef1de189..dfb584ae0 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
@@ -21,6 +21,7 @@
             </template>
             <screen-nodata class="nodata" v-else></screen-nodata>
           </div>
+          <div class="dashed-line"></div>
           <div class="list right-list">
             <template v-if="info.content">
               <!-- <div class="item-title">需求内容</div> -->
@@ -290,6 +291,12 @@ export default {
 .list-wr {
   display: flex;
   padding: 0 20px;
+  .dashed-line {
+    width: 1px;
+    height: 600px;
+    margin: 0 15px;
+    border: 1px dashed #1257c9;
+  }
   .left-list {
     width: 280px !important;
     height: 600px;
@@ -322,7 +329,7 @@ export default {
     }
   }
   .right-list {
-    padding: 0 25px !important;
+    padding: 0 15px !important;
   }
 }
 </style>
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 35de4c922..285956979 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -62,6 +62,8 @@
                         @clickFeature="clickMap"
                         :showIconLayer="true"
                         :showPolygonLayer="true"
+                        :showPolIconLayer="true"
+                        :areaScale="0.1"
                         :clickType="'popup'"
                         :isAddOpenlay="true"></screen-map>
           </div>
@@ -369,8 +371,9 @@ export default {
           if (item.coordinates && item.coordinates.length > 0) {
             if (!this.isRepeatItem(item.name)) {
               let colorIndex = index < polygonColorArray.length ? index : 0
-              item.fillColor = transparent,
-                item.color = polygonColorArray[colorIndex]
+              item.fillColor = 'rgba(0, 229, 237, 0.16)'
+              item.color = '#00E5ED'
+                // item.color = polygonColorArray[colorIndex]
               subPolygonList.push(item)
             }
           }
@@ -456,7 +459,10 @@ export default {
       if (this.isfirstInit) {
         // this.agencyInfo.level = 'agency'
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
-        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
+        const polygonIconArray = [
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+        ]
+        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null)
       } else {
         this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
       }
@@ -464,10 +470,11 @@ export default {
 
     // 点击项目
     async clickMap (feature) {
-      if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
-        await this.loadOrgData(feature.values_.level, feature.values_.id)
-        this.loadMap()
-      }
+      // 点击显示下级区域
+      // if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
+      //   await this.loadOrgData(feature.values_.level, feature.values_.id)
+      //   this.loadMap()
+      // }
       console.log('标注信息', feature.values_.properties)
       if (!feature.values_.properties) {
         return

From 12397745cfc25bbcbcc9be4098bef9e063fd9e53 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 8 Jun 2022 15:38:52 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/detailForm.vue  | 183 +++++++++++++++++-
 .../communityService/fuwujilu/fuwuList.vue    |   1 +
 2 files changed, 174 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 5ed9abe58..e32fcd64b 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -139,6 +139,138 @@
 
       </el-form>
 
+      <div v-show="formData.serviceStatus==='completed'">
+        <h3 class="d-h3">反馈内容</h3>
+
+        <el-form ref="ref_form_feedback"
+                 :inline="true"
+                 :model="feedbackFormData"
+                 class="div_form">
+
+          <el-form-item label="服务目标"
+                        prop="serviceGoal"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{feedbackFormData.serviceGoal}}</span>
+            <!-- <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务目标，不超过1000字"
+                      v-model="feedbackFormData.serviceGoal"></el-input> -->
+          </el-form-item>
+
+          <el-form-item label="服务效果"
+                        prop="serviceEffect"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{feedbackFormData.serviceEffect}}</span>
+            <!-- <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务效果，不超过1000字"
+                      v-model="feedbackFormData.serviceEffect"></el-input> -->
+          </el-form-item>
+
+          <el-form-item label="服务人数"
+                        style="display: block"
+                        prop="servicePeopleNumber"
+                        label-width="150px">
+            <span>{{feedbackFormData.servicePeopleNumber}}</span>
+            <!-- <el-input-number class="item_width_1"
+                             v-model="feedbackFormData.servicePeopleNumber"
+                             :min="0"
+                             :max="9999"
+                             label="服务人数"></el-input-number> -->
+          </el-form-item>
+
+          <el-form-item label="服务状态"
+                        label-width="150px"
+                        style="display: block"
+                        prop="serviceStatus">
+            <span>已完成</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="feedbackFormData.serviceStatus"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in statusArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+          <el-form-item label="满意度"
+                        style="display: block"
+                        label-width="150px"
+                        prop="satisfaction">
+            <span>{{feedbackFormData.satisfactionShow}}</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="feedbackFormData.satisfaction"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in satisfyArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+          <el-form-item label="地址"
+                        prop="address"
+                        label-width="150px"
+                        style="display: block">
+            <span>{{feedbackFormData.address}}</span>
+            <!-- <el-input class="item_width_1"
+                      v-model="feedbackFormData.address"></el-input> -->
+          </el-form-item>
+          <el-form-item label="地图位置"
+                        label-width="150px"
+                        style="display: block">
+            <div style="width:500px">
+
+              <div class="div_map">
+                <div id="map_app">
+
+                </div>
+                <div class="div_searchmap">
+                  <el-input maxlength="50"
+                            size="mini"
+                            placeholder="请输入关键字"
+                            v-model="keyWords">
+                  </el-input>
+                  <el-button style="margin-left: 10px"
+                             type="primary"
+                             size="mini"
+                             @click="handleSearchMap">查询</el-button>
+                </div>
+              </div>
+
+            </div>
+          </el-form-item>
+
+          <el-form-item class="block"
+                        label="附件"
+                        label-width="150px"
+                        prop="attach">
+            <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
+                       class="upload-demo"
+                       :action="uploadUlr"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                       :limit="3"
+                       :file-list="fileList">
+
+            </el-upload>
+            <span v-else>无附件</span>
+          </el-form-item>
+        </el-form>
+      </div>
+
     </div>
 
     <div class="div_btn">
@@ -185,8 +317,6 @@ export default {
     }
 
     return {
-
-
       btnDisable: false,
 
       keyWords: '',
@@ -202,6 +332,20 @@ export default {
         longitude: 36.0722275, //经度
         latitude: 120.38945519 //纬度
       },
+
+      feedbackFormData: {
+        serviceProjectId: '',//	服务项目id	
+        serviceProjectName: '',
+        serviceGoal: '',//	服务目标	
+        serviceEffect: '',//	服务效果	
+        servicePeopleNumber: null,//	服务人数	
+        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
+        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
+        longitude: '',//	经度	
+        latitude: '',//	维度	
+        address: '',
+        attachmentList: [],//	附件列表
+      },
       serviceList: [],//服务list
 
       endPickerOptions: {
@@ -211,17 +355,18 @@ export default {
         disabledDate: startDisabledDate
       },
 
-
       projectList: [],
-
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
     }
   },
   components: {},
   mounted () {
     if (this.serviceRecordId) {//详情
       this.loadInfo()
+
     }
-    // this.initMap()
+    this.initMap()
     console.log('mounted')
   },
 
@@ -240,13 +385,25 @@ export default {
       if (code === 0) {
         this.formData = { ...data }
         this.formData.serviceRecordId = this.serviceRecordId
+        this.feedbackFormData = { ...data.feedBack }
+        this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
+        this.feedbackFormData.satisfactionShow = this.feedbackFormData.satisfaction === 'perfect' ? '非常满意' : this.feedbackFormData.satisfaction === 'good' ? '基本满意' : '不满意'
+        this.fileList = []
+        data.feedBack.attachmentList.forEach(element => {
+          let obj = {
+            name: element.attachmentName,
+            format: element.attachmentFormat,
+            url: element.attachmentUrl,
+          }
+          this.fileList.push(obj)
+        });
+
+
       } else {
         this.$message.error(msg)
       }
     },
 
-
-
     async handleComfirm () {
 
       this.btnDisable = true
@@ -265,6 +422,7 @@ export default {
 
 
     },
+
     async editFuwu () {
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
       if (regPhone.test(this.formData.principalContact) === false) {
@@ -409,7 +567,7 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          this.formData.address = result.result.address
+          // this.formData.address = result.result.address
           // 显示搜索到的地址
         });
     },
@@ -448,7 +606,6 @@ export default {
   computed: {
     dataRule () {
       return {
-
         serviceCategoryKey: [
           { required: true, message: '服务类别不能为空', trigger: 'blur' },
         ],
@@ -485,7 +642,13 @@ export default {
       default () {
         return []
       }
-    }
+    },
+    satisfyArray: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 3ce7a034c..2309bd626 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -253,6 +253,7 @@
                @closed="showDetail = false">
       <detail-form ref="ref_detail_form"
                    :serviceRecordId="serviceRecordId"
+                   :satisfyArray="satisfyArray"
                    :categrayArray="categrayArray"
                    @handleOk="handleOk"
                    @handleClose="handleClose"

From c5d2dfdf10f7b6f617ea1a3013c027b304abb985 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 8 Jun 2022 16:03:37 +0800
Subject: [PATCH 13/19] 11

---
 .../visual/communityGovern/duoyuanDialog.vue  | 335 ++++++++++++++++++
 1 file changed, 335 insertions(+)
 create mode 100644 src/views/modules/visual/communityGovern/duoyuanDialog.vue

diff --git a/src/views/modules/visual/communityGovern/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanDialog.vue
new file mode 100644
index 000000000..dfb584ae0
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/duoyuanDialog.vue
@@ -0,0 +1,335 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>详情</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <!-- <div class="list-title">需求内容</div> -->
+        <div class="list-wr">
+          <div class="list left-list" v-infinite-scroll="getServicelist" style="overflow:auto">
+            <template v-if="servicelist.length > 0">
+            <div class="left-item" :class="activeIndex == index ? 'active-item' : ''" v-for="(item, index) in servicelist" :key="index" @click="toDetail(index)">
+              <div class="item-time">{{item.reportTime || '2022-05-18'}}</div>
+              <div class="item-content">{{item.content || '本周加班本周加班本周加班本周加班本周加班本周加班'}}</div>
+            </div>
+            </template>
+            <screen-nodata class="nodata" v-else></screen-nodata>
+          </div>
+          <div class="dashed-line"></div>
+          <div class="list right-list">
+            <template v-if="info.content">
+              <!-- <div class="item-title">需求内容</div> -->
+              <div class="item">
+                <span class="item-field">所属网格：</span>
+                <span>{{ info.gridName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">需求类型：</span>
+                <span>{{ info.categoryName }}</span>
+              </div>
+              <!-- <div class="item">
+                <span class="item-field">需求状态：</span>
+                <span>{{ info.statusName }}</span>
+              </div> -->
+              <div class="item">
+                <span class="item-field">上报类型：</span>
+                <span>{{ info.reportTypeName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">上报人：</span>
+                <span>{{ info.reportUserName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">上报人联系方式	：</span>
+                <span>{{ info.reportUserMobile }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">上报时间	：</span>
+                <span>{{ info.reportTime }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">需求人	：</span>
+                <span>{{ info.demandUserName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">服务时间	：</span>
+                <span>{{ info.wantServiceTime }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">需求内容：</span>
+                <div>{{ info.content }}</div>
+              </div>
+              <div class="item">
+                <span class="item-field">服务方	：</span>
+                <span>{{ info.serviceShowName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">实际服务时间	：</span>
+                <span>{{ info.serviceStartTime }} 至 {{ info.serviceEndTime }}</span>
+              </div>
+              <!-- <div class="item">
+                <span class="item-field">完成情况	：</span>
+                <span>{{ info.finishDesc }}</span>
+              </div> -->
+              <div class="item">
+                <span class="item-field">评价	：</span>
+                <span>
+                  <el-rate :value="info.score" disabled></el-rate>
+                </span>
+              </div>
+            </template>
+            <screen-nodata class="nodata" v-else></screen-nodata>
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata"
+import cptCard from '@/views/modules/visual/cpts/card'
+import { requestPost } from '@/js/dai/request'
+
+export default {
+  name: 'dialogInfo',
+  props: {
+    userId: {
+      type: String,
+      default: '',
+    },
+    gridName: {
+      type: String,
+      default: '',
+    },
+    orgId: {
+      type: String,
+      default: ''
+    }
+  },
+
+  components: {
+    cptCard,
+    ScreenNodata
+  },
+
+  data() {
+    return {
+      pageNo: 1,
+      pageSize: 10,
+      servicelist: [],
+      info: {
+        // content: '受到供应链等不可抗力的影响，大多数车企的销量都呈现环比下滑的趋势，不过像供应链断供这样的问题只是暂时的，在复工复产后，5、6月份的销量也许就会恢复到正常水平。长远来看新能源的发展还是非常可观的，其市场格局正在逐步稳定，新能源汽车的前景仍然大有可为。',
+        // gridName: '第一网格',
+        // categoryName: '便民服务',
+        // statusName: '待处理',
+        // reportTypeName: '自身上报',
+        // reportUserName: '张三',
+        // reportUserMobile: '13794049999',
+        // reportTime: '2022-05-18 14:47:00',
+        // wantServiceTime: '2022-05-18 14:47:00',
+        // serviceShowName: '李四',
+        // serviceStartTime: '2022-05-18 14:47:00',
+        // serviceEndTime: '2022-05-18 14:47:00',
+        // finishDesc: '已解决',
+        // score: '3.5'
+      },
+      loadType: 'loading',
+      activeIndex: 0
+    }
+  },
+  created () {
+    this.servicelist = []
+  },
+  methods: {
+    // 获取组织需求列表
+    async getServicelist () {
+      if (this.loadType == 'none') {
+        return
+      }
+      const url = '/heart/residemand/service-list'
+      const params = {
+        serverId: this.orgId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        type: 'community_org', // 志愿者：volunteer；社区自组织：community_org；
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        if (this.pageNo == 1) {
+          this.getDemandDetail(data.list[0].demandRecId)
+        }
+        this.pageNo++
+        this.servicelist = this.servicelist.concat(data.list)
+        this.loadType = this.servicelist.length < data.total ? 'loading' : 'none'
+      } else {
+        this.$message.error(msg)
+      }
+    },    
+    // 获取需求详情
+    async getDemandDetail (id) {
+      this.info = {}
+      const url = '/heart/userdemand/demandDetail'
+      const params = {
+        demandRecId: id, // 需求id
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.info = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    toDetail (index) {
+      this.activeIndex = index
+      this.getDemandDetail(this.servicelist[index].demandRecId)
+    },
+    handleClose() {
+      this.$emit("close")
+    },
+  }
+}
+</script>
+
+<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
+<style lang="scss" scoped>
+@mixin scrollBar {
+    &::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 8px;
+        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
+        background: linear-gradient(270deg, #0063fe, #0095ff);
+    }
+    &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
+        border-radius: 8px;
+        background: darken(#0c81fe, 20);
+    }
+}
+.m-pop {
+  .wrap {
+    .list {
+      display: block;
+      width: calc(100% - 280px);
+      max-height: 600px;
+      overflow: auto;
+      @include scrollBar;
+      .item-title {
+        padding: 0;
+        font-size: 22px;
+        font-family: PingFang SC;
+        font-weight: 800;
+        color: #ffffff;
+        margin-bottom: 15px;
+      }
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+        .item-field {
+          // width: 100px;
+          flex-shrink: 0;
+        }
+        .item-content {
+          width: 100%;
+          max-height: 420px;
+          overflow-y: auto;
+          @include scrollBar;
+        }
+        ::v-deep p {
+          margin: 0;
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .item-imgs {
+          width: 100%;
+          display: flex;
+          flex-wrap: wrap;
+          
+          img {
+            display: block;
+            width: 240px;
+            height: 240px;
+            margin-right: 10px;
+          }
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 20px 0 10px 62px;
+      font-size: 20px;
+      cursor: pointer;
+    }
+}
+.list-wr {
+  display: flex;
+  padding: 0 20px;
+  .dashed-line {
+    width: 1px;
+    height: 600px;
+    margin: 0 15px;
+    border: 1px dashed #1257c9;
+  }
+  .left-list {
+    width: 280px !important;
+    height: 600px;
+    overflow: auto;
+    padding: 10px 0 !important;
+    @include scrollBar;
+    .active-item {
+      border: 1px solid #0063FE !important;
+      box-shadow: 0px 0px 10px #0063fe inset;
+    }
+    .left-item {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      box-sizing: border-box;
+      margin-top: 0;
+      margin-bottom: 20px;
+      font-size: 16px;
+      cursor: pointer;
+      color: #ffffff;
+      padding: 5px;
+      border: 1px solid transparent;
+      .item-content {
+        margin-top: 10px;
+        width: 100%;    
+        overflow: hidden;    
+        text-overflow: ellipsis;    
+        white-space: nowrap;
+      }
+    }
+  }
+  .right-list {
+    padding: 0 15px !important;
+  }
+}
+</style>

From fe6003d7b1195653c72f5bb9db1672a9b9464ae9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 8 Jun 2022 16:05:22 +0800
Subject: [PATCH 14/19] 11

---
 .../visual/communityGovern/duoyuanDialog.vue  | 335 ------------------
 1 file changed, 335 deletions(-)
 delete mode 100644 src/views/modules/visual/communityGovern/duoyuanDialog.vue

diff --git a/src/views/modules/visual/communityGovern/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanDialog.vue
deleted file mode 100644
index dfb584ae0..000000000
--- a/src/views/modules/visual/communityGovern/duoyuanDialog.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-<template>
-  <div class="m-pop">
-    <div class="wrap">
-      <cpt-card>
-        <div class="title">
-          <img src="@/assets/img/shuju/title-tip.png" />
-          <span>详情</span>
-        </div>
-
-        <div class="btn-close" @click="handleClose">
-          <img src="@/assets/img/shuju/people/close.png" />
-        </div>
-        <!-- <div class="list-title">需求内容</div> -->
-        <div class="list-wr">
-          <div class="list left-list" v-infinite-scroll="getServicelist" style="overflow:auto">
-            <template v-if="servicelist.length > 0">
-            <div class="left-item" :class="activeIndex == index ? 'active-item' : ''" v-for="(item, index) in servicelist" :key="index" @click="toDetail(index)">
-              <div class="item-time">{{item.reportTime || '2022-05-18'}}</div>
-              <div class="item-content">{{item.content || '本周加班本周加班本周加班本周加班本周加班本周加班'}}</div>
-            </div>
-            </template>
-            <screen-nodata class="nodata" v-else></screen-nodata>
-          </div>
-          <div class="dashed-line"></div>
-          <div class="list right-list">
-            <template v-if="info.content">
-              <!-- <div class="item-title">需求内容</div> -->
-              <div class="item">
-                <span class="item-field">所属网格：</span>
-                <span>{{ info.gridName }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">需求类型：</span>
-                <span>{{ info.categoryName }}</span>
-              </div>
-              <!-- <div class="item">
-                <span class="item-field">需求状态：</span>
-                <span>{{ info.statusName }}</span>
-              </div> -->
-              <div class="item">
-                <span class="item-field">上报类型：</span>
-                <span>{{ info.reportTypeName }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">上报人：</span>
-                <span>{{ info.reportUserName }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">上报人联系方式	：</span>
-                <span>{{ info.reportUserMobile }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">上报时间	：</span>
-                <span>{{ info.reportTime }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">需求人	：</span>
-                <span>{{ info.demandUserName }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">服务时间	：</span>
-                <span>{{ info.wantServiceTime }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">需求内容：</span>
-                <div>{{ info.content }}</div>
-              </div>
-              <div class="item">
-                <span class="item-field">服务方	：</span>
-                <span>{{ info.serviceShowName }}</span>
-              </div>
-              <div class="item">
-                <span class="item-field">实际服务时间	：</span>
-                <span>{{ info.serviceStartTime }} 至 {{ info.serviceEndTime }}</span>
-              </div>
-              <!-- <div class="item">
-                <span class="item-field">完成情况	：</span>
-                <span>{{ info.finishDesc }}</span>
-              </div> -->
-              <div class="item">
-                <span class="item-field">评价	：</span>
-                <span>
-                  <el-rate :value="info.score" disabled></el-rate>
-                </span>
-              </div>
-            </template>
-            <screen-nodata class="nodata" v-else></screen-nodata>
-          </div>
-        </div>
-      </cpt-card>
-    </div>
-  </div>
-</template>
-
-<script>
-import ScreenNodata from "@/views/modules/visual/components/screen-nodata"
-import cptCard from '@/views/modules/visual/cpts/card'
-import { requestPost } from '@/js/dai/request'
-
-export default {
-  name: 'dialogInfo',
-  props: {
-    userId: {
-      type: String,
-      default: '',
-    },
-    gridName: {
-      type: String,
-      default: '',
-    },
-    orgId: {
-      type: String,
-      default: ''
-    }
-  },
-
-  components: {
-    cptCard,
-    ScreenNodata
-  },
-
-  data() {
-    return {
-      pageNo: 1,
-      pageSize: 10,
-      servicelist: [],
-      info: {
-        // content: '受到供应链等不可抗力的影响，大多数车企的销量都呈现环比下滑的趋势，不过像供应链断供这样的问题只是暂时的，在复工复产后，5、6月份的销量也许就会恢复到正常水平。长远来看新能源的发展还是非常可观的，其市场格局正在逐步稳定，新能源汽车的前景仍然大有可为。',
-        // gridName: '第一网格',
-        // categoryName: '便民服务',
-        // statusName: '待处理',
-        // reportTypeName: '自身上报',
-        // reportUserName: '张三',
-        // reportUserMobile: '13794049999',
-        // reportTime: '2022-05-18 14:47:00',
-        // wantServiceTime: '2022-05-18 14:47:00',
-        // serviceShowName: '李四',
-        // serviceStartTime: '2022-05-18 14:47:00',
-        // serviceEndTime: '2022-05-18 14:47:00',
-        // finishDesc: '已解决',
-        // score: '3.5'
-      },
-      loadType: 'loading',
-      activeIndex: 0
-    }
-  },
-  created () {
-    this.servicelist = []
-  },
-  methods: {
-    // 获取组织需求列表
-    async getServicelist () {
-      if (this.loadType == 'none') {
-        return
-      }
-      const url = '/heart/residemand/service-list'
-      const params = {
-        serverId: this.orgId,
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        type: 'community_org', // 志愿者：volunteer；社区自组织：community_org；
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        if (this.pageNo == 1) {
-          this.getDemandDetail(data.list[0].demandRecId)
-        }
-        this.pageNo++
-        this.servicelist = this.servicelist.concat(data.list)
-        this.loadType = this.servicelist.length < data.total ? 'loading' : 'none'
-      } else {
-        this.$message.error(msg)
-      }
-    },    
-    // 获取需求详情
-    async getDemandDetail (id) {
-      this.info = {}
-      const url = '/heart/userdemand/demandDetail'
-      const params = {
-        demandRecId: id, // 需求id
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.info = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    toDetail (index) {
-      this.activeIndex = index
-      this.getDemandDetail(this.servicelist[index].demandRecId)
-    },
-    handleClose() {
-      this.$emit("close")
-    },
-  }
-}
-</script>
-
-<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
-<style lang="scss" scoped>
-@mixin scrollBar {
-    &::-webkit-scrollbar {
-        /*滚动条整体样式*/
-        width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
-        height: 1px;
-    }
-    &::-webkit-scrollbar-thumb {
-        /*滚动条里面小方块*/
-        border-radius: 8px;
-        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
-        background: linear-gradient(270deg, #0063fe, #0095ff);
-    }
-    &::-webkit-scrollbar-track {
-        /*滚动条里面轨道*/
-        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
-        border-radius: 8px;
-        background: darken(#0c81fe, 20);
-    }
-}
-.m-pop {
-  .wrap {
-    .list {
-      display: block;
-      width: calc(100% - 280px);
-      max-height: 600px;
-      overflow: auto;
-      @include scrollBar;
-      .item-title {
-        padding: 0;
-        font-size: 22px;
-        font-family: PingFang SC;
-        font-weight: 800;
-        color: #ffffff;
-        margin-bottom: 15px;
-      }
-      .item {
-        display: flex;
-        width: 100%;
-        box-sizing: border-box;
-        margin-top: 0;
-        margin-bottom: 15px;
-        font-size: 16px;
-        cursor: pointer;
-        .item-field {
-          // width: 100px;
-          flex-shrink: 0;
-        }
-        .item-content {
-          width: 100%;
-          max-height: 420px;
-          overflow-y: auto;
-          @include scrollBar;
-        }
-        ::v-deep p {
-          margin: 0;
-          img {
-            width: 100%;
-            height: 100%;
-          }
-        }
-
-        .item-imgs {
-          width: 100%;
-          display: flex;
-          flex-wrap: wrap;
-          
-          img {
-            display: block;
-            width: 240px;
-            height: 240px;
-            margin-right: 10px;
-          }
-        }
-      }
-      .item-desc {
-        font-size: 16px;
-        margin-bottom: 10px;
-        line-height: 24px;
-      }
-    }
-  }
-  .list-title {
-      width: 100%;
-      box-sizing: border-box;
-      padding: 20px 0 10px 62px;
-      font-size: 20px;
-      cursor: pointer;
-    }
-}
-.list-wr {
-  display: flex;
-  padding: 0 20px;
-  .dashed-line {
-    width: 1px;
-    height: 600px;
-    margin: 0 15px;
-    border: 1px dashed #1257c9;
-  }
-  .left-list {
-    width: 280px !important;
-    height: 600px;
-    overflow: auto;
-    padding: 10px 0 !important;
-    @include scrollBar;
-    .active-item {
-      border: 1px solid #0063FE !important;
-      box-shadow: 0px 0px 10px #0063fe inset;
-    }
-    .left-item {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-      box-sizing: border-box;
-      margin-top: 0;
-      margin-bottom: 20px;
-      font-size: 16px;
-      cursor: pointer;
-      color: #ffffff;
-      padding: 5px;
-      border: 1px solid transparent;
-      .item-content {
-        margin-top: 10px;
-        width: 100%;    
-        overflow: hidden;    
-        text-overflow: ellipsis;    
-        white-space: nowrap;
-      }
-    }
-  }
-  .right-list {
-    padding: 0 15px !important;
-  }
-}
-</style>

From 0a814607ea1677d8f6e7ff805313865cd13e3ee8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 9 Jun 2022 09:13:30 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/detailForm.vue  | 104 ++++++++++++------
 1 file changed, 69 insertions(+), 35 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index e32fcd64b..6125199cc 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -144,6 +144,7 @@
 
         <el-form ref="ref_form_feedback"
                  :inline="true"
+                 :disabled="true"
                  :model="feedbackFormData"
                  class="div_form">
 
@@ -151,45 +152,41 @@
                         prop="serviceGoal"
                         label-width="150px"
                         style="display: block">
-            <span>{{feedbackFormData.serviceGoal}}</span>
-            <!-- <el-input class="item_width_1"
+            <el-input class="item_width_1"
                       type="textarea"
                       maxlength="1000"
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input> -->
+                      v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果"
                         prop="serviceEffect"
                         label-width="150px"
                         style="display: block">
-            <span>{{feedbackFormData.serviceEffect}}</span>
-            <!-- <el-input class="item_width_1"
+            <el-input class="item_width_1"
                       type="textarea"
                       maxlength="1000"
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input> -->
+                      v-model="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数"
                         style="display: block"
                         prop="servicePeopleNumber"
                         label-width="150px">
-            <span>{{feedbackFormData.servicePeopleNumber}}</span>
-            <!-- <el-input-number class="item_width_1"
+            <el-input-number class="item_width_1"
                              v-model="feedbackFormData.servicePeopleNumber"
                              :min="0"
                              :max="9999"
-                             label="服务人数"></el-input-number> -->
+                             label="服务人数"></el-input-number>
           </el-form-item>
 
           <el-form-item label="服务状态"
                         label-width="150px"
-                        style="display: block"
                         prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
@@ -205,11 +202,9 @@
 
           </el-form-item>
           <el-form-item label="满意度"
-                        style="display: block"
                         label-width="150px"
                         prop="satisfaction">
-            <span>{{feedbackFormData.satisfactionShow}}</span>
-            <!-- <el-select class="item_width_1"
+            <el-select class="item_width_1"
                        v-model="feedbackFormData.satisfaction"
                        placeholder="全部"
                        clearable>
@@ -218,18 +213,17 @@
                          :label="item.label"
                          :value="item.value">
               </el-option>
-            </el-select> -->
+            </el-select>
 
           </el-form-item>
           <el-form-item label="地址"
                         prop="address"
                         label-width="150px"
                         style="display: block">
-            <span>{{feedbackFormData.address}}</span>
-            <!-- <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input> -->
+            <el-input class="item_width_1"
+                      v-model="feedbackFormData.address"></el-input>
           </el-form-item>
-          <el-form-item label="地图位置"
+          <!-- <el-form-item label="地图位置"
                         label-width="150px"
                         style="display: block">
             <div style="width:500px">
@@ -252,20 +246,30 @@
               </div>
 
             </div>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item class="block"
                         label="附件"
                         label-width="150px"
                         prop="attach">
-            <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
+            <!-- <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
                        class="upload-demo"
-                       :action="uploadUlr"
+                       :on-preview="handleFileDownload"
                        accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
                        :limit="3"
                        :file-list="fileList">
 
-            </el-upload>
+            </el-upload> -->
+            <div v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
+                 class="attachement-list">
+              <a :href="att.attachmentUrl"
+                 target="_blank"
+                 :key="att.attachmentUrl"
+                 v-for="att in feedbackFormData.attachmentList">
+                <i class="el-icon-folder-opened"></i>
+                {{ att.attachmentName }}
+              </a>
+            </div>
             <span v-else>无附件</span>
           </el-form-item>
         </el-form>
@@ -317,6 +321,8 @@ export default {
     }
 
     return {
+
+
       btnDisable: false,
 
       keyWords: '',
@@ -366,8 +372,8 @@ export default {
       this.loadInfo()
 
     }
-    this.initMap()
-    console.log('mounted')
+    // this.initMap()
+
   },
 
 
@@ -387,16 +393,17 @@ export default {
         this.formData.serviceRecordId = this.serviceRecordId
         this.feedbackFormData = { ...data.feedBack }
         this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
-        this.feedbackFormData.satisfactionShow = this.feedbackFormData.satisfaction === 'perfect' ? '非常满意' : this.feedbackFormData.satisfaction === 'good' ? '基本满意' : '不满意'
         this.fileList = []
-        data.feedBack.attachmentList.forEach(element => {
-          let obj = {
-            name: element.attachmentName,
-            format: element.attachmentFormat,
-            url: element.attachmentUrl,
-          }
-          this.fileList.push(obj)
-        });
+        if (data.feedBack.attachmentList && data.feedBack.attachmentList.length > 0) {
+          data.feedBack.attachmentList.forEach(element => {
+            let obj = {
+              name: element.attachmentName,
+              format: element.attachmentFormat,
+              url: element.attachmentUrl,
+            }
+            this.fileList.push(obj)
+          });
+        }
 
 
       } else {
@@ -422,7 +429,6 @@ export default {
 
 
     },
-
     async editFuwu () {
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
       if (regPhone.test(this.formData.principalContact) === false) {
@@ -461,6 +467,19 @@ export default {
 
     },
 
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.name;
+      console.log(a)
+      a.href = file.url;
+      a.dispatchEvent(event);
+
+
+    },
+
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
@@ -567,7 +586,7 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          // this.formData.address = result.result.address
+          this.formData.address = result.result.address
           // 显示搜索到的地址
         });
     },
@@ -606,6 +625,7 @@ export default {
   computed: {
     dataRule () {
       return {
+
         serviceCategoryKey: [
           { required: true, message: '服务类别不能为空', trigger: 'blur' },
         ],
@@ -656,4 +676,18 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/form-main.scss";
+
+.attachement-list {
+  // padding-left: 20px;
+  a {
+    display: block;
+    cursor: pointer;
+    // color: #4df0ff;
+    font-size: 14px;
+
+    i {
+      color: #333;
+    }
+  }
+}
 </style>

From 37efca5bcf9134b525a575854ca06b98595692db Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 9 Jun 2022 09:23:45 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 285956979..53e007da4 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -62,8 +62,6 @@
                         @clickFeature="clickMap"
                         :showIconLayer="true"
                         :showPolygonLayer="true"
-                        :showPolIconLayer="true"
-                        :areaScale="0.1"
                         :clickType="'popup'"
                         :isAddOpenlay="true"></screen-map>
           </div>
@@ -371,7 +369,8 @@ export default {
           if (item.coordinates && item.coordinates.length > 0) {
             if (!this.isRepeatItem(item.name)) {
               let colorIndex = index < polygonColorArray.length ? index : 0
-              item.fillColor = 'rgba(0, 229, 237, 0.16)'
+              // item.fillColor = 'rgba(0, 229, 237, 0.16)'
+              item.fillColor = transparent
               item.color = '#00E5ED'
                 // item.color = polygonColorArray[colorIndex]
               subPolygonList.push(item)

From ed9982d3a25a3c0a61633fa303cd0a170946f1da Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 9 Jun 2022 09:41:20 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E7=BB=84=E7=BB=87=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomTable.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index c2fef85e4..7fd7efe6e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -213,6 +213,7 @@ export default {
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
+      agencyLevel: '',//树对应的level， grid neighborHood building agency
 
 
       validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
@@ -339,6 +340,20 @@ export default {
 
       }
 
+      if (this.agencyObj.level === 'grid') {
+        this.agencyLevel = 'grid'
+
+      } else if (this.agencyObj.level === 'neighborHood') {
+        this.agencyLevel = 'neighborHood'
+
+      } else if (this.agencyObj.level === 'building') {
+        this.agencyLevel = 'building'
+
+      } else {
+        this.agencyLevel = 'agency'
+
+      }
+
       // if (fromTree) {
       //   this.agencyObj = treeObj
 
@@ -346,7 +361,7 @@ export default {
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        level: this.agencyObj.level,
+        level: this.agencyLevel,
         id: this.agencyObj.id,
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,

From 5920495e620cee4641ca805d235e42fe84984580 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 9 Jun 2022 10:56:24 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=8B=96=E5=8A=A8?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=9C=B0=E5=9D=80=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index 5e1287abc..10929b974 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -348,7 +348,7 @@ export default {
       geocoder
         .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          // this.fmData.address = result.result.address;
+          this.fmData.address = result.result.address;
         });
     },
 

From 46aea778070a0c774a97d2cd5bef205d192102b2 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 9 Jun 2022 17:15:00 +0800
Subject: [PATCH 19/19] partyOld

---
 .../visual/communityParty/partyOld.vue        | 1090 +++++++++++++++++
 1 file changed, 1090 insertions(+)
 create mode 100644 src/views/modules/visual/communityParty/partyOld.vue

diff --git a/src/views/modules/visual/communityParty/partyOld.vue b/src/views/modules/visual/communityParty/partyOld.vue
new file mode 100644
index 000000000..be0c958c1
--- /dev/null
+++ b/src/views/modules/visual/communityParty/partyOld.vue
@@ -0,0 +1,1090 @@
+<template>
+  <div class="warning-box">
+    <cpt-card>
+      <div class="card-title">
+        <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
+        <div class="title-label">
+          党员信息统计&nbsp;&nbsp;
+          <el-cascader 
+            v-model="selectAgency"
+            :options="propTree" 
+            :props="{ checkStrictly: true }" 
+            :show-all-levels="false"
+            :getCheckedNodes="getCheckedNodes"
+            clearable @change="handleCascader">
+          </el-cascader>
+        </div> 
+      </div>
+      <div class="card-echart">
+        <div class="card-left">
+          <div class="card-left-title">党员年龄统计</div>
+          <div class="card-flex">
+            <div class="echart-wr">
+              <!-- <div class="echart-cicle"></div>  -->
+              <screen-echarts-frame class="echart-org"
+                              @myChartMethod="pieInitOk"
+                              ref="ageChart"></screen-echarts-frame>
+              <!-- <div id="echartOrg" class="echart-org"></div> -->
+            </div>
+            <div class="echarts-tips echarts-tips-wd50">
+              <div class="tips-lists">
+                <div v-for="(item, index) in ageItem" :key="index" class="tips-items">
+                  <div class="tips-items-title" :class="'tips-items-title' + item.code">
+                    {{ item.name }}
+                  </div>
+                  <div class="tips-items-num">
+                    <div class="tips-item-count">{{item.value}}</div>
+                    <div class="tips-item-has">{{ item.radio }}</div>
+                  </div>
+                </div>
+                
+              </div>
+            </div>
+            
+          </div>
+          <div class="ecahrts-button">
+            <el-button type="warning" size="small" @click="handleExport('age')">导出</el-button>
+          </div>
+          <div class="warning-box-bottom">
+            <screen-table
+              :headerList="headerList"
+              :tableData="ageList"
+              :headerStyle="headerStyle"
+              :tableContentStyle="headerStyle"
+              :visibleLoading="visibleAgeLoading"
+              :operate="false"
+              @row="handleClickRow"
+            ></screen-table>
+            <div class="pagination">
+              <el-pagination
+                :current-page="agePageNo"
+                :page-size="agePageSize"
+                background
+                layout="prev, pager, next"
+                @size-change="pageSizeChangeHandleAge"
+                @current-change="pageCurrentChangeHandleAge"
+                :total="ageTotal"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+        <div class="card-left">
+          <div class="card-left-title">党员学历统计</div>
+          <div class="card-flex">
+            <div class="echart-wr echart-wr100">
+              <!-- <div class="echart-cicle echart-cicle0"></div> -->
+              <!-- <div id="echartType" class="echart-org"></div> -->
+              <screen-echarts-frame class="echart-org"
+                              @myChartMethod="pieInitOks"
+                              ref="eduChart"></screen-echarts-frame>
+            </div>
+            <div v-if="false" class="echarts-tips">
+              <div class="tips-list">
+                <div v-for="item in eduItem" :key="item.value" class="tips-item">
+                  <div class="tips-item-icon" :style="'background:' + item.color"></div>
+                  <div class="tips-item-text">{{item.name}}</div>
+                </div>
+                
+              </div>
+            </div>
+          </div>
+          <div class="ecahrts-button">
+            <el-button type="warning" size="small" @click="handleExport('edu')">导出</el-button>
+          </div>
+          <div class="warning-box-bottom">
+            <screen-table
+              :headerList="headerEduList"
+              :tableData="eduList"
+              :headerStyle="headerStyle"
+              :tableContentStyle="headerStyle"
+              :visibleLoading="visibleLoading"
+              :operate="false"
+              @row="handleClickRow"
+            ></screen-table>
+            <div class="pagination">
+              <el-pagination
+                :current-page="pageNo"
+                :page-size="pageSize"
+                background
+                layout="prev, pager, next"
+                @size-change="pageSizeChangeHandleNew"
+                @current-change="pageCurrentChangeHandleNew"
+                :total="total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      
+    </cpt-card>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import screenTable from "../components/screen-table/index";
+import cptCard from "@/views/modules/visual/cpts/card";
+import nextTick from "dai-js/tools/nextTick";
+import screenEchartsFrame from "../components/screen-echarts-frame";
+import { pieOption } from './options'
+
+import * as echarts from 'echarts';
+export default {
+  name: "warning-box",
+  components: {
+    cptCard,
+    screenTable,
+    screenEchartsFrame
+  },
+  data() {
+    return {
+      headerList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "姓名", coulmn: 'name' },
+        { title: "年龄", coulmn: 'age' },
+        { title: "手机号码", coulmn: 'mobile' }
+      ],
+      headerStyle: [
+        {
+          'max-width': '60px'
+        },
+        {
+          'min-width': '100px'
+        },
+        {
+          'min-width': '100px'
+        },
+        {
+          'min-width': '160px'
+        }
+      ],
+      headerEduList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "姓名", coulmn: 'name' },
+        { title: "学历", coulmn: 'education' },
+        { title: "手机号码", coulmn: 'mobile' }
+      ],
+      tableData: [
+        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+      ],
+      noInit: false,
+      noEduInit: false,
+      selectAgency: null,
+      ageTotalCount: 0,
+      eduTotalCount: 0,
+      propTree: [],
+      value2: '',
+      visibleAgeLoading: true,
+      visibleLoading: true,
+      agencyId: '',
+      orgType: '',
+      ageCode: '',
+      eduCode: '',
+      pageNo: 1,
+      pageSize: 10,
+      agePageNo: 1,
+      agePageSize: 10,
+      total: 0,
+      ageTotal: 0,
+      eduItem: [
+        {
+          name: '小学',
+          value: 0,
+          color: 'rgba(27, 81, 255, 1)'
+        }, {
+          name: '初中',
+          value: 1,
+          color: 'rgba(0, 229, 237, 1)'
+        }, {
+          name: '高中',
+          value: 2,
+          color: 'rgba(120, 0, 255, 1)'
+        }, {
+          name: '中专',
+          value: 3,
+          color: 'rgba(255, 120, 0, 1)'
+        }, {
+          name: '大专',
+          value: 4,
+          color: 'rgba(255, 186, 0, 1)'
+        }, {
+          name: '本科',
+          value: 5,
+          color: 'rgba(22, 215, 131, 1)'
+        }, {
+          name: '硕士',
+          value: 6,
+          color: 'rgba(42, 0, 255, 1)'
+        }, {
+          name: '博士',
+          value: 7,
+          color: 'rgba(198, 0, 255, 1)'
+        }, {
+          name: '其他',
+          value: 8,
+          color: 'rgba(255, 42, 0, 1)'
+        }
+      ],
+      ageItem: [
+        {
+          name: '50岁以下',
+          value: 1,
+          color: 'rgba(27, 81, 255, 1)'
+        }, {
+          name: '50-59岁',
+          value: 2,
+          color: 'rgba(0, 229, 237, 1)'
+        }, {
+          name: '60-69岁',
+          value: 3,
+          color: 'rgba(120, 0, 255, 1)'
+        }, {
+          name: '70-79岁',
+          value: 4,
+          color: 'rgba(255, 120, 0, 1)'
+        }, {
+          name: '80岁以上',
+          value: 5,
+          color: 'rgba(255, 186, 0, 1)'
+        }
+      ],
+      ageList: [],
+      eduList: [],
+      pieAgeChartS: null,
+      pieEduChartSs: null,
+      pieAgeOptions: null,
+      pieEduOptions: null
+    };
+  },
+  async mounted() {
+    await nextTick(100);
+    await this.getAgencyList()
+    this.getAgeCount(this.$store.state.user.agencyId, 'agency')
+    this.getEduCount(this.$store.state.user.agencyId, 'agency')
+    // this.initAgeCharts()
+    // this.initEduCharts()
+    this.getAgeList(this.$store.state.user.agencyId, 'agency')
+    this.getEduList(this.$store.state.user.agencyId, 'agency')
+    // this.initChartType()
+  },
+  methods: {
+    pieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.pieAgeChartS = dom
+      // this.pieInitState = true
+
+    },
+    pieInitOks (dom) {
+      console.log('pies准备好了', dom)
+      this.pieEduChartS = dom
+      // this.pieInitState = true
+
+    },
+    initAgeCharts() {
+      // const eId = document.getElementById('echartOrg')
+      // let _charts = echarts.init(eId)
+      let option = {
+      
+      }
+      this.pieAgeOptions = pieOption(this.pieAgeChartS)
+      this.clickAgePie(0)
+      let fun = params => {
+        this.clickAgePie(params.dataIndex)
+      }
+      this.$refs.ageChart.handleClick(fun)
+      // option && this.$refs.pieChart.setOption(option);
+
+    },
+    initEduCharts() {
+      // const eId = document.getElementById('echartOrg')
+      // let _charts = echarts.init(eId)
+      let option = {
+      
+      }
+      let legend = {
+        show: true,
+        orient: 'vertical',
+        top: '20%',
+        right: 0,
+        textStyle: {
+          width: 90,
+          color: '#fff',
+          rich: {
+            a: {
+              width: 90
+            }
+          }
+        },
+        formatter: name => {
+          for (let a = 0; a < this.eduItem.length; a++) {
+            // this.data  这个数据中有名称和次数
+            if (this.eduItem[a].name === name) {
+              //两个名称进行对比，取出对应的次数
+              let params1 = name + "\n"; //然后return你需要的legend格式即可
+              console.log(params1);
+              let tmp = params1.split("\n");
+              let res = "" + params1;
+              for (let i in tmp) {
+                res = res.replace(tmp[i], "");
+              }
+              return res + params1;
+            }
+          }
+        }
+      }
+      this.pieEduOptions = pieOption(this.pieEduChartS)
+      this.pieEduOptions.legend = { ...legend }
+      // this.pieEduOptions.series[1].width = 400
+      this.clickEduPie(0)
+      let fun = params => {
+        this.clickEduPie(params.dataIndex)
+      }
+      this.$refs.eduChart.handleClick(fun)
+      // this.noInit = true
+      // option && this.$refs.pieChart.setOption(option);
+
+    },
+    initChartType() {
+      const eId = document.getElementById('echartType')
+      let _charts = echarts.init(eId)
+      
+      let option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          show: true,
+          orient: 'vertical',
+          top: '20%',
+          right: 0,
+          textStyle: {
+            width: 90,
+            color: '#fff',
+            rich: {
+              a: {
+                width: 90
+              }
+            }
+          },
+          formatter: name => {
+            for (let a = 0; a < this.eduItem.length; a++) {
+              // this.data  这个数据中有名称和次数
+              if (this.eduItem[a].name === name) {
+                //两个名称进行对比，取出对应的次数
+                let params1 = name + "\n"; //然后return你需要的legend格式即可
+                console.log(params1);
+                let tmp = params1.split("\n");
+                let res = "" + params1;
+                for (let i in tmp) {
+                  res = res.replace(tmp[i], "");
+                }
+                return res + params1;
+              }
+            }
+          }
+        },
+        title: {
+          text: '12000',  //图形标题，配置在中间对应效果图的80%
+          subtext: '总数',
+          left: 196,
+          top: "center",
+          textAlign: 'center',
+          textStyle: {
+            color: "#fff",
+            fontSize: 28,
+            align: "center"
+          },
+          subtextStyle: {
+            fontSize: 16,
+            color: '#fff',
+            align: 'center'
+          }
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: 'pie',
+            // center: ['50%', '50%'],
+            radius: ['40%', '60%'],
+            avoidLabelOverlap: true,
+            // top: top + '%',
+            // height: '80%',
+            // left: 0,
+            width: 400,
+            label: {
+              position: 'outside',
+              alignTo: 'edge',
+              formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+              minMargin: 5,
+              edgeDistance: 20,
+              lineHeight: 15,
+              color: '#fff',
+              fontSize: 15,
+              rich: {
+                name: {
+                  padding: [0, 6, 0, 6]
+                },
+                a: {
+                  fontSize: 15,
+                  color: '#fff',
+                  padding: [0, 6, 0, 6]
+                },
+                r: {
+                  backgroundColor: 'auto',
+                  borderRadius: 6,
+                  width: 6,
+                  height: 6,
+                  // padding: [3, 3, 0, -12]
+                }
+              }
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '14',
+                fontWeight: 'bold'
+              }
+            },
+            labelLine: {
+              show: true,
+              length: 20,
+              length2: 0,
+              maxSurfaceAngle: 80
+            },
+            labelLayout: function (params) {
+              const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+              const points = params.labelLinePoints;
+              // Update the end point.
+              points[2][0] = isLeft
+                ? params.labelRect.x
+                : params.labelRect.x + params.labelRect.width;
+              return {
+                labelLinePoints: points
+              };
+            },
+            data: this.eduItem
+          }
+        ]
+      }
+      option && _charts.setOption(option);
+
+    },
+    clickAgePie (seriesIndex) {
+      let _code = ''
+      let isClick = false
+      console.log('seriesIndex---', seriesIndex)
+      this.ageItem.forEach((element, index) => {
+        if (index === seriesIndex) {
+          _code = element.code
+          
+          if (!this.noInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zlcm', element)
+        } else {
+          element.isClick = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.ageCode = isClick && _code || ''
+      this.pieAgeOptions.title.text = this.ageTotalCount
+      this.pieAgeOptions.series[1].data = this.ageItem
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.ageChart.setOption(this.pieAgeOptions)
+      if (this.noInit) {
+        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+         console.log('zlcm---isClick', isClick)
+         this.agePageNo = 1
+        this.getAgeList(_arr[0], orgType, isClick && _code || '')
+      }
+      this.noInit = true
+
+    },
+    clickEduPie (seriesIndex) {
+      let _code = ''
+      let isClick = false
+      this.eduItem.forEach((element, index) => {
+        if (index === seriesIndex) {
+          _code = element.code
+
+          if (!this.noEduInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zlcm')
+        } else {
+          element.isClick = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.eduCode = isClick && _code || ''
+      this.pieEduOptions.title.text = this.eduTotalCount
+      this.pieEduOptions.series[1].data = this.eduItem
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.eduChart.setOption(this.pieEduOptions)
+      if (this.noEduInit) {
+        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.pageNo = 1
+        this.getEduList(_arr[0], orgType, isClick && _code || '')
+      }
+      this.noEduInit = true
+      
+
+    },
+    async getAgeCount(orgId, orgType) {
+      const url = "/epmetuser/icresiuser/partymemberagestatistics";
+      let params = {
+        orgId,
+        orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        const colorList = [
+          {
+            name: '50岁以下',
+            value: 1,
+            color: '#FAC126'
+          }, {
+            name: '50-59岁',
+            value: 2,
+            color: '#3DDA83'
+          }, {
+            name: '60-69岁',
+            value: 3,
+            color: '#A800FF'
+          }, {
+            name: '70-79岁',
+            value: 4,
+            color: '#2865FA'
+          }, {
+            name: '80岁以上',
+            value: 5,
+            color: '#00DAD2'
+          }
+        ]
+        this.ageItem = data.map((item, index) => {
+          return {
+            ...item,
+            name: item.label,
+            isClick: false,
+            itemStyle: {
+              color: colorList[index].color
+            }
+          }
+        })
+        this.ageTotalCount = 0
+        data.forEach(item => {
+          this.ageTotalCount += Number(item.value)
+        })
+        this.initAgeCharts()
+      } else {
+      }
+    },
+    async getEduCount(orgId, orgType) {
+      const url = "/epmetuser/icresiuser/partymembereducationstatistics";
+      let params = {
+        orgId,
+        orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.eduItem = data.map(item => {
+          return {
+            ...item,
+            name: item.label,
+            isClick: false
+          }
+        })
+        this.eduTotalCount = 0
+        data.forEach(item => {
+          this.eduTotalCount += Number(item.value)
+        })
+        this.initEduCharts()
+      } else {
+      }
+    },
+    async getAgeList(orgId, orgType, _code) {
+      
+      this.visibleAgeLoading = true
+      const url = "/epmetuser/icresiuser/partymemberagelist";
+      let params = {
+        orgId,
+        orgType,
+        code: _code || '',
+        pageNo: this.agePageNo,
+        pageSize: this.agePageSize
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.ageList = data.list.map((item, index) => {
+          return {
+            ...item,
+            index: index + 1
+          }
+        })
+        this.ageTotal = data.total
+      } else {
+        this.$message.error(msg)
+      }
+      // if (_code == 0 || _code) this.noInit = true
+      this.visibleAgeLoading = false
+    },
+    async getEduList(orgId, orgType, _code) {
+      this.visibleLoading = true
+      const url = "/epmetuser/icresiuser/partymembereducationlist";
+      let params = {
+        orgId,
+        orgType,
+        code: _code || '',
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.eduList = data.list.map((item, index) => {
+          return {
+            ...item,
+            index: index + 1
+          }
+        })
+        this.total = data.total
+      } else {
+        this.$message.error(msg)
+      }
+      this.visibleLoading = false
+    },
+    async getAgencyList(node, resolve) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      const url = '/gov/org/customeragency/agencygridtree'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        this.selectAgency = [`${data.agencyId}-${data.level}`]
+        this.orgType = data.level
+        this.agencyId = data.agencyId
+        let arr = []
+        arr.push(data)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+      }
+    },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = { 
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined 
+            }
+          } else _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)}
+        } else {
+          _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
+    handleClickRow(val) {
+      console.log('click-row----', val)
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${val.userId}`,
+      });
+    },
+    handleCascader(val) {
+      console.log('val-vvv', val)
+      const _arr = val[val.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      this.agencyId = _arr[0]
+      this.orgType = orgType
+      this.noInit = false
+      this.noEduInit = false
+      this.getAgeCount(_arr[0], orgType)
+      this.getEduCount(_arr[0], orgType)
+      this.getAgeList(_arr[0], orgType)
+      this.getEduList(_arr[0], orgType)
+    },
+    getCheckedNodes(val) {
+      console.log('val-nnn', val)
+    },
+    lazyLoad(node, resolve) {
+      setTimeout(() => {
+        this.getAgeList(node, resolve)
+      }, 500)
+    },
+    pageSizeChangeHandleAge(val) {
+      this.agePageNo = 1
+      this.agePageSize = val
+      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
+    },
+    pageCurrentChangeHandleAge (val) {
+      this.agePageNo = val
+      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
+    },
+    pageSizeChangeHandleNew(val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+      this.getEduList(this.agencyId, this.orgType, this.eduCode)
+    },
+    pageCurrentChangeHandleNew(val) {
+      this.pageNo = val;
+      this.getEduList(this.agencyId, this.orgType, this.eduCode)
+    },
+    async handleExport(type) {
+      const urls = {
+        age: '/epmetuser/icresiuser/partymemberagelist/export',
+        edu: '/epmetuser/icresiuser/partymembereducationlist/export'
+      }
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      let params = {
+        orgId: _arr[0],
+        orgType: orgType,
+        code: type == 'age' ? this.ageCode : this.eduCode,
+      }
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      await this.$http({
+        method: 'POST',
+        url: urls[type],
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出失败', err)
+          return this.$message.error('网络错误')
+        })
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.card-title {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  .title-icon {
+    display: block;
+    width: 46px;
+    height: 34px;
+    box-sizing: border-box;
+    margin-right: 6px;
+  }
+  ::v-deep .el-dropdown {
+    font-size: 18px;
+    color: #fff;
+    font-weight: 800;
+  }
+  .title-time {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    margin-left: 30px;
+    font-size: 14px;
+    color: #fff;
+    .title-time-label {
+      margin-right: 10px;
+    }
+    ::v-deep .el-date-editor--month {
+      width: 100px;
+      .el-input__inner {
+        width: 100px;
+        height: 24px;
+        box-sizing: border-box;
+        padding: 0;
+        font-size: 14px;
+        color: #fff;
+        line-height: 24px;
+        text-align: center;
+        background: #06186D;
+        border: 1px solid #1A64CC;
+        border-radius: 2px;
+      }
+      .el-input__prefix {
+        display: none;
+      }
+      .el-input__suffix {
+        right: 0;
+        .el-input__icon {
+          line-height: 24px;
+        }
+      }
+      
+    }
+  }
+  .title-label {
+    font-size: 20px;
+    font-weight: 800;
+    ::v-deep .el-input {
+      
+      width: 180px;
+      .el-input__inner {
+        font-size: 18px;
+        // font-weight: 800;
+        color: #fff;
+        background: #06186d;
+        border: 1px solid #1a64cc;
+      }
+      .el-icon-arrow-down::before {
+          content: "\e790";
+      }
+    }
+  }
+}
+.card-echart {
+  display: flex;
+  margin-top: 40px;
+  height: 100%;
+  .card-left {
+    position: relative;
+    flex: 1;
+    // display: flex;
+    height: 100%;
+    .card-flex {
+      width: 100%;
+      display: flex;
+    }
+  }
+}
+.card-left-title {
+  position: relative;
+  padding-left: 40px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #fff;
+}
+.card-left-title::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 20px;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-top: -6px;
+  background: #2865FA;
+  border-radius: 50%;
+}
+.echart-wr {
+  position: relative;
+  flex-shrink: 0;
+  width: 50%;
+  height: 320px;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 100%;
+  }
+  .echart-cicle {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 240px;
+    height: 240px;
+    box-sizing: border-box;
+    margin-top: -120px;
+    margin-left: -120px;
+    border: 1px dashed rgba(0, 96, 240, 1);
+    border-radius: 50%;
+  }
+  .echart-cicle0 {
+    left: 80px;
+    margin-left: 0;
+  }
+}
+.echart-wr100 {
+  width: 70%;
+}
+.echarts-tips {
+  width: 40%;
+  // flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.echarts-tips-wd50 {
+  width: 320px;
+}
+.tips-list, .tips-item, .tips-lists, .tips-items-num {
+  display: flex;
+  align-items: center;
+}
+.tips-list {
+  // width: 100%;
+  // height: 100%;
+  flex-wrap: wrap;
+  // justify-content: center;
+  .tips-item {
+    // flex: 1;
+    width: 50%;
+    margin-top: 20px;
+    // margin-right: 40px;
+    cursor: pointer;
+    .tips-item-icon {
+      width: 20px;
+      height: 10px;
+      box-sizing: border-box;
+      margin-right: 8px;
+      background: #1B51FF;
+      border-radius: 2px;
+    }
+    .tips-item-text {
+      font-size: 16px;
+      color: #D2E7FF;
+    }
+  }
+}
+.tips-lists {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 30px 0 0 30px;
+  flex-wrap: wrap;
+  .tips-items {
+    margin-bottom: 30px;
+    margin-right: 40px;
+    // width: 50%;
+    cursor: pointer;
+    .tips-items-title {
+      position: relative;
+      width: 100px;
+      height: 26px;
+      box-sizing: border-box;
+      padding-left: 6px;
+      font-size: 16px;
+      color: #EFF0F1;
+      background: url('../../../../assets/img/shuju/measure/huang@2x.png') no-repeat left bottom;
+      &1 {
+        background: url('../../../../assets/img/shuju/measure/lv@2x.png') no-repeat left bottom;
+      }
+      &2 {
+        background: url('../../../../assets/img/shuju/measure/zi@2x.png') no-repeat left bottom;
+      }
+      &3 {
+        background: url('../../../../assets/img/shuju/measure/lan@2x.png') no-repeat left bottom;
+      }
+      &4 {
+        background: url('../../../../assets/img/shuju/measure/lanlv@2x.png') no-repeat left bottom;
+      }
+    }
+    .tips-items-num {
+      justify-content: space-between;
+      box-sizing: border-box;
+      margin-top: 10px;
+      // padding-right: 30px;
+      font-size: 20px;
+      .tips-item-has {
+        font-size: 14px;
+      }
+    }
+  }
+}
+
+.warning-box-bottom {
+  height: calc(100% - 500px);
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0 30px;
+  // overflow-y: scroll;
+}
+.ecahrts-button {
+  width: 100%;
+  padding-right: 30px;
+  text-align: right;
+  ::v-deep .el-button--warning {
+
+    background: linear-gradient(90deg, #0863EA, #3B9FFC);
+    border: 0;
+  }
+}
+</style>