Bläddra i källkod

模型图修改

haojianlong 4 år sedan
förälder
incheckning
cca7b687ad
1 ändrade filer med 66 tillägg och 42 borttagningar
  1. 66 42
      src/views/model/file/pathcontrol/index.vue

+ 66 - 42
src/views/model/file/pathcontrol/index.vue

@@ -52,7 +52,7 @@
                 <p>耗时: {{SchedulerCheck.TakeTime||'--'}}</p>
                 <!-- <p>平均上传速度: 1M/s</p> -->
                 <p>开始时间: {{SchedulerCheck.BeginTime||'--'}}</p>
-                <p v-if="SchedulerCheck.EndTime">待分配模型数量: {{waitAssign}}</p>
+                <p v-if="!SchedulerCheck.EndTime">待分配模型数量: {{waitAssign}}</p>
                 <p v-else>结束时间: {{SchedulerCheck.EndTime||'--'}}</p>
               </div>
             </div>
@@ -94,7 +94,7 @@
                   <div class="fixed">
                     <p>{{OriginalName}} json数据压缩包</p>
                     <p style="color:#8d9aa3">文件大小: {{ModelExport.JsonzSize?(ModelExport.JsonzSize/1000/1024).toFixed(1)+'M':'--'}}</p>
-                    <p style="color:#8d9aa3">上传时间: {{ModelExport.EndTime||'--'}}</p>
+                    <p style="color:#8d9aa3">上传时间: {{ModelExport.JsonzEndTime||'--'}}</p>
                   </div>
                 </el-row>
               </el-row>
@@ -103,8 +103,8 @@
               <img v-else-if="UploadState.EndTime&&!SchedulerCheck.EndTime" class="status down-model" src="@/assets/image/model/downModelBlue.png" />
               <img v-else class="status down-model" src="@/assets/image/model/downModelGreen.png" />
               <!-- 下载模型文件2 -->
-              <img v-if="!ModelCheck.EndTime" class="status down-model-sec" src="@/assets/image/model/downModelGray.png" />
-              <img v-else-if="ModelCheck.EndTime&&!SchedulerExport.EndTime" class="status down-model-sec"
+              <img v-if="!SchedulerExport.BeginTime" class="status down-model-sec" src="@/assets/image/model/downModelGray.png" />
+              <img v-else-if="SchedulerExport.BeginTime&&!ModelExport.JsonzBeginTime" class="status down-model-sec"
                 src="@/assets/image/model/downModelBlue.png" />
               <img v-else class="status down-model-sec" src="@/assets/image/model/downModelGreen.png" />
               <!-- 存储json -->
@@ -133,8 +133,8 @@
             <img v-else-if="JsonAnalysis.BeginTime&&!JsonAnalysis.EndTime" class="status waiting-anl" src="@/assets/image/model/waitingAnlBlue.png" />
             <img v-else class="status waiting-anl" src="@/assets/image/model/waitingAnlGreen.png" />
             <!-- 未通过 -->
-            <img v-if="!ModelCheck.Remove" class="status del-model" src="@/assets/image/model/delModelGray.png" />
-            <img v-else class="status del-model" src="@/assets/image/model/delModelBlue.png" />
+            <img v-if="ModelCheck.Remove||ModelExport.Remove" class="status del-model" src="@/assets/image/model/delModelBlue.png" />
+            <img v-else class="status del-model" src="@/assets/image/model/delModelGray.png" />
 
             <!-- 调度器2 -->
             <div class="path-tips shadow-box" style="top:114px;left:329px;" @click="getNodeDes"
@@ -154,7 +154,7 @@
           <div class="path-tips shadow-box up-model-tips" @click="getNodeDes">
             <i class="el-icon-error" v-if="ModelCheck.HasError"></i>
             <i class="el-icon-warning" v-else-if="ModelCheck.HasRetry"></i>
-            <p>耗时: {{ModelCheck.TakeTime||'--'}}</p>
+            <p>耗时: {{ModelCheck.DownTakeTime||'--'}}</p>
             <p>平均下载速度: {{ModelCheckSpeed}}</p>
             <p>开始时间: {{UploadState.EndTime||'--'}}</p>
             <p>结束时间: {{SchedulerCheck.EndTime||'--'}}</p>
