Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue

@@ -6,7 +6,7 @@
       <span class="name">{{ data.name }}</span>
       <span class="posts">{{ data.posts }}</span>
     </div>
-    <div class="desc" v-if="data.processId">节点：{{ data.processName }}</div>
+    <div class="node" v-if="data.processId">节点：{{ data.processName }}</div>
     <el-image
       style="width: 100px; height: 100px"
       v-if="
@@ -371,6 +371,11 @@ export default {
     }
   }
 
+  .node {
+    color: #ffbf00;
+    font-size: 16px;
+    line-height: 19px;
+  }
   .desc {
     font-size: 16px;
     line-height: 19px;

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue

@@ -326,7 +326,7 @@ export default {
           processName: this.processName,
           context: content,
           // file: this.imageUrl,
-          type: type ? type.join(",") : "text",
+          type: type && type.length > 0 ? type.join(",") : "text",
           source: 1,
           processType: this.processType,
         };

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@@ -171,14 +171,25 @@ export default {
 
         rows.forEach(item =>{
           this.timeLine2List.push({
-            time: moment(item.operationTime || new Date()).format(
+            id: item.processId,
+            time: item.operationTime
+              ? new Date(item.operationTime).toLocaleString()
+              : null,
+            name: item.operatorName,
+            desc: item.context,
+            source: item.source,
+            processId: item.processId,
+            processName: item.processName,
+            type: item.type,
+            processType: item.processType,
+            /*time: moment(item.operationTime || new Date()).format(
               "yyyy-MM-DD HH:mm:ss"
             ),
             name: item.operatorName,
             desc: item.context,
             source: item.source,
             posts: "",
-            direction: item.source == 1 ? "right" : "left",
+            direction: item.source == 1 ? "right" : "left",*/
           });
         })