فهرست منبع

1.模型版本信息加载过程中添加loading态;2.资产关系还原通过Excel维护关系入口;3.消息中心不再显示用来驱动页面刷新的消息

zhangyu 5 سال پیش
والد
کامیت
5b8f934972

+ 9 - 5
src/components/model/file/versionDialog.vue

@@ -1,11 +1,11 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialog" :before-close="handleClose" width="900px">
-    <div class="content">
+    <div v-loading="loading" class="content">
       <el-scrollbar style="height:100%;">
         <span>上传人:{{versionData.userName}}</span>
         <span style="marginLeft:30px;">上传时间:{{versionData.acceptTime}}</span>
         <p style="marginTop:15px;">更新内容:</p>
-        <!-- <div v-if="Object.keys(versionData.createData).length || Object.keys(versionData.deleteData).length"> -->
+        <div v-if="Object.keys(versionData.createData).length || Object.keys(versionData.deleteData).length">
           <el-divider v-if="Object.keys(versionData.createData).length">新增设备概要内容</el-divider>
           <p v-if="Object.keys(versionData.createData).length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,新增设备实例如下:</p>
           <p v-for="(item, key) in versionData.createData" :key="'C'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
@@ -22,13 +22,13 @@
             <p>【{{mapType[key]}}】</p>
             <p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
           </div>
-        <!-- </div> -->
-        <!-- <div v-else>
+        </div>
+        <div v-else>
           <div style="height: 60%;transform: translateY(50%);font-weight: normal;font-size: 12px;text-align: center;color: #909399;">
             <i class="icon-wushuju iconfont"></i>
             数据暂无
           </div>
-        </div> -->
+        </div>
       </el-scrollbar>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -59,6 +59,7 @@ export default {
   data() {
     return {
       title: "版本文件信息",
+      loading: true,
       versionData: {
         userName: '',
         acceptTime: '',
@@ -112,6 +113,7 @@ export default {
               }
             }
           });
+          this.loading = false;
           this.$forceUpdate();
         })
         console.log(this.versionData)
@@ -140,6 +142,7 @@ export default {
               }
             }
           });
+          this.loading = false;
           this.$forceUpdate();
         })
         console.log(this.versionData)
@@ -150,6 +153,7 @@ export default {
     dialogVisible: {
       handler() {
         if (this.dialogVisible) {
+          this.loading = true;
           this.versionData = {
             userName: '',
             acceptTime: '',

+ 4 - 4
src/components/relation/overview/CardList.vue

@@ -255,10 +255,10 @@
         if (Manual === 3) {
           if (relation.RelationType) {
             this.values = {...this.values, optionTips, lastTime}
-            // this.$refs.maintain.dialogManualOption = true //导出excel 弹窗
-            this.$router.push({
-              path:"relationShip"
-            })
+            this.$refs.maintain.dialogManualOption = true //导出excel 弹窗
+            // this.$router.push({
+            //   path:"relationShip"
+            // })
           } else {
             this.$message.warning("设计中")
             return false

+ 1 - 1
src/framework/components/messagesever/msgAllDetails.vue

@@ -109,7 +109,7 @@ export default {
             Name: "project"
           }
         ],
-        Filters: `UserId='${this.userId}'`,
+        Filters: `UserId='${this.userId}';Type!='Refresh'`,
         Orders: "CreateTime desc, Id asc",
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize