zhangyu il y a 4 ans
Parent
commit
65b5b9e812

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

@@ -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;
                     });

+ 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

@@ -500,10 +500,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;
                     });

+ 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;
                 });