From 481501447bf6f03f156e0b3ec6e26a28c6ee0e92 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 10 Aug 2023 14:16:08 +0800
Subject: [PATCH] =?UTF-8?q?bug#373=20=E8=BD=AC=E8=AE=AE=E9=A2=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=88=86=E7=B1=BB=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/measure/info.vue | 33 ++++++++-----------
 .../shequzhili/issue/cpts/issue-detail.vue    | 14 +++++---
 src/views/modules/visual/cpts/line-chart.vue  | 11 +++++--
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index 62c942928..206fb297e 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -306,9 +306,9 @@
               >
                 <el-option
                   v-for="item in serviceOptiondList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -622,10 +622,11 @@ export default {
       }
     },
     handleServiceChange(type, val) {
+      console.log(val);
       if (val === "social_org") {
         if (type === "add") this.getServiceuserList(val, "add_demand");
         else this.getServiceuserList(val, "query_demand");
-      } else this.getServiceuserList(val, "");
+      } else this.getServiceuserList(val,this.form.categoryCode);
     },
     async handleGridChange(val) {
       console.log("网格改变了", val);
@@ -641,12 +642,6 @@ export default {
       }
     },
 
-    handleServiceChange(type, val) {
-      if (val === "social_org") {
-        if (type === "add") this.getServiceuserList(val, "add_demand");
-        else this.getServiceuserList(val, "query_demand");
-      } else this.getServiceuserList(val, "");
-    },
 
     handleAdd(addType) {
       this.addType = addType;
@@ -660,7 +655,6 @@ export default {
     async formatRowForm(addType) {
       this.addType = addType;
       const { form: row } = this;
-
       if (addType == "look") {
         this.finishServiceTime =
           (row.serviceStartTime && [
@@ -680,7 +674,7 @@ export default {
         this.form.score = 5;
       }
       if (addType == "appoint" && row.serviceType) {
-        const type = row.serviceType == "social_org" ? "add_demand" : "";
+        const type = row.categoryCode || ""
         await this.getServiceuserList(row.serviceType, type);
       }
       if (addType == "edit") {
@@ -936,22 +930,21 @@ export default {
     },
 
     async getServiceuserList(serviceType, query) {
-      if (!serviceType) return false;
+      if (!serviceType) return;
       const { demandUserId } = this.form;
       const params = {
-        serviceName: "",
-        serviceType: serviceType,
-        queryPurpose: query,
+        serviceTypeId: query,
+        serverOrgType: serviceType,
+        businessType: "resi_service",
       };
       await this.$http
-        .post("/governance/userdemand/servicelist", params)
+        .post("/actual/base/serviceitem/listServerOrg", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
-            this.serviceOptiondList = res.data.filter(
-              (item) => item.value != demandUserId
-            );
+            this.serviceOptiondList.push(...res.data)
+            console.log( this.serviceOptiondList );
           }
         })
         .catch(() => {
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index 9ce0976f6..c66d62faf 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -14,7 +14,9 @@
         />议题详情
       </h3>
       <div class="m-detail-main">
-        <div class="m-info">
+        <el-row>
+          <el-col :span="11">
+            <div class="m-info">
           <div
             :class="[
               'm-info-prop',
@@ -230,8 +232,8 @@
             <div class="line" @click="handleToEvaluation">查看全部</div>
           </div>
         </div>
-
-        <div class="m-line">
+          </el-col>
+          <el-col :span="13"> <div class="m-line">
           <div class="stat">
             <div class="stat-item">
               <!-- <div>
@@ -268,7 +270,11 @@
           <div v-if="issueChartData.length > 0" class="m-chart">
             <line-chart :list="issueChartData" />
           </div>
-        </div>
+        </div></el-col>
+        </el-row>
+      
+
+       
       </div>
       <!--
 显示关闭：
diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue
index 00b7c5052..f7492415d 100644
--- a/src/views/modules/visual/cpts/line-chart.vue
+++ b/src/views/modules/visual/cpts/line-chart.vue
@@ -43,6 +43,7 @@ export default {
     return {
       iniLoading: false,
       id,
+      myChart:{}
     };
   },
   watch: {
@@ -80,7 +81,7 @@ export default {
     initCharts(date, data, data1) {
       console.log(this.id);
       let div = document.getElementById(this.id);
-      let myChart = echarts.init(div);
+      this.myChart = echarts.init(div);
       var option = {
         tooltip: {
           trigger: "axis",
@@ -166,10 +167,14 @@ export default {
           },
         ],
       };
-      myChart.setOption(option);
-      window.addEventListener("resize", () => myChartPieLeft.resize(), false);
+      this.myChart.setOption(option);
+      window.addEventListener("resize", () => this.myChart.resize());
     },
   },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.myChart.resize);
+}
+
 };
 </script>