Browse Source

模型图修改

haojianlong 4 years ago
parent
commit
71f3f74baf

+ 2 - 2
src/components/model/file/nodeDialog.vue

@@ -10,7 +10,7 @@
             <i class="el-icon-close" v-else></i>
             {{t.name}}
           </p>
-          <p>非强制检查项</p>
+          <p v-if="check[checkType].notCheckList.length">非强制检查项</p>
           <p v-for="(t,i) in check[checkType].notCheckList" :key='-i-1'>
             <i class="el-icon-check" v-if="!t.check"></i>
             <i class="el-icon-close" v-else></i>
@@ -23,7 +23,7 @@
       <p>处理结果</p>
       <div class="gray-border"></div>
     </div>
-    <div class="err-des">
+    <div class="err-des" v-if="errMsg">
       <p>错误说明</p>
       <div>{{errMsg}}</div>
     </div>

+ 1 - 0
src/components/model/file/pathCard.vue

@@ -52,6 +52,7 @@ export default {
   border: 1px solid transparent;
   box-shadow: 0 2px 11px 0 rgba(0, 0, 0, 0.1);
   border-radius: 4px;
+  cursor: pointer;
   &.borderY {
     border-color: #fcc636;
   }

+ 94 - 92
src/views/model/file/pathcontrol/index.vue

@@ -33,10 +33,10 @@
                 <i class="el-icon-success" style="color:#67C23A"></i>模型中转站
               </div>
               <div class="first-content">
-                <p>模型文件存储于OSS服务器</p>
+                <p>模型文件存储于OSS服务器</p>
               </div>
-              <img v-if="!SchedulerCheck.BeginTime" class="status row-waiting-manage" src="@/assets/image/model/waitingManageGray.png" />
-              <img v-else-if="SchedulerCheck.BeginTime&&!SchedulerCheck.EndTime" class="status row-waiting-manage"
+              <img v-if="!UploadState.EndTime" class="status row-waiting-manage" src="@/assets/image/model/waitingManageGray.png" />
+              <img v-else-if="UploadState.EndTime&&!SchedulerCheck.EndTime" class="status row-waiting-manage"
                 src="@/assets/image/model/waitingManageBlue.png" />
               <img v-else class="status row-waiting-manage" src="@/assets/image/model/waitingManageGreen.png" />
 
@@ -45,8 +45,8 @@
               <img v-else class="status up-model" src="@/assets/image/model/upModelGreen.png" />
 
               <!-- 调度器1 -->
-              <div class="path-tips shadow-box" style="top:67px;left:291px;" @click="getNodeDes"
-                v-if='SchedulerCheck.BeginTime&&!SchedulerCheck.EndTime'>
+              <div class="path-tips shadow-box" style="top:67px;left:291px;" @click="getNodeDes(SchedulerCheck,'等待调度器分配', true)"
+                v-if='SchedulerCheck.BeginTime'>
                 <i class="el-icon-error" v-if="SchedulerCheck.HasError"></i>
                 <i class="el-icon-warning" v-else-if="SchedulerCheck.HasRetry"></i>
                 <p>耗时: {{SchedulerCheck.TakeTime||'--'}}</p>
@@ -59,7 +59,7 @@
             <p style="float:left;width:100%;text-align:center;margin-top:73px;color:#acb5bb;font-size:12px;">本地电脑主机</p>
           </el-row>
           <!-- 上传模型文件 -->
-          <div class="path-tips shadow-box" style="top:189px;left:190px;" @click="getNodeDes">
+          <div class="path-tips shadow-box" style="top:189px;left:190px;" @click="getNodeDes(UploadState,'上传模型文件', true)">
             <i class="el-icon-error" v-if="UploadState.HasError"></i>
             <i class="el-icon-warning" v-else-if="UploadState.HasRetry"></i>
             <p>耗时: {{UploadState.TakeTime||'--'}}</p>
@@ -100,7 +100,8 @@
               </el-row>
               <!-- 下载模型文件1 -->
               <img v-if="!SchedulerCheck.BeginTime" class="status down-model" src="@/assets/image/model/downModelGray.png" />
-              <img v-else-if="SchedulerCheck.BeginTime&&!SchedulerCheck.EndTime" class="status down-model" src="@/assets/image/model/downModelBlue.png" />
+              <img v-else-if="SchedulerCheck.BeginTime&&!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="!SchedulerExport.BeginTime" class="status down-model-sec" src="@/assets/image/model/downModelGray.png" />
@@ -124,21 +125,21 @@
             </pathCard>
             <pathCard class="revit-item" :title="'导出模型json数据并压缩存储'" @click="getNodeDes" :data="ModelExport"></pathCard>
             <!-- 调度器2 -->
-            <img v-if="!SchedulerExport.BeginTime" class="status row-waiting-manage" src="@/assets/image/model/waitingManageGray.png" />
-            <img v-else-if="SchedulerExport.BeginTime&&!SchedulerExport.EndTime" class="status row-waiting-manage"
+            <img v-if="!ModelCheck.EndTime" class="status row-waiting-manage" src="@/assets/image/model/waitingManageGray.png" />
+            <img v-else-if="ModelCheck.EndTime&&!SchedulerExport.EndTime" class="status row-waiting-manage"
               src="@/assets/image/model/waitingManageBlue.png" />
             <img v-else class="status row-waiting-manage" src="@/assets/image/model/waitingManageGreen.png" />
             <!-- 等待解析 -->
-            <img v-if="!JsonAnalysis.BeginTime" class="status waiting-anl" src="@/assets/image/model/waitingAnlGray.png" />
-            <img v-else-if="JsonAnalysis.BeginTime&&!JsonAnalysis.EndTime" class="status waiting-anl" src="@/assets/image/model/waitingAnlBlue.png" />
+            <img v-if="!ModelExport.EndTime" class="status waiting-anl" src="@/assets/image/model/waitingAnlGray.png" />
+            <img v-else-if="ModelExport.EndTime&&!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||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"
-              v-if="SchedulerExport.BeginTime&&!SchedulerExport.EndTime">
+            <div class="path-tips shadow-box" style="top:114px;left:329px;" @click="getNodeDes(SchedulerExport,'等待调度器分配', true)"
+              v-if="SchedulerExport.BeginTime">
               <i class="el-icon-error" v-if="SchedulerExport.HasError"></i>
               <i class="el-icon-warning" v-else-if="SchedulerExport.HasRetry"></i>
               <p>耗时: {{SchedulerExport.TakeTime||'--'}}</p>
@@ -151,7 +152,7 @@
             <p style="float:left;width:100%;text-align:center;margin-top:83px;color:#acb5bb;font-size:12px;">revit本地服务器集群</p>
           </el-row>
           <!-- 下载模型文件1 -->
-          <div class="path-tips shadow-box up-model-tips" @click="getNodeDes">
+          <div class="path-tips shadow-box up-model-tips" @click="getNodeDes(ModelCheck,'下载模型文件', true)">
             <i class="el-icon-error" v-if="ModelCheck.HasError"></i>
             <i class="el-icon-warning" v-else-if="ModelCheck.HasRetry"></i>
             <p>耗时: {{SchedulerCheck.TakeTime||'--'}}</p>
@@ -160,7 +161,7 @@
             <p>结束时间: {{SchedulerCheck.EndTime||'--'}}</p>
           </div>
           <!-- 下载模型文件2 -->
-          <div class="path-tips shadow-box up-model-tips2" @click="getNodeDes">
+          <div class="path-tips shadow-box up-model-tips2" @click="getNodeDes(ModelExport,'下载模型文件', true)">
             <i class="el-icon-error" v-if="ModelExport.HasError"></i>
             <i class="el-icon-warning" v-else-if="ModelExport.HasRetry"></i>
             <p>耗时: {{ModelExport.DownTakeTime||'--'}}</p>
@@ -169,7 +170,7 @@
             <p>结束时间: {{ModelExport.JsonzBeginTime||'--'}}</p>
           </div>
           <!-- 存储json -->
-          <div class="path-tips shadow-box up-json-tips" @click="getNodeDes">
+          <div class="path-tips shadow-box up-json-tips" @click="getNodeDes(ModelExport,'存储json数据', true)">
             <i class="el-icon-error" v-if="ModelExport.HasError"></i>
             <i class="el-icon-warning" v-else-if="ModelExport.HasRetry"></i>
             <p>耗时: {{ModelExport.JsonzTakeTime||'--'}}</p>
@@ -178,7 +179,7 @@
             <p>结束时间: {{ModelExport.JsonzEndTime||'--'}}</p>
           </div>
           <!-- 下载json压缩包 -->
-          <div class="path-tips shadow-box down-json-tips" @click="getNodeDes">
+          <div class="path-tips shadow-box down-json-tips" @click="getNodeDes(JsonAnalysis,'下载json压缩包', true)">
             <i class="el-icon-error" v-if="JsonAnalysis.HasError"></i>
             <i class="el-icon-warning" v-else-if="JsonAnalysis.HasRetry"></i>
             <p>耗时: {{JsonAnalysis.TakeTime||'--'}}</p>
@@ -193,21 +194,38 @@
         </div>
         <div class="third-column column">
           <div>
-            <div id="webDatabase" class="shadow-box">
-              <div style="background:#b8c5d0;height:20px;"></div>
-              <div>
-                <div style="text-align:center;">
-                  <i class="iconfont icon-project-o" style="color:#dee6ec;font-size:40px"></i>
-                  <p style="color:#676767">web服务数据库</p>
+            <div id="webDatabase">
+              <div class="shadow-box">
+                <div style="background:#b8c5d0;height:20px;"></div>
+                <div>
+                  <div style="text-align:center;">
+                    <i class="iconfont icon-project-o" style="color:#dee6ec;font-size:40px"></i>
+                    <p style="color:#676767">web服务数据库</p>
+                  </div>
                 </div>
+                <img class="status column-up" src="@/assets/image/model/columnGray.png" />
+                <img class="status right-down" src="@/assets/image/model/rightDownGray.png" />
+              </div>
+              <div class="shadow-box">
+                <div style="background:#b8c5d0;height:20px;"></div>
+                <div>
+                  <div style="text-align:center;">
+                    <i class="iconfont icon-project-o" style="color:#dee6ec;font-size:40px"></i>
+                    <p style="color:#676767">数据中心数据库</p>
+                  </div>
+                </div>
+                <img class="status column-up" src="@/assets/image/model/columnGray.png" />
+              </div>
+              <div class="shadow-box">
+                <div style="background:#b8c5d0;height:20px;"></div>
+                <div>
+                  <div style="text-align:center;">
+                    <i class="iconfont icon-project-o" style="color:#dee6ec;font-size:40px"></i>
+                    <p style="color:#676767">web服务数据库</p>
+                  </div>
+                </div>
+                <img class="status column-up" src="@/assets/image/model/columnGray.png" />
               </div>
-              <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="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">
@@ -216,7 +234,8 @@
             <pathCard class="webServer-item" :title="'建筑模型检查'" :data="MultiFloorCheck" @click="getNodeDes">
               <p>共检查项: 2项</p>
             </pathCard>
-            <pathCard class="webServer-item" :title="'处理模型数据格式'" :data="SyncDatacenter" @click="getNodeDes"></pathCard>
+            <pathCard class="webServer-item" :title="'存储数据到数据中心'" :data="SyncDatacenter" @click="getNodeDes"></pathCard>
+            <pathCard class="webServer-item" :title="'记录增删日志'" @click="getNodeDes" :data="SaveLog"></pathCard>
 
             <img v-if="!SaveData.BeginTime" class="status path1 path" src="@/assets/image/model/arrowGray.png" />
             <img v-else-if="SaveData.BeginTime&&!SaveData.EndTime" class="status path1 path" src="@/assets/image/model/arrowBlue.png" />
@@ -237,39 +256,17 @@
             <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>
+            <img v-if="1" class="status path5 path" src="@/assets/image/model/arrowGray.png" />
+            <!-- <img v-else-if="2" class="status path1" src="@/assets/image/model/arrowBlue.png" />
+            <img v-else class="status path1" src="@/assets/image/model/arrowGreen.png" /> -->
+
+            <p style="float:left;width:100%;padding-left:714px;margin-top:83px;color:#acb5bb;font-size:12px;">模型web服务器</p>
           </el-row>
           <div id="thirdDel" class="delModel">
             <i class="iconfont icon-delate" style="color:#89969F;font-size:30px;line-height:1;margin-left:-6px"></i>
             <p>放弃文件</p>
           </div>
         </div>
-        <div class="forth-column column">
-          <div>
-            <div id="dataCenterDatabase" class="shadow-box">
-              <div style="background:#b8c5d0;height:20px;"></div>
-              <div>
-                <div style="text-align:center;">
-                  <i class="iconfont icon-project-o" style="color:#dee6ec;font-size:40px"></i>
-                  <p style="color:#676767">数据中心数据库</p>
-                </div>
-              </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" /> -->
-            </div>
-          </div>
-          <el-row id="dataCenterServer">
-            <pathCard :title="'储存模型数据并记录增删日志'" @click="getNodeDes" :data="SaveLog"></pathCard>
-
-            <img v-if="1" class="status path1" src="@/assets/image/model/arrowGray.png" />
-            <!-- <img v-else-if="2" class="status path1" src="@/assets/image/model/arrowBlue.png" />
-            <img v-else class="status path1" src="@/assets/image/model/arrowGreen.png" /> -->
-
-            <p style="float:left;width:100%;text-align:center;margin-top:83px;color:#acb5bb;font-size:12px;">数据中心服务器 </p>
-          </el-row>
-        </div>
         <div class="fifth-column column">
           <pathCard class="finish-item" :title="'完成'" :data="SaveLog" :isCustomize="true">
             <p>后续关系计算...</p>
@@ -351,8 +348,11 @@ export default {
       }
     },
     // 弹窗
