Bladeren bron

Merge branch 'dataType' of http://39.106.8.246:3003/web/adm into dataType

haojianlong 4 jaren geleden
bovenliggende
commit
a2c4582291

+ 1 - 1
src/api/scan/request.js

@@ -905,7 +905,7 @@ export function shaftSpaceQuery(param, success) {
 
 //获取未和当前竖井关联的业务空间
 export function shaftUnlinkSpaceQuery(param, success) {
-  let url = `${baseUrl}${shaft}/un-shaft-zoneSpaceBaseTable?ShaftId=${param.ShaftId}`
+  let url = `${baseUrl}${shaft}/un-shaft-zoneSpaceBaseTable?shaftId=${param.ShaftId}`
   http.postJson(url, param.data, success)
 }
 

+ 20 - 20
src/components/ledger/cenote/dialog/addSpaceDialog.vue

@@ -21,18 +21,18 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            {{scope.row.RoomLocalName||scope.row.RoomName||''}}
+            {{scope.row.localName||scope.row.name||''}}
           </template>
         </el-table-column>
         <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop :label="`所属建筑楼层`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.BuildingId && floorType[scope.row.BuildingId]? ((floorType[scope.row.BuildingId] || '') + (scope.row.FloorId && floorType[scope.row.FloorId] ? (' - ' + floorType[scope.row.FloorId] || '') : '')) : ''}}
+            {{ scope.row.buildingId && floorType[scope.row.buildingId]? ((floorType[scope.row.buildingId] || '') + (scope.row.floorId && floorType[scope.row.floorId] ? (' - ' + floorType[scope.row.floorId] || '') : '')) : ''}}
           </template>
         </el-table-column>
-        <el-table-column prop="ObjectType" :label="`空间类型`" show-overflow-tooltip min-width="100">
+        <el-table-column prop="classCode" :label="`空间类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            {{spaceType[scope.row.ObjectType] || ''}}
+            {{spaceType[scope.row.classCode] || ''}}
           </template>
         </el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      title: "添加系统所在业务空间",
+      title: "添加竖井所在业务空间",
       keycode: "", //输入查询条件
       inSpaceType: "业务空间",
       Buildfloor: ["all"], // 选中的建筑楼层
@@ -125,32 +125,32 @@ export default {
     getTableData() {
       let params = {
         data: {
-          Filters: "not RoomID isNull",
-          Orders: "localName desc",
-          PageNumber: this.page.pageNumber,
-          PageSize: this.page.pageSize
+          filters: "not id isNull",
+          orders: "localName desc",
+          pageNumber: this.page.pageNumber,
+          pageSize: this.page.pageSize
         },
         ShaftId: this.$route.query.ShaftId
       };
       if (this.Buildfloor[0] == "noKnow") {
-        params.data.Filters += `;buildingId isNull`;
+        params.data.filters += `;buildingId isNull`;
       } else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
-        params.data.Filters += `;buildingId='${this.Buildfloor[0]}'`;
+        params.data.filters += `;buildingId='${this.Buildfloor[0]}'`;
       }
       if (this.Buildfloor[1] == "noKnow") {
-        params.data.Filters += `;floorId isNull`;
+        params.data.filters += `;floorId isNull`;
       } else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
-        params.data.Filters += `;floorId='${this.Buildfloor[1]}'`;
+        params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
       }
       if (this.Spacecategory) {
-        params.data.Filters += `;ObjectType='${this.Spacecategory}'`;
+        params.data.filters += `;classCode='${this.Spacecategory}'`;
       }
       if (this.keycode != "") {
-        params.data.Filters += `;RoomName contain '${this.keycode}' or RoomLocalName contain '${this.keycode}'`;
+        params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}'`;
       }
       shaftUnlinkSpaceQuery(params, res => {
-        this.tableData = res.Content;
-        this.page.total = res.Total;
+        this.tableData = res.content;
+        this.page.total = res.total;
       });
     },
     handleClose() {
@@ -165,9 +165,9 @@ export default {
         let params = {
           Content: this.selections.map(item => {
             return {
-              SpaceID: item.RoomID,
-              ShaftId: this.$route.query.ShaftId,
-              ObjectType: item.ObjectType
+              spaceID: item.id,
+              shaftId: this.$route.query.ShaftId,
+              objectType: item.classCode
             };
           })
         };

+ 4 - 4
src/components/ledger/cenote/relatedSpaceList.vue

@@ -23,7 +23,7 @@
         </el-table-column>
         <el-table-column prop='localId' label='业务空间本地编码' show-overflow-tooltip min-width="200" header-align='center' align="center">
         </el-table-column>
-        <el-table-column v-if="!$route.query.onlyRead" label='操作' show-overflow-tooltip min-width="90" header-align='center' align='center'>
+        <el-table-column v-if="$route.query.onlyRead !== 'true'" label='操作' show-overflow-tooltip min-width="90" header-align='center' align='center'>
           <template slot-scope="scope">
             <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain icon="el-icon-delete"></el-button>
           </template>
@@ -116,11 +116,11 @@ export default {
           let params = {
             data: [
               {
-                ShaftId: this.$route.query.ShaftId,
-                SpaceId: row.RoomID
+                shaftId: this.$route.query.ShaftId,
+                spaceId: row.id
               }
             ],
-            type: row.ObjectType
+            type: row.classCode
           };
           this.deleteSpInSh(params);
         })

+ 7 - 0
src/components/ledger/lib/cenoteGraphy.vue

@@ -195,6 +195,13 @@ export default {
         this.scene.removeAllZone();
         this.scene.addZoneList(tempArr);
         this.scene.click(this, this.canvasClick);
+        if (this.config.isEdit) {
+            this.scene.zoneList.map(t => {
+                t.selected = t.highLightFlag;
+                t.transparency = 20;
+                t.highLightFlag = false;
+            })
+        }
         this.canvasLoading = false;
       })
     },

+ 1 - 0
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -191,6 +191,7 @@ export default {
     // 替换模型文件成功
     refresh(modelId,pa) {
       this.modelId = modelId
+      this.currentModelId = pa.id;
       this.hasGraph = true;
       const temp = this.modelId.split('.');
       if (temp[1]) {