From 12840ac2415c930db30b6a982fdc373f53be7f88 Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Sat, 1 Apr 2023 14:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9E=97=E6=B9=BE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 6 +- src/store/index.js | 28 +-- .../projectAdmin/jlw/components/CountList.vue | 4 +- .../jlw/digitalSite/centerTop.vue | 30 ++-- .../projectAdmin/jlw/digitalSite/index.vue | 4 + .../jlw/digitalSite/leftBottom.vue | 112 +++++++----- .../projectAdmin/jlw/digitalSite/rightTop.vue | 24 ++- .../jlw/envirManage/rightCenter.vue | 165 +++++++++++++++--- .../jlw/jChart/pie/JNestedRingChart.vue | 3 + .../jlw/safeManage/leftCenter.vue | 37 ++-- 10 files changed, 278 insertions(+), 135 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c4273443..81d3c981 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -78,17 +78,17 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 + // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/#/'//内蒙古线上 - // axios.defaults.baseURL = 'http://121.196.214.246/api'//金林湾线上新 + axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' } else if (process.env.NODE_ENV == 'production') { let host = window.location.host - axios.defaults.baseURL = window.location.protocol + '//' + host + '/api'//金林湾地址 + axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址 // axios.defaults.baseURL = window.location.protocol + '//' + host + '/' // axios.defaults.baseURL ='http://192.168.34.216:6023/' // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" diff --git a/src/store/index.js b/src/store/index.js index ac635365..836b5de0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,21 +45,29 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // 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 + "/", //正式部署地址 + // UPLOADURL: + // window.location.protocol + "//" + window.location.host + "/upload/image", //正式部署地址 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式部署地址 + //---------------- BASEURL: baseUrl ? baseUrl - : window.location.protocol + "//" + window.location.host + "/api", // - // UPLOADURL: - // window.location.protocol + "//" + window.location.host + "/api/upload/image", // - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试 - // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', + : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 // UPLOADURL: 'http://182.90.224.237:7000/upload/image', + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/api/upload/image", //金林湾部署地址 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 // FILEURL: 'http://182.90.224.237:7000/image/', + // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://139.9.66.234:6324/`upload/image', // FILEURL: 'http://139.9.66.234:6324/image/', - /* 2022-06-06 广西本地的*/ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', - // FILEURL: 'http://182.90.224.237:7000/image/', - // 邱平毅的 + /* 2022-06-06 广西本地的*/ // 邱平毅的 // BASEURL:'http://192.168.34.116:6023/', // UPLOADURL: 'http://192.168.34.116:6023/upload/image', // FILEURL: 'http://192.168.34.116:6023/image/', @@ -78,8 +86,8 @@ export default new Vuex.Store({ // FILEURL: 'http://139.9.66.234:7072/image/',//三江集团 // UPLOADURL: 'http://182.90.224.147:18170/upload/image',//瑞士恒通 // FILEURL: 'http://182.90.224.147:18170/image/',//瑞士恒通 - UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾新地址 - FILEURL: 'http://121.196.214.246/image/',//金林湾新地址 + UPLOADURL: "http://121.196.214.246/api/upload/image", //金林湾新地址 + FILEURL: "http://121.196.214.246/image/", //金林湾新地址 ACCOUNTTYPE: [ "系统管理员", diff --git a/src/views/projectAdmin/jlw/components/CountList.vue b/src/views/projectAdmin/jlw/components/CountList.vue index 73bf9772..34547dda 100644 --- a/src/views/projectAdmin/jlw/components/CountList.vue +++ b/src/views/projectAdmin/jlw/components/CountList.vue @@ -23,11 +23,11 @@
-
{{ item.devonline == '0' ? '在线' : '离线' }}
+
{{ item.devonline == '0' ? '离线' : '在线' }}
{{ item.devName || item.deviceName }}
今日报警：{{ item.alarmNum }} diff --git a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue index e6da998f..92983faa 100644 --- a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue +++ b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue @@ -2833,14 +2833,14 @@ export default { clearInterval(this.towerInterval) } //环境监测 - clearInterval(this.plantCapInterval) - if (this.lifterInterval) { - clearInterval(this.lifterInterval) - } - if (this.videoAlarmTimer) { - clearInterval(this.videoAlarmTimer) - } - clearInterval(this.timer1) + // clearInterval(this.plantCapInterval) + // if (this.lifterInterval) { + // clearInterval(this.lifterInterval) + // } + // if (this.videoAlarmTimer) { + // clearInterval(this.videoAlarmTimer) + // } + // clearInterval(this.timer1) }, methods: { // 计算点位的缩小比 @@ -3058,7 +3058,7 @@ export default { }, closeInterval() { this.showEnvironDialog = false - clearInterval(this.plantCapInterval) + // clearInterval(this.plantCapInterval) }, closeBoltDetails() { this.showBoltDetails = false @@ -3591,9 +3591,9 @@ export default { } }) this.getRealTimeDustNoiseData() - this.realTimeDustNoiseDataTime = setInterval(() => { - this.getRealTimeDustNoiseData() - }, 5000) + // this.realTimeDustNoiseDataTime = setInterval(() => { + // this.getRealTimeDustNoiseData() + // }, 5000) this.selectDustNoiseData() } else { // this.createCenterChart(); @@ -3640,9 +3640,9 @@ export default { if (res.code == 200) { if (res.result) { this.plantCap = res.result - this.plantCapInterval = setTimeout(() => { - this.getRealTimeDustNoiseData(deviceId) - }, 5000) + // this.plantCapInterval = setTimeout(() => { + // this.getRealTimeDustNoiseData(deviceId) + // }, 5000) } else { this.plantCap = { crc: '--', diff --git a/src/views/projectAdmin/jlw/digitalSite/index.vue b/src/views/projectAdmin/jlw/digitalSite/index.vue index bc78f37c..0018612f 100644 --- a/src/views/projectAdmin/jlw/digitalSite/index.vue +++ b/src/views/projectAdmin/jlw/digitalSite/index.vue @@ -200,6 +200,8 @@ export default { // 视频设备数量 selectVideoCountList(data).then((res) => { if (res.code === 200) { + console.log('获取视频设备信息: ', res) + this.videoCountList = res.result } }) @@ -217,6 +219,8 @@ export default { // 获取环境监测信息 selectEnvironmentDevAlaramCountList(data).then((res) => { if (res.code === 200) { + console.log('获取环境监测信息', res) + this.$set(this.environment, 'list', res.result.devList) } }) diff --git a/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue b/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue index 2b934509..459d5f0b 100644 --- a/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue +++ b/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue @@ -1,16 +1,31 @@