diff --git a/config/dev.env.js b/config/dev.env.js index 958ed54..72ababf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:14537"' - BASE_API: '"http://111.198.10.15:11304"' + // BASE_API: '"http://111.198.10.15:11304"' + BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 958ed54..72ababf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:14537"' - BASE_API: '"http://111.198.10.15:11304"' + // BASE_API: '"http://111.198.10.15:11304"' + BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' }) diff --git a/config/prod.env.js b/config/prod.env.js index bcc4cef..e5e1df3 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://111.198.10.15:11304"', + // BASE_API: '"http://111.198.10.15:11304"', + BASE_API: '"http://42.81.160.165:2022/smartwell/"', } diff --git a/config/dev.env.js b/config/dev.env.js index 958ed54..72ababf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:14537"' - BASE_API: '"http://111.198.10.15:11304"' + // BASE_API: '"http://111.198.10.15:11304"' + BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' }) diff --git a/config/prod.env.js b/config/prod.env.js index bcc4cef..e5e1df3 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://111.198.10.15:11304"', + // BASE_API: '"http://111.198.10.15:11304"', + BASE_API: '"http://42.81.160.165:2022/smartwell/"', } diff --git a/src/router/index.js b/src/router/index.js index 4b8c2b6..8aacb9c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -139,7 +139,7 @@ path: '/listRule', name: 'ListRule', component: () => import('@/views/alarmRule/alarmRule'), - meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] } + meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] } } ] }, diff --git a/config/dev.env.js b/config/dev.env.js index 958ed54..72ababf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:14537"' - BASE_API: '"http://111.198.10.15:11304"' + // BASE_API: '"http://111.198.10.15:11304"' + BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' }) diff --git a/config/prod.env.js b/config/prod.env.js index bcc4cef..e5e1df3 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://111.198.10.15:11304"', + // BASE_API: '"http://111.198.10.15:11304"', + BASE_API: '"http://42.81.160.165:2022/smartwell/"', } diff --git a/src/router/index.js b/src/router/index.js index 4b8c2b6..8aacb9c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -139,7 +139,7 @@ path: '/listRule', name: 'ListRule', component: () => import('@/views/alarmRule/alarmRule'), - meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] } + meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] } } ] }, diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index 1f52bfb..1c117e8 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -133,7 +133,7 @@ return { aMapManager, type: 'massMarkers', // 加载数据方式:massMarkers或cluster - refreshType: 'websocket', // 刷新数据方式:clock或websocket + refreshType: 'clock', // 刷新数据方式:clock或websocket showAlarm: true, // 是否显示报警 showAll: false, // 是否显示全部井 listQuery: { diff --git a/config/dev.env.js b/config/dev.env.js index 958ed54..72ababf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:14537"' - BASE_API: '"http://111.198.10.15:11304"' + // BASE_API: '"http://111.198.10.15:11304"' + BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' }) diff --git a/config/prod.env.js b/config/prod.env.js index bcc4cef..e5e1df3 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://111.198.10.15:11304"', + // BASE_API: '"http://111.198.10.15:11304"', + BASE_API: '"http://42.81.160.165:2022/smartwell/"', } diff --git a/src/router/index.js b/src/router/index.js index 4b8c2b6..8aacb9c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -139,7 +139,7 @@ path: '/listRule', name: 'ListRule', component: () => import('@/views/alarmRule/alarmRule'), - meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] } + meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] } } ] }, diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index 1f52bfb..1c117e8 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -133,7 +133,7 @@ return { aMapManager, type: 'massMarkers', // 加载数据方式:massMarkers或cluster - refreshType: 'websocket', // 刷新数据方式:clock或websocket + refreshType: 'clock', // 刷新数据方式:clock或websocket showAlarm: true, // 是否显示报警 showAll: false, // 是否显示全部井 listQuery: { diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue index 7a03250..aee4692 100644 --- a/src/views/wellManage/infoWell.vue +++ b/src/views/wellManage/infoWell.vue @@ -70,7 +70,7 @@
- +