|
|
@@ -185,7 +185,7 @@
|
|
|
<span style="width: 10%">子设备名称 : </span>
|
|
|
<span style="margin-right: 20px">{{detailTitle.worldName}}</span>
|
|
|
</div>
|
|
|
- <div style="margin-top: 10px;margin-left: 25px;">
|
|
|
+ <div style="margin-top: 20px;margin-left: 110px;">
|
|
|
<el-transfer
|
|
|
filterable
|
|
|
:titles="['待选字段', '已选字段']"
|
|
|
@@ -354,10 +354,9 @@ export default {
|
|
|
|
|
|
},
|
|
|
changeMeasurepoint (value, direction, movedKeys) {
|
|
|
- let measurepointID
|
|
|
+ let measurepointID = 0
|
|
|
for (let i = 0; i < movedKeys.length; i++) {
|
|
|
const sign = movedKeys[i]
|
|
|
-
|
|
|
measurepointID = this.selectData[sign].measurepointId
|
|
|
|
|
|
if (direction === 'right') {
|
|
|
@@ -447,7 +446,7 @@ export default {
|
|
|
this.soutRizhi = context.info + '\n\n' + this.soutRizhi
|
|
|
})
|
|
|
}
|
|
|
- this.soutRizhi = this.soutRiZhiSucess + '结束' + '\n\n' + this.soutRizhi
|
|
|
+ this.soutRizhi = this.soutRiZhiSucess + '结束！！！' + '\n\n' + this.soutRizhi
|
|
|
}
|
|
|
},
|
|
|
yuLanMouseOver () {
|
|
|
@@ -563,9 +562,10 @@ export default {
|
|
|
selectList: [], // 数据库中子设备字段名
|
|
|
sureSelectList: [], // 选择的子设备字段名
|
|
|
filedList: [{
|
|
|
- key: -1,
|
|
|
+ key: 0,
|
|
|
prop: 'time',
|
|
|
- label: '时间'
|
|
|
+ label: '时间',
|
|
|
+ measurepointId: Math.floor(Math.random() * 10000 + 1)
|
|
|
}], // 数据库的字段名
|
|
|
icon: 'icon iconfont icon-xitong1', // 图标
|
|
|
sql: {
|
|
|
@@ -601,7 +601,7 @@ export default {
|
|
|
if (headers) {
|
|
|
for (let i = 0; i < headers.length; i++) {
|
|
|
var list = {
|
|
|
- key: i,
|
|
|
+ key: i + 1,
|
|
|
measurepointId: headers[i].measurepointId,
|
|
|
prop: headers[i].name_en,
|
|
|
label: headers[i].name_zh
|
|
|
@@ -635,16 +635,17 @@ export default {
|
|
|
this.equimentClick()
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
+ // 单击事件
|
|
|
handleClick (id) {
|
|
|
- clearTimeout(this.clicktime) // 首先清除计时器
|
|
|
- this.clicktime = setTimeout(() => {
|
|
|
- // 这里执行你自己的方法或者业务逻辑
|
|
|
+ clearTimeout(this.time) // 首先清除计时器
|
|
|
+ this.time = setTimeout(() => {
|
|
|
this.equimentClick(id)
|
|
|
}, 300)
|
|
|
},
|
|
|
// 双击事件
|
|
|
dblClick (id) {
|
|
|
- clearTimeout(this.clicktime) // 清除
|
|
|
+ clearTimeout(this.time) // 清除
|
|
|
// 这里可以添加你自己双击事件的方法或者逻辑
|
|
|
this.equimentDoubleClick(id)
|
|
|
},
|
|
|
@@ -716,12 +717,12 @@ export default {
|
|
|
},
|
|
|
closeEqupField () {
|
|
|
this.showEqumField = false
|
|
|
-
|
|
|
// 根据选择的ID 找出对应的字段名 存储在sql 中
|
|
|
const chooseFiledEn = []
|
|
|
const chooseFiledZh = []
|
|
|
for (let i = 0; i < this.sureSelect.length; i++) {
|
|
|
const sign = this.sureSelect[i]
|
|
|
+
|
|
|
chooseFiledEn.push(this.selectData[sign].prop)
|
|
|
chooseFiledZh.push(this.selectData[sign].label)
|
|
|
}
|
|
|
@@ -832,16 +833,81 @@ export default {
|
|
|
this.$refs.pythonKafkaTmp.init(this.measurepoint.join())
|
|
|
})
|
|
|
},
|
|
|
- getSubSystem (resolve) {
|
|
|
+
|
|
|
+ getCoal (resolve) {
|
|
|
+ var coalData = {
|
|
|
+ userID: this.userID
|
|
|
+ }
|
|
|
+ let coalAll = []
|
|
|
+ this.$http({
|
|
|
+ url: this.$http.adornUrl('/dataset/tree/getcoal'),
|
|
|
+ method: 'post',
|
|
|
+ data: this.$http.adornData(coalData, false)
|
|
|
+ }).then(({data}) => {
|
|
|
+ if (!(data && data.code === 0)) {
|
|
|
+ Message.error(data.msg)
|
|
|
+ } else {
|
|
|
+ const coalContent = data.info
|
|
|
+ for (let sign = 0; sign < coalContent.length; sign++) {
|
|
|
+ var coal = {
|
|
|
+ name: coalContent[sign].name,
|
|
|
+ coalid: coalContent[sign].id,
|
|
|
+ limit: 'coal',
|
|
|
+ hbaseTableName: '',
|
|
|
+ icon: 'iconfont icon-xitongfuwu',
|
|
|
+ leaf: false
|
|
|
+ }
|
|
|
+ coalAll.push(coal)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return resolve(coalAll)
|
|
|
+ // console.log('***************')
|
|
|
+ // console.log(coalAll)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getSystem (coalId, resolve) {
|
|
|
+ var coalData = {
|
|
|
+ userID: this.userID,
|
|
|
+ coalid: coalId
|
|
|
+ }
|
|
|
+ this.$http({
|
|
|
+ url: this.$http.adornUrl('/dataset/tree/getfisystem'),
|
|
|
+ method: 'post',
|
|
|
+ data: this.$http.adornData(coalData, false)
|
|
|
+ }).then(systemRespond => {
|
|
|
+ let systemAll = []
|
|
|
+ if (systemRespond.data.length <= 0) {
|
|
|
+ Message.error(systemRespond.msg)
|
|
|
+ } else {
|
|
|
+ const systemContent = systemRespond.data
|
|
|
+ for (let i = 0; i < systemContent.length; i++) {
|
|
|
+ var system = {
|
|
|
+ name: systemContent[i].name,
|
|
|
+ systemid: systemContent[i].id,
|
|
|
+ limit: 'system',
|
|
|
+ icon: 'icon iconfont icon-xitongfuwu',
|
|
|
+ hbaseTableName: '',
|
|
|
+ leaf: false
|
|
|
+ }
|
|
|
+ systemAll.push(system)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return resolve(systemAll)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getSubSystem (systemid, resolve) {
|
|
|
+ const systemData = {
|
|
|
+ systemid: systemid,
|
|
|
+ userID: this.userID
|
|
|
+ }
|
|
|
this.$http({
|
|
|
url: this.$http.adornUrl('/dataset/tree/getsubSystem'),
|
|
|
- method: 'post'
|
|
|
+ method: 'post',
|
|
|
+ data: this.$http.adornData(systemData, false)
|
|
|
}).then(subrespond => {
|
|
|
let subSystemAll = []
|
|
|
let subSystemContent = subrespond.data
|
|
|
- if (subSystemContent.length === 0) {
|
|
|
- Message.error(subrespond.msg)
|
|
|
- } else {
|
|
|
+ if (subSystemContent.length !== 0) {
|
|
|
for (let j = 0; j < subSystemContent.length; j++) {
|
|
|
var subSystem = {
|
|
|
name: subSystemContent[j].name,
|
|
|
@@ -858,7 +924,8 @@ export default {
|
|
|
},
|
|
|
getEquipment (subSustemid, resolve) {
|
|
|
const subSystemData = {
|
|
|
- subSystemid: subSustemid
|
|
|
+ subSystemid: subSustemid,
|
|
|
+ userID: this.userID
|
|
|
}
|
|
|
this.$http({
|
|
|
url: this.$http.adornUrl('/dataset/tree/getequipment'),
|
|
|
@@ -867,9 +934,7 @@ export default {
|
|
|
}).then(eqprespond => {
|
|
|
let equipmentAll = []
|
|
|
const eqpSystemContent = eqprespond.data
|
|
|
- if (eqpSystemContent.length === 0) {
|
|
|
- Message.error(eqprespond.msg)
|
|
|
- } else {
|
|
|
+ if (eqpSystemContent.length !== 0) {
|
|
|
for (let k = 0; k < eqpSystemContent.length; k++) {
|
|
|
var equipment = {
|
|
|
name: eqpSystemContent[k].name,
|
|
|
@@ -887,6 +952,7 @@ export default {
|
|
|
},
|
|
|
getSubEquipment (equipmentid, resolve) {
|
|
|
const equimentData = {
|
|
|
+ userID: this.userID,
|
|
|
equipment: equipmentid
|
|
|
}
|
|
|
this.$http({
|
|
|
@@ -914,16 +980,113 @@ export default {
|
|
|
return resolve(subEquimentAll)
|
|
|
})
|
|
|
},
|
|
|
- // 左侧树的懒加载
|
|
|
+ // 左侧树的懒加载 五层结构
|
|
|
loadTreeNode (node, resolve) {
|
|
|
if (node.level === 0) {
|
|
|
- this.getSubSystem(resolve)
|
|
|
+ this.getCoal(resolve)
|
|
|
} else if (node.level === 1) {
|
|
|
+ this.getSystem(node.data.coalid, resolve)
|
|
|
+ } else if (node.level === 2) {
|
|
|
+ this.getSubSystem(node.data.systemid, resolve)
|
|
|
+ } else if (node.level === 3) {
|
|
|
this.getEquipment(node.data.subSustemid, resolve)
|
|
|
} else {
|
|
|
this.getSubEquipment(node.data.equipmentid, resolve)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // getSubSystem (resolve) {
|
|
|
+ // this.$http({
|
|
|
+ // url: this.$http.adornUrl('/dataset/tree/getsubSystem'),
|
|
|
+ // method: 'post'
|
|
|
+ // }).then(subrespond => {
|
|
|
+ // let subSystemAll = []
|
|
|
+ // let subSystemContent = subrespond.data
|
|
|
+ // if (subSystemContent.length === 0) {
|
|
|
+ // Message.error(subrespond.msg)
|
|
|
+ // } else {
|
|
|
+ // for (let j = 0; j < subSystemContent.length; j++) {
|
|
|
+ // var subSystem = {
|
|
|
+ // name: subSystemContent[j].name,
|
|
|
+ // subSustemid: subSystemContent[j].id,
|
|
|
+ // limit: 'subSystem',
|
|
|
+ // icon: 'iconfont icon-xitongfuwu',
|
|
|
+ // leaf: false
|
|
|
+ // }
|
|
|
+ // subSystemAll.push(subSystem)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // return resolve(subSystemAll)
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ // getEquipment (subSustemid, resolve) {
|
|
|
+ // const subSystemData = {
|
|
|
+ // subSystemid: subSustemid
|
|
|
+ // }
|
|
|
+ // this.$http({
|
|
|
+ // url: this.$http.adornUrl('/dataset/tree/getequipment'),
|
|
|
+ // method: 'post',
|
|
|
+ // data: this.$http.adornData(subSystemData, false)
|
|
|
+ // }).then(eqprespond => {
|
|
|
+ // let equipmentAll = []
|
|
|
+ // const eqpSystemContent = eqprespond.data
|
|
|
+ // if (eqpSystemContent.length === 0) {
|
|
|
+ // Message.error(eqprespond.msg)
|
|
|
+ // } else {
|
|
|
+ // for (let k = 0; k < eqpSystemContent.length; k++) {
|
|
|
+ // var equipment = {
|
|
|
+ // name: eqpSystemContent[k].name,
|
|
|
+ // equipmentid: eqpSystemContent[k].id,
|
|
|
+ // limit: 'equipment',
|
|
|
+ // hbaseTableName: '',
|
|
|
+ // icon: 'iconfont icon-xitongfuwu',
|
|
|
+ // leaf: false
|
|
|
+ // }
|
|
|
+ // equipmentAll.push(equipment)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // return resolve(equipmentAll)
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ // getSubEquipment (equipmentid, resolve) {
|
|
|
+ // const equimentData = {
|
|
|
+ // equipment: equipmentid
|
|
|
+ // }
|
|
|
+ // this.$http({
|
|
|
+ // url: this.$http.adornUrl('/dataset/tree/getsubequipment'),
|
|
|
+ // method: 'post',
|
|
|
+ // data: this.$http.adornData(equimentData, false)
|
|
|
+ // }).then(subEqpRespond => {
|
|
|
+ // let subEquimentAll = []
|
|
|
+ // const subEqpSystemContent = subEqpRespond.data
|
|
|
+ // if (subEqpSystemContent.length === 0) {
|
|
|
+ // Message.error(subEqpRespond.msg)
|
|
|
+ // } else {
|
|
|
+ // for (let m = 0; m < subEqpSystemContent.length; m++) {
|
|
|
+ // var subEquiment = {
|
|
|
+ // name: subEqpSystemContent[m].name,
|
|
|
+ // subEquipmentid: subEqpSystemContent[m].id,
|
|
|
+ // hbaseTableName: subEqpSystemContent[m].hbaseTableName,
|
|
|
+ // limit: 'children',
|
|
|
+ // icon: 'iconfont icon-xitong3',
|
|
|
+ // leaf: true
|
|
|
+ // }
|
|
|
+ // subEquimentAll.push(subEquiment)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // return resolve(subEquimentAll)
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ // // 左侧树的懒加载
|
|
|
+ // loadTreeNode (node, resolve) {
|
|
|
+ // if (node.level === 0) {
|
|
|
+ // this.getSubSystem(resolve)
|
|
|
+ // } else if (node.level === 1) {
|
|
|
+ // this.getEquipment(node.data.subSustemid, resolve)
|
|
|
+ // } else {
|
|
|
+ // this.getSubEquipment(node.data.equipmentid, resolve)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
},
|
|
|
// 生命周期 - 创建完成（可以访问当前this实例）
|
|
|
mounted () {
|
