Kaynağa Gözat

Merge remote-tracking branch 'origin/dataType' into dataType

shaun-sheep 4 yıl önce
ebeveyn
işleme
35dce3214b

+ 0 - 2
src/components/business_space/newGraphy/graphy.vue

@@ -855,7 +855,6 @@ export default {
       }
       let pa = {
         content: [space],
-        // projection: ['state']
       }
       zoneUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
@@ -1181,7 +1180,6 @@ export default {
       zoneObj.floorId = this.buildFloor[1];
       let pa = {
         content: [zoneObj],
-        // projection: ['bimLocation', 'classCode', 'outline', 'height', 'buildingId', 'floorId']
       }
       if (!zoneObj.outline) {
         pa.nullItems = ['outline']

+ 5 - 4
src/components/ledger/handsontables/device.vue

@@ -26,7 +26,7 @@
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
     <!-- bim坐标弹框 -->
     <bimDialog :dialog="myDialog" :bimcodeobj="bimcodeobj" @closeBIM="closeBIM" :addBody="true"
-               ref="bimdialog"></bimDialog>
+               ref="bimdialog" :read="onlyRead ? true : false"></bimDialog>
     <!--      上传文件-->
     <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
                          :firmDataType="firmDataType"
@@ -1166,10 +1166,11 @@ export default {
             if (!this.onlyRead) {
                 const linkId = this.tableData[row.row].linkId;
                 if (!linkId) { //未关联资产
-                    this.$confirm('请先关联资产后再维护该信息!', '提示', {
-                        confirmButtonText: '确定',
+                    this.$confirm('您暂未关联设备对应的资产,该信息点不可编辑', '提示', {
+                        confirmButtonText: '我知道了',
                         showCancelButton: false,
-                        type: 'warning'
+                        type: 'warning',
+                        center: true
                     }).then(() => {
                         return false;
                     });

+ 8 - 2
src/components/ledger/lib/bimDialog.vue

@@ -22,7 +22,7 @@
         <p v-show='!isdata'>当前楼层暂无平面图,请前往“建筑楼层管理”中给楼层添加平面图</p>
       </div>
     </div>
-    <div slot='footer' class='footer'>
+    <div slot='footer' class='footer' v-if="!read">
       <el-button @click='handleClose'>取 消</el-button>
       <el-button type='primary' @click='save'>确 定</el-button>
     </div>
@@ -51,6 +51,10 @@ export default {
     bimcodeobj: {
       default: {},
     },
+    read: {
+      default: true,
+      type: Boolean
+    }
   },
   data() {
     return {
@@ -154,7 +158,9 @@ export default {
       }
       this.view.fitSceneToView()
       this.drawMainScene.isSpaceSelectable = false
-      this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
+      if (!this.read) {
+        this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
+      }
       if (this.floorData.outline && this.floorData.outline.length) {
         let newArr = this.floorData.outline.map((t) => {
           return new SPoint(t.X, t.Y)

+ 1 - 1
src/components/ledger/system/dialog/addCenoteDialog.vue

@@ -106,7 +106,7 @@ export default {
   methods: {
     //修改竖井类型
     changeCenote(value) {
-      this.cenoteType = value.Id
+      this.cenoteType = value.id
       this.getTableData()
     },
     // 显示弹窗

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

@@ -16,7 +16,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
                          min-width="100"></el-table-column>
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">

+ 5 - 13
src/components/ready/buildfloor/addConnectivity.vue

@@ -48,24 +48,16 @@ export default {
         floorId: this.floor.id,
         floorOtherIdList: []
       }
-      let flag = false
       arr.map(t => {
         if (t[1]) {
           param.floorOtherIdList.push(t[1])
-          flag = true
-        } else {
-          flag = false
         }
       })
-      if (flag) {
-        createRelationInFloor(param, res => {
-          this.connectDialogVis = false;
-          this.$message.success('关联成功');
-          this.$emit('refresh')
-        })
-      } else {
-        this.connectDialogVis = false;
-      }
+			createRelationInFloor(param, res => {
+				this.connectDialogVis = false;
+				this.$message.success('关联成功');
+				this.$emit('refresh')
+			})
     }
   }
 }

+ 4 - 3
src/views/ledger/facility/addfacility.vue

@@ -499,10 +499,11 @@ export default {
             if (!this.onlyRead) {
                 const linkId = this.tableData[row.row].linkId;
                 if (!linkId) { //未关联资产
-                    this.$confirm('请先关联资产后再维护该信息!', '提示', {
-                        confirmButtonText: '确定',
+                    this.$confirm('您暂未关联设备对应的资产,该信息点不可编辑', '提示', {
+                        confirmButtonText: '我知道了',
                         showCancelButton: false,
-                        type: 'warning'
+                        type: 'warning',
+                        center: true
                     }).then(() => {
                         return false;
                     });

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

@@ -315,8 +315,7 @@ export default {
 				filters: `classCode='${this.classCode}'`,
 				pageSize: this.pageSize,
 				orders: 'createTime desc, id desc',
-				pageNumber: this.pageNumber,
-				// projection: ['category', 'localName', 'localId', 'id', 'bimId', 'cADID', 'locationJson', 'bimLocation'],
+				pageNumber: this.pageNumber
 			}
 			if (this.buildId == 'noKnow') {
 				params.filters += `;buildingId isNull`

+ 4 - 3
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -421,10 +421,11 @@ export default {
       ) {
         const propertyId = this.tableData[row.row].propertyId;
         if (!propertyId) { //未关联资产
-            this.$confirm('请先关联资产再维护该信息!', '提示', {
-                confirmButtonText: '确定',
+            this.$confirm('您暂未关联设备对应的资产,该信息点不可编辑', '提示', {
+                confirmButtonText: '我知道了',
                 showCancelButton: false,
-                type: 'warning'
+                type: 'warning',
+                center: true
             }).then(() => {
                 return false;
             });

+ 4 - 3
src/views/ledger/facility/partsmanage/index.vue

@@ -565,10 +565,11 @@ export default {
         case 'infos.insuranceFile': //保险文件
             const propertyId = this.tableData[row.row].propertyId;
             if (!propertyId) { //未关联资产
-                this.$confirm('请先关联资产后再维护该信息!', '提示', {
-                    confirmButtonText: '确定',
+                this.$confirm('您暂未关联设备对应的资产,该信息点不可编辑', '提示', {
+                    confirmButtonText: '我知道了',
                     showCancelButton: false,
-                    type: 'warning'
+                    type: 'warning',
+                    center: true
                 }).then(() => {
                     return false;
                 });

+ 1 - 2
src/views/ready/buildfloor/drawGraphy/checkGraphy.vue

@@ -134,8 +134,7 @@ export default {
       }
       if (this.key) {
         let Param = {
-          Content: [{ FloorId: this.floor.FloorID, StructureInfo: { FloorMap: this.key } }],
-          Projection: ['FloorMap'],
+          content: [{ id: this.floor.FloorID, infos: { floorMap: this.key } }]
         }
         manageUpdateFloor(Param, (res) => {
           this.$message.success('更新成功')