Skip to content

Commit

Permalink
fix(equipmentCloud): config
Browse files Browse the repository at this point in the history
  • Loading branch information
dawnwinterLiu committed Oct 14, 2022
1 parent 2f344d5 commit a7575d2
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 11 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.EN.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [4.6.2](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.2) (2022-10-14)


### Features

* **cloudOperations:** 告警关联规则引擎修改 ([f61ef67](https://github.com/dgiot/dgiot-dashboard/commit/f61ef6716d84ac4ed8a7b011afe56d308b056f83))
* **dashboard:** update v4.6.2 ([2f344d5](https://github.com/dgiot/dgiot-dashboard/commit/2f344d5c43660950738926aeac7b9f7be3f56a49))
* dgiot_grafana ([a9eb8ef](https://github.com/dgiot/dgiot-dashboard/commit/a9eb8ef9210bcba3b06905b37f3466015087204f))
* index ([84ec4c3](https://github.com/dgiot/dgiot-dashboard/commit/84ec4c3a0c03016b7724d37a5784ce46bcafb04e))



## [4.6.1](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.1) (2022-09-23)


Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.ZH.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [4.6.2](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.2) (2022-10-14)


### Features

* **cloudOperations:** 告警关联规则引擎修改 ([f61ef67](https://github.com/dgiot/dgiot-dashboard/commit/f61ef6716d84ac4ed8a7b011afe56d308b056f83))
* **dashboard:** update v4.6.2 ([2f344d5](https://github.com/dgiot/dgiot-dashboard/commit/2f344d5c43660950738926aeac7b9f7be3f56a49))
* dgiot_grafana ([a9eb8ef](https://github.com/dgiot/dgiot-dashboard/commit/a9eb8ef9210bcba3b06905b37f3466015087204f))
* index ([84ec4c3](https://github.com/dgiot/dgiot-dashboard/commit/84ec4c3a0c03016b7724d37a5784ce46bcafb04e))



## [4.6.1](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.1) (2022-09-23)


Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [4.6.2](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.2) (2022-10-14)


### Features

* **cloudOperations:** 告警关联规则引擎修改 ([f61ef67](https://github.com/dgiot/dgiot-dashboard/commit/f61ef6716d84ac4ed8a7b011afe56d308b056f83))
* **dashboard:** update v4.6.2 ([2f344d5](https://github.com/dgiot/dgiot-dashboard/commit/2f344d5c43660950738926aeac7b9f7be3f56a49))
* dgiot_grafana ([a9eb8ef](https://github.com/dgiot/dgiot-dashboard/commit/a9eb8ef9210bcba3b06905b37f3466015087204f))
* index ([84ec4c3](https://github.com/dgiot/dgiot-dashboard/commit/84ec4c3a0c03016b7724d37a5784ce46bcafb04e))



## [4.6.1](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.1) (2022-09-23)


Expand Down
3 changes: 2 additions & 1 deletion src/views/CloudFunction/lowcode/components/ViewEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,10 @@
// 根据下拉的表,查到对应表数据
const params = {
order: '-updatedAt',
excludeKeys:
'children,thing,decoder,topics,productSecret,view,category,producttemplet',
}
const { results = [] } = await this.$query_object(_class, params)
console.log(results)
this.keys = results
} catch (error) {
console.log(error)
Expand Down
32 changes: 22 additions & 10 deletions src/views/DeviceCloud/manage/js/proddetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -886,15 +886,12 @@ export default {
},
},
mounted() {
this.query_notification()
this.getAllunit()
this.getDefaultTopic()
this.$nextTick(() => {
this.$refs._tabs.$children[0].$refs.tabs[3].style.display = 'none'
this.mqtt.router = this.$dgiotBus.router(this.$route.fullPath)
})
this.Industry()
this.getAllunit()
this.Industry()
// editor编辑器使用
editor2 = ace.edit('editor2')
editor2.session.setMode('ace/mode/text') // 设置语言
Expand All @@ -905,15 +902,11 @@ export default {
enableSnippets: true,
enableLiveAutocompletion: true, // 设置自动提示
})
if (this.$route.query.id) {
let id = this.$route.query.id
this.fileParams.path = `product/${id}`
this.get_filelist(`dgiot_file/product/${id}`) //dgiot_file/file ///`product/${id}`
}

if (this.$route.query.activeName) {
this.activeName = this.$route.query.activeName
}
if (this.$route.query.id) this.queryProductInfo(this.$route.query.id) // 获取产品信息
// if (this.$route.query.id) this.queryProductInfo(this.$route.query.id) // 获取产品信息
},
beforeDestroy() {
window.clearInterval(this.subtimer)
Expand Down Expand Up @@ -1647,11 +1640,16 @@ export default {
},
hiddenRow: ['class', 'key', 'createdAt'],
}
this.query_notification()
break
case 'fiveth':
this.getProductChannel()
break
case 'third':
this.getAllunit()
break
case 'second':
this.getDefaultTopic()
this.getTopic()
break
case 'seven':
Expand All @@ -1663,6 +1661,13 @@ export default {
case 'eighth':
this.isreload++
break
case 'file':
if (this.$route.query.id) {
let id = this.$route.query.id
this.fileParams.path = `product/${id}`
this.get_filelist(`dgiot_file/product/${id}`) //dgiot_file/file ///`product/${id}`
}
break
default:
window.clearInterval(this.subtimer)
this.subtimer = null
Expand Down Expand Up @@ -3396,6 +3401,13 @@ export default {
this.productInfo = _.merge(response, {
decoder: { code: '' },
thing: { properties: [] },
config: {
address: '余杭区良渚平高创业城c1座',
location: {
longitude: '120.161324',
latitude: '30.262441',
},
},
})
this.productName = response.name
for (var key in response) {
Expand Down

1 comment on commit a7575d2

@vercel
Copy link

@vercel vercel bot commented on a7575d2 Oct 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dgiot-dashboard – ./

dgiot-dashboard-git-master-dgiot.vercel.app
dgiot-dashboard.vercel.app
dgiot-dashboard-dgiot.vercel.app

Please sign in to comment.