Skip to content

Commit

Permalink
feat(proxy): nodejs_version
Browse files Browse the repository at this point in the history
  • Loading branch information
h7ml committed Jun 10, 2022
1 parent fb32ae8 commit 25f0fea
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 15 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG.ZH.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-06-10)


### Bug Fixes

* **moment): feat(konva:** utils ([e36f501](https://github.com/dgiot/dgiot-dashboard/commit/e36f501e300baede4ce99de3e2ab4d07da7dc6e0))
* **queryZetaProduct:** queryProductTemplet ([1c47a45](https://github.com/dgiot/dgiot-dashboard/commit/1c47a4511451818ecd1f8fdcf2b4cebd0e6b4761))
* **this:** 修复this指向错误 ([2a803ad](https://github.com/dgiot/dgiot-dashboard/commit/2a803ad10013ce96fa45e994c029fa403a414ae7))


### Features

* **压测任务:** 压测报告 ([e6e6f6b](https://github.com/dgiot/dgiot-dashboard/commit/e6e6f6b4fec9ffe91a2d691e4573dae05bbdb99d))
* **grafana:** url ([530b9fd](https://github.com/dgiot/dgiot-dashboard/commit/530b9fd1b095e86614234ee1f585ef0c6fb07eec))
* **konva:** utils ([ceafa78](https://github.com/dgiot/dgiot-dashboard/commit/ceafa787b91cbca42a7efd52ce92a3b5e673b94b))
* **router:** 路由处理分离 ([e2023ed](https://github.com/dgiot/dgiot-dashboard/commit/e2023ed42854c38af414288faf4260a064ed2d7e))
* **secret:** 百度地图密钥全局配置 ([f17b43d](https://github.com/dgiot/dgiot-dashboard/commit/f17b43dd1f27f1cd5d2d61fc347a4dd706f2d630))
* translate ([ebd3196](https://github.com/dgiot/dgiot-dashboard/commit/ebd3196a719d75bb8978143935d87529262c6980))
* update catalogue ([4530af6](https://github.com/dgiot/dgiot-dashboard/commit/4530af6825129925923dfd6e2000701b9cb5a63a))


### Reverts

* **修复应用管理 && 背景图丢失): feat(grafana:** url ([2ee8701](https://github.com/dgiot/dgiot-dashboard/commit/2ee87010a2ef7e6afdc580ad2a155f975447f885))



## 4.5.4 (2022-06-01)


Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-06-10)


### Bug Fixes

* **moment): feat(konva:** utils ([e36f501](https://github.com/dgiot/dgiot-dashboard/commit/e36f501e300baede4ce99de3e2ab4d07da7dc6e0))
* **queryZetaProduct:** queryProductTemplet ([1c47a45](https://github.com/dgiot/dgiot-dashboard/commit/1c47a4511451818ecd1f8fdcf2b4cebd0e6b4761))
* **this:** 修复this指向错误 ([2a803ad](https://github.com/dgiot/dgiot-dashboard/commit/2a803ad10013ce96fa45e994c029fa403a414ae7))


### Features

* **压测任务:** 压测报告 ([e6e6f6b](https://github.com/dgiot/dgiot-dashboard/commit/e6e6f6b4fec9ffe91a2d691e4573dae05bbdb99d))
* **grafana:** url ([530b9fd](https://github.com/dgiot/dgiot-dashboard/commit/530b9fd1b095e86614234ee1f585ef0c6fb07eec))
* **konva:** utils ([ceafa78](https://github.com/dgiot/dgiot-dashboard/commit/ceafa787b91cbca42a7efd52ce92a3b5e673b94b))
* **router:** 路由处理分离 ([e2023ed](https://github.com/dgiot/dgiot-dashboard/commit/e2023ed42854c38af414288faf4260a064ed2d7e))
* **secret:** 百度地图密钥全局配置 ([f17b43d](https://github.com/dgiot/dgiot-dashboard/commit/f17b43dd1f27f1cd5d2d61fc347a4dd706f2d630))
* translate ([ebd3196](https://github.com/dgiot/dgiot-dashboard/commit/ebd3196a719d75bb8978143935d87529262c6980))
* update catalogue ([4530af6](https://github.com/dgiot/dgiot-dashboard/commit/4530af6825129925923dfd6e2000701b9cb5a63a))


### Reverts

* **修复应用管理 && 背景图丢失): feat(grafana:** url ([2ee8701](https://github.com/dgiot/dgiot-dashboard/commit/2ee87010a2ef7e6afdc580ad2a155f975447f885))



## 4.5.4 (2022-06-01)


Expand Down
8 changes: 3 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ environment:

install:
- ps: Install-Product node $env:nodejs_version
- curl -L https://unpkg.com/@pnpm/self-installer | node
- pnpm config set registry https://registry.npmmirror.com
- pnpm config get registry
- pnpm install
- npm config get registry
- npm install --legacy-peer-deps
test_script:
- pnpm build
- npm run build
build: off
1 change: 0 additions & 1 deletion src/config/setting.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ module.exports = {
'gitee.io',
'github.io',
'netlify.app',
'vercel.app',
'surge.sh',
'h7ml.icu',
],
Expand Down
1 change: 0 additions & 1 deletion src/utils/webscroket/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ let localHost = [
'gitee.io',
'github.io',
'netlify.app',
'vercel.app',
'surge.sh',
'h7ml.icu',
]
Expand Down
14 changes: 6 additions & 8 deletions src/views/DeviceCloud/manage/js/devicesDetailLite.js
Original file line number Diff line number Diff line change
Expand Up @@ -840,24 +840,22 @@ export default {
})
},
CardDevice() {
var vm = this
vm.loading = true
getCardDevice(vm.deviceid)
this.loading = true
getCardDevice(this.deviceid)
.then((response) => {
if (response?.data) {
vm.renderCard(response.data)
this.renderCard(response.data)
}
})
.catch((error) => {
console.log('update error 清除timer', error)
})
setTimeout(() => {
vm.loading = false
this.loading = false
}, 800)
},
//渲染卡片
renderCard(resData) {
var vm = this
let array = []
resData.forEach((item) => {
if (item.devicetype) {
Expand All @@ -876,8 +874,8 @@ export default {
})
machine[item] = arr
})
vm.machinelist = machine
vm.thirdtbKey = moment(new Date()).valueOf()
this.machinelist = machine
this.thirdtbKey = moment(new Date()).valueOf()
},
// 实时数据的分页
dataDeviceSizeChange(val) {
Expand Down

1 comment on commit 25f0fea

@vercel
Copy link

@vercel vercel bot commented on 25f0fea Jun 10, 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-dgiot.vercel.app
dgiot-dashboard.vercel.app

Please sign in to comment.