diff --git a/src/views/bigScreen/enpComponents/carlist.vue b/src/views/bigScreen/enpComponents/carlist.vue index 0edd325a..b64d0d17 100644 --- a/src/views/bigScreen/enpComponents/carlist.vue +++ b/src/views/bigScreen/enpComponents/carlist.vue @@ -150,8 +150,8 @@ export default { }], activeName:10, tabOptions:[ - { label: "进出厂车辆运输台账", name: 10 }, - { label: "进出厂车辆运输台账", name: 20 }, + { label: "进出厂运输车辆台账", name: 10 }, + { label: "厂内运输车辆台账", name: 20 }, { label: "非道路移动机械电子台账", name: 30 }, ] @@ -160,7 +160,10 @@ export default { methods: { - + //返回地图 + backtoMap() { + this.$emit('close') + }, } } diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index bd36168b..0621347b 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -21,25 +21,30 @@ runningStateEnum[scope.row.running_state]?.text }} - - - {{ scope.row.envdata.dust_rtd ? scope.row.envdata.dust_rtd : '-' }} - - - + + {{ scope.row.envdata.so2_zs ? scope.row.envdata.so2_zs : '-' }} - + + 23% + + {{ scope.row.envdata.nox_zs ? scope.row.envdata.nox_zs : '-' }} - + + 36% + + {{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }} + + + 45% @@ -182,13 +187,13 @@ export default { } }, mounted() { - if (this.directDetail) { + if (this.directDetail) { this.currentEquipmentId = this.eqId; this.currentEquipmentName = this.eqId; this.query.equipment_id = this.eqId; this.$nextTick(() => { this.handleQuery() }) } - + @@ -266,4 +271,4 @@ export default { }, } - \ No newline at end of file + diff --git a/src/views/bigScreen/enpComponents/smartg_carwash.vue b/src/views/bigScreen/enpComponents/smartg_carwash.vue index ab9cc3ba..229608e9 100644 --- a/src/views/bigScreen/enpComponents/smartg_carwash.vue +++ b/src/views/bigScreen/enpComponents/smartg_carwash.vue @@ -12,9 +12,14 @@ - 洗车行为统计 + 洗车行为统计 + + + @@ -87,4 +92,4 @@ export default { }, } } - \ No newline at end of file + diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue index e86f753d..43e64cb7 100644 --- a/src/views/bigScreen/enpComponents/transport.vue +++ b/src/views/bigScreen/enpComponents/transport.vue @@ -27,7 +27,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,8 +53,11 @@ - - + + {{ ysdata.crkbh }} {{ ysdata.dzbh }} {{ ysdata.tgfs }} @@ -76,11 +79,27 @@ {{ ysdata.cchwmc }} {{ ysdata.cchwl }} {{ ysdata.cdmc }} - {{ ysdata.jczp }} - {{ ysdata.sdqd }} - {{ ysdata.xsz }} - {{ ysdata.sdtgzp }} + + + + + + + + + + + + + + + + + + + + {{ ysdata.sdqd }} + + 退出 + @@ -363,17 +366,7 @@ - - - {{item.name}} - {{ item.value }} - - + + @@ -616,20 +618,23 @@ export default { show: false, }, data: [ - { value: 2, name: "新能源" }, - { value: 6, name: "其他" }, + { value: 2, name: "国五" }, + { value: 6, name: "国六" }, + { value: 6, name: "清洁运输" }, ], }, }, pieData: [ - { value: 2, name: "新能源" }, - { value: 6, name: "其他" }, + { value: 2, name: "国五" }, + { value: 6, name: "国六" }, + { value: 8, name: "清洁运输" }, + ], containerHeight: null, refValue1: "moocBox1", table1Visible: false, lineData: [], - liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨气"], + liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨"], refValue2: "moocBox2", table2Visible: false, lineData2: [], @@ -638,6 +643,10 @@ export default { table3Visible: false, lineData3: [], liData3: ["设备名称", "PM10", "PM2.5"], + table4Visible: false, + lineData4: [], + refValue4: "moocBox1", + liData4: ["车辆类型", "运行时间","运行里程"], noIndex: true, eqNumData: { sc: 0, @@ -681,6 +690,7 @@ export default { that.addListener(); setTimeout(function () {}, 5000); }); + // that.intervalinfo = setInterval(() => { // that.getleft1Data(); // // that.getleft2Data(); @@ -802,6 +812,7 @@ export default { lineData.push(arr); }); this.lineData2 = lineData; + //console.log(this.lineData2) }); }, //空气微站实时监测---(小微站) @@ -835,18 +846,48 @@ export default { lineData.push(arr); }); this.lineData3 = lineData; + }); }, //今日车辆统计数据 getright2Data() {}, //环卫车作业情况 - getright3Data() {}, + getright3Data() { + + + let lineData = []; + + let arr = [], + obj1 = {}, + obj2 = {}, + obj3 = {}; + obj1.elType = "primary"; + obj1.value = "洒水车"; //设备名称 + obj2.elType = "primary"; + obj2.value ="2024-08-22"; //PM10 + obj3.elType = "primary"; + obj3.value ="23"; //PM2.5 + arr.push(obj1); + arr.push(obj2); + arr.push(obj3); + lineData.push(arr); + + this.lineData4 = lineData; + + + + }, configDark() { this.config.dark = this.config.dark ? false : true; }, backSystem() { this.$router.push({ path: "/dashboard_enp" }); }, + //退出登录 + backlogin(){ + this.$router.push({ path: "/login" }); + + }, closeDialog() { this.elDrawer = false; this.activeIndex = 0; @@ -930,6 +971,7 @@ export default { this.table1Visible = true; this.table2Visible = true; this.table3Visible = true; + this.table4Visible = true; }, // bindBtnClass(index) { // let classInfo = { btns: true, btnsActive: false }; @@ -1178,11 +1220,20 @@ header { background-size: cover; background-image: url("/public/img/enp_blue/user_enp.png"); } +.quit{ + width: 3.5vh; + height: 2.3vh; + margin-top: 1.2vh; + margin-left: 2vh; + background-size: cover; + cursor: pointer; +} .dark_config { width: 2.3vh; height: 2.3vh; margin-top: 0.9vh; margin-left: 2vh; + background-size: cover; } .model { @@ -1441,15 +1492,14 @@ header { /* 车辆统计-start */ .carStaticWrap{ flex-shrink: 1; - width: 150px; + width: 23vh; align-self: center; display: flex; flex-direction: column; } .todyCarItem { - width:75px; + width:22vh; color: white; - font-size: 16px; display: flex; flex-direction: column; } @@ -1458,7 +1508,7 @@ header { text-align: center; } .carStaticNum{ - font-size: 35px; + font-size: 25px; color: #00f6ff; font-weight: bold; display: inline-block;