Kaynağa Gözat

修改总览显示文案,现场验证任务-创建任务时,设备对象上的信息未获取并存在任务中

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

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

@@ -13,7 +13,7 @@
           <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
           <el-form-item label="资产本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
           <el-form-item label="资产本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
-          <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
+          <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
           <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
@@ -36,8 +36,8 @@
               <div class="demo-image__preview">
                 <el-image style="width:100%;" v-for="item in imgList"
                  :key="item.Key" :title="item.Name"
-                 @click="nowUrl = item.Key" 
-                 :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}&width=400`" 
+                 @click="nowUrl = item.Key"
+                 :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}&width=400`"
                  :preview-src-list="srcList">
                 </el-image>
               </div>
@@ -237,4 +237,4 @@ export default {
     cursor: pointer;
   }
 }
-</style>
+</style>

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

@@ -15,7 +15,7 @@
           <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
           <el-form-item label="设备本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
           <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
-          <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
+          <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
           <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>

+ 2 - 2
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -10,8 +10,8 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="EquipLocalName" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipLocalName" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="EquipFamily.FamilyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="InstallLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

+ 2 - 2
src/components/ready/buildfloor/modelFile.vue

@@ -81,7 +81,7 @@ export default {
             this.pushChild(option.children, arr, Code)
           }
         }
-      })    
+      })
     },
     //改变item
     handleChange(value) {
@@ -104,4 +104,4 @@ export default {
             font-size: 14px;
         }
     }
-</style>
+</style>

+ 2 - 2
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -152,8 +152,8 @@
           label: '本地名称'
         }],
         codeValue: '',
