Browse Source

拓扑图;模型图修改

haojianlong 4 years ago
parent
commit
c325e225e0

+ 1 - 1
package.json

@@ -23,7 +23,7 @@
     "@saga-web/cad-engine": "2.0.560",
     "@saga-web/draw": "2.1.75",
     "@saga-web/graphy": "2.1.47",
-    "@saga-web/topology": "1.0.82",
+    "@saga-web/topology": "1.0.83",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

+ 6 - 4
src/components/model/file/nodeDialog.vue

@@ -6,14 +6,14 @@
         <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" v-if="!t.check"></i>
-            <i class="el-icon-close" v-else></i>
+            <i class="el-icon-check" v-if="show&&!t.check"></i>
+            <i class="el-icon-close" v-if="show&&t.check"></i>
             {{t.name}}
           </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>
+            <i class="el-icon-check" v-if="show&&!t.check"></i>
+            <i class="el-icon-close" v-if="show&&t.check"></i>
             {{t.name}}
           </p>
         </div>
@@ -64,6 +64,7 @@ export default {
           notCheckList: [],
         }
       },
+      show: false,
       errMsg: '',
       checkType: ''
     };
@@ -73,6 +74,7 @@ export default {
       this.errMsg = msg.ErrorMsg || '';
       this.checkType = type || '';
       this.title = title
+      this.show = msg.BeginTime
       if (type) {
         this.check[type].checkList.forEach(t => {
           if (t.value && t.value == 'GridCheck') {

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

@@ -3,7 +3,7 @@
     :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-if="!data.BeginTime" class="iconfont icon-iconfontgengduo" style="color:#6f6f6f"></i>
       <i v-else-if="data.BeginTime&&!data.EndTime" class="iconfont icon-conduct" style="color:#409eff"></i>
       <i v-else class="el-icon-success" style="color:#67C23A"></i>
       {{title}}

+ 10 - 5
src/views/business_space/dataUtil/topology.vue

@@ -9,16 +9,21 @@
         <el-button size="mini" @click="saveGraphy" icon="el-icon-notebook-2">保存</el-button>
       </div>
       <div title="划线">
-        <el-button size="mini" @click="drawline" icon="el-icon-edit">添加关系</el-button>
+        <el-button size="mini" @click="drawline" icon="el-icon-edit">连线</el-button>
       </div>
-      <div title="适配底图">
+      <!-- <div title="适配底图">
         <el-button size="mini" @click="fitClick" icon="el-icon-crop">适配底图</el-button>
-      </div>
-      <div title="添加item">
-        <div v-for="(t,i) in equipList" :key="t.ID" @click="additem(i)" class="equip">
+      </div> -->
+      <div>
+        <div v-for="(t,i) in equipList" :key="t.ID" @click="additem(i)" class="equip" title="添加item">
           <img :src="t.ImgSource" />
         </div>
       </div>
+      <div>
+        <p>使用说明:</p>
+        <p>双击连线添加折点</p>
+        <p>alt+左键删除折点</p>
+      </div>
     </el-aside>
     <el-main>
       <div ref="graphy" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"

+ 4 - 0
src/views/model/file/pathcontrol/index.vue

@@ -13,6 +13,10 @@
         <span>模型处理完成时间:</span>
         <span>{{SaveLog.EndTime}}</span>
       </div>
+      <div style="width:200px">
+        <span>模型文件大小:</span>
+        <span>{{(Size/1000/1024).toFixed(1)}}M</span>
+      </div>
     </el-row>
     <el-row class="path-pic">
       <div id="path-container">