|
@@ -32,23 +32,32 @@
|
|
|
<el-form class='form' :rules='rules' ref='form' :model='form' label-width='140px'>
|
|
|
<el-form-item label='对应数据字典' prop='diction'>
|
|
|
<dictionary-cas @change="changeDictionaryCas" ref="dictionaryCas"></dictionary-cas>
|
|
|
- <div class='dict'>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label='对象标识' prop="EquipmentMark">
|
|
|
+ <el-input v-model='form.EquipmentMark'></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <template v-for="(it,index) in typeList">
|
|
|
+ <div class='dict' :key="index">
|
|
|
+ <label class="el-form-item__label" style="width:140px;">信息点名称:</label><span style="line-height:40px">{{it.name||''}}</span>
|
|
|
<p class='btm'>
|
|
|
- <el-input readonly type='textarea' :rows='2' placeholder='信息点的单位及值的说明' v-model='ValueDescription'></el-input>
|
|
|
+ <el-input readonly type='textarea' :rows='2' placeholder='信息点的单位及值的说明' v-model='it.ValueDescription'>
|
|
|
+ </el-input>
|
|
|
+ <el-form-item style="margin-top:15px;" label='值处理方式' prop='DataRuleType'>
|
|
|
+ <el-select v-model='it.DataRuleType' placeholder='请选择'>
|
|
|
+ <el-option v-for='item in handleTypeArr' :key='item.value' :label='item.label' :value='item.value'></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</p>
|
|
|
+ <!-- components -->
|
|
|
+ <no-handle :ref='"noHandle"+index' v-if='it.DataRuleType == "无需处理,直接使用"' :noHandleShow='noHandleShow'></no-handle>
|
|
|
+ <auto-handle :ref='"autoHandle"+index' v-else-if='it.DataRuleType == "需自动单位转换"' :unitObj='it' :autoHandleShow='autoHandleShow'>
|
|
|
+ </auto-handle>
|
|
|
+ <enum-handle :ref='"enumHandle"+index' v-else-if='it.DataRuleType == "需按设置枚举转换"' :enumHandleShow='enumHandleShow'></enum-handle>
|
|
|
+ <formula-handle :ref='"formulaHandle"+index' v-else-if='it.DataRuleType == "需按公式转换"' :formulaHandleShow='formulaHandleShow'>
|
|
|
+ </formula-handle>
|
|
|
+ <split-handle :ref='"splitHandle"+index' v-else-if='it.DataRuleType == "需拆分处理"' :splitHandleShow='splitHandleShow'></split-handle>
|
|
|
</div>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label='值处理方式' prop='DataRuleType'>
|
|
|
- <el-select v-model='form.DataRuleType' placeholder='请选择'>
|
|
|
- <el-option v-for='item in handleTypeArr' :key='item.value' :label='item.label' :value='item.value'></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <!-- components -->
|
|
|
- <no-handle ref='noHandle' v-if='form.DataRuleType == "无需处理,直接使用"' :noHandleShow='noHandleShow'></no-handle>
|
|
|
- <auto-handle ref='autoHandle' v-else-if='form.DataRuleType == "需自动单位转换"' :unitObj='unitObj' :autoHandleShow='autoHandleShow'></auto-handle>
|
|
|
- <enum-handle ref='enumHandle' v-else-if='form.DataRuleType == "需按设置枚举转换"' :enumHandleShow='enumHandleShow'></enum-handle>
|
|
|
- <formula-handle ref='formulaHandle' v-else-if='form.DataRuleType == "需按公式转换"' :formulaHandleShow='formulaHandleShow'></formula-handle>
|
|
|
- <split-handle ref='splitHandle' v-else-if='form.DataRuleType == "需拆分处理"' :splitHandleShow='splitHandleShow'></split-handle>
|
|
|
+ </template>
|
|
|
</el-form>
|
|
|
<div class='btn-box'>
|
|
|
<el-button type='primary' @click='save'>保存</el-button>
|
|
@@ -82,14 +91,16 @@ export default {
|
|
|
dataDict: {}, //数据字典
|
|
|
InfomationPoint: null, //信息点
|
|
|
unitObj: {}, //传给自动单位转换的obj
|
|
|
- ValueDescription: '', //值/点位描述
|
|
|
+ ValueDescription: {}, //值/点位描述
|
|
|
form: {
|
|
|
diction: '1',//占位
|
|
|
- DataRuleType: '无需处理,直接使用'
|
|
|
+ DataRuleType: '无需处理,直接使用',
|
|
|
+ EquipmentMark: ''
|
|
|
},
|
|
|
rules: {
|
|
|
DataRuleType: [{ required: true, message: '请选择值处理方式', trigger: 'change' }],
|
|
|
- diction: [{ required: true }]
|
|
|
+ diction: [{ required: true }],
|
|
|
+ EquipmentMark: [{ required: true, message: '请输入对象标识', trigger: 'blur' }],
|
|
|
},
|
|
|
handleTypeArr: [
|
|
|
{
|
|
@@ -119,7 +130,8 @@ export default {
|
|
|
enumHandleShow: {},
|
|
|
formulaHandleShow: {},
|
|
|
splitHandleShow: {},
|
|
|
- dictionaryData: []
|
|
|
+ dictionaryData: [],
|
|
|
+ typeList: []
|
|
|
}
|
|
|
},
|
|
|
props: {
|
|
@@ -139,209 +151,240 @@ export default {
|
|
|
methods: {
|
|
|
//保存
|
|
|
save() {
|
|
|
+ if (!this.form.EquipmentMark) {
|
|
|
+ this.errMsg();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
this.$refs.dictionaryCas.validate(valid => {
|
|
|
if (valid) {
|
|
|
- var flag = this.form.DataRuleType
|
|
|
- switch (flag) {
|
|
|
- case '无需处理,直接使用':
|
|
|
- this.$refs['noHandle'].getForm(noHandle => {
|
|
|
- if (noHandle) {
|
|
|
- this.saveForm(this.form, noHandle)
|
|
|
- } else {
|
|
|
- this.errMsg()
|
|
|
- }
|
|
|
- })
|
|
|
- break
|
|
|
- case '需自动单位转换':
|
|
|
- this.$refs['autoHandle'].getForm(autoHandle => {
|
|
|
- if (autoHandle) {
|
|
|
- this.saveForm(this.form, autoHandle)
|
|
|
- } else {
|
|
|
- this.errMsg()
|
|
|
- }
|
|
|
- })
|
|
|
- break
|
|
|
- case '需按设置枚举转换':
|
|
|
- this.$refs['enumHandle'].getForm(enumHandle => {
|
|
|
- if (enumHandle) {
|
|
|
- this.saveForm(this.form, enumHandle)
|
|
|
- } else {
|
|
|
- this.errMsg()
|
|
|
- }
|
|
|
- })
|
|
|
- break
|
|
|
- case '需按公式转换':
|
|
|
- this.$refs['formulaHandle'].getForm(formulaHandle => {
|
|
|
- if (formulaHandle) {
|
|
|
- this.saveForm(this.form, formulaHandle)
|
|
|
- } else {
|
|
|
- this.errMsg()
|
|
|
- }
|
|
|
- })
|
|
|
- break
|
|
|
- case '需拆分处理':
|
|
|
- this.$refs['splitHandle'].getForm(splitHandle => {
|
|
|
- if (splitHandle) {
|
|
|
- this.saveForm(this.form, splitHandle)
|
|
|
- } else {
|
|
|
- this.errMsg()
|
|
|
- }
|
|
|
- })
|
|
|
- break
|
|
|
+ for (let i = 0; i < this.typeList.length; i++) {
|
|
|
+ let flag = this.typeList[i].DataRuleType
|
|
|
+ switch (flag) {
|
|
|
+ case '无需处理,直接使用':
|
|
|
+ let componnoHandle = `noHandle${i}`
|
|
|
+ this.$refs[componnoHandle][0].getForm(noHandle => {
|
|
|
+ if (noHandle) {
|
|
|
+ this.typeList[i].other = noHandle
|
|
|
+ // this.saveForm(this.form, noHandle)
|
|
|
+ } else {
|
|
|
+ this.errMsg();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ break
|
|
|
+ case '需自动单位转换':
|
|
|
+ let componautoHandle = `autoHandle${i}`
|
|
|
+ this.$refs[componautoHandle][0].getForm(autoHandle => {
|
|
|
+ if (autoHandle) {
|
|
|
+ this.typeList[i].other = autoHandle
|
|
|
+ // this.saveForm(this.form, autoHandle)
|
|
|
+ } else {
|
|
|
+ this.errMsg()
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ break
|
|
|
+ case '需按设置枚举转换':
|
|
|
+ let componenumHandle = `enumHandle${i}`
|
|
|
+ this.$refs[componenumHandle][0].getForm(enumHandle => {
|
|
|
+ if (enumHandle) {
|
|
|
+ this.typeList[i].other = enumHandle
|
|
|
+ // this.saveForm(this.form, enumHandle)
|
|
|
+ } else {
|
|
|
+ this.errMsg()
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ break
|
|
|
+ case '需按公式转换':
|
|
|
+ let componformulaHandle = `formulaHandle${i}`
|
|
|
+ this.$refs[componformulaHandle][0].getForm(formulaHandle => {
|
|
|
+ if (formulaHandle) {
|
|
|
+ this.typeList[i].other = formulaHandle
|
|
|
+ // this.saveForm(this.form, formulaHandle)
|
|
|
+ } else {
|
|
|
+ this.errMsg()
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ break
|
|
|
+ case '需拆分处理':
|
|
|
+ let componsplitHandle = `splitHandle${i}`
|
|
|
+ this.$refs[componsplitHandle][0].getForm(splitHandle => {
|
|
|
+ if (splitHandle) {
|
|
|
+ this.typeList[i].other = formulaHandle
|
|
|
+ // this.saveForm(this.form, splitHandle)
|
|
|
+ } else {
|
|
|
+ this.errMsg()
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ break
|
|
|
+ }
|
|
|
}
|
|
|
+ this.saveForm()
|
|
|
} else {
|
|
|
this.errMsg()
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- saveForm(basic, other) {
|
|
|
- let type = basic.DataRuleType
|
|
|
- let basicParams = {
|
|
|
- InfomationPointCode: this.dictionaryData[this.dictionaryData.length - 1], //信息点code
|
|
|
- InfomationPoint: this.dictionaryNames[this.dictionaryNames.length - 1], //信息点名称
|
|
|
- DataRuleType: basic.DataRuleType, //值处理方式
|
|
|
- DataSourceId: this.datasourceId, //数据源id
|
|
|
- PointId: this.editData.Point.Id, //点位ID
|
|
|
- Type: this.dictionaryNames[0], //一级分类名称
|
|
|
- TypeCode: this.dictionaryData[0], //一级分类code
|
|
|
- }
|
|
|
- if (this.dictionaryData.length == 3) {
|
|
|
- //设备-部件-空间
|
|
|
- basicParams.EquipmentTypeCode = this.dictionaryData[1]
|
|
|
- basicParams.EquipmentType = this.dictionaryNames[1]
|
|
|
- } else if (this.dictionaryData.length == 4) { //专业系统
|
|
|
- basicParams.SpecialtyCode = this.dictionaryData[1]
|
|
|
- basicParams.Specialty = this.dictionaryNames[1]
|
|
|
- basicParams.SystemCode = this.dictionaryData[2]
|
|
|
- basicParams.System = this.dictionaryNames[2]
|
|
|
- basicParams.EquipmentTypeCode = basicParams.SystemCode //为了配置从动参取值存储
|
|
|
- basicParams.EquipmentType = basicParams.System
|
|
|
- }
|
|
|
+ saveForm() {
|
|
|
let updateParams = {
|
|
|
data: {
|
|
|
Content: [{ Id: this.editData.Point.Id }]
|
|
|
},
|
|
|
type: this.protocolType
|
|
|
}
|
|
|
- let otherParams = {}
|
|
|
- switch (type) {
|
|
|
- case '无需处理,直接使用':
|
|
|
- otherParams = {
|
|
|
- EquipmentMark: other.EquipmentMark
|
|
|
- }
|
|
|
- updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
- break
|
|
|
- case '需自动单位转换':
|
|
|
- let DataRuleContent1 = JSON.stringify([
|
|
|
- {
|
|
|
- seq: 1,
|
|
|
- ruletype: 'type1',
|
|
|
- content: [
|
|
|
- {
|
|
|
- from: other.unit[0] + '-' + other.unit[1],
|
|
|
- to: this.unitObj.unit
|
|
|
- }
|
|
|
- ]
|
|
|
+ let params = this.typeList.map((t, i) => {
|
|
|
+ let temp = this.dictionaryData[i],
|
|
|
+ tempNames = t.name.split('-');
|
|
|
+ let eachData = {
|
|
|
+ InfomationPointCode: temp[temp.length - 1],
|
|
|
+ InfomationPoint: tempNames[tempNames.length - 1],
|
|
|
+ DataRuleType: t.DataRuleType,
|
|
|
+ DataSourceId: this.datasourceId, //数据源id
|
|
|
+ PointId: this.editData.Point.Id, //点位ID
|
|
|
+ TypeCode: temp[0],
|
|
|
+ Type: tempNames[0],
|
|
|
+ EquipmentMark: this.form.EquipmentMark
|
|
|
+ }
|
|
|
+ if (temp.length == 3) {
|
|
|
+ //设备-部件-空间
|
|
|
+ eachData.EquipmentTypeCode = temp[1]
|
|
|
+ eachData.EquipmentType = tempNames[1]
|
|
|
+ } else if (temp.length == 4) {
|
|
|
+ eachData.SpecialtyCode = temp[1]
|
|
|
+ eachData.Specialty = tempNames[1]
|
|
|
+ eachData.SystemCode = temp[2]
|
|
|
+ eachData.System = tempNames[2]
|
|
|
+ eachData.EquipmentTypeCode = eachData.SystemCode //为了配置从动参取值存储
|
|
|
+ eachData.EquipmentType = eachData.System
|
|
|
+ }
|
|
|
+ let type = t.DataRuleType;
|
|
|
+ updateParams.data.Content[0].EquipmentMark = eachData.EquipmentMark
|
|
|
+ switch (type) {
|
|
|
+ case '无需处理,直接使用':
|
|
|
+ // otherParams = {
|
|
|
+ // EquipmentMark: other.EquipmentMark
|
|
|
+ // }
|
|
|
+ // updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
+ break
|
|
|
+ case '需自动单位转换':
|
|
|
+ let DataRuleContent1 = JSON.stringify([
|
|
|
+ {
|
|
|
+ seq: 1,
|
|
|
+ ruletype: 'type1',
|
|
|
+ content: [
|
|
|
+ {
|
|
|
+ from: t.other.unit[0] + '-' + t.other.unit[1],
|
|
|
+ to: this.unitObj[eachData.InfomationPointCode].unit
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ ])
|
|
|
+ eachData.DataRuleContent = DataRuleContent1;
|
|
|
+ // otherParams = {
|
|
|
+ // DataRuleContent: DataRuleContent1,
|
|
|
+ // EquipmentMark: other.EquipmentMark
|
|
|
+ // }
|
|
|
+ // updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
+ break
|
|
|
+ case '需按设置枚举转换':
|
|
|
+ let DataRuleContent2 = t.other.pointArr.length
|
|
|
+ ? JSON.stringify([{ seq: 1, ruletype: 'type2', content: t.other.pointArr }])
|
|
|
+ : undefined
|
|
|
+ // otherParams = {
|
|
|
+ // EquipmentMark: other.EquipmentMark,
|
|
|
+ // DataRuleContent: DataRuleContent2
|
|
|
+ // }
|
|
|
+ eachData.DataRuleContent = DataRuleContent2;
|
|
|
+ // updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
+ break
|
|
|
+ case '需按公式转换':
|
|
|
+ let subRule = t.other.from
|
|
|
+ ? {
|
|
|
+ seq: 1,
|
|
|
+ ruletype: 'type4',
|
|
|
+ content: [
|
|
|
+ {
|
|
|
+ from: t.other.from,
|
|
|
+ to: t.other.to
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ : undefined
|
|
|
+ let extractRule = {
|
|
|
+ seq: 2,
|
|
|
+ ruletype: 'type5',
|
|
|
+ content: t.other.extract
|
|
|
+ ? [
|
|
|
+ {
|
|
|
+ extract: 'number'
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ : []
|
|
|
}
|
|
|
- ])
|
|
|
- otherParams = {
|
|
|
- DataRuleContent: DataRuleContent1,
|
|
|
- EquipmentMark: other.EquipmentMark
|
|
|
- }
|
|
|
- updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
- break
|
|
|
- case '需按设置枚举转换':
|
|
|
- let DataRuleContent2 = other.pointArr.length
|
|
|
- ? JSON.stringify([{ seq: 1, ruletype: 'type2', content: other.pointArr }])
|
|
|
- : undefined
|
|
|
- otherParams = {
|
|
|
- EquipmentMark: other.EquipmentMark,
|
|
|
- DataRuleContent: DataRuleContent2
|
|
|
- }
|
|
|
- updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
- break
|
|
|
- case '需按公式转换':
|
|
|
- let subRule = other.from
|
|
|
- ? {
|
|
|
- seq: 1,
|
|
|
- ruletype: 'type4',
|
|
|
- content: [
|
|
|
- {
|
|
|
- from: other.from,
|
|
|
- to: other.to
|
|
|
- }
|
|
|
- ]
|
|
|
+ let countRule = t.other.mark
|
|
|
+ ? {
|
|
|
+ seq: 3,
|
|
|
+ ruletype: 'type6',
|
|
|
+ content: [
|
|
|
+ {
|
|
|
+ calculationtype: t.other.mark,
|
|
|
+ value: t.other.markValue
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ : undefined
|
|
|
+
|
|
|
+ let DataRuleContent3 = []
|
|
|
+ if (subRule) {
|
|
|
+ DataRuleContent3.push(subRule)
|
|
|
}
|
|
|
- : undefined
|
|
|
- let extractRule = {
|
|
|
- seq: 2,
|
|
|
- ruletype: 'type5',
|
|
|
- content: other.extract
|
|
|
- ? [
|
|
|
- {
|
|
|
- extract: 'number'
|
|
|
- }
|
|
|
- ]
|
|
|
- : []
|
|
|
- }
|
|
|
- let countRule = other.mark
|
|
|
- ? {
|
|
|
- seq: 3,
|
|
|
- ruletype: 'type6',
|
|
|
- content: [
|
|
|
- {
|
|
|
- calculationtype: other.mark,
|
|
|
- value: other.markValue
|
|
|
- }
|
|
|
- ]
|
|
|
+ DataRuleContent3.push(extractRule)
|
|
|
+ if (countRule) {
|
|
|
+ DataRuleContent3.push(countRule)
|
|
|
}
|
|
|
- : undefined
|
|
|
-
|
|
|
- let DataRuleContent3 = []
|
|
|
- if (subRule) {
|
|
|
- DataRuleContent3.push(subRule)
|
|
|
- }
|
|
|
- DataRuleContent3.push(extractRule)
|
|
|
- if (countRule) {
|
|
|
- DataRuleContent3.push(countRule)
|
|
|
- }
|
|
|
- DataRuleContent3 = DataRuleContent3.length ? JSON.stringify(DataRuleContent3) : undefined
|
|
|
- otherParams = {
|
|
|
- EquipmentMark: other.EquipmentMark,
|
|
|
- DataRuleContent: DataRuleContent3
|
|
|
- }
|
|
|
- updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
- break
|
|
|
- case '需拆分处理':
|
|
|
- let SplitPoints = other.devArr.length ? other.devArr : undefined
|
|
|
- let DataRuleContent4 = undefined
|
|
|
- var enum5 = null
|
|
|
- if (other.tranfVal) {
|
|
|
- enum5 = { seq: 2, ruletype: 'type2', content: other.pointArr }
|
|
|
- } else {
|
|
|
- enum5 = { seq: 2, ruletype: 'type2', content: [] }
|
|
|
- }
|
|
|
- SplitPoints.forEach(ele => {
|
|
|
- let cutStr = {
|
|
|
- seq: 1,
|
|
|
- ruletype: 'type4',
|
|
|
- content: [
|
|
|
- {
|
|
|
- from: ele.SplitStart,
|
|
|
- to: ele.SplitEnd
|
|
|
- }
|
|
|
- ]
|
|
|
+ DataRuleContent3 = DataRuleContent3.length ? JSON.stringify(DataRuleContent3) : undefined
|
|
|
+ eachData.DataRuleContent = DataRuleContent3;
|
|
|
+ // otherParams = {
|
|
|
+ // EquipmentMark: other.EquipmentMark,
|
|
|
+ // DataRuleContent: DataRuleContent3
|
|
|
+ // }
|
|
|
+ // updateParams.data.Content[0].EquipmentMark = other.EquipmentMark
|
|
|
+ break
|
|
|
+ case '需拆分处理':
|
|
|
+ let SplitPoints = t.other.devArr.length ? t.other.devArr : undefined
|
|
|
+ let DataRuleContent4 = undefined
|
|
|
+ var enum5 = null
|
|
|
+ if (t.other.tranfVal) {
|
|
|
+ enum5 = { seq: 2, ruletype: 'type2', content: t.other.pointArr }
|
|
|
+ } else {
|
|
|
+ enum5 = { seq: 2, ruletype: 'type2', content: [] }
|
|
|
}
|
|
|
- ele.DataRuleContent = JSON.stringify([cutStr, enum5])
|
|
|
- })
|
|
|
- otherParams = {
|
|
|
- SplitPoints: SplitPoints
|
|
|
- }
|
|
|
- updateParams.data.Content[0].EquipmentMark = other.eqMark
|
|
|
- break
|
|
|
- }
|
|
|
- let params = [Object.assign(basicParams, otherParams)]
|
|
|
+ SplitPoints.forEach(ele => {
|
|
|
+ let cutStr = {
|
|
|
+ seq: 1,
|
|
|
+ ruletype: 'type4',
|
|
|
+ content: [
|
|
|
+ {
|
|
|
+ from: ele.SplitStart,
|
|
|
+ to: ele.SplitEnd
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ ele.DataRuleContent = JSON.stringify([cutStr, enum5])
|
|
|
+ })
|
|
|
+ eachData.SplitPoints = SplitPoints;
|
|
|
+ // otherParams = {
|
|
|
+ // SplitPoints: SplitPoints
|
|
|
+ // }
|
|
|
+ updateParams.data.Content[0].EquipmentMark = t.other.eqMark
|
|
|
+ break
|
|
|
+ }
|
|
|
+ return eachData;
|
|
|
+ })
|
|
|
updatePoint(updateParams, res => { this.create(params) })
|
|
|
},
|
|
|
create(params) {
|
|
@@ -367,7 +410,7 @@ export default {
|
|
|
},
|
|
|
handleItemChange(val, cb) {
|
|
|
if (val.length == 3) {
|
|
|
- if(val[2]!='null'){
|
|
|
+ if (val[2] != 'null') {
|
|
|
let params = { type: val[2] }
|
|
|
getQueryProperty(params, res => {
|
|
|
if (res.Result == 'success') {
|
|
@@ -435,46 +478,61 @@ export default {
|
|
|
},
|
|
|
init() {
|
|
|
//获取所有的设备
|
|
|
- this.getEqAll()
|
|
|
+ // this.getEqAll()
|
|
|
},
|
|
|
//回显数值
|
|
|
async showValue(val) {
|
|
|
// await this.getEqAll()
|
|
|
let length = val.RelationList.length
|
|
|
let eqMark = this.editData.Point.EquipmentMark
|
|
|
+ this.form.EquipmentMark = eqMark;
|
|
|
+ console.log('-------------')
|
|
|
+ console.log(val)
|
|
|
if (length) {
|
|
|
var data = val.RelationList[0]
|
|
|
let dict = [data.SpecialtyCode, data.SystemCode, data.EquipmentTypeCode]
|
|
|
//回显字典
|
|
|
- let tempArr = []
|
|
|
- if (data.TypeCode == 'Eq' || data.TypeCode == 'Ec' || data.TypeCode == 'Sp') {
|
|
|
- tempArr = [data.TypeCode, data.EquipmentTypeCode, data.InfomationPointCode]
|
|
|
- } else if (data.TypeCode == 'Sy') {
|
|
|
- tempArr = [data.TypeCode, data.SpecialtyCode, data.SystemCode, data.InfomationPointCode]
|
|
|
- } else {
|
|
|
- tempArr = [data.TypeCode, data.InfomationPointCode]
|
|
|
- }
|
|
|
+ let tempArr = val.RelationList.map(t => {
|
|
|
+ let eachData = [];
|
|
|
+ if (t.TypeCode == 'Eq' || t.TypeCode == 'Ec' || t.TypeCode == 'Sp') {
|
|
|
+ eachData = [t.TypeCode, t.EquipmentTypeCode, t.InfomationPointCode]
|
|
|
+ } else if (t.TypeCode == 'Sy') {
|
|
|
+ eachData = [t.TypeCode, t.SpecialtyCode, t.SystemCode, t.InfomationPointCode]
|
|
|
+ } else {
|
|
|
+ eachData = [t.TypeCode, t.InfomationPointCode]
|
|
|
+ }
|
|
|
+ return eachData;
|
|
|
+ })
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.dictionaryCas.setCascaderVal(tempArr)
|
|
|
+ this.$refs.dictionaryCas.setCascaderVal(tempArr);
|
|
|
})
|
|
|
-
|
|
|
- this.form.DataRuleType = data.DataRuleType
|
|
|
+ this.typeList = val.RelationList.map(t => {
|
|
|
+ if (t.TypeCode == 'Eq' || t.TypeCode == 'Ec' || t.TypeCode == 'Sp') {
|
|
|
+ t.name = `${t.Type}-${t.EquipmentType}-${t.InfomationPoint}`
|
|
|
+ } else if (t.TypeCode == 'Sy') {
|
|
|
+ t.name = `${t.Type}-${t.Specialty}-${t.System}-${t.InfomationPoint}`
|
|
|
+ } else {
|
|
|
+ t.name = `${t.Type}-${t.InfomationPoint}`
|
|
|
+ }
|
|
|
+ return t;
|
|
|
+ });
|
|
|
+ this.form.DataRuleType = data.DataRuleType
|
|
|
// this.handleItemChange(dict, () => {
|
|
|
- // this.unitObj = this.infoDict[data.InfomationPointCode]
|
|
|
- // this.InfomationPoint = this.unitObj.infoPointName || '--'
|
|
|
- // if (typeof this.unitObj.dataSource == 'string') {
|
|
|
- // if (this.unitObj.dataSource.length) {
|
|
|
- // this.ValueDescription = this.unitObj.dataSource
|
|
|
- // } else {
|
|
|
- // this.ValueDescription = '无信息点单位及值说明'
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // let str = ''
|
|
|
- // this.unitObj.dataSource.forEach(ele => {
|
|
|
- // str += ele.code + '.' + ele.name + ' '
|
|
|
- // })
|
|
|
- // this.ValueDescription = str
|
|
|
- // }
|
|
|
+ // this.unitObj = this.infoDict[data.InfomationPointCode]
|
|
|
+ // this.InfomationPoint = this.unitObj.infoPointName || '--'
|
|
|
+ // if (typeof this.unitObj.dataSource == 'string') {
|
|
|
+ // if (this.unitObj.dataSource.length) {
|
|
|
+ // this.ValueDescription = this.unitObj.dataSource
|
|
|
+ // } else {
|
|
|
+ // this.ValueDescription = '无信息点单位及值说明'
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // let str = ''
|
|
|
+ // this.unitObj.dataSource.forEach(ele => {
|
|
|
+ // str += ele.code + '.' + ele.name + ' '
|
|
|
+ // })
|
|
|
+ // this.ValueDescription = str
|
|
|
+ // }
|
|
|
// })
|
|
|
if (length == 1) {
|
|
|
let flag = data.DataRuleType
|
|
@@ -585,11 +643,41 @@ export default {
|
|
|
//对应数据字典变化
|
|
|
changeDictionaryCas({ val, labels, data }) {
|
|
|
this.dictionaryData = val;
|
|
|
- this.dictionaryNames = labels
|
|
|
+ this.dictionaryNames = labels || '';
|
|
|
+ this.unitObj = data || {}
|
|
|
+ if (this.typeList.length) {
|
|
|
+ this.typeList = this.typeList.map(t => {
|
|
|
+ if (labels.indexOf(t.name) < 0) {
|
|
|
+ return undefined
|
|
|
+ }
|
|
|
+ return t;
|
|
|
+ }).filter(item => item)
|
|
|
+ let temp = this.typeList.map(t => {
|
|
|
+ return t.name;
|
|
|
+ })
|
|
|
+ for (let i = 0; i < labels.length; i++) {
|
|
|
+ if (temp.indexOf(labels[i]) < 0) {
|
|
|
+ this.typeList.push({
|
|
|
+ name: labels[i],
|
|
|
+ DataRuleType: '无需处理,直接使用'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.typeList = labels.map(t => {
|
|
|
+ return {
|
|
|
+ name: t,
|
|
|
+ DataRuleType: '无需处理,直接使用'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.typeList = this.typeList.map((t, i) => {
|
|
|
+ t.ValueDescription = this.delDataSource(data[val[i][val[i].length - 1]].DataSource)
|
|
|
+ return t;
|
|
|
+ })
|
|
|
// this.infoDict = this.$refs.dictionaryCas.pointDataSource
|
|
|
- this.unitObj = data
|
|
|
- this.InfomationPoint = this.unitObj.InfoPointName || ''
|
|
|
- this.ValueDescription = this.delDataSource(this.unitObj.DataSource)
|
|
|
+ // this.InfomationPoint = this.unitObj.InfoPointName || ''
|
|
|
+ // this.ValueDescription = this.delDataSource(this.unitObj.DataSource)
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
@@ -626,7 +714,7 @@ export default {
|
|
|
span:nth-of-type(2) {
|
|
|
width: calc(100% - 120px);
|
|
|
overflow: hidden;
|
|
|
- text-overflow:ellipsis;
|
|
|
+ text-overflow: ellipsis;
|
|
|
white-space: nowrap;
|
|
|
}
|
|
|
}
|
|
@@ -644,6 +732,7 @@ export default {
|
|
|
}
|
|
|
.btm {
|
|
|
margin-top: 5px;
|
|
|
+ margin-left: 140px;
|
|
|
}
|
|
|
}
|
|
|
}
|