浏览代码

Merge branch 'infoPoint' of http://39.106.8.246:3003/web/ibms into infoPoint

haojianlong 5 年之前
父节点
当前提交
1e3c196ed9
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/components/model/file/floorTable.vue

+ 5 - 5
src/components/model/file/floorTable.vue

@@ -39,15 +39,15 @@
           ></el-button>
         </div>
         <div
-          :class="[scope.row.Status == 1 ||scope.row.Status == 10 ? 'upLoad-loading':'','upLoad']"
+          :class="[scope.row.Status == 1 || scope.row.Status == 10 || scope.row.Status == 11 || (scope.row.Status == 0 && scope.row.precent == 100)? 'upLoad-loading':'','upLoad']"
           v-show="scope.row.isDown"
         >
           <div class="progress">
             <el-progress
-              :text-inside="scope.row.Status == 1 || scope.row.Status == 10 ?false:true"
+              :text-inside="scope.row.Status == 1 || scope.row.Status == 10 || scope.row.Status == 11 || (scope.row.Status == 0 && scope.row.precent == 100)?false:true"
               :stroke-width="20"
               :percentage="scope.row.precent"
-              :color="scope.row.Status == 1 || scope.row.Status == 10 ?'#909399':'#67C23A'"
+              :color="scope.row.Status == 1 || scope.row.Status == 10 || scope.row.Status == 11?'#909399':'#67C23A'"
             ></el-progress>
           </div>
           <div class="progress-right">
@@ -58,7 +58,7 @@
               @click="closeUpdate(scope.row)"
               circle
             ></el-button>-->
-            <span v-show="scope.row.Status == 0">上传中</span>
+            <span v-show="scope.row.Status == 0 && scope.row.precent == 100">上传中</span>
             <span v-show="scope.row.Status == 1">等待检查...</span>
             <span v-show="scope.row.Status == 10">模型检查中</span>
             <span v-show="scope.row.Status == 11">未通过检查</span>
@@ -90,7 +90,7 @@ export default {
     },
     // 替换日志
     repliaceModel(item) {
-      if (item.row.Status == 2) {
+      if (item.Status == 2 || item.Status == 20 || item.Status == 21) {
         this.$alert("正在识别模型对象,请稍后再替换。", "替换模型", {
           confirmButtonText: "确定",
           callback: action => {