Explorar o código

修改 BIM模型中轮廓坐标的展示

shaun-sheep %!s(int64=4) %!d(string=hai) anos
pai
achega
2058048c4e

+ 44 - 39
src/components/business_space/business/handsontable.vue

@@ -69,44 +69,44 @@
   </div>
 </template>
 <script>
-// 引用handsontable插件
-import "@/assets/js/chosen.jquery.min";
-import tools from "@/utils/scan/tools";
-import "@/assets/js/handsontable-chosen-editor";
-import lStorage from '@/utils/localStorage'
-import myPagination from "@/components/common/myPagination";
-import addBusiness from "@/components/business_space/dialogs/addDialog/businessDialog"
-import showTools from "@/utils/handsontable/notShow"
-import handsonUtils from "@/utils/hasontableUtils"
-import Handsontable from "handsontable-pro"
-import buildFloor from '@/utils/handsontable/buildFloorData'
-import spaceCascader from '@/components/ledger/lib/spaceSelect'
-import 'handsontable-pro/dist/handsontable.full.css'
-import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
-import qrcode from "@/components/ledger/lib/qrcode";
-import {
-  BeatchQueryParam,
-  handleZoneUpdateBd,
-  queryAllZoneType,
-  zoneCreate,
-  zoneDelete,
-  zoneQuery,
-  zoneUpdate
-} from "@/api/scan/request";
-import { mapGetters } from "vuex";
-import dialogZone from "../../ledger/addDialog/dialogZone";
+  // 引用handsontable插件
+  import "@/assets/js/chosen.jquery.min";
+  import tools from "@/utils/scan/tools";
+  import "@/assets/js/handsontable-chosen-editor";
+  import lStorage from '@/utils/localStorage'
+  import myPagination from "@/components/common/myPagination";
+  import addBusiness from "@/components/business_space/dialogs/addDialog/businessDialog"
+  import showTools from "@/utils/handsontable/notShow"
+  import handsonUtils from "@/utils/hasontableUtils"
+  import Handsontable from "handsontable-pro"
+  import buildFloor from '@/utils/handsontable/buildFloorData'
+  import spaceCascader from '@/components/ledger/lib/spaceSelect'
+  import 'handsontable-pro/dist/handsontable.full.css'
+  import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
+  import qrcode from "@/components/ledger/lib/qrcode";
+  import {
+    BeatchQueryParam,
+    handleZoneUpdateBd,
+    queryAllZoneType,
+    zoneCreate,
+    zoneDelete,
+    zoneQuery,
+    zoneUpdate
+  } from "@/api/scan/request";
+  import {mapGetters} from "vuex";
+  import dialogZone from "../../ledger/addDialog/dialogZone";
 
-export default {
-  props: {
-    id: {},
-    zoneCode: {},
-    otherType: String
-  },
-  components: {
-    qrcode, //二维码页面
-    myPagination,
-    addBusiness,
-    uploadImgDialog,
+  export default {
+    props: {
+      id: {},
+      zoneCode: {},
+      otherType: String
+    },
+    components: {
+      qrcode, //二维码页面
+      myPagination,
+      addBusiness,
+      uploadImgDialog,
     dialogZone,
     spaceCascader,
   },
@@ -174,7 +174,7 @@ export default {
       imgsArr: [], //空间图片
       OtherList: [],//其他分区筛选框
       OtherValue: '',
-      addData: {}, 
+      addData: {},
     };
   },
   created() {
@@ -266,8 +266,12 @@ export default {
           } else if (item.hasOwnProperty("BuildingId") && !item.hasOwnProperty("FloorId")) {
             item.flowBuild = item.BuildingId
           }
+          if(item.Outline) {
+            item.Outline = JSON.stringify(item.Outline)
+          }
           return item
         });
+
         if (this.main && this.main.length && this.main[0].RoomID) {
           this.copyMain = tools.deepCopy(this.main);
           if (this.onlyRead) {
@@ -425,7 +429,7 @@ export default {
       let val = this.hot.colToProp(row.col);
       this.row = row.row;
       let inputData = this.inputMap[val];
-      lStorage.set('screen_data', { path: this.$route.path, data: { RoomID: infos.RoomID, zone: this.zoneCode } })
+      lStorage.set('screen_data', {path: this.$route.path, data: {RoomID: infos.RoomID, zone: this.zoneCode}})
       if (val == "point") {
         let query = {
           RoomID: infos.RoomID,
@@ -451,6 +455,7 @@ export default {
           this.myDialog.uploadImgs = true;
         }
       }
+
       if (!this.onlyRead && !inputData.Editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;

+ 7 - 3
src/views/model/report/index.vue

@@ -26,8 +26,12 @@
       </div>
       <div class="content-box">
         <div class="button">
-          <el-button @click="del" :plain="toBeDelCount?false:true" :disabled="toBeDelCount?false:true">需从模型中删除的设备</el-button>
-          <el-button @click="supplement" :plain="toBeSuppCount?false:true" :disabled="toBeSuppCount?false:true">模型待补充的设备</el-button>
+          <el-button @click="del" :plain="toBeDelCount?false:true" :disabled="toBeDelCount?false:true"
+                     :title="toBeDelCount ? '没有待删除的设备':''">需从模型中删除的设备
+          </el-button>
+          <el-button @click="supplement" :plain="toBeSuppCount?false:true" :disabled="toBeSuppCount?false:true"
+                     :title="toBeSuppCount ? '没有待补充的设备':''">模型待补充的设备
+          </el-button>
           <el-button type="info" :loading="load" @click='getExportReport'>导出模型问题报告</el-button>
         </div>
         <div class="table"
@@ -218,7 +222,6 @@
   },
   methods: {
     cellStyle({row, column, rowIndex, columnIndex}) {
-      console.log(row, column.label, '=====')
       if (column.label !== '模型楼层' && column.label !== '待删除设备数量' && column.label !== '待补充设备数量' && column.label !== '有问题的检查项') {
         return {
           background: '#f3f3f3',
@@ -343,6 +346,7 @@
         this.toBeDelCount = 0;
         this.toBeSuppCount = 0;
         res.Content.forEach(item => {
+
           if (item.Count > 0) {
             this.toBeDelCount += 1;
           }