diff --git a/src/api/axios.js b/src/api/axios.js index 031f8de..029851f 100644 --- a/src/api/axios.js +++ b/src/api/axios.js @@ -35,7 +35,7 @@ const LoadingInstance = { function myAxios(axiosConfig, customOptions) { const service = axios.create({ baseURL: axiosConfig.type ? '' : baseURLs, // 设置统一的请求前缀 - timeout: 10000, // 设置统一的超时时长 + timeout: 20000, // 设置统一的超时时长 }); // 自定义配置 diff --git a/src/api/common.js b/src/api/common.js index 29082ec..e2f780a 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -2,7 +2,7 @@ import myAxios from "./axios"; import myAxios2 from "./axios2"; const sx = process.env.VUE_APP_CITY_TYPE == 'sx'?'/ferry_service/ferryController/conveyor':'' -const sxAdmin = process.env.VUE_APP_CITY_TYPE == 'sx'?'/admin/grsg2':'/thirdpart/grsg' +const sxAdmin = (process.env.VUE_APP_CITY_TYPE == 'sx'||process.env.VUE_APP_CITY_TYPE == 'cq')?'/admin/grsg2':'/thirdpart/grsg' /** * 查询系统码表 diff --git a/src/assets/warning.jpg b/src/assets/warning.jpg new file mode 100644 index 0000000..df2ea84 Binary files /dev/null and b/src/assets/warning.jpg differ diff --git a/src/views/energyEfficiency/index.vue b/src/views/energyEfficiency/index.vue index 6554e55..ba9afc3 100644 --- a/src/views/energyEfficiency/index.vue +++ b/src/views/energyEfficiency/index.vue @@ -1,6 +1,8 @@