From b0f927b437aea9f5af91eac34927d2b8c83ad26e Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 15 Jun 2022 09:30:40 +0800
Subject: [PATCH 01/27] =?UTF-8?q?=E5=A4=9A=E5=85=83=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E7=82=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?maporg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 53e007da4..dbaf1df06 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -364,6 +364,9 @@ export default {
       }
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
+        this.agencyInfo.agencyLevel = data.agencyLevel,
+        this.agencyInfo.longitude = data.longitude,
+        this.agencyInfo.latitude = data.latitude
         let subPolygonList = []
         data.children.forEach((item, index) => {
           if (item.coordinates && item.coordinates.length > 0) {

From 9e9cc36ae6b4599a9698ad448f78564dfb105ba5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 23 Jun 2022 10:37:40 +0800
Subject: [PATCH 02/27] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/tinymce2/index.vue          | 13 ++++++++++---
 src/views/modules/workPc/guidance/DetailForm.vue |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue
index 60a382841..5f82a817d 100644
--- a/src/views/components/tinymce2/index.vue
+++ b/src/views/components/tinymce2/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <editor id="editors" v-model="content" tag-name="div" :init="init" />
+  <editor :id="id" v-model="content" tag-name="div" :init="init" />
   <!-- <textarea id="editors" v-model="content" /> -->
 </template>
 
@@ -51,6 +51,13 @@ import { debounce } from "throttle-debounce";
 
 export default {
   props: {
+    id: {
+      type: String,
+      default: () => {
+        num === 10000 && (num = 1);
+        return `tinymce${+new Date()}${num++}`;
+      },
+    },
     value: {
       default: "",
     },
@@ -67,7 +74,7 @@ export default {
     let token = this.getUserToken();
 
     let init = {
-      selector: '#editors',
+      selector: `#${this.id}`,
       language_url: require("./zh_CN.js"), // 中文语言包路径
       language: "zh_CN",
       skin_url: require("tinymce/skins/ui/oxide/skin.css"), // 编辑器皮肤样式
@@ -154,7 +161,7 @@ export default {
     };
   },
   mounted() {
-    tinymce.init(this.init)
+    // tinymce.init(this.init)
   },
   methods: {
     vModel(editor) {
diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue
index 74b0cf3ca..8b878642b 100644
--- a/src/views/modules/workPc/guidance/DetailForm.vue
+++ b/src/views/modules/workPc/guidance/DetailForm.vue
@@ -69,6 +69,8 @@
 
             <Tinymce class="tinymce_view"
                      v-if="formType!='D'"
+                     :ref="item.moduleId"
+                     :id="item.moduleId"
                      v-model="item.moduleContent"
                      :height="450"
                      :customerId="customerId"

From e2db756be08eb63f8a7b7f5e5eaf51eb24a72555 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 23 Jun 2022 13:57:53 +0800
Subject: [PATCH 03/27] 11

---
 .../shijianchuli/lineOption copy.js           |  86 ++
 .../shijianchuli/pieOption copy.js            | 183 +++++
 .../shijianchuli/shijianchulifenxi copy.vue   | 740 ++++++++++++++++++
 3 files changed, 1009 insertions(+)
 create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js
 create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js
 create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js
new file mode 100644
index 000000000..04b4f9503
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js	
@@ -0,0 +1,86 @@
+import * as echarts from 'echarts'
+export function lineOption () {
+
+  return {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'cross',
+        label: {
+          backgroundColor: '#6a7985'
+        }
+      }
+    },
+    xAxis: {
+      type: 'category',
+      // boundaryGap: false,
+      axisLabel: {
+        color: '#8ec7dc',
+        fontSize: 16
+      },
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        lineStyle: {
+          color: '#0c4b59'
+        }
+      }
+    },
+    yAxis: {
+      nameTextStyle: {
+        color: '#8ec7dc',
+        fontSize: 18
+      },
+      splitNumber: 4,
+      minInterval: 1,
+      show: true,
+      type: 'value',
+      axisLabel: {
+        color: '#8ec7dc',
+        fontSize: 18
+      },
+      axisTick: {
+        show: false
+      },
+      splitLine: {
+        lineStyle: {
+          color: ['#145968'],
+          type: 'dotted'
+        }
+      },
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: [0, 15],
+        lineStyle: {
+          color: '#0c4b59'
+        }
+      }
+    },
+    series: [
+      {
+        name: '项目数',
+        type: 'line',
+        smooth: true,
+        barWidth: 15,
+        areaStyle: {},
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0, 1, 0, 0,
+            [
+              { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+              { offset: 1, color: '#6339FF' }
+            ]
+          )
+        }
+      },
+      // {
+      //   data: [820, 932, 901, 934, 1290, 1330, 1320],
+      //   type: 'line',
+      //   areaStyle: {}
+      // }
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js
new file mode 100644
index 000000000..5eb83badb
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js	
@@ -0,0 +1,183 @@
+
+export function pieOption (_charts) {
+const center= ['50%', '170px']
+  return {
+    title: {
+      text: '0',
+      top: 140,
+      left: 'center',
+      textStyle: {
+        width: '100%',
+        fontSize: 32,
+        color: '#FFFFFF',
+        fontWeight: 400
+      },
+      itemGap: 5,
+      subtext: '总数',
+      subtextStyle: {
+        fontSize: 20,
+        color: '#fff',
+        fontWeight: 400
+      }
+    },
+    tooltip: {
+      show: false
+    },
+    // legend: {
+      // top: 350,
+      // bottom: 0,
+      // itemWidth: 20,
+      // itemHeight: 10,
+      // textStyle: {
+      //   color: '#D2E7FF',
+      //   fontSize: 16,
+      //   lineHeight: 20,
+      // },
+    
+    // },
+    series: [
+      // 外侧圆环
+      {
+        type: 'pie',
+        // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+        startAngle: 0,
+        hoverAnimation: false,
+        // tooltip: {
+        // },
+        center: center,
+        radius: ['58%', '58.3%'],
+        label: {
+          normal: {
+            show: false
+          }
+        },
+        labelLine: {
+          normal: {
+            show: false
+          }
+        },
+        data: [{
+          value: 360,
+          itemStyle: {
+            normal: {
+              color: 'rgba(40, 101, 250, 0)',
+              width:0,
+              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderWidth: 1,
+              borderType: 'dotted'
+            }
+          }
+        }
+        ]
+      },
+
+      // 突出的
+      {
+        hoverAnimation: false,
+        // name: 'Access From',
+        type: 'pie',
+        center: center,
+        radius: ['35%', '48%'],
+        avoidLabelOverlap: false,
+        // top: top + '%',
+        // height: '80%',
+        selectedMode: 'single',
+        left: 'center',
+        width: 400,
+        label: {
+          // show: false,
+          position: 'outside',
+          alignTo: 'edge',
+          // formatter: '{a|{c}}\n\n{name|{b}}',
+          formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
+          minMargin: 5,
+          edgeDistance: 1,
+          lineHeight: 15,
+          color: '#fff',
+          fontSize: 12,
+          // distanceToLabelLine: -60,
+          rich: {
+            name: {
+              padding: [0, 6, 0, 6]
+            },
+            a: {
+              fontSize: 30,
+              color: '#fff',
+              padding: [0, 6, 6, 6]
+            },
+            r: {
+              backgroundColor: 'auto',
+              borderRadius: 6,
+              width: 6,
+              height: 6,
+              // padding: [3, 3, 0, -12]
+            }
+          }
+        },
+        labelLine: {
+          show: false,
+          smooth: 0.2,
+          length: 30,
+          length2: 0,
+          maxSurfaceAngle: 80
+        },
+        labelLayout: function (params) {
+          
+          const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+          const points = params.labelLinePoints;
+          // Update the end point.
+          if (points) {
+            points[2][0] = isLeft
+            ? params.labelRect.x
+            : params.labelRect.x + params.labelRect.width;
+          }
+          
+          return {
+            labelLinePoints: points
+          };
+        },
+        itemStyle: {
+           color:function(params) {
+          //自定义颜色
+          var colorList = [ '#FAC126', '#3DDA83'];
+            return colorList[params.dataIndex]
+          }
+        },
+        data: [],
+
+      },
+         // 中间圆环
+         {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 0,
+          hoverAnimation: false,
+          center: center,
+          // tooltip: {
+          // },
+          radius: ['0%', '25%'],
+          label: {
+          
+              show: false
+           
+          },
+          labelLine: {
+           
+              show: false
+          
+          },
+          data: [{
+            value: 360,
+            itemStyle: {
+              normal: {
+                color: 'rgba(8, 37, 134, 1)',
+            
+              }
+            }
+          }
+          ]
+        },
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
new file mode 100644
index 000000000..301a60a96
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
@@ -0,0 +1,740 @@
+<template>
+  <cpt-card>
+    <div class="title">
+      <img src="@/assets/img/shuju/title-tip.png" />
+      <span>事件处理分析</span>
+
+      <div class="search">
+        <div class="second-select cascader">
+          <el-cascader class="customer_cascader"
+                       ref="myCascader"
+                       v-model="agencyIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeAgency"></el-cascader>
+        </div>
+        <div class="second-select">
+          <el-select v-model="dataType"
+                     :popper-append-to-body="false"
+                     placeholder="请选择">
+            <el-option v-for="(item) in dateArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"
+                       @click.native="handleChangeDate(item.value)">
+            </el-option>
+          </el-select>
+        </div>
+
+        <div v-if="dataType==='0'"
+             class="second-select range-data">
+
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          prefix-icon="el-icon-caret-bottom"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          @change="handleSelectChange">
+          </el-date-picker>
+        </div>
+      </div>
+
+    </div>
+    <div class="g-cpt-resi">
+      <div class="g-l">
+        <div class="l_top">
+
+          <div v-if="!pieNoData && !dataLoading"
+               class="g-pie">
+            <screen-echarts-frame class="echart-wr"
+                                  @myChartMethod="pieInitOk"
+                                  ref="pieChart"></screen-echarts-frame>
+
+            <div class="pie-legend">
+              <div :class="['legend_item',{'item_last':index===legendArray.length-1}]"
+                   v-for="(item,index) in legendArray"
+                   :key="index">
+                <div class="item_name">{{item.name}}</div>
+                <img :src="item.url" />
+                <!-- <div class="item_num">
+                  <span class="item_count">{{item.count}}</span>
+                  <span class="item_percent">{{item.percent}}</span>
+                </div> -->
+              </div>
+            </div>
+
+          </div>
+          <screen-nodata class="nodata"
+                         v-if="pieNoData&& !dataLoading"></screen-nodata>
+          <div class="table-status"
+               v-if="dataLoading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+
+        </div>
+        <div class="l_bottom">
+          <div class="bottom_label">月度新增事件统计</div>
+          <screen-echarts-frame v-if="!lineNoData&& !dataLoading"
+                                class="echart-line"
+                                @myChartMethod="lineInitOk"
+                                ref="lineChart"></screen-echarts-frame>
+          <screen-nodata class="nodata"
+                         v-if="lineNoData&& !dataLoading"></screen-nodata>
+          <div class="table-status"
+               v-if="dataLoading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+        </div>
+      </div>
+      <div class="g-r">
+        <div class="m-tb">
+
+          <div class="tb">
+            <cpt-tb :col-list="demand.colList"
+                    :loading="demand.loading"
+                    :header="demand.header"
+                    :list="demand.list"
+                    @operate="toEventInfo"></cpt-tb>
+
+          </div>
+          <div class="m-pagination">
+            <el-pagination :current-page="demand.pageNo"
+                           :page-size="demand.pageSize"
+                           :total="demand.total"
+                           background
+                           layout="prev, pager, next,total"
+                           @current-change="handlePageNoChange_demand">
+            </el-pagination>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <event-info v-if="showProject"
+                :eventId="eventId"
+                :orgId="orgId"
+                :orgType="orgType"
+                @close="showProject = false" />
+  </cpt-card>
+</template>
+
+<script>
+
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata";
+import eventInfo from "./event-info";
+
+import { pieOption } from './pieOption.js'
+import { lineOption } from './lineOption.js'
+import nextTick from 'dai-js/tools/nextTick'
+import dateFormat from "dai-js/tools/dateFormat";
+
+
+export default {
+  name: "shijianchulifenxi",
+  data () {
+    return {
+      dataLoading: true,
+      pieNoData: false,
+      lineNoData: false,
+      isfirstInit: true,//记录地图是否第一次加载
+
+      projectTotal: 0,
+      processingCount: 0,
+      processingRatio: 0,
+
+      lineChart: '',
+      lineOption: {},
+      lineInitState: false,
+      lineColorArray: [],
+      lineData: [],
+      lineXaxis: [],
+      lineSeriesData: [],
+
+      pieChartS: null,
+      pieChart: '',
+      pieOption: {},
+      pieInitState: false,
+
+
+      pieData: [],
+
+      legendArray: [
+        {
+          name: '未结案',
+          count: 0,
+          percent: '0%',
+          url: require('@/assets/img/shuju/measure/huang@2x.png')
+        },
+        {
+          name: '已结案',
+          count: 0,
+          percent: '0%',
+          url: require('@/assets/img/shuju/measure/lv@2x.png')
+        }
+      ],
+
+      timeRange: [],
+
+      orgId: '',
+      orgType: 'agency',
+      queryStartTime: '',
+      queryEndTime: '',
+      processStatus: 'closed_case',
+      dataType: '1',
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+      dateArray: [
+        {
+          label: '近一年',
+          value: '1'
+        },
+        {
+          label: '近一个月',
+          value: '2'
+        },
+        {
+          label: '近三个月',
+          value: '3'
+        },
+        {
+          label: '近半年',
+          value: '4'
+        },
+        {
+          label: '自定义',
+          value: '0'
+        },
+      ],
+
+      tableList: [],
+      demand: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "15%",
+          },
+          {
+            align: "center",
+            width: "25%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "5%",
+          },
+
+          {
+            align: "center",
+            width: "10%",
+          },
+        ],
+        header: ["序号", "所属组织", "事件内容", "上报渠道", "报事人", "手机号", "状态", "操作"],
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+      },
+
+      showProject: false,
+      eventId: '',
+
+    };
+  },
+  // mixins: [animate]
+  beforeDestroy () {
+
+  },
+  async created () {
+
+  },
+
+  async mounted () {
+    this.dataLoading = true
+    //初始化时间、各组件
+    this.initData()
+    await this.getAgencylist()//获取组织级别
+    this.handleChangeDate(this.dataType)
+    //获取服务器数据
+    await this.getProjectTotal()
+    await this.getLineChart()
+
+    this.dataLoading = false
+
+
+    // this.assignData()
+
+  },
+
+  methods: {
+    async getApiData () {
+
+      await this.getProjectTotal()
+      await this.getLineChart()
+
+      this.assignData()
+
+    },
+
+    async handleChangeDate (index) {
+      let end = new Date();
+      let start = new Date();
+      if (index === '1') {//近一年
+        start.setFullYear(start.getFullYear() - 1);
+        console.log(start.getDate())
+      } else if (index === '2') {//近一个月
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+
+      } else if (index === '3') {//近三个月
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
+
+      } else if (index === '4') {//近半年
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 183);
+      }
+      if (index != '0') {
+        this.queryStartTime = dateFormat(start, 'yyyy-MM-dd') + " 00:00:00"
+        this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59"
+      }
+      if (index !== '0') {
+        await this.getApiData()
+        // this.assignPieChart()
+      }
+
+
+    },
+
+    assignData () {
+
+      this.getPie()
+      this.getLine()
+    },
+
+    handleSelectChange (value) {
+
+      this.queryStartTime = value[0] + " 00:00:00"
+      this.queryEndTime = value[1] + " 23:59:59"
+      this.getApiData();
+    },
+
+    // 获取当前登录人员信息及组织信息
+    async getAgencylist () {
+      const url = "/gov/org/customeragency/agencygridtree";
+      //const url = '/gov/org/customeragency/agencylist'
+
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+
+        this.orgId = data.agencyId
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          this.casOptions.push(data)
+          this.agencyIdArray.push(this.orgId)
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    //加载项目
+    async getProjectTotal () {
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.showLoading()
+        this.$refs.pieChart.clear()
+      }
+
+      const url = "/gov/project/icEvent/processAnalysis/processStatusRatio";
+      //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio";
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType,
+        queryStartTime: this.queryStartTime,
+        queryEndTime: this.queryEndTime,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.hideLoading()
+      }
+      if (code === 0) {
+        this.projectTotal = parseInt(data.processingCount) + parseInt(data.closedCount);
+
+        this.legendArray = [
+          {
+            name: '已完成',
+            count: data.closedCount,
+            percent: data.closedRatio,
+            url: require('@/assets/img/shuju/measure/huang@2x.png')
+          },
+          {
+            name: '处理中',
+            count: data.processingCount,
+            percent: data.processingRatio,
+            url: require('@/assets/img/shuju/measure/lv@2x.png')
+          }
+        ]
+
+        this.pieData = [
+
+          {
+            name: "已完成",
+            value: Math.floor(data.closedRatio * 10000) / 100
+          },
+          {
+            name: "处理中",
+            value: Math.floor(data.processingRatio * 10000) / 100
+          },
+        ]
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getTable () {
+      const url = "/gov/project/icEvent/processAnalysis/eventList";
+      //const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList";
+      let params = {
+        processStatus: this.processStatus,
+        orgId: this.orgId,
+        orgType: this.orgType,
+        queryStartTime: this.queryStartTime,
+        queryEndTime: this.queryEndTime,
+        pageNo: this.demand.pageNo,
+        pageSize: this.demand.pageSize,
+        biz: 'eventProcessAnalysis'
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.demand.loading = false;
+
+      if (code === 0) {
+
+        this.demand.total = data.total;
+        this.tableList = data.list
+        this.demand.list = data.list.map((item, index) => {
+          return [
+            index + 1,
+            item.gridName ? item.gridName : '',
+            item.eventContent ? item.eventContent : '',
+            item.sourceTypeName ? item.sourceTypeName : '',
+            item.reportUserName ? item.reportUserName : '',
+            item.mobile ? item.mobile : 'processing',
+            item.processStatus ? item.processStatus === 'closed_case' ? '已完成' : '处理中' : '',
+
+            { type: "operate", list: ["查看"] },
+          ];
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChange_demand (val) {
+      this.demand.pageNo = val;
+      this.getTable();
+    },
+
+
+    toEventInfo (index) {
+      const { tableList } = this;
+      this.eventId = tableList[index].eventId
+
+      this.showProject = true
+
+    },
+
+    pieInitOk (dom) {
+      this.pieChartS = dom
+      this.pieInitState = true
+    },
+    lineInitOk () {
+
+      this.lineInitState = true
+
+    },
+    getLine () {
+      if (this.lineInitState) {
+        this.assignLineChart()
+      } else {
+        setTimeout(() => {
+          this.getLine()
+        }, 500)
+      }
+    },
+    // 获取折线图
+    async getLineChart () {
+      if (this.$refs.lineChart) {
+        this.$refs.lineChart.clear()
+        this.$refs.lineChart.showLoading()
+      }
+      const _that = this
+      // this.$refs.pieChart.showLoading()
+      const url = "/gov/project/icEvent/processAnalysis/monthlyIncrement";
+      //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/monthlyIncrement";
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType,
+        queryStartTime: this.queryStartTime,
+        queryEndTime: this.queryEndTime,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        // 获取pieChart配置
+
+        this.lineXaxis = []
+        this.lineSeriesData = []
+        if (data && data.length > 0) {
+          this.lineNoData = false
+          data.forEach(item => {
+            this.lineXaxis.push(item.monthName)
+            this.lineSeriesData.push(item.increment)
+          });
+          this.lineData = data
+
+        } else {
+          this.lineNoData = true
+        }
+
+        if (this.$refs.lineChart) {
+          this.$refs.lineChart.hideLoading()
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+
+    assignLineChart () {
+
+      this.lineOption = lineOption()
+      this.$refs.lineChart.setOption(this.lineOption, true)
+      this.$refs.lineChart.setOption({
+        xAxis: { data: this.lineXaxis },
+        series: [
+          { data: this.lineSeriesData },
+
+        ]
+      }, true)
+    },
+
+    getPie () {
+
+      if (this.pieInitState) {
+        this.assignPieChart()
+      } else {
+        setTimeout(() => {
+          this.getPie()
+        }, 500)
+      }
+    },
+    // 获取饼状图
+    async assignPieChart () {
+
+      let maxIndex = 0
+
+      const _that = this
+
+      // 获取pieChart配置
+      this.pieOption = pieOption(this.pieChartS)
+
+      this.pieData[0].selected = false
+      this.pieData[1].selected = false
+
+      this.pieOption.title.text = this.projectTotal
+
+      this.clickPie()
+
+      let fun = function (params) {
+
+        _that.clickPie(params)
+      }
+      this.$refs.pieChart.handleClick(fun)
+
+    },
+
+    clickPie (params) {
+
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 1) {//点击数据
+        if (dataIndex === 0) {
+          this.processStatus = 'closed_case'
+        } else if (dataIndex === 1) {
+          this.processStatus = 'processing'
+        }
+      } else if (componentIndex === 2) {//点击中心
+        this.processStatus = ''
+        dataIndex = 3
+      }
+
+      if (dataIndex === 3) {
+        this.$refs.pieChart.clear()
+      }
+      this.pieData.forEach((element, index) => {
+        if (index === dataIndex) {
+          element.selected = true
+          element.label = {
+            show: true,
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          // element.selected = !element.selected
+        } else {
+
+
+          element.selected = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+          };
+          element.selected = false
+        }
+      });
+
+
+
+      this.pieOption.series[1].data = this.pieData
+      this.demand.pageNo = 1
+      this.getTable()
+
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.pieChart.setOption(this.pieOption)
+    },
+
+    handleChangeAgency () {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+        this.orgType = obj.level === 'grid' ? 'grid' : 'agency'
+        this.orgId = obj.agencyId
+
+      } else {
+        this.orgId = ''
+        this.orgType = ''
+      }
+
+      this.getApiData()
+    },
+
+    //初始化时间
+    initData () {
+      var time = (new Date).getTime() - 24 * 60 * 60 * 1000;
+      var nowdate = new Date(time); // 获取的是前一天日期
+      var y = nowdate.getFullYear();
+      var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1;
+      var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate();
+      this.dateIdShow = y + '-' + m + '-' + d;
+    },
+
+  },
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
+  computed: {},
+
+  components: {
+    cptCard,
+    cptTb,
+    screenEchartsFrame,
+    eventInfo,
+    ScreenLoading,
+    ScreenNodata
+  },
+
+  watch: {
+    dateIdShow () {
+
+      // let dataArray = this.dateIdShow.split('-')
+      // this.dateId = dataArray.join('')
+    },
+    uid (id) {
+      this.userId = id;
+    },
+    userId () {
+      // this.getApiData();
+      window.scrollTo(0, 0);
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/shijianchulifenxi.scss"
+  scoped
+></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/search_1.scss"
+  scoped
+></style>
+
+

From 0e029d9117eb51a2352d8be289b0e270606c5c29 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 23 Jun 2022 17:04:14 +0800
Subject: [PATCH 04/27] =?UTF-8?q?=E8=BF=81=E5=87=BA=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/verify.vue   | 754 +++++++++++++++++
 .../modules/plugins/change/verifyForm.vue     | 763 ++++++++++++++++++
 2 files changed, 1517 insertions(+)
 create mode 100644 src/views/modules/plugins/change/verify.vue
 create mode 100644 src/views/modules/plugins/change/verifyForm.vue

diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
new file mode 100644
index 000000000..616b366ad
--- /dev/null
+++ b/src/views/modules/plugins/change/verify.vue
@@ -0,0 +1,754 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        :label-width="'100px'"
+        class="demo-form-inline"
+      >
+        <div>
+          <el-form-item prop="gridId" label="所属网格">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.gridId"
+                placeholder="请选择网格"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                @change="handleChangeGrid"
+              >
+                <el-option
+                  v-for="item in optionsG"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <div class="resi-cell-col">
+                <el-form-item prop="villageId">
+                  <el-select
+                    v-model.trim="fmData.villageId"
+                    placeholder="请选择小区"
+                    size="small"
+                    clearable
+                    class="resi-cell-select"
+                    @change="handleChangeV"
+                  >
+                    <el-option
+                      v-for="item in optionsV"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="buildId">
+                  <el-select
+                    v-model.trim="fmData.buildId"
+                    placeholder="楼号"
+                    size="small"
+                    clearable
+                    :disabled="changeVDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                    @change="handleChangeB"
+                  >
+                    <el-option
+                      v-for="item in optionsB"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="unitId">
+                  <el-select
+                    v-model.trim="fmData.unitId"
+                    placeholder="单元"
+                    size="small"
+                    clearable
+                    :disabled="changeBDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                    @change="handleChangeD"
+                  >
+                    <el-option
+                      v-for="item in optionsD"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="homeId">
+                  <el-select
+                    v-model.trim="fmData.homeId"
+                    placeholder="房号"
+                    size="small"
+                    clearable
+                    :disabled="changeDDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                  >
+                    <el-option
+                      v-for="item in optionsH"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+            </div>
+          </el-form-item>
+        </div>
+
+        <div>
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="fmData.name"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="手机号" prop="mobile">
+            <el-input
+              v-model="fmData.mobile"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="身份证号" prop="idCard">
+            <el-input
+              v-model="fmData.idCard"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+        </div>
+        <div>
+          <!-- <el-form-item label="迁入时间" prop="startTime">
+            <el-date-picker
+              v-model="rangeTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item> -->
+
+          <el-form-item label="审核状态" prop="confirmResult">
+            <el-select
+              v-model.trim="fmData.confirmResult"
+              placeholder="审核状态"
+              size="small"
+              clearable
+              class="resi-cell-select"
+            >
+              <el-option
+                v-for="item in optionsWelfare"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              class="diy-button--search"
+              size="small"
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              class="diy-button--reset"
+              size="small"
+              @click="resetForm('searchForm')"
+              >重置</el-button
+            >
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+      >
+        <el-table-column
+          label="序号"
+          fixed="left"
+          type="index"
+          align="center"
+          width="50"
+        />
+
+        <el-table-column
+          prop="name"
+          width="100"
+          fixed="left"
+          label="姓名"
+          align="center"
+        />
+          <!-- <template slot-scope="scope">
+            <a class="name-a" @click="handleWatch(scope.$index)">
+              {{ scope.row.name }}
+            </a>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="gender" align="center" width="60" label="性别">
+        </el-table-column>
+        <el-table-column
+          prop="mobile"
+          width="140"
+          align="center"
+          label="手机号"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="idCard"
+          align="center"
+          width="180"
+          label="身份证号"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="gridName"
+          align="center"
+          label="所属网格"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="homeName"
+          label="所属房屋"
+          align="center"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        />
+        <!-- <el-table-column
+          prop="allName"
+          label="迁出类型"
+          align="center"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        /> -->
+        <el-table-column
+          prop="newHomeName"
+          label="迁往房屋"
+          align="center"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="confirmResult"
+          label="审核状态"
+          align="center"
+          width="100"
+        />
+        
+
+        <el-table-column fixed="right" label="操作" align="center" width="120">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleWatch(scope.row)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+
+            <el-button
+              v-if="scope.row.confirmResult == '未审核'"
+              @click="handleEdit(scope.row)"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >审核</el-button
+            >
+            
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="1000px"
+      top="5vh"
+      class="dialog-h"
+      @close="handleClose(false)"
+    >
+      <verify-form
+        v-if="formShow"
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+      ></verify-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from '@/js/dai/request'
+import nextTick from 'dai-js/tools/nextTick'
+import { mapGetters } from 'vuex'
+import verifyForm from './verifyForm'
+import axios from 'axios'
+
+export default {
+  components: { verifyForm },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: '审核信息',
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem('pageSize') || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      optionsWelfare: [
+        {
+          value: '1',
+          label: '已通过'
+        },
+        {
+          value: '2',
+          label: '未通过'
+        }
+      ],
+
+      fmData: {
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        // isWeifare: '', //福利0否，1是
+        // startTime: '',
+        // endTime: '',
+        submitType: '',
+        confirmResult: ''
+      },
+      rangeTime: [],
+
+      importBtnTitle: '导入',
+      importLoading: false,
+
+      searchH: 0,
+      tableHeight: 0
+    }
+  },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    maxTableHeight() {
+      console.log('computed-searchH---', this.searchH)
+      const h = this.clientHeight - this.searchH + this.iframeHeight
+      const _h = this.clientHeight - this.searchH
+      console.log('computed-searchH---_h', _h)
+      return this.$store.state.inIframe ? h : _h
+      
+    },
+    
+    changeVDisabled() {
+      return !this.fmData.villageId
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId
+    }
+  },
+  watch: {
+    rangeTime: function (val) {
+      console.log('val----', val)
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0]
+        this.fmData.endTime = val[1]
+      } else {
+        this.fmData.startTime = ''
+        this.fmData.endTime = ''
+      }
+    },
+    searchH() {
+      const h = this.clientHeight - this.searchH + this.iframeHeight
+      const _h = this.clientHeight - this.searchH
+      console.log('computed-searchH---_h', _h)
+      
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h
+      })
+    }
+  },
+  mounted() {
+    this.getGridList()
+    this.getValiheList()
+    this.getTableData()
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270
+    console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
+  },
+  methods: {
+    handleClearVillage() {
+      this.fmData.buildId = ''
+      this.fmData.homeId = ''
+    },
+    handleClearBuild() {
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+    },
+    handleClearDan() {
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+    },
+    handleChangeGrid(val) {
+      console.log('val', val)
+      this.fmData.villageId = ''
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getValiheList()
+    },
+    handleChangeV(val) {
+      console.log('val', val)
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getBuildList()
+    },
+    handleChangeB(val) {
+      console.log('val', val)
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getUniList()
+    },
+    handleChangeD(val) {
+      console.log('val', val)
+      this.fmData.homeId = ''
+      this.getHouseList()
+    },
+
+    getGridList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customergrid/gridoption', {
+          agencyId: user.agencyId,
+          purpose: 'query'
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getValiheList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', {
+          gridId: this.fmData.gridId,
+          agencyId: ''
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList() {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.fmData.villageId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList() {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.fmData.buildId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList() {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      window.localStorage.setItem('pageSize', val)
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.pageNo = val
+      this.getTableData()
+    },
+
+    handleClose(val) {
+      console.log('val-----', val)
+      if (val) {
+        this.handleEditSuccess()
+      }
+      this.formShow = false
+    },
+    handleSearch(val) {
+      console.log(this.fmData)
+      this.pageNo = 1
+      this.getTableData()
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.handleSearch()
+    },
+    async handleAdd() {
+      this.formShow = true
+      await nextTick()
+      console.log(this.$refs)
+      this.$refs.eleEditForm.initForm('add')
+    },
+
+
+    async handleWatch(row) {
+      this.formShow = true
+      await nextTick()
+      this.$refs.eleEditForm.getDatail('detail', row.id)
+    },
+
+    async handleEdit(row) {
+      this.formShow = true
+      await nextTick()
+      this.$refs.eleEditForm.getDatail('edit', row.id)
+    },
+    handleEditSuccess() {
+      // this.handleClose()
+      this.getTableData()
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex)
+      const url =
+        '/heart/iccommunityselforganization/delcommunityselforganization'
+      const { tableData } = this
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId
+      })
+
+      if (code === 0) {
+        this.$message.success('删除成功！')
+        this.getTableData()
+      } else {
+        this.$message.success('操作失败！')
+      }
+    },
+
+    async getTableData() {
+      const url = '/epmetuser/myHome/confirmList'
+      const { pageSize, pageNo, fmData } = this
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData
+      })
+      if (code === 0) {
+        console.log('列表请求成功！！！！！！！！！！！！！！')
+        this.total = data.total || 0
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item
+            })
+          : []
+      } else {
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 120px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
new file mode 100644
index 000000000..9dc9bc65b
--- /dev/null
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -0,0 +1,763 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form :model="detailInfo" :disabled="btnType == 'detail'">
+        <el-form-item
+          label="迁出人姓名:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.name }}</span>
+        </el-form-item>
+        <el-form-item
+          label="手机号:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.mobile }}</span>
+        </el-form-item>
+        <el-form-item
+          label="身份证号:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.idCard }}</span>
+        </el-form-item>
+        <el-form-item
+          label="所在网格:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.gridName }}</span>
+        </el-form-item>
+        <el-form-item
+          label="所在房屋:"
+          label-width="150px"
+        >
+          <span>
+            {{ detailInfo.villageName + detailInfo.buildName +  detailInfo.unitName + detailInfo.homeName }}
+          </span>
+        </el-form-item>
+        <el-divider></el-divider>
+         <el-form-item
+          label="迁出类型:"
+          label-width="150px"
+        >
+          <span v-if="detailInfo.outType == 'in'">{{'迁往' + rootAgency.organizationName + '内其他区域' }}</span>
+          <span v-else>其他</span>
+        </el-form-item>
+        <template v-if="detailInfo.outType == 'in'">
+          <el-form-item
+            label="迁往区域:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newGridName }}</span>
+          </el-form-item>
+          <el-form-item
+            label="迁至房屋:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        </template>
+        <el-form-item
+          v-else
+            label="迁至地址:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        <el-form-item
+          label="迁出时间:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.moveOutDate }}</span>
+        </el-form-item>
+        <el-form-item
+          label="迁出原因:"
+          label-width="150px"
+        >
+          <span>
+            {{ detailInfo.deleteReason }}
+          </span>
+        </el-form-item>
+        <el-divider></el-divider>
+        <el-form-item
+          label="审核结果:"
+          label-width="150px"
+        >
+          <el-select
+              v-model.trim="confirmResult"
+              placeholder="请选择结果"
+              clearable
+              class="item_width_1"
+            >
+              <el-option label="通过" value="1" />
+              <el-option label="不通过" value="2" />
+            </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="confirmResult == 2"
+          label="审核备注:"
+          label-width="150px"
+        >
+          <el-input type="textarea" v-model="reason" style="width: 300px;"></el-input>
+        </el-form-item>
+        <!-- <template v-if="btnType == 'detail' && confirmResult == '1'">
+          <el-form-item
+            label="迁往区域:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newGridName }}</span>
+          </el-form-item>
+          <el-form-item
+            label="迁至房屋:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        </template> -->
+      </el-form>
+      
+      <el-form
+        v-if="confirmResult == 1 && btnType == 'edit'"
+        ref="ref_form"
+        :inline="false"
+        :model="dataForm"
+        :rules="dataRule"
+        class="form"
+      >
+        <el-form-item
+          label="当前组织:"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ gridName }}</span>
+        </el-form-item>
+
+        <el-form-item label="姓名" label-width="150px" style="display: block">
+          <span>{{ dataForm.name }}</span>
+        </el-form-item>
+
+        <el-form-item label="迁出时间:" prop="outOfTime" label-width="150px">
+          <el-date-picker
+            v-model="dataForm.outOfTime"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 200px"
+            :clearable="false"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="迁出类型:"
+          prop="type"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-radio-group v-model="dataForm.type">
+            <el-radio v-if="dataForm.type == 'in'" :label="'in'">{{
+              '迁往' + rootAgency.organizationName + '内其他区域'
+            }}</el-radio>
+            <el-radio v-else :label="'out'">其他</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <div v-if="dataForm.type === 'in'">
+          <el-form-item label="迁出至" prop="agencyId" label-width="150px">
+            <el-cascader
+              ref="myCascader"
+              v-model="agencyIdArray"
+              style="width: 480px"
+              :key="iscascaderShow"
+              :options="casOptions"
+              :props="optionProps"
+              @change="handleChangeAgency"
+              clearable
+            ></el-cascader>
+          </el-form-item>
+
+          <el-form-item label="所属家庭:" label-width="150px" prop="villageId">
+            <div class="resi-cell-col">
+              <el-select
+                v-model.trim="dataForm.villageId"
+                placeholder="请选择小区"
+                clearable
+                class="item_width_1"
+                @change="handleChangeCommunity($event)"
+              >
+                <el-option
+                  v-for="item in communityList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+
+              <el-select
+                v-model.trim="dataForm.buildId"
+                placeholder="请选择楼号"
+                clearable
+                class="item_width_1 margin_left10"
+                @change="handleChangeBuilding($event)"
+              >
+                <el-option
+                  v-for="item in buildingList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+
+              <el-select
+                v-model.trim="dataForm.unitId"
+                placeholder="请选择单元"
+                clearable
+                class="item_width_1 margin_left10"
+                @change="handleChangeUnit($event)"
+              >
+                <el-option
+                  v-for="item in unitList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+
+              <el-select
+                v-model.trim="dataForm.homeId"
+                placeholder="请选择房号"
+                clearable
+                class="item_width_1 margin_left10"
+                @change="handleChangeHome($event)"
+              >
+                <el-option
+                  v-for="item in roomList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+        </div>
+        <div v-if="dataForm.type === 'out'">
+          <el-form-item label="外迁详细地址:" prop="address" label-width="150px">
+            <el-input
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 7 }"
+              :rows="5"
+              resize="none"
+              style="width: 600px"
+              placeholder="请输入外迁详细地址"
+              v-model="dataForm.address"
+            >
+            </el-input>
+          </el-form-item>
+        </div>
+        <el-form-item label="迁出原因:" prop="reason" label-width="150px">
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 7 }"
+            :rows="5"
+            resize="none"
+            style="width: 600px"
+            placeholder="请输入迁出原因"
+            v-model="dataForm.reason"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="" prop="welfareFlag" label-width="150px">
+          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div v-if="confirmResult == 1" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+      <el-button
+        v-if="btnType != 'detail'"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleComfirm"
+        >提交</el-button
+      >
+    </div>
+    <div v-if="confirmResult == 2" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+      <el-button
+        v-if="btnType != 'detail'"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleVerify"
+        >提交</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import util from '@js/util.js'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data() {
+    return {
+      btnDisable: false,
+      communityList: [],
+      buildingList: [],
+      unitList: [],
+      roomList: [],
+      confirmResult: '1',
+      reason: '',
+      dataForm: {
+        icUserId: '', // 被调动人ID
+        type: 'in', //操作类型【客户外out,客户内in】
+        agencyId: '', //调动到的组织Id
+        gridId: '', //调动到的网格Id
+        gridName: '',
+        villageId: '', //调动到的小区ID
+        villageName: '',
+        buildId: '', //调动到的楼宇Id
+        buildName: '',
+        unitId: '', //调动到的单元Id
+        unitName: '',
+        homeId: '', //调动到的房屋Id
+        homeName: '',
+        transferTime: '', //调动时间【日期类型】
+        reason: '', //备注
+        customerId: '',
+        oldHome: '',
+        oldDept: '',
+        oldAddress: '',
+        ownerName: '',
+        name: '',
+        gender: '',
+        age: '',
+        address: '',
+        outOfTime: '',
+        welfareFlag: false
+      },
+
+      customerId: '', //客户id
+      userId: '', //操作人员id
+      gridName: '',
+      rootAgency: {},
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+      btnType: '',
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList'
+        // checkStrictly: true
+      },
+
+      selGrid: {},
+      detailInfo: {}
+    }
+  },
+  components: {},
+  mounted() {},
+  computed: {
+    dataRule() {
+      return {
+        type: [
+          { required: true, message: '操作类型不能为空', trigger: 'blur' }
+        ],
+        agencyId: [
+          { required: true, message: '所选组织不能为空', trigger: 'blur' }
+        ],
+        villageId: [
+          { required: true, message: '所属家庭不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '外迁详细地址不能为空', trigger: 'blur' }
+        ],
+        outOfTime: [
+          { required: true, message: '迁出时间不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    async initForm(row) {
+      this.customerId = localStorage.getItem('customerId')
+
+      // this.$refs.ref_form.resetFields()
+
+      // this.icUserId = row.icResiUserId
+      this.gridName = row.gridName
+      this.dataForm.icUserId = row.icResiUserId
+
+      // 添加参数
+      if (
+        row.DOOR_NAME !== null &&
+        row.DOOR_NAME !== '' &&
+        row.DOOR_NAME !== undefined
+      ) {
+        this.dataForm.oldHome = row.DOOR_NAME
+      } else {
+        this.dataForm.oldHome = ''
+      }
+      this.dataForm.customerId = this.customerId
+      this.dataForm.idCard = row.idCard
+      this.dataForm.mobile = row.mobile
+      this.dataForm.type = row.outType
+      this.dataForm.outOfTime = row.moveOutDate
+      this.dataForm.reason = row.deleteReason
+      this.dataForm.address = row.xxdz
+      // await this.loadHouseInfo(row.HOME_ID_VALUE)
+
+      this.dataForm.name = row.name
+      // this.dataForm.gender = row.GENDER
+      // this.dataForm.age = ''
+      this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : '1'
+      this.reason = row.reason
+
+      await this.loadRootAgency()
+      await this.getAgencylist()
+    },
+    async getDatail(type, id) {
+      let url = '/epmetuser/myHome/moveOutConfirmDetail'
+      this.btnType = type
+      const params = {
+        id: id || ''
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.detailInfo = { ...data }
+        this.initForm(data)
+      } else this.$message.error(msg)
+    },
+    async loadHouseInfo(homeIdValue) {
+      const url = '/gov/org/ichouse/' + homeIdValue
+      const { data, code, msg } = await requestGet(url)
+      if (code === 0) {
+        this.dataForm.oldDept = ''
+        this.dataForm.oldAddress = data.houseName
+        this.dataForm.ownerName = data.ownerName
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //根据人员id获取根组织信息
+    async loadRootAgency() {
+      await this.$http
+        .post('/gov/org/agency/customerrootagency/' + this.customerId)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+
+          if (res.data) {
+            this.rootAgency = res.data
+          }
+        })
+        .catch(() => {})
+    },
+
+    async getAgencylist() {
+      const url = '/gov/org/customeragency/rootagencygridtree'
+
+      const params = {
+        agencyId: this.rootAgency.id
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          let treeData = [data]
+          this.resolveAgencyTree(treeData)
+          this.casOptions.push(data)
+        }
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    resolveAgencyTree(treeData) {
+      treeData.forEach((element) => {
+        if (!element.subAgencyList || element.subAgencyList.length === 0) {
+          //不存在下级，且level=grid的是true
+
+          if (element.level === 'grid') {
+            element.disabled = false
+          } else {
+            element.disabled = true
+          }
+        } else {
+          this.resolveAgencyTree(element.subAgencyList)
+        }
+      })
+    },
+
+    handleChangeAgency() {
+      console.log(this.$refs['myCascader'].getCheckedNodes()[0].data)
+      this.selGrid = this.$refs['myCascader'].getCheckedNodes()[0].data
+      this.dataForm.agencyId = this.selGrid.pid
+      this.dataForm.gridId = this.selGrid.agencyId
+      this.dataForm.gridName = this.selGrid.agencyName
+      this.loadCommunityList()
+      this.dataForm.villageId = '' //调动到的小区ID
+      this.dataForm.villageName = ''
+      this.dataForm.buildId = '' //调动到的楼宇Id
+      this.dataForm.buildName = ''
+      this.dataForm.unitId = '' //调动到的单元Id
+      this.dataForm.unitName = ''
+      this.dataForm.homeId = '' //调动到的房屋Id
+      this.dataForm.homeName = ''
+    },
+
+    async loadCommunityList() {
+      const url = '/gov/org/icneighborhood/neighborhoodoption'
+
+      let params = {
+        gridId: this.dataForm.gridId,
+        agencyId: this.dataForm.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.communityList = []
+        this.communityList = [...data]
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeCommunity(id) {
+      // 小区
+      this.communityList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.villageName = item.label
+        }
+      })
+
+      const url = '/gov/org/icbuilding/buildingoption'
+
+      let params = {
+        neighborHoodId: this.dataForm.villageId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.buildingList = []
+        this.buildingList = [...data]
+        this.dataForm.buildId = '' //调动到的楼宇Id
+        this.dataForm.unitId = '' //调动到的单元Id
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeBuilding(id) {
+      // 楼号
+      this.buildingList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.buildName = item.label
+        }
+      })
+
+      const url = '/gov/org/icbuildingunit/unitoption'
+
+      let params = {
+        buildingId: this.dataForm.buildId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = []
+        this.unitList = [...data]
+        this.dataForm.unitId = '' //调动到的单元Id
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeUnit(id) {
+      // 单元号
+      this.unitList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.unitName = item.label
+        }
+      })
+
+      const url = '/gov/org/ichouse/houseoption'
+
+      let params = {
+        unitId: this.dataForm.unitId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.roomList = []
+        this.roomList = [...data]
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeHome(id) {
+      // 房屋号
+      this.roomList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.homeName = item.label
+        }
+      })
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 2000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+        } else {
+          if (this.dataForm.type === 'in') {
+            if (!this.dataForm.buildId) {
+              this.$message.warning('楼栋')
+              return false
+            }
+            if (!this.dataForm.unitId) {
+              this.$message.warning('请选择单元')
+              return false
+            }
+            if (!this.dataForm.homeId) {
+              this.$message.warning('请选择房间')
+              return false
+            }
+          }
+          this.saveForm()
+        }
+      })
+    },
+    async handleVerify() {
+      const params = {
+        id: this.detailInfo.id,
+        confirmResult: this.confirmResult,
+        reason: this.reason
+      }
+
+      const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)
+
+      if (code === 0) {
+        this.$message.success('提交成功')
+        this.handleCancle(true)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async saveForm() {
+      const url = '/epmetuser/changeRelocation/saveOutOfInfo'
+      let noData = new Date()
+      noData = util.dateFormatter(noData, 'time')
+      this.dataForm.transferTime = noData
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+
+      if (code === 0) {
+        // this.$message.success('调动成功')
+        // this.handleCancle()
+        this.handleVerify()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle(val) {
+      this.resetData()
+      this.$emit('dialogCancle', val)
+    },
+
+    resetData() {
+      this.dataForm = {
+        icUserId: '', // 被调动人ID
+        type: 'in', //操作类型【客户外out,客户内in】
+        agencyId: '', //调动到的组织Id
+        gridId: '', //调动到的网格Id
+        villageId: '', //调动到的小区ID
+        buildId: '', //调动到的楼宇Id
+        unitId: '', //调动到的单元Id
+        homeId: '', //调动到的房屋Id
+        transferTime: '', //调动时间【日期类型】
+        reason: '', //备注
+        outOfTime: '',
+        welfareFlag: false
+      }
+
+      this.customerId = '' //客户id
+      this.userId = '' //操作人员id
+      this.gridName = ''
+      this.rootAgency = {}
+
+      this.selGrid = {}
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 150px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.resi-cell-col {
+  width: 750px;
+  display: flex;
+  justify-content: flex-start;
+}
+
+.margin_left10 {
+  margin-left: 10px;
+}
+</style>

From 33b8479b1cdeb40fae1c3500cb2a3997ab3d29c2 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 23 Jun 2022 17:16:44 +0800
Subject: [PATCH 05/27] echart3d

---
 package.json                                  |   1 +
 src/assets/img/shuju/3d-pid-bg.png            | Bin 0 -> 19139 bytes
 src/assets/scss/modules/visual/search_1.scss  |   1 +
 .../communityGovern/shijianchuli/chart.js     | 275 ++++++++++++++
 .../shijianchuli/shijianchulifenxi copy 2.vue | 328 ++++++++++++++++
 .../shijianchuli/shijianchulifenxi.vue        | 352 ++++++++++++++++--
 6 files changed, 931 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/img/shuju/3d-pid-bg.png
 create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/chart.js
 create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue

diff --git a/package.json b/package.json
index 3def21d39..9fcede3be 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "babel-eslint": "^8.0.1",
     "babel-plugin-component": "^1.1.1",
     "echarts": "^5.2.2",
+    "echarts-gl": "^2.0.9",
     "element-theme": "^2.0.1",
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.5",
diff --git a/src/assets/img/shuju/3d-pid-bg.png b/src/assets/img/shuju/3d-pid-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..4519b38e8527cfdb031a82cbfe87870d9cd4d495
GIT binary patch
literal 19139
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%0At<l2;wWs3IWG2sg
ze<XOn^oT>D>*y~D3@8>xXjwaC6?y~eQ{L+G#7uqFj3N6-SE{MeXjLl{c*>F}9F+`6
zr<t$=8lGYFMKD%rc#-?O;ZeNqdS8*pztc$L|4#rT3EcLEt|J5;oS17nZozR37utn5
zK{X>580@uI4GZ9yi*+Ie?s1=AaKDb17xp@#2nmH(yKKgtxW#qs&F=3_ae!InlQ2Z2
zBXeElDc=SYYrL6Z?{vd)8%^w(8gmn<fyHj407XwO_K3$B_u1+u<l>qlbLkpZuP5o1
z@_4mG^O{W^soW={nW<+^G;>1W4kzXAn9T8o{A}BeZ3m|u$8dbEgJW~8p=BgfQ%Bq)
z16++1mZ~f({YiKJE;sgHatnAV7VFjtMHQj&whOt|HU1X&^_qT#Dk5T60e6J3STPg_
z;>zx+rkhwz%xq|4+s1|?6pey#<OJl*Qtw!3)ttej_|RYK)q+b%1?sA-E~cIs{rOUi
z889=^;}mkjusw&voCtAtvE#<9jT7@uoN$C87b8NyiAaN!$j8d=F`qZ&a+lrD+(;@{
zZys9RB)V896l*6G9+!~iTfhzOxDkcLr`AyM)il0hdUOTMfCm$e%n^<Tb~>W5%@L2y
zlMQTeeC$#?!&yf(&MmvceV$(dW|vX2-xsYg62b`f{T1{vER*TyE%lNW045ArlhXa8
z?tL2P2vLKW44#vV4Y}RIW_N6L$F|Ad@3BS)^UIyWcH#75Pb+cK9fMGDG&c%yShF-W
z)EKQwn<e?`e8e61xUqP^oo=lz<aI)EsR@OD!B%%NCm7E|k$WUGb_#$!YDrk3!8D_M
z8=>t`1Ut<f;b;`c7DqfbPiB~QGdgpXUvxxdHYXhJa2zh?+~<Xr9w#zzt&frfDFOEw
z=3$`gRT0odE6NQPezZQ6<lQ75j+PfENM`WC%XK9-jrA-Xi^F~2GTtK$6OArf?T+iq
zE@mA;IJew&B4Hb6<~wNTMo5gIv^ET}HN9XV{gmg&4K*;5*CPie^Sl}I6?fm#YM=S`
z6YGTH$s`mWh0pN}JlFkphwP2Q+eNz^b4g~ZMFZ;y)oE0dKsKYP@vI;oTO8roG%f{@
zIyIIR=OxR~?qr2kX>qiApYyGrd3ydm|6J~ZhW%rfi6-c2SZ_+gR)M<t6A?lQK@9^K
z<ye8Eqebk6jrlRw`<xo<oy$Kn>8T+vI6|=Cjyc!x*_I;=i(N+)I#}r_B}7!yz+BS<
z*KDRK3HvG3T11JDiqCw-J?6gN=T1H7?wgOp4m`aGMHA1Q*V(?l*&Q-nq(aPb4d5!*
z3C-0(9dI34j7ATWyZD3dr(nyxh2RrEpRj@;@7|y<IC*$su8X6H!Hm2<jYhsm8kly(
zW8;_<1Z4MQ{yoElJ2o^0W0|<;W<`NH7m_DjS{WSf8Lf5?Xw8q6ZtuCv{YkLWpBQev
z_1JLlmCv1)H=)Lxu_<&O`8nU^8?yR2*56R_Pe=EP^SMY+{LZg$_UsTc>CMo5mtAfv
zmO9<ybKY?U3$EfPmb#c<=^r_6(2Ye74T!Q&s3eQACV#Aa;y&1P#M`7IZ&&d)Ll6$q
zr$|{I^8QhG?jd*GL+-@#GiYr+qX>on%A@(*-a8~G68qivtKD&}`@XH5^~+KLO8i?8
z%k8Dz(&sKJa%VEVXtANV#c^Rd-$gss1|jGz+}yKv+^yJ2M?l8=gk;?P;pk04Y@|>D
zX8px1Me`f(`er84B5Y>8Z1ruoTX)EgoM(mWxWlb)bW{sM)pnK6@t6F+g=HssyU%>L
zUvU>LcYB|Uo$l(cR%L-1W(4yWKgs5WkZ6b5$vjSBxEUbeXn{Cu8JQQWnZt5L{xNqx
z&!qRDJ8=w`#$R@wP<)ME?LL5%A0O)l)RC*)I3IAs>IjHziouBlU^v`KEW3e>>^K2|
z3I8jJKOul>hQ987<coQ}m9yq?p3`KyO^I`%B1HB{$afmD&k$E4ku5WD0wD`G%))Ms
zOYj^Dl9CjI8g2?|%z-}F(M#}r#{GEA{pC1^BL3tOo+Ym)o_(*}>+Y`p(aTek6AZz=
ze)jgQz4?>HvT5XUKA2BgJkg>U6fiQKOIZ(3BR=_{V81NCOq$i)cbK!h6*F74=Zjhc
zqN5&mR0>h&%kiP8;OE!W^8G%0AJ*L;1C@Bk59=L)iUv^(L0d3Fh<>;wIqAMV;jTaA
zem~xG$a;3Znpl6G?jLvbXULSB_*b||vCsX;g9h*ExyUo1Q*13t6zD{dbZL%4;t64;
zJ;D*H5&iP1MYzP-u!IpJ5CBtnkXsFj0a<k6PA{arLZV<Xj3+YJ$VeQ`@R?E;P0Y+-
zd8BF_bw?gXE|2YS$X&F&zC6|mh4spljNI2h^2wCBNwuR$r>Kr_^pYO!a-R)^BD@g%
z!qN<k;utF6Doz$wPQ>KSOZ6PoOAOe65iYT5ThuOP37u*r0ZvF4Q5!4~B<dCk<6q<%
zzK^@(SV0&hClGpeed@0hii>&W2;7POF%VaZI9u-6<tEr}H~Adl&>emJBUntnJ%Ml;
zURe4$0+vdhRpu|&Ky4~w0D(rjz6jI{>u3EJYK+22+X;)%P%X){5hX4v2p|+2O`LVt
z<zsie7(>akck8+JX}wM;z8bH50-ow0_j)rpPg#%?jP1S8oS5XEu$U=SwD8z?WX9GU
zs$|3M-VkTP?N}s`*_p+mz;tVm>R^F`YShsHfdvLpOlcc3!fKVCvs4fSWI0!G(mms}
zqY-Xw<ZRDSVEwgDD4trcR$tCNN*332-;#93P2?Fj-yQei4#8&keN!RIXs}?E$lPjS
z0G`~=Li-QEN!55AmKL)|KupU+OZFGS=omR&S(|L4lxwceyYI6oRNpxP$T<afXh95?
z)~DV&p?IdeF7%Hl$YRJ>=u{!P2pmCighP=>0GoEZ`&0q2=EMZ<T!D>{U@{uGF^dOm
zMzK5$1|gDwgvZig_zTN7G9&_qZ--*V{gH!+bMBrzWAz1hZoz$@E6yoqi>T7T!us@C
zClu?i-V&PYA5~Y56>&%NP=YGCJLCqp!180<5s7ifQRHC-^JAj;6gS42f7jgbYO+sY
z#(Eq~30#~k2httx`1!Zxz$AOQ|EtwES8ls|+C3*Haf?4E0QoNOzKgb8opSJS(cQOL
leD?lZTo((TKCk~TzyJy&Ab$uE&i?=a002ovPDHLkV1lJ?Mk)XR

literal 0
HcmV?d00001

diff --git a/src/assets/scss/modules/visual/search_1.scss b/src/assets/scss/modules/visual/search_1.scss
index 55aaef76f..ffb46b67f 100644
--- a/src/assets/scss/modules/visual/search_1.scss
+++ b/src/assets/scss/modules/visual/search_1.scss
@@ -24,6 +24,7 @@
     display: flex;
     align-items: center;
     margin-left:40px;
+    z-index: 10;
 
     .second-select {
 
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/chart.js b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
new file mode 100644
index 000000000..8d19ca2d2
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
@@ -0,0 +1,275 @@
+/**
+ * 绘制3d图
+ * @param pieData 总数据
+ * @param internalDiameterRatio:透明的空心占比
+ * @param distance 视角到主体的距离
+ * @param alpha 旋转角度
+ * @param pieHeight 立体的高度
+ * @param opacity 饼或者环的透明度
+ */
+ const getPie3D = (pieData, internalDiameterRatio, distance, alpha, pieHeight, opacity = 1) => {
+  const series = []
+  let sumValue = 0
+  let startValue = 0
+  let endValue = 0
+  let legendData = []
+  let legendBfb = []
+  const k = 1 - internalDiameterRatio
+  pieData.sort((a, b) => {
+    return b.value - a.value
+  })
+  // 为每一个饼图数据，生成一个 series-surface 配置
+  for (let i = 0; i < pieData.length; i++) {
+    sumValue += pieData[i].value
+    const seriesItem = {
+      name:
+          typeof pieData[i].name === 'undefined'
+            ? `series${i}`
+            : pieData[i].name,
+      type: 'surface',
+      parametric: true,
+      wireframe: {
+        show: false
+      },
+      pieData: pieData[i],
+      pieStatus: {
+        selected: false,
+        hovered: false,
+        k: k
+      },
+      center: ['10%', '50%']
+    }
+    if (typeof pieData[i].itemStyle !== 'undefined') {
+      const itemStyle = {}
+      itemStyle.color =
+          typeof pieData[i].itemStyle.color !== 'undefined'
+            ? pieData[i].itemStyle.color
+            : opacity
+      itemStyle.opacity =
+          typeof pieData[i].itemStyle.opacity !== 'undefined'
+            ? pieData[i].itemStyle.opacity
+            : opacity
+      seriesItem.itemStyle = itemStyle
+    }
+    series.push(seriesItem)
+  }
+ 
+  // 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数，
+  // 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
+  legendData = []
+  legendBfb = []
+  for (let i = 0; i < series.length; i++) {
+    endValue = startValue + series[i].pieData.value
+    series[i].pieData.startRatio = startValue / sumValue
+    series[i].pieData.endRatio = endValue / sumValue
+    series[i].parametricEquation = getParametricEquation(
+      series[i].pieData.startRatio,
+      series[i].pieData.endRatio,
+      false,
+      false,
+      k,
+      series[i].pieData.value
+    )
+    startValue = endValue
+    const bfb = fomatFloat(series[i].pieData.value / sumValue, 4)
+    legendData.push({
+      name: series[i].name,
+      value: bfb
+    })
+    legendBfb.push({
+      name: series[i].name,
+      value: bfb
+    })
+  }
+  const boxHeight = getHeight3D(series, pieHeight) // 通过pieHeight设定3d饼/环的高度，单位是px
+  // 准备待返回的配置项，把准备好的 legendData、series 传入。
+  const option = {
+    legend: {
+      show: false,
+      data: legendData,
+      orient: 'vertical',
+      left: 10,
+      top: 10,
+      itemGap: 10,
+      textStyle: {
+        color: '#A1E2FF'
+      },
+      icon: 'circle',
+      formatter: function (param) {
+        const item = legendBfb.filter(item => item.name === param)[0]
+        const bfs = fomatFloat(item.value * 100, 2) + '%'
+        return `${item.name}  ${bfs}`
+      }
+    },
+    labelLine: {
+      show: true,
+      lineStyle: {
+        color: '#fff'
+      }
+    },
+    label: {
+      show: true,
+      position: 'outside',
+      formatter: '{b} \n{c} {d}%'
+    },
+    tooltip: {
+      backgroundColor: '#033b77',
+      borderColor: '#21f2c4',
+      textStyle: {
+        color: '#fff',
+        fontSize: 13
+      },
+      formatter: params => {
+        if (
+          params.seriesName !== 'mouseoutSeries' &&
+            params.seriesName !== 'pie2d'
+        ) {
+          const bfb = (
+            (option.series[params.seriesIndex].pieData.endRatio -
+                option.series[params.seriesIndex].pieData.startRatio) *
+              100
+          ).toFixed(2)
+          return (
+            `${params.seriesName}<br/>` +
+            `<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>` +
+            `${bfb}%`
+          )
+        }
+      }
+    },
+    xAxis3D: {
+      min: -1,
+      max: 1
+    },
+    yAxis3D: {
+      min: -1,
+      max: 1
+    },
+    zAxis3D: {
+      min: -1,
+      max: 1
+    },
+    grid3D: {
+      show: false,
+      boxHeight: boxHeight, // 圆环的高度
+      viewControl: {
+        // 3d效果可以放大、旋转等，请自己去查看官方配置
+        alpha, // 角度
+        beta: -40,
+        distance, // 调整视角到主体的距离，类似调整zoom
+        rotateSensitivity: 0, // 设置为0无法旋转
+        zoomSensitivity: 0, // 设置为0无法缩放
+        panSensitivity: 0, // 设置为0无法平移
+        autoRotate: false // 自动旋转
+      }
+    },
+    series: series
+  }
+  return option
+}
+ 
+/**
+ * 生成扇形的曲面参数方程，用于 series-surface.parametricEquation
+ */
+const getParametricEquation = (startRatio, endRatio, isSelected, isHovered, k, h) => {
+  // 计算
+  const midRatio = (startRatio + endRatio) / 2
+  const startRadian = startRatio * Math.PI * 2
+  const endRadian = endRatio * Math.PI * 2
+  const midRadian = midRatio * Math.PI * 2
+  // 如果只有一个扇形，则不实现选中效果。
+  if (startRatio === 0 && endRatio === 1) {
+    isSelected = false
+  }
+  // 通过扇形内径/外径的值，换算出辅助参数 k（默认值 1/3）
+  k = typeof k !== 'undefined' ? k : 1 / 3
+  // 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0）
+  const offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0
+  const offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0
+  // 计算高亮效果的放大比例（未高亮，则比例为 1）
+  const hoverRate = isHovered ? 1.05 : 1
+  // 返回曲面参数方程
+  return {
+    u: {
+      min: -Math.PI,
+      max: Math.PI * 3,
+      step: Math.PI / 32
+    },
+    v: {
+      min: 0,
+      max: Math.PI * 2,
+      step: Math.PI / 20
+    },
+    x: function (u, v) {
+      if (u < startRadian) {
+        return (
+          offsetX +
+          Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate
+        )
+      }
+      if (u > endRadian) {
+        return (
+          offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate
+        )
+      }
+      return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate
+    },
+    y: function (u, v) {
+      if (u < startRadian) {
+        return (
+          offsetY +
+          Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate
+        )
+      }
+      if (u > endRadian) {
+        return (
+          offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate
+        )
+      }
+      return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate
+    },
+    z: function (u, v) {
+      if (u < -Math.PI * 0.5) {
+        return Math.sin(u)
+      }
+      if (u > Math.PI * 2.5) {
+        return Math.sin(u) * h * 0.1
+      }
+      return Math.sin(v) > 0 ? 1 * h * 0.1 : -1
+    }
+  }
+}
+ 
+/**
+ * 获取3d丙图的最高扇区的高度
+ */
+const getHeight3D = (series, height) => {
+  series.sort((a, b) => {
+    return b.pieData.value - a.pieData.value
+  })
+  return (height * 25) / series[0].pieData.value
+}
+ 
+/**
+ * 格式化浮点数
+ */
+const fomatFloat = (num, n) => {
+  let f = parseFloat(num)
+  if (isNaN(f)) {
+    return false
+  }
+  f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n) // n 幂
+  let s = f.toString()
+  let rs = s.indexOf('.')
+  // 判定如果是整数，增加小数点再补0
+  if (rs < 0) {
+    rs = s.length
+    s += '.'
+  }
+  while (s.length <= rs + n) {
+    s += '0'
+  }
+  return s
+}
+ 
+export { getPie3D, getParametricEquation }
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue
new file mode 100644
index 000000000..8ec4d06f2
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue	
@@ -0,0 +1,328 @@
+<template>
+  <div class="chart-container">
+    <div class="chart"
+         id="cityGreenLand"
+         ref="chart"></div>
+    <!-- 底座背景 -->
+    <div class="bg"></div>
+  </div>
+</template>
+ 
+<script>
+import * as echarts from 'echarts';
+// import echarts from 'echarts'
+import 'echarts-gl';
+import { getPie3D, getParametricEquation } from './chart.js' //工具类js，页面路径自己修改
+
+const color = ['#005aff', '#f8b551']
+
+export default {
+  name: 'chart',
+  data () {
+    return {
+      optionData: [
+        {
+          name: '处理中',
+          value: 28
+        },
+        {
+          name: '已完成',
+          value: 72
+        }
+      ],
+      statusChart: null,
+      option: {}
+    }
+  },
+  created () {
+    this.setLabel()
+  },
+  mounted () {
+    this.initChart()
+
+    //根据窗口变化自动调节图表大小
+    const that = this
+    window.onresize = function () {
+      that.changeSize()
+    }
+  },
+  methods: {
+    // 初始化label样式
+    setLabel () {
+      this.optionData.forEach((item, index) => {
+        item.itemStyle = {
+          color: color[index]
+        }
+        item.label = {
+          normal: {
+            show: true,
+            color: color[index],
+            formatter: [
+              '{d|{d}%}',
+              '{b|{b}}'
+
+
+            ].join('\n'), // 用\n来换行
+            rich: {
+              b: {
+                color: '#fff',
+                lineHeight: 25,
+                align: 'left',
+                fontSize: 16,
+                marginTop: 20
+              },
+              c: {
+                fontSize: 22,
+                color: '#fff',
+                textShadowColor: '#1c90a6',
+                textShadowOffsetX: 0,
+                textShadowOffsetY: 2,
+                textShadowBlur: 5
+              },
+              d: {
+                color: color[index],
+                fontSize: 25,
+                align: 'left'
+              }
+            }
+          }
+        }
+        item.labelLine = {
+          normal: {
+            length: 30,
+            length2: 80,
+            lineStyle: {
+              width: 1,
+              color: 'rgba(255,255,255,0.7)'
+            }
+          }
+        }
+        item.labelLayout = function (params) {
+          const isLeft = params.labelRect.x < myChart.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
+          };
+        }
+      })
+    },
+    // 图表初始化
+    initChart () {
+      // let statusChart = echarts.init(document.getElementById('cityGreenLand-charts'));
+      this.statusChart = echarts.init(document.getElementById('cityGreenLand'));
+      // 传入数据生成 option, 构建3d饼状图, 参数工具文件已经备注的很详细
+      this.option = getPie3D(this.optionData, 0.8, 220, 28, 22, 0.4)
+      this.statusChart.setOption(this.option)
+      // 是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption
+      this.option.series.push({
+        name: '电梯状态', //自己根据场景修改
+        backgroundColor: 'transparent',
+        type: 'pie',
+        label: {
+          opacity: 1,
+          fontSize: 13,
+          lineHeight: 20
+        },
+        startAngle: 40, // 起始角度，支持范围[0, 360]。
+        clockwise: false, // 饼图的扇区是否是顺时针排布。上述这两项配置主要是为了对齐3d的样式
+        radius: ['40%', '50%'],
+        center: ['50%', '50%'],
+        data: this.optionData,
+        itemStyle: {
+          opacity: 0  //这里必须是0，不然2d的图会覆盖在表面
+        }
+      })
+      this.statusChart.setOption(this.option)
+      this.bindListen(this.statusChart)
+    },
+    // 监听鼠标事件，实现饼图选中效果（单选），近似实现高亮（放大）效果。
+    // optionName是防止有多个图表进行定向option传递，单个图表可以不传，默认是opiton
+    bindListen (myChart, optionName = 'option') {
+      let selectedIndex = ''
+      let hoveredIndex = ''
+      // 监听点击事件，实现选中效果（单选）
+      myChart.on('click', (params) => {
+        // 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
+        const isSelected = !this[optionName].series[params.seriesIndex].pieStatus
+          .selected
+        const isHovered =
+          this[optionName].series[params.seriesIndex].pieStatus.hovered
+        const k = this[optionName].series[params.seriesIndex].pieStatus.k
+        const startRatio =
+          this[optionName].series[params.seriesIndex].pieData.startRatio
+        const endRatio =
+          this[optionName].series[params.seriesIndex].pieData.endRatio
+        // 如果之前选中过其他扇形，将其取消选中（对 option 更新）
+        if (selectedIndex !== '' && selectedIndex !== params.seriesIndex) {
+          this[optionName].series[
+            selectedIndex
+          ].parametricEquation = getParametricEquation(
+            this[optionName].series[selectedIndex].pieData.startRatio,
+            this[optionName].series[selectedIndex].pieData.endRatio,
+            false,
+            false,
+            k,
+            this[optionName].series[selectedIndex].pieData.value
+          )
+          this[optionName].series[selectedIndex].pieStatus.selected = false
+        }
+        // 对当前点击的扇形，执行选中/取消选中操作（对 option 更新）
+        this[optionName].series[
+          params.seriesIndex
+        ].parametricEquation = getParametricEquation(
+          startRatio,
+          endRatio,
+          isSelected,
+          isHovered,
+          k,
+          this[optionName].series[params.seriesIndex].pieData.value
+        )
+        this[optionName].series[params.seriesIndex].pieStatus.selected = isSelected
+        // 如果本次是选中操作，记录上次选中的扇形对应的系列号 seriesIndex
+        selectedIndex = isSelected ? params.seriesIndex : null
+        // 使用更新后的 option，渲染图表
+        myChart.setOption(this[optionName])
+      })
+      // 监听 mouseover，近似实现高亮（放大）效果
+      // myChart.on('mouseover', (params) => {
+      //   // 准备重新渲染扇形所需的参数
+      //   let isSelected
+      //   let isHovered
+      //   let startRatio
+      //   let endRatio
+      //   let k
+      //   // 如果触发 mouseover 的扇形当前已高亮，则不做操作
+      //   if (hoveredIndex === params.seriesIndex) {
+      //     // 否则进行高亮及必要的取消高亮操作
+      //   } else {
+      //     // 如果当前有高亮的扇形，取消其高亮状态（对 option 更新）
+      //     if (hoveredIndex !== '') {
+      //       // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 false。
+      //       isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
+      //       isHovered = false
+      //       startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
+      //       endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
+      //       k = this[optionName].series[hoveredIndex].pieStatus.k
+      //       // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
+      //       this[optionName].series[
+      //         hoveredIndex
+      //       ].parametricEquation = getParametricEquation(
+      //         startRatio,
+      //         endRatio,
+      //         isSelected,
+      //         isHovered,
+      //         k,
+      //         this[optionName].series[hoveredIndex].pieData.value
+      //       )
+      //       this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
+      //       // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
+      //       hoveredIndex = ''
+      //     }
+      //     // 如果触发 mouseover 的扇形不是透明圆环，将其高亮（对 option 更新）
+      //     if (
+      //       params.seriesName !== 'mouseoutSeries' &&
+      //       params.seriesName !== 'pie2d'
+      //     ) {
+      //       // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
+      //       isSelected =
+      //         this[optionName].series[params.seriesIndex].pieStatus.selected
+      //       isHovered = true
+      //       startRatio =
+      //         this[optionName].series[params.seriesIndex].pieData.startRatio
+      //       endRatio = this[optionName].series[params.seriesIndex].pieData.endRatio
+      //       k = this[optionName].series[params.seriesIndex].pieStatus.k
+      //       // 对当前点击的扇形，执行高亮操作（对 option 更新）
+      //       this[optionName].series[
+      //         params.seriesIndex
+      //       ].parametricEquation = getParametricEquation(
+      //         startRatio,
+      //         endRatio,
+      //         isSelected,
+      //         isHovered,
+      //         k,
+      //         this[optionName].series[params.seriesIndex].pieData.value + 60
+      //       )
+      //       this[optionName].series[
+      //         params.seriesIndex
+      //       ].pieStatus.hovered = isHovered
+      //       // 记录上次高亮的扇形对应的系列号 seriesIndex
+      //       hoveredIndex = params.seriesIndex
+      //     }
+      //     // 使用更新后的 option，渲染图表
+      //     myChart.setOption(this[optionName])
+      //   }
+      // })
+      // // 修正取消高亮失败的 bug
+      //   myChart.on('globalout', () => {
+      //   // 准备重新渲染扇形所需的参数
+      //   let isSelected
+      //   let isHovered
+      //   let startRatio
+      //   let endRatio
+      //   let k
+      //   if (hoveredIndex !== '') {
+      //     // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
+      //     isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
+      //     isHovered = false
+      //     k = this[optionName].series[hoveredIndex].pieStatus.k
+      //     startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
+      //     endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
+      //     // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
+      //     this[optionName].series[
+      //       hoveredIndex
+      //     ].parametricEquation = getParametricEquation(
+      //       startRatio,
+      //       endRatio,
+      //       isSelected,
+      //       isHovered,
+      //       k,
+      //       this[optionName].series[hoveredIndex].pieData.value
+      //     )
+      //     this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
+      //     // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
+      //     hoveredIndex = ''
+      //   }
+      //   // 使用更新后的 option，渲染图表
+      //   myChart.setOption(this[optionName])
+      // })
+
+    },
+    // 自适应宽高
+    changeSize () {
+      this.statusChart.resize()
+    }
+  }
+}
+</script>
+ 
+<style lang='scss' scoped>
+.chart-container {
+  position: relative;
+  width: 100%;
+  height: 800px;
+
+  .chart,
+  .bg {
+    width: 100%;
+    height: 800px;
+    z-index: 2;
+  }
+
+  .bg {
+    position: absolute;
+    bottom: 180px;
+    left: 50%;
+    z-index: 1;
+    width: 570px;
+    height: 340px;
+    background: no-repeat center;
+    background-image: url("../../../../../assets/img/shuju/3d-pid-bg.png");
+    background-size: 100% 100%;
+    transform: translateX(-50%);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 301a60a96..a6baa08f1 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -23,7 +23,7 @@
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
-                       @click.native="handleChangeDate(item.value)">
+                       @click.native="handleChangeDate(item.value,true)">
             </el-option>
           </el-select>
         </div>
@@ -51,22 +51,26 @@
 
           <div v-if="!pieNoData && !dataLoading"
                class="g-pie">
-            <screen-echarts-frame class="echart-wr"
+            <div class="chart-container">
+              <div class="chart"
+                   id="cityGreenLand"
+                   ref="chart"></div>
+              <!-- <screen-echarts-frame class="echart-wr"
                                   @myChartMethod="pieInitOk"
-                                  ref="pieChart"></screen-echarts-frame>
+                                  ref="pieChart"></screen-echarts-frame> -->
+              <!-- 底座背景 -->
+              <div class="bg"></div>
+            </div>
 
-            <div class="pie-legend">
+            <!-- <div class="pie-legend">
               <div :class="['legend_item',{'item_last':index===legendArray.length-1}]"
                    v-for="(item,index) in legendArray"
                    :key="index">
                 <div class="item_name">{{item.name}}</div>
                 <img :src="item.url" />
-                <!-- <div class="item_num">
-                  <span class="item_count">{{item.count}}</span>
-                  <span class="item_percent">{{item.percent}}</span>
-                </div> -->
+               
               </div>
-            </div>
+            </div> -->
 
           </div>
           <screen-nodata class="nodata"
@@ -140,6 +144,11 @@ import { lineOption } from './lineOption.js'
 import nextTick from 'dai-js/tools/nextTick'
 import dateFormat from "dai-js/tools/dateFormat";
 
+import * as echarts from 'echarts';
+import 'echarts-gl';
+import { getPie3D, getParametricEquation } from './chart.js' //工具类js，页面路径自己修改
+
+const color = ['#005aff', '#f8b551']
 
 export default {
   name: "shijianchulifenxi",
@@ -169,6 +178,18 @@ export default {
 
 
       pieData: [],
+      optionData: [
+        {
+          name: '处理中',
+          value: 28
+        },
+        {
+          name: '已完成',
+          value: 72
+        }
+      ],
+      statusChart: null,
+      option: {},
 
       legendArray: [
         {
@@ -292,15 +313,17 @@ export default {
     //初始化时间、各组件
     this.initData()
     await this.getAgencylist()//获取组织级别
-    this.handleChangeDate(this.dataType)
+    this.handleChangeDate(this.dataType, false)
     //获取服务器数据
+
     await this.getProjectTotal()
     await this.getLineChart()
+    await this.getTable()
 
     this.dataLoading = false
 
 
-    // this.assignData()
+    this.assignData()
 
   },
 
@@ -314,7 +337,7 @@ export default {
 
     },
 
-    async handleChangeDate (index) {
+    async handleChangeDate (index, isRefresh) {
       let end = new Date();
       let start = new Date();
       if (index === '1') {//近一年
@@ -333,7 +356,7 @@ export default {
         this.queryStartTime = dateFormat(start, 'yyyy-MM-dd') + " 00:00:00"
         this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59"
       }
-      if (index !== '0') {
+      if (index !== '0' && isRefresh) {
         await this.getApiData()
         // this.assignPieChart()
       }
@@ -342,8 +365,8 @@ export default {
     },
 
     assignData () {
-
-      this.getPie()
+      this.initChart()
+      // this.getPie()
       this.getLine()
     },
 
@@ -384,10 +407,10 @@ export default {
 
     //加载项目
     async getProjectTotal () {
-      if (this.$refs.pieChart) {
-        this.$refs.pieChart.showLoading()
-        this.$refs.pieChart.clear()
-      }
+      // if (this.$refs.pieChart) {
+      //   this.$refs.pieChart.showLoading()
+      //   this.$refs.pieChart.clear()
+      // }
 
       const url = "/gov/project/icEvent/processAnalysis/processStatusRatio";
       //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio";
@@ -399,9 +422,9 @@ export default {
       };
 
       const { data, code, msg } = await requestPost(url, params);
-      if (this.$refs.pieChart) {
-        this.$refs.pieChart.hideLoading()
-      }
+      // if (this.$refs.pieChart) {
+      //   this.$refs.pieChart.hideLoading()
+      // }
       if (code === 0) {
         this.projectTotal = parseInt(data.processingCount) + parseInt(data.closedCount);
 
@@ -420,7 +443,7 @@ export default {
           }
         ]
 
-        this.pieData = [
+        this.optionData = [
 
           {
             name: "已完成",
@@ -431,6 +454,7 @@ export default {
             value: Math.floor(data.processingRatio * 10000) / 100
           },
         ]
+        this.setLabel()
 
       } else {
         this.$message.error(msg);
@@ -655,8 +679,6 @@ export default {
         }
       });
 
-
-
       this.pieOption.series[1].data = this.pieData
       this.demand.pageNo = 1
       this.getTable()
@@ -665,6 +687,255 @@ export default {
       this.$refs.pieChart.setOption(this.pieOption)
     },
 
+    setLabel () {
+      this.optionData.forEach((item, index) => {
+
+        item.itemStyle = {
+          color: color[index]
+        }
+        item.label = {
+          normal: {
+            show: true,
+            color: color[index],
+            formatter: [
+              '{d|{d}%}',
+              '{b|{b}}'
+
+
+            ].join('\n'), // 用\n来换行
+            rich: {
+              b: {
+                color: '#fff',
+                lineHeight: 25,
+                align: 'left',
+                fontSize: 13,
+                marginTop: 20
+              },
+              c: {
+                fontSize: 22,
+                color: '#fff',
+                textShadowColor: '#1c90a6',
+                textShadowOffsetX: 0,
+                textShadowOffsetY: 2,
+                textShadowBlur: 5
+              },
+              d: {
+                color: color[index],
+                fontSize: 22,
+                align: 'left'
+              }
+            }
+          }
+        }
+        item.labelLine = {
+          normal: {
+            length: 30,
+            length2: 80,
+            lineStyle: {
+              width: 1,
+              color: 'rgba(255,255,255,0.7)'
+            }
+          }
+        }
+        item.labelLayout = function (params) {
+          const isLeft = params.labelRect.x < myChart.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
+          };
+        }
+      })
+    },
+
+    // 图表初始化
+    initChart () {
+      this.$nextTick(() => {
+        // let statusChart = echarts.init(document.getElementById('cityGreenLand-charts'));
+        this.statusChart = echarts.init(document.getElementById('cityGreenLand'));
+        // 传入数据生成 option, 构建3d饼状图, 参数工具文件已经备注的很详细
+        this.option = getPie3D(this.optionData, 0.8, 300, 28, 22, 0.4)
+        this.statusChart.setOption(this.option)
+        // 是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption
+        this.option.series.push({
+          name: '', //自己根据场景修改
+          backgroundColor: 'transparent',
+          type: 'pie',
+          label: {
+            opacity: 1,
+            fontSize: 13,
+            lineHeight: 20
+          },
+          startAngle: 40, // 起始角度，支持范围[0, 360]。
+          clockwise: false, // 饼图的扇区是否是顺时针排布。上述这两项配置主要是为了对齐3d的样式
+          radius: ['30%', '35%'],
+          center: ['50%', '50%'],
+          data: this.optionData,
+          itemStyle: {
+            opacity: 0  //这里必须是0，不然2d的图会覆盖在表面
+          }
+        })
+        this.statusChart.setOption(this.option)
+        this.bindListen(this.statusChart)
+      })
+
+    },
+    // 监听鼠标事件，实现饼图选中效果（单选），近似实现高亮（放大）效果。
+    // optionName是防止有多个图表进行定向option传递，单个图表可以不传，默认是opiton
+    bindListen (myChart, optionName = 'option') {
+      let selectedIndex = ''
+      let hoveredIndex = ''
+      // 监听点击事件，实现选中效果（单选）
+      myChart.on('click', (params) => {
+        // 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
+        const isSelected = !this[optionName].series[params.seriesIndex].pieStatus
+          .selected
+        const isHovered =
+          this[optionName].series[params.seriesIndex].pieStatus.hovered
+        const k = this[optionName].series[params.seriesIndex].pieStatus.k
+        const startRatio =
+          this[optionName].series[params.seriesIndex].pieData.startRatio
+        const endRatio =
+          this[optionName].series[params.seriesIndex].pieData.endRatio
+        // 如果之前选中过其他扇形，将其取消选中（对 option 更新）
+        if (selectedIndex !== '' && selectedIndex !== params.seriesIndex) {
+          this[optionName].series[
+            selectedIndex
+          ].parametricEquation = getParametricEquation(
+            this[optionName].series[selectedIndex].pieData.startRatio,
+            this[optionName].series[selectedIndex].pieData.endRatio,
+            false,
+            false,
+            k,
+            this[optionName].series[selectedIndex].pieData.value
+          )
+          this[optionName].series[selectedIndex].pieStatus.selected = false
+        }
+        // 对当前点击的扇形，执行选中/取消选中操作（对 option 更新）
+        this[optionName].series[
+          params.seriesIndex
+        ].parametricEquation = getParametricEquation(
+          startRatio,
+          endRatio,
+          isSelected,
+          isHovered,
+          k,
+          this[optionName].series[params.seriesIndex].pieData.value
+        )
+        this[optionName].series[params.seriesIndex].pieStatus.selected = isSelected
+        // 如果本次是选中操作，记录上次选中的扇形对应的系列号 seriesIndex
+        selectedIndex = isSelected ? params.seriesIndex : null
+        // 使用更新后的 option，渲染图表
+        myChart.setOption(this[optionName])
+      })
+      // 监听 mouseover，近似实现高亮（放大）效果
+      // myChart.on('mouseover', (params) => {
+      //   // 准备重新渲染扇形所需的参数
+      //   let isSelected
+      //   let isHovered
+      //   let startRatio
+      //   let endRatio
+      //   let k
+      //   // 如果触发 mouseover 的扇形当前已高亮，则不做操作
+      //   if (hoveredIndex === params.seriesIndex) {
+      //     // 否则进行高亮及必要的取消高亮操作
+      //   } else {
+      //     // 如果当前有高亮的扇形，取消其高亮状态（对 option 更新）
+      //     if (hoveredIndex !== '') {
+      //       // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 false。
+      //       isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
+      //       isHovered = false
+      //       startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
+      //       endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
+      //       k = this[optionName].series[hoveredIndex].pieStatus.k
+      //       // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
+      //       this[optionName].series[
+      //         hoveredIndex
+      //       ].parametricEquation = getParametricEquation(
+      //         startRatio,
+      //         endRatio,
+      //         isSelected,
+      //         isHovered,
+      //         k,
+      //         this[optionName].series[hoveredIndex].pieData.value
+      //       )
+      //       this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
+      //       // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
+      //       hoveredIndex = ''
+      //     }
+      //     // 如果触发 mouseover 的扇形不是透明圆环，将其高亮（对 option 更新）
+      //     if (
+      //       params.seriesName !== 'mouseoutSeries' &&
+      //       params.seriesName !== 'pie2d'
+      //     ) {
+      //       // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
+      //       isSelected =
+      //         this[optionName].series[params.seriesIndex].pieStatus.selected
+      //       isHovered = true
+      //       startRatio =
+      //         this[optionName].series[params.seriesIndex].pieData.startRatio
+      //       endRatio = this[optionName].series[params.seriesIndex].pieData.endRatio
+      //       k = this[optionName].series[params.seriesIndex].pieStatus.k
+      //       // 对当前点击的扇形，执行高亮操作（对 option 更新）
+      //       this[optionName].series[
+      //         params.seriesIndex
+      //       ].parametricEquation = getParametricEquation(
+      //         startRatio,
+      //         endRatio,
+      //         isSelected,
+      //         isHovered,
+      //         k,
+      //         this[optionName].series[params.seriesIndex].pieData.value + 60
+      //       )
+      //       this[optionName].series[
+      //         params.seriesIndex
+      //       ].pieStatus.hovered = isHovered
+      //       // 记录上次高亮的扇形对应的系列号 seriesIndex
+      //       hoveredIndex = params.seriesIndex
+      //     }
+      //     // 使用更新后的 option，渲染图表
+      //     myChart.setOption(this[optionName])
+      //   }
+      // })
+      // // 修正取消高亮失败的 bug
+      //   myChart.on('globalout', () => {
+      //   // 准备重新渲染扇形所需的参数
+      //   let isSelected
+      //   let isHovered
+      //   let startRatio
+      //   let endRatio
+      //   let k
+      //   if (hoveredIndex !== '') {
+      //     // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
+      //     isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
+      //     isHovered = false
+      //     k = this[optionName].series[hoveredIndex].pieStatus.k
+      //     startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
+      //     endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
+      //     // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
+      //     this[optionName].series[
+      //       hoveredIndex
+      //     ].parametricEquation = getParametricEquation(
+      //       startRatio,
+      //       endRatio,
+      //       isSelected,
+      //       isHovered,
+      //       k,
+      //       this[optionName].series[hoveredIndex].pieData.value
+      //     )
+      //     this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
+      //     // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
+      //     hoveredIndex = ''
+      //   }
+      //   // 使用更新后的 option，渲染图表
+      //   myChart.setOption(this[optionName])
+      // })
+
+    },
+
     handleChangeAgency () {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
@@ -719,7 +990,7 @@ export default {
       this.userId = id;
     },
     userId () {
-      // this.getApiData();
+
       window.scrollTo(0, 0);
     },
   },
@@ -737,4 +1008,33 @@ export default {
   scoped
 ></style>
 
+<style lang='scss' scoped>
+.chart-container {
+  position: relative;
+  width: 600px;
+  height: 500px;
+  margin-top: 50px;
+
+  .chart,
+  .bg {
+    width: 600px;
+    height: 500px;
+    z-index: 2;
+  }
+
+  .bg {
+    position: absolute;
+    bottom: 155px;
+    left: 50%;
+    z-index: 1;
+    width: 250px;
+    height: 140px;
+    background: no-repeat center;
+    background-image: url("../../../../../assets/img/shuju/3d-pid-bg.png");
+    background-size: 100% 100%;
+    transform: translateX(-50%);
+  }
+}
+</style>
+
 

From cbebffad7667b569147cc90fec6123e7aca9686a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 23 Jun 2022 17:18:28 +0800
Subject: [PATCH 06/27] dd

---
 src/views/components/resiSearch.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index ddbd29fab..78da43f1d 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -173,6 +173,7 @@
                   size="small"
                   clearable
                   class="resi-cell-select"
+                  :collapse-tags="n.multiSelect == 1 ? true : false"
                   :multiple="n.multiSelect == 1 ? true : false"
                 >
                   <el-option
@@ -710,13 +711,13 @@ export default {
     min-height: 32px;
   }
   .resi-cell-input {
-    width: 200px;
+    max-width: 200px;
   }
   .resi-cell--daterange {
-    max-width: 260px;
+    max-width: 240px;
   }
   .resi-cell-select {
-    width: 200px;
+    max-width: 200px;
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {

From 44cc7645bfd255291255f9da45dd88c3198d3c81 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 24 Jun 2022 08:36:16 +0800
Subject: [PATCH 07/27] 11

---
 .../modules/visual/shijianchulifenxi.scss     | 40 +++++----
 .../shijianchuli/shijianchulifenxi.vue        |  6 +-
 src/views/modules/visual/cpts/tb.vue          | 90 +++++++++----------
 3 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss
index bd9655728..01f5d7385 100644
--- a/src/assets/scss/modules/visual/shijianchulifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss
@@ -35,25 +35,7 @@
 }
 
 .l_bottom {
-  .bottom_label {
-    position: relative;
-    padding-left: 40px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #fff;
-  }
-  .bottom_label::after {
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 20px;
-    width: 12px;
-    height: 12px;
-    box-sizing: border-box;
-    margin-top: -6px;
-    background: #2865fa;
-    border-radius: 50%;
-  }
+ 
   > span {
     font-size: 18px;
     font-family: PingFang SC;
@@ -66,6 +48,26 @@
   }
 }
 
+.bottom_label {
+  position: relative;
+  padding-left: 40px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #fff;
+}
+.bottom_label::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 20px;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-top: -6px;
+  background: #2865fa;
+  border-radius: 50%;
+}
+
 
 .g-r {
   .m-tb {
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index a6baa08f1..44c35ded5 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -47,6 +47,8 @@
     </div>
     <div class="g-cpt-resi">
       <div class="g-l">
+        <div class="bottom_label"
+             style="margin-top:20px">事件总览</div>
         <div class="l_top">
 
           <div v-if="!pieNoData && !dataLoading"
@@ -329,7 +331,7 @@ export default {
 
   methods: {
     async getApiData () {
-
+      this.getTable()
       await this.getProjectTotal()
       await this.getLineChart()
 
@@ -1013,7 +1015,7 @@ export default {
   position: relative;
   width: 600px;
   height: 500px;
-  margin-top: 50px;
+  margin-top: 0;
 
   .chart,
   .bg {
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 317f438f0..8b77155dd 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -1,68 +1,66 @@
 <template>
   <div class="m-table">
-    <table class="table" border="0" cellspacing="0" cellpadding="0">
-      <col
-        :align="item.align"
-        :width="item.width"
-        :key="'col' + index"
-        v-for="(item, index) in colList"
-      />
+    <table class="table"
+           border="0"
+           cellspacing="0"
+           cellpadding="0">
+      <col :align="item.align"
+           :width="item.width"
+           :key="'col' + index"
+           v-for="(item, index) in colList" />
 
       <thead>
         <tr class="table-header">
-          <th class="table-header-th" v-for="item in header" :key="item">
+          <th class="table-header-th"
+              v-for="item in header"
+              :key="item">
             {{ item }}
           </th>
         </tr>
       </thead>
       <tbody class="table-body">
-        <tr class="table-body-tr" v-for="(value, index) in list" :key="index">
-          <td class="td" v-for="(item, indexs) in value" :key="indexs">
+        <tr class="table-body-tr"
+            v-for="(value, index) in list"
+            :key="index">
+          <td class="td"
+              v-for="(item, indexs) in value"
+              :key="indexs">
             <div v-if="typeof item === 'string' || typeof item === 'number'">
               {{ item }}
             </div>
             <div v-if="typeof item === 'object' && item && item.type == 'index'">
-              <img
-                v-if="highlightTop3 && index == 0"
-                src="@/assets/img/shuju/top/1.png"
-                alt=""
-              />
-              <img
-                v-else-if="highlightTop3 && index == 1"
-                src="@/assets/img/shuju/top/2.png"
-                alt=""
-              />
-              <img
-                v-else-if="highlightTop3 && index == 2"
-                src="@/assets/img/shuju/top/3.png"
-                alt=""
-              />
+              <img v-if="highlightTop3 && index == 0"
+                   src="@/assets/img/shuju/top/1.png"
+                   alt="" />
+              <img v-else-if="highlightTop3 && index == 1"
+                   src="@/assets/img/shuju/top/2.png"
+                   alt="" />
+              <img v-else-if="highlightTop3 && index == 2"
+                   src="@/assets/img/shuju/top/3.png"
+                   alt="" />
               <span v-else>{{ index + 1 }}</span>
             </div>
-            <a
-              v-else-if="typeof item === 'object' && item  && item.type == 'operate'"
-              v-for="btn in item.list"
-              :key="'operate' + index + btn"
-              @click="handleClickBtn(index, btn)"
-              >{{ btn }}</a
-            >
-            <a
-              v-else-if="typeof item === 'object' && item && item.type == 'people'"
-              @click="handleClickPeople(item)"
-              >{{ item.name }}</a
-            >
+            <a v-else-if="typeof item === 'object' && item  && item.type == 'operate'"
+               v-for="btn in item.list"
+               :key="'operate' + index + btn"
+               @click="handleClickBtn(index, btn)">{{ btn }}</a>
+            <a v-else-if="typeof item === 'object' && item && item.type == 'people'"
+               @click="handleClickPeople(item)">{{ item.name }}</a>
           </td>
         </tr>
       </tbody>
     </table>
 
-    <div class="table-status" v-if="loading">
+    <div class="table-status"
+         v-if="loading">
       <screen-loading>加载中</screen-loading>
     </div>
 
-    <div class="table-status" v-if="list.length == 0 && !loading">
+    <div class="table-status"
+         v-if="list.length == 0 && !loading">
       <div class="no-data">
-        <img src="@/assets/img/modules/visual/noData.png" class="no-data-img" />
+        <img src="@/assets/img/modules/visual/noData.png"
+             class="no-data-img" />
       </div>
     </div>
   </div>
@@ -131,20 +129,20 @@ export default {
       default: false,
     },
   },
-  data() {
+  data () {
     return {};
   },
   watch: {},
 
-  mounted() {},
+  mounted () { },
 
-  created() {},
+  created () { },
 
   methods: {
-    handleClickBtn(index, type) {
+    handleClickBtn (index, type) {
       this.$emit("operate", index, type);
     },
-    handleClickPeople(item) {
+    handleClickPeople (item) {
       this.$router.push({
         path: `/main-shuju/visual-basicinfo-people/${item.uid}`,
       });
@@ -193,7 +191,7 @@ export default {
           box-sizing: border-box;
           text-align: center;
           border: none;
-          padding: 10px 5px;
+          padding: 20px 5px;
 
           > div {
             overflow: hidden;

From 0b0a63a5c4115653e24b8495869057f6ce127302 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 24 Jun 2022 09:39:16 +0800
Subject: [PATCH 08/27] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/shijianchulifenxi.scss     |   4 +-
 .../communityGovern/shijianchuli/chart.js     |  31 +--
 .../shijianchuli/lineOption.js                | 108 ++++++++--
 .../shijianchuli/shijianchulifenxi.vue        | 204 +++++++++---------
 4 files changed, 209 insertions(+), 138 deletions(-)

diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss
index 01f5d7385..ca099bed4 100644
--- a/src/assets/scss/modules/visual/shijianchulifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss
@@ -21,8 +21,8 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 200px - 355px);
-      margin-top: 20px;
+      height: calc(100vh - 200px - 365px);
+      margin-top: 0;
     }
   }
 
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/chart.js b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
index 8d19ca2d2..f7c5dda59 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/chart.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
@@ -120,21 +120,22 @@
         fontSize: 13
       },
       formatter: params => {
-        if (
-          params.seriesName !== 'mouseoutSeries' &&
-            params.seriesName !== 'pie2d'
-        ) {
-          const bfb = (
-            (option.series[params.seriesIndex].pieData.endRatio -
-                option.series[params.seriesIndex].pieData.startRatio) *
-              100
-          ).toFixed(2)
-          return (
-            `${params.seriesName}<br/>` +
-            `<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>` +
-            `${bfb}%`
-          )
-        }
+        
+        // if (
+        //   params.seriesName !== 'mouseoutSeries' &&
+        //     params.seriesName !== 'pie2d'
+        // ) {
+        //   const bfb = (
+        //     (option.series[params.seriesIndex].pieData.endRatio -
+        //         option.series[params.seriesIndex].pieData.startRatio) *
+        //       100
+        //   ).toFixed(2)
+        //   return (
+        //     `${params.seriesName}<br/>` +
+        //     `<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>` +
+        //     `${bfb}%`
+        //   )
+        // }
       }
     },
     xAxis3D: {
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
index 04b4f9503..d02e4b20b 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
@@ -1,4 +1,11 @@
 import * as echarts from 'echarts'
+let circleList = [
+  'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFdklEQVRYhY1YTY/bRBh+/BHbiRN7l02bqst+st1dVT0gceXABYk7PfYPwIELv4IfABJ3euuBCxKCKxckBEKi2y1F6Xa3abTZT+fLHxnbaMZje+zE3Y70aiLPzPs888w778xEin/8EO9YJKGbVDEkrvhdWdSKBumGehGJReBVdVZyApsPk/roicSdi4aKb4sUEK38jeLEHIdVRQWOnsgLgORCLWsKzFUDqlmHXEvGRzMCMnEx6XmIgpCDRaU6saMnMTYfRpmMQgzIJdCiNTebqHc6kHUbMYkQBT7ikCReFBWypkNSZUS+A/f0FOOjMSdRtlgglikgypwCK8z0FQPWzgYkpQn/8grT3jFmo0ggjMxhrSWjsWqhcXcP9c4Yo5fH8AYugFDQOSVBx8apAqkzRQBXYd1bhnF7G8HVNZznV4hDhZNWuIkEQm4EkhLC3luGtrwEb9DF8MUV+560R7xmpFXMB1kCYu+1obc3MD7qY9qbAagDqHFTKwhQkBnicIbrgyEaqy6am9uQ5Fdwnp8LfaW0FpcgX3NzvcXARy/6cAchB9e5aZxEqhaEWVGiAQCftU97PuJZH617GzBdH5Njh4/JglKdi3i1XkNzbQuTNwO4A8LBjZJpXAWRAOHgnkBOgjtwoZgD5tM/ewripkHJMFMHuQr2fgehTzB+ORVmTUmYAJoAWgAsAHbJLN7W5H1z1agv6pP6LgZvYRdIkGsKVLOD64Mel1njM6fOGtxxg33rfLwNe3+DjXYOX+H0t64we0nYasnSjLrnWLq/CrnWZ3mDkygSsHdtRLMA/iXhYJqgQELAuvc+9r98BOPWeqbdnU+Ajc+PcfjdDxi+eC2Akywu/MsJ800xrp6epQTkwi5QmzYCZ8yJqYIKCYn6nTYefP1FATwt9Btto31y+TVh16jMN8UQMOWCAnKtgeDaK+SCnISGDx59CrW5PAeeLWhzmfVJ+xe3rMx8yzVTPE+KQSgpOmbD2cKMyBLTzoNK8LQkfcRkJWdKU9+SoolBKJeGS4gjlLZmbkrdupGA0rAqx+e+s1ImEPNVKR+riYX+6EYCoTeqHJ/7XkggRhwGqFk1IYqjQo4fdZ/dSGDUPRTyfij4iZlviiGQSAkkDKPZFJplCMBEyHABuo9/BZlWq0Dbuo9/yfrn4xMi1DfFEC4ossAmBpk4qC01CwdLnts9TE5Ocfjt9wicwRx44CRttE+SkHw+dpaRoL4phoCpZuDURl0HKx9tQVuiW6ac25MMd/l3F79/9Q1WP7uP1vY6l/0YvZ8PEIf07J9yc/nYRAnqU9F1XP/jiAoUCZApAZkO0Npq4+KvMz5YFRJWcuzSdXz90x8A/uTjIz5TnwOnBHIVWlu3mG+KUVoCCCQiOAd9KA0d5pohKJA6pVmSxsCQngAlG/K28ZwC1JfSMJjv/EaEVAFxq0QgLoHbfwlzfQdk2oN/4S3I7W+7D/gF01ckmOsduP3/mO/SJbW4BKkjGguKfgJ7fw3Df9/AO/OEwAxuvBGlshu3FFi7dxFcnjCf+bYsxEB6RUovCSGrr58NYO9FsHY3ob93Aee5w52rhQuHuHzi1rX3bOjtFfjnR/w6Fop3wXRceikt3/9TABX1TgOt7Q12unnnV5icjBB65fhJlkExAHOtBaO9zOQfdV/BPZ1yUlFJgUgkAIFA+V2QkLF2LRjt25BVC2HgI/LpuyCZiaTIkHUdiqYjIkP4F2dcsaiUDefeBSKBRQeIPFerpgJz3YRq1NlDhAlJIhDPxeR4AjKZm2U58BblgfTNFvPnWeHqLMQHQCYSnGd+xeM0fwNWAGbPMv42rHqelx+gVa/lcnnba1gkl5Wq53m587v8NyCOXfR7vgD4H8khvGFl000HAAAAAElFTkSuQmCC',
+  'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFb0lEQVRYhY1YW28bRRT+ZtbrS24mjVu3btPUDoiqFIEQ4gUh8dKX8hf4A/wT+Am88cA7b5GgrxVPFIREL0rapHHbOHGcxM7Fa3u9c9BMZrZn1+umI43W2j2Xb75z5pwZi89/JLznEExMTFGhKb+njtyUD+KCZxaILOfTnvGIAfj3z5/hmjGcnpjyLosBPtPvtB+yfsxIMBCuQWY4komnD09eRVHMoISc1R9jTH0EahcDhIisM5V6mhmugfz75t35qlgOyJTTxJQ3MCcqqIo8yhRBIcQQCmOrmYOPgvAgaYQedbCnXuPUgkhPYsBiBjjNzrGnp1hEUd7CCiTmqIsjtYsmnRllyfSMQTELKa5iQVTxsXcZp6qJJh0gAAwrbjgQWpc4gLTznKxjUSyhgR660Qu8hDLv8w5cCkBEZ4joBU4h0fNWsSjr+IQWsKm2cDQlYQ2AdJKdO2+gIi5hhV6jpXYRAijpHLIzlwXAZAMQ6gBFGziWVxGIG2hIgW21iQ6TFe7JGYhjLmuY187VS7SoYwxr5wU78xaEZ+VhaY2Mc2AEYKi/q10MxRgtHUI5wFDtoGd14qTMpTNeFOHLGupqD23qmBVp58XUzFsWOICxdT5g4AR1EFAJbW2TDvGYBnFSCs5AzIJcRZVGGKtX6AOYsasu2d8lxoafAhDalfPwmOTUtsQi5rXt6DFe8zqSTEIfnphBNdrAG+sgb1fuAMzaZ7FxG40rNaxo5fYOtjefYZOtXrCtZkKjmuh4H+E6fLQQGrbEBACvjjKFGFHXCMxaAJyB2cvXcOPre/h+dgE33SpW7wCffoXmnw/w637LrJBYWExeUBdn2rb2Ea1j3wGQiV0wgzKdmAKSs9PnIOY/QOXb7/ADd+7G3AJu6m9ahoUpz3ZNztieQZn7lJwB4WOGjg2NcS1gIPJffoN7+SIW087d0N+0jJNPbVmpbQvfMCs4A2+TUKKAU0PZREXUhipV3J3m3A0rk2N6MmZa25YGWJyEMqUvSLGkTE0/j4WLAPgFI5Opz2zHIw2AbFDSbfW8k4U4uQhAODIymfrMdiYAgsIIcyZuxDpY5MrsYRtPLwJw2MYzm/1OT8UNSNtWplglWnC8YhqjL+bNvlestrsKN3r0EA/sCqeu/tFD/OHkmb4Bom1rH/yAIhkaQh89MY+5RGN5W9sH3QPsPfwdPwd9tNPOg/75Ny1jC9LQ6oYOhLHdN/0g0Q1jBlQTPe8u6qIMSb2J2m4q3M42Nn/7BT/d/gx3KtXzetDZQ/PZv3hCyvT+vp2B1TVMaJsij0K0HgMwIBIAKMCYBmjLZVSinqlWI9Z0XHmNSGH09B/8BeBvq897QcAAxCzIZVzWtrWPLAAOhFIbaMm7qMgaimrHKPNEdeV1eEE3HHAGtC1RRDH6D+vsRAQHgG8VRQOMqY0tUcOHIsAbOjJG0rX9XeeBIZ9iEULUUFVtPNe2kTqkJkLgDOlckHm8kqtYVlvYoQMDImKrfPeJyNIuluDJOmrUxSttk23LRAjcEckdErSQUM/Rlg0or45bqowDtWkMhLy2pw+lfOvKBsryEpbUIV7a45irC/GJOM2AYB+MoFakE/TlMla8L1CmQxypFk4MuZNVVOn+J6+Z45xuWMNoG09o3yTkGMnjOTJ3AYvn252xj9NoH09lHQtiCVdyVdwifScYYYjIynqmxRSEjwKNcUxdbKkXhjGVqoYqlXMTu4BnO88LqbZwiC10RQmeuI5ZUUAJecvCGIqOEag3OKMgEefM21F6F5hh72xkr2eJozPLD1AAQc9NELIup9x4VkOCu5ZN3A3dC+6MGZt2W06Pd92G3QITY9r1PEHTe/43wHWzfk8OAP8D28XBfaJJ48oAAAAASUVORK5CYII='
+]
+let className = ['1号停车场', '2号停车场', '3号停车场', '4号停车场', '5号停车场', '6号停车场', '7号停车场']
+let serviceCount = [50, 28, 17, 38, 90, 73, 39]
+
 export function lineOption () {
 
   return {
@@ -11,6 +18,13 @@ export function lineOption () {
         }
       }
     },
+    // grid: {
+    //   left: '5%',
+    //   right: '5%',
+    //   bottom: '5%',
+    //   top: '10%',
+    //   containLabel: true
+    // },
     xAxis: {
       type: 'category',
       // boundaryGap: false,
@@ -25,7 +39,8 @@ export function lineOption () {
         lineStyle: {
           color: '#0c4b59'
         }
-      }
+      },
+      // data: className
     },
     yAxis: {
       nameTextStyle: {
@@ -58,29 +73,82 @@ export function lineOption () {
         }
       }
     },
+    // series: [
+    //   {
+    //     name: '项目数',
+    //     type: 'line',
+    //     smooth: true,
+    //     barWidth: 15,
+    //     areaStyle: {},
+    //     itemStyle: {
+    //       color: new echarts.graphic.LinearGradient(
+    //         0, 1, 0, 0,
+    //         [
+    //           { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+    //           { offset: 1, color: '#6339FF' }
+    //         ]
+    //       )
+    //     }
+    //   },
+    //   // {
+    //   //   data: [820, 932, 901, 934, 1290, 1330, 1320],
+    //   //   type: 'line',
+    //   //   areaStyle: {}
+    //   // }
+    // ]
     series: [
       {
-        name: '项目数',
-        type: 'line',
-        smooth: true,
-        barWidth: 15,
-        areaStyle: {},
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(
-            0, 1, 0, 0,
-            [
-              { offset: 0, color: 'rgba(121, 55, 255, 0)' },
-              { offset: 1, color: '#6339FF' }
-            ]
-          )
-        }
+      name: '',
+      type: 'bar',
+      zlevel: 1,
+      itemStyle: {
+       
+        normal: {
+          barBorderRadius: 0,
+          color: function (params) {
+            // 大于等于50%的是黄色 反之为蓝色
+            var colorList = [
+              ['rgba(252, 210, 152, .2)', 'rgba(252, 210, 152, 1)'],
+              ['rgba(36, 253, 231, .2)', 'rgba(36, 253, 231, 1)'],
+            ];
+            var colorItem
+           
+              colorItem = colorList[1];
+        
+            // 设置线条渐变色
+            return new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+              offset: 0,
+              color: colorItem[0]
+            },
+            {
+              offset: 1,
+              color: colorItem[1]
+            }
+            ], false);
+          }
+
+        },
+      },
+      barWidth: 4,
+      // data: serviceCount
+    },
+   
+    {
+      name: 'XXX',
+      type: 'pictorialBar',
+      symbol: function (params, value) {
+        // 设置图片
+      
+        return circleList[1]
       },
-      // {
-      //   data: [820, 932, 901, 934, 1290, 1330, 1320],
-      //   type: 'line',
-      //   areaStyle: {}
-      // }
+      symbolPosition: 'end',
+      symbolSize: [30, 30],
+      symbolOffset: [0, -12],
+      z: 20,
+      // data: serviceCount
+    }
     ]
 
+
   }
 }
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 44c35ded5..c3a5c819b 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -590,6 +590,7 @@ export default {
         xAxis: { data: this.lineXaxis },
         series: [
           { data: this.lineSeriesData },
+          { data: this.lineSeriesData },
 
         ]
       }, true)
@@ -792,6 +793,7 @@ export default {
       let hoveredIndex = ''
       // 监听点击事件，实现选中效果（单选）
       myChart.on('click', (params) => {
+        debugger
         // 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
         const isSelected = !this[optionName].series[params.seriesIndex].pieStatus
           .selected
@@ -834,107 +836,107 @@ export default {
         myChart.setOption(this[optionName])
       })
       // 监听 mouseover，近似实现高亮（放大）效果
-      // myChart.on('mouseover', (params) => {
-      //   // 准备重新渲染扇形所需的参数
-      //   let isSelected
-      //   let isHovered
-      //   let startRatio
-      //   let endRatio
-      //   let k
-      //   // 如果触发 mouseover 的扇形当前已高亮，则不做操作
-      //   if (hoveredIndex === params.seriesIndex) {
-      //     // 否则进行高亮及必要的取消高亮操作
-      //   } else {
-      //     // 如果当前有高亮的扇形，取消其高亮状态（对 option 更新）
-      //     if (hoveredIndex !== '') {
-      //       // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 false。
-      //       isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
-      //       isHovered = false
-      //       startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
-      //       endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
-      //       k = this[optionName].series[hoveredIndex].pieStatus.k
-      //       // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
-      //       this[optionName].series[
-      //         hoveredIndex
-      //       ].parametricEquation = getParametricEquation(
-      //         startRatio,
-      //         endRatio,
-      //         isSelected,
-      //         isHovered,
-      //         k,
-      //         this[optionName].series[hoveredIndex].pieData.value
-      //       )
-      //       this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
-      //       // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
-      //       hoveredIndex = ''
-      //     }
-      //     // 如果触发 mouseover 的扇形不是透明圆环，将其高亮（对 option 更新）
-      //     if (
-      //       params.seriesName !== 'mouseoutSeries' &&
-      //       params.seriesName !== 'pie2d'
-      //     ) {
-      //       // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
-      //       isSelected =
-      //         this[optionName].series[params.seriesIndex].pieStatus.selected
-      //       isHovered = true
-      //       startRatio =
-      //         this[optionName].series[params.seriesIndex].pieData.startRatio
-      //       endRatio = this[optionName].series[params.seriesIndex].pieData.endRatio
-      //       k = this[optionName].series[params.seriesIndex].pieStatus.k
-      //       // 对当前点击的扇形，执行高亮操作（对 option 更新）
-      //       this[optionName].series[
-      //         params.seriesIndex
-      //       ].parametricEquation = getParametricEquation(
-      //         startRatio,
-      //         endRatio,
-      //         isSelected,
-      //         isHovered,
-      //         k,
-      //         this[optionName].series[params.seriesIndex].pieData.value + 60
-      //       )
-      //       this[optionName].series[
-      //         params.seriesIndex
-      //       ].pieStatus.hovered = isHovered
-      //       // 记录上次高亮的扇形对应的系列号 seriesIndex
-      //       hoveredIndex = params.seriesIndex
-      //     }
-      //     // 使用更新后的 option，渲染图表
-      //     myChart.setOption(this[optionName])
-      //   }
-      // })
-      // // 修正取消高亮失败的 bug
-      //   myChart.on('globalout', () => {
-      //   // 准备重新渲染扇形所需的参数
-      //   let isSelected
-      //   let isHovered
-      //   let startRatio
-      //   let endRatio
-      //   let k
-      //   if (hoveredIndex !== '') {
-      //     // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
-      //     isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
-      //     isHovered = false
-      //     k = this[optionName].series[hoveredIndex].pieStatus.k
-      //     startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
-      //     endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
-      //     // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
-      //     this[optionName].series[
-      //       hoveredIndex
-      //     ].parametricEquation = getParametricEquation(
-      //       startRatio,
-      //       endRatio,
-      //       isSelected,
-      //       isHovered,
-      //       k,
-      //       this[optionName].series[hoveredIndex].pieData.value
-      //     )
-      //     this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
-      //     // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
-      //     hoveredIndex = ''
-      //   }
-      //   // 使用更新后的 option，渲染图表
-      //   myChart.setOption(this[optionName])
-      // })
+      myChart.on('mouseover', (params) => {
+        // 准备重新渲染扇形所需的参数
+        let isSelected
+        let isHovered
+        let startRatio
+        let endRatio
+        let k
+        // 如果触发 mouseover 的扇形当前已高亮，则不做操作
+        if (hoveredIndex === params.seriesIndex) {
+          // 否则进行高亮及必要的取消高亮操作
+        } else {
+          // 如果当前有高亮的扇形，取消其高亮状态（对 option 更新）
+          if (hoveredIndex !== '') {
+            // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 false。
+            isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
+            isHovered = false
+            startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
+            endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
+            k = this[optionName].series[hoveredIndex].pieStatus.k
+            // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
+            this[optionName].series[
+              hoveredIndex
+            ].parametricEquation = getParametricEquation(
+              startRatio,
+              endRatio,
+              isSelected,
+              isHovered,
+              k,
+              this[optionName].series[hoveredIndex].pieData.value
+            )
+            this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
+            // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
+            hoveredIndex = ''
+          }
+          // 如果触发 mouseover 的扇形不是透明圆环，将其高亮（对 option 更新）
+          if (
+            params.seriesName !== 'mouseoutSeries' &&
+            params.seriesName !== 'pie2d'
+          ) {
+            // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
+            isSelected =
+              this[optionName].series[params.seriesIndex].pieStatus.selected
+            isHovered = true
+            startRatio =
+              this[optionName].series[params.seriesIndex].pieData.startRatio
+            endRatio = this[optionName].series[params.seriesIndex].pieData.endRatio
+            k = this[optionName].series[params.seriesIndex].pieStatus.k
+            // 对当前点击的扇形，执行高亮操作（对 option 更新）
+            this[optionName].series[
+              params.seriesIndex
+            ].parametricEquation = getParametricEquation(
+              startRatio,
+              endRatio,
+              isSelected,
+              isHovered,
+              k,
+              this[optionName].series[params.seriesIndex].pieData.value + 60
+            )
+            this[optionName].series[
+              params.seriesIndex
+            ].pieStatus.hovered = isHovered
+            // 记录上次高亮的扇形对应的系列号 seriesIndex
+            hoveredIndex = params.seriesIndex
+          }
+          // 使用更新后的 option，渲染图表
+          myChart.setOption(this[optionName])
+        }
+      })
+      // 修正取消高亮失败的 bug
+      myChart.on('globalout', () => {
+        // 准备重新渲染扇形所需的参数
+        let isSelected
+        let isHovered
+        let startRatio
+        let endRatio
+        let k
+        if (hoveredIndex !== '') {
+          // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
+          isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
+          isHovered = false
+          k = this[optionName].series[hoveredIndex].pieStatus.k
+          startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
+          endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
+          // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
+          this[optionName].series[
+            hoveredIndex
+          ].parametricEquation = getParametricEquation(
+            startRatio,
+            endRatio,
+            isSelected,
+            isHovered,
+            k,
+            this[optionName].series[hoveredIndex].pieData.value
+          )
+          this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
+          // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
+          hoveredIndex = ''
+        }
+        // 使用更新后的 option，渲染图表
+        myChart.setOption(this[optionName])
+      })
 
     },
 

From 6341634678103211f948667ff8126de09c8c09e0 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 24 Jun 2022 11:16:03 +0800
Subject: [PATCH 09/27] =?UTF-8?q?=E8=BF=81=E5=87=BA=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/verify.vue   |  6 +-
 .../modules/plugins/change/verifyForm.vue     | 58 ++++++++++++++++---
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 616b366ad..52b8043a0 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -199,7 +199,7 @@
         border
         style="width: 100%"
         class="resi-table"
-        :height="tableHeight"
+        :height="maxTableHeight"
       >
         <el-table-column
           label="序号"
@@ -401,8 +401,8 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     maxTableHeight() {
       console.log('computed-searchH---', this.searchH)
-      const h = this.clientHeight - this.searchH + this.iframeHeight
-      const _h = this.clientHeight - this.searchH
+      const h = this.clientHeight - this.searchH - 440 + this.iframeHeight
+      const _h = this.clientHeight - this.searchH - 440
       console.log('computed-searchH---_h', _h)
       return this.$store.state.inIframe ? h : _h
       
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 9dc9bc65b..d99e2a740 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h">
+    <div v-loading="loadingForm" class="dialog-h-content scroll-h">
       <el-form :model="detailInfo" :disabled="btnType == 'detail'">
         <el-form-item
           label="迁出人姓名:"
@@ -61,7 +61,7 @@
             label="迁至地址:"
             label-width="150px"
           >
-            <span>{{ detailInfo.newHomeName }}</span>
+            <span>{{ detailInfo.xxdz }}</span>
           </el-form-item>
         <el-form-item
           label="迁出时间:"
@@ -81,17 +81,29 @@
         <el-form-item
           label="审核结果:"
           label-width="150px"
+          :rules="[
+            { required: true, message: '请选择审核结果', trigger: 'blur' },
+          ]"
         >
+          <el-input v-if="btnType == 'detail' && confirmResult == ''" value="未审核"></el-input>
           <el-select
+            v-else
               v-model.trim="confirmResult"
               placeholder="请选择结果"
               clearable
+              :disabled="!detailInfo.isInHome"
               class="item_width_1"
             >
               <el-option label="通过" value="1" />
-              <el-option label="不通过" value="2" />
+              <el-option label="未通过" value="2" />
             </el-select>
         </el-form-item>
+        <el-form-item
+          v-if="detailInfo && !detailInfo.isInHome"
+          label-width="150px"
+        >
+          <span style="color: red; font-size: 12px;">当前人员已不在该房屋</span>
+        </el-form-item>
         <el-form-item
           v-if="confirmResult == 2"
           label="审核备注:"
@@ -116,7 +128,7 @@
       </el-form>
       
       <el-form
-        v-if="confirmResult == 1 && btnType == 'edit'"
+        v-if="confirmResult == 1 && btnType == 'edit' && detailInfo.isInHome"
         ref="ref_form"
         :inline="false"
         :model="dataForm"
@@ -275,10 +287,21 @@
         </el-form-item>
       </el-form>
     </div>
+    <div v-if="confirmResult == ''" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+    </div>
     <div v-if="confirmResult == 1" class="resi-btns">
       <el-button size="small" @click="handleCancle(false)">取消</el-button>
       <el-button
-        v-if="btnType != 'detail'"
+        v-if="btnType != 'detail' && !detailInfo.isInHome"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleVerify"
+        >提交</el-button
+      >
+      <el-button
+        v-else-if="btnType != 'detail'"
         type="primary"
         size="small"
         :loading="btnDisable"
@@ -310,11 +333,12 @@ export default {
   data() {
     return {
       btnDisable: false,
+      loadingForm: true,
       communityList: [],
       buildingList: [],
       unitList: [],
       roomList: [],
-      confirmResult: '1',
+      confirmResult: '',
       reason: '',
       dataForm: {
         icUserId: '', // 被调动人ID
@@ -422,11 +446,17 @@ export default {
       this.dataForm.name = row.name
       // this.dataForm.gender = row.GENDER
       // this.dataForm.age = ''
-      this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : '1'
+      if (row.isInHome) {
+        this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
+      } else this.confirmResult = '1'
+      
       this.reason = row.reason
 
       await this.loadRootAgency()
       await this.getAgencylist()
+      setTimeout(() => {
+        this.loadingForm = false
+      }, 500)
     },
     async getDatail(type, id) {
       let url = '/epmetuser/myHome/moveOutConfirmDetail'
@@ -656,11 +686,23 @@ export default {
       })
     },
     async handleVerify() {
-      const params = {
+      let params = {
         id: this.detailInfo.id,
         confirmResult: this.confirmResult,
         reason: this.reason
       }
+      if (this.confirmResult == 1 && this.detailInfo.isInHome) {
+        params = {
+          ...params,
+          gridName: this.dataForm.gridName,
+          villageName: this.dataForm.villageName,
+          buildName: this.dataForm.buildName,
+          unitName: this.dataForm.unitName,
+          homeName: this.dataForm.homeName,
+          xxdz: this.dataForm.address
+        }
+      }
+      
 
       const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)
 

From 41f6ffa69a5e01646fb4d89493570c4dd95e0ef4 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 24 Jun 2022 14:04:16 +0800
Subject: [PATCH 10/27] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=89=B2=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BB=BF=E5=8F=98=E8=93=9D?=
 =?UTF-8?q?=E7=9A=84=E9=97=AA=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/element-ui/theme-variables.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/element-ui/theme-variables.scss b/src/element-ui/theme-variables.scss
index 9a9bacf46..93d161a54 100644
--- a/src/element-ui/theme-variables.scss
+++ b/src/element-ui/theme-variables.scss
@@ -16,7 +16,8 @@ $--color-transition-base: color .2s cubic-bezier(.645,.045,.355,1) !default;
 /* Color
 -------------------------- */
 /// color|1|Brand Color|0
-$--color-primary: #17B3A3 !default;
+// $--color-primary: #17B3A3 !default;
+$--color-primary: #3E8EF7 !default;
 /// color|1|Background Color|4
 $--color-white: #FFFFFF !default;
 /// color|1|Background Color|4

From 58a4a04a37508867d670ff3a4936fb86378dbe3d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 24 Jun 2022 16:13:47 +0800
Subject: [PATCH 11/27] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shijianchuli/lineOption copy.js           |  86 -----
 .../shijianchuli/pieOption copy.js            | 183 ---------
 .../communityGovern/shijianchuli/pieOption.js | 311 +++++++--------
 .../shijianchuli/shijianchulifenxi.vue        | 358 ++----------------
 4 files changed, 183 insertions(+), 755 deletions(-)
 delete mode 100644 src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js
 delete mode 100644 src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js
deleted file mode 100644
index 04b4f9503..000000000
--- a/src/views/modules/visual/communityGovern/shijianchuli/lineOption copy.js	
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as echarts from 'echarts'
-export function lineOption () {
-
-  return {
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
-      }
-    },
-    xAxis: {
-      type: 'category',
-      // boundaryGap: false,
-      axisLabel: {
-        color: '#8ec7dc',
-        fontSize: 16
-      },
-      axisTick: {
-        show: false
-      },
-      axisLine: {
-        lineStyle: {
-          color: '#0c4b59'
-        }
-      }
-    },
-    yAxis: {
-      nameTextStyle: {
-        color: '#8ec7dc',
-        fontSize: 18
-      },
-      splitNumber: 4,
-      minInterval: 1,
-      show: true,
-      type: 'value',
-      axisLabel: {
-        color: '#8ec7dc',
-        fontSize: 18
-      },
-      axisTick: {
-        show: false
-      },
-      splitLine: {
-        lineStyle: {
-          color: ['#145968'],
-          type: 'dotted'
-        }
-      },
-      axisLine: {
-        show: true,
-        symbol: ['none', 'arrow'],
-        symbolOffset: [0, 15],
-        lineStyle: {
-          color: '#0c4b59'
-        }
-      }
-    },
-    series: [
-      {
-        name: '项目数',
-        type: 'line',
-        smooth: true,
-        barWidth: 15,
-        areaStyle: {},
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(
-            0, 1, 0, 0,
-            [
-              { offset: 0, color: 'rgba(121, 55, 255, 0)' },
-              { offset: 1, color: '#6339FF' }
-            ]
-          )
-        }
-      },
-      // {
-      //   data: [820, 932, 901, 934, 1290, 1330, 1320],
-      //   type: 'line',
-      //   areaStyle: {}
-      // }
-    ]
-
-  }
-}
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js
deleted file mode 100644
index 5eb83badb..000000000
--- a/src/views/modules/visual/communityGovern/shijianchuli/pieOption copy.js	
+++ /dev/null
@@ -1,183 +0,0 @@
-
-export function pieOption (_charts) {
-const center= ['50%', '170px']
-  return {
-    title: {
-      text: '0',
-      top: 140,
-      left: 'center',
-      textStyle: {
-        width: '100%',
-        fontSize: 32,
-        color: '#FFFFFF',
-        fontWeight: 400
-      },
-      itemGap: 5,
-      subtext: '总数',
-      subtextStyle: {
-        fontSize: 20,
-        color: '#fff',
-        fontWeight: 400
-      }
-    },
-    tooltip: {
-      show: false
-    },
-    // legend: {
-      // top: 350,
-      // bottom: 0,
-      // itemWidth: 20,
-      // itemHeight: 10,
-      // textStyle: {
-      //   color: '#D2E7FF',
-      //   fontSize: 16,
-      //   lineHeight: 20,
-      // },
-    
-    // },
-    series: [
-      // 外侧圆环
-      {
-        type: 'pie',
-        // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
-        startAngle: 0,
-        hoverAnimation: false,
-        // tooltip: {
-        // },
-        center: center,
-        radius: ['58%', '58.3%'],
-        label: {
-          normal: {
-            show: false
-          }
-        },
-        labelLine: {
-          normal: {
-            show: false
-          }
-        },
-        data: [{
-          value: 360,
-          itemStyle: {
-            normal: {
-              color: 'rgba(40, 101, 250, 0)',
-              width:0,
-              borderColor: 'rgba(40, 101, 250, 0.5)',
-              borderWidth: 1,
-              borderType: 'dotted'
-            }
-          }
-        }
-        ]
-      },
-
-      // 突出的
-      {
-        hoverAnimation: false,
-        // name: 'Access From',
-        type: 'pie',
-        center: center,
-        radius: ['35%', '48%'],
-        avoidLabelOverlap: false,
-        // top: top + '%',
-        // height: '80%',
-        selectedMode: 'single',
-        left: 'center',
-        width: 400,
-        label: {
-          // show: false,
-          position: 'outside',
-          alignTo: 'edge',
-          // formatter: '{a|{c}}\n\n{name|{b}}',
-          formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
-          minMargin: 5,
-          edgeDistance: 1,
-          lineHeight: 15,
-          color: '#fff',
-          fontSize: 12,
-          // distanceToLabelLine: -60,
-          rich: {
-            name: {
-              padding: [0, 6, 0, 6]
-            },
-            a: {
-              fontSize: 30,
-              color: '#fff',
-              padding: [0, 6, 6, 6]
-            },
-            r: {
-              backgroundColor: 'auto',
-              borderRadius: 6,
-              width: 6,
-              height: 6,
-              // padding: [3, 3, 0, -12]
-            }
-          }
-        },
-        labelLine: {
-          show: false,
-          smooth: 0.2,
-          length: 30,
-          length2: 0,
-          maxSurfaceAngle: 80
-        },
-        labelLayout: function (params) {
-          
-          const isLeft = params.labelRect.x < _charts.getWidth() / 2;
-          const points = params.labelLinePoints;
-          // Update the end point.
-          if (points) {
-            points[2][0] = isLeft
-            ? params.labelRect.x
-            : params.labelRect.x + params.labelRect.width;
-          }
-          
-          return {
-            labelLinePoints: points
-          };
-        },
-        itemStyle: {
-           color:function(params) {
-          //自定义颜色
-          var colorList = [ '#FAC126', '#3DDA83'];
-            return colorList[params.dataIndex]
-          }
-        },
-        data: [],
-
-      },
-         // 中间圆环
-         {
-          type: 'pie',
-          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
-          startAngle: 0,
-          hoverAnimation: false,
-          center: center,
-          // tooltip: {
-          // },
-          radius: ['0%', '25%'],
-          label: {
-          
-              show: false
-           
-          },
-          labelLine: {
-           
-              show: false
-          
-          },
-          data: [{
-            value: 360,
-            itemStyle: {
-              normal: {
-                color: 'rgba(8, 37, 134, 1)',
-            
-              }
-            }
-          }
-          ]
-        },
-    ]
-
-  }
-}
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
index 5eb83badb..6e9b5c886 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
@@ -1,183 +1,184 @@
 
 export function pieOption (_charts) {
-const center= ['50%', '170px']
-  return {
-    title: {
-      text: '0',
-      top: 140,
-      left: 'center',
-      textStyle: {
-        width: '100%',
-        fontSize: 32,
-        color: '#FFFFFF',
-        fontWeight: 400
-      },
-      itemGap: 5,
-      subtext: '总数',
-      subtextStyle: {
-        fontSize: 20,
-        color: '#fff',
-        fontWeight: 400
-      }
-    },
-    tooltip: {
-      show: false
-    },
-    // legend: {
-      // top: 350,
-      // bottom: 0,
-      // itemWidth: 20,
-      // itemHeight: 10,
-      // textStyle: {
-      //   color: '#D2E7FF',
-      //   fontSize: 16,
-      //   lineHeight: 20,
-      // },
-    
-    // },
-    series: [
-      // 外侧圆环
-      {
-        type: 'pie',
-        // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
-        startAngle: 0,
-        hoverAnimation: false,
-        // tooltip: {
-        // },
-        center: center,
-        radius: ['58%', '58.3%'],
-        label: {
-          normal: {
-            show: false
-          }
-        },
-        labelLine: {
-          normal: {
-            show: false
-          }
+  const center= ['50%', '170px']
+    return {
+      title: {
+        text: '0',
+        top: 140,
+        left: 'center',
+        textStyle: {
+          width: '100%',
+          fontSize: 32,
+          color: '#FFFFFF',
+          fontWeight: 400
         },
-        data: [{
-          value: 360,
-          itemStyle: {
-            normal: {
-              color: 'rgba(40, 101, 250, 0)',
-              width:0,
-              borderColor: 'rgba(40, 101, 250, 0.5)',
-              borderWidth: 1,
-              borderType: 'dotted'
-            }
-          }
+        itemGap: 5,
+        subtext: '总数',
+        subtextStyle: {
+          fontSize: 20,
+          color: '#fff',
+          fontWeight: 400
         }
-        ]
       },
-
-      // 突出的
-      {
-        hoverAnimation: false,
-        // name: 'Access From',
-        type: 'pie',
-        center: center,
-        radius: ['35%', '48%'],
-        avoidLabelOverlap: false,
-        // top: top + '%',
-        // height: '80%',
-        selectedMode: 'single',
-        left: 'center',
-        width: 400,
-        label: {
-          // show: false,
-          position: 'outside',
-          alignTo: 'edge',
-          // formatter: '{a|{c}}\n\n{name|{b}}',
-          formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
-          minMargin: 5,
-          edgeDistance: 1,
-          lineHeight: 15,
-          color: '#fff',
-          fontSize: 12,
-          // distanceToLabelLine: -60,
-          rich: {
-            name: {
-              padding: [0, 6, 0, 6]
-            },
-            a: {
-              fontSize: 30,
-              color: '#fff',
-              padding: [0, 6, 6, 6]
-            },
-            r: {
-              backgroundColor: 'auto',
-              borderRadius: 6,
-              width: 6,
-              height: 6,
-              // padding: [3, 3, 0, -12]
-            }
-          }
-        },
-        labelLine: {
-          show: false,
-          smooth: 0.2,
-          length: 30,
-          length2: 0,
-          maxSurfaceAngle: 80
-        },
-        labelLayout: function (params) {
-          
-          const isLeft = params.labelRect.x < _charts.getWidth() / 2;
-          const points = params.labelLinePoints;
-          // Update the end point.
-          if (points) {
-            points[2][0] = isLeft
-            ? params.labelRect.x
-            : params.labelRect.x + params.labelRect.width;
-          }
-          
-          return {
-            labelLinePoints: points
-          };
-        },
-        itemStyle: {
-           color:function(params) {
-          //自定义颜色
-          var colorList = [ '#FAC126', '#3DDA83'];
-            return colorList[params.dataIndex]
-          }
-        },
-        data: [],
-
+      tooltip: {
+        show: false
       },
-         // 中间圆环
-         {
+      // legend: {
+        // top: 350,
+        // bottom: 0,
+        // itemWidth: 20,
+        // itemHeight: 10,
+        // textStyle: {
+        //   color: '#D2E7FF',
+        //   fontSize: 16,
+        //   lineHeight: 20,
+        // },
+      
+      // },
+      series: [
+        // 外侧圆环
+        {
           type: 'pie',
           // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
           startAngle: 0,
           hoverAnimation: false,
-          center: center,
           // tooltip: {
           // },
-          radius: ['0%', '25%'],
+          center: center,
+          radius: ['58%', '58.3%'],
           label: {
-          
+            normal: {
               show: false
-           
+            }
           },
           labelLine: {
-           
+            normal: {
               show: false
-          
+            }
           },
           data: [{
             value: 360,
             itemStyle: {
               normal: {
-                color: 'rgba(8, 37, 134, 1)',
-            
+                color: 'rgba(40, 101, 250, 0)',
+                width:0,
+                borderColor: 'rgba(40, 101, 250, 0.5)',
+                borderWidth: 1,
+                borderType: 'dotted'
               }
             }
           }
           ]
         },
-    ]
-
+  
+        // 突出的
+        {
+          hoverAnimation: false,
+          // name: 'Access From',
+          type: 'pie',
+          center: center,
+          radius: ['35%', '48%'],
+          avoidLabelOverlap: false,
+          // top: top + '%',
+          // height: '80%',
+          selectedMode: 'single',
+          left: 'center',
+          width: 400,
+          label: {
+            // show: false,
+            position: 'outside',
+            alignTo: 'edge',
+            // formatter: '{a|{c}}\n\n{name|{b}}',
+            formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
+            minMargin: 5,
+            edgeDistance: 1,
+            lineHeight: 15,
+            color: '#fff',
+            fontSize: 12,
+            // distanceToLabelLine: -60,
+            rich: {
+              name: {
+                padding: [0, 6, 0, 6]
+              },
+              a: {
+                fontSize: 30,
+                color: '#fff',
+                padding: [0, 6, 6, 6]
+              },
+              r: {
+                backgroundColor: 'auto',
+                borderRadius: 6,
+                width: 6,
+                height: 6,
+                // padding: [3, 3, 0, -12]
+              }
+            }
+          },
+          labelLine: {
+            show: false,
+            smooth: 0.2,
+            length: 30,
+            length2: 0,
+            maxSurfaceAngle: 80
+          },
+          labelLayout: function (params) {
+            
+            const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+            const points = params.labelLinePoints;
+            // Update the end point.
+            if (points) {
+              points[2][0] = isLeft
+              ? params.labelRect.x
+              : params.labelRect.x + params.labelRect.width;
+            }
+            
+            return {
+              labelLinePoints: points
+            };
+          },
+          itemStyle: {
+             color:function(params) {
+            //自定义颜色
+            var colorList = [ '#FAC126', '#3DDA83'];
+              return colorList[params.dataIndex]
+            }
+          },
+          data: [],
+  
+        },
+           // 中间圆环
+           {
+            type: 'pie',
+            // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+            startAngle: 0,
+            hoverAnimation: false,
+            center: center,
+            // tooltip: {
+            // },
+            radius: ['0%', '25%'],
+            label: {
+            
+                show: false
+             
+            },
+            labelLine: {
+             
+                show: false
+            
+            },
+            data: [{
+              value: 360,
+              itemStyle: {
+                normal: {
+                  color: 'rgba(8, 37, 134, 1)',
+              
+                }
+              }
+            }
+            ]
+          },
+      ]
+  
+    }
   }
-}
+  
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index c3a5c819b..301a60a96 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -23,7 +23,7 @@
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
-                       @click.native="handleChangeDate(item.value,true)">
+                       @click.native="handleChangeDate(item.value)">
             </el-option>
           </el-select>
         </div>
@@ -47,32 +47,26 @@
     </div>
     <div class="g-cpt-resi">
       <div class="g-l">
-        <div class="bottom_label"
-             style="margin-top:20px">事件总览</div>
         <div class="l_top">
 
           <div v-if="!pieNoData && !dataLoading"
                class="g-pie">
-            <div class="chart-container">
-              <div class="chart"
-                   id="cityGreenLand"
-                   ref="chart"></div>
-              <!-- <screen-echarts-frame class="echart-wr"
+            <screen-echarts-frame class="echart-wr"
                                   @myChartMethod="pieInitOk"
-                                  ref="pieChart"></screen-echarts-frame> -->
-              <!-- 底座背景 -->
-              <div class="bg"></div>
-            </div>
+                                  ref="pieChart"></screen-echarts-frame>
 
-            <!-- <div class="pie-legend">
+            <div class="pie-legend">
               <div :class="['legend_item',{'item_last':index===legendArray.length-1}]"
                    v-for="(item,index) in legendArray"
                    :key="index">
                 <div class="item_name">{{item.name}}</div>
                 <img :src="item.url" />
-               
+                <!-- <div class="item_num">
+                  <span class="item_count">{{item.count}}</span>
+                  <span class="item_percent">{{item.percent}}</span>
+                </div> -->
               </div>
-            </div> -->
+            </div>
 
           </div>
           <screen-nodata class="nodata"
@@ -146,11 +140,6 @@ import { lineOption } from './lineOption.js'
 import nextTick from 'dai-js/tools/nextTick'
 import dateFormat from "dai-js/tools/dateFormat";
 
-import * as echarts from 'echarts';
-import 'echarts-gl';
-import { getPie3D, getParametricEquation } from './chart.js' //工具类js，页面路径自己修改
-
-const color = ['#005aff', '#f8b551']
 
 export default {
   name: "shijianchulifenxi",
@@ -180,18 +169,6 @@ export default {
 
 
       pieData: [],
-      optionData: [
-        {
-          name: '处理中',
-          value: 28
-        },
-        {
-          name: '已完成',
-          value: 72
-        }
-      ],
-      statusChart: null,
-      option: {},
 
       legendArray: [
         {
@@ -315,23 +292,21 @@ export default {
     //初始化时间、各组件
     this.initData()
     await this.getAgencylist()//获取组织级别
-    this.handleChangeDate(this.dataType, false)
+    this.handleChangeDate(this.dataType)
     //获取服务器数据
-
     await this.getProjectTotal()
     await this.getLineChart()
-    await this.getTable()
 
     this.dataLoading = false
 
 
-    this.assignData()
+    // this.assignData()
 
   },
 
   methods: {
     async getApiData () {
-      this.getTable()
+
       await this.getProjectTotal()
       await this.getLineChart()
 
@@ -339,7 +314,7 @@ export default {
 
     },
 
-    async handleChangeDate (index, isRefresh) {
+    async handleChangeDate (index) {
       let end = new Date();
       let start = new Date();
       if (index === '1') {//近一年
@@ -358,7 +333,7 @@ export default {
         this.queryStartTime = dateFormat(start, 'yyyy-MM-dd') + " 00:00:00"
         this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59"
       }
-      if (index !== '0' && isRefresh) {
+      if (index !== '0') {
         await this.getApiData()
         // this.assignPieChart()
       }
@@ -367,8 +342,8 @@ export default {
     },
 
     assignData () {
-      this.initChart()
-      // this.getPie()
+
+      this.getPie()
       this.getLine()
     },
 
@@ -409,10 +384,10 @@ export default {
 
     //加载项目
     async getProjectTotal () {
-      // if (this.$refs.pieChart) {
-      //   this.$refs.pieChart.showLoading()
-      //   this.$refs.pieChart.clear()
-      // }
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.showLoading()
+        this.$refs.pieChart.clear()
+      }
 
       const url = "/gov/project/icEvent/processAnalysis/processStatusRatio";
       //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio";
@@ -424,9 +399,9 @@ export default {
       };
 
       const { data, code, msg } = await requestPost(url, params);
-      // if (this.$refs.pieChart) {
-      //   this.$refs.pieChart.hideLoading()
-      // }
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.hideLoading()
+      }
       if (code === 0) {
         this.projectTotal = parseInt(data.processingCount) + parseInt(data.closedCount);
 
@@ -445,7 +420,7 @@ export default {
           }
         ]
 
-        this.optionData = [
+        this.pieData = [
 
           {
             name: "已完成",
@@ -456,7 +431,6 @@ export default {
             value: Math.floor(data.processingRatio * 10000) / 100
           },
         ]
-        this.setLabel()
 
       } else {
         this.$message.error(msg);
@@ -590,7 +564,6 @@ export default {
         xAxis: { data: this.lineXaxis },
         series: [
           { data: this.lineSeriesData },
-          { data: this.lineSeriesData },
 
         ]
       }, true)
@@ -682,6 +655,8 @@ export default {
         }
       });
 
+
+
       this.pieOption.series[1].data = this.pieData
       this.demand.pageNo = 1
       this.getTable()
@@ -690,256 +665,6 @@ export default {
       this.$refs.pieChart.setOption(this.pieOption)
     },
 
-    setLabel () {
-      this.optionData.forEach((item, index) => {
-
-        item.itemStyle = {
-          color: color[index]
-        }
-        item.label = {
-          normal: {
-            show: true,
-            color: color[index],
-            formatter: [
-              '{d|{d}%}',
-              '{b|{b}}'
-
-
-            ].join('\n'), // 用\n来换行
-            rich: {
-              b: {
-                color: '#fff',
-                lineHeight: 25,
-                align: 'left',
-                fontSize: 13,
-                marginTop: 20
-              },
-              c: {
-                fontSize: 22,
-                color: '#fff',
-                textShadowColor: '#1c90a6',
-                textShadowOffsetX: 0,
-                textShadowOffsetY: 2,
-                textShadowBlur: 5
-              },
-              d: {
-                color: color[index],
-                fontSize: 22,
-                align: 'left'
-              }
-            }
-          }
-        }
-        item.labelLine = {
-          normal: {
-            length: 30,
-            length2: 80,
-            lineStyle: {
-              width: 1,
-              color: 'rgba(255,255,255,0.7)'
-            }
-          }
-        }
-        item.labelLayout = function (params) {
-          const isLeft = params.labelRect.x < myChart.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
-          };
-        }
-      })
-    },
-
-    // 图表初始化
-    initChart () {
-      this.$nextTick(() => {
-        // let statusChart = echarts.init(document.getElementById('cityGreenLand-charts'));
-        this.statusChart = echarts.init(document.getElementById('cityGreenLand'));
-        // 传入数据生成 option, 构建3d饼状图, 参数工具文件已经备注的很详细
-        this.option = getPie3D(this.optionData, 0.8, 300, 28, 22, 0.4)
-        this.statusChart.setOption(this.option)
-        // 是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption
-        this.option.series.push({
-          name: '', //自己根据场景修改
-          backgroundColor: 'transparent',
-          type: 'pie',
-          label: {
-            opacity: 1,
-            fontSize: 13,
-            lineHeight: 20
-          },
-          startAngle: 40, // 起始角度，支持范围[0, 360]。
-          clockwise: false, // 饼图的扇区是否是顺时针排布。上述这两项配置主要是为了对齐3d的样式
-          radius: ['30%', '35%'],
-          center: ['50%', '50%'],
-          data: this.optionData,
-          itemStyle: {
-            opacity: 0  //这里必须是0，不然2d的图会覆盖在表面
-          }
-        })
-        this.statusChart.setOption(this.option)
-        this.bindListen(this.statusChart)
-      })
-
-    },
-    // 监听鼠标事件，实现饼图选中效果（单选），近似实现高亮（放大）效果。
-    // optionName是防止有多个图表进行定向option传递，单个图表可以不传，默认是opiton
-    bindListen (myChart, optionName = 'option') {
-      let selectedIndex = ''
-      let hoveredIndex = ''
-      // 监听点击事件，实现选中效果（单选）
-      myChart.on('click', (params) => {
-        debugger
-        // 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
-        const isSelected = !this[optionName].series[params.seriesIndex].pieStatus
-          .selected
-        const isHovered =
-          this[optionName].series[params.seriesIndex].pieStatus.hovered
-        const k = this[optionName].series[params.seriesIndex].pieStatus.k
-        const startRatio =
-          this[optionName].series[params.seriesIndex].pieData.startRatio
-        const endRatio =
-          this[optionName].series[params.seriesIndex].pieData.endRatio
-        // 如果之前选中过其他扇形，将其取消选中（对 option 更新）
-        if (selectedIndex !== '' && selectedIndex !== params.seriesIndex) {
-          this[optionName].series[
-            selectedIndex
-          ].parametricEquation = getParametricEquation(
-            this[optionName].series[selectedIndex].pieData.startRatio,
-            this[optionName].series[selectedIndex].pieData.endRatio,
-            false,
-            false,
-            k,
-            this[optionName].series[selectedIndex].pieData.value
-          )
-          this[optionName].series[selectedIndex].pieStatus.selected = false
-        }
-        // 对当前点击的扇形，执行选中/取消选中操作（对 option 更新）
-        this[optionName].series[
-          params.seriesIndex
-        ].parametricEquation = getParametricEquation(
-          startRatio,
-          endRatio,
-          isSelected,
-          isHovered,
-          k,
-          this[optionName].series[params.seriesIndex].pieData.value
-        )
-        this[optionName].series[params.seriesIndex].pieStatus.selected = isSelected
-        // 如果本次是选中操作，记录上次选中的扇形对应的系列号 seriesIndex
-        selectedIndex = isSelected ? params.seriesIndex : null
-        // 使用更新后的 option，渲染图表
-        myChart.setOption(this[optionName])
-      })
-      // 监听 mouseover，近似实现高亮（放大）效果
-      myChart.on('mouseover', (params) => {
-        // 准备重新渲染扇形所需的参数
-        let isSelected
-        let isHovered
-        let startRatio
-        let endRatio
-        let k
-        // 如果触发 mouseover 的扇形当前已高亮，则不做操作
-        if (hoveredIndex === params.seriesIndex) {
-          // 否则进行高亮及必要的取消高亮操作
-        } else {
-          // 如果当前有高亮的扇形，取消其高亮状态（对 option 更新）
-          if (hoveredIndex !== '') {
-            // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 false。
-            isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
-            isHovered = false
-            startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
-            endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
-            k = this[optionName].series[hoveredIndex].pieStatus.k
-            // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
-            this[optionName].series[
-              hoveredIndex
-            ].parametricEquation = getParametricEquation(
-              startRatio,
-              endRatio,
-              isSelected,
-              isHovered,
-              k,
-              this[optionName].series[hoveredIndex].pieData.value
-            )
-            this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
-            // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
-            hoveredIndex = ''
-          }
-          // 如果触发 mouseover 的扇形不是透明圆环，将其高亮（对 option 更新）
-          if (
-            params.seriesName !== 'mouseoutSeries' &&
-            params.seriesName !== 'pie2d'
-          ) {
-            // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
-            isSelected =
-              this[optionName].series[params.seriesIndex].pieStatus.selected
-            isHovered = true
-            startRatio =
-              this[optionName].series[params.seriesIndex].pieData.startRatio
-            endRatio = this[optionName].series[params.seriesIndex].pieData.endRatio
-            k = this[optionName].series[params.seriesIndex].pieStatus.k
-            // 对当前点击的扇形，执行高亮操作（对 option 更新）
-            this[optionName].series[
-              params.seriesIndex
-            ].parametricEquation = getParametricEquation(
-              startRatio,
-              endRatio,
-              isSelected,
-              isHovered,
-              k,
-              this[optionName].series[params.seriesIndex].pieData.value + 60
-            )
-            this[optionName].series[
-              params.seriesIndex
-            ].pieStatus.hovered = isHovered
-            // 记录上次高亮的扇形对应的系列号 seriesIndex
-            hoveredIndex = params.seriesIndex
-          }
-          // 使用更新后的 option，渲染图表
-          myChart.setOption(this[optionName])
-        }
-      })
-      // 修正取消高亮失败的 bug
-      myChart.on('globalout', () => {
-        // 准备重新渲染扇形所需的参数
-        let isSelected
-        let isHovered
-        let startRatio
-        let endRatio
-        let k
-        if (hoveredIndex !== '') {
-          // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
-          isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
-          isHovered = false
-          k = this[optionName].series[hoveredIndex].pieStatus.k
-          startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
-          endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
-          // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
-          this[optionName].series[
-            hoveredIndex
-          ].parametricEquation = getParametricEquation(
-            startRatio,
-            endRatio,
-            isSelected,
-            isHovered,
-            k,
-            this[optionName].series[hoveredIndex].pieData.value
-          )
-          this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
-          // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
-          hoveredIndex = ''
-        }
-        // 使用更新后的 option，渲染图表
-        myChart.setOption(this[optionName])
-      })
-
-    },
-
     handleChangeAgency () {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
@@ -994,7 +719,7 @@ export default {
       this.userId = id;
     },
     userId () {
-
+      // this.getApiData();
       window.scrollTo(0, 0);
     },
   },
@@ -1012,33 +737,4 @@ export default {
   scoped
 ></style>
 
-<style lang='scss' scoped>
-.chart-container {
-  position: relative;
-  width: 600px;
-  height: 500px;
-  margin-top: 0;
-
-  .chart,
-  .bg {
-    width: 600px;
-    height: 500px;
-    z-index: 2;
-  }
-
-  .bg {
-    position: absolute;
-    bottom: 155px;
-    left: 50%;
-    z-index: 1;
-    width: 250px;
-    height: 140px;
-    background: no-repeat center;
-    background-image: url("../../../../../assets/img/shuju/3d-pid-bg.png");
-    background-size: 100% 100%;
-    transform: translateX(-50%);
-  }
-}
-</style>
-
 

From 666d5c61bc37909b10e436cc52751f96a88a071f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 27 Jun 2022 11:19:48 +0800
Subject: [PATCH 12/27] dd

---
 .../modules/plugins/change/verifyForm.vue     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index d99e2a740..4cc0f6210 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -3,7 +3,7 @@
     <div v-loading="loadingForm" class="dialog-h-content scroll-h">
       <el-form :model="detailInfo" :disabled="btnType == 'detail'">
         <el-form-item
-          label="迁出人姓名:"
+          label="移除人姓名:"
           label-width="150px"
         >
           <span>{{ detailInfo.name }}</span>
@@ -35,7 +35,7 @@
           </span>
         </el-form-item>
         <el-divider></el-divider>
-         <el-form-item
+         <!-- <el-form-item
           label="迁出类型:"
           label-width="150px"
         >
@@ -62,15 +62,15 @@
             label-width="150px"
           >
             <span>{{ detailInfo.xxdz }}</span>
-          </el-form-item>
+          </el-form-item> -->
         <el-form-item
-          label="迁出时间:"
+          label="移除时间:"
           label-width="150px"
         >
           <span>{{ detailInfo.moveOutDate }}</span>
         </el-form-item>
         <el-form-item
-          label="迁出原因:"
+          label="移除原因:"
           label-width="150px"
         >
           <span>
@@ -167,10 +167,10 @@
           style="display: block"
         >
           <el-radio-group v-model="dataForm.type">
-            <el-radio v-if="dataForm.type == 'in'" :label="'in'">{{
+            <el-radio :label="'in'">{{
               '迁往' + rootAgency.organizationName + '内其他区域'
             }}</el-radio>
-            <el-radio v-else :label="'out'">其他</el-radio>
+            <el-radio :label="'out'">其他</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -437,10 +437,10 @@ export default {
       this.dataForm.customerId = this.customerId
       this.dataForm.idCard = row.idCard
       this.dataForm.mobile = row.mobile
-      this.dataForm.type = row.outType
-      this.dataForm.outOfTime = row.moveOutDate
+      // this.dataForm.type = row.outType
+      // this.dataForm.outOfTime = row.moveOutDate
       this.dataForm.reason = row.deleteReason
-      this.dataForm.address = row.xxdz
+      // this.dataForm.address = row.xxdz
       // await this.loadHouseInfo(row.HOME_ID_VALUE)
 
       this.dataForm.name = row.name
@@ -450,7 +450,7 @@ export default {
         this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
       } else this.confirmResult = '1'
       
-      this.reason = row.reason
+      // this.reason = row.reason
 
       await this.loadRootAgency()
       await this.getAgencylist()
@@ -665,7 +665,8 @@ export default {
       }, 2000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          // app.util.validateRule(messageObj)
+          console.log('submit error')
         } else {
           if (this.dataForm.type === 'in') {
             if (!this.dataForm.buildId) {
@@ -681,7 +682,7 @@ export default {
               return false
             }
           }
-          this.saveForm()
+          // this.saveForm()
         }
       })
     },

From 36ec4a536a3274a168801eee44d23fd0de2bced1 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 27 Jun 2022 16:49:08 +0800
Subject: [PATCH 13/27] dd

---
 src/views/modules/plugins/change/verifyForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 4cc0f6210..99c19afec 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -682,7 +682,7 @@ export default {
               return false
             }
           }
-          // this.saveForm()
+          this.saveForm()
         }
       })
     },
@@ -715,7 +715,7 @@ export default {
       }
     },
     async saveForm() {
-      const url = '/epmetuser/changeRelocation/saveOutOfInfo'
+      const url = '/epmetuser/changeRelocation/moveOutHome'
       let noData = new Date()
       noData = util.dateFormatter(noData, 'time')
       this.dataForm.transferTime = noData

From ad49894b11da78407e69cb413acd84ef2182cb30 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 28 Jun 2022 13:44:46 +0800
Subject: [PATCH 14/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E8=AF=8D=E2=80=98=E4=B8=80=E6=88=B7=E4=B8=80=E7=A0=81=E2=80=99?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=98=E4=B8=80=E6=88=BF=E4=B8=80=E7=A0=81?=
 =?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityTable.vue      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 1c50a46c6..cd7571b7c 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -7,7 +7,7 @@
                       class="diy-button--reset"
                       size="small"
                       :loading="yhymLoading"
-                      @click="handleYhymInfo">补全一户一码信息</el-button>
+                      @click="handleYhymInfo">补全一房一码信息</el-button>
       <el-button style=""
                  class="diy-button--add"
                  size="small"
@@ -206,7 +206,7 @@
                  size="small"
                  :disabled="yihuyimaDisabled"
                  :loading="exportBtn"
-                 @click="handleExportYihuyima()">导出一户一码</el-button>
+                 @click="handleExportYihuyima()">导出一房一码</el-button>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -240,7 +240,7 @@ export default {
 
       showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
       roleList: [],//角色列表
-      showYhymInfo: false, // 是否显示补全一户一码信息按钮
+      showYhymInfo: false, // 是否显示补全一房一码信息按钮
       yhymLoading: false,
 
       agencyObj: {},//树所选的组织对象
@@ -282,7 +282,7 @@ 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
@@ -372,7 +372,7 @@ export default {
       })
     },
 
-    // 补全一户一码点击事件
+    // 补全一房一码点击事件
     async handleYhymInfo () {
       this.yhymLoading = true
       const url = "/gov/org/house/createBatchHouseCodeAndUrl"
@@ -687,13 +687,13 @@ export default {
     },
 
 
-    // 导出一户一码
+    // 导出一房一码
 
     handleExportYihuyima () {
       this.exportBtn = true
       this.yihuyimaDisabled = true
       let title = this.agencyObj.label
-      title = title + '-一户一码'
+      title = title + '-一房一码'
       let url = "/gov/org/house/downloadZip"
 
 

From 9e3ba34027e3fbfe0a7f5eb7e57c75f0dd319031 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Jun 2022 14:16:33 +0800
Subject: [PATCH 15/27] dd

---
 src/views/components/resiChangeTransfer.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index 1990c3e19..f19da89b9 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -498,7 +498,8 @@ export default {
       }, 2000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          // app.util.validateRule(messageObj)
+          console.log('error submit!')
 
         } else {
           if (this.dataForm.type === 'in') {
@@ -522,7 +523,9 @@ export default {
     },
 
     async saveForm () {
-      const url = '/epmetuser/changeRelocation/saveOutOfInfo'
+      
+      // saveOutOfInfo
+      const url = '/epmetuser/changeRelocation/moveOutHome'
       let noData = new Date()
       noData = util.dateFormatter(noData, 'time')
       this.dataForm.transferTime = noData
@@ -530,7 +533,7 @@ export default {
       const { data, code, msg } = await requestPost(url, this.dataForm)
 
       if (code === 0) {
-        this.$message.success('调动成功')
+        this.$message.success('操作成功')
         this.handleCancle()
       } else {
         this.$message.error(msg)

From b11271fb98481fce1576a7232131ba60d31ea1aa Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 28 Jun 2022 15:39:28 +0800
Subject: [PATCH 16/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue |  3 ++-
 .../visual/communityGovern/duoyuanfuwu/pieOption.js  | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index dbaf1df06..300d9e1b9 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -111,6 +111,7 @@ const legendList = [
   { name: '#8fc41e', icon: require('../../../../../assets/img/shuju/volunteer7.png') },
   { name: '#00a1be', icon: require('../../../../../assets/img/shuju/volunteer8.png') },
   { name: '#0067b6', icon: require('../../../../../assets/img/shuju/volunteer9.png') },
+  { name: '#e5007f', icon: require('../../../../../assets/img/shuju/volunteer3.png') },
   { name: '', icon: require('../../../../../assets/img/shuju/volunteer1.png') }
 ]
 const defaultLegendIcon = require('../../../../../assets/img/shuju/volunteer1.png')
@@ -164,10 +165,10 @@ export default {
         require('../../../../../assets/img/shuju/volunteer5.png'), // 楼委会
         require('../../../../../assets/img/shuju/volunteer7.png'), // 老友俱乐部
         require('../../../../../assets/img/shuju/volunteer8.png'), // 治安巡逻
+        require('../../../../../assets/img/shuju/volunteer3.png'), // 应急队伍
         require('../../../../../assets/img/shuju/volunteer9.png'), // 其他
         require('../../../../../assets/img/shuju/volunteer1.png'), // 采集员
         require('../../../../../assets/img/shuju/volunteer2.png'), // 代办员
-        require('../../../../../assets/img/shuju/volunteer3.png'), // 能人达人
         require('../../../../../assets/img/shuju/volunteer6.png'), // 调解员
       ],
       polygonList: []
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
index ae6ffd8ce..3afabd257 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
@@ -44,7 +44,7 @@ export function pieOption (_charts) {
           // tooltip: {
           // },
           center: center,
-          radius: ['53%', '53.3%'],
+          radius: ['48%', '48.3%'],
           label: {
             show: false
           },
@@ -70,7 +70,7 @@ export function pieOption (_charts) {
           // name: 'Access From',
           type: 'pie',
           center: center,
-          radius: ['30%', '43%'],
+          radius: ['25%', '38%'],
           avoidLabelOverlap: false,
           // top: top + '%',
           // height: '80%',
@@ -87,14 +87,14 @@ export function pieOption (_charts) {
             edgeDistance: 1,
             lineHeight: 15,
             color: '#fff',
-            fontSize: 10,
+            fontSize: 8,
             // distanceToLabelLine: -60,
             rich: {
               name: {
                 padding: [0, 6, 0, 6]
               },
               a: {
-                fontSize: 25,
+                fontSize: 23,
                 color: '#fff',
                 padding: [0, 6, 6, 6]
               },
@@ -110,9 +110,9 @@ export function pieOption (_charts) {
           labelLine: {
             show: false,
             smooth: 0.2,
-            length: 40,
+            length: 20,
             length2: 0,
-            maxSurfaceAngle: 80
+            maxSurfaceAngle: 60
           },
           labelLayout: function (params) {
             

From ce389708f4cfe67dde67e51f9c25f6d4699c6c9d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Jun 2022 15:41:33 +0800
Subject: [PATCH 17/27] dd

---
 src/views/components/tinymce2/index.vue                    | 2 +-
 .../modules/communityParty/regionalParty/activitysForm.vue | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue
index 5f82a817d..eb118d6ad 100644
--- a/src/views/components/tinymce2/index.vue
+++ b/src/views/components/tinymce2/index.vue
@@ -48,7 +48,7 @@ import "tinymce/plugins/visualblocks"; //
 import "tinymce/plugins/visualchars"; //
 import "tinymce/plugins/wordcount"; //数字统计
 import { debounce } from "throttle-debounce";
-
+let num = 1;
 export default {
   props: {
     id: {
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 81b926c19..ea0915d51 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -258,7 +258,7 @@ export default {
         latitude: 120.38945519 //纬度
       },
       serviceList: [],
-      gridList: [],
+      gridLists: [],
       agencyId: ''
 
     }
@@ -304,7 +304,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.gridList = data
+        this.gridLists = data
 
       } else {
         this.$message.error(msg)
@@ -390,6 +390,9 @@ export default {
       if (this.formData.content) {
         this.formData.content = this.dormatHtml(this.formData.content)
       }
+      if (this.formData.result) {
+        this.formData.result = this.dormatHtml(this.formData.result)
+      }
       
       const { data, code, msg } = await requestPost(url, this.formData)
 

From fe33533c21de36613e65b499a097dd08b9f64f1a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 28 Jun 2022 16:26:39 +0800
Subject: [PATCH 18/27] =?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     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 300d9e1b9..39a8cf284 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -62,7 +62,9 @@
                         @clickFeature="clickMap"
                         :showIconLayer="true"
                         :showPolygonLayer="true"
+                        :showPolIconLayer="true"
                         :clickType="'popup'"
+                        :areaScale="0.1"
                         :isAddOpenlay="true"></screen-map>
           </div>
           <div class="map-tips">

From c93bbb2a59314580675697a90d47074cf23e41b9 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 28 Jun 2022 17:35:20 +0800
Subject: [PATCH 19/27] =?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/components/screen-map/index.vue    | 90 ++++++++++++++-----
 1 file changed, 67 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 0d9f75ce1..e85e184c0 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -197,7 +197,7 @@ const vueGis = {
       //icon图标样式
       iconUrlArray: [],
       iconTextColor: '#ffffff',
-      distanceMax: null,//显示的坐标距离中心点的范围                                                    
+      distanceMax: null,//显示的坐标距离中心点的范围
 
       input_lat: null,
       input_lon: null,
@@ -207,7 +207,6 @@ const vueGis = {
   },
   async mounted () {
 
-
   },
   methods: {
     showPosition () {
@@ -231,7 +230,6 @@ const vueGis = {
 
       //初始化地图
       this.initMap()
-
       if (this.showPolIconLayer) {
         console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
         //初始化多边形标注图层
@@ -246,6 +244,7 @@ const vueGis = {
         this.loadPolygon()
       }
 
+
       if (this.showIconLayer) {
         //初始化icon图层
         this.initIconLayer()
@@ -296,7 +295,6 @@ const vueGis = {
       }
       this.setMapLocation()
       // gaodeMapLayer.getSource().changed()
-
     },
 
     //加载区域多边形
@@ -355,6 +353,7 @@ const vueGis = {
           this.loadPolIcon(feature)
         }
 
+
       }
 
     },
@@ -363,7 +362,7 @@ const vueGis = {
     loadPolIcon (feature) {
       polIconSource.clear()
       let polyIconFeatures = [];
-      console.log('feature-----', feature)
+      // console.log('feature-----', feature)
       feature.forEach(oneIcon => {
 
         var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
@@ -380,7 +379,7 @@ const vueGis = {
             id: oneIcon.id_
           }
         });
-        // console.log('oneIcon----', oneIcon)
+        // console.log('oneIcon----ddd', oneIcon)
         let polyIconStyle = new Style({
           image: new Icon({
             // anchor: [0.5, 0.5],
@@ -416,12 +415,14 @@ const vueGis = {
               info: { ...oneIcon }
             }
           });
+          // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
           let iconStyle = new Style({
             image: new Icon({
               // anchor: [0.5, 0.5],
               // imgSize: [32, 32],
               // scale: 0.5,
-              src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0]
+              // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
+              src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
             }),
             // text: createTextStyle(oneIcon)
           });
@@ -454,8 +455,8 @@ const vueGis = {
       return (distance < max || distance === max)
 
       // debugger
-      //   return 
-      // var wgs84Sphere = new ol.Sphere(6378137); 
+      //   return
+      // var wgs84Sphere = new ol.Sphere(6378137);
       // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]);
     },
 
@@ -514,6 +515,46 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
+      if (!this.zoom) {
+        this.setZoom(this.mapInfo.agencyLevel)
+      }
+      this.centerPoint = []
+
+
+      //如果存在中心点（返回时赋值）
+      if (this.center && this.center.length > 0) {
+        this.centerPoint = this.center
+        this.centerFlag = 'point'
+        this.center = []
+
+      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+        this.centerFlag = 'flag_polygon'
+
+      } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
+        this.centerPoint.push(this.mapInfo.longitude)
+        this.centerPoint.push(this.mapInfo.latitude)
+        this.centerFlag = 'point'
+
+      } else {
+        this.centerPoint = centerPointGlobal
+        this.centerFlag = 'point'
+      }
+      // debugger
+      if (this.centerFlag === 'flag_parent') {
+        let parentFeatures = parentLayer.getSource().getFeatures()[0]
+        let polygon = parentFeatures.getGeometry();
+        map.getView().fit(polygon, map.getSize());
+        this.zoom = map.getView().getZoom() - 1
+
+      } else if (this.centerFlag === 'flag_polygon') {
+        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+        let polygon = polygonFeatures.getGeometry();
+        map.getView().fit(polygon, map.getSize());
+        this.zoom = map.getView().getZoom() - 1
+
+      } else {
+        mapView.setCenter(this.centerPoint);
+      }
 
       if (!this.isChangeCenter) {
         return false
@@ -579,13 +620,13 @@ const vueGis = {
     },
 
     //根据组织层级设置缩放级别
-    setZoom (level) {
-      if (level === 'district') {
-        this.zoom = 11
-      } else if (level === 'street') {
-        this.zoom = 12
-      } else if (level === 'community') {
-        this.zoom = 13
+    setZoom(level) {
+      if (level === "district") {
+        this.zoom = 11;
+      } else if (level === "street") {
+        this.zoom = 12;
+      } else if (level === "community") {
+        this.zoom = 13;
       }
 
     },
@@ -630,15 +671,18 @@ const vueGis = {
         };
       })();
 
-      // select = new Select({
-      //   style: overlayStyle
-      // });
-      // 有BUG 加入多边形选中样式时，如果同时存在icon层和多边形层，点击icon会使icon消失 ---zhaotongyao 2022.06.01
+      select = new Select({
+        style: overlayStyle
+      });
 
-      map.addLayer(polygonLayer)
-      // map.addInteraction(select);
 
 
+      map.addLayer(polygonLayer)
+      if (this.$route.path == '/main-shuju/visual-communityGovern-duoyuanfuwu-duoyuanfuwufenxi' || this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
+         console.log('去掉默认点击')
+      } else {
+          map.addInteraction(select);
+      }
     },
 
     //初始化多边形icon图层
@@ -917,4 +961,4 @@ export default vueGis;
   // color: rgba(1, 17, 104, 1);
   color: #fff;
 }
-</style>   
\ No newline at end of file
+</style>
\ No newline at end of file

From 7751745864a36f11c6fa903127bd98370df5a46d Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 28 Jun 2022 18:53:48 +0800
Subject: [PATCH 20/27] =?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/assets/img/shuju/volunteer3.png           | Bin 2211 -> 3640 bytes
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png
index a070fa692a1af623028a4209dec8bca37ca7b9b8..2d2493957000c0cfb479f74bcbe0034f541475ef 100644
GIT binary patch
literal 3640
zcmaJ^c{r5q+a7BOQI-@n;hjv(VvKDV+l+miG!bPPW-yq=%*2T7OH{~G!W$JzSxT1d
zM3yLpsF4tvw2-9~&Fh=q-`o59{`mTy<9MF?y6@vU&+EMI>-^_Q#W`6^N$imT002_9
zHdq(_YRG@J#6<buDIu9k{-VUPJjOag^Jj$<7$kr>k>*PR+ENGsBo`8a7!le}G6n#I
z)X4Z_tYeN2C_fqnO8A)rWmD*UGyq_1%BB<if=Mi(FDZabMXN3~x2polM6{}#t|Q!$
zjv)n-ZB8*rM@~86{Z0k@84^`ZO@PL16rX@XViACBN(hySVxv|6=0)-2pT{s&;NK~%
zV6^IgL>+U)0WmZN38)LzgZOD94S@QFP;EUVTt`m}h=6Mw!r%rlZ5;?)8wJ-x>FNXj
zc~tq;7({=R3)bqNTKpYaHIT)kqhPS`@Nj6j4wS|SfN2{V@;MMN1Omd(fG{JdECL%s
zWvcyRz>=7L3^JWXrcr@E8413$lPt6<U+I5ZpwR!Nr857yCjN!N*aSLE8w&r~(yv5E
z$NxW-LisnF$#Nn6SMUEx%*02~NiY`@lXjBf#~+-(+RsvS6ox?}uxJcCjTZ9j7IA?z
z7L6H5qXQ9qNk9!ZGL=XRXM+C*I69(isZ17u>PNE0qE-16P%@c_Lh2YI;5zyiR(co<
zZEZ`8p#|K^O54g1iP42yz;z9NVX-v7lN1t_^$Sb<FBbD#>`yOH=={o95`!E@B3dzM
z6yV=IqsYJ4V)$FWf3U>gYcc;V7RDC?`#IVFHR)eReEa+i|Me|@^RM$sRKDFAd|yXK
z-NOI?61Q!!=6E(|Fh3$h#agA8`(n2BbV^Z%a{9>4bc~HXCX0c6d$ZeAtPWf*gTDq$
zzZtaPEgK&%A-23jEH@?%7uRlZOHe*QUfR+^Mh<s8*Y0T<`H)3b){D@O-`MLDe#uKF
zL#WyQs!uPV^WgT6ZD{{_op$E@Wjk>HEt7Q~wUpMBIb>!c`m(a>&-fp5E5hHu$0@j9
z-{A=<`SF?Nw!(3>`SIrUxy@?x#cS;?+*ey7a~ixoN-g0<2_w#!#gva}FAr2(L`#0}
zf1$G_md#xbk^H6zp0io~h;0oGyLN!nX=MSfOM~`Ljas+N2v``Nt=rJsC`hP0nIgA8
z%3mx+EptL=U&OwZtIJdE$ohpvv=RNU8#h%#3L<7gWX3pQobB2nZ&fD5*9&1aYU?KT
zRhiEw+aJw-R+eQrN3xP@VMAFrXTq04C6W3sM&tt*B%x?PgoMZ5{D|c!xjI27jmr#C
zJH;QV9s=uO?<uSC_NUf&6x~UWo~yi_RO?#$5NE7`nz_R1w^y$SS9o1Oxd0dzj9M6j
zs14pt7dVIa{wqT!x;yn@)!N6&uUwAirM7{yjn*v%n;D}{=P5n6_b)m57y%!T-=Ko4
z<D6@bnr}S2x>0^u@RN-HUA(Mg(Wui2)lPiEsIym&`cBF5>Wfo|wTAij>Zt6-u`cvx
zee0+JI{H;P+h_%o>%T&!*F70m|2#_D>U?xy!dy(J^;sN#hPe%(uY#ZOhO|Yj3Tw@b
zyMklHIL02Q-wsprw$zx{ukSQJQ+XSd@Dg-AZ#m*_W9?>(>GY56%oyl>{ewsQHVJ94
zuACi;^*ajVL}UErUu|1Gt~oUBy?3v#o~iMc@eNsb8Z-Aox6ij01D@skwM&aD$@*AV
zaKrxbeMziQo<dz^<jTZ`cVbLaCQRSED0<JhbaO)P$m3PFi7@ZwT{Z`#*I$)9&i)``
zn+qRoO3cJ!2M!YIEQvBIHIdtq4W%mvLlc{THNz|Smdr|cMz8NpK1Lr6@M{!pZythj
z_gk<|%V)2MEOHvU+w5hQj}|!J(gvMwyJ}*4KD~+C>7a9ELElrKnJ(YStyjD1rl{mo
z*i1Y|Yv0yT<Rd+mY$NqSrk|G`$erxVeLUyRLx0-5g|vNs+Vj4hQRvQa_#N+e`3}PQ
z)4S;>csV(8b*tZ(0Gu-xT>G3X%2Si8=RlNm=Bw*Ma8MXN=HmM)<z1fTpvwYwx_xtf
zr82Duxn4Y^=?*UN`>d;WIDoSzMR{ZxqX1=m2!|h7N*tR-KqI~gJ~5SOj9tC2d=4qg
zIUHnt?a8I1k~j=Yih;>iAUU`cn4F{fPAzz5dhMQ&ds4d(Q_Hg|lvq>RRxEU63k6tL
zJvm5@S!Bu%nIs;(Z8xh;ELKqyDhw*t8aQ_k=xAWCf5b6FGAJIt;hx87SZ)nyn{i36
z?e(8JST%ac$$Mtg26kTfX;DSYK9P;e#bi~&V$^q3a&U&Aaq_!_ZxVz0>T%LiQrjn8
zY6f%tzZI35H`*~ccO#`&Ih`S2<xArhw~4SN)5Zdym&;x8y@DQVJi(JQv&Oyb7GWbQ
zY-O=if^+u;7c|Jhz4c*efiXf72w|VybeVx+isQUeZ>Sp%`AuIfo=Xwiz2j!EFj=^*
zM*y|UJiGMCyFv4BpK*W9$1U3VN#mXrmz~}dyKIEngKOyy3hJFJ3@DK=_q0!PSnU!<
z2(01p$kO6&q1at@U8Wu)Tp{=@G-=We==yLqp9_+{CaI+uMg_SVRx7*d$wXZd@o5jT
zPYKp2*9;xabGV}pxT}TJRHM*^5Y=XOkCq<2f8ke>6fda;3;A~A)0J1y*sux3$_^_f
zu0puf&gM6d&pY+8(S~VaD#0`}0X^M2`C0C|q6251y68BM!1@`;eqC<|;8}^PYpUcT
zlxx$SoUb*76TQj}DV%zHgD*;7F8C7@-^yt&ab7)te}bkZXKWhGeIx{D7GPzw&8N4w
z>u7TR1m}IOjW0ONo5&AKoKLwrbBR@nRKh%**9GJq@H&)^8;8KR<)-G`!#&ebcmq+z
zTHB517S^6x&uH0h4z|_)qEVAh=ugtHg~-k5-ThN}pgF>6fbPqIMQwpzE+DUY@U*5O
zkfVtn-On?k?mp;vWV7G)y^WyrP9NVs#K7C+%Ga+Oj`T_kFx}GvJ;FFg3-t-nl#Y#9
zDdAy(*^;8ji#3N4D#!;1LvQb^zWzC*_qfs13JCaQW;pZa8MLx}1@7JK+u=JOg^juv
z78J3~D!VV#SN8NOid&Uuo;sPW;E9gx>WI9|mFnt#0tj)idWKAWfHJ#^?huzX%NER(
zEq=4rlS*&vJ-gURFI!eCNqfm2398zU7tcY645-^hm+b9WX_<4Cz0i2c<7;s%c{ci4
z2vq_E%D5#Sex8w`G&{6r+gf6O`>1DRSF(|N=LA$}D{+m-H1HD9s#QD*NO|v(R!daY
zHR1v@yw9fg_hc2ucz|Zl5WopaOlyXT?We%B2lB-)CvO@rN`gS?S}p@wa#ub`u$qpA
zJ~^9Y1kkmMpUzq{x+H-51C!?^Yy-Z&*IkJSIo$loXZR^q=#%sHqR=({G?Sht9?Yv`
zMAsWx-4$RNY^O;&Z+%V~S#<W=saeCk50viugJk6s8g<R{oae;)#@8~~acl0NeEsa<
zi3RJJ<8+hVx_gGoa_A3shl5I@kL<P$GYRS1pFTk>j_qLX?RnD~&=i;ArO1B6-nFgh
zz7$wtgAksO1`^+OEOeUitv6MHeMW%|xbKPF!<A*H@3m|acNq48%qGKkQj6sWCmGvS
zc)4$xv#ugw^-B|WYTD52^fZaXLOyCv2k;W6UXFciOWDmA$`xawg(hOn7cH8|>b3_&
zY*HDwcl4eg-cd+j2`aSstMqxbijW@V^ks3du9VdtqKk76>7u5`CuVeTMOj*$iiW6F
zUO{l|b%_qtbUxtg-L$n?6>0gLMAzeC0<*q=Ddi4>*e?K&?k|Y6I6>q%R+}#Ru*1^W
zwER$UzUcelV29SzjmkyH$H-^bE?-g?l}SD_a&NLG{b~hsGP=)^A1!Bk7<Uw(HcNb}
z!a3Kl`;QbSLr|y1cIhC`0^znl;)~T#f8KfrgouZ_=CbZOXkI>?DdkvD_7b{~jSv|g
zU%7CFRjMZtdgEr;91>|Py<GdH%mm!uoSG!&r}|j1^))5jDPbcNY}1(MTt?0+?-@kr
z<3{KZ_n`71^#HuOe?Q5oY;pZ8q>lBBhZywGf|d3YFODdbr6x}V$)F0W%<moQk9Vjg
zkCj3EI$w=e)w$iW<;4YFh?NV>+;Bb9?6bt(19Wy5T;O4?)V&wKTKkwidMmt7CAs8;
z{<e{^SO)`5%vogDmYSa%G<a8V`S}WxwVQ7X5HXxaGJ9#2`NpcFpHnZ><LZ}JBd=7Z
zl{qp!#~45{cZ?K<mO=21gp03U#QK9xwTYHYLWsIGZFIiIi}Odquzsjzk3>>wh4j0f
zrel3MhwO<TC(g*hR~s(K^9rllLlz63%AKiQVku=JEbqBbxveD(F}D0Wgh3v@?Th18
zIm|5IDl!EY=H%M+z`cLJ74f9arDLlkbLfpvUp7BvY&`^wzghJb5Czl^a+iMK#Gn8C
Om$S8W!d6-M#QzV<R8Q&v

literal 2211
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

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 39a8cf284..395477b94 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -771,7 +771,10 @@ export default {
     align-items: center;
     margin-top: 10px;
     margin-right: 40px;
-
+    .title-icon {
+      width: 40px;
+      height: 34px;
+    }
     .map-tips-icon {
       width: 20px;
       height: 10px;

From 6176a8d797edd308589d7283430b84b18edd6447 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 29 Jun 2022 10:03:48 +0800
Subject: [PATCH 21/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E8=87=AA=E7=BB=84=E7=BB=87=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/sqzzz/cpts/edit.vue | 3 +++
 src/views/modules/communityService/sqzzz/index.vue     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index 0b756bafa..9537cccc3 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -314,6 +314,9 @@ export default {
         principalPhone: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },
         ],
+        address: [
+          { required: true, message: "地址不能为空", trigger: "blur" },
+        ],
         longitude: [
           { required: true, message: "请拖动地图选择坐标点", trigger: "blur" },
         ],
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index e25b5326e..6193674c7 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -131,6 +131,8 @@
         </el-table-column>
         <el-table-column prop="principalPhone" align="center" label="联系电话">
         </el-table-column>
+        <el-table-column prop="address" align="center" label="地址">
+        </el-table-column>
         <el-table-column prop="remark" align="center" label="备注">
         </el-table-column>
         <el-table-column

From 7d8979690e6e8fdf691ede0019bdb092f4ef5273 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 23 Jun 2022 14:52:51 +0800
Subject: [PATCH 22/27] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/csgltc/csgl.vue | 5 ++---
 src/views/modules/shequzhili/ggfwtc/ggfw.vue | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 34902625a..4fb809e53 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -102,8 +102,7 @@
                          header-align="center"
                          align="center"
                          label="占地面积"
-                         show-overflow-tooltip
-                         min-width="250">
+                         max-width="100">
 
         </el-table-column>
         <el-table-column prop="capacity"
@@ -117,7 +116,7 @@
                          align="center"
                          show-overflow-tooltip
                          label="地址"
-                         width="120">
+                         mix-width="230">
         </el-table-column>
 
         <el-table-column label="操作"
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index fcf551528..9e781de2b 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -101,7 +101,7 @@
                          align="center"
                          label="占地面积"
                          show-overflow-tooltip
-                         min-width="250">
+                         max-width="100">
         </el-table-column>
         <el-table-column prop="capacity"
                          header-align="center"
@@ -114,7 +114,7 @@
                          align="center"
                          show-overflow-tooltip
                          label="地址"
-                         width="120">
+                         mix-width="230">
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"

From 22a78d42426772ed41fe24184aab114cf4105c74 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 29 Jun 2022 10:31:16 +0800
Subject: [PATCH 23/27] =?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     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 395477b94..1f646b050 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -223,7 +223,7 @@ export default {
           }
           this.pieData.push(ob)
         })
-        this.getMapData()
+        // this.getMapData()
       } else {
         this.$message.error(msg)
       }

From 20447ebe26befda03ce6533cb9fcd691ef0d5555 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 29 Jun 2022 10:58:48 +0800
Subject: [PATCH 24/27] =?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/assets/img/shuju/volunteer3.png | Bin 3640 -> 2821 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png
index 2d2493957000c0cfb479f74bcbe0034f541475ef..509fdf17fbf7fae8605ff14d743a050a55d83a46 100644
GIT binary patch
delta 2192
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
VT5+d$89$#400xCc*62CK{2!M;1^fU2

delta 3017
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
Qzu!3ssc(*G(Q}UbA5;K|!T<mO


From f344735d462e3469263329f5bf382c4371c42aba Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 29 Jun 2022 16:23:44 +0800
Subject: [PATCH 25/27] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 017e779a5..842806954 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -271,10 +271,13 @@ export default {
       // }
       arr.forEach((item) => {
         if (item.itemType == 'checkbox') _form[item.columnName] = []
-        else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
+        else if (item.queryType == 'resi_category' && columnName ){
+           _form[item.columnName] = [columnName]
+        } else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
         else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: ''}
         else _form[item.columnName] = ''
       })
+      console.log('_form----------rrr', _form)
       return _form
     }
     let itemList = this.formList.map(item => {
@@ -290,7 +293,7 @@ export default {
 
       return {
         ...item,
-        isChange: this.columnName && this.columnName === item.columnName ? true : false
+        isChange:( item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
       }
     })
     let constForm = {

From c1bbd562f823f6a95a705b1ce013278c3ef11c6e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 1 Jul 2022 10:43:28 +0800
Subject: [PATCH 26/27] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=EF=BC=8C=E6=A5=BC?=
 =?UTF-8?q?=E6=A0=8B=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildForm.vue      | 61 ++++++++++++++++++-
 .../modules/base/community/buildTable.vue     | 22 +++++--
 .../modules/base/community/communityForm.vue  | 45 +++++++++++++-
 .../modules/base/community/communityTable.vue | 21 +++++--
 src/views/modules/base/community/roomForm.vue | 49 +++++++++++++--
 5 files changed, 182 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 5a9c703f2..ffaf80203 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -24,6 +24,21 @@
                     v-model="dataForm.buildingName">
           </el-input>
         </el-form-item>
+        <el-form-item label="楼栋编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
         <el-form-item label="楼栋类型"
                       prop="type"
                       label-width="150px"
@@ -73,6 +88,16 @@
                            :max="9999"
                            label="总户数"></el-input-number>
         </el-form-item>
+        <el-form-item label="人口数"
+                      style="display: block"
+                      prop="realPerson"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realPerson"
+                           :min="0"
+                           :max="9999"
+                           label="人口数"></el-input-number>
+        </el-form-item>
         <el-form-item label="楼长姓名"
                       prop="buildingLeaderName"
                       label-width="150px"
@@ -128,6 +153,16 @@
           </div>
 
         </el-form-item>
+        <el-form-item label="楼栋地址"
+                      prop="coordinatePosition"
+                      label-width="150px"
+                      style="display: block">
+          <!-- <span>{{ dataForm.coordinatePosition }}</span> -->
+          <el-input class="item_width_1"
+                    placeholder="请选择楼栋地址"
+                    disabled
+                    v-model="dataForm.coordinatePosition" />
+        </el-form-item>
       </el-form>
 
     </div>
@@ -169,9 +204,13 @@ export default {
         totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//总户数	
+        realPerson: 0, 
         buildingLeaderName: '',//楼长姓名
         buildingLeaderMobile: '',//楼长电话
         type: '',//房屋类型
+        coordinatePosition: '',
+        sysCoding: '',
+        coding: '',
         location: '', //坐标位置
         longitude: '', //经度
         latitude: '' //纬度
@@ -199,7 +238,8 @@ export default {
       if (row) {
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.buildingId = this.dataForm.buildingId
-        this.buildType = this.dataForm.buildingTypeKey
+        // this.buildType = this.dataForm.buildingTypeKey
+        this.buildType = this.dataForm.type
 
         map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
         this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
@@ -226,6 +266,18 @@ export default {
 
       })
     },
+    async handleCode() {
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getBuildingCoding/" + this.dataForm.neighborHoodId);
+      console.log('data----', data)
+      console.log('code----', code)
+      console.log('msg----', msg)
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
     async addBuild () {
       if (this.dataForm.buildingLeaderMobile) {
         const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
@@ -328,12 +380,14 @@ export default {
           let { data } = result
           if (Array.isArray(data) && data.length > 0) {
             const {
-              location: { lat, lng }
+              location: { lat, lng },
+              address
             } = data[0]
             map.setCenter(new TMap.LatLng(lat, lng))
             this.setMarker(lat, lng)
             this.dataForm.latitude = lat
             this.dataForm.longitude = lng
+            this.dataForm.coordinatePosition = address
           } else {
             this.$message.error('未检索到相关位置坐标')
           }
@@ -405,6 +459,9 @@ export default {
         totalUnitNum: [
           { required: true, message: '单元数不能为空', trigger: 'blur' }
         ],
+        coding: [
+          { required: true, message: '楼栋编码不能为空', trigger: 'blur' }
+        ]
         // totalFloorNum: [
         //   { required: true, message: '层数不能为空', trigger: 'blur' }
         // ],
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 68466e237..486dc9ec7 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -360,11 +360,12 @@ export default {
       this.formShow = false
     },
 
-    handleDetail (row) {
+    async handleDetail (row) {
       this.formTitle = '楼栋详情'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+        this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
       })
     },
 
@@ -376,11 +377,12 @@ export default {
       })
     },
 
-    handleEdit (row) {
+    async handleEdit (row) {
       this.formTitle = '修改楼栋'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
       })
     },
 
@@ -508,6 +510,18 @@ export default {
         this.$message.error(msg)
       }
     },
+    async detail (row) {
+      const url = "/gov/org/houseInformation/getBuildingDetail/" + row.buildingId
+
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        return data
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
     //导出表格
     async handleExport () {
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 9dd8aef98..bf588d58c 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -41,6 +41,21 @@
                       v-model="dataForm.neighborHoodName">
             </el-input>
           </el-form-item>
+          <el-form-item label="小区编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
           <el-form-item label="关联物业"
                         prop="propertyId"
                         label-width="150px"
@@ -62,6 +77,16 @@
                        size="small"
                        @click="handleAddProperty">添加物业</el-button>
           </el-form-item>
+          <el-form-item label="实有楼栋"
+                      style="display: block"
+                      prop="realBuilding"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realBuilding"
+                           :min="0"
+                           :max="9999"
+                           label="总户数"></el-input-number>
+        </el-form-item>
           <el-form-item label="详细地址"
                         prop="address"
                         label-width="150px"
@@ -181,7 +206,10 @@ export default {
         remark: '', //备注【最大500字】
         location: '', //坐标位置
         longitude: '', //经度
-        latitude: '' //纬度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
       },
 
       propertyFormShow: false,
@@ -285,6 +313,7 @@ export default {
       this.formType = type
       if (row) {
         this.dataForm = JSON.parse(JSON.stringify(row))
+        this.dataForm.neighborHoodId = this.dataForm.id
         this.neighborHoodId = this.dataForm.neighborHoodId
         map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
         this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
@@ -298,7 +327,16 @@ export default {
       await this.loadGrid()
       await this.loadProperty()
     },
-
+    async handleCode() {
+      if (!this.dataForm.gridId) return this.$message.error('请选择网格')
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getNeighborHoodCoding/" + this.dataForm.gridId);
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
     //加载组织
     async loadAgency () {
       const url = '/epmetuser/customerstaff/staffbasicinfo'
@@ -489,6 +527,9 @@ export default {
         gridId: [
           { required: true, message: '所属网格不能为空', trigger: 'blur' }
         ],
+        coding: [
+          { required: true, message: '小区编码不能为空', trigger: 'blur' }
+        ],
         address: [
           { required: true, message: '详细地址不能为空', trigger: 'blur' }
         ],
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index fdf86681c..eb953177f 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -356,11 +356,12 @@ export default {
       this.formShow = false
     },
 
-    handleDetail (row) {
+    async handleDetail (row) {
       this.formTitle = '小区详情'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+        this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
       })
     },
 
@@ -371,7 +372,18 @@ export default {
         this.$refs.ref_form.initForm('add', null, this.agencyObj)
       })
     },
+    async detail (row) {
+      const url = "/gov/org/houseInformation/neighborhoodDetail/" + row.neighborHoodId
 
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        return data
+      } else {
+        this.$message.error(msg)
+      }
+    },
     // 补全一房一码点击事件
     async handleYhymInfo () {
       this.yhymLoading = true
@@ -400,11 +412,12 @@ export default {
       }
     },
 
-    handleEdit (row) {
+    async handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
       })
     },
 
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 8f564f371..3733735cf 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -11,7 +11,7 @@
         <el-form-item label="所属楼栋"
                       label-width="150px"
                       style="display: block">
-          <span>{{ dataForm.neighborHoodName }}{{dataForm.buildingName}}</span>
+          <span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
@@ -39,7 +39,21 @@
                     v-model="dataForm.doorName">
           </el-input>
         </el-form-item>
-
+        <el-form-item v-if="formType != 'detail'" label="房屋编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
         <div v-if="formType === 'detail'">
           <el-form-item label="房屋编码"
                         prop="houseCode"
@@ -59,6 +73,16 @@
                target="_blank">下载</a>
           </div>
         </div>
+        <!-- <el-form-item label="居住人数"
+                      style="display: block"
+                      prop="realPerson"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realPerson"
+                           :min="0"
+                           :max="9999"
+                           label="居住人数"></el-input-number>
+        </el-form-item> -->
         <el-form-item label="房屋类型"
                       prop="houseType"
                       label-width="150px"
@@ -184,7 +208,10 @@ export default {
         ownerPhone: '', //联系方式
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-        remark: ''
+        remark: '',
+        // realPerson: 0,
+        coding: '',
+        sysCoding: ''
       },
 
       keyWords: '',
@@ -203,6 +230,7 @@ export default {
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       this.formType = type
+      console.log('agencyObj-----', agencyObj)
       if (row) {
 
         this.houseId = row.houseId
@@ -217,7 +245,7 @@ export default {
         // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
 
       } else {
-
+        
         this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
         this.dataForm.buildingId = this.agencyObj.id
       }
@@ -264,6 +292,16 @@ export default {
         this.$message.error(msg)
       }
     },
+    async handleCode() {
+      if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
 
     async handleComfirm () {
       this.btnDisable = true
@@ -382,6 +420,9 @@ export default {
         doorName: [
           { required: true, message: '门牌号不能为空', trigger: 'blur' }
         ],
+        coding: [
+          { required: true, message: '房屋编码不能为空', trigger: 'blur' }
+        ],
         houseType: [
           { required: true, message: '房屋类型不能为空', trigger: 'blur' }
         ],

From 39e6708f5a071125c6e9d68cb817a9c4bf183541 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 5 Jul 2022 13:35:46 +0800
Subject: [PATCH 27/27] bug

---
 .../modules/visual/communityParty/gridParty.vue      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 65d0919c6..4ea08dbe4 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -166,7 +166,7 @@ export default {
     await this.loadOrgData()
     // this.loadMap()
     this.getMapData()
-    await this.getWorkUserInfo()
+    // await this.getWorkUserInfo()
     // this.isfirstInit = false
     // 地图相关end
   },
@@ -458,6 +458,16 @@ export default {
       if (code === 0) {
 
         this.orgData = data
+        this.agencyInfo = data //之前获取用户信息的接口不用了。。。
+        if (!this.agencyInfo.latitude) {
+          this.agencyInfo.latitude = 36.072227
+        }
+        if (!this.agencyInfo.longitude) {
+          this.agencyInfo.longitude = 120.389455
+        }
+        if (!this.agencyInfo.level) {
+          this.agencyInfo.level = 'street'
+        }
         this.orgId = this.orgData.id
         this.orgType = this.orgData.level
         this.parentPolygon = []