yuhan 9 月之前
父节点
当前提交
b3c615142d

+ 2 - 12
src/views/module_interLock/InterlockSummary/modules/InterlockSummaryForm.vue

@@ -350,10 +350,6 @@
       formDisabled(){
         return this.disabled
       },
-      clickSystemNode() {
-        /** 其中:interlockType判断点击的是否为系统(0为装置,1为系统,2为未选中) */
-        return this.$store.getters.clickSystemNode
-      },
     },
     // watch: {
     //   'model.interlockName'(val) {
@@ -363,8 +359,6 @@
     created () {
       this.getTagInfo()
       this.initDictData()
-      console.log(111)
-      console.log('clickSystemNode', this.clickSystemNode)
       // this.getData('0', 'apparatusData')
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
@@ -396,10 +390,8 @@
         })
       },
       // 获取所有位号
-      getTagInfo(groupId){
-        console.log(1111)
-        console.log('clickSystemNode', this.clickSystemNode)
-        postAction(this.url.getTagInfo, {groupId: groupId}).then(res => {
+      getTagInfo(){
+        postAction(this.url.getTagInfo).then(res => {
           this.tagDataOptions = res.result
           this.confirmLoading = false
         })
@@ -478,7 +470,6 @@
       edit (record) {
         // this.model = Object.assign({}, record);
         // 编辑时获取当前联锁所有详细信息
-        console.log(record)
         getAction(this.url.getLsAllData, {id: record.summaryid}).then(res => {
           var resultArr = res.result
           this.model = resultArr
@@ -486,7 +477,6 @@
           this.model.interlockOutValueData = [resultArr.deviceId, resultArr.moduleName, resultArr.interlockOutValueTag+'&'+resultArr.interlockOutValue]
           this.visible = true;
           this.getZzXtData()
-          this.getTagInfo(this.model.groupId)
         })
       },
       submitForm () {

+ 5 - 3
src/views/module_interLock/interlockSummarySet/InterlockSummarySet.vue

@@ -350,7 +350,7 @@
       } else {
         this.setAdd()
       }
-      this.getTagInfo()
+      // this.getTagInfo()
       this.initDictData()
       // this.getData('0', 'apparatusData')
        //备份model原始值
@@ -388,8 +388,8 @@
         })
       },
       // 获取所有位号
-      getTagInfo(){
-        postAction(this.url.getTagInfo).then(res => {
+      getTagInfo(groupId){
+        postAction(this.url.getTagInfo, {groupId: groupId}).then(res => {
           this.tagDataOptions = res.result
           this.confirmLoading = false
         })
@@ -468,6 +468,7 @@
           this.model.interlockSystemId = this.clickSystemNode.id
         }
         this.getZzXtData()
+        this.getTagInfo(this.clickSystemNode.groupId)
       },
       // 编辑联锁-弹窗
       getEditData() {
@@ -481,6 +482,7 @@
           this.conditionDataSource = resultArr.interlockDetailEditQueryVOList // 表格数据
           this.model.interlockOutValueData = [resultArr.deviceId, resultArr.moduleName, resultArr.interlockOutValueTag+'&'+resultArr.interlockOutValue]
           this.getZzXtData()
+          this.getTagInfo(this.model.groupId)
         })
       },
       goBack(){