From be467d3f93ec610380c8195f4e6335fa56c84d24 Mon Sep 17 00:00:00 2001
From: Li xia <2309368887@qq.com>
Date: Mon, 19 Aug 2024 14:14:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E2=80=9D=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/enpComponents/carlist.vue |  9 ++--
 src/views/bigScreen/enpComponents/cems.vue    | 27 ++++++-----
 .../enpComponents/smartg_carwash.vue          |  9 +++-
 .../bigScreen/enpComponents/transport.vue     | 46 ++++++++++++++-----
 src/views/bigScreen/index_enp_blue.vue        | 44 ++++++++++--------
 5 files changed, 89 insertions(+), 46 deletions(-)

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')
+        },
 	}
 }
 </script>
diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue
index bd36168b..029859da 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 }}</el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="颗粒物实测(mg/m3)" width="180">
-                            <template #default="scope">
-                                {{ scope.row.envdata.dust_rtd ? scope.row.envdata.dust_rtd : '-' }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="SO2(mg/m3)" width="160">
+
+                        <el-table-column label="SO2(mg/m3)" width="130">
                             <template #default="scope">
                                 {{ scope.row.envdata.so2_zs ? scope.row.envdata.so2_zs : '-' }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="NOX(mg/m3)" width="160">
+						<el-table-column label="SO2达标率(%)" width="130">
+                            23%
+                        </el-table-column>
+                        <el-table-column label="NOX(mg/m3)" width="130">
                             <template #default="scope">
                                 {{ scope.row.envdata.nox_zs ? scope.row.envdata.nox_zs : '-' }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="颗粒物折算(mg/m3)" width="180">
+						<el-table-column label="NOX达标率(%)" width="130">
+                           36%
+                        </el-table-column>
+                        <el-table-column label="颗粒物折算(mg/m3)" width="130">
                             <template #default="scope">
                                 {{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }}
                             </template>
+                        </el-table-column>
+						<el-table-column label="颗粒物折算达标率(%)" width="130">
+                            45%
                         </el-table-column>
                         <el-table-column label="温度(℃)">
                             <template #default="scope">
@@ -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 {
     },
 
 }
-</script>
\ No newline at end of file
+</script>
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 @@
                     <el-container>
                         <el-header class="searchWrap">
                             <div class="left-panel">
-                                <div class="left-panel">洗车行为统计</div>
+                                <div class="left-panel">洗车行为统计
+								</div>
+
                             </div>
                             <div class="right-panel">
+								<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
+                            start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
+                            clearable />
                                 <el-select v-model="query.station" placeholder="洗车台" @change="handleQuery" clearable>
                                     <el-option v-for="item in stationOptions" :key="item" :label="item.name"
                                         :value="item.id"></el-option>
@@ -87,4 +92,4 @@ export default {
         },
     }
 }
-</script>
\ No newline at end of file
+</script>
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 @@
                         <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
                             start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
                             clearable />
-                        <el-select v-model="query.type" placeholder="出入类型" clearable @change="handleQuery">
+                        <el-select v-model="query.type" placeholder="车辆类型" clearable @change="handleQuery">
                             <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>
@@ -44,7 +44,7 @@
                         <el-table-column prop="dzbh" label="道闸编号"></el-table-column>
                         <el-table-column prop="dtgfs" label="抬杆方式"></el-table-column>
                         <el-table-column prop="jcsj" label="进厂时间"></el-table-column>
-                        <el-table-column prop="ccsj" label="出场时间"></el-table-column>
+                        <el-table-column prop="ccsj" label="出厂时间"></el-table-column>
                         <el-table-column prop="gcllx" label="车俩类型"></el-table-column>
                         <el-table-column prop="hclys" label="车辆颜色"></el-table-column>
                         <el-table-column prop="cph" label="车牌号"></el-table-column>
@@ -53,8 +53,11 @@
                         <el-table-column prop="fdjhm" label="发动机号码"></el-table-column>
 
                     </scTable>
-					<el-dialog width="650px" v-model="dialogFormVisible" title="车辆运输台账详情" >
-						<el-descriptions :column="2" width="600px">
+					<el-dialog width="650px" style="border-color: var(--el-border-color-light);
+					background: rgb(4, 50, 83);
+                    background-color: rgb(4, 50, 83);
+                    box-shadow: inset 0px 0px 30px 15px rgb(7, 79, 109)" v-model="dialogFormVisible" title="车辆运输台账详情" >
+						<el-descriptions :column="3" width="600px">
 							<el-descriptions-item label="出入口编号">{{ ysdata.crkbh }}</el-descriptions-item>
 							<el-descriptions-item label="道闸编号">{{ ysdata.dzbh }}</el-descriptions-item>
 							<el-descriptions-item label="抬杆方式">{{ ysdata.tgfs }}</el-descriptions-item>