-    getNodeDes(data, title) {
+    getNodeDes(data, title, flag) {
       let type = '';
+      if (flag && !data.errMsg) {
+        return
+      }
       if (title == '楼层模型检查') {
         type = 'firstCheck'
       } else if (title == '建筑模型检查') {
@@ -752,21 +752,43 @@ export default {
           }
         }
         &.third-column {
-          width: 1544px;
+          width: 1946px;
           margin-left: 200px;
           #webDatabase {
+            & > div {
+              display: inline-block;
+              position: relative;
+              width: 130px;
+              height: 144px;
+              .column-up {
+                top: 158px;
+                left: 63px;
+                transform: scale(1.1);
+              }
+              .right-down {
+                left: 130px;
+                top: 103px;
+              }
+              &:nth-child(1) {
+                margin-left: 500px;
+              }
+              &:nth-child(2) {
+                margin-left: 672px;
+              }
+              &:nth-child(3) {
+                margin-left: 271px;
+              }
+            }
+          }
+          #dataCenterDatabase {
             width: 130px;
             height: 144px;
-            margin-left: 500px;
+            margin: 0 auto;
             .column-up {
               top: 158px;
-              left: 565px;
+              left: 165px;
               transform: scale(1.1);
             }
-            .right-down {
-              right: 560px;
-              top: 103px;
-            }
           }
           #webServer {
             border: 2px dashed #b8c5d0;
@@ -794,8 +816,11 @@ export default {
             .path4 {
               left: 1520px;
             }
+            .path5 {
+              left: 1923px;
+            }
             .del-model {
-              right: 517px;
+              right: 919px;
               top: 168px;
             }
           }
@@ -803,33 +828,9 @@ export default {
             margin: 48px 0 0 925px;
           }
         }
-        &.forth-column {
-          width: 335px;
-          margin-left: 70px;
-          margin-right: 87px;
-          #dataCenterDatabase {
-            width: 130px;
-            height: 144px;
-            margin: 0 auto;
-            .column-up {
-              top: 158px;
-              left: 165px;
-              transform: scale(1.1);
-            }
-          }
-          #dataCenterServer {
-            border: 2px dashed #b8c5d0;
-            margin-top: 240px;
-            padding: 16px 16px 0;
-            height: 270px;
-            .path1 {
-              top: 95px;
-              left: 311px;
-            }
-          }
-        }
         &.fifth-column {
           width: auto;
+          margin-left: 88px;
           .finish-item {
             margin-top: 403px;
           }
@@ -847,6 +848,7 @@ export default {
     width: 204px;
     height: 93px;
     padding: 10px;
+    cursor: pointer;
     i {
       position: absolute;
       font-size: 16px;