Skip to content

Commit

Permalink
fix(equipmentCloud): 修复产品详情默认经纬度未赋值导致的报错
Browse files Browse the repository at this point in the history
  • Loading branch information
h7ml committed Jun 27, 2022
1 parent 382b7f8 commit 0aff5e1
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 2 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: 'npm' # See documentation for possible values
directory: '/' # Location of package manifests
schedule:
interval: 'daily'
1 change: 1 addition & 0 deletions CHANGELOG.EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

### Features

* **cloudPressure:** 压测报告生成添加等待时间 优化loading ([2969b9b](https://github.com/dgiot/dgiot-dashboard/commit/2969b9b605b24507300bfcbb48515ec6fc4a1a80))
* **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
* **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
* **components:** 云压测 ([ed99eee](https://github.com/dgiot/dgiot-dashboard/commit/ed99eee177a5947609cfa35998bdd1f8b3d3a9ab))
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

### Features

* **cloudPressure:** 压测报告生成添加等待时间 优化loading ([2969b9b](https://github.com/dgiot/dgiot-dashboard/commit/2969b9b605b24507300bfcbb48515ec6fc4a1a80))
* **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
* **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
* **components:** 云压测 ([ed99eee](https://github.com/dgiot/dgiot-dashboard/commit/ed99eee177a5947609cfa35998bdd1f8b3d3a9ab))
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

### Features

* **cloudPressure:** 压测报告生成添加等待时间 优化loading ([2969b9b](https://github.com/dgiot/dgiot-dashboard/commit/2969b9b605b24507300bfcbb48515ec6fc4a1a80))
* **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
* **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
* **components:** 云压测 ([ed99eee](https://github.com/dgiot/dgiot-dashboard/commit/ed99eee177a5947609cfa35998bdd1f8b3d3a9ab))
Expand Down
2 changes: 1 addition & 1 deletion src/dgiot/components/DgiotAmis/render.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
console.info('请求url', url)
console.groupEnd()
if (url.indexOf('null') == -1 || url.indexOf('undefined') == -1) {
throw new Error(`url请求参数不正确${url}`)
// throw new Error(`url请求参数不正确${url}`)
console.log(url)
// topo 以下处理了 请求参数替换不正确时页面报错的情况
url = url.replace('/null', '/').replace('/undefined', '/')
Expand Down
10 changes: 9 additions & 1 deletion src/views/DeviceCloud/manage/js/proddetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -3247,7 +3247,15 @@ export default {
if (response) {
this.productInfo = _.merge(response, {
decoder: { code: '' },
thing: { properties: [] }
thing: { properties: [] },
config: {
address: '余杭区良渚平高创业城c1座',
location: {
latitude: '120.161324',
longitude: '30.262441',
__type: 'GeoPoint',
},
},
})
this.productName = response.name
for (var key in response) {
Expand Down

0 comments on commit 0aff5e1

Please sign in to comment.