|
@@ -95,6 +95,7 @@ export default {
|
|
options: [],
|
|
options: [],
|
|
optionObj: {},
|
|
optionObj: {},
|
|
infoDict: {}, //信息点字典
|
|
infoDict: {}, //信息点字典
|
|
|
|
+ dataDict:{}, //数据字典
|
|
InfomationPoint: null, //信息点
|
|
InfomationPoint: null, //信息点
|
|
unitObj: {}, //传给自动单位转换的obj
|
|
unitObj: {}, //传给自动单位转换的obj
|
|
props: {
|
|
props: {
|
|
@@ -159,10 +160,11 @@ export default {
|
|
save() {
|
|
save() {
|
|
this.$refs['form'].validate(valid => {
|
|
this.$refs['form'].validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
- var flag = this.form.DataRuleType
|
|
|
|
|
|
+ var flag = this.form.DataRuleType
|
|
switch (flag) {
|
|
switch (flag) {
|
|
case '无需处理,直接使用':
|
|
case '无需处理,直接使用':
|
|
this.$refs['noHandle'].getForm(noHandle => {
|
|
this.$refs['noHandle'].getForm(noHandle => {
|
|
|
|
+ console.log(noHandle)
|
|
if (noHandle) {
|
|
if (noHandle) {
|
|
this.saveForm(this.form, noHandle)
|
|
this.saveForm(this.form, noHandle)
|
|
} else {
|
|
} else {
|
|
@@ -172,6 +174,7 @@ export default {
|
|
break
|
|
break
|
|
case '需自动单位转换':
|
|
case '需自动单位转换':
|
|
this.$refs['autoHandle'].getForm(autoHandle => {
|
|
this.$refs['autoHandle'].getForm(autoHandle => {
|
|
|
|
+ console.log(autoHandle)
|
|
if (autoHandle) {
|
|
if (autoHandle) {
|
|
this.saveForm(this.form, autoHandle)
|
|
this.saveForm(this.form, autoHandle)
|
|
} else {
|
|
} else {
|
|
@@ -217,11 +220,15 @@ export default {
|
|
console.log(basic, other)
|
|
console.log(basic, other)
|
|
let type = basic.DataRuleType
|
|
let type = basic.DataRuleType
|
|
let basicParams = {
|
|
let basicParams = {
|
|
- System: basic.dict[0], //系统
|
|
|
|
- Specialty: basic.dict[1], //专业
|
|
|
|
- EquipmentType: basic.dict[2], //设备类
|
|
|
|
- Funcid: basic.dict[3], //信息点id
|
|
|
|
- InfomationPoint: this.InfomationPoint, //信息点
|
|
|
|
|
|
+ SpecialtyCode: basic.dict[0],
|
|
|
|
+ SystemCode: basic.dict[1], //code
|
|
|
|
+ EquipmentTypeCode:basic.dict[2],
|
|
|
|
+ InfomationPointCode: basic.dict[3],
|
|
|
|
+ System: this.dataDict[basic.dict[0]].name, //系统
|
|
|
|
+ Specialty: this.dataDict[basic.dict[1]].name, //专业
|
|
|
|
+ EquipmentType: this.dataDict[basic.dict[2]].name, //设备类
|
|
|
|
+ Funcid: "1", //信息点id
|
|
|
|
+ InfomationPoint: this.InfomationPoint, //信息点
|
|
DataRuleType: basic.DataRuleType, //值处理方式
|
|
DataRuleType: basic.DataRuleType, //值处理方式
|
|
DataSourceId: '4',
|
|
DataSourceId: '4',
|
|
PointId: this.editData.Id, //点位ID
|
|
PointId: this.editData.Id, //点位ID
|
|
@@ -234,7 +241,17 @@ export default {
|
|
}
|
|
}
|
|
break
|
|
break
|
|
case '需自动单位转换':
|
|
case '需自动单位转换':
|
|
- otherParams = {}
|
|
|
|
|
|
+ let DataRuleContent1 = JSON.stringify([{
|
|
|
|
+ "seq": 1,
|
|
|
|
+ "ruletype": "type1",
|
|
|
|
+ "content": [{
|
|
|
|
+ "from":other.unit[0] + '-' + other.unit[1] ,
|
|
|
|
+ "to": this.unitObj.unit
|
|
|
|
+ }]
|
|
|
|
+ }]);
|
|
|
|
+ otherParams = {
|
|
|
|
+ DataRuleContent:DataRuleContent1
|
|
|
|
+ }
|
|
break
|
|
break
|
|
case '需按设置枚举转换':
|
|
case '需按设置枚举转换':
|
|
let DataRuleContent2 = other.pointArr.length
|
|
let DataRuleContent2 = other.pointArr.length
|
|
@@ -287,7 +304,7 @@ export default {
|
|
case '需按拆分枚举转换':
|
|
case '需按拆分枚举转换':
|
|
let SplitPoints = other.devArr.length ? other.devArr : undefined
|
|
let SplitPoints = other.devArr.length ? other.devArr : undefined
|
|
let DataRuleContent4 = undefined;
|
|
let DataRuleContent4 = undefined;
|
|
- if (other.pointArr) {
|
|
|
|
|
|
+ if (other.tranfVal) {
|
|
DataRuleContent4 = other.pointArr
|
|
DataRuleContent4 = other.pointArr
|
|
? JSON.stringify([
|
|
? JSON.stringify([
|
|
{
|
|
{
|
|
@@ -308,6 +325,12 @@ export default {
|
|
console.log(params)
|
|
console.log(params)
|
|
batchCreate(params, res=> {
|
|
batchCreate(params, res=> {
|
|
console.log(res);
|
|
console.log(res);
|
|
|
|
+ if(res.Result == 'Success') {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: '保存成功',
|
|
|
|
+ type: 'success'
|
|
|
|
+ })
|
|
|
|
+ }
|
|
})
|
|
})
|
|
},
|
|
},
|
|
errMsg() {
|
|
errMsg() {
|
|
@@ -318,7 +341,7 @@ export default {
|
|
},
|
|
},
|
|
handleChange(arr) {
|
|
handleChange(arr) {
|
|
this.unitObj = this.infoDict[arr[3]]
|
|
this.unitObj = this.infoDict[arr[3]]
|
|
- this.InfomationPoint = this.unitObj.infoPointName
|
|
|
|
|
|
+ this.InfomationPoint = this.unitObj.infoPointName || '--'
|
|
},
|
|
},
|
|
handleItemChange(val) {
|
|
handleItemChange(val) {
|
|
if (val.length == 3) {
|
|
if (val.length == 3) {
|
|
@@ -362,11 +385,21 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ //缓存数据字典
|
|
|
|
+ getDataDict(arr) {
|
|
|
|
+ for (var i = 0; i < arr.length; i++) {
|
|
|
|
+ this.dataDict[arr[i].code] = arr[i]
|
|
|
|
+ if (arr[i].content && arr[i].content.length > 0) {
|
|
|
|
+ this.getDataDict(arr[i].content)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ },
|
|
getEqAll() {
|
|
getEqAll() {
|
|
let params = { format: true }
|
|
let params = { format: true }
|
|
getEquipmentAll(params, res => {
|
|
getEquipmentAll(params, res => {
|
|
if (res.Result == 'success') {
|
|
if (res.Result == 'success') {
|
|
- this.options = res.Content
|
|
|
|
|
|
+ this.options = res.Content;
|
|
|
|
+ this.getDataDict(this.options)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|