@@ -163,10 +163,10 @@
           <div class="path-tips shadow-box up-model-tips2" @click="getNodeDes">
             <i class="el-icon-error" v-if="ModelExport.HasError"></i>
             <i class="el-icon-warning" v-else-if="ModelExport.HasRetry"></i>
-            <p>耗时: {{ModelExport.TakeTime||'--'}}</p>
+            <p>耗时: {{ModelExport.DownTakeTime||'--'}}</p>
             <p>平均下载速度: {{ModelExportSpeed||'--'}}</p>
-            <p>开始时间: {{ModelCheck.EndTime||'--'}}</p>
-            <p>结束时间: {{SchedulerExport.EndTime||'--'}}</p>
+            <p>开始时间: {{SchedulerExport.BeginTime||'--'}}</p>
+            <p>结束时间: {{ModelExport.JsonzBeginTime||'--'}}</p>
           </div>
           <!-- 存储json -->
           <div class="path-tips shadow-box up-json-tips" @click="getNodeDes">
@@ -234,8 +234,8 @@
             <img v-else-if="SaveLog.BeginTime&&!SaveLog.EndTime" class="status path4 path" src="@/assets/image/model/arrowBlue.png" />
             <img v-else class="status path4 path" src="@/assets/image/model/arrowGreen.png" />
 
-            <img v-if="!ModelExport.Remove" class="status del-model" src="@/assets/image/model/delModelGray.png" />
-            <img v-else class="status del-model" src="@/assets/image/model/delModelBlue.png" />
+            <img v-if="MultiFloorCheck.GridCheck||MultiFloorCheck.LevelCheck" class="status del-model" src="@/assets/image/model/delModelBlue.png" />
+            <img v-else class="status del-model" src="@/assets/image/model/delModelGray.png" />
 
             <p style="float:left;width:100%;text-align:center;margin-top:83px;color:#acb5bb;font-size:12px;">模型web服务器</p>
           </el-row>
@@ -271,7 +271,7 @@
           </el-row>
         </div>
         <div class="fifth-column column">
-          <pathCard class="finish-item" :title="'完成'" :data="{}" :isCustomize="true">
+          <pathCard class="finish-item" :title="'完成'" :data="SaveLog" :isCustomize="true">
             <p>后续关系计算...</p>
             <p>完成时间: {{SaveLog.EndTime||'--'}}</p>
           </pathCard>
@@ -366,20 +366,26 @@ export default {
         Filters: `Id="${this.Id}"`
       }
       modelPathControl(pa, res => {
-        const data = res.Content[0];
-        if (data.SchedulerExport && data.SchedulerExport.BeginTime) {
-          data.ModelExport.BeginTime = data.SchedulerExport.BeginTime
-        }
-        this.updateData(data);
-        this.getSpeed();
-        this.interval(data);
-        if (!this.SaveLog.EndTime) {
-          if (this.timeout) {
-            clearTimeout(this.timeout);
+        if (res.Content.length) {
+          const data = res.Content[0];
+          if (data.SchedulerExport && data.SchedulerExport.BeginTime) {
+            if (data.ModelExport) {
+              data.ModelExport.BeginTime = data.SchedulerExport.BeginTime
+            }
+          }
+          this.updateData(data);
+          this.getSpeed();
+          this.interval(data);
+          if (!this.SaveLog.EndTime) {
+            if (this.timeout) {
+              clearTimeout(this.timeout);
+            }
+            this.timeout = setTimeout(() => {
+              this.init()
+            }, 30000)
           }
-          this.timeout = setTimeout(() => {
-            this.init()
-          }, 30000)
+        } else {
+          this.$message.warning('暂无数据')
         }
       })
     },
@@ -421,14 +427,23 @@ export default {
         }
         this.allTakeTime = this.formatTime(temp).TakeTime
       }
