From a9712c85564a6490c9192827dc056e1634793e00 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 23 May 2022 10:47:16 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          |  1 +
 .../shijianfenlei/shijianfenleifenxi.vue      | 63 +++++++------------
 2 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 200593006..45d0e85fa 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -309,6 +309,7 @@ export default {
               opacity: 1,
             }
           }
+          this.demand.pageNo = 1
           this.getTable(element.code)
         } else {
           element.label = {
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index 2d0b70253..626673f04 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -240,9 +240,7 @@ export default {
       categoryCode: '',
       tableOrgId: '',
       eventId: '',
-      processStatus: '',
-      isFirstLoadPie: true, // 首次加载显示全部数据，无联动
-      isFirstLoadTable: true, // 首次加载显示全部数据，无联动
+      processStatus: ''
     }
   },
   // mixins: [animate]
@@ -261,12 +259,6 @@ export default {
     
     // 获取服务器数据
     await this.handleChangeDate(this.dataType)
-    if (this.isFirstLoadPie) {
-      await this.getGridPieData()
-    }
-    if (this.isFirstLoadTable) {
-      await this.getTable()
-    }
     this.dataLoading = false
   },
 
@@ -364,7 +356,6 @@ export default {
         this.$refs.pieChart.hideLoading()
       }
       if (code === 0) {
-        this.categoryCode = data[0].categoryCode
         this.pieData = []
         data.forEach((item, index) => {
           let ob = {
@@ -395,7 +386,7 @@ export default {
         orgType: this.orgType,
         queryStartTime: this.queryStartTime,
         queryEndTime: this.queryEndTime,
-        categoryCode: this.isFirstLoadPie ? '' : this.categoryCode
+        categoryCode: this.categoryCode
       }
       const { data, code, msg } = await requestPost(url, params)
       if (this.$refs.gridPieChart) {
@@ -429,7 +420,7 @@ export default {
         queryStartTime: this.queryStartTime,
         queryEndTime: this.queryEndTime,
         processStatus: this.processStatus, // 处理状态，processing,closed_case。可为空，为空查询所有状态的事件列表
-        categoryCode: this.isFirstLoadTable ? '' : this.categoryCode,
+        categoryCode: this.categoryCode,
         pageNo: this.demand.pageNo,
         pageSize: this.demand.pageSize,
       }
@@ -496,18 +487,18 @@ export default {
 
       this.pieData.forEach((item, index) => {
         this.pieTotal = this.pieTotal + item.value
-        if (item.value > maxValue) {
-          maxValue = item.value
-          maxIndex = index
-          item.selected = true
-        } else if (index !== 0) {
-          item.selected = false
-        }
+        // if (item.value > maxValue) {
+        //   maxValue = item.value
+        //   maxIndex = index
+        //   item.selected = true
+        // } else if (index !== 0) {
+        //   item.selected = false
+        // }
       })
 
       this.pieOption.title.text = this.pieTotal
 
-      this.clickPie(maxIndex)
+      this.clickPie() // this.clickPie(maxIndex)
 
       let fun = function (params) {
         _that.clickPie(params.dataIndex)
@@ -545,11 +536,9 @@ export default {
       this.pieOption.series[1].data = this.pieData
       // this.$refs.pieChart.hideLoading()
       this.$refs.pieChart.setOption(this.pieOption)
-      if (!this.isFirstLoadPie) {
-        this.tableOrgId = ''
-        this.demand.pageNo = 1
-        this.getGridPieData()
-      }
+      this.tableOrgId = ''
+      this.demand.pageNo = 1
+      this.getGridPieData()
     },
 
 
@@ -579,19 +568,19 @@ export default {
 
       this.gridPieData.forEach((item, index) => {
         this.gridPieTotal = this.gridPieTotal + item.value
-        if (item.value > maxValue) {
-          maxValue = item.value
-          maxIndex = index
-          item.selected = true
-        } else if (index !== 0) {
-          item.selected = false
-        }
+        // if (item.value > maxValue) {
+        //   maxValue = item.value
+        //   maxIndex = index
+        //   item.selected = true
+        // } else if (index !== 0) {
+        //   item.selected = false
+        // }
       })
 
       this.gridPieOption.title.text = this.gridPieTotal
       // this.gridPieOption.legend.bottom = 50
 
-      this.clickGridPie(maxIndex)
+      this.clickGridPie() // this.clickGridPie(maxIndex)
 
       let fun = function (params) {
         _that.clickGridPie(params.dataIndex)
@@ -629,12 +618,8 @@ export default {
       this.gridPieOption.series[1].data = this.gridPieData
       // this.$refs.pieChart.hideLoading()
       this.$refs.gridPieChart.setOption(this.gridPieOption)
-      if (!this.isFirstLoadTable) {
-        this.demand.pageNo = 1
-        this.getTable()
-      }
-      this.isFirstLoadPie = false
-      this.isFirstLoadTable = false
+      this.demand.pageNo = 1
+      this.getTable()
     },
 
     handleChangeAgency (value) {

From 8c227fec781789f5db072fbeebbf95cb6e9053c1 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 23 May 2022 13:35:12 +0800
Subject: [PATCH 2/6] 11

---
 .../scss/modules/shequzhili/event-info.scss   |   2 +-
 .../shequzhili/event/cpts/event-info copy.vue | 489 ------------------
 .../shequzhili/event/cpts/event-info1.vue     | 152 ------
 .../modules/shequzhili/event/eventList.vue    |   4 +-
 src/views/modules/visual/cpts/analyse.vue     |  13 +-
 5 files changed, 15 insertions(+), 645 deletions(-)
 delete mode 100644 src/views/modules/shequzhili/event/cpts/event-info copy.vue
 delete mode 100644 src/views/modules/shequzhili/event/cpts/event-info1.vue

diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index 2b5ebb5f9..08dbf0f14 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -336,7 +336,7 @@
                 display: flex;
 
                 .detail-field {
-                    width: 80px;
+                    width: 100px;
                     text-align: justify;
                     text-align-last: justify;
                 }
diff --git a/src/views/modules/shequzhili/event/cpts/event-info copy.vue b/src/views/modules/shequzhili/event/cpts/event-info copy.vue
deleted file mode 100644
index 165a825a4..000000000
--- a/src/views/modules/shequzhili/event/cpts/event-info copy.vue	
+++ /dev/null
@@ -1,489 +0,0 @@
-<template>
-  <div class="">
-    <div v-if="pageType == 'add'">
-      <el-card>
-        <h3>新增事件</h3>
-        <event-add ref="ref_add"
-                   @changeName="changeName"
-                   @changeMobile="changeMobile"
-                   @changeUserId="changeUserId"></event-add>
-      </el-card>
-
-      <div class="process-form">
-        <el-card>
-          <h3>处理</h3>
-          <process-form ref="ref_processinfo_add"
-                        :demandUserId="demandUserId"
-                        :demandUserName="demandUserName"
-                        :demandUserMobile="demandUserMobile"></process-form>
-
-          <div class="div-btn ">
-            <el-button size="small"
-                       @click="handleClose">关闭</el-button>
-            <el-button style="margin-left:20px"
-                       type="primary"
-                       size="small"
-                       @click="handleComfirm">确定</el-button>
-          </div>
-        </el-card>
-      </div>
-    </div>
-
-    <div v-if="pageType == 'dispose'||pageType == 'info'"
-         class="g-page">
-      <div class="g-left">
-
-        <event-detail ref="ref_detail"
-                      :eventId="eventId"
-                      :eventDetailData="eventDetailData"
-                      @handleClose="handleClose"></event-detail>
-
-        <div v-if="!eventDetailData.operationId"
-             class="process-form">
-          <el-card>
-            <h3>处理</h3>
-            <process-form ref="ref_processinfo_dispose"
-                          :eventId="eventId"
-                          :eventDetailData="eventDetailData"></process-form>
-
-            <div class="div-btn ">
-              <el-button size="small"
-                         @click="handleClose">关闭</el-button>
-              <el-button style="margin-left:20px"
-                         type="primary"
-                         size="small"
-                         @click="handleComfirm">确定</el-button>
-            </div>
-          </el-card>
-        </div>
-      </div>
-      <div class="g-right">
-        <el-card class="m-card"
-                 style="max-height: 90vh; overflow: auto">
-          <h3>处理进展</h3>
-          <div class="m-process"
-               v-if="projectProcess.length>0">
-            <div class="list">
-              <div class="item"
-                   :class="index === 0 ? 'z-on' : ''"
-                   :key="item.processId"
-                   v-for="(item, index) in projectProcess">
-                <div class="item-row">
-                  <div class="name">{{ item.processName }}</div>
-                  <div class="date">
-                    {{ item.processTime }}
-                  </div>
-                </div>
-
-                <div v-if="item.type==='event'">
-                  <div class="detail">
-                    <div class="detail-field">回复人：</div>
-                    <div class="detail-value">{{ item.publicReply }}</div>
-                  </div>
-                  <div class="detail">
-                    <div class="detail-field">回复内容：</div>
-                    <div class="detail-value">{{ item.departmentName }}</div>
-                  </div>
-                </div>
-
-                <div v-if="item.type==='project'">
-                  <div v-if="item.processName==='回复'">
-                    <div class="detail">
-                      <div class="detail-field">回复人：</div>
-                      <div class="detail-value">{{ item.publicReply }}</div>
-                    </div>
-                    <div class="detail">
-                      <div class="detail-field">回复内容：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
-                    </div>
-                  </div>
-                  <div v-else>
-                    <div class="detail">
-                      <div class="detail-field">处理部门：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
-                    </div>
-
-                    <div class="detail"
-                         v-if="item.processName == '处理响应' && item.assistanceUnitName">
-                      <div class="detail-field">协 办：</div>
-                      <div class="detail-value">
-                        <fold-text :row="3">{{ item.assistanceUnitName }}</fold-text>
-                      </div>
-                    </div>
-                    <div class="detail"
-                         v-if="item.processName != '转项目' && item.publicReply">
-                      <div class="detail-field">说 明：</div>
-                      <div class="detail-value">
-                        <fold-text :row="3">{{ item.publicReply }}</fold-text>
-                      </div>
-                    </div>
-
-                    <div class="detail"
-                         v-if="item.processName != '转项目' && item.internalRemark">
-                      <div class="detail-field">内部备注：</div>
-                      <div class="detail-value">
-                        <fold-text :row="3">{{ item.internalRemark }}</fold-text>
-                      </div>
-                    </div>
-                    <div v-if="item.internalFile&&item.internalFile.length>0"
-                         class="detail">
-                      <div class="attachement-list">
-                        <a :href="att.url"
-                           target="_blank"
-                           :key="att.url"
-                           v-for="att in item.internalFile">
-                          <i class="el-icon-folder-opened"></i>
-                          {{ att.name }}
-                        </a>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <div v-if="item.type==='demand'">
-                  <div v-if="item.processName==='回复'">
-                    <div class="detail">
-                      <div class="detail-field">回复人：</div>
-                      <div class="detail-value">{{ item.publicReply }}</div>
-                    </div>
-                    <div class="detail">
-                      <div class="detail-field">回复内容：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
-                    </div>
-                  </div>
-                  <div v-if="item.processName==='需求完成'">
-                    <div class="detail">
-                      <div class="detail-field">服务方：</div>
-                      <div class="detail-value">{{ item.serviceParty }}</div>
-                    </div>
-                    <div class="detail">
-                      <div class="detail-field">实际服务时间：</div>
-                      <div class="detail-value">{{ item.actualServiceTime }}</div>
-                    </div>
-                  </div>
-                  <div v-if="item.processName==='转服务'">
-                    <div class="detail">
-                      <div class="detail-field">服务时间：</div>
-                      <div class="detail-value">{{ item.serviceTime }}</div>
-                    </div>
-
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div v-else>暂无处理进展</div>
-        </el-card>
-      </div>
-
-    </div>
-
-  </div>
-</template>
-
-<script>
-import { requestPost } from "@/js/dai/request";
-import foldText from "@/views/components/foldText";
-
-import eventInfo from "./event-info1";
-
-import dateFormat from "dai-js/tools/dateFormat";
-
-import eventAdd from "./add";
-import eventDetail from "./event-detail";
-import processForm from "./process-form";
-
-function iniData () {
-  return {
-    formData: {
-      operationType: '',
-
-    },
-    eventInfoData: {},
-    replayInfo: {},
-    demand: {},
-    project: {},
-
-    //新增
-    demandUserId: '',
-    demandUserName: '',
-    demandUserMobile: '',
-
-    eventDetailCopy: {},
-
-    projectProcess: [],
-
-  };
-}
-
-export default {
-  name: "projectInfo",
-  props: {
-    eventId: {
-      type: String,
-      default: "",
-    },
-    pageType: {
-      type: String,
-      default: "",
-    },
-    eventDetailData: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-  },
-
-  components: {
-    foldText,
-    eventInfo,
-    eventAdd,
-    eventDetail,
-    processForm,
-  },
-
-  data: iniData,
-
-  computed: {},
-
-  watch: {
-    eventId () {
-      let data = iniData();
-      Object.keys(data).forEach((k) => {
-        this[k] = data[k];
-      });
-      this.getApiData();
-    },
-  },
-
-  mounted () {
-    if (this.pageType === 'dispose') {
-      this.getProjectProcess()
-    }
-
-    if (this.eventId) {
-      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-    }
-  },
-
-  methods: {
-
-
-    changeName (val) {
-      this.demandUserName = val
-    },
-    changeMobile (val) {
-
-      this.demandUserMobile = val
-    },
-    changeUserId (val) {
-
-      this.demandUserId = val
-    },
-
-    //加载组织数据
-    async getProjectProcess () {
-      const url = "/gov/project/icEvent/process";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/process";
-
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
-      });
-
-      if (code === 0) {
-        this.projectProcess = data.map((item) => {
-          item.processTime = dateFormat(
-            new Date(item.processTime * 1000),
-            "yyyy-MM-dd hh:mm"
-          );
-          return item;
-        });
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    getEventInfo () {
-      this.$refs.ref_add.getEventInfo()
-      if (this.$refs.ref_add.okflag) {
-
-        this.eventInfoData = this.$refs.ref_add.formData
-      } else {
-        return false
-      }
-
-      console.log('eventInfo', this.eventInfoData)
-    },
-
-    handleComfirm () {
-      if (this.pageType === 'add') {
-        this.handelAdd()
-      }
-      if (this.pageType === 'dispose') {
-        this.handelDispose()
-      }
-    },
-
-    handelAdd () {
-      if (this.pageType === 'add') {
-        this.$refs.ref_add.getEventInfo()
-        if (this.$refs.ref_add.okflag) {
-
-          this.eventInfoData = this.$refs.ref_add.formData
-        } else {
-          return false
-        }
-
-        console.log('eventInfo', this.eventInfoData)
-      }
-
-      this.$refs.ref_processinfo_add.getProcessInfo()
-      if (this.$refs.ref_processinfo_add.okflag) {
-
-        this.formData.operationType = this.$refs.ref_processinfo_add.operationType
-        this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType
-
-        this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList
-
-        if (this.formData.operationType === '0') {
-          this.project = {}
-          this.demand = {}
-          this.replayInfo = this.$refs.ref_processinfo_add.replayInfo
-          console.log('replayInfo', this.replayInfo)
-          //回复属性赋值
-          this.eventInfoData.content = this.replayInfo.content
-          this.eventInfoData.status = this.replayInfo.status
-
-        } else if (this.formData.operationType === '1') {
-          this.replayInfo = {}
-          this.demand = {}
-          this.project = this.$refs.ref_processinfo_add.project
-          //项目的属性同事件一样
-          this.project.gridId = this.eventInfoData.gridId
-          console.log('projectInfo', this.project)
-
-        } else if (this.formData.operationType === '2') {
-          this.replayInfo = {}
-          this.project = {}
-          this.demand = this.$refs.ref_processinfo_add.demand
-          //需求的属性同事件一样
-          this.demand.gridId = this.eventInfoData.gridId
-          this.demand.reportUserName = this.eventInfoData.name//上报人姓名同需求上报人姓名
-          this.demand.reportUserMobile = this.eventInfoData.mobile//上报人手机号同需求上报人手机号
-          this.demand.reportTime = this.eventInfoData.happenTime//上报时间
-          console.log('demond', this.demand)
-        }
-
-      } else {
-        return false
-      }
-
-      this.formData = {
-        ...this.eventInfoData,
-        // replayInfo: this.replayInfo,
-        project: this.project,
-        demand: this.demand
-      }
-
-      console.log('this.formData', this.formData)
-      this.submit()
-    },
-
-    async submit () {
-      const url = "/gov/project/icEvent/add";
-
-      const { formData } = this;
-      const { data, code, msg } = await requestPost(url, {
-
-        ...formData,
-      });
-      if (code === 0) {
-
-        this.$message.success("操作成功！");
-        if (this.pageType === 'add') {
-          this.eventInfo = this.$refs.ref_add.resetData()
-
-        }
-        this.$emit("handleOk");
-      } else {
-      }
-    },
-
-    handelDispose () {
-      this.$refs.ref_processinfo_dispose.getProcessInfo()
-      if (this.$refs.ref_processinfo_dispose.okflag) {
-
-        this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType
-
-        if (this.formData.operationType === '0') {
-
-          this.project = {}
-          this.demand = {}
-          this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo
-
-          this.replayInfo.icEventId = this.eventId
-          console.log('replayInfo', this.replayInfo)
-          //回复属性赋值
-          let url = '/gov/project/icEvent/reply'
-          this.submitDispose(url, this.replayInfo)
-
-        } else if (this.formData.operationType === '1') {
-          this.replayInfo = {}
-          this.demand = {}
-          this.project = this.$refs.ref_processinfo_dispose.project
-          //项目的属性同事件一样
-          this.project.icEventId = this.eventId
-          console.log('projectInfo', this.project)
-          let url = '/gov/project/icEvent/icEventToProject'
-          this.submitDispose(url, this.project)
-
-        } else if (this.formData.operationType === '2') {
-          this.replayInfo = {}
-          this.project = {}
-          this.demand = this.$refs.ref_processinfo_dispose.demand
-          //需求的属性同事件一样
-          this.demand.icEventId = this.eventId
-          console.log('demond', this.demand)
-          let url = '/gov/project/icEvent/icEventToDemand'
-          this.submitDispose(url, this.demand)
-        }
-
-      } else {
-        return false
-      }
-
-    },
-    async submitDispose (url, params) {
-
-      const { data, code, msg } = await requestPost(url, {
-
-        ...params,
-      });
-      if (code === 0) {
-
-        this.$message.success("操作成功！");
-
-        this.$emit("handleOk");
-      } else {
-      }
-    },
-
-    handleClose () {
-      if (this.pageType === 'add') {
-        this.eventInfo = this.$refs.ref_add.resetData()
-
-      }
-
-      this.$emit("handleClose");
-    }
-  },
-};
-</script>
-
-<style
-  lang="scss"
-  src="@/assets/scss/modules/shequzhili/event-info.scss"
-  scoped
-></style>
diff --git a/src/views/modules/shequzhili/event/cpts/event-info1.vue b/src/views/modules/shequzhili/event/cpts/event-info1.vue
deleted file mode 100644
index 72c046233..000000000
--- a/src/views/modules/shequzhili/event/cpts/event-info1.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-  <div class="">
-    <div class="g-page" v-show="pageType == 'info'">
-      <div class="g-left">
-        <el-card>
-          <h3>事件详情</h3>
-
-          <div class="m-row">
-            <div class="m-info">
-              <div class="info-title">事件内容</div>
-              <div class="info-content">{{ info.eventContent }}</div>
-              <div class="info-pics">
-                <img
-                  :src="src"
-                  :key="src"
-                  v-for="src in info.eventImgs"
-                  @click="watchImg(src)"
-                />
-              </div>
-              <div class="info-prop">
-                <span class="info-title-2">提交时间：</span>
-                <span>{{ info.eventTime }}</span>
-              </div>
-              <div class="info-prop">
-                <span class="info-title-2">报事人：</span>
-                <span>{{ info.eventPeopleName }}</span>
-              </div>
-              <div class="info-prop">
-                <span class="info-title-2">所属网格：</span>
-                <span>{{ info.gridName }}</span>
-              </div>
-              <div class="info-prop">
-                <span class="info-title-2">提报给：</span>
-                <div>
-                  <div>{{ info.eventPersonShow }}</div>
-                  <div>{{ info.eventOrgShow }}</div>
-                </div>
-
-                <!-- <span>{{ info.eventPerson.join("、") || "--" }}</span> -->
-              </div>
-            </div>
-          </div>
-
-          <div class="m-btns" v-if="type == 'info'">
-            <el-button size="" @click="handleClose">关闭</el-button>
-          </div>
-        </el-card>
-      </div>
-      <div class="g-right"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { requestPost } from "@/js/dai/request";
-import foldText from "@/views/components/foldText";
-import dateFormat from "dai-js/tools/dateFormat";
-
-function iniData() {
-  return {
-    pageType: "info",
-
-    eventInfo: {
-      eventTime: "",
-      eventContent: "",
-      eventAddress: "",
-      gridName: "",
-      isClosed: true,
-      isResolve: true,
-      isRollback: true,
-      eventImgs: [],
-      eventPerson: [],
-      eventOrg: [],
-      eventPeopleName: "",
-      projectInfo: {
-        projectId: "",
-        operationName: "",
-        operationTime: "",
-        projectDeclare: "",
-      },
-    },
-  };
-}
-
-export default {
-  name: "issueInfo",
-  props: {
-    eventId: {
-      type: String,
-      default: "64502a8f1048a7240295527a9b32e513",
-    },
-    type: {
-      type: String,
-      default: "info",
-    },
-  },
-
-  components: {
-    foldText,
-  },
-
-  data: iniData,
-
-  computed: {},
-
-  watch: {},
-
-  mounted() {
-    this.getApiData();
-  },
-
-  methods: {
-    watchImg(src) {
-      window.open(src);
-    },
-
-    handleClose() {
-      this.$emit("close");
-    },
-
-    async getApiData() {
-      this.getEventInfo();
-    },
-    //加载组织数据
-    async getEventInfo() {
-      const url = "/gov/project/resievent/eventdetail-icdata";
-
-      const { data, code, msg } = await requestPost(url, {
-        resiEventId: this.projectInfo.originId,
-      });
-
-      if (code === 0) {
-        if (data.eventOrg && data.eventOrg.length > 0) {
-          data.eventOrgShow = data.eventOrg.join("、");
-        }
-        if (data.eventPerson && data.eventPerson.length > 0) {
-          data.eventPersonShow = data.eventPerson.join("、");
-        }
-        this.info = { ...data };
-      } else {
-        this.$message.error(msg);
-      }
-    },
-  },
-};
-</script>
-
-<style
-  lang="scss"
-  src="@/assets/scss/modules/shequzhili/project-info.scss"
-  scoped
-></style>
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index ef7066da7..c35141f1a 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -436,8 +436,8 @@ export default {
   computed: {
     maxTableHeight () {
       return this.$store.state.inIframe
-        ? this.clientHeight - 400 + this.iframeHeigh
-        : this.clientHeight - 400;
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index 5c4af5d53..d9db3c597 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -20,7 +20,8 @@
 
       <div class="analys-col">
         <div class="analys-person">
-          <div class="personal-name">{{userName}}</div>
+          <div class="personal-name"
+               @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
         </div>
       </div>
@@ -265,6 +266,10 @@ export default {
       type: String,
       default: '案件居民'
     },
+    isUserClick: { //中间报事人是否能点击
+      type: Boolean,
+      default: false
+    },
     singleList: Array, // 默认，必传 单个来源或多个来源
 
   },
@@ -306,6 +311,12 @@ export default {
     handleUser (item) {
       this.$emit('user', item)
     },
+    handleMidderUser (id) {
+      if (this.isUserClick) {
+        this.$emit('toMiddleUserInfo', id)
+      }
+
+    },
     handleShow (item) {
       item.showItem = !item.showItem
     }

From fa51d333648ee0c57beef06c113ed31c15929754 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 23 May 2022 14:18:28 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          | 85 ++++++++++++++-----
 1 file changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 45d0e85fa..6ed17014a 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -105,6 +105,15 @@ import nextTick from 'dai-js/tools/nextTick'
 const transparent = 'rgba(2, 2, 2, 0)'
 const polygonColorArray = [ '#f59701', '#0067b6', '#e70014', '#8fc41e', '#00a1be' ]
 const colorArray = [ '#1B51FF', '#00E5ED', '#7800FF', '#16D783', '#FF7800', '#FFBA00', '#FFD685', '#2A00FF', '#C600FF', '#FF2A00']
+const legendList = [
+  { name: '#e70014', icon: require('../../../../../assets/img/shuju/volunteer4.png') },
+  { name: '#f59701', icon: require('../../../../../assets/img/shuju/volunteer5.png') },
+  { 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: '', icon: require('../../../../../assets/img/shuju/volunteer1.png') }
+]
+const defaultLegendIcon = require('../../../../../assets/img/shuju/volunteer1.png')
 export default {
   name: "duoyuanfuwufenxi",
   data () {
@@ -142,7 +151,8 @@ export default {
         list: [],
         pageSize: 10,
         pageNo: 1,
-        total: 0
+        total: 0,
+        categoryCode: ''
       },
       // 地图相关数据
       isfirstInit: true, // 记录是否是首次加载地图
@@ -150,11 +160,11 @@ export default {
       distributionsList: [],
       legendArray: [],
       iconUrlArray: [
-        require('../../../../../assets/img/shuju/volunteer9.png'), // 其他
         require('../../../../../assets/img/shuju/volunteer4.png'), // 文化队伍
+        require('../../../../../assets/img/shuju/volunteer5.png'), // 楼委会
         require('../../../../../assets/img/shuju/volunteer7.png'), // 老友俱乐部
         require('../../../../../assets/img/shuju/volunteer8.png'), // 治安巡逻
-        require('../../../../../assets/img/shuju/volunteer5.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'), // 能人达人
@@ -217,10 +227,10 @@ export default {
     },
 
     // 加载列表数据
-    async getTable (categoryCode = '') {
+    async getTable () {
       const url = "/heart/iccommunityselforganization/category-list"
       const params = {
-        categoryCode: categoryCode,
+        categoryCode: this.categoryCode,
         pageNo: this.demand.pageNo,
         pageSize: this.demand.pageSize
       }
@@ -278,18 +288,18 @@ export default {
 
       this.pieData.forEach((item, index) => {
         this.pieTotal = this.pieTotal + item.value
-        if (item.value > maxValue) {
-          maxValue = item.value
-          maxIndex = index
-          item.selected = true
-        } else if (index !== 0) {
-          item.selected = false
-        }
+        // if (item.value > maxValue) {
+        //   maxValue = item.value
+        //   maxIndex = index
+        //   item.selected = true
+        // } else if (index !== 0) {
+        //   item.selected = false
+        // }
       })
 
       this.pieOption.title.text = this.pieTotal
 
-      this.clickPie(maxIndex)
+      this.clickPie() // this.clickPie(maxIndex)
 
       let fun = function (params) {
         _that.clickPie(params.dataIndex)
@@ -309,8 +319,10 @@ export default {
               opacity: 1,
             }
           }
+          this.categoryCode = element.code
           this.demand.pageNo = 1
-          this.getTable(element.code)
+          this.getTable()
+          this.getMapData()
         } else {
           element.label = {
             show: false,
@@ -368,27 +380,58 @@ export default {
         this.$message.error(msg)
       }
     },
+    getLegendIcon (color) {
+      let icon = ''
+      legendList.forEach(item => {
+        if (item.name == color) {
+          icon = item.icon
+        }
+      })
+      if (!icon) {
+        icon = defaultLegendIcon
+      }
+      return icon
+    },
+    getLegendIconIndex (color) {
+      let iconIndex = 0
+      this.iconUrlList.forEach((item, index) => {
+        if (color == item.color) {
+          iconIndex = index
+        }
+      })
+      return iconIndex
+    },
     async getMapData () {
+      this.legendArray = []
       this.pieData.forEach((item, index) => {
         let ob = {
           optionValue: item.code,
           optionLabel: item.name,
-          url: index < this.iconUrlArray.length ? this.iconUrlArray[index] : this.iconUrlArray[0]
+          url: this.getLegendIcon(item.color)
         }
         this.legendArray.push(ob)
       })
       const url = '/heart/iccommunityselforganization/coordinate-list'
       const params = {
-        categoryCode: ''
+        categoryCode: this.categoryCode
       }
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
+        if (this.isfirstInit) {
+          this.iconUrlArray = []
+          this.iconUrlList = []
+          data.list.forEach(item => {
+            this.iconUrlArray.push(this.getLegendIcon(item.color))
+            this.iconUrlList.push(item)
+          })
+        }
+        this.distributionsList = []
         data.list.forEach((item, index) => {
-          item.urlIndex = index < this.iconUrlArray.length ? index : 0
-          if (index === 0) {
-            item.latitude = "36.07394505338441"
-            item.longitude = "120.3868167667315"
-          }
+          item.urlIndex = this.getLegendIconIndex(item.color)
+          // if (index === 0) {
+          //   item.latitude = "36.07394505338441"
+          //   item.longitude = "120.3868167667315"
+          // }
           this.distributionsList.push(item)
         })
         // this.distributionsList = data.list

From a1b8a5b3c6327992d7dc3575cf260c610ffae400 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 23 May 2022 14:38:09 +0800
Subject: [PATCH 4/6] sqzz

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

diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index b75f9346a..df7741c20 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -492,6 +492,7 @@ export default {
         organizationName: "",
         serviceItem: "",
         organizationPersonCount: "",
+        categoryCode: "",
         principalName: "",
         principalPhone: "",
         organizationCreatedTime: "",

From e384aa09546ea24238bad41827777e1c83b0d004 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 23 May 2022 15:16:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/measure/zhuhu_orange.png | Bin 0 -> 9487 bytes
 src/assets/img/shuju/measure/zhuhu_red.png    | Bin 0 -> 9424 bytes
 src/assets/img/shuju/measure/zhuhu_yellow.png | Bin 0 -> 15132 bytes
 .../shequzhili/event/cpts/event-info.vue      |  22 ++--
 .../event/cpts/process-form-demand.vue        | 101 ++++++++++++---
 .../event/cpts/process-form-project.vue       |  81 +++++++++++-
 .../event/cpts/process-form-replay.vue        |  91 +++++++++++++-
 .../shequzhili/event/cpts/process-form.vue    | 116 ++----------------
 .../shijianchuli/event-info.vue               |   1 +
 src/views/modules/visual/cpts/analyse.vue     |  38 +++++-
 10 files changed, 311 insertions(+), 139 deletions(-)
 create mode 100644 src/assets/img/shuju/measure/zhuhu_orange.png
 create mode 100644 src/assets/img/shuju/measure/zhuhu_red.png
 create mode 100644 src/assets/img/shuju/measure/zhuhu_yellow.png

diff --git a/src/assets/img/shuju/measure/zhuhu_orange.png b/src/assets/img/shuju/measure/zhuhu_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..0656dcc38c9245d9213a13296e0f8fd8e9c1718b
GIT binary patch
literal 9487
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/zhuhu_red.png b/src/assets/img/shuju/measure/zhuhu_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fa8c1bd59e940664e15d2ad9b001209d630ce55
GIT binary patch
literal 9424
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/zhuhu_yellow.png b/src/assets/img/shuju/measure/zhuhu_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..00bc496eae3fa7d1896de92959c2c83cd5c3a935
GIT binary patch
literal 15132
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
WVyoNU0{%I#Dk&x_S|+UL_kRGUQ7S$F

literal 0
HcmV?d00001

diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 1b95d188c..b8b9c929e 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -354,25 +354,23 @@ export default {
     },
 
     async handelAdd () {
-      if (this.pageTypeCopy === 'add') {
-        this.$refs.ref_add.getEventInfo()
-        if (this.$refs.ref_add.okflag) {
 
-          this.eventInfoData = this.$refs.ref_add.formData
-        } else {
-          return false
-        }
+      this.$refs.ref_add.getEventInfo()
+      if (this.$refs.ref_add.okflag) {
 
-        console.log('eventInfo', this.eventInfoData)
+        this.eventInfoData = this.$refs.ref_add.formData
+      } else {
+        return false
       }
 
+      console.log('eventInfo', this.eventInfoData)
+
       this.$refs.ref_processinfo_add.getProcessInfo()
       if (this.$refs.ref_processinfo_add.okflag) {
 
         this.formData.operationType = this.$refs.ref_processinfo_add.operationType
         this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType
-
-        this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList
+        // this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList
 
         if (this.formData.operationType === '0') {
           this.project = {}
@@ -403,8 +401,6 @@ export default {
           console.log('demond', this.demand)
         }
 
-      } else {
-        return false
       }
 
       this.formData = {
@@ -475,6 +471,8 @@ export default {
           console.log('demond', this.demand)
           let url = '/gov/project/icEvent/icEventToDemand'
           await this.submitDispose(url, this.demand)
+        } else {
+          this.$message.info("请选择一种处理方式");
         }
 
       } else {
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 23176b402..77f6d0cce 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -5,7 +5,19 @@
              :model="formData"
              :rules="dataRule"
              label-width="100px">
-      <el-form-item label="需求内容"
+      <el-form-item label="事件分类"
+                    label-width="150px"
+                    prop="categoryId">
+        <el-cascader class="cell-width-2"
+                     ref="myCascader"
+                     v-model="selCategoryArray"
+                     :key="iscascaderShow"
+                     :options="casOptions"
+                     :props="optionProps"
+                     :show-all-levels="false"
+                     @change="handleChangeCate"></el-cascader>
+      </el-form-item>
+      <el-form-item label="服务内容"
                     label-width="150px"
                     prop="content">
         <el-input v-model="formData.content"
@@ -16,7 +28,7 @@
                   placeholder="请输入内容"></el-input>
       </el-form-item>
 
-      <el-form-item label="需求类型"
+      <el-form-item label="服务类型"
                     label-width="150px"
                     prop="categoryCode">
 
@@ -40,7 +52,7 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="需求人"
+      <el-form-item label="服务人"
                     label-width="150px"
                     prop="demandUserName">
         <el-input v-model="formData.demandUserName"
@@ -165,19 +177,19 @@ var geocoder // 新建一个正逆地址解析类
 
 function iniFmData () {
   return {
-    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转需求]	
+    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转服务]	
     icEventId: '',//事件Id	
     gridId: '',//	
-    categoryCode: '',//	二级需求分类编码	
-    parentCode: '',//	父级需求分类编码	
-    content: '',//		需求内容1000字	
+    categoryCode: '',//	二级服务分类编码	
+    parentCode: '',//	父级服务分类编码	
+    content: '',//		服务内容1000字	
     reportType: 'self_help',//	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help	
     reportUserName: '',//	上报人姓名	
     reportUserMobile: '',//	自身上报时存储注册居民的手机号	
     reportTime: '',//	上报时间	
-    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
-    demandUserName: '',//	需求人姓名	
-    demandUserMobile: '',//需求人联系电话	
+    demandUserId: '',//	服务人：user.id或者ic_resi_user.id	
+    demandUserName: '',//	服务人姓名	
+    demandUserMobile: '',//服务人联系电话	
     wantServiceTime: '',//	希望服务时间
     serviceType: '',
     serverId: '',
@@ -185,6 +197,7 @@ function iniFmData () {
     serviceLocation: '',//事件地址	
     latitude: '',//	经度	
     longitude: '',//维度	
+    categoryId: ''
   };
 }
 export default {
@@ -213,6 +226,17 @@ export default {
       ],
       serviceOptiondList: [],
 
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
+
       formData: iniFmData(),
       formDataTemp: {
         icEventId: "",
@@ -251,17 +275,20 @@ export default {
     dataRule () {
 
       return {
+        categoryId: [
+          { required: true, message: "请填写事件分类", trigger: "blur" },
+        ],
         content: [
-          { required: true, message: "需求内容不能为空", trigger: "blur" },
+          { required: true, message: "服务内容不能为空", trigger: "blur" },
         ],
         categoryCode: [
-          { required: true, message: "需求类型不能为空", trigger: "blur" },
+          { required: true, message: "服务类型不能为空", trigger: "blur" },
         ],
         wantServiceTime: [
           { required: true, message: "服务时间不能为空", trigger: "blur" },
         ],
         demandUserName: [
-          { required: true, message: "需求人不能为空", trigger: "blur" },
+          { required: true, message: "服务人不能为空", trigger: "blur" },
         ],
         demandUserMobile: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },
@@ -325,6 +352,7 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
+    this.getCategoryList();
     this.getDemandOptions();
     // this.formData = { ...this.formDataTemp }
     this.initMap()
@@ -343,11 +371,55 @@ export default {
       this.formData.demandUserId = this.demandUserId
     }
 
-
   },
 
   methods: {
 
+    async getCategoryList () {
+      const url = "/gov/issue/issueprojectcategorydict/list"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        let treeDataNew = this.filterTree(data)
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+
+
+        this.casOptions = treeDataNew
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleChangeCate () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.formData.categoryId = this.selCateObj.id
+    },
+
+    //重构树，去除网格
+    filterTree (arr) {
+      let childs = arr
+      for (let i = childs.length; i--; i > 0) {
+        if (childs[i].subCategory) {
+          if (childs[i].subCategory.length) {
+            this.filterTree(childs[i].subCategory)
+          } else {
+            delete childs[i].subCategory
+          }
+        }
+      }
+      return arr
+    },
+
     async getDemandOptions () {
       const url = "/heart/icresidemanddict/demandoption"
       let params = {}
@@ -404,6 +476,7 @@ export default {
         this.formData.categoryCode = val[1];
       }
     },
+
     handleServiceChange (type, val) {
       if (val === "social_org") {
         if (type === "add") this.getServiceuserList(val, "add_demand");
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 3e8a66327..506420821 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -5,6 +5,18 @@
              :model="formData"
              :rules="dataRule"
              label-width="100px">
+      <el-form-item label="事件分类"
+                    label-width="150px"
+                    prop="categoryList">
+        <el-cascader class="cell-width-2"
+                     ref="myCascader"
+                     v-model="selCategoryArray"
+                     :key="iscascaderShow"
+                     :options="casOptions"
+                     :props="optionProps"
+                     :show-all-levels="false"
+                     @change="handleChangeCate"></el-cascader>
+      </el-form-item>
       <el-form-item label="项目标题"
                     prop="title"
                     label-width="150px"
@@ -175,7 +187,7 @@ import { isCard } from "@/utils/validate";
 let loading; // 加载动画
 function iniFmData () {
   return {
-    operationType: '1',//处理方式[0:已回复 1:已转项目  1:已转需求]	
+    operationType: '1',//处理方式[0:已回复 1:已转项目  2:已转需求]	
     publicReply: '',//项目方案 1000	
     internalRemark: '',//	内部备注 1000	
     gridId: '',//
@@ -184,7 +196,9 @@ function iniFmData () {
     assistanceUnitType: '',//	 协办单位类型，1社区自组织，2联建单位	
     staffList: [],// 	勾选人员信息	
     categoryList: [],//	 	
-    tagList: [],//	
+    tagList: [],//
+
+
 
     internalFile: [],//	
     title: '',//		
@@ -211,6 +225,16 @@ export default {
       visibleTagPanel: false,
       selectedTagData: [],
 
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
 
       formData: iniFmData(),
       formDataTemp: {
@@ -254,6 +278,9 @@ export default {
     dataRule () {
 
       return {
+        categoryList: [
+          { required: true, message: "请填写事件分类", trigger: "blur" },
+        ],
         title: [
           { required: true, message: "标题不能为空", trigger: "blur" },
         ],
@@ -329,6 +356,7 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
+    this.getCategoryList();
     this.loadGrid();
     this.getMyDepartmentList();
     this.getAssistanceUnitList();
@@ -342,6 +370,52 @@ export default {
   },
 
   methods: {
+    async getCategoryList () {
+      const url = "/gov/issue/issueprojectcategorydict/list"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        let treeDataNew = this.filterTree(data)
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+
+
+        this.casOptions = treeDataNew
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleChangeCate () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.formData.categoryList = []
+      this.formData.categoryList.push(this.selCateObj)
+
+    },
+
+    //重构树，去除网格
+    filterTree (arr) {
+      let childs = arr
+      for (let i = childs.length; i--; i > 0) {
+        if (childs[i].subCategory) {
+          if (childs[i].subCategory.length) {
+            this.filterTree(childs[i].subCategory)
+          } else {
+            delete childs[i].subCategory
+          }
+        }
+      }
+      return arr
+    },
     async loadGrid () {
       const url = "/gov/org/customergrid/gridoption"
 
@@ -396,7 +470,7 @@ export default {
       const url = "/gov/issue/issueprojecttagdict/list";
 
       const { data, code, msg } = await requestPost(url, {
-        // categoryList: this.projectCate,
+
       });
 
       if (code === 0) {
@@ -409,7 +483,6 @@ export default {
       }
     },
 
-
     handleTagChange (val) {
       console.log(val);
     },
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index 678100301..c46476c6b 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -6,6 +6,18 @@
              :model="formData"
              :rules="dataRule"
              class="form">
+      <el-form-item label="事件分类"
+                    label-width="150px"
+                    prop="categoryList">
+        <el-cascader class="cell-width-2"
+                     ref="myCascader"
+                     v-model="selCategoryArray"
+                     :key="iscascaderShow"
+                     :options="casOptions"
+                     :props="optionProps"
+                     :show-all-levels="false"
+                     @change="handleChangeCate"></el-cascader>
+      </el-form-item>
       <el-form-item label="回复内容"
                     prop="content"
                     label-width="150px"
@@ -46,7 +58,7 @@ export default {
     return {
       btnDisable: false,
       formData: {
-        operationType: '0',//处理方式[0:已回复 1:已转项目  1:已转需求]	
+        operationType: '0',//处理方式[0:已回复 1:已转项目  2:已转需求]	
         content: '',
         status: ''
       },
@@ -54,7 +66,18 @@ export default {
       status: false,
       okflag: false,
 
-      eventDetailCopy: {}
+      eventDetailCopy: {},
+
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
 
     };
   },
@@ -84,13 +107,68 @@ export default {
   watch: {},
 
   async mounted () {
+    this.getCategoryList()
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+
+      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+        this.selCategoryArray = []
+        this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
+        this.selCategoryArray.push(this.eventDetailCopy.categoryId)
+
+        this.selCateObj = {
+          name: this.eventDetailCopy.categoryName,
+          id: this.eventDetailCopy.categoryId
+        }
+      }
     }
   },
 
   methods: {
+    async getCategoryList () {
+      const url = "/gov/issue/issueprojectcategorydict/list"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        let treeDataNew = this.filterTree(data)
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+
+
+        this.casOptions = treeDataNew
 
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleChangeCate () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+
+    },
+
+    //重构树，去除网格
+    filterTree (arr) {
+      let childs = arr
+      for (let i = childs.length; i--; i > 0) {
+        if (childs[i].subCategory) {
+          if (childs[i].subCategory.length) {
+            this.filterTree(childs[i].subCategory)
+          } else {
+            delete childs[i].subCategory
+          }
+        }
+      }
+      return arr
+    },
     async getReplayInfo () {
       this.okflag = false
       this.$refs["ref_form1"].validate((valid, messageObj) => {
@@ -98,11 +176,20 @@ export default {
           app.util.validateRule(messageObj);
 
         } else {
+          debugger
           if (this.status) {
+
+            if (!this.selCateObj || !this.selCateObj.id) {
+              this.$message.info("请填写事件分类");
+              return false
+            }
             this.formData.status = 'closed_case'
           } else {
             this.formData.status = 'processing'
           }
+          this.formData.categoryId = this.selCateObj.id
+          this.formData.categoryList = []
+          this.formData.categoryList.push(this.selCateObj)
 
           this.okflag = true
         }
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index 6ab88929e..8adf8fc14 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -6,26 +6,14 @@
                :inline="false"
                :rules="dataRule"
                class="form">
-        <el-form-item label="分类"
-                      label-width="150px"
-                      prop="categoryList">
-          <el-cascader class="cell-width-2"
-                       ref="myCascader"
-                       :disabled="operationType==='2'"
-                       v-model="selCategoryArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeCate"></el-cascader>
-        </el-form-item>
+
         <el-form-item label="处理方式"
                       label-width="150px"
                       prop="operationType">
           <el-radio-group v-model="operationType">
             <el-radio label="0">回复</el-radio>
             <el-radio label="1">立项</el-radio>
-            <el-radio label="2">转需求</el-radio>
+            <el-radio label="2">转服务</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -70,24 +58,20 @@ export default {
   data () {
     return {
 
-
       casOptions: [],
       iscascaderShow: 0,
-      selCategoryArray: [
-
-      ],
+      selCategoryArray: [],
       selCateObj: {},
       optionProps: {
         multiple: false,
         value: 'id',
         label: 'name',
         children: 'subCategory',
-
       },
 
-      operationType: '0',
+      operationType: '',
+
 
-      categoryList: [],
       replayInfo: {},
       demand: {},
       project: {},
@@ -105,9 +89,7 @@ export default {
   computed: {
     dataRule () {
       return {
-        categoryList: [
-          { required: true, message: "分类不能为空", trigger: "blur" },
-        ],
+
         operationType: [
           { required: true, message: "处理方式不能为空", trigger: "blur" },
         ],
@@ -149,117 +131,39 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    await this.getCategoryList()
+
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-        this.selCategoryArray = []
-        this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
-        this.selCategoryArray.push(this.eventDetailCopy.categoryId)
-
-        this.selCateObj = {
-          name: this.eventDetailCopy.categoryName,
-          id: this.eventDetailCopy.categoryId
-        }
-      }
-    }
-
 
+    }
 
   },
 
   methods: {
-
-
-    async getCategoryList () {
-      const url = "/gov/issue/issueprojectcategorydict/list"
-
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-
-        let treeDataNew = this.filterTree(data)
-
-        //组织级联数据
-        ++this.iscascaderShow
-        this.casOptions = []
-
-
-        this.casOptions = treeDataNew
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleChangeCate () {
-      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
-      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-
-    },
-
-    //重构树，去除网格
-    filterTree (arr) {
-      let childs = arr
-      for (let i = childs.length; i--; i > 0) {
-        if (childs[i].subCategory) {
-          if (childs[i].subCategory.length) {
-            this.filterTree(childs[i].subCategory)
-          } else {
-            delete childs[i].subCategory
-          }
-        }
-      }
-      return arr
-    },
-
     async getProcessInfo () {
-
       this.okflag = false
 
-      if (this.selCategoryArray.length === 0) {
-        this.$message({
-          type: "error",
-          message: "请选择分类",
-        });
-
-        this.okflag = false
-        return false
-      }
-      this.categoryList = []
-
-      this.categoryList.push(this.selCategoryArray[1])
+      // this.categoryList = []
 
+      // this.categoryList.push(this.selCategoryArray[1])
 
       if (this.operationType === '0') {
         this.$refs.ref_process_form_replay.getReplayInfo()
         if (this.$refs.ref_process_form_replay.okflag) {
-
           this.replayInfo = this.$refs.ref_process_form_replay.formData
 
-          this.replayInfo.categoryId = this.categoryList[0]
-          this.replayInfo.categoryList = this.categoryList
-
           this.okflag = true
 
         } else {
           return false
         }
 
-
       } else if (this.operationType === '1') {
         this.$refs.ref_process_form_project.getProjectInfo()
         if (this.$refs.ref_process_form_project.okflag) {
 
           this.project = this.$refs.ref_process_form_project.formData
 
-          this.project.categoryList = []
-          this.project.categoryList.push(this.selCateObj)
-
-
           //赋值分类信息
           this.okflag = true
 
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 6adb7112b..d2cf26951 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -146,6 +146,7 @@
                        :userTag="'(报事人)'"
                        :singleList="yanPan.singleList"
                        :hasEvent="yanPan.hasEvent"
+                       :bcLimit="yanPan.resiReportEventCount"
                        @user="toUserInfo" />
               <div v-else
                    class="m-hint">
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index d9db3c597..84ee80068 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -19,7 +19,26 @@
       </div>
 
       <div class="analys-col">
-        <div class="analys-person">
+        <div v-if="bcLimit>31||bcLimit==31"
+             class="analys-person_red">
+          <div class="personal-name"
+               @click="handleMidderUser()">{{userName}}</div>
+          <div class="personal-tips">{{userTag}}</div>
+        </div>
+        <div v-else-if="bcLimit<31&&(bcLimit>21||bcLimit==21)"
+             class="analys-person_orange">
+          <div class="personal-name"
+               @click="handleMidderUser()">{{userName}}</div>
+          <div class="personal-tips">{{userTag}}</div>
+        </div>
+        <div v-else-if="bcLimit<21&&(bcLimit>11||bcLimit==11)"
+             class="analys-person_yellow">
+          <div class="personal-name"
+               @click="handleMidderUser()">{{userName}}</div>
+          <div class="personal-tips">{{userTag}}</div>
+        </div>
+        <div v-else
+             class="analys-person">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
@@ -270,6 +289,10 @@ export default {
       type: Boolean,
       default: false
     },
+    bcLimit: { //中间报事人的背景颜色限制
+      type: Number,
+      default: 1
+    },
     singleList: Array, // 默认，必传 单个来源或多个来源
 
   },
@@ -396,6 +419,19 @@ export default {
         }
       }
 
+      .analys-person-orange {
+        background: url("../../../../assets/img/shuju/measure/zhuhu_orange.png")
+          no-repeat center;
+      }
+      .analys-person-yellow {
+        background: url("../../../../assets/img/shuju/measure/zhuhu_yellow.png")
+          no-repeat center;
+      }
+      .analys-person-red {
+        background: url("../../../../assets/img/shuju/measure/zhuhu_red.png")
+          no-repeat center;
+      }
+
       .analys-cate {
         display: flex;
         flex-direction: column;

From 3525651196cb7ff252782f826ebce24754249daa Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 23 May 2022 15:18:35 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/event/cpts/process-form-replay.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index c46476c6b..3ff89b0c3 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -176,7 +176,7 @@ export default {
           app.util.validateRule(messageObj);
 
         } else {
-          debugger
+
           if (this.status) {
 
             if (!this.selCateObj || !this.selCateObj.id) {