Merge branch 'dev-shuju' into test

src/views/modules/visual/basicinfo/cpts/incident-info.vue

@@ -36,7 +36,10 @@
           </div>
           <div class="info-prop">
             <span>提报给：</span>
-            <span>{{ info.eventPerson.join("、") || "--" }}</span>
+            <div>
+              <div :key="item" v-for="item in info.eventOrg">{{ item }}</div>
+              <div :key="item" v-for="item in info.eventPerson">{{ item }}</div>
+            </div>
           </div>
         </div>
 

src/views/modules/visual/measure/dialogInfo.vue

@@ -51,31 +51,34 @@
             </div>
           </div>
           <div class="list">
-            <div class="item">
+            <div class="item" v-if="info.serviceShowFlag">
               <span class="item-field">服务方：</span>
               <span>{{ info.serviceShowName }}</span>
             </div>
-            <div class="item">
+            <template v-if="info.status == 'finished'">
-              <span class="item-field">实际服务时间：</span>
+              <div class="item">
-              <span v-if="info.serviceStartTime"
+                <span class="item-field">实际服务时间：</span>
-                >{{ info.serviceStartTime }} 至 <br />
+                <span v-if="info.serviceStartTime"
-                {{ info.serviceEndTime }}</span
+                  >{{ info.serviceStartTime }} 至 <br />
-              >
+                  {{ info.serviceEndTime }}</span
-            </div>
+                >
-            <div class="item">
+              </div>
-              <span class="item-field">完成情况：</span>
+              <div class="item">
-              <span
+                <span class="item-field">完成情况：</span>
-                >{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
+                <span
-                <br />
+                  >{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
-                {{ info.finishDesc }}</span
+                  <br />
-              >
+                  {{ info.finishDesc }}</span
-            </div>
+                >
-            <div class="item">
+              </div>
-              <span class="item-field">评价：</span>
+              <div class="item">
-              <span>
+                <span class="item-field">评价：</span>
-                <el-rate :value="info.score" disabled></el-rate>
+                <span>
-              </span>
+                  <el-rate :value="info.score" disabled></el-rate>
-            </div>
+                </span>
+              </div>
+            </template>
+            
           </div>
         </div>
 
@@ -194,17 +197,18 @@ export default {
       if (code === 0) {
         // console.log('data-org----dict', data)
         this.info = data;
-        this.getAnalyse();
+        this.getAnalyse(demandId);
       } else {
         this.$message.error(msg);
       }
     },
-    async getAnalyse() {
+    async getAnalyse(demandId) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       this.loading = true;
       const url = "/heart/userdemand/demand-research-analysis";
       let params = {
         firstCategoryCode: this.info.firstCategoryCode,
+        demandRecId: demandId,
         icResiUserId: this.info.icResiUserId,
         epmetUserIdList: [this.info.epmetUserId],
         queryOrigin: this.queryOrigin,

src/views/modules/visual/measure/service.vue

@@ -514,6 +514,7 @@ export default {
         this.categoryCode = code
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.pageNo = 1
         this.getServiceList(_arr[0], orgType, code)
       }
     },
@@ -536,11 +537,15 @@ export default {
     pageSizeChangeHandleNew(val) {
       this.pageNo = 1;
       this.pageSize = val;
-      this.handleCascader(this.selectAgency)
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      this.getServiceList(_arr[0], orgType, this.categoryCode)
     },
     pageCurrentChangeHandleNew(val) {
       this.pageNo = val;
-      this.handleCascader(this.selectAgency)
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      this.getServiceList(_arr[0], orgType, this.categoryCode)
     },
   },
 };