diff --git a/src/assets/i18n/langs/cn/environmentalMonitor/overview.js b/src/assets/i18n/langs/cn/environmentalMonitor/overview.js
index 9e75d5d7..cfdb0eea 100644
--- a/src/assets/i18n/langs/cn/environmentalMonitor/overview.js
+++ b/src/assets/i18n/langs/cn/environmentalMonitor/overview.js
@@ -73,7 +73,13 @@ export default {
value: "东",
id:7,
unit:'风'
- }
+ },
+ {
+ name: "噪音",
+ value: "101",
+ id:9,
+ unit:'dB'
+ },
// , {
// name: "气压",
// value: "101",
diff --git a/src/assets/i18n/langs/en/environmentalMonitor/overview.js b/src/assets/i18n/langs/en/environmentalMonitor/overview.js
index e9939b9b..6ee5466c 100644
--- a/src/assets/i18n/langs/en/environmentalMonitor/overview.js
+++ b/src/assets/i18n/langs/en/environmentalMonitor/overview.js
@@ -73,12 +73,19 @@ export default {
value: "东",
id:7,
unit:'风'
- }, {
+ },
+ {
name: "气压",
value: "101",
id:8,
unit:'kPa'
},
+ {
+ name: "噪音",
+ value: "101",
+ id:9,
+ unit:'dB'
+ },
],
//演示模拟数据
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 5918d3a6..0c261f24 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -44,7 +44,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// 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://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
@@ -78,16 +78,16 @@ 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.122:8070' //彭洁本地
+ // 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'//金林湾线上新
} 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 + '/'
+ axios.defaults.baseURL = window.location.protocol + '//' + host + '/api'
// axios.defaults.baseURL ='http://192.168.34.216:6023/'
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
diff --git a/src/store/index.js b/src/store/index.js
index 12b33dff..aca30247 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -72,12 +72,14 @@ export default new Vuex.Store({
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
- UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
- FILEURL: 'http://182.90.224.147:100/image/',//演示平台
+ // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
+ // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
// UPLOADURL: 'http://139.9.66.234:7072/upload/image',//三江集团
// 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/',//金林湾新地址
ACCOUNTTYPE: [
"系统管理员",
diff --git a/src/views/projectAdmin/jlw/envirManage/centerTop.vue b/src/views/projectAdmin/jlw/envirManage/centerTop.vue
index 1cbf9cbf..ec198b6e 100644
--- a/src/views/projectAdmin/jlw/envirManage/centerTop.vue
+++ b/src/views/projectAdmin/jlw/envirManage/centerTop.vue
@@ -2,14 +2,21 @@
diff --git a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
index 45ee0859..6de232ff 100644
--- a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
@@ -1,6 +1,6 @@
-
{{ $t("message.environmentalOverview.e2") }}
+{{ $t('message.environmentalOverview.e2') }}
{{ $t("message.environmentalOverview.e3") }}
+{{ $t('message.environmentalOverview.e3') }}
+
- - {{$t('message.projectInfo.noData')}} + + {{ $t('message.projectInfo.noData') }}
{{ $t("message.environmentalOverview.e5") }}
+{{ $t('message.environmentalOverview.e5') }}
- {{ $t("message.environmentalOverview.e5SelectArr")[0].title }}
+ {{ $t('message.environmentalOverview.e5SelectArr')[0].title }}
-
+
- {{ $t("message.environmentalOverview.e5SelectArr")[1].title }}
+ {{ $t('message.environmentalOverview.e5SelectArr')[1].title }}
{{ $t("message.environmentalOverview.e6") }}
+{{ $t('message.environmentalOverview.e6') }}
- {{ $t("message.environmentalOverview.e6SelectArr")[0].title }}
+ {{ $t('message.environmentalOverview.e6SelectArr')[0].title }}
-
+
- {{ $t("message.environmentalOverview.e6SelectArr")[1].title }}
+ {{ $t('message.environmentalOverview.e6SelectArr')[1].title }}
-
+
- {{ $t("message.environmentalOverview.e6SelectArr")[2].title }}
+ {{ $t('message.environmentalOverview.e6SelectArr')[2].title }}
-
+
- {{ $t("message.environmentalOverview.e6SelectArr")[3].title }}
+ {{ $t('message.environmentalOverview.e6SelectArr')[3].title }}
+
- {{$t('message.projectInfo.noData')}} + {{ $t('message.projectInfo.noData') }}
{{ $t("message.environmentalOverview.e7") }}
+{{ $t('message.environmentalOverview.e7') }}
{{ item.tem2 }} ~ {{ item.tem1 }}
- {{ $t("message.environmentalOverview.wind_power") }} + {{ $t('message.environmentalOverview.wind_power') }} {{ item.win_speed }}