Browse Source

模型图

haojianlong 4 years ago
parent
commit
18888ec6d2
2 changed files with 64 additions and 52 deletions
  1. 34 37
      src/components/model/file/nodeDialog.vue
  2. 30 15
      src/views/model/file/pathcontrol/index.vue

+ 34 - 37
src/components/model/file/nodeDialog.vue

@@ -6,11 +6,15 @@
         <div v-if='checkType=="firstCheck"||checkType=="secondCheck"'>
           <p>强制检查项</p>
           <p v-for="(t,i) in check[checkType].checkList" :key='i'>
-            <i class="el-icon-check"></i>{{t.name}}
+            <i class="el-icon-check" v-if="!t.check"></i>
+            <i class="el-icon-close" v-else></i>
+            {{t.name}}
           </p>
           <p>非强制检查项</p>
           <p v-for="(t,i) in check[checkType].notCheckList" :key='-i-1'>
-            <i class="el-icon-close"></i>{{t.name}}
+            <i class="el-icon-check" v-if="!t.check"></i>
+            <i class="el-icon-close" v-else></i>
+            {{t.name}}
           </p>
         </div>
       </div>
@@ -34,47 +38,30 @@ export default {
       check: {
         firstCheck: {
           checkList: [
-            { name: '楼层平面图命名规范检查' },
-            { name: '项目长度单位检查' },
-            { name: '楼层缺失检查' },
-            { name: '构件范围检查' },
-            { name: '设备族编码检查' },
-            { name: '部件所在位置检查' },
-            { name: '柱边界检查' },
-            { name: '连接件检查' },
-            { name: '系统类型名称检查' },
-            { name: '未在空间中的设备' },
-            { name: '管段检查' },
-            { name: '管网及相关设备检查' },
-            { name: 'Revit族参数完整性检查' },
-            { name: 'xyz坐标重叠检查' }
+            { name: '楼层平面图命名规范检查', check: false },
+            { name: '项目长度单位检查', check: false },
           ],
           notCheckList: [
-            { name: '楼层标高与楼层顺序号检查' },
-            { name: '轴网检查' }
+            { name: '楼层缺失检查', check: false },
+            { name: '构件范围检查', check: false },
+            { name: '设备族编码检查', check: false },
+            { name: '部件所在位置检查', check: false },
+            { name: '柱边界检查', check: false },
+            { name: '连接件检查', check: false },
+            { name: '系统类型名称检查', check: false },
+            { name: '未在空间中的设备', check: false },
+            { name: '管段检查', check: false },
+            { name: '管网及相关设备检查', check: false },
+            { name: 'Revit族参数完整性检查', check: false },
+            { name: 'xyz坐标重叠检查', check: false }
           ],
         },
         secondCheck: {
           checkList: [
-            { name: '楼层标高与楼层顺序号检查' },
-            { name: '轴网检查' }
-          ],
-          notCheckList: [
-            { name: '楼层平面图命名规范检查' },
-            { name: '项目长度单位检查' },
-            { name: '楼层缺失检查' },
-            { name: '构件范围检查' },
-            { name: '设备族编码检查' },
-            { name: '部件所在位置检查' },
-            { name: '柱边界检查' },
-            { name: '连接件检查' },
-            { name: '系统类型名称检查' },
-            { name: '未在空间中的设备' },
-            { name: '管段检查' },
-            { name: '管网及相关设备检查' },
-            { name: 'Revit族参数完整性检查' },
-            { name: 'xyz坐标重叠检查' }
+            { name: '楼层标高与楼层顺序号检查', check: false, value: 'LevelCheck' },
+            { name: '轴网检查', check: false, value: 'GridCheck' }
           ],
+          notCheckList: [],
         }
       },
       errMsg: '',
@@ -83,8 +70,18 @@ export default {
   },
   methods: {
     showDialog(msg, type) {
-      this.errMsg = msg;
+      this.errMsg = msg.ErrorMsg || '';
       this.checkType = type || '';
+      if (type) {
+        this.check[type].checkList.forEach(t => {
+          if (t.value && t.value == 'GridCheck') {
+            t.check = msg.GridCheck || false
+          }
+          if (t.value && t.value == 'LevelCheck') {
+            t.check = msg.LevelCheck || false
+          }
+        })
+      }
       this.dialogVisible = true;
     }
   }

+ 30 - 15
src/views/model/file/pathcontrol/index.vue

@@ -108,8 +108,9 @@
                 src="@/assets/image/model/downModelBlue.png" />
               <img v-else class="status down-model-sec" src="@/assets/image/model/downModelGreen.png" />
               <!-- 存储json -->
-              <img v-if="!ModelExport.BeginTime" class="status up-json" src="@/assets/image/model/upJsonGray.png" />
-              <img v-else-if="ModelExport.BeginTime&&!ModelExport.EndTime" class="status up-json" src="@/assets/image/model/upJsonBlue.png" />
+              <img v-if="!ModelExport.JsonzBeginTime" class="status up-json" src="@/assets/image/model/upJsonGray.png" />
+              <img v-else-if="ModelExport.JsonzBeginTime&&!ModelExport.JsonzEndTime" class="status up-json"
+                src="@/assets/image/model/upJsonBlue.png" />
               <img v-else class="status up-json" src="@/assets/image/model/upJsonGreen.png" />
               <!-- 下载json -->
               <img v-if="!JsonAnalysis.BeginTime" class="status down-json" src="@/assets/image/model/downJsonGray.png" />
@@ -171,10 +172,10 @@
           <div class="path-tips shadow-box up-json-tips" @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.JsonzTakeTime||'--'}}</p>
             <p>平均上传速度: {{SaveJsonSpeed||'--'}}</p>