@@ -76,11 +79,27 @@
 							<el-descriptions-item label="出厂运输货物名称">{{ ysdata.cchwmc }}</el-descriptions-item>
 							<el-descriptions-item label="出厂运输货物量">{{ ysdata.cchwl }}</el-descriptions-item>
 							<el-descriptions-item label="车队名称">{{ ysdata.cdmc }}</el-descriptions-item>
-							<el-descriptions-item label="进厂照片">{{ ysdata.jczp }}</el-descriptions-item>
-							<el-descriptions-item label="随车清单">{{ ysdata.sdqd }}</el-descriptions-item>
-							<el-descriptions-item label="行驶证">{{ ysdata.xsz }}</el-descriptions-item>
-							<el-descriptions-item label="手动抬杆照片">{{ ysdata.sdtgzp }}</el-descriptions-item>
 
+							<el-descriptions-item label="进厂照片">
+								<div class="demo-image__preview">
+									<el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+								    </el-image>
+								</div>
+							</el-descriptions-item>
+
+							<el-descriptions-item label="行驶证">
+								<div class="demo-image__preview">
+									<el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+								    </el-image>
+								</div>
+							</el-descriptions-item>
+							<el-descriptions-item label="手动抬杆照片">
+								<div class="demo-image__preview">
+									<el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+								    </el-image>
+								</div>
+							</el-descriptions-item>
+							<el-descriptions-item label="随车清单">{{ ysdata.sdqd }}</el-descriptions-item>
 						</el-descriptions>
 						<template #footer>
 							<div class="dialog-footer">