-      if (this.UploadState.EndTime && this.SchedulerCheck.EndTime) {
-        let temp = {
-          BeginTime: new Date(this.UploadState.EndTime).getTime(),
-          EndTime: new Date(this.SchedulerCheck.EndTime).getTime()
-        }
-        this.ModelCheck.TakeTime = this.formatTime(temp).TakeTime
-      } else {
-        this.ModelCheckSpeed = '--'
+      if (this.UploadState.EndTime && !this.SchedulerCheck.EndTime) {
+        const sTime = new Date(this.UploadState.EndTime).getTime();
+        const eTime = new Date().getTime();
+        this.ModelCheck.DownTakeTime = this.msToStr(eTime - sTime);
+      } else if (this.UploadState.EndTime && this.SchedulerCheck.EndTime) {
+        const sTime = new Date(this.UploadState.EndTime).getTime();
+        const eTime = new Date(this.SchedulerCheck.EndTime).getTime();
+        this.ModelCheck.DownTakeTime = this.msToStr(eTime - sTime);
+      }
+      if (this.SchedulerExport.BeginTime && !this.ModelExport.JsonzBeginTime) {
+        const sTime = new Date(this.SchedulerExport.BeginTime).getTime();
+        const eTime = new Date().getTime();
+        this.ModelExport.DownTakeTime = this.msToStr(eTime - sTime);
+      } else if (this.SchedulerExport.BeginTime && this.ModelExport.JsonzBeginTime) {
+        const sTime = new Date(this.SchedulerExport.BeginTime).getTime();
+        const eTime = new Date(this.ModelExport.JsonzBeginTime).getTime();
+        this.ModelExport.DownTakeTime = this.msToStr(eTime - sTime);
       }
     },
     // 设置速度
@@ -438,7 +453,7 @@ export default {
         sTime = new Date(this.UploadState.BeginTime).getTime();
         eTime = new Date(this.UploadState.EndTime).getTime();
         if (sTime != eTime) {
-          this.UploadStateSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}KB/S`
+          this.UploadStateSpeed = this.formatSpeed(this.Size / (eTime - sTime))
         } else {
           this.UploadStateSpeed = '--'
         }
@@ -449,18 +464,18 @@ export default {
         sTime = new Date(this.UploadState.EndTime).getTime();
         eTime = new Date(this.SchedulerCheck.EndTime).getTime();
         if (sTime != eTime) {
-          this.ModelCheckSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}KB/S`
+          this.ModelCheckSpeed = this.formatSpeed(this.Size / (eTime - sTime))
         } else {
           this.ModelCheckSpeed = '--'
         }
       } else {
         this.ModelCheckSpeed = '--'
       }
-      if (this.ModelCheck.EndTime && this.SchedulerExport.EndTime) {
-        sTime = new Date(this.ModelCheck.EndTime).getTime();
-        eTime = new Date(this.SchedulerExport.EndTime).getTime();
+      if (this.SchedulerExport.BeginTime && this.ModelExport.JsonzBeginTime) {
+        sTime = new Date(this.SchedulerExport.BeginTime).getTime();
+        eTime = new Date(this.ModelExport.JsonzBeginTime).getTime();
         if (sTime != eTime) {
-          this.ModelExportSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}KB/S`
+          this.ModelExportSpeed = this.formatSpeed(this.Size / (eTime - sTime))
         } else {
           this.ModelExportSpeed = '--'
         }
@@ -471,7 +486,7 @@ export default {
         sTime = new Date(this.ModelExport.JsonzBeginTime).getTime();
         eTime = new Date(this.ModelExport.JsonzEndTime).getTime();
         if (sTime != eTime) {
-          this.SaveJsonSpeed = `${(this.ModelExport.JsonzSize / (eTime - sTime)).toFixed(1)}KB/S`
+          this.SaveJsonSpeed = this.formatSpeed(this.ModelExport.JsonzSize / (eTime - sTime))
         } else {
           this.SaveJsonSpeed = '--'
         }
@@ -482,7 +497,7 @@ export default {
         sTime = new Date(this.JsonAnalysis.BeginTime).getTime();
         eTime = new Date(this.JsonAnalysis.EndTime).getTime();
         if (sTime != eTime) {
-          this.DownJsonSpeed = `${(this.ModelExport.JsonzSize / (eTime - sTime)).toFixed(1)}KB/S`
+          this.DownJsonSpeed = this.formatSpeed(this.ModelExport.JsonzSize / (eTime - sTime))
         } else {
           this.DownJsonSpeed = '--'
         }
@@ -512,6 +527,15 @@ export default {
       }
       return data;
     },
+    // 生成speed
+    formatSpeed(speed) {
+      if (speed > 1024) {
+        speed = (speed / 1024).toFixed(1);
+        return `${speed}MB/s`
+      } else {
+        return `${speed.toFixed(1)}KB/s`
+      }
+    },
     msToStr(mss) {
       let str = '';
       const days = parseInt(mss / (1000 * 60 * 60 * 24));