From 01cfac30b02d807bdce6f99d3b2a7e8714b313bb Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 25 Mar 2024 00:33:29 +0800 Subject: [PATCH 1/4] fix: test --- public/js/config.js | 4 ++-- src/assets/js/http.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index fde19c6d..b5d0e08e 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -11,7 +11,7 @@ var COMPANY = '' //通用 // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -COMPANY = 'zjsj'//中建四局 +// COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 // COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 @@ -26,7 +26,7 @@ var PROJECT = { online_gxlt: 'gxlt', // 广西联通 } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true // 是否显示头部 var tabsShow = true // 是否显示tabs if (COMPANY == 'xingxuan') { diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 15309b9e..b5c2c766 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,11 +85,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 + axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 - axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 + // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 From 03b9230d80aeff0337749d2659c42fd4be1c190b Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 25 Mar 2024 11:06:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=9A=E4=BD=8D=E5=92=8C=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E6=A8=A1=E5=9D=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +-- .../dataPay/dataModule/dataPayAlarmRecord.vue | 5 +-- .../dataModule/dataPayRealTimeData.vue | 33 ++++++++----------- .../dataPay/dataModule/dataPayAlarmRecord.vue | 6 ++-- .../dataModule/dataPayRealTimeData.vue | 30 ++++------------- 5 files changed, 28 insertions(+), 50 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index b5c2c766..fd882353 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,10 +85,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 + // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 diff --git a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue index 978a0542..e66a9ee6 100644 --- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue +++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue @@ -4,8 +4,8 @@ - - + + @@ -123,6 +123,7 @@ export default { }, refresh() { this.searchForm = {} + this.daterange = [] this.pageInfo.pageNo = 1 //页数 this.pageInfo.pageSize = 10 //条数 this.getPage() diff --git a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue index 79b333c7..83df3b36 100644 --- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue +++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue @@ -4,21 +4,21 @@ - - + + - - + + - + @@ -32,7 +32,7 @@ - + - + - + @@ -149,6 +141,7 @@ export default { }, refresh() { this.searchForm = {} + this.daterange = [] this.pageInfo.pageNo = 1 //页数 this.pageInfo.pageSize = 10 //条数 this.getPage() diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue index f9dbaf2b..ba594cb7 100644 --- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue +++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue @@ -4,8 +4,9 @@ - - + + + @@ -143,6 +144,7 @@ export default { }, refresh() { this.searchForm = {} + this.daterange = [] this.pageInfo.pageNo = 1 //页数 this.pageInfo.pageSize = 10 //条数 this.getPage() diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue index 109b9564..60063f95 100644 --- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue +++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue @@ -9,34 +9,15 @@ > - - + + + - - + + @@ -181,6 +162,7 @@ export default { }, refresh() { this.searchForm = {}; + this.daterange = [] this.pageInfo.pageNo = 1; //页数 this.pageInfo.pageSize = 10; //条数 this.getPage(); From 79772354ab2f8e54d1eb31201f4dcd0ede9f4230 Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 25 Mar 2024 15:37:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/components/account.vue | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index fd882353..1b2b505a 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 diff --git a/src/components/account.vue b/src/components/account.vue index 57dc5c72..c7366756 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -125,7 +125,9 @@ @click="goto6()" v-if=" $route.path.indexOf('/firm/projectManage') == -1 && - $store.state.userInfo.systemLogoConfig.isShowProjectFront == 1 + $store.state.userInfo.systemLogoConfig.isShowProjectFront == 1 && + $store.state.userInfo.accountType == 5 && + $store.state.userInfo.accountType == 6 " :title="projectFront" > From 42d4678306d29743f59f01d29cf84c9e55f2b09e Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 26 Mar 2024 16:13:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/store/index.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 1b2b505a..10ede28b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -73,7 +73,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上 // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 - // axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/· + axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/· // axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 @@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 diff --git a/src/store/index.js b/src/store/index.js index d76a5a6e..9e3f1909 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,8 +48,11 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // UPLOADURL:'http://jxj.zhgdyun.com:100/upload/image/',// 演示平台 + // FILEURL:'http://jxj.zhgdyun.com:100/image/',// 演示平台 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 + BASEURL: baseUrl ? baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境