|
|
@@ -371,7 +371,6 @@
|
|
|
placeholder="请输入参数内容"
|
|
|
size="mini"
|
|
|
type="textarea"
|
|
|
- :readonly="!!row.paramCode"
|
|
|
rows="1"
|
|
|
autosize
|
|
|
></el-input>
|
|
|
@@ -673,7 +672,7 @@
|
|
|
import MaterialAdd from '@/components/common/MaterialAdd.vue';
|
|
|
import { getteampage } from '@/api/main/index.js';
|
|
|
import bindSubstanceList from './bindSubstanceList.vue';
|
|
|
- import { getAssetInfo} from '@/api/main/index.js';
|
|
|
+ import { getAssetInfo } from '@/api/main/index.js';
|
|
|
|
|
|
//设备初始化字段
|
|
|
const substanceKey = [
|
|
|
@@ -899,6 +898,13 @@
|
|
|
slot: 'paramValue',
|
|
|
minWidth: 261
|
|
|
},
|
|
|
+ {
|
|
|
+ prop: 'iotPointName',
|
|
|
+ label: '物联点位',
|
|
|
+ align: 'center',
|
|
|
+ minWidth: 150
|
|
|
+ },
|
|
|
+
|
|
|
{
|
|
|
prop: 'formula',
|
|
|
label: '计算公式',
|
|
|
@@ -1069,7 +1075,7 @@
|
|
|
this.addForm.areaName = '';
|
|
|
this.addForm.factoryId = '';
|
|
|
this.addForm.factoryName = '';
|
|
|
- this.addForm.postName ='' ;
|
|
|
+ this.addForm.postName = '';
|
|
|
this.addForm.postId = '';
|
|
|
},
|
|
|
// 关闭时清理表单
|
|
|
@@ -1217,9 +1223,9 @@
|
|
|
this.addForm.deviceId = data.deviceId;
|
|
|
this.addForm.deviceName = data.deviceName;
|
|
|
this.addForm.deviceCode = data.deviceCode;
|
|
|
- const deviceData= await getAssetInfo(data.deviceId)
|
|
|
- this.addForm.postId=deviceData.postId
|
|
|
- this.addForm.postName=deviceData.postName
|
|
|
+ const deviceData = await getAssetInfo(data.deviceId);
|
|
|
+ this.addForm.postId = deviceData.postId;
|
|
|
+ this.addForm.postName = deviceData.postName;
|
|
|
this.addForm.associatedObject = 2;
|
|
|
}
|
|
|
|
|
|
@@ -1256,7 +1262,9 @@
|
|
|
this.addForm.deviceName = info.name;
|
|
|
this.addForm.postId = info.postId;
|
|
|
this.addForm.postName = info.postName;
|
|
|
- this.addForm.detailList = this.addForm.detailList.filter(item=>!item.paramCode);
|
|
|
+ this.addForm.detailList = this.addForm.detailList.filter(
|
|
|
+ (item) => !item.paramCode
|
|
|
+ );
|
|
|
}
|
|
|
},
|
|
|
// 添加
|
|
|
@@ -1360,6 +1368,7 @@
|
|
|
minValue: item.minValue,
|
|
|
paramType: 7,
|
|
|
paramValue: item.paramValue,
|
|
|
+ iotPointName: item.paramValue,
|
|
|
iotId: item.iotId,
|
|
|
remark: '',
|
|
|
symbol: null,
|
