From 90daf157bfd96ae7f2f01b9d86cf6af9c802be5b Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 15 Dec 2021 09:18:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B67?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/cpts/incident-info.vue | 2 +-
 src/views/modules/visual/basicinfo/cpts/topic-info.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
index e95e2fe2..4d116c6f 100644
--- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
@@ -106,7 +106,7 @@
                 </div>
                 <div class="info-prop">
                   <span>项目方案：</span>
-                  <span>{{ projectInfo.projectTitle }}</span>
+                  <span>{{ projectInfo.backGround }}</span>
                 </div>
                 <div class="info-prop">
                   <span>内部备注：</span>
diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
index ed1861d7..bccd5855 100644
--- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
@@ -166,7 +166,7 @@
                 </div>
                 <div class="info-prop">
                   <span>项目方案：</span>
-                  <span>{{ projectInfo.projectTitle }}</span>
+                  <span>{{ projectInfo.backGround }}</span>
                 </div>
                 <div class="info-prop">
                   <span>内部备注：</span>

From 89fd76f7a34f9ae06bacda90eac4a421594ad11b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 15 Dec 2021 09:24:10 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD333?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/measure/service.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 48ad2e84..b0d9a180 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -175,7 +175,7 @@ export default {
         { title: "上报类型", coulmn: 'reportTypeName' },
         { title: "上报人", coulmn: 'reportUserName' },
         { title: "上报时间", coulmn: 'reportTime' },
-        { title: "需求人", coulmn: 'gridName' },
+        { title: "需求人", coulmn: 'demandUserName' },
         { title: "服务方", coulmn: 'serviceName' },
         { title: "服务时间", coulmn: 'wantServiceTime' },
       ],
