Ver código fonte

添加14项目,测试问题修改

zhangyu 3 anos atrás
pai
commit
eb86396d9a

+ 2 - 2
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -143,7 +143,7 @@ export default {
             processTime && arr.push({
                 timestamp: processTime,
                 time: new Date(processTime).getTime(),
-                content: '开始执行任务',
+                content: '执行任务',
             })
             qrCodeTime && arr.push({
                 timestamp: qrCodeTime,
@@ -193,7 +193,7 @@ export default {
                 content: '确认信息',
                 title: '已确认的设备信息'
             })
-            return arr.map(i => ({ ...i })).sort((a, b) => b.time - a.time)
+            return arr.map(i => ({ ...i })).sort((a, b) => a.time - b.time)
         },
     },
     props: {

+ 2 - 2
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -176,7 +176,7 @@ export default {
             processTime && arr.push({
                 timestamp: processTime,
                 time: new Date(processTime).getTime(),
-                content: '开始执行任务',
+                content: '执行任务',
             })
             qrCodeTime && arr.push({
                 timestamp: qrCodeTime,
@@ -226,7 +226,7 @@ export default {
                 content: '确认信息',
                 title: '已确认的设备信息'
             })
-            return arr.map(i => ({ ...i })).sort((a, b) => b.time - a.time)
+            return arr.map(i => ({ ...i })).sort((a, b) => a.time - b.time)
         },
     },
     props: {

+ 1 - 1
src/components/ledger/details/detail/exhibitionEnergy.vue

@@ -43,7 +43,7 @@
             if (str.length > 8) {
               return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
             } else {
-              return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+                return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
             }
           }
         } else {

+ 1 - 1
src/components/ledger/system/table/cenoteTable.vue

@@ -36,7 +36,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            可前往“全部关系总览”中计算连通的其它竖井
+            可前往“全部关系总览”中,按系统内包含的设备与竖井关系计算
           </div>
         </template>
       </el-table>

+ 1 - 1
src/components/ledger/system/table/deviceTable.vue

@@ -34,7 +34,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            可前往“全部关系总览”中计算竖井内设备
+            可前往“全部关系总览”中计算系统内设备
           </div>
         </template>
       </el-table>

+ 2 - 2
src/components/ledger/system/table/spaceTable.vue

@@ -5,7 +5,7 @@
       <el-tooltip
         class="item"
         effect="dark"
-        content="可前往“全部关系总览”中,按系统内包含的设备与空间关系计算"
+        content="可前往“全部关系总览”中,按系统内包含的设备与业务空间关系计算"
         placement="right"
       >
         <el-button>按系统内设备与业务空间关系计算</el-button>
@@ -64,7 +64,7 @@
         <template slot="empty">
           <div style="height: 60%; transform: translateY(50%)">
             <i class="icon-wushuju iconfont"></i>
-            可前往“全部关系总览”中按系统内包含的设备业务空间关系计算
+            可前往“全部关系总览”中按系统内包含的设备业务空间关系计算
           </div>
         </template>
       </el-table>

+ 3 - 1
src/framework/layout/layout-store.js

@@ -24,7 +24,7 @@ export default {
       "system:role:query": true,
       "system:role:setOpts": true
     },
-    projectId: 'Pj1101051029',
+    projectId: '',
     group_code: '',
     projects: project["14"],
     breadcrumb: [],
@@ -57,6 +57,8 @@ export default {
         let pid = storage.get(KEY_PROJECT_SELECTED)
         if (pid) {
           state.projectId = pid
+        } else if (state.projects && state.projects.length) {
+            state.projectId = state.projects[0].id
         }
       }
       return state.projectId

+ 30 - 2
src/framework/layout/project.js

@@ -176,13 +176,41 @@ const project = {
       pwd: "saga123456",
       group_code: "XG"
     },
-
     {
       id: "Pj1101050013",
       name: "BIM测试项目_亚投行",
       pwd: "saga123456",
       group_code: "BT"
-
+    },
+    {
+      id: "Pj4403050002",
+      name: "深圳万象天地",
+      pwd: "saga123456",
+      group_code: "HR"
+    },
+    {
+      id: "Pj4501030002",
+      name: "南宁万象城",
+      pwd: "saga123456",
+      group_code: "HR"
+    },
+    {
+      id: "Pj3101150007",
+      name: "上海森兰花园城",
+      pwd: "saga123456",
+      group_code: "ZS"
+    },
+    {
+      id: "Pj3201130004",
+      name: "招商南京燕子矶花园城项目",
+      pwd: "saga123456",
+      group_code: "ZS"
+    },
+    {
+      id: "Pj4403050019",
+      name: "招商IOC广场",
+      pwd: "saga123456",
+      group_code: "ZS"
     },
     {
       id: "Pj1101080259",

+ 2 - 1
src/views/ledger/facility/addfacility.vue

@@ -194,6 +194,7 @@ export default {
     },
     // 创建设备数据
     async handleCreateTableData() {
+        debugger
       let newData = this.tableData.filter(item => {
         let keys = Object.keys(item);
         keys.map(key => {
@@ -213,7 +214,7 @@ export default {
       }
       let flag = false;
       newData.map(item => {
-        if (item.checked && !item.localName) {
+        if (!item.localName) {
           flag = true;
         }
         // 处理建筑-楼层

+ 32 - 30
src/views/model/report/deleted.vue

@@ -212,37 +212,39 @@ export default {
     getGraphy() {// 绘制空间位置图片
       console.log(this.i);
       let can = this.$refs.canvas;
-      let modelId = can[this.i].dataset.modelid
-      let that = this;
-      that.clearGraphy(this.i)
-      that.scene = new LocationPointScene();
-      this.canvasLoading = true;
-      that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
-        that.canvasLoading = false;
-        if (res == 'error') {
-          this.FloorMap = '';
-          console.log('数据解析异常');
-          return;
-        }
-        let EquipID = can[this.i].dataset.equipid;
-        let X = Number(can[this.i].dataset.x);
-        let Y = can[this.i].dataset.y * -1;
-        that.view.scene = that.scene;
-        this.scene.addMarker({
-          Id: EquipID,
-          X: X,
-          Y: Y
+      if (can && can.length) {
+        let modelId = can[this.i].dataset.modelid
+        let that = this;
+        that.clearGraphy(this.i)
+        that.scene = new LocationPointScene();
+        this.canvasLoading = true;
+        that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
+            that.canvasLoading = false;
+            if (res == 'error') {
+            this.FloorMap = '';
+            console.log('数据解析异常');
+            return;
+            }
+            let EquipID = can[this.i].dataset.equipid;
+            let X = Number(can[this.i].dataset.x);
+            let Y = can[this.i].dataset.y * -1;
+            that.view.scene = that.scene;
+            this.scene.addMarker({
+            Id: EquipID,
+            X: X,
+            Y: Y
+            })
+            that.view.fitSceneToView();
+            that.view.scalable = false;
+            this.scene.isSpaceSelectable = false;
+            this.i++;
+            if (this.i !== this.pageData.length) {
+            this.$nextTick(() => {
+                this.getGraphy();
+            })
+            }
         })
-        that.view.fitSceneToView();
-        that.view.scalable = false;
-        this.scene.isSpaceSelectable = false;
-        this.i++;
-        if (this.i !== this.pageData.length) {
-          this.$nextTick(() => {
-            this.getGraphy();
-          })
-        }
-      })
+      }
     },
     clearGraphy(i) {
       // if (this.view && this.view.scene) {

+ 4 - 5
src/views/model/report/index.vue

@@ -315,7 +315,7 @@ export default {
         let equipComDelList = [],
           toBeAdded = []
         this.equipComDelList = [];
-        this.equipComAddList = [];
+        this.equipComAddMap = {};
         this.LostFloorName.forEach(item => {
           if (item.CurrentModelId) {
             equipComDelList.push({
@@ -326,11 +326,11 @@ export default {
             item.flag = 'lost';
             item.FloorName = `${item.Note + item.FloorName}`
           }
-          if (item.Id) {
+          if (item.Id && item.CurrentModelId) {
             toBeAdded.push({
               modelId: item.Id
             })
-            this.equipComAddList.push(item.Id)
+            this.equipComAddMap[item.Id] = item.CurrentModelId;
           }
         })
         let params = {
@@ -399,8 +399,7 @@ export default {
         window.open(jumpRouter.href, '_blank')
       },
       supplement() {// 点击模型待补充的设备
-        let equipComAddList = encodeURIComponent(JSON.stringify(this.equipComAddList));
-        let jumpRouter = this.$router.resolve({ path: '/model/report/supplement', query: { equipComDelList: equipComAddList } })
+        let jumpRouter = this.$router.resolve({ path: '/model/report/supplement', query: this.equipComAddMap })
         window.open(jumpRouter.href, '_blank')
       },
       getExportReport() {// 导出模型问题报告

+ 35 - 33
src/views/model/report/supplement.vue

@@ -24,7 +24,7 @@
           <p>平面图上的位置:<span>{{ item.local | localTransformation }}</span></p>
           <div class="img-box">
             <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"
-                    :data-modelid="item.modelId"
+                    :data-modelid="equipComAddMap[item.modelId]"
                     :data-equipid='item.id' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
           </div>
         </div>
@@ -63,7 +63,7 @@ export default {
   data() {
     return {
       pageData: [],
-      equipComDelList: null,
+      equipComAddMap: null,
       canvasWidth: 400,
       canvasHeight: 280,
       scene: '',
@@ -116,7 +116,7 @@ export default {
     })
   },
   created() {
-    this.equipComDelList = decodeURIComponent(this.$route.query.equipComDelList);
+    this.equipComAddMap = this.$route.query;
   },
   computed: {
     ...mapGetters('layout', ['projectId'])
@@ -151,7 +151,7 @@ export default {
     },
     getToBeSuppement() {
       let params = {
-        filters: `modelId in ${this.equipComDelList}`,
+        filters: `modelId in ${JSON.stringify(Object.keys(this.equipComAddMap))}`,
         pageNumber: this.page.pageNumber,
         pageSize: this.page.pageSize
       }
@@ -168,7 +168,6 @@ export default {
             this.getGraphy();
           })
         }
-        // this.pageData = res.Content;
         this.pageData.forEach(item => {
           if (item.bimLocation) {
             let local = {};
@@ -198,35 +197,38 @@ export default {
     getGraphy() {// 绘制空间位置图片
       let can = this.$refs.canvas;
       let that = this;
-      let modelId = can[this.i].dataset.modelid;
-      that.clearGraphy(this.i)
-      that.scene = new LocationPointScene();
-      this.canvasLoading = true;
-      that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
-        that.canvasLoading = false;
-        if (res == 'error') {
-          this.FloorMap = '';
-          console.log('数据解析异常');
-          return;
-        }
-        let equipId = can[this.i].dataset.equipid;
-        let X = Number(can[this.i].dataset.x);
-        let Y = can[this.i].dataset.y * -1;
-        that.view.scene = that.scene;
-        this.scene.addMarker({
-          Id: equipId,
-          X: X,
-          Y: Y
+      if (can && can.length) {
+        let modelId = can[this.i].dataset.modelid;
+        that.clearGraphy(this.i)
+        that.scene = new LocationPointScene();
+        this.canvasLoading = true;
+        that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
+            that.canvasLoading = false;
+            if (res == 'error') {
+            this.FloorMap = '';
+            console.log('数据解析异常');
+            return;
+            }
+            let equipId = can[this.i].dataset.equipid;
+            let X = Number(can[this.i].dataset.x);
+            let Y = can[this.i].dataset.y * -1;
+            that.view.scene = that.scene;
+            this.scene.addMarker({
+            Id: equipId,
+            X: X,
+            Y: Y
+            })
+            that.view.fitSceneToView();
+            that.view.scalable = false;
+            this.scene.isSpaceSelectable = false;
+            this.i++;
+            if (this.i !== this.pageData.length) {
+            this.$nextTick(() => {
+                this.getGraphy();
+            })
+            }
         })
-        that.view.fitSceneToView();
-        this.scene.isSpaceSelectable = false;
-        this.i++;
-        if (this.i !== this.pageData.length) {
-          this.$nextTick(() => {
-            this.getGraphy();
-          })
-        }
-      })
+      }
     },
     clearGraphy(i) {
       this.view = new FloorView(`canvas${i}`)