@@ -104,7 +123,7 @@ export default {
 				tgfs:"自动",
 				jcsj:"2024-08-02",
 				ccsj:"2024-08-02",
-				cllx:"运输车辆",
+				cllx:"罐车",
 				clys:"白色",
 				cph:"Ad1233",
 				zcdjsj:"",
@@ -112,8 +131,8 @@ export default {
 				clppxh:"",
 				fdjhm:"",
 				rllx:"",
-				pfjd:"",
-				syxz:"",
+				pfjd:"国五",
+				syxz:"汽油",
 				lxzt:"",
 				jcyshwmc:"",
 				jchwl:"",
@@ -151,6 +170,11 @@ export default {
             timeOptions: ['日', '月', '年'],
             apiObj: this.$API.enp.vehicle_access,
             params: {},
+			url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+			srcList: [
+				'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
+
+			]
         }
     },
     methods: {
diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index ab64adec..4eac18a7 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -357,17 +357,7 @@
 						<div style="display: flex">
 							<div class="chart" id="pieChart"></div>
 							<div class="carStaticWrap">
-								<div style="display:flex">
-									<div
-										class="todyCarItem"
-										v-for="item in pieData"
-										:key="item"
-									>
-										<span class="carStaticText" style="color: #d5d5d5">{{item.name}}</span>
-										<span class="carStaticNum">{{ item.value }}</span
-										>
-									</div>
-								</div>
+
 								<div style="display:flex">
 									<div
 										class="todyCarItem"
@@ -391,6 +381,15 @@
 								src="img/enp_blue/block_title.png"
 							/>
 						</div>
+						<scScrollTavle
+							v-if="table4Visible"
+							:tableHeight="containerHeight"
+							:rowData="lineData4"
+							:titleData="liData4"
+							:refValue="refValue4"
+							class="bigScreenTable"
+							:noIndex="noIndex"
+						></scScrollTavle>
 					</div>
 				</div>
 				<!-- 左右两条边框线 -->
@@ -610,20 +609,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: [],
@@ -632,6 +634,10 @@ export default {
 			table3Visible: false,
 			lineData3: [],
 			liData3: ["设备名称", "PM10", "PM2.5"],
+			table4Visible: false,
+			lineData4: ["环卫车","洒水"],
+			liData4: ["车辆类型", "作业情况"],
+			refValue4:liData4,
 			noIndex: true,
 			eqNumData: {
 				sc: 0,
@@ -913,6 +919,7 @@ export default {
 			this.table1Visible = true;
 			this.table2Visible = true;
 			this.table3Visible = true;
+			this.table4Visible = true;
 		},
 		// bindBtnClass(index) {
 		//   let classInfo = { btns: true, btnsActive: false };
@@ -1418,7 +1425,7 @@ header {
 /* 车辆统计-start */
 .carStaticWrap{
 	flex-shrink: 1;
-	width: 150px;
+	width: 200px;
 	align-self: center;
 	display: flex;
 	flex-direction: column;
@@ -1426,7 +1433,6 @@ header {
 .todyCarItem {
 	width:75px;
 	color: white;
-	font-size: 16px;
 	display: flex;
 	flex-direction: column;
 }
@@ -1435,7 +1441,7 @@ header {
 	text-align: center;
 }
 .carStaticNum{
-	font-size: 35px;
+	font-size: 25px;
 	color: #00f6ff;
 	font-weight: bold;
 	display: inline-block;

From b05ce66c38185fac9b036ff84eaf9899bc5ab70f Mon Sep 17 00:00:00 2001
From: Li xia <2309368887@qq.com>
Date: Mon, 19 Aug 2024 14:16:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:"bug=E4=BF=AE=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enp_blue.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index 4eac18a7..2b88d130 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -637,7 +637,6 @@ export default {
 			table4Visible: false,
 			lineData4: ["环卫车","洒水"],
 			liData4: ["车辆类型", "作业情况"],
-			refValue4:liData4,
 			noIndex: true,
 			eqNumData: {
 				sc: 0,

From 1ed17fcedc0968bdce9e90f338153d5f53210935 Mon Sep 17 00:00:00 2001
From: Li xia <2309368887@qq.com>
Date: Mon, 19 Aug 2024 17:01:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E2=80=9D=E8=B6=85=E4=BD=8E081?=
 =?UTF-8?q?6=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/enpComponents/cems.vue |  4 +-
 src/views/bigScreen/index_enp_blue.vue     | 55 ++++++++++++++++++++--
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue
index 029859da..0621347b 100644
--- a/src/views/bigScreen/enpComponents/cems.vue
+++ b/src/views/bigScreen/enpComponents/cems.vue
@@ -38,12 +38,12 @@
 						<el-table-column label="NOX达标率(%)" width="130">
                            36%
                         </el-table-column>
-                        <el-table-column label="颗粒物折算(mg/m3)" width="130">
+                        <el-table-column label="颗粒物(mg/m3)" width="130">
                             <template #default="scope">
                                 {{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }}
                             </template>
                         </el-table-column>
-						<el-table-column label="颗粒物折算达标率(%)" width="130">
+						<el-table-column label="颗粒物达标率(%)" width="130">
                             45%
                         </el-table-column>
                         <el-table-column label="温度(℃)">
diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index 3a9a4704..e5a53eef 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -192,6 +192,9 @@
 								@click="configDark" size="small"></el-button>
 
 						</div>
+						<div class="quit" @click="backlogin">
+							退出
+						</div>
 					</div>
 				</div>
 			</el-header>
@@ -641,8 +644,9 @@ export default {
 			lineData3: [],
 			liData3: ["设备名称", "PM10", "PM2.5"],
 			table4Visible: false,
-			lineData4: ["环卫车","洒水"],
-			liData4: ["车辆类型", "作业情况"],
+			lineData4: [],
+			refValue4: "moocBox1",
+			liData4: ["车辆类型", "运行时间","运行里程"],
 			noIndex: true,
 			eqNumData: {
 				sc: 0,
@@ -686,6 +690,7 @@ export default {
 			that.addListener();
 			setTimeout(function () {}, 5000);
 		});
+
 		// that.intervalinfo = setInterval(() => {
 		//   that.getleft1Data();
 		//   // that.getleft2Data();
@@ -807,6 +812,7 @@ export default {
 						lineData.push(arr);
 					});
 					this.lineData2 = lineData;
+					//console.log(this.lineData2)
 				});
 		},
 		//空气微站实时监测---（小微站）
@@ -840,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;
@@ -1184,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 {
@@ -1447,13 +1492,13 @@ header {
 /* 车辆统计-start */
 .carStaticWrap{
 	flex-shrink: 1;
-	width: 200px;
+	width: 23vh;
 	align-self: center;
 	display: flex;
 	flex-direction: column;
 }
 .todyCarItem {
-	width:75px;
+	width:22vh;
 	color: white;
 	display: flex;
 	flex-direction: column;