From b789e06bd2befd14c42bafa462bff2dfa35f58a2 Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Mon, 13 Mar 2023 17:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88-=E9=AB=98=E6=94=AF?= =?UTF-8?q?=E6=A8=A1=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 4 +- src/assets/js/api/highModulus.js | 5 +- src/assets/js/http.js | 3 +- src/components/account.vue | 3 +- src/store/index.js | 10 +- .../fourEngin/assets/images/common}/blueH.png | Bin .../fourEngin/command/rightTwo.vue | 2 +- .../projectFront/highModulus/alarmInfo.vue | 373 ++++++++++-------- 8 files changed, 235 insertions(+), 165 deletions(-) rename src/{assets/images/zjsj => views/projectAdmin/fourEngin/assets/images/common}/blueH.png (100%) diff --git a/public/js/config.js b/public/js/config.js index e56bebea..e7fb5161 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,4 +1,4 @@ -// var COMPANY = ''; //通用 +var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -7,7 +7,7 @@ // var COMPANY='shenbai'; //沈白高铁 // COMPANY = 'henan' // 河南春笋 // COMPANY = 'xingxuan' -COMPANY = 'hengtong'//瑞士恒通 +// COMPANY = 'hengtong'//瑞士恒通 diff --git a/src/assets/js/api/highModulus.js b/src/assets/js/api/highModulus.js index c935bf5b..a9665886 100644 --- a/src/assets/js/api/highModulus.js +++ b/src/assets/js/api/highModulus.js @@ -29,4 +29,7 @@ export const selectHighFormworkPlaneFigureListApi = data => post('xmgl/highFormw // 编辑平面图点位 export const updateFigureCoordinateApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/updateFigureCoordinate', data); // 查询点位 -export const selecthighFormworkPlaneFigureCoordinateListApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/selectList',data); \ No newline at end of file +export const selecthighFormworkPlaneFigureCoordinateListApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/selectList',data); + +//分页列表查询高支模报警数据信息 +export const getHighFormworkAlarmDataApi = data => get('/xmgl/highFormworkAlarmData/list', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 88e50c0c..f1892a38 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -72,8 +72,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456 // axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789 // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 - axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 + // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 + axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' diff --git a/src/components/account.vue b/src/components/account.vue index 99ac5728..f81ea52e 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -127,7 +127,8 @@

- {{ $store.state.userInfo.menuAuthority.roleName }} + + 公司管理员

{{ headerConfiguration }} diff --git a/src/store/index.js b/src/store/index.js index f289925d..95dda892 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,9 +48,9 @@ export default new Vuex.Store({ BASEURL: baseUrl ? baseUrl : window.location.protocol + "//" + window.location.host + "/", // - UPLOADURL: - window.location.protocol + "//" + window.location.host + "/upload/image", // - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试 + // UPLOADURL: + // window.location.protocol + "//" + window.location.host + "/upload/image", // + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试 // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 @@ -63,8 +63,8 @@ export default new Vuex.Store({ // BASEURL:'http://192.168.34.116:6023/', // UPLOADURL: 'http://192.168.34.116:6023/upload/image', // FILEURL: 'http://192.168.34.116:6023/image/', - // UPLOADURL: 'http://124.71.67.160:8088/upload/image', - // FILEURL: 'http://124.71.67.160:8088/image/', + UPLOADURL: 'http://124.71.67.160:8088/upload/image', + FILEURL: 'http://124.71.67.160:8088/image/', //--- // UPLOADURL: 'http://192.168.34.125:6023/upload/i·mage', // FILEURL: 'http://192.168.34.125:6023/image/', diff --git a/src/assets/images/zjsj/blueH.png b/src/views/projectAdmin/fourEngin/assets/images/common/blueH.png similarity index 100% rename from src/assets/images/zjsj/blueH.png rename to src/views/projectAdmin/fourEngin/assets/images/common/blueH.png diff --git a/src/views/projectAdmin/fourEngin/command/rightTwo.vue b/src/views/projectAdmin/fourEngin/command/rightTwo.vue index c5ee204a..febddb7b 100644 --- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue @@ -132,7 +132,7 @@ export default { .woria { width: 100%; height: calc(115% - 92px); - background: url(/img/blueH.da444a96.png) no-repeat; + background: url(../assets/images/common/blueH.png) no-repeat; background-size: 99% 101%; // margin-top: 10px; .woriaTwo { diff --git a/src/views/projectFront/highModulus/alarmInfo.vue b/src/views/projectFront/highModulus/alarmInfo.vue index 07d077bf..64c143ca 100644 --- a/src/views/projectFront/highModulus/alarmInfo.vue +++ b/src/views/projectFront/highModulus/alarmInfo.vue @@ -1,6 +1,6 @@ \ No newline at end of file