-            <p>开始时间: {{ModelExport.BeginTime||'--'}}</p>
-            <p>结束时间: {{ModelExport.EndTime||'--'}}</p>
+            <p>开始时间: {{ModelExport.JsonzBeginTime||'--'}}</p>
+            <p>结束时间: {{ModelExport.JsonzEndTime||'--'}}</p>
           </div>
           <!-- 下载json压缩包 -->
           <div class="path-tips shadow-box down-json-tips" @click="getNodeDes">
@@ -338,11 +339,16 @@ export default {
     if (this.timer) {
       clearInterval(this.timer);
     }
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+    }
   },
   methods: {
     init() {
       this.getMessage();
-      this.getUnassignNum()
+      if (!this.SchedulerExport.EndTime) {
+        this.getUnassignNum();
+      }
     },
     // 弹窗
     getNodeDes(data, title) {
@@ -352,7 +358,7 @@ export default {
       } else if (title == '建筑模型检查') {
         type = 'secondCheck'
       }
-      this.$refs.nodeDialog.showDialog(data.ErrorMsg || '', type)
+      this.$refs.nodeDialog.showDialog(data, type)
     },
     // 获取流转状态
     getMessage() {
@@ -432,7 +438,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)}K/s`
+          this.UploadStateSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}KB/S`
         } else {
           this.UploadStateSpeed = '--'
         }
@@ -443,7 +449,7 @@ 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)}K/s`
+          this.ModelCheckSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}KB/S`
         } else {
           this.ModelCheckSpeed = '--'
         }
@@ -454,18 +460,18 @@ export default {
         sTime = new Date(this.ModelCheck.EndTime).getTime();
         eTime = new Date(this.SchedulerExport.EndTime).getTime();
         if (sTime != eTime) {
-          this.ModelExportSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}K/s`
+          this.ModelExportSpeed = `${(this.Size / (eTime - sTime)).toFixed(1)}KB/S`
         } else {
           this.ModelExportSpeed = '--'
         }
       } else {
         this.ModelExportSpeed = '--'
       }
-      if (this.ModelExport.BeginTime && this.ModelExport.EndTime) {
-        sTime = new Date(this.ModelExport.BeginTime).getTime();
-        eTime = new Date(this.ModelExport.EndTime).getTime();
+      if (this.ModelExport.JsonzBeginTime && this.ModelExport.JsonzEndTime) {
+        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)}K/s`
+          this.SaveJsonSpeed = `${(this.ModelExport.JsonzSize / (eTime - sTime)).toFixed(1)}KB/S`
         } else {
           this.SaveJsonSpeed = '--'
         }
@@ -476,7 +482,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)}K/s`
+          this.DownJsonSpeed = `${(this.ModelExport.JsonzSize / (eTime - sTime)).toFixed(1)}KB/S`
         } else {
           this.DownJsonSpeed = '--'
         }
@@ -495,6 +501,15 @@ export default {
         const eTime = new Date(data.EndTime).getTime();
         data.TakeTime = this.msToStr(eTime - sTime);
       }
+      if (data.JsonzBeginTime && !data.JsonzEndTime) {
+        const sTime = new Date(data.JsonzBeginTime).getTime();
+        const eTime = new Date().getTime();
+        data.JsonzTakeTime = this.msToStr(eTime - sTime);
+      } else if (data.JsonzBeginTime && data.JsonzEndTime) {
+        const sTime = new Date(data.JsonzBeginTime).getTime();
+        const eTime = new Date(data.JsonzEndTime).getTime();
+        data.JsonzTakeTime = this.msToStr(eTime - sTime);
+      }
       return data;
     },
     msToStr(mss) {