调整

src/views/incidentDetails.vue

@@ -114,7 +114,9 @@
           <i class="iconfont icon-icon_weizuo last"></i>
         </div>
         <div class="time">
-          {{ processTime[4] ? processTime[4].startTime : "" }}
+          <template v-if="processTime[4]">
+            {{processTime[4].startTime | timeFormat("MM-dd HH:mm:ss")}}
+          </template>
         </div>
       </div>
       <div
@@ -153,7 +155,9 @@
           ></i>
         </div>
         <div class="time">
-          {{ processTime[3] ? processTime[3].startTime : "" }}
+          <template v-if="processTime[3]">
+            {{processTime[3].startTime | timeFormat("MM-dd HH:mm:ss")}}
+          </template>
         </div>
       </div>
       <div
@@ -169,6 +173,46 @@
           v-html="processMessage[3] ? processMessage[3].desc : ''"
         ></div>
       </div>
+      <!-- 处理日志 start -->
+      <div v-for="(item, i) in data.incident.handlerLogs" :key="i">
+        <div
+          class="process"
+          v-if="
+            processData == '处理' ||
+              processData == '评价' ||
+              (processData == '结束' && processData != '重复事件')
+          "
+        >
+          <div class="status">
+            {{ processMessage[2] ? processMessage[2].name : "" }}
+          </div>
+          <div class="ico">
+            <i
+              class="iconfont icon-icon_zhengzaijinx now"
+              v-if="processData == '处理' && i === 0"
+            ></i>
+            <i
+              class="iconfont icon-icon_weizuo last"
+              v-else
+            ></i>
+          </div>
+          <div class="time">
+            {{ item.opTime | timeFormat("MM-dd HH:mm:ss")}}，{{ item.userName }}
+          </div>
+        </div>
+        <div
+          class="processCont"
+          v-if="
+            processData == '处理' ||
+              processData == '评价' ||
+              (processData == '结束' && processData != '重复事件')
+          "
+        >
+          <div class="status"></div>
+          <div class="conents">{{ item.opValue }}</div>
+        </div>
+      </div>
+      <!-- 处理日志 end -->
       <div
         class="process"
         v-if="
@@ -183,15 +227,17 @@
         <div class="ico">
           <i
             class="iconfont icon-icon_zhengzaijinx now"
-            v-if="processData == '处理'"
+            v-if="processData == '处理' && !data.incident.handlerLogs"
           ></i>
           <i
             class="iconfont icon-icon_weizuo last"
-            v-if="processData != '处理'"
+            v-else
           ></i>
         </div>
         <div class="time">
-          {{ processTime[2] ? processTime[2].startTime : "" }}
+          <template v-if="processTime[2]">
+            {{processTime[2].startTime | timeFormat("MM-dd HH:mm:ss")}}
+          </template>
         </div>
       </div>
       <div
@@ -208,6 +254,7 @@
           v-html="processMessage[2] ? processMessage[2].desc : ''"
         ></div>
       </div>
+
       <div
         class="process"
         v-if="
@@ -231,7 +278,9 @@
           ></i>
         </div>
         <div class="time">
-          {{ processTime[1] ? processTime[1].startTime : "" }}
+          <template v-if="processTime[1]">
+            {{processTime[1].startTime | timeFormat("MM-dd HH:mm:ss")}}
+          </template>
         </div>
       </div>
       <div
@@ -264,7 +313,9 @@
           ></i>
         </div>
         <div class="time">
-          {{ data.createTime }}
+          <template v-if="processTime[0]">
+            {{processTime[0].startTime | timeFormat("MM-dd HH:mm:ss")}}
+          </template>
         </div>
       </div>
       <div class="processCont">
@@ -276,7 +327,7 @@
       </div>
     </div>
     <!-- 处理日志 -->
-    <div class="repairProgress">
+    <!-- <div class="repairProgress">
       <div class="label">
         处理日志
       </div>
@@ -296,7 +347,7 @@
           </tr>
         </table>
       </div>
-    </div>
+    </div> -->
     <!-- 撤回原因 -->
     <div class="label" v-if="processData == '已撤回'">
       撤回原因
@@ -451,6 +502,8 @@ export default {
       this.data = JSON.parse(this.$route.params.data);
       if(!this.data.incident.handlerLogs){
         this.data.incident.handlerLogs = [];
+      }else{
+        this.data.incident.handlerLogs.reverse();
       }
       if (this.data.incident.repeat) {
         this.processData = "重复事件";