@@ -316,7 +316,7 @@ export default {
         this.categoryList = categoryList
         let xData = categoryList.map(item => item.categoryName)
         let yData = []
-        yData = legend.map(item => {
+        yData = legend.map((item, index) => {
           return {
             name: item.legendName,
             type: 'bar',
@@ -328,9 +328,12 @@ export default {
             emphasis: {
               focus: 'series'
             },
-            data: categoryList.map(n => n.total)
+            data: categoryList.map(n => {
+              return n.detail[index].serviceDemandTotal
+            })
           }
         })
+        console.log('yData', yData)
         
         this.initCharts(xData, yData)
         this.getServiceList(orgId, orgType, data.categoryList[0].categoryCode)

From a37a0428d6c8aba07253a27c1edfee32e5fefbab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 15 Dec 2021 09:27:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/measure/dialogInfo.vue     | 354 ++----------------
 1 file changed, 23 insertions(+), 331 deletions(-)

diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue
index 6e3f04c8..7b46272c 100644
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@@ -144,346 +144,35 @@ export default {
         //       title: '不知道写了什么哈哈哈',
         //       status: 'closed',
         //       projectId: '1'
-        //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
-        //     }
-        //   ]
-        // },
-        // {
-        //   categoryName: '辨明服务',
-        //   categoryCode: '1',
-        //   showItem: false,
-        //   projectList: [
-        //     {
-        //       title: '不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1'
-        //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
-        //     }
-        //   ]
-        // },
-        // {
-        //   categoryName: '辨明服务',
-        //   categoryCode: '1',
-        //   showItem: false,
-        //   projectList: [
-        //     {
-        //       title: '不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1'
-        //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
-        //     }
-        //   ]
-        // },
-        // {
-        //   categoryName: '辨明服务',
-        //   categoryCode: '1',
-        //   showItem: false,
-        //   projectList: [
-        //     {
-        //       title: '不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1'
-        //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
         //     }
+        //    
         //   ]
         // },
+        
+      ],
+      userLists: [
         // {
-        //   categoryName: '辨明服务',
-        //   categoryCode: '1',
-        //   showItem: false,
-        //   projectList: [
-        //     {
-        //       title: '不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1'
-        //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
-        //     }
-        //   ]
-        // },
+        //   homeId: "1",
+        //   icUserId: "1",
+        //   icUserName: "沾上干",
+        // }
+      ],
+      userName: "王亚男哈",
+      eventList: [
         // {
-        //   categoryName: '辨明服务',
-        //   categoryCode: '1',
-        //   showItem: false,
+        //   categoryName: "辨明服务",
+        //   categoryCode: "1",
         //   projectList: [
         //     {
-        //       title: '不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1'
+        //       title: "不知道写了什么哈哈哈",
+        //       status: "closed",
+        //       projectId: "1",
         //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
-        //     }
-        //   ]
+            
+        //   ],
         // },
-        // {
-        //   categoryName: '辨明服务',
-        //   categoryCode: '1',
-        //   showItem: false,
-        //   projectList: [
-        //     {
-        //       title: '不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1'
-        //     },
-        //     {
-        //       title: '罗里吧嗦写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '2'
-        //     },
-        //     {
-        //       title: '胡说八道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=3'
-        //     },
-        //     {
-        //       title: '费眼飞鱼不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '1=4'
-        //     },
-        //     {
-        //       title: '狗屁不通不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '5'
-        //     },
-        //     {
-        //       title: '啦啦啦不知道写了什么哈哈哈',
-        //       status: 'closed',
-        //       projectId: '6'
-        //     }
-        //   ]
-        // }
-      ],
-      userLists: [
-        {
-          homeId: "1",
-          icUserId: "1",
-          icUserName: "沾上干",
-        },
-        {
-          homeId: "2",
-          icUserId: "2",
-          icUserName: "李四",
-        },
-        {
-          homeId: "3",
-          icUserId: "3",
-          icUserName: "王五哈哈",
-        },
-      ],
-      userName: "王亚男哈",
-      eventList: [
-        {
-          categoryName: "辨明服务",
-          categoryCode: "1",
-          projectList: [
-            {
-              title: "不知道写了什么哈哈哈",
-              status: "closed",
-              projectId: "1",
-            },
-            {
-              title: "罗里吧嗦写了什么哈哈哈",
-              status: "closed",
-              projectId: "2",
-            },
-            {
-              title: "胡说八道写了什么哈哈哈",
-              status: "closed",
-              projectId: "1=3",
-            },
-            {
-              title: "费眼飞鱼不知道写了什么哈哈哈",
-              status: "closed",
-              projectId: "1=4",
-            },
-            {
-              title: "狗屁不通不知道写了什么哈哈哈",
-              status: "closed",
-              projectId: "5",
-            },
-            {
-              title: "啦啦啦不知道写了什么哈哈哈",
-              status: "closed",
-              projectId: "6",
-            },
-          ],
-        },
-        {
-          categoryName: "水煮鱼辨明服务辨明服务",
-          categoryCode: "4",
-          projectList: [
-            {
-              title: "熟煮雨不知道写了什么哈哈哈",
-              status: "pending",
-              projectId: "4",
-            },
-          ],
-        },
-        {
-          categoryName: "开心麻花",
-          categoryCode: "2",
-          projectList: [
-            {
-              title: "不知道开心麻花写了什么哈哈哈",
-              status: "closed",
-              projectId: "1",
-            },
-          ],
-        },
-        {
-          categoryName: "酸菜鱼",
-          categoryCode: "3",
-          projectList: [
-            {
-              title: "不知道酸菜鱼写了什么哈哈哈",
-              status: "pending",
-              projectId: "3",
-            },
-          ],
-        },
-      ],
+        
+      ]
     };
   },
 
@@ -574,6 +263,7 @@ export default {
 ></style>
 <style lang="scss" scoped>
 .m-pop {
+  color: #fff;
   .wrap {
     .list {
       display: block;
@@ -589,6 +279,7 @@ export default {
       }
       .item-desc {
         font-size: 16px;
+        color: #fff;
         margin-bottom: 10px;
         line-height: 24px;
       }
@@ -599,6 +290,7 @@ export default {
     box-sizing: border-box;
     padding: 20px 0 10px 62px;
     font-size: 20px;
+    color: #fff;
     cursor: pointer;
   }
 }

From 196c942bfd64a5434e0b13f39cd5d09a8108f9ed Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 15 Dec 2021 10:34:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=86=E6=9E=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/measure/index.vue        | 19 +++++---
 src/views/modules/visual/cpts/analyse.vue     | 44 ++++++++++++-------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 32600962..8da78a93 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -299,7 +299,7 @@
           type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
         <el-form-item 
-        v-if="addType === 'appoint' || addType == 'finish' || addType == 'look'" 
+        v-if="addType === 'appoint' || addType == 'finish' || (addType == 'look' && form.serviceShowFlag)" 
         label="服务方" prop="serviceType">
           <template v-if="disabled && addType !== 'appoint'">
             <el-input v-model="form.serviceShowName" :disabled="disabled"  class="input-width"></el-input>
@@ -337,7 +337,10 @@
             </el-select>
           </template>
         </el-form-item>
-        <template v-if="addType == 'finish' || addType == 'look'">
+        <el-form-item v-if="addType == 'look' && form.status == 'canceled'" label="取消时间" prop="cancelTime">
+          <span>{{ form.cancelTime }}</span>
+        </el-form-item>
+        <template v-if="addType == 'finish' || (addType == 'look' && form.status == 'finished')">
           <el-form-item label="完成情况" prop="finishResult">
             <el-radio v-model="form.finishResult" 
             label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
@@ -360,7 +363,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
-              <el-rate v-model="form.score" :disabled="disabled && addType != 'finish'" ></el-rate>
+              <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
           </el-form-item>
           <el-form-item label="备注" prop="finishDesc">
             <el-input v-model="form.finishDesc" :autosize="{ minRows: 2, maxRows: 10}" 
@@ -373,9 +376,9 @@
         
       </el-form>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button size="small" @click="handlerCancle">{{ addType != 'look' ? '取消' : '关闭'}}</el-button>
         <el-button
-          v-if="!disabled"
+          v-if="addType != 'look'"
           type="primary"
           size="small"
           :loading="btnLoading"
@@ -592,7 +595,7 @@ export default {
         serviceType: [{ required: true, message: '服务方不能为空', trigger: 'blur' }],
         serviceStartTime: [{ required: true, message: '实际服务时间不能为空', trigger: 'blur' }],
         score: [{ required: true, message: '评分不能为空', trigger: 'blur' }],
-        finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        // finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
         finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }],
       }
     }
@@ -715,6 +718,7 @@ export default {
       // this.form.demandUserId = ''
       this.$delete(this.form, 'demandRecId')
       this.selectDemandUser = ''
+      this.finishServiceTime = ''
       for(const n in this.form) {
         this.form[n] = ''
       }
@@ -733,6 +737,9 @@ export default {
       if (addType == 'look') {
         this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
       }
+      if (addType == 'finish') {
+        this.form.finishResult = 'resolved'
+      }
       if (addType == 'appoint' && row.serviceType) {
         await this.getServiceuserList(row.serviceType)
       }
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index acc1bbab..43777c25 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -109,14 +109,17 @@
                 <div class="cate-list-w0"
                      :class="item.showItem && 'cate-list-w100'">
                   <div class="list list-wr">
-                    <div v-for="(n, i) in item.projectList"
+                    <template v-if="item.projectList && item.projectList.length > 0">
+                      <div v-for="(n, i) in item.projectList"
                          :key="i"
                          class="item"
                          @click="handleProject(n)">
-                      <div class="item-status"
-                           :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
-                      <div class="item-content">{{n.title}}</div>
-                    </div>
+                        <div class="item-status"
+                            :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
+                        <div class="item-content">{{n.title}}</div>
+                      </div>
+                    </template>
+                    <div v-else class="no-data">暂无数据</div>
                     <!-- <div class="item">
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@@ -187,16 +190,19 @@
                 <div class="cate-list-w0"
                      :class="item.showItem && 'cate-list-w100'">
                   <div class="list list-wr">
-                    <div v-for="(n, i) in item.projectList"
+                    <template v-if="item.projectList && item.projectList.length > 0">
+                      <div v-for="(n, i) in item.projectList"
                          :key="i"
                          class="item"
                          @click="handleProject(n)">
-                      <div class="item-status"
-                           :class="'item-status-'+n.status">
-                        {{ n.statusName || filterStatus(n.status)}}
+                        <div class="item-status"
+                            :class="'item-status-'+n.status">
+                          {{ n.statusName || filterStatus(n.status)}}
+                        </div>
+                        <div class="item-content">{{n.title}}</div>
                       </div>
-                      <div class="item-content">{{n.title}}</div>
-                    </div>
+                    </template>
+                    <div v-else class="no-data">暂无数据</div>
                     <!-- <div class="item">
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@@ -242,13 +248,13 @@ export default {
     },
     moreTitle: String, // hasEvent 为true 时 传入
     moreList: Array, // hasEvent 为true 时 传入
-    singleTitle: { // 默认，必传
+    singleTitle: { // 默认，必传 单个来源或多个来源
       type: String,
       default: '楼院小组'
     },
-    userList: Array, // 默认，必传
-    userName: String, // 默认，必传
-    singleList: Array, // 默认，必传
+    userList: Array, // 默认，必传 单个来源或多个来源
+    userName: String, // 默认，必传 单个来源或多个来源
+    singleList: Array, // 默认，必传 单个来源或多个来源
 
   },
   data () {
@@ -541,6 +547,14 @@ export default {
     }
   }
 }
+.no-data {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  text-align: center;
+  line-height: 100%;
+}
 .pad10 {
   padding-top: 10px;
 }