-        MainObject: `(限制条件:${localStorage.getItem('MainObject') || '无'} )类型`,
-        FromObject: `(限制条件:${localStorage.getItem('FromObject') || '无'} )类型`,
+        MainObject: `(限制条件:${localStorage.getItem('MainObject') || '无'} )`,
+        FromObject: `(限制条件:${localStorage.getItem('FromObject') || '无'} )`,
         ruleForm: {
           main: '',
           codeList: [{

+ 111 - 108
src/views/ready/buildfloor/drawGraphy/checkGraphy.vue

@@ -19,125 +19,128 @@
   </el-dialog>
 </template>
 <script>
-import drawFloor from "./drawFloor";
-import { mapGetters, mapActions } from "vuex";
-import request from "@/api/model/file.js";
-import { bindFloorModel } from "@/api/model/file";
-export default {
-  components: {
-    drawFloor
-  },
-  computed: {
-    ...mapGetters("layout", ["projectId"])
-  },
-  props: {
-    alreadyRelatedModel: {
-      default: []
-    }
-  },
-  data() {
-    return {
-      casVal: [],
-      jsonKey: "", //map.josn
-      checkGraphyVisible: false,
-      options: [],
-      floor: {}, // 当前选中的楼层数据
-      modelIdToFloorId: {}
-    };
-  },
-  methods: {
-    // 弹窗显示
-    showDialog(floor) {
-      this.floor = floor;
-      this.checkGraphyVisible = true;
+  import drawFloor from "./drawFloor";
+  import {mapGetters} from "vuex";
+  import request from "@/api/model/file.js";
+  import {bindFloorModel} from "@/api/model/file";
+
+  export default {
+    components: {
+      drawFloor
     },
-    // 关闭弹窗
-    handleClose() {
-      this.checkGraphyVisible = false;
-      this.casVal = []
-      this.$refs.drawFloorDialog.clearGraphy()
+    computed: {
+      ...mapGetters("layout", ["projectId"])
     },
-    // 更新楼层 平面图文件
-    bindGraphy() {
-      if (!this.jsonKey) {
-        this.$message.warning("请选择模型文件");
-        return
-      }
-      if (this.alreadyRelatedModel.indexOf(this.modelIdToFloorId[this.jsonKey]) > -1) {
-        this.$message.warning('此模型已关联该建筑下的楼层');
-        return;
+    props: {
+      alreadyRelatedModel: {
+        default: []
       }
-      let pa = {
-        FloorId: this.floor.FloorID,
-        Id: this.modelIdToFloorId[this.jsonKey],
-        BuildingId: this.floor.BuildID,
-        Cover: true
-      };
-      bindFloorModel(pa, res => {
-        this.$message.success("更新成功");
-        this.handleClose()
-        this.$emit('refresh', this.jsonKey)
-      });
-    },
-    // 点击多级联动
-    handleChange(val) {
-      this.$refs.drawFloorDialog.initGraphy(val[1], 1)
-      this.jsonKey = val[1]
     },
-    // 通过id查询文件夹下模型文件
-    handleItemChange(val) {
-      let data = {
-        FolderId: val[0],
-        Status: '4',
-        ProjectId: this.projectId
+    data() {
+      return {
+        casVal: [],
+        jsonKey: "", //map.josn
+        checkGraphyVisible: false,
+        options: [],
+        floor: {}, // 当前选中的楼层数据
+        modelIdToFloorId: {}
       };
-      request.queryFloorList(data, res => {
-        let tempArr = res.Content.map(t => {
-          this.modelIdToFloorId[t.CurrentModelId] = t.Id;
-          return {
-            value: t.CurrentModelId,
-            label: t.FloorName
-          }
-        })
-        this.pushChild(this.options, tempArr, val[0])
-      })
     },
-    // 将模型文件list填到相应的文件夹下
-    pushChild(options, arr, Code) {
-      options.map(option => {
-        if (option.value == Code) {
-          option.children = arr;
-        } else {
-          if (option.children) {
-            this.pushChild(option.children, arr, Code)
-          }
+    methods: {
+      // 弹窗显示
+      showDialog(floor) {
+        this.floor = floor;
+        this.checkGraphyVisible = true;
+      },
+      // 关闭弹窗
+      handleClose() {
+        this.checkGraphyVisible = false;
+        this.casVal = []
+        this.$refs.drawFloorDialog.clearGraphy()
+      },
+      // 更新楼层 平面图文件
+      bindGraphy() {
+        if (!this.jsonKey) {
+          this.$message.warning("请选择模型文件");
+          return
         }
-      })    },
-    init() {
-      this.getDirectory()
-    },
-    // 获取文件夹
-    getDirectory() {
-      request.queryModel("", res => {
-        this.options = res.Content.map(t => {
-          return {
-            value: t.Id,
-            label: t.Name,
-            children: []
+        if (this.alreadyRelatedModel.indexOf(this.modelIdToFloorId[this.jsonKey]) > -1) {
+          this.$message.warning('此模型已关联该建筑下的楼层');
+          return;
+        }
+        let pa = {
+          FloorId: this.floor.FloorID,
+          Id: this.modelIdToFloorId[this.jsonKey],
+          BuildingId: this.floor.BuildID,
+          Cover: true
+        };
+        bindFloorModel(pa, res => {
+          this.$message.success("更新成功");
+          this.handleClose()
+          this.$emit('refresh', this.jsonKey)
+        });
+      },
+      // 点击多级联动
+      handleChange(val) {
+        this.$refs.drawFloorDialog.initGraphy(val[1], 1)
+        this.jsonKey = val[1]
+      },
+      // 通过id查询文件夹下模型文件
+      handleItemChange(val) {
+        let data = {
+          FolderId: val[0],
+          Status: '4',
+          ProjectId: this.projectId
+        };
+        request.queryFloorList(data, res => {
+          let tempArr = res.Content.map(t => {
+            this.modelIdToFloorId[t.CurrentModelId] = t.Id;
+            return {
+              value: t.CurrentModelId,
+              label: t.FloorName
+            }
+          })
+          console.log(tempArr,'tempArr')
+          this.pushChild(this.options, tempArr, val[0])
+        })
+      },
+      // 将模型文件list填到相应的文件夹下
+      pushChild(options, arr, Code) {
+        options.map(option => {
+          if (option.value == Code) {
+            option.children = arr;
+          } else {
+            if (option.children) {
+              this.pushChild(option.children, arr, Code)
+            }
           }
         })
-      });
+      },
+      init() {
+        this.getDirectory()
+      },
+      // 获取文件夹
+      getDirectory() {
+        request.queryModel("", res => {
+          this.options = res.Content.map(t => {
+            return {
+              value: t.Id,
+              label: t.Name,
+              children: []
+            }
+          })
+        });
+      },
     },
-  },
-  created() {
-    this.init()
-  },
-  watch: {
-    projectId() {
+    created() {
       this.init()
+    },
+    watch: {
+      projectId() {
+        this.init()
+      }
     }
-  }
-};
+  };
 </script>
 <style lang="less">
 #checkGraphy {
@@ -151,4 +154,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 2 - 2
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -29,7 +29,7 @@ export default {
   },
   data() {
     return {
-      modelId: "", // 
+      modelId: "", //
       isEdit: false, // 是否编辑模式
       file: {},
       alreadyRelatedModel: [],
@@ -154,4 +154,4 @@ export default {
     height: calc(100% - 40px);
   }
 }
-</style>
+</style>

+ 2 - 2
src/views/relation/relationShip/index.vue

@@ -265,8 +265,8 @@
     data() {
       return {
         visible: false,
-        MainObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('MainObject') || '无'}类型)`,
-        FromObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('FromObject') || '无'}类型)`,
+        MainObject: `(限制条件:${localStorage.getItem('MainObject') || '无'})`,
+        FromObject: `(限制条件:${localStorage.getItem('FromObject') || '无'})`,
         pageSizes: [10, 20, 50, 100],
         pageSize: 50,
         currentPage: 1,