diff --git a/dist.zip b/dist.zip index b5e616a7..09aaf894 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/js/config.js b/public/js/config.js index 9210af6b..93f5448a 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index a7a12b69..c4f48461 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,10 +40,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/store/index.js b/src/store/index.js index e75e3ab8..02da5307 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -58,8 +58,8 @@ export default new Vuex.Store({ // 邱平毅的 // UPLOADURL: 'http://192.168.34.216:6023/upload/image', // FILEURL: 'http://192.168.34.216:6023/image/', - UPLOADURL: 'http://ue6a4s.natappfree.cc/upload/image', - FILEURL: 'http://ue6a4s.natappfree.cc/image/', + UPLOADURL: 'http://124.71.67.160:8088/upload/image', + FILEURL: 'http://124.71.67.160:8088/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue index a39bd06e..4258434d 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue @@ -49,13 +49,13 @@ export default { leftList: { a: { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') }, b: { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') }, - c: { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') } + c: { label: '噪音', value: 13, unit: 'dB', image: require('../assets/images/command-center/icon-noise.png') } }, tableData:[], // 右边的列表 rightList: { temperature: { label: '温度', value: 22, unit: '℃', image: require('../assets/images/command-center/icon-temperature.png') }, - humidity: { label: '湿度', value: 16, unit: 'RH', image: require('../assets/images/command-center/icon-humidity.png') }, + humidity: { label: '湿度', value: 16, unit: '%RH', image: require('../assets/images/command-center/icon-humidity.png') }, windSpeed: { label: '风速', value: 60, @@ -85,13 +85,15 @@ export default { getDustNoiseDataApi(data).then(res=>{ console.log('环境监测',res) if(res.code == 200){ - this.leftList.a.value = res.result.pm25 + if(res.result != null){ + this.leftList.a.value = res.result.pm25 this.leftList.b.value = res.result.pm10 this.leftList.c.value = res.result.noise this.rightList.temperature.value = res.result.temperature this.rightList.humidity.value = res.result.humidity this.rightList.windSpeed.value = res.result.windspeed this.rightList.windDirection.value = res.result.winddirectionName + } } }) }, diff --git a/src/views/projectAdmin/fourEngin/command/rightFour.vue b/src/views/projectAdmin/fourEngin/command/rightFour.vue index c6e09000..16657c8b 100644 --- a/src/views/projectAdmin/fourEngin/command/rightFour.vue +++ b/src/views/projectAdmin/fourEngin/command/rightFour.vue @@ -15,11 +15,11 @@

{{item.title}}

-
-
+
已整改质量问题 ({{ qualityProblem.rectificationNum || 0 }})
-
+
未整改质量问题 ({{ qualityProblem.noRectificationNum || 0 }})