diff --git a/src/assets/images/qualityManage/btnBg.png b/src/assets/images/qualityManage/btnBg.png new file mode 100644 index 00000000..5f4cba84 Binary files /dev/null and b/src/assets/images/qualityManage/btnBg.png differ diff --git a/src/assets/images/qualityManage/defBtn.png b/src/assets/images/qualityManage/defBtn.png new file mode 100644 index 00000000..3d1a98f6 Binary files /dev/null and b/src/assets/images/qualityManage/defBtn.png differ diff --git a/src/assets/images/qualityManage/hygl.png b/src/assets/images/qualityManage/hygl.png new file mode 100644 index 00000000..558a62c2 Binary files /dev/null and b/src/assets/images/qualityManage/hygl.png differ diff --git a/src/assets/images/qualityManage/hygl2.png b/src/assets/images/qualityManage/hygl2.png new file mode 100644 index 00000000..41cd34ba Binary files /dev/null and b/src/assets/images/qualityManage/hygl2.png differ diff --git a/src/assets/images/qualityManage/secyre01.png b/src/assets/images/qualityManage/secyre01.png new file mode 100644 index 00000000..0c5f0687 Binary files /dev/null and b/src/assets/images/qualityManage/secyre01.png differ diff --git a/src/assets/images/qualityManage/secyre02.png b/src/assets/images/qualityManage/secyre02.png new file mode 100644 index 00000000..6fbe7c4b Binary files /dev/null and b/src/assets/images/qualityManage/secyre02.png differ diff --git a/src/assets/images/qualityManage/secyre03.png b/src/assets/images/qualityManage/secyre03.png new file mode 100644 index 00000000..44549f01 Binary files /dev/null and b/src/assets/images/qualityManage/secyre03.png differ diff --git a/src/assets/images/qualityManage/secyre04.png b/src/assets/images/qualityManage/secyre04.png new file mode 100644 index 00000000..311516eb Binary files /dev/null and b/src/assets/images/qualityManage/secyre04.png differ diff --git a/src/assets/images/qualityManage/shuangtan.png b/src/assets/images/qualityManage/shuangtan.png new file mode 100644 index 00000000..f4adf38c Binary files /dev/null and b/src/assets/images/qualityManage/shuangtan.png differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 36b68025..239e5192 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -35,7 +35,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://14.29.220.211:6023/' // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' + // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 + // axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 diff --git a/src/components/chart/airQulityChart.vue b/src/components/chart/airQulityChart.vue index 67100577..3404cbab 100644 --- a/src/components/chart/airQulityChart.vue +++ b/src/components/chart/airQulityChart.vue @@ -15,7 +15,7 @@
{{ $t("message.projectSummary.actor") }}
-
+
{{ $t("message.projectSummary.fine") }}
@@ -96,7 +96,7 @@ export default { this.lineColor = "#6ce9f0"; break; case "良": - this.lineColor = "#FFBB38"; + this.lineColor = "#468EFD"; break; case "轻度污染": this.lineColor = "#FE7A18"; diff --git a/src/views/projectAdmin/dataBoardTwo/components/qualityAndsecure.vue b/src/views/projectAdmin/dataBoardTwo/components/qualityAndsecure.vue new file mode 100644 index 00000000..a1f4d257 --- /dev/null +++ b/src/views/projectAdmin/dataBoardTwo/components/qualityAndsecure.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectAdmin/dataBoardTwo/contractManage.vue b/src/views/projectAdmin/dataBoardTwo/contractManage.vue index 01cbf04e..1ffb966d 100644 --- a/src/views/projectAdmin/dataBoardTwo/contractManage.vue +++ b/src/views/projectAdmin/dataBoardTwo/contractManage.vue @@ -1,8 +1,25 @@ diff --git a/src/views/projectAdmin/dataBoardTwo/environment.vue b/src/views/projectAdmin/dataBoardTwo/environment.vue index ad4629ac..cab1e501 100644 --- a/src/views/projectAdmin/dataBoardTwo/environment.vue +++ b/src/views/projectAdmin/dataBoardTwo/environment.vue @@ -206,7 +206,10 @@

-
+
+ +
+ +
@@ -225,7 +228,7 @@

PM10

{{plantCap.pm10?plantCap.pm10:'--'}}μg/m3

- +
@@ -235,11 +238,11 @@

- + {{$t('message.dataBoard.temperature')}}

{{plantCap.temperature?plantCap.temperature:'--'}}℃

- +
@@ -249,11 +252,11 @@

- + {{$t('message.dataBoard.humidity')}}

{{plantCap.humidity?plantCap.humidity:'--'}}%

- +
@@ -264,7 +267,7 @@

TSP

{{plantCap.tsp?plantCap.tsp:'--'}}μg/m3

- +
@@ -274,11 +277,11 @@

- + {{$t('message.dataBoard.noise')}}

{{plantCap.noise?plantCap.noise:'--'}}dB

- +
@@ -288,16 +291,16 @@

- + {{$t('message.dataBoard.windSpeed')}}

{{plantCap.windspeed?plantCap.windspeed:'--'}}m/s

- +
- - + --> +
@@ -491,25 +494,27 @@
+

- + 扬尘 {{$t('message.dataBoard.noiseAlarm')}}

{{alarmData.noiseNum}}

-
+ +

{{'PM2.5'+$t('message.dataBoard.excessiveAlarm')}}

{{alarmData.pm25Num}}

-
+
@@ -674,10 +679,12 @@ export default { [ { value: this.alarmData.noiseNum, name: '' }, { value: this.alarmData.pm25Num, name: '' }, - { value: this.alarmData.pm10Num, name: '' }, - { value: this.alarmData.tspNum, name: '' }, + // { value: this.alarmData.pm10Num, name: '' }, + // { value: this.alarmData.tspNum, name: '' }, ], - this.$refs.safeChart,["rgba(120, 111, 240, 1)","#fe6c7f","rgba(92, 226, 246, 1)","#ffbb38"],'报警总数' + + // this.$refs.safeChart,["rgba(120, 111, 240, 1)","#fe6c7f","rgba(92, 226, 246, 1)","#ffbb38"],'报警总数' + this.$refs.safeChart,["#5CE2F6","#5181F6"],'报警总数' ); }); }, @@ -689,7 +696,8 @@ export default { color: color?color:["#5181F6", "#61D2B9", "#F67F51", "#7851F6"], title: { show: true, - text: data[0].value+data[1].value+data[2].value+data[3].value, + text: data[0].value+data[1].value, + // text: data[0].value+data[1].value+data[2].value+data[3].value, x: "48%", y: "36%", z: 5, @@ -1750,12 +1758,15 @@ export default { padding-left: 32px; } .online{ - background-color: rgba(68, 215, 182, 0.54); + // background-color: rgba(68, 215, 182, 0.54); + background-color: #319FC9; } .offline{ - background-color: rgba(151, 12, 12, 0.54); + // background-color: rgba(151, 12, 12, 0.54); + background-color:#7BA0C0 } } + //蓝色风格 .dataBoardPage_blue{ .weatherBox{ @@ -1854,4 +1865,15 @@ export default { } } } +.greenTable{ + color: #fff !important; +} +.dataBoardContent .alarmBlockContent td{ +color: #fff !important; +} +.dataBoardContent .alarmBlockContent th{ +color: #fff !important; +} + + diff --git a/src/views/projectAdmin/dataBoardTwo/quality.vue b/src/views/projectAdmin/dataBoardTwo/quality.vue index b60abd88..5cdf8b3f 100644 --- a/src/views/projectAdmin/dataBoardTwo/quality.vue +++ b/src/views/projectAdmin/dataBoardTwo/quality.vue @@ -6,6 +6,7 @@
-->
+
@@ -100,14 +101,15 @@

{{ total.jyUrgentLevelNum }}

-
+ + + {{ $t("message.dataBoard.seriousnessProblem") }}

{{ total.yzUrgentLevelNum }}

-
+
-->

@@ -127,26 +129,28 @@

- + + {{ $t("message.dataBoard.all") }} - - --> + + + {{ $t("message.dataBoard.lately30days") }} - + -->
@@ -164,6 +168,7 @@