Browse Source

修改bug

chuwu 5 years ago
parent
commit
4501c6378b
1 changed files with 25 additions and 3 deletions
  1. 25 3
      src/components/config_point/step3_point/3_temps.vue

+ 25 - 3
src/components/config_point/step3_point/3_temps.vue

@@ -14,11 +14,11 @@
             <div class="flex-around">
                 <div class="point-despoint">
                     <p class="center">原始点位说明</p>
-                    <p></p>
+                    <p>{{pointDes}}</p>
                 </div>
                 <div class="point-despoint">
                     <p class="center">数据字典值说明</p>
-                    <p class="content-view">{{unitObj.unit || '--'}}</p>
+                    <p class="content-view">{{delDataSource(unitObj.dataSource)}}</p>
                 </div>
             </div>
             <div class="center">
@@ -29,7 +29,7 @@
             <div class="flex-around">
                 <div class="point-despoint">
                     <p>原始点位说明</p>
-                    <p></p>
+                    <p>{{pointDes}}</p>
                 </div>
                 <div class="point-despoint">
                     <p>数据字典值说明</p>
@@ -151,6 +151,7 @@
                         trigger: 'change'
                     }]
                 },
+                pointDes: ""
             }
         },
         created() {},
@@ -177,6 +178,7 @@
                     ValueDescription: '',
                     DataRuleType: '无需处理,直接使用'
                 }
+                this.unitObj = {}
                 let params = {
                     data: {
                         DataSourceId: this.datasourceId,
@@ -188,6 +190,7 @@
                 console.log(params, 'params')
                 queryDescription(params, res => {
                     console.log(res)
+                    this.pointDes = !!res.Content ? res.Content.join("、") : "--"
                 })
             },
             //保存
@@ -580,6 +583,25 @@
                 //获取所有的设备
                 this.getEqAll()
             },
+            //处理函数
+            delDataSource(val){
+                if(!val){
+                    return '--'
+                }
+                if(typeof val == 'string'){
+                    if(!!val){
+                        return val
+                    }else{
+                        return '无信息带你单位及值说明'
+                    }
+                }else {
+                    let str = ''
+                    val.forEach(el => {
+                        str = el.code + '、' + el.name + ' '
+                    })
+                    return str
+                }
+            }
         }
     }
 </script>