Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

b9bc0e17 · 朱超 · 346ea3ea · c7982d6f · b9bc0e17 · b9bc0e17
Commit b9bc0e17 authored Jul 25, 2024 by 朱超
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 411 additions and 602 deletions

config.js public/config.js +4 -4

AlarmInfoPage.vue src/views/AlarmPage/AlarmInfoPage.vue +407 -598

No files found.
--- a/public/config.js
+++ b/public/config.js

- export const ExternalSERVEICE='http://218.69.97.198:8001'
- export const WithinSERVEICE='http://192.168.1.252:8001'
-//export const ExternalSERVEICE='http://localhost:5013'
-//export const WithinSERVEICE='http://localhost:5013'
+//  export const ExternalSERVEICE='http://218.69.97.198:8001'
+//  export const WithinSERVEICE='http://192.168.1.252:8001'
+export const ExternalSERVEICE='http://localhost:5013'
+export const WithinSERVEICE='http://localhost:5013'
 export const CURRLOGO="LOGO_gangyi.png"

--- a/src/views/AlarmPage/AlarmInfoPage.vue
+++ b/src/views/AlarmPage/AlarmInfoPage.vue