Bläddra i källkod

模型监控调整

haojianlong 5 år sedan
förälder
incheckning
e1aef6bc46
2 ändrade filer med 49 tillägg och 16 borttagningar
  1. 10 4
      src/components/model/file/pathCard.vue
  2. 39 12
      src/views/model/file/pathcontrol/index.vue

+ 10 - 4
src/components/model/file/pathCard.vue

@@ -1,5 +1,7 @@
 <template>
-  <div :class="{'pathCard':true,'borderY':!data.HasError&&data.HasRetry,'borderR':data.HasError}" @click="cardClick">
+  <div
+    :class="{'pathCard':true,'borderB':data.BeginTime&&!data.EndTime,'borderY':!data.EndTime&&!data.HasError&&data.HasRetry,'borderR':!data.EndTime&&data.HasError}"
+    @click="cardClick">
     <div class="path-title">
       <i v-if="!data.BeginTime" class="iconfont icon-iconfontgengduo" style="color:#333333"></i>
       <i v-else-if="data.BeginTime&&!data.EndTime" class="iconfont icon-conduct" style="color:#409eff"></i>
@@ -10,9 +12,9 @@
     </div>
     <div class="path-content">
       <slot></slot>
-      <p>耗时: {{data.TokeTime||'--'}}</p>
-      <p>开始时间: {{data.BeginTime||'--'}}</p>
-      <p>结束时间: {{data.EndTime||'--'}}</p>
+      <p v-if="!isCustomize">耗时: {{data.TokeTime||'--'}}</p>
+      <p v-if="!isCustomize">开始时间: {{data.BeginTime||'--'}}</p>
+      <p v-if="!isCustomize">结束时间: {{data.EndTime||'--'}}</p>
     </div>
   </div>
 </template>
@@ -26,6 +28,10 @@ export default {
     data: {
       type: Object,
       default: {}
+    },
+    isCustomize: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

+ 39 - 12
src/views/model/file/pathcontrol/index.vue

@@ -189,13 +189,13 @@
                   <p style="color:#676767">web服务数据库</p>
                 </div>
               </div>
-              <img v-if="!SaveData.BeginTime" class="status column-up" src="@/assets/image/model/columnGray.png" />
-              <img v-else-if="SaveData.BeginTime&&!SaveData.EndTime" class="status column-up" src="@/assets/image/model/columnBlue.png" />
-              <img v-else class="status column-up" src="@/assets/image/model/columnGreen.png" />
+              <img v-if="1||!SaveData.BeginTime" class="status column-up" src="@/assets/image/model/columnGray.png" />
+              <!-- <img v-else-if="SaveData.BeginTime&&!SaveData.EndTime" class="status column-up" src="@/assets/image/model/columnBlue.png" />
+              <img v-else class="status column-up" src="@/assets/image/model/columnGreen.png" /> -->
 
-              <img v-if="!MultiFloorCheck.BeginTime" class="status right-down" src="@/assets/image/model/rightDownGray.png" />
-              <img v-else-if="MultiFloorCheck.BeginTime&&!MultiFloorCheck.EndTime" class="status right-down" src="@/assets/image/model/rightDownBlue.png" />
-              <img v-else class="status right-down" src="@/assets/image/model/rightDownGreen.png" />
+              <img v-if="1||!MultiFloorCheck.BeginTime" class="status right-down" src="@/assets/image/model/rightDownGray.png" />
+              <!-- <img v-else-if="MultiFloorCheck.BeginTime&&!MultiFloorCheck.EndTime" class="status right-down" src="@/assets/image/model/rightDownBlue.png" />
+              <img v-else class="status right-down" src="@/assets/image/model/rightDownGreen.png" /> -->
             </div>
           </div>
           <el-row id="webServer">
@@ -244,8 +244,8 @@
               </div>
 
               <img v-if="1" class="status column-up" src="@/assets/image/model/columnGray.png" />
-              <img v-else-if="2" class="status column-up" src="@/assets/image/model/columnBlue.png" />
-              <img v-else class="status column-up" src="@/assets/image/model/columnGreen.png" />
+              <!-- <img v-else-if="2" class="status column-up" src="@/assets/image/model/columnBlue.png" />
+              <img v-else class="status column-up" src="@/assets/image/model/columnGreen.png" /> -->
             </div>
           </div>
           <el-row id="dataCenterServer">
@@ -259,7 +259,10 @@
           </el-row>
         </div>
         <div class="fifth-column column">
-          <pathCard class="finish-item" :title="'完成'" @click="getNodeDes" :data="finish"></pathCard>
+          <pathCard class="finish-item" :title="'完成'" @click="getNodeDes" :data="finish" :isCustomize="true">
+            <p>后续关系计算...</p>
+            <p>完成时间: {{Note.EndTime||'--'}}</p>
+          </pathCard>
         </div>
       </div>
     </el-row>
@@ -298,7 +301,7 @@ export default {
     }
   },
   mounted() {
-    Bus.$on('messageListUpdate', message => {
+    Bus.$on('modelStatusChange', message => {
       this.getMessage()
     })
   },
@@ -331,11 +334,35 @@ export default {
       })
     },
     // 处理时间工具
-    formatTime(time) {
+    formatTime(data) {
+      if (data.BeginTime && !data.EndTime) {
+        const sTime = new Date(data.BeginTime).getTime();
+        const eTime = new Date().getTime();
+        data.TakeTime = this.msToStr(eTime - sTime);
+      }
+      return data;
+    },
+    msToStr(mss) {
       let str = '';
+      const days = parseInt(mss / (1000 * 60 * 60 * 24));
+      const hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+      const minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
+      const seconds = ((mss % (1000 * 60)) / 1000).toFixed();
+      if (days > 0) {
+        str += `${days}天`
+      }
+      if (hours > 0) {
+        str += `${hours}小时`
+      }
+      if (minutes > 0) {
+        str += `${minutes}分钟`
+      }
+      if (seconds > 0) {
+        str += `${seconds}秒`
+      }
       return str;
     }
-  },
+  }
 };
 </script>
 <style lang="less" scoped>