|
@@ -4,31 +4,27 @@
|
|
|
<ul>
|
|
|
<li>
|
|
|
<span>原始点位信息:</span>
|
|
|
- <span>XXX</span>
|
|
|
+ <span>{{editData.Description || '--'}}</span>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <span>点位地址:</span>
|
|
|
- <span>XXX</span>
|
|
|
+ <span>位置标签:</span>
|
|
|
+ <span>{{editData.LocationFlag || '--'}}</span>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <span>点位描述:</span>
|
|
|
- <span>XXX</span>
|
|
|
+ <span>设备类型:</span>
|
|
|
+ <span>{{editData.KeyEquipmentType || '--'}}</span>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <span>位置标签:</span>
|
|
|
- <span>XXX</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>模式(读/写):</span>
|
|
|
- <span>XXX</span>
|
|
|
+ <span>设备参数:</span>
|
|
|
+ <span>{{editData.KeyEquipmentParameter || '--'}}</span>
|
|
|
</li>
|
|
|
<li>
|
|
|
<span>值/单位说明:</span>
|
|
|
- <span>XXX</span>
|
|
|
+ <span>{{editData.ValueDescription || '--'}}</span>
|
|
|
</li>
|
|
|
<li>
|
|
|
<span>备注:</span>
|
|
|
- <span>XXX</span>
|
|
|
+ <span>{{editData.Remarks || '--'}}</span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
</div>
|
|
@@ -49,12 +45,12 @@
|
|
|
@active-item-change='handleItemChange'
|
|
|
></el-cascader>
|
|
|
<div class='dict'>
|
|
|
- <p class='top'>
|
|
|
+ <!-- <p class='top'>
|
|
|
<i class='el-icon-plus'></i>
|
|
|
<el-button type='text'>添加自定义信息点</el-button>
|
|
|
- </p>
|
|
|
+ </p> -->
|
|
|
<p class='btm'>
|
|
|
- <el-input type='textarea' :rows='2' placeholder='信息点的单位及值的说明' v-model='textarea'></el-input>
|
|
|
+ <el-input type='textarea' :rows='2' placeholder='信息点的单位及值的说明' v-model='form.ValueDescription'></el-input>
|
|
|
</p>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
@@ -99,6 +95,7 @@ export default {
|
|
|
options: [],
|
|
|
optionObj: {},
|
|
|
infoDict: {}, //信息点字典
|
|
|
+ InfomationPoint: null, //信息点
|
|
|
unitObj: {}, //传给自动单位转换的obj
|
|
|
props: {
|
|
|
value: 'code',
|
|
@@ -107,12 +104,12 @@ export default {
|
|
|
},
|
|
|
form: {
|
|
|
dict: [],
|
|
|
+ ValueDescription: '',
|
|
|
DataRuleType: '无需处理,直接使用'
|
|
|
},
|
|
|
rules: {
|
|
|
DataRuleType: [{ required: true, message: '请选择值处理方式', trigger: 'change' }]
|
|
|
},
|
|
|
- textarea: '',
|
|
|
handleTypeArr: [
|
|
|
{
|
|
|
label: '无需处理,直接使用',
|
|
@@ -223,8 +220,11 @@ export default {
|
|
|
System: basic.dict[0], //系统
|
|
|
Specialty: basic.dict[1], //专业
|
|
|
EquipmentType: basic.dict[2], //设备类
|
|
|
- InfomationPoint: basic.dict[3], //信息点
|
|
|
- DataRuleType: basic.DataRuleType //值处理方式
|
|
|
+ Funcid: basic.dict[3], //信息点id
|
|
|
+ InfomationPoint: this.InfomationPoint, //信息点
|
|
|
+ DataRuleType: basic.DataRuleType, //值处理方式
|
|
|
+ DataSourceId: '4',
|
|
|
+ PointId: this.editData.Id, //点位ID
|
|
|
}
|
|
|
let otherParams = {}
|
|
|
switch (type) {
|
|
@@ -317,10 +317,8 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
handleChange(arr) {
|
|
|
- console.log(arr)
|
|
|
- console.log(this.infoDict)
|
|
|
this.unitObj = this.infoDict[arr[3]]
|
|
|
- console.log(this.unitObj)
|
|
|
+ this.InfomationPoint = this.unitObj.infoPointName
|
|
|
},
|
|
|
handleItemChange(val) {
|
|
|
if (val.length == 3) {
|
|
@@ -379,6 +377,15 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.init()
|
|
|
+ },
|
|
|
+ watch: {
|
|
|
+ editData: {
|
|
|
+ immediate: true,
|
|
|
+ handler(val) {
|
|
|
+ console.log('editData')
|
|
|
+ console.log(val)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -409,6 +416,9 @@ export default {
|
|
|
text-align: right;
|
|
|
line-height: 33px;
|
|
|
}
|
|
|
+ .btm {
|
|
|
+ margin-top: 5px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
.btn-box {
|