diff --git a/.env.development b/.env.development
index 807d02f0..e6ab5abd 100644
--- a/.env.development
+++ b/.env.development
@@ -16,10 +16,10 @@ VUE_APP_PJ = 'gx'
 # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
 
 #测试环境
-VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
-# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
-VUE_APP_BASEURL = http://49.232.14.174:2226
-# VUE_APP_BASEURL = http://127.0.0.1:2226
+# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
+# VUE_APP_BASEURL = http://49.232.14.174:2226
+VUE_APP_BASEURL = http://127.0.0.1:2226
 
 # #光子
 # VUE_APP_API_BASEURL = http://49.232.14.174:2250/api
diff --git a/.env.production b/.env.production
index bc6bbf1e..37c90e3f 100644
--- a/.env.production
+++ b/.env.production
@@ -16,8 +16,12 @@ VUE_APP_TITLE = ''
 # VUE_APP_API_BASEURL = http://192.168.10.5:2250/api
 # VUE_APP_BASEURL = http://192.168.10.5:2250
 #托克逊
-VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
-VUE_APP_BASEURL = http://49.232.14.174:2226
+# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+# VUE_APP_BASEURL = http://49.232.14.174:2226
+VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
+# VUE_APP_BASEURL = http://49.232.14.174:2226
+VUE_APP_BASEURL = http://127.0.0.1:2226
+
 
 # VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
 # VUE_APP_BASEURL = http://1.203.161.103:2800
diff --git a/src/config/route.js b/src/config/route.js
index e5aec495..dff3d0c5 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -30,7 +30,7 @@ const routes = [
 						path: "/testx",
 						meta: {
 							title: "测试页",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							perms: ["testx"],
 						},
 						component: "home/testx",
@@ -40,7 +40,7 @@ const routes = [
 						path: "/dashboard",
 						meta: {
 							title: "控制台",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							affix: true,
 							perms: ["dashboard"],
 						},
@@ -51,7 +51,7 @@ const routes = [
 						path: "/dashboard_enm",
 						meta: {
 							title: "控制台",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							affix: true,
 							perms: ["enm"],
 						},
@@ -62,7 +62,7 @@ const routes = [
 						path: "/dashboard_photon",
 						meta: {
 							title: "控制台",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							affix: true,
 							perms: ["photondashboard"],
 						},
@@ -73,7 +73,7 @@ const routes = [
 						path: "/dashboard_enp",
 						meta: {
 							title: "控制台",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							affix: true,
 							perms: ["dashboardEnp"],
 						},
@@ -84,7 +84,7 @@ const routes = [
 						path: "/dashboard_ly",
 						meta: {
 							title: "控制台",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							affix: true,
 							perms: ["dashboard_ly"],
 						},
@@ -95,7 +95,7 @@ const routes = [
 						path: "/dashboard_gx",
 						meta: {
 							title: "控制台",
-							icon: "el-icon-monitor",
+							// icon: "el-icon-monitor",
 							affix: true,
 							perms: ["dashboard_gx"],
 						},
@@ -106,7 +106,7 @@ const routes = [
 						name: "track",
 						meta: {
 							title: "轨迹追踪",
-							icon: "el-icon-position",
+							// icon: "el-icon-position",
 							fullpage: true,
 							hidden: true,
 						},
@@ -117,7 +117,7 @@ const routes = [
 						path: "/usercenter",
 						meta: {
 							title: "帐号信息",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["userCenter"],
 						},
 						component: "userCenter",
@@ -127,7 +127,7 @@ const routes = [
 						path: "/events",
 						meta: {
 							title: "报警事件",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["bigScreen2"],
 						},
 						component: "home/event",
@@ -150,7 +150,7 @@ const routes = [
 						path: "/enm_slag/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_slag"],
 						},
 						component: "enm_slag/report",
@@ -160,7 +160,7 @@ const routes = [
 						path: "/enm_slag/power",
 						meta: {
 							title: "单位产品电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_slag"],
 						},
 						component: "enm_slag/power",
@@ -170,7 +170,7 @@ const routes = [
 						path: "/enm_slag/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_slag"],
 						},
 						component: "enm_slag/teamAnalysis",
@@ -180,7 +180,7 @@ const routes = [
 						path: "/enm_slag/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_slag"],
 						},
 						component: "enm_slag/workshopAnalysis",
@@ -190,7 +190,7 @@ const routes = [
 						path: "/enm_slag/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_slag"],
 						},
 						component: "enm_slag/handoverLog",
@@ -213,7 +213,7 @@ const routes = [
 						path: "/enm_limestone/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_limestone"],
 						},
 						component: "enm_limestone/report",
@@ -223,7 +223,7 @@ const routes = [
 						path: "/enm_limestone/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_limestone"],
 						},
 						component: "enm_limestone/workshopAnalysis",
@@ -233,7 +233,7 @@ const routes = [
 						path: "/enm_limestone/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_limestone"],
 						},
 						component: "enm_limestone/handoverLog",
@@ -256,7 +256,7 @@ const routes = [
 						path: "/enm_rm/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_rm"],
 						},
 						component: "enm_rm/report",
@@ -266,7 +266,7 @@ const routes = [
 						path: "/enm_rm/power",
 						meta: {
 							title: "单位产品电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_rm"],
 						},
 						component: "enm_rm/power",
@@ -276,7 +276,7 @@ const routes = [
 						path: "/enm_rm/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_rm"],
 						},
 						component: "enm_rm/teamAnalysis",
@@ -286,7 +286,7 @@ const routes = [
 						path: "/enm_rm/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_rm"],
 						},
 						component: "enm_rm/workshopAnalysis",
@@ -296,7 +296,7 @@ const routes = [
 						path: "/enm_rm/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_rm"],
 						},
 						component: "enm_rm/handoverLog",
@@ -319,7 +319,7 @@ const routes = [
 						path: "/enm_rmbase/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_rmbase"],
 						},
 						component: "enm_rmbase/report",
@@ -329,7 +329,7 @@ const routes = [
 						path: "/enm_rmbase/power",
 						meta: {
 							title: "主要设备单位电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_rmbase"],
 						},
 						component: "enm_rmbase/power",
@@ -339,7 +339,7 @@ const routes = [
 						path: "/enm_rmbase/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_rmbase"],
 						},
 						component: "enm_rmbase/teamAnalysis",
@@ -349,7 +349,7 @@ const routes = [
 						path: "/enm_rmbase/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_rmbase"],
 						},
 						component: "enm_rmbase/workshopAnalysis",
@@ -359,7 +359,7 @@ const routes = [
 						path: "/enm_rmbase/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_rmbase"],
 						},
 						component: "enm_rmbase/handoverLog",
@@ -382,7 +382,7 @@ const routes = [
 						path: "/enm_coal/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_coal"],
 						},
 						component: "enm_coal/report",
@@ -392,7 +392,7 @@ const routes = [
 						path: "/enm_coal/power",
 						meta: {
 							title: "单位产品电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_coal"],
 						},
 						component: "enm_coal/power",
@@ -402,7 +402,7 @@ const routes = [
 						path: "/enm_coal/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_coal"],
 						},
 						component: "enm_coal/teamAnalysis",
@@ -412,7 +412,7 @@ const routes = [
 						path: "/enm_coal/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_coal"],
 						},
 						component: "enm_coal/workshopAnalysis",
@@ -422,7 +422,7 @@ const routes = [
 						path: "/enm_coal/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_coal"],
 						},
 						component: "enm_coal/handoverLog",
@@ -445,7 +445,7 @@ const routes = [
 						path: "/enm_coalbase/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_coalbase"],
 						},
 						component: "enm_coalbase/report",
@@ -455,7 +455,7 @@ const routes = [
 						path: "/enm_coalbase/power",
 						meta: {
 							title: "主要设备单位电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_coalbase"],
 						},
 						component: "enm_coalbase/power",
@@ -465,7 +465,7 @@ const routes = [
 						path: "/enm_coalbase/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_coalbase"],
 						},
 						component: "enm_coalbase/teamAnalysis",
@@ -475,7 +475,7 @@ const routes = [
 						path: "/enm_coalbase/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_coalbase"],
 						},
 						component: "enm_coalbase/workshopAnalysis",
@@ -485,7 +485,7 @@ const routes = [
 						path: "/enm_coalbase/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_coalbase"],
 						},
 						component: "enm_coalbase/handoverLog",
@@ -508,7 +508,7 @@ const routes = [
 						path: "/enm_kiln/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_kiln"],
 						},
 						component: "enm_kiln/report",
@@ -518,7 +518,7 @@ const routes = [
 						path: "/enm_kiln/power",
 						meta: {
 							title: "单位产品电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_kiln"],
 						},
 						component: "enm_kiln/power",
@@ -528,7 +528,7 @@ const routes = [
 						path: "/enm_kiln/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_kiln"],
 						},
 						component: "enm_kiln/teamAnalysis",
@@ -538,7 +538,7 @@ const routes = [
 						path: "/enm_kiln/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_kiln"],
 						},
 						component: "enm_kiln/workshopAnalysis",
@@ -548,7 +548,7 @@ const routes = [
 						path: "/enm_kiln/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_kiln"],
 						},
 						component: "enm_kiln/handoverLog",
@@ -571,7 +571,7 @@ const routes = [
 						path: "/enm_kilnbase/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_kilnbase"],
 						},
 						component: "enm_kilnbase/report",
@@ -581,7 +581,7 @@ const routes = [
 						path: "/enm_kilnbase/power",
 						meta: {
 							title: "主要设备单位电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_kilnbase"],
 						},
 						component: "enm_kilnbase/power",
@@ -591,7 +591,7 @@ const routes = [
 						path: "/enm_kilnbase/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_kilnbase"],
 						},
 						component: "enm_kilnbase/teamAnalysis",
@@ -601,7 +601,7 @@ const routes = [
 						path: "/enm_kilnbase/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_kilnbase"],
 						},
 						component: "enm_kilnbase/workshopAnalysis",
@@ -611,7 +611,7 @@ const routes = [
 						path: "/enm_kilnbase/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_kilnbase"],
 						},
 						component: "enm_kilnbase/handoverLog",
@@ -621,7 +621,7 @@ const routes = [
 						path: "/enm_kilnbase/mgroupData",
 						meta: {
 							title: "数据校正",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_kilnbase"],
 						},
 						component: "enm_kilnbase/mgroupData",
@@ -644,7 +644,7 @@ const routes = [
 						path: "/enm_cogeneration/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_cogeneration"],
 						},
 						component: "enm_cogeneration/report",
@@ -654,7 +654,7 @@ const routes = [
 						path: "/enm_cogeneration/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_cogeneration"],
 						},
 						component: "enm_cogeneration/teamAnalysis",
@@ -664,7 +664,7 @@ const routes = [
 						path: "/enm_cogeneration/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_cogeneration"],
 						},
 						component: "enm_cogeneration/workshopAnalysis",
@@ -674,7 +674,7 @@ const routes = [
 						path: "/enm_cogeneration/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_cogeneration"],
 						},
 						component: "enm_cogeneration/handoverLog",
@@ -697,7 +697,7 @@ const routes = [
 						path: "/enm_mill/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_mill"],
 						},
 						component: "enm_mill/report",
@@ -707,7 +707,7 @@ const routes = [
 						path: "/enm_mill/power",
 						meta: {
 							title: "单位产品电耗",
-							icon: "el-icon-odometer",
+							// icon: "el-icon-odometer",
 							perms: ["enm_mill"],
 						},
 						component: "enm_mill/power",
@@ -717,7 +717,7 @@ const routes = [
 						path: "/enm_mill/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_mill"],
 						},
 						component: "enm_mill/teamAnalysis",
@@ -727,7 +727,7 @@ const routes = [
 						path: "/enm_mill/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_mill"],
 						},
 						component: "enm_mill/workshopAnalysis",
@@ -737,7 +737,7 @@ const routes = [
 						path: "/enm_mill/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_mill"],
 						},
 						component: "enm_mill/handoverLog",
@@ -760,7 +760,7 @@ const routes = [
 						path: "/enm_pack/report",
 						meta: {
 							title: "生产报告",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							perms: ["enm_pack"],
 						},
 						component: "enm_pack/report",
@@ -770,7 +770,7 @@ const routes = [
 						path: "/enm_pack/teamAnalysis",
 						meta: {
 							title: "班组月度对比",
-							icon: "el-icon-operation",
+							// icon: "el-icon-operation",
 							perms: ["enm_pack"],
 						},
 						component: "enm_pack/teamAnalysis",
@@ -780,7 +780,7 @@ const routes = [
 						path: "/enm_pack/workshopAnalysis",
 						meta: {
 							title: "车间单耗分析",
-							icon: "el-icon-data-line",
+							// icon: "el-icon-data-line",
 							perms: ["enm_pack"],
 						},
 						component: "enm_pack/workshopAnalysis",
@@ -790,7 +790,7 @@ const routes = [
 						path: "/enm_pack/handoverLog",
 						meta: {
 							title: "交接班日志",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							perms: ["enm_pack"],
 						},
 						component: "enm_pack/handoverLog",
@@ -813,7 +813,7 @@ const routes = [
 						path: "/enp/pfk",
 						meta: {
 							title: "排放口",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["enm_hb"],
 						},
 						component: "enp/pfk",
@@ -836,7 +836,7 @@ const routes = [
 						path: "/enm_energy/energy",
 						meta: {
 							title: "能源统计",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_energy"],
 						},
 						component: "enm_energy/energy",
@@ -846,7 +846,7 @@ const routes = [
 						path: "/enm_energy/value",
 						meta: {
 							title: "工业产值",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_value"],
 						},
 						component: "enm_energy/value",
@@ -856,7 +856,7 @@ const routes = [
 						path: "/enm_energy/electric",
 						meta: {
 							title: "全厂电量统计",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_electric"],
 						},
 						component: "enm_energy/electric",
@@ -866,7 +866,7 @@ const routes = [
 						path: "/enm_energy/electricHour",
 						meta: {
 							title: "全厂电量小时统计",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_hour"],
 						},
 						component: "enm_energy/electric_hour",
@@ -876,7 +876,7 @@ const routes = [
 						path: "/enm_energy/electricDay",
 						meta: {
 							title: "全厂电量日统计",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_day"],
 						},
 						component: "enm_energy/electric_day",
@@ -886,7 +886,7 @@ const routes = [
 						path: "/enm_energy/electricMonth",
 						meta: {
 							title: "全厂电量月统计",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_month"],
 						},
 						component: "enm_energy/electric_month",
@@ -896,7 +896,7 @@ const routes = [
 						path: "/enm_energy/hourBase",
 						meta: {
 							title: "电量消耗小时报表",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["hour_base"],
 						},
 						component: "enm_energy/hour_base",
@@ -906,7 +906,7 @@ const routes = [
 						path: "/enm_energy/dayBase",
 						meta: {
 							title: "电量消耗日报表",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["day_base"],
 						},
 						component: "enm_energy/day_base",
@@ -916,7 +916,7 @@ const routes = [
 						path: "/enm_energy/monthBase",
 						meta: {
 							title: "电量消耗月报表",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["month_base"],
 						},
 						component: "enm_energy/month_base",
@@ -926,7 +926,7 @@ const routes = [
 						path: "/enm_energy/energyPicture",
 						meta: {
 							title: "能源流向",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_energy_picture"],
 						},
 						component: "enm_energy/energyPicture",
@@ -949,7 +949,7 @@ const routes = [
 						path: "/enm_report/costing",
 						meta: {
 							title: "成本计算",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_report"],
 						},
 						component: "enm_report/costing",
@@ -959,7 +959,7 @@ const routes = [
 						path: "/enm_report/quality",
 						meta: {
 							title: "质量报表",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_report"],
 						},
 						component: "enm_report/quality",
@@ -969,7 +969,7 @@ const routes = [
 						path: "/enm_report/reportDay",
 						meta: {
 							title: "生产日报表",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_report"],
 						},
 						component: "enm_report/reportDay",
@@ -979,7 +979,7 @@ const routes = [
 						path: "/enm_report/reportMonth",
 						meta: {
 							title: "生产月报表",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_report"],
 						},
 						component: "enm_report/reportMonth",
@@ -1002,7 +1002,7 @@ const routes = [
 						path: "/mtm/materials_gx",
 						meta: {
 							title: "物料产品",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["material_gx"],
 						},
 						component: "mtm/materials_gx",
@@ -1012,7 +1012,7 @@ const routes = [
 						path: "/mtm/materials",
 						meta: {
 							title: "物料产品",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["material"],
 						},
 						component: "mtm/materials",
@@ -1022,7 +1022,7 @@ const routes = [
 						name: "testItem",
 						meta: {
 							title: "检测项目",
-							icon: "el-icon-postcard",
+							// icon: "el-icon-postcard",
 							type: "menu",
 							perms: ["testitem"],
 						},
@@ -1033,7 +1033,7 @@ const routes = [
 						path: "/mtm/process",
 						meta: {
 							title: "工序管理",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["process"],
 						},
 						component: "mtm/process",
@@ -1043,7 +1043,7 @@ const routes = [
 						path: "/mtm/mgruops",
 						meta: {
 							title: "工段管理",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["mgroup"],
 						},
 						component: "mtm/mgroup",
@@ -1053,7 +1053,7 @@ const routes = [
 						path: "/mtm/route",
 						meta: {
 							title: "加工路线",
-							icon: "el-icon-share",
+							// icon: "el-icon-share",
 							perms: ["route"],
 						},
 						component: "mtm/route",
@@ -1063,7 +1063,7 @@ const routes = [
 						path: "/mtm/routepack",
 						meta: {
 							title: "加工工艺",
-							icon: "el-icon-share",
+							// icon: "el-icon-share",
 							perms: ["routepack"],
 						},
 						component: "mtm/routepack",
@@ -1087,7 +1087,7 @@ const routes = [
 						meta: {
 							title: "生产一部",
 							type: "menu",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["utask_1b"],
 						},
 						children: [
@@ -1096,7 +1096,7 @@ const routes = [
 								path: "/pm/utask_dept7",
 								meta: {
 									title: "7车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["utask_dept7"],
 								},
 								component: "pm/utask_dept7",
@@ -1106,7 +1106,7 @@ const routes = [
 								path: "/pm/utask_dept10",
 								meta: {
 									title: "10车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["utask_dept10"],
 								},
 								component: "pm/utask_dept10",
@@ -1118,7 +1118,7 @@ const routes = [
 						path: "/pm/utask_2b",
 						meta: {
 							title: "生产二部",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							type: "menu",
 							perms: ["utask_2b"],
 						},
@@ -1128,7 +1128,7 @@ const routes = [
 								path: "/pm/utask_dept6",
 								meta: {
 									title: "6车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["utask_dept6"],
 								},
 								component: "pm/utask_dept6",
@@ -1140,7 +1140,7 @@ const routes = [
 						path: "/pm/utask",
 						meta: {
 							title: "车间任务",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["utask_gx"],
 						},
 						component: "pm/utask",
@@ -1163,7 +1163,7 @@ const routes = [
 						path: "/wpm/mlog_1b",
 						meta: {
 							title: "生产一部",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							type: "menu",
 							perms: ["mlog_1b"],
 						},
@@ -1173,7 +1173,7 @@ const routes = [
 								path: "/wpm/mlog_hun",
 								meta: {
 									title: "混料",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mlog_hun"],
 								},
 								component: "wpm/mlog_hun",
@@ -1183,7 +1183,7 @@ const routes = [
 								path: "/wpm/mlog_tui",
 								meta: {
 									title: "退火",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mlog_tui"],
 								},
 								component: "wpm/mlog_tui",
@@ -1193,7 +1193,7 @@ const routes = [
 								path: "/wpm/mlog_dept7",
 								meta: {
 									title: "7车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mlog_dept7"],
 								},
 								component: "wpm/mlog_dept7",
@@ -1203,7 +1203,7 @@ const routes = [
 								path: "/wpm/mlog_dept10",
 								meta: {
 									title: "10车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mlog_dept10"],
 								},
 								component: "wpm/mlog_dept10",
@@ -1215,7 +1215,7 @@ const routes = [
 						path: "/wpm/worktaskFlog",
 						meta: {
 							title: "生产二部记录",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm"],
 							hidden: true,
 						},
@@ -1226,7 +1226,7 @@ const routes = [
 						path: "/wpm/mlog_2b",
 						meta: {
 							title: "生产二部",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm"],
 						},
 						children: [
@@ -1235,7 +1235,7 @@ const routes = [
 								path: "/pm/mlog_dept6",
 								meta: {
 									title: "6车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mlog_dept6"],
 								},
 								component: "wpm/mlog_dept6",
@@ -1245,7 +1245,7 @@ const routes = [
 								path: "/pm/mlogDept6Detail",
 								meta: {
 									title: "6车间",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mlog_dept6"],
 									hidden: true,
 								},
@@ -1258,7 +1258,7 @@ const routes = [
 						path: "/wpm/otherlog",
 						meta: {
 							title: "其他日志",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["otherlog"],
 						},
 						component: "wpm/otherlog",
@@ -1270,7 +1270,7 @@ const routes = [
 				name: "wpm_gx",
 				path: "/wpm_gx",
 				meta: {
-					title: "生产执行gx",
+					title: "生产执行",
 					icon: "el-icon-grid",
 					type: "menu",
 					perms: ["wpm_gx"],
@@ -1301,7 +1301,7 @@ const routes = [
 						path: "/wpm_gx/qiepian",
 						meta: {
 							title: "切片",
-							icon: "el-icon-files",
+							// icon: "el-icon-files",
 							perms: ["wpm_qp"],
 						},
 						component: "wpm_gx/qiepian",
@@ -1311,7 +1311,7 @@ const routes = [
 						path: "/wpm_gx/saobian",
 						meta: {
 							title: "扫边",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_sb"],
 						},
 						component: "wpm_gx/saobian",
@@ -1321,7 +1321,7 @@ const routes = [
 						path: "/wpm_gx/heihua",
 						meta: {
 							title: "黑化",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_hh"],
 						},
 						component: "wpm_gx/heihua",
@@ -1331,7 +1331,7 @@ const routes = [
 						path: "/wpm_gx/shaojie",
 						meta: {
 							title: "烧结",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_sj"],
 						},
 						component: "wpm_gx/shaojie",
@@ -1341,7 +1341,7 @@ const routes = [
 						path: "/wpm_gx/jianbo",
 						meta: {
 							title: "减薄",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_jb"],
 						},
 						component: "wpm_gx/jianbo",
@@ -1351,7 +1351,7 @@ const routes = [
 						path: "/wpm_gx/jingdiao",
 						meta: {
 							title: "精雕",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_jd"],
 						},
 						component: "wpm_gx/jingdiao",
@@ -1361,7 +1361,7 @@ const routes = [
 						path: "/wpm_gx/mopao",
 						meta: {
 							title: "磨抛",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_mp"],
 						},
 						component: "wpm_gx/mopao",
@@ -1371,7 +1371,7 @@ const routes = [
 						path: "/wpm_gx/daojiao",
 						meta: {
 							title: "倒角",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_dj"],
 						},
 						component: "wpm_gx/daojiao",
@@ -1381,7 +1381,7 @@ const routes = [
 						path: "/wpm_gx/chaoxi",
 						meta: {
 							title: "超洗",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["wpm_cx"],
 						},
 						component: "wpm_gx/chaoxi",
@@ -1404,7 +1404,7 @@ const routes = [
 						path: "/qm/income",
 						meta: {
 							title: "入厂检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["itest"],
 						},
 						component: "qm/income",
@@ -1414,7 +1414,7 @@ const routes = [
 						path: "/qm/first",
 						meta: {
 							title: "首件检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["ftest"],
 						},
 						component: "qm/first",
@@ -1424,7 +1424,7 @@ const routes = [
 						path: "/qm/qmProcess",
 						meta: {
 							title: "过程检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["ptest"],
 						},
 						component: "qm/process",
@@ -1434,7 +1434,7 @@ const routes = [
 						path: "/qm/inm",
 						meta: {
 							title: "库存检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["intest"],
 						},
 						component: "qm/inm",
@@ -1444,7 +1444,7 @@ const routes = [
 						path: "/qm/behavior",
 						meta: {
 							title: "性能检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["btest"],
 						},
 						component: "qm/behavior",
@@ -1454,7 +1454,7 @@ const routes = [
 						path: "/qm/product",
 						meta: {
 							title: "成品检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["producttest"],
 						},
 						component: "qm/product",
@@ -1464,7 +1464,7 @@ const routes = [
 						path: "/qm/productDetail",
 						meta: {
 							title: "成品检验",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["producttest"],
 							hidden: true,
 						},
@@ -1488,7 +1488,7 @@ const routes = [
 						path: "/inm/warehouse",
 						meta: {
 							title: "仓库管理",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["warehouse"],
 						},
 						component: "inm/warehouse",
@@ -1498,7 +1498,7 @@ const routes = [
 						path: "/inm/good",
 						meta: {
 							title: "成品库",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["good"],
 						},
 						children: [
@@ -1507,7 +1507,7 @@ const routes = [
 								path: "/inm/good",
 								meta: {
 									title: "成品库",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["good"],
 								},
 								component: "inm/good",
@@ -1517,7 +1517,7 @@ const routes = [
 								path: "/inm/good_mio",
 								meta: {
 									title: "出入库记录",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["good_mio"],
 								},
 								component: "inm/good_mio",
@@ -1529,7 +1529,7 @@ const routes = [
 						path: "/inm/halfgood",
 						meta: {
 							title: "半成品库",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["halfgood"],
 						},
 						children: [
@@ -1538,7 +1538,7 @@ const routes = [
 								path: "/inm/halfgood",
 								meta: {
 									title: "半成品库",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["halfgood"],
 								},
 								component: "inm/halfgood",
@@ -1548,7 +1548,7 @@ const routes = [
 								path: "/inm/halfgood_mio",
 								meta: {
 									title: "出入库记录",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["halfgood_mio"],
 								},
 								component: "inm/halfgood_mio",
@@ -1560,7 +1560,7 @@ const routes = [
 						path: "/inm/mainso",
 						meta: {
 							title: "原料库",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["mainso"],
 						},
 						children: [
@@ -1569,7 +1569,7 @@ const routes = [
 								path: "/inm/mainso",
 								meta: {
 									title: "原料库",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mainso"],
 								},
 								component: "inm/mainso",
@@ -1579,7 +1579,7 @@ const routes = [
 								path: "/inm/mainso_mio",
 								meta: {
 									title: "出入库记录",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["mainso_mio"],
 								},
 								component: "inm/mainso_mio",
@@ -1591,7 +1591,7 @@ const routes = [
 						path: "/inm/helpso",
 						meta: {
 							title: "辅料库",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["helpso"],
 						},
 						children: [
@@ -1600,7 +1600,7 @@ const routes = [
 								path: "/inm/helpso",
 								meta: {
 									title: "辅料库",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["helpso"],
 								},
 								component: "inm/helpso",
@@ -1610,7 +1610,7 @@ const routes = [
 								path: "/inm/helpso_mio",
 								meta: {
 									title: "出入库记录",
-									icon: "el-icon-cellphone",
+									// icon: "el-icon-cellphone",
 									perms: ["helpso_mio"],
 								},
 								component: "inm/helpso_mio",
@@ -1632,7 +1632,7 @@ const routes = [
 						path: "/inm/mio",
 						meta: {
 							title: "出入库记录",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["mio"],
 						},
 						component: "inm/mio",
@@ -1642,7 +1642,7 @@ const routes = [
 						path: "/inm/mioitem",
 						meta: {
 							title: "出入库记录明细",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["inm"],
 							hidden: true,
 						},
@@ -1666,7 +1666,7 @@ const routes = [
 						path: "/pum/supplier",
 						meta: {
 							title: "供应商",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["pum"],
 						},
 						component: "pum/supplier",
@@ -1676,7 +1676,7 @@ const routes = [
 						path: "/pum/plan",
 						meta: {
 							title: "采购计划",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["pu_plan"],
 						},
 						component: "pum/plan",
@@ -1686,7 +1686,7 @@ const routes = [
 						path: "/pum/planitem",
 						meta: {
 							title: "采购计划详情",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["pu_plan"],
 							hidden: true,
 						},
@@ -1697,7 +1697,7 @@ const routes = [
 						path: "/pum/order",
 						meta: {
 							title: "采购订单",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["pu_order"],
 						},
 						component: "pum/order",
@@ -1707,7 +1707,7 @@ const routes = [
 						path: "/pum/orderitem",
 						meta: {
 							title: "采购订单详情",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["pu_order"],
 							hidden: true,
 						},
@@ -1731,7 +1731,7 @@ const routes = [
 						path: "/sam/customer",
 						meta: {
 							title: "客户信息",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["customer"],
 						},
 						component: "sam/customer",
@@ -1741,7 +1741,7 @@ const routes = [
 						path: "/sam/contract",
 						meta: {
 							title: "合同信息",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["contract"],
 						},
 						component: "sam/contract",
@@ -1751,7 +1751,7 @@ const routes = [
 						path: "/sam/samOrder",
 						meta: {
 							title: "订单管理",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["order"],
 						},
 						component: "sam/order",
@@ -1761,7 +1761,7 @@ const routes = [
 						path: "/sam/samOrderitem",
 						meta: {
 							title: "订单详情",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							hidden: true,
 							perms: ["order"],
 						},
@@ -1785,7 +1785,7 @@ const routes = [
 						path: "/ecm/event",
 						meta: {
 							title: "事件列表",
-							icon: "el-icon-alarm-clock",
+							// icon: "el-icon-alarm-clock",
 							perms: ["event"],
 						},
 						component: "ecm/event",
@@ -1795,7 +1795,7 @@ const routes = [
 						path: "/ecm/event_from",
 						meta: {
 							title: "事件详情",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["event"],
 						},
@@ -1806,7 +1806,7 @@ const routes = [
 						path: "/ecm/event_handlefrom",
 						meta: {
 							title: "处理事件",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							perms: ["event"],
 							hidden: true,
 						},
@@ -1817,7 +1817,7 @@ const routes = [
 						path: "/ecm/myevent",
 						meta: {
 							title: "我的事件",
-							icon: "el-icon-notification",
+							// icon: "el-icon-notification",
 							perms: ["myevent"],
 						},
 						component: "ecm/myevent",
@@ -1827,7 +1827,7 @@ const routes = [
 						path: "/ecm/notify_setting",
 						meta: {
 							title: "提醒配置",
-							icon: "el-icon-setting",
+							// icon: "el-icon-setting",
 							perms: ["notify_setting"],
 						},
 						component: "ecm/notify_setting",
@@ -1837,7 +1837,7 @@ const routes = [
 						path: "/ecm/algo",
 						meta: {
 							title: "算法布设",
-							icon: "el-icon-set-up",
+							// icon: "el-icon-set-up",
 							perms: ["algo"],
 						},
 						component: "ecm/algo",
@@ -1860,7 +1860,7 @@ const routes = [
 						path: "/opm/operation",
 						meta: {
 							title: "作业列表",
-							icon: "el-icon-tickets",
+							// icon: "el-icon-tickets",
 							perms: ["operation"],
 						},
 						component: "opm/operation",
@@ -1870,7 +1870,7 @@ const routes = [
 						path: "/opm/oplcate",
 						meta: {
 							title: "许可证分类",
-							icon: "el-icon-ticket",
+							// icon: "el-icon-ticket",
 							perms: ["oplcate"],
 						},
 						component: "opm/oplcate",
@@ -1880,7 +1880,7 @@ const routes = [
 						path: "/opm/opl",
 						meta: {
 							title: "作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1891,7 +1891,7 @@ const routes = [
 						path: "/opm/fire",
 						meta: {
 							title: "动火作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1902,7 +1902,7 @@ const routes = [
 						path: "/opm/space",
 						meta: {
 							title: "有限空间作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1913,7 +1913,7 @@ const routes = [
 						path: "/opm/clear",
 						meta: {
 							title: "清库作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1924,7 +1924,7 @@ const routes = [
 						path: "/opm/high",
 						meta: {
 							title: "高处作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1935,7 +1935,7 @@ const routes = [
 						path: "/opm/hoisting",
 						meta: {
 							title: "吊装作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1946,7 +1946,7 @@ const routes = [
 						path: "/opm/preheat",
 						meta: {
 							title: "预热器清堵作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1957,7 +1957,7 @@ const routes = [
 						path: "/opm/cooler",
 						meta: {
 							title: "篦冷机清大块作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1968,7 +1968,7 @@ const routes = [
 						path: "/opm/soil",
 						meta: {
 							title: "动土作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1979,7 +1979,7 @@ const routes = [
 						path: "/opm/usecl",
 						meta: {
 							title: "临时用电作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -1990,7 +1990,7 @@ const routes = [
 						path: "/opm/normal",
 						meta: {
 							title: "普通作业许可证",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["operation"],
 						},
@@ -2014,7 +2014,7 @@ const routes = [
 						path: "/rpm/rparty",
 						meta: {
 							title: "相关方列表",
-							icon: "el-icon-tickets",
+							// icon: "el-icon-tickets",
 							perms: ["rparty"],
 						},
 						component: "rpm/rparty",
@@ -2024,7 +2024,7 @@ const routes = [
 						path: "/rpm/blacklist",
 						meta: {
 							title: "黑名单",
-							icon: "el-icon-box",
+							// icon: "el-icon-box",
 							perms: ["blacklist"],
 						},
 						component: "rpm/blacklist",
@@ -2034,7 +2034,7 @@ const routes = [
 						path: "/rpm/remployee",
 						meta: {
 							title: "人员列表",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["remployee"],
 						},
 						component: "rpm/remployee",
@@ -2044,7 +2044,7 @@ const routes = [
 						path: "/rpm/rcertificate",
 						meta: {
 							title: "人员证书",
-							icon: "el-icon-postcard",
+							// icon: "el-icon-postcard",
 							perms: ["rcertificate"],
 						},
 						component: "rpm/rcertificate",
@@ -2054,7 +2054,7 @@ const routes = [
 						path: "/rpm/rfile",
 						meta: {
 							title: "企业资料",
-							icon: "el-icon-shopping-bag",
+							// icon: "el-icon-shopping-bag",
 							perms: ["rfile"],
 						},
 						component: "rpm/rfile",
@@ -2064,7 +2064,7 @@ const routes = [
 						path: "/rpm/rpj",
 						meta: {
 							title: "入厂项目",
-							icon: "el-icon-calendar",
+							// icon: "el-icon-calendar",
 							perms: ["rpj"],
 						},
 						component: "rpm/rpj",
@@ -2074,7 +2074,7 @@ const routes = [
 						path: "/rpm/rpjadd",
 						meta: {
 							title: "入厂项目相关信息",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["rpj"],
 						},
@@ -2098,7 +2098,7 @@ const routes = [
 						path: "/vm/visit",
 						meta: {
 							title: "来访项目",
-							icon: "el-icon-tickets",
+							// icon: "el-icon-tickets",
 							perms: ["visit"],
 						},
 						component: "vm/visit",
@@ -2108,7 +2108,7 @@ const routes = [
 						path: "/vm/visitor",
 						meta: {
 							title: "我的访客",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["visit"],
 						},
 						component: "vm/visitor",
@@ -2118,7 +2118,7 @@ const routes = [
 						path: "/vm/people",
 						meta: {
 							title: "访客人员",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							perms: ["visit"],
 							hidden: true,
 						},
@@ -2129,7 +2129,7 @@ const routes = [
 						path: "/vm/vistoradd",
 						meta: {
 							title: "项目信息",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["visit"],
 						},
@@ -2153,7 +2153,7 @@ const routes = [
 						path: "/wf/workflow",
 						meta: {
 							title: "工作流",
-							icon: "el-icon-guide",
+							// icon: "el-icon-guide",
 							perms: ["workflow"],
 						},
 						component: "wf/workflow",
@@ -2163,7 +2163,7 @@ const routes = [
 						path: "/wf/configuration",
 						meta: {
 							title: "工作流配置",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["workflow"],
 						},
@@ -2174,7 +2174,7 @@ const routes = [
 						path: "/wf/allwork",
 						meta: {
 							title: "全部工单",
-							icon: "el-icon-folder",
+							// icon: "el-icon-folder",
 							perms: ["allwork"],
 						},
 						component: "wf/allwork",
@@ -2184,7 +2184,7 @@ const routes = [
 						path: "/wf/ownerwork",
 						meta: {
 							title: "我创建的",
-							icon: "el-icon-folder-add",
+							// icon: "el-icon-folder-add",
 							perms: ["ownerwork"],
 						},
 						component: "wf/ownerwork",
@@ -2194,7 +2194,7 @@ const routes = [
 						path: "/wf/dutywork",
 						meta: {
 							title: "待办工单",
-							icon: "el-icon-folder-opened",
+							// icon: "el-icon-folder-opened",
 							perms: ["duty"],
 						},
 						component: "wf/dutywork",
@@ -2204,7 +2204,7 @@ const routes = [
 						path: "/wf/worked",
 						meta: {
 							title: "我处理的",
-							icon: "el-icon-expand",
+							// icon: "el-icon-expand",
 							perms: ["worked"],
 						},
 						component: "wf/worked",
@@ -2214,7 +2214,7 @@ const routes = [
 						path: "/wf/ccwork",
 						meta: {
 							title: "抄送我的",
-							icon: "el-icon-edit-pen",
+							// icon: "el-icon-edit-pen",
 							perms: ["ccwork"],
 						},
 						component: "wf/ccwork",
@@ -2224,7 +2224,7 @@ const routes = [
 						path: "/wf/ticketdetail",
 						meta: {
 							title: "工单详情",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["duty"],
 						},
@@ -2248,7 +2248,7 @@ const routes = [
 						path: "/am/area",
 						meta: {
 							title: "区域列表",
-							icon: "el-icon-tickets",
+							// icon: "el-icon-tickets",
 							perms: ["area"],
 						},
 						component: "am/area",
@@ -2258,7 +2258,7 @@ const routes = [
 						path: "/am/eqm",
 						meta: {
 							title: "门禁通道",
-							icon: "el-icon-phone",
+							// icon: "el-icon-phone",
 							perms: ["eqm"],
 						},
 						component: "am/em1",
@@ -2268,7 +2268,7 @@ const routes = [
 						path: "/am/monitor",
 						meta: {
 							title: "视频通道",
-							icon: "el-icon-video-camera",
+							// icon: "el-icon-video-camera",
 							perms: ["monitor"],
 						},
 						component: "am/monitor",
@@ -2278,7 +2278,7 @@ const routes = [
 						path: "/am/audio",
 						meta: {
 							title: "喇叭通道",
-							icon: "el-icon-mic",
+							// icon: "el-icon-mic",
 							perms: ["audio"],
 						},
 						component: "am/audio",
@@ -2288,7 +2288,7 @@ const routes = [
 						path: "/am/blt",
 						meta: {
 							title: "定位标签",
-							icon: "el-icon-map-location",
+							// icon: "el-icon-map-location",
 							perms: ["blt"],
 						},
 						component: "am/blt",
@@ -2311,7 +2311,7 @@ const routes = [
 						path: "/em/ecate",
 						meta: {
 							title: "设备分类",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["ecate"],
 						},
 						component: "em/ecate",
@@ -2321,7 +2321,7 @@ const routes = [
 						path: "/em/equipment",
 						meta: {
 							title: "生产设备",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["equipment"],
 						},
 						component: "em/equipment",
@@ -2331,7 +2331,7 @@ const routes = [
 						path: "/em/equipmentc",
 						meta: {
 							title: "计量设备",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["equipmentjl"],
 						},
 						component: "em/equipmentjl",
@@ -2341,7 +2341,7 @@ const routes = [
 						path: "/em/equipmentz",
 						meta: {
 							title: "治理设备",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["equipmentzl"],
 						},
 						component: "em/equipmentzl",
@@ -2351,7 +2351,7 @@ const routes = [
 						path: "/em/equipmentjc",
 						meta: {
 							title: "监测设备",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["equipmentjc"],
 						},
 						component: "em/equipmentjc",
@@ -2361,7 +2361,7 @@ const routes = [
 						path: "/em/equipmentjk",
 						meta: {
 							title: "监控设备",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["equipmentjk"],
 						},
 						component: "em/equipmentjk",
@@ -2371,7 +2371,7 @@ const routes = [
 						path: "/em/xjRecord",
 						meta: {
 							title: "巡检记录",
-							icon: "el-icon-cellphone",
+							// icon: "el-icon-cellphone",
 							perms: ["einspect"],
 						},
 						component: "em/xjRecord",
@@ -2394,7 +2394,7 @@ const routes = [
 						path: "/hrm/employee",
 						meta: {
 							title: "人员信息",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["employee"],
 						},
 						component: "hrm/employee",
@@ -2404,7 +2404,7 @@ const routes = [
 						path: "/hrm/employee_photon",
 						meta: {
 							title: "人员信息",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["employee_photon"],
 						},
 						component: "hrm/employee_photon",
@@ -2414,7 +2414,7 @@ const routes = [
 						path: "/hrm/team_photon",
 						meta: {
 							title: "班组管理",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							perms: ["team_photon"],
 						},
 						component: "hrm/team_photon",
@@ -2424,7 +2424,7 @@ const routes = [
 						path: "/hrm/certificate",
 						meta: {
 							title: "证书列表",
-							icon: "el-icon-tickets",
+							// icon: "el-icon-tickets",
 							perms: ["certificate"],
 						},
 						component: "hrm/certificate",
@@ -2434,7 +2434,7 @@ const routes = [
 						path: "/hrm/clock_record",
 						meta: {
 							title: "打卡记录",
-							icon: "el-icon-check",
+							// icon: "el-icon-check",
 							perms: ["clock_record"],
 						},
 						component: "hrm/clock_record",
@@ -2444,7 +2444,7 @@ const routes = [
 						path: "/hrm/attendance",
 						meta: {
 							title: "到岗记录",
-							icon: "el-icon-check",
+							// icon: "el-icon-check",
 							perms: ["attendance"],
 						},
 						component: "hrm/attendance",
@@ -2454,7 +2454,7 @@ const routes = [
 						path: "/hrm/performance",
 						meta: {
 							title: "绩效考核",
-							icon: "el-icon-check",
+							// icon: "el-icon-check",
 							perms: ["kpi"],
 						},
 						component: "hrm/performance",
@@ -2464,7 +2464,7 @@ const routes = [
 						path: "/hrm/certificate",
 						meta: {
 							title: "相关证书",
-							icon: "el-icon-menu",
+							// icon: "el-icon-menu",
 							hidden: true,
 							perms: ["certificate"],
 						},
@@ -2475,7 +2475,7 @@ const routes = [
 						path: "/hrm/dchannel_auth",
 						meta: {
 							title: "门禁权限",
-							icon: "el-icon-key",
+							// icon: "el-icon-key",
 							perms: ["dchannel_auth"],
 						},
 						component: "hrm/dchannel_auth",
@@ -2498,7 +2498,7 @@ const routes = [
 						path: "/dpm/riskpoint",
 						meta: {
 							title: "风险管理",
-							icon: "el-icon-aim",
+							// icon: "el-icon-aim",
 							perms: ["riskpoint"],
 						},
 						component: "dpm/riskpoint",
@@ -2508,7 +2508,7 @@ const routes = [
 						path: "/dpm/checkwork",
 						meta: {
 							title: "排查工作",
-							icon: "el-icon-aim",
+							// icon: "el-icon-aim",
 							perms: ["checkwork"],
 						},
 						component: "dpm/checkwork",
@@ -2518,7 +2518,7 @@ const routes = [
 						path: "/dpm/hazard",
 						meta: {
 							title: "隐患管理",
-							icon: "el-icon-aim",
+							// icon: "el-icon-aim",
 							perms: ["hazard"],
 						},
 						component: "dpm/hazard",
@@ -2541,7 +2541,7 @@ const routes = [
 						path: "/edu/question",
 						meta: {
 							title: "题库",
-							icon: "el-icon-notebook",
+							// icon: "el-icon-notebook",
 							perms: ["question"],
 						},
 						component: "edu/question",
@@ -2551,7 +2551,7 @@ const routes = [
 						path: "/edu/paper",
 						meta: {
 							title: "试卷库",
-							icon: "el-icon-notebook",
+							// icon: "el-icon-notebook",
 							perms: ["paper"],
 						},
 						component: "edu/paper",
@@ -2561,7 +2561,7 @@ const routes = [
 						path: "/edu/exam",
 						meta: {
 							title: "在线考试",
-							icon: "el-icon-notebook",
+							// icon: "el-icon-notebook",
 							perms: ["exam"],
 						},
 						component: "edu/exam",
@@ -2571,7 +2571,7 @@ const routes = [
 						path: "/edu/train",
 						meta: {
 							title: "线下培训",
-							icon: "el-icon-notebook",
+							// icon: "el-icon-notebook",
 							perms: ["train"],
 						},
 						component: "edu/train",
@@ -2581,7 +2581,7 @@ const routes = [
 						path: "/edu/examrecord",
 						meta: {
 							title: "考试记录",
-							icon: "el-icon-notebook",
+							// icon: "el-icon-notebook",
 							perms: ["examrecord"],
 						},
 						component: "edu/examrecord",
@@ -2615,7 +2615,7 @@ const routes = [
 						name: "team",
 						meta: {
 							title: "班组管理",
-							icon: "el-icon-postcard",
+							// icon: "el-icon-postcard",
 							type: "menu",
 							perms: ["team"],
 						},
@@ -2626,7 +2626,7 @@ const routes = [
 						path: "/enm_base/mgruop",
 						meta: {
 							title: "工段",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["mgroup"],
 						},
 						component: "enm_base/mgroup",
@@ -2636,7 +2636,7 @@ const routes = [
 						path: "/enm_base/mpoint",
 						meta: {
 							title: "测点",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["mpoint"],
 						},
 						component: "em/mpoint",
@@ -2646,7 +2646,7 @@ const routes = [
 						path: "/enm_base/material",
 						meta: {
 							title: "物料",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["material"],
 						},
 						component: "enm_base/material",
@@ -2656,7 +2656,7 @@ const routes = [
 						path: "/enm_base/logDetail",
 						meta: {
 							title: "日志详情",
-							icon: "el-icon-document-copy",
+							// icon: "el-icon-document-copy",
 							hidden: true,
 						},
 						component: "enm_rm/logDetail",
@@ -2666,7 +2666,7 @@ const routes = [
 						path: "/enm_base/formula",
 						meta: {
 							title: "计算系数",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_formula"],
 						},
 						component: "enm_base/formulaSetting",
@@ -2689,7 +2689,7 @@ const routes = [
 						path: "/enm_monthSet/priceset",
 						meta: {
 							title: "物料价格配置",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_priceset"],
 						},
 						component: "enm_monthSet/priceset",
@@ -2699,7 +2699,7 @@ const routes = [
 						path: "/enm_monthSet/feeset",
 						meta: {
 							title: "工段成本配置",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm_feeset"],
 						},
 						component: "enm_monthSet/feeset",
@@ -2709,7 +2709,7 @@ const routes = [
 						path: "/enm_monthSet/goalSetting",
 						meta: {
 							title: "月度年度目标值",
-							icon: "el-icon-grid",
+							// icon: "el-icon-grid",
 							perms: ["enm"],
 						},
 						component: "enm_monthSet/goalSetting",
@@ -2732,7 +2732,7 @@ const routes = [
 						name: "user",
 						meta: {
 							title: "账户管理",
-							icon: "el-icon-user",
+							// icon: "el-icon-user",
 							type: "menu",
 							perms: ["user"],
 						},
@@ -2743,7 +2743,7 @@ const routes = [
 						name: "dept",
 						meta: {
 							title: "部门管理",
-							icon: "sc-icon-organization",
+							// icon: "sc-icon-organization",
 							type: "menu",
 							perms: ["dept"],
 						},
@@ -2754,7 +2754,7 @@ const routes = [
 						name: "post",
 						meta: {
 							title: "岗位管理",
-							icon: "el-icon-postcard",
+							// icon: "el-icon-postcard",
 							type: "menu",
 							perms: ["post"],
 						},
@@ -2765,7 +2765,7 @@ const routes = [
 						name: "role",
 						meta: {
 							title: "角色管理",
-							icon: "el-icon-notebook",
+							// icon: "el-icon-notebook",
 							type: "menu",
 							perms: ["role"],
 						},
@@ -2776,7 +2776,7 @@ const routes = [
 						name: "dict",
 						meta: {
 							title: "字典管理",
-							icon: "el-icon-document",
+							// icon: "el-icon-document",
 							type: "menu",
 							perms: ["dict"],
 						},
@@ -2787,7 +2787,7 @@ const routes = [
 						name: "task",
 						meta: {
 							title: "计划任务",
-							icon: "el-icon-alarm-clock",
+							// icon: "el-icon-alarm-clock",
 							type: "menu",
 							perms: ["task"],
 						},
@@ -2803,7 +2803,7 @@ const routes = [
 		name: "bigScreen",
 		meta: {
 			title: "驾驶舱",
-			icon: "el-icon-position",
+			icon: "el-icon-platform",
 			perms: ["bigScreen"],
 			fullpage: true,
 		},
@@ -2815,7 +2815,7 @@ const routes = [
 		name: "bigScreen2",
 		meta: {
 			title: "能管大屏",
-			icon: "el-icon-position",
+			icon: "el-icon-platform",
 			perms: ["bigScreen2"],
 			fullpage: true,
 		},
@@ -2827,7 +2827,7 @@ const routes = [
 		name: "bigScreenly",
 		meta: {
 			title: "数智大屏",
-			icon: "el-icon-position",
+			icon: "el-icon-platform",
 			perms: ["bigScreenly"],
 			fullpage: true,
 		},
@@ -2929,7 +2929,7 @@ const routes = [
 						path: "/statistic/hunliao",
 						meta: {
 							title: "混料统计",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_wpm"],
 						},
 						component: "statistics/hunliao.vue",
@@ -2939,7 +2939,7 @@ const routes = [
 						path: "/statistic/pass_num",
 						meta: {
 							title: "合格数统计",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_wpm"],
 						},
 						component: "statistics/pass_num.vue",
@@ -2949,7 +2949,7 @@ const routes = [
 						path: "/statistic/task_rate",
 						meta: {
 							title: "任务进度",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_wpm"],
 						},
 						component: "statistics/task_rate.vue",
@@ -2959,7 +2959,7 @@ const routes = [
 						path: "/statistic/ppass_num",
 						meta: {
 							title: "工序合格数",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_wpm"],
 						},
 						component: "statistics/ppass_num.vue",
@@ -2982,7 +2982,7 @@ const routes = [
 						path: "/statistic/product_check",
 						meta: {
 							title: "生产检验统计",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_qm"],
 						},
 						component: "statistics/product_check.vue",
@@ -2992,7 +2992,7 @@ const routes = [
 						path: "/statistic/product_check2",
 						meta: {
 							title: "生产检验统计(粗加工)",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_qm"],
 						},
 						component: "statistics/product_check2.vue",
@@ -3012,7 +3012,7 @@ const routes = [
 						path: "/statistic/good_check",
 						meta: {
 							title: "成品检验统计",
-							icon: "el-icon-DataAnalysis",
+							// icon: "el-icon-DataAnalysis",
 							perms: ["statistic_qm"],
 						},
 						component: "statistics/good_check.vue",
@@ -3177,7 +3177,7 @@ const routes = [
 		path: "/ops",
 		meta: {
 			title: "运维",
-			icon: "el-icon-briefcase",
+			icon: "el-icon-tools",
 			type: "menu",
 			perms: ["ops"],
 		},
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 0be9db94..ab8212f4 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -22,7 +22,13 @@
 	--el-color-primary-dark-9: #060f19;
 	--el-border-radius-base: 2px;
 }
+.el-tag {
+	--el-tag-border-radius: 2px;
+}
 
+.el-message-box {
+	--el-messagebox-border-radius: 2px;
+}
 .el-menu {
 	border: none !important;
 }
diff --git a/src/views/bigScreen/enpComponents/carManager.vue b/src/views/bigScreen/enpComponents/carManager.vue
new file mode 100644
index 00000000..79b1d791
--- /dev/null
+++ b/src/views/bigScreen/enpComponents/carManager.vue
@@ -0,0 +1,45 @@
+<template>
+    <el-container>
+        <el-header class="panel_title">
+            <el-menu mode="horizontal" :default-active="activeIndex" :ellipsis="false" @select="handleSelect">
+                <el-menu-item index="1">进出厂车辆</el-menu-item>
+                <el-menu-item index="2">厂内车辆</el-menu-item>
+                <el-menu-item index="3">非道路移动机械</el-menu-item>
+            </el-menu>
+
+        </el-header>
+        <el-main class="nopadding">
+            <car_across v-if="activeIndex == '1'"></car_across>
+            <car_inner v-if="activeIndex == '2'"></car_inner>
+            <car_roadmachine v-if="activeIndex == '3'"></car_roadmachine>
+        </el-main>
+    </el-container>
+</template>
+<script>
+import car_across from "./car_across.vue";
+import car_inner from "./car_inner.vue";
+import car_roadmachine from "./car_roadmachine.vue";
+export default {
+    components: {
+        car_across,
+        car_inner,
+        car_roadmachine
+    },
+    data() {
+        return {
+            activeIndex: "1",
+            tableData: [],
+        }
+    },
+    methods: {
+        handleSelect(key, keyPath) {
+            this.activeIndex = key;
+        }
+    }
+}
+</script>
+<style>
+.el-tabs {
+    height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/car_across.vue b/src/views/bigScreen/enpComponents/car_across.vue
new file mode 100644
index 00000000..edf71263
--- /dev/null
+++ b/src/views/bigScreen/enpComponents/car_across.vue
@@ -0,0 +1,311 @@
+<template>
+    <el-container>
+        <el-header class="panel_title">
+            <div class="left-panel">
+                进出厂运输车辆台账
+            </div>
+            <div class="right-panel">
+                <el-button type="primary" @click="backtoMap">返回地图</el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <el-container>
+                <el-header class="searchWrap">
+                    <div class="left-panel">
+                        <div style="font-size: 1.8vh;">
+                            进出厂运输车辆总数：<span class="totalNumber">{{ count }}</span>
+                        </div>
+                    </div>
+                    <div class="right-panel">
+                        <el-select v-model="query.level" placeholder="排口等级" style="width:10vw" clearable
+                            @change="handleQuery">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                </el-header>
+                <el-main>
+                    <scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
+                        :query="query" @dataChange="updateCount">
+                        <el-table-column type="index" width="50" />
+                        <el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
+                        <el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
+                        <el-table-column prop="level" label="生产日期"></el-table-column>
+                        <el-table-column prop="color" label="车牌颜色"></el-table-column>
+                        <el-table-column prop="eqpment" label="注册登记日期"></el-table-column>
+                        <el-table-column prop="eqpment" label="车辆品牌型号"></el-table-column>
+                        <el-table-column prop="eqpment" label="发动机号码"></el-table-column>
+                        <el-table-column prop="eqpment" label="燃料类型"></el-table-column>
+                        <el-table-column prop="eqpment" label="排放阶段"></el-table-column>
+                        <el-table-column prop="eqpment" label="联网状态"></el-table-column>
+                        <el-table-column prop="eqpment" label="随车清单"></el-table-column>
+                        <el-table-column prop="eqpment" label="行驶证"></el-table-column>
+                        <el-table-column prop="eqpment" label="车辆所有人(单位)"></el-table-column>
+                    </scTable>
+                </el-main>
+            </el-container>
+        </el-main>
+    </el-container>
+</template>
+<script>
+import * as echarts from "echarts";
+export default {
+    props: {
+        directDetail: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        eqId: {
+            type: String,
+            default: () => {
+                return '';
+            },
+        },
+    },
+    data() {
+        return {
+            count: 0,
+            apiObj: this.$API.enp.drain.list,
+            params: { type: 10 },
+            query: {
+                search: ''
+            },
+            searchInputStyle: {
+                color: '#fff',
+            },
+            tableData: [],
+            detailItem: {},
+            detailForm: {
+                day: 18,
+                year: 2024,
+                month: 1
+            },
+            biquery: {
+                end_time: '2024-02-01',
+                start_time: '2024-01-29',
+                time_bucket: "1 minute",
+                equipment_id: "3491356310052896768",
+            },
+            showEqInfo:true,
+            resizeTimeout:null,
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        hiddenChange(){
+            let that = this;
+            that.showEqInfo = !that.showEqInfo;
+            that.addListener();
+        },
+        handleQuery() {
+            this.$refs.table.queryData(this.query);
+        },
+        updateCount(res, tableData) {
+            this.count = res.count
+        },
+        initTimeNow() {
+            var now = new Date();
+            let year = now.getFullYear(); // 年份
+            let month = now.getMonth() + 1; // 月份
+            let day = now.getDate(); // 日期
+            this.detailForm.year = year;
+            this.detailForm.month = month;
+            this.detailForm.day = day;
+        },
+        backtoMap() {
+            this.$emit('close')
+        },
+        getEquipments(ids) {
+            let that = this;
+            let reqs = [];
+            ids.forEach(id => {
+                reqs.push(that.$API.em.equipment.item.req(id).then(res => {
+                    if (res.type == 10) {
+                        that.eqs = res;
+                    } else if (res.type == 40) {
+                        that.eqc = res;
+                    } else if (res.type == 30) {
+                        that.eqz = res;
+                    }
+                }))
+            });
+            const promise = Promise.all(reqs);
+            promise.then(() => {
+                // this.getDetailData()
+            })
+
+        },
+       
+        
+    }
+}
+</script>
+<style>
+.tableBg {
+    width: 100%;
+    height: 88vh;
+    background-image: url('/public/img/enp_blue/bigtableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+.leftCard {
+    height: 80vh;
+    flex: 1;
+    color: #ffffff;
+    font-size: 0.75vw;
+    background-image: url('/public/img/enp_blue/smallTableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    margin-right: 1vw;
+}
+
+.rightCard {
+    flex: 2;
+    height: 80vh;
+    color: #ffffff;
+    background-image: url('/public/img/enp_blue/tableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+
+
+.totalWrap {
+    display: flex;
+    justify-content: space-between;
+    color: #ffffff;
+    font-size: 1.6vh;
+    padding: 0 0.5vw;
+    height: 3vh;
+    line-height: 3vh;
+}
+
+.totalNumber {
+    color: #64D2FF;
+    font-size: 2vh;
+    font-weight: bold;
+}
+
+.searchBtn {
+    width: 4.7vw;
+    height: 3vh;
+    background-size: 100% 100%;
+    background-image: url('/public/img/enp_blue/search.png');
+}
+
+.backMap {
+    height: 25px;
+    line-height: 25px;
+    position: absolute;
+    right: 1vw;
+    top: 15px;
+    font-size: 1vh;
+    width: -moz-fit-content;
+    width: fit-content;
+    color: #ffffff;
+    padding: 0 0.5vw;
+    background-image: url('/public/img/enp_blue/back.png');
+}
+
+.pageTitle {
+    height: 5vh;
+    line-height: 5vh;
+    color: #ffffff;
+    font-size: 1.2vw;
+    padding-left: 1vw;
+}
+
+/*  */
+.headerTitle {
+    color: #ffffff;
+    height: 4vh;
+    line-height: 4vh;
+    font-size: 2vh;
+    position: relative
+}
+
+.backBtn {
+    font-size: 1vh;
+    position: absolute;
+    top: 1vh;
+    right: 1vh;
+    line-height: 2vh
+}
+
+.greenBlock {
+    width: 1vh;
+    height: 1vh;
+    background-image: url('/public/img/enp_blue/greenBlock.png');
+    background-size: 100% 100%;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 0.5vw;
+}
+
+.circles {
+    width: 10px;
+    height: 10px;
+    border-radius: 5px;
+    background: #aaaaaa;
+    display: inline-block;
+    margin: auto 0.5vw auto 0;
+}
+
+.circles_1 {
+    background: #0ed877;
+}
+
+.circles_2 {
+    background: orange;
+}
+
+.linesWrap {
+    padding: 1vh 0.5vw;
+    height: 93%;
+    overflow: scroll;
+    font-weight: bold;
+    line-height: 3.5vh;
+}
+
+.typeLine {
+    height: 3.5vh;
+    line-height: 4vh;
+    font-weight: normal;
+}
+
+.infoLine {
+    line-height: 3vh;
+    padding-left: 0.5vw;
+    display: flex
+}
+
+.infotitle {
+    font-weight: normal;
+    color: #dddddd;
+}
+
+.hiddenIcon{
+    top:45%;
+    left:-25px;
+    width:50px;
+    height:50px;
+    z-index: 100;
+    position: absolute;
+    border-radius: 25px;
+    border: 1px solid rgba(254,254,254,.3);
+    box-shadow: 0 0 7px 2px rgba(254,254,254,.5);
+    background: rgba(255,255,255,.5);
+}
+.hiddenIcon_hidden{
+    left:0;
+}
+.hiddenImg{
+    font-size:40px;
+    margin:4px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/car_inner.vue b/src/views/bigScreen/enpComponents/car_inner.vue
new file mode 100644
index 00000000..11ca7644
--- /dev/null
+++ b/src/views/bigScreen/enpComponents/car_inner.vue
@@ -0,0 +1,311 @@
+<template>
+    <el-container>
+        <el-header class="panel_title">
+            <div class="left-panel">
+                厂内运输车辆台账
+            </div>
+            <div class="right-panel">
+                <el-button type="primary" @click="backtoMap">返回地图</el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <el-container>
+                <el-header class="searchWrap">
+                    <div class="left-panel">
+                        <div style="font-size: 1.8vh;">
+                            进出厂运输车辆总数：<span class="totalNumber">{{ count }}</span>
+                        </div>
+                    </div>
+                    <div class="right-panel">
+                        <el-select v-model="query.level" placeholder="排口等级" style="width:10vw" clearable
+                            @change="handleQuery">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                </el-header>
+                <el-main>
+                    <scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
+                        :query="query" @dataChange="updateCount">
+                        <el-table-column type="index" width="50" />
+                        <el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
+                        <el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
+                        <el-table-column prop="level" label="生产日期"></el-table-column>
+                        <el-table-column prop="color" label="车牌颜色"></el-table-column>
+                        <el-table-column prop="eqpment" label="注册登记日期"></el-table-column>
+                        <el-table-column prop="eqpment" label="车辆品牌型号"></el-table-column>
+                        <el-table-column prop="eqpment" label="发动机号码"></el-table-column>
+                        <el-table-column prop="eqpment" label="燃料类型"></el-table-column>
+                        <el-table-column prop="eqpment" label="排放阶段"></el-table-column>
+                        <el-table-column prop="eqpment" label="联网状态"></el-table-column>
+                        <el-table-column prop="eqpment" label="随车清单"></el-table-column>
+                        <el-table-column prop="eqpment" label="行驶证"></el-table-column>
+                        <el-table-column prop="eqpment" label="车辆所有人(单位)"></el-table-column>
+                    </scTable>
+                </el-main>
+            </el-container>
+        </el-main>
+    </el-container>
+</template>
+<script>
+import * as echarts from "echarts";
+export default {
+    props: {
+        directDetail: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        eqId: {
+            type: String,
+            default: () => {
+                return '';
+            },
+        },
+    },
+    data() {
+        return {
+            count: 0,
+            apiObj: this.$API.enp.drain.list,
+            params: { type: 10 },
+            query: {
+                search: ''
+            },
+            searchInputStyle: {
+                color: '#fff',
+            },
+            tableData: [],
+            detailItem: {},
+            detailForm: {
+                day: 18,
+                year: 2024,
+                month: 1
+            },
+            biquery: {
+                end_time: '2024-02-01',
+                start_time: '2024-01-29',
+                time_bucket: "1 minute",
+                equipment_id: "3491356310052896768",
+            },
+            showEqInfo:true,
+            resizeTimeout:null,
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        hiddenChange(){
+            let that = this;
+            that.showEqInfo = !that.showEqInfo;
+            that.addListener();
+        },
+        handleQuery() {
+            this.$refs.table.queryData(this.query);
+        },
+        updateCount(res, tableData) {
+            this.count = res.count
+        },
+        initTimeNow() {
+            var now = new Date();
+            let year = now.getFullYear(); // 年份
+            let month = now.getMonth() + 1; // 月份
+            let day = now.getDate(); // 日期
+            this.detailForm.year = year;
+            this.detailForm.month = month;
+            this.detailForm.day = day;
+        },
+        backtoMap() {
+            this.$emit('close')
+        },
+        getEquipments(ids) {
+            let that = this;
+            let reqs = [];
+            ids.forEach(id => {
+                reqs.push(that.$API.em.equipment.item.req(id).then(res => {
+                    if (res.type == 10) {
+                        that.eqs = res;
+                    } else if (res.type == 40) {
+                        that.eqc = res;
+                    } else if (res.type == 30) {
+                        that.eqz = res;
+                    }
+                }))
+            });
+            const promise = Promise.all(reqs);
+            promise.then(() => {
+                // this.getDetailData()
+            })
+
+        },
+       
+        
+    }
+}
+</script>
+<style>
+.tableBg {
+    width: 100%;
+    height: 88vh;
+    background-image: url('/public/img/enp_blue/bigtableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+.leftCard {
+    height: 80vh;
+    flex: 1;
+    color: #ffffff;
+    font-size: 0.75vw;
+    background-image: url('/public/img/enp_blue/smallTableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    margin-right: 1vw;
+}
+
+.rightCard {
+    flex: 2;
+    height: 80vh;
+    color: #ffffff;
+    background-image: url('/public/img/enp_blue/tableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+
+
+.totalWrap {
+    display: flex;
+    justify-content: space-between;
+    color: #ffffff;
+    font-size: 1.6vh;
+    padding: 0 0.5vw;
+    height: 3vh;
+    line-height: 3vh;
+}
+
+.totalNumber {
+    color: #64D2FF;
+    font-size: 2vh;
+    font-weight: bold;
+}
+
+.searchBtn {
+    width: 4.7vw;
+    height: 3vh;
+    background-size: 100% 100%;
+    background-image: url('/public/img/enp_blue/search.png');
+}
+
+.backMap {
+    height: 25px;
+    line-height: 25px;
+    position: absolute;
+    right: 1vw;
+    top: 15px;
+    font-size: 1vh;
+    width: -moz-fit-content;
+    width: fit-content;
+    color: #ffffff;
+    padding: 0 0.5vw;
+    background-image: url('/public/img/enp_blue/back.png');
+}
+
+.pageTitle {
+    height: 5vh;
+    line-height: 5vh;
+    color: #ffffff;
+    font-size: 1.2vw;
+    padding-left: 1vw;
+}
+
+/*  */
+.headerTitle {
+    color: #ffffff;
+    height: 4vh;
+    line-height: 4vh;
+    font-size: 2vh;
+    position: relative
+}
+
+.backBtn {
+    font-size: 1vh;
+    position: absolute;
+    top: 1vh;
+    right: 1vh;
+    line-height: 2vh
+}
+
+.greenBlock {
+    width: 1vh;
+    height: 1vh;
+    background-image: url('/public/img/enp_blue/greenBlock.png');
+    background-size: 100% 100%;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 0.5vw;
+}
+
+.circles {
+    width: 10px;
+    height: 10px;
+    border-radius: 5px;
+    background: #aaaaaa;
+    display: inline-block;
+    margin: auto 0.5vw auto 0;
+}
+
+.circles_1 {
+    background: #0ed877;
+}
+
+.circles_2 {
+    background: orange;
+}
+
+.linesWrap {
+    padding: 1vh 0.5vw;
+    height: 93%;
+    overflow: scroll;
+    font-weight: bold;
+    line-height: 3.5vh;
+}
+
+.typeLine {
+    height: 3.5vh;
+    line-height: 4vh;
+    font-weight: normal;
+}
+
+.infoLine {
+    line-height: 3vh;
+    padding-left: 0.5vw;
+    display: flex
+}
+
+.infotitle {
+    font-weight: normal;
+    color: #dddddd;
+}
+
+.hiddenIcon{
+    top:45%;
+    left:-25px;
+    width:50px;
+    height:50px;
+    z-index: 100;
+    position: absolute;
+    border-radius: 25px;
+    border: 1px solid rgba(254,254,254,.3);
+    box-shadow: 0 0 7px 2px rgba(254,254,254,.5);
+    background: rgba(255,255,255,.5);
+}
+.hiddenIcon_hidden{
+    left:0;
+}
+.hiddenImg{
+    font-size:40px;
+    margin:4px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/car_roadmachine.vue b/src/views/bigScreen/enpComponents/car_roadmachine.vue
new file mode 100644
index 00000000..7be850bf
--- /dev/null
+++ b/src/views/bigScreen/enpComponents/car_roadmachine.vue
@@ -0,0 +1,311 @@
+<template>
+    <el-container>
+        <el-header class="panel_title">
+            <div class="left-panel">
+                非道路移动机械电子台账
+            </div>
+            <div class="right-panel">
+                <el-button type="primary" @click="backtoMap">返回地图</el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <el-container>
+                <el-header class="searchWrap">
+                    <div class="left-panel">
+                        <div style="font-size: 1.8vh;">
+                            非道路移动机械总数：<span class="totalNumber">{{ count }}</span>
+                        </div>
+                    </div>
+                    <div class="right-panel">
+                        <el-select v-model="query.level" placeholder="排口等级" style="width:10vw" clearable
+                            @change="handleQuery">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                </el-header>
+                <el-main>
+                    <scTable ref="table" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
+                        :query="query" @dataChange="updateCount">
+                        <el-table-column type="index" width="50" />
+                        <el-table-column prop="number" label="车牌号码/登记号码"></el-table-column>
+                        <el-table-column prop="name" label="车辆识别代码(VIN)"></el-table-column>
+                        <el-table-column prop="level" label="生产日期"></el-table-column>
+                        <el-table-column prop="color" label="车牌颜色"></el-table-column>
+                        <el-table-column prop="eqpment" label="注册登记日期"></el-table-column>
+                        <el-table-column prop="eqpment" label="车辆品牌型号"></el-table-column>
+                        <el-table-column prop="eqpment" label="发动机号码"></el-table-column>
+                        <el-table-column prop="eqpment" label="燃料类型"></el-table-column>
+                        <el-table-column prop="eqpment" label="排放阶段"></el-table-column>
+                        <el-table-column prop="eqpment" label="联网状态"></el-table-column>
+                        <el-table-column prop="eqpment" label="随车清单"></el-table-column>
+                        <el-table-column prop="eqpment" label="行驶证"></el-table-column>
+                        <el-table-column prop="eqpment" label="车辆所有人(单位)"></el-table-column>
+                    </scTable>
+                </el-main>
+            </el-container>
+        </el-main>
+    </el-container>
+</template>
+<script>
+import * as echarts from "echarts";
+export default {
+    props: {
+        directDetail: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        eqId: {
+            type: String,
+            default: () => {
+                return '';
+            },
+        },
+    },
+    data() {
+        return {
+            count: 0,
+            apiObj: this.$API.enp.drain.list,
+            params: { type: 10 },
+            query: {
+                search: ''
+            },
+            searchInputStyle: {
+                color: '#fff',
+            },
+            tableData: [],
+            detailItem: {},
+            detailForm: {
+                day: 18,
+                year: 2024,
+                month: 1
+            },
+            biquery: {
+                end_time: '2024-02-01',
+                start_time: '2024-01-29',
+                time_bucket: "1 minute",
+                equipment_id: "3491356310052896768",
+            },
+            showEqInfo:true,
+            resizeTimeout:null,
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        hiddenChange(){
+            let that = this;
+            that.showEqInfo = !that.showEqInfo;
+            that.addListener();
+        },
+        handleQuery() {
+            this.$refs.table.queryData(this.query);
+        },
+        updateCount(res, tableData) {
+            this.count = res.count
+        },
+        initTimeNow() {
+            var now = new Date();
+            let year = now.getFullYear(); // 年份
+            let month = now.getMonth() + 1; // 月份
+            let day = now.getDate(); // 日期
+            this.detailForm.year = year;
+            this.detailForm.month = month;
+            this.detailForm.day = day;
+        },
+        backtoMap() {
+            this.$emit('close')
+        },
+        getEquipments(ids) {
+            let that = this;
+            let reqs = [];
+            ids.forEach(id => {
+                reqs.push(that.$API.em.equipment.item.req(id).then(res => {
+                    if (res.type == 10) {
+                        that.eqs = res;
+                    } else if (res.type == 40) {
+                        that.eqc = res;
+                    } else if (res.type == 30) {
+                        that.eqz = res;
+                    }
+                }))
+            });
+            const promise = Promise.all(reqs);
+            promise.then(() => {
+                // this.getDetailData()
+            })
+
+        },
+       
+        
+    }
+}
+</script>
+<style>
+.tableBg {
+    width: 100%;
+    height: 88vh;
+    background-image: url('/public/img/enp_blue/bigtableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+.leftCard {
+    height: 80vh;
+    flex: 1;
+    color: #ffffff;
+    font-size: 0.75vw;
+    background-image: url('/public/img/enp_blue/smallTableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    margin-right: 1vw;
+}
+
+.rightCard {
+    flex: 2;
+    height: 80vh;
+    color: #ffffff;
+    background-image: url('/public/img/enp_blue/tableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+
+
+.totalWrap {
+    display: flex;
+    justify-content: space-between;
+    color: #ffffff;
+    font-size: 1.6vh;
+    padding: 0 0.5vw;
+    height: 3vh;
+    line-height: 3vh;
+}
+
+.totalNumber {
+    color: #64D2FF;
+    font-size: 2vh;
+    font-weight: bold;
+}
+
+.searchBtn {
+    width: 4.7vw;
+    height: 3vh;
+    background-size: 100% 100%;
+    background-image: url('/public/img/enp_blue/search.png');
+}
+
+.backMap {
+    height: 25px;
+    line-height: 25px;
+    position: absolute;
+    right: 1vw;
+    top: 15px;
+    font-size: 1vh;
+    width: -moz-fit-content;
+    width: fit-content;
+    color: #ffffff;
+    padding: 0 0.5vw;
+    background-image: url('/public/img/enp_blue/back.png');
+}
+
+.pageTitle {
+    height: 5vh;
+    line-height: 5vh;
+    color: #ffffff;
+    font-size: 1.2vw;
+    padding-left: 1vw;
+}
+
+/*  */
+.headerTitle {
+    color: #ffffff;
+    height: 4vh;
+    line-height: 4vh;
+    font-size: 2vh;
+    position: relative
+}
+
+.backBtn {
+    font-size: 1vh;
+    position: absolute;
+    top: 1vh;
+    right: 1vh;
+    line-height: 2vh
+}
+
+.greenBlock {
+    width: 1vh;
+    height: 1vh;
+    background-image: url('/public/img/enp_blue/greenBlock.png');
+    background-size: 100% 100%;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 0.5vw;
+}
+
+.circles {
+    width: 10px;
+    height: 10px;
+    border-radius: 5px;
+    background: #aaaaaa;
+    display: inline-block;
+    margin: auto 0.5vw auto 0;
+}
+
+.circles_1 {
+    background: #0ed877;
+}
+
+.circles_2 {
+    background: orange;
+}
+
+.linesWrap {
+    padding: 1vh 0.5vw;
+    height: 93%;
+    overflow: scroll;
+    font-weight: bold;
+    line-height: 3.5vh;
+}
+
+.typeLine {
+    height: 3.5vh;
+    line-height: 4vh;
+    font-weight: normal;
+}
+
+.infoLine {
+    line-height: 3vh;
+    padding-left: 0.5vw;
+    display: flex
+}
+
+.infotitle {
+    font-weight: normal;
+    color: #dddddd;
+}
+
+.hiddenIcon{
+    top:45%;
+    left:-25px;
+    width:50px;
+    height:50px;
+    z-index: 100;
+    position: absolute;
+    border-radius: 25px;
+    border: 1px solid rgba(254,254,254,.3);
+    box-shadow: 0 0 7px 2px rgba(254,254,254,.5);
+    background: rgba(255,255,255,.5);
+}
+.hiddenIcon_hidden{
+    left:0;
+}
+.hiddenImg{
+    font-size:40px;
+    margin:4px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 32a23c9f..868dd389 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -65,86 +65,10 @@
         </el-header>
         <el-main>
             <el-container>
-                <el-aside style="width: 35%">
+                <el-aside v-show="showEqInfo" style="width: 35%">
                     <div class="aside_one">
                         <div class="pageTitle">排放口及关联设备静态信息</div>
                         <div class="linesWrap">
-                            <div class="typeLine">
-                                <div class="greenBlock">
-                                    <div class="greenBlockInner"></div>
-                                </div>
-                                <span>生产设备</span>
-                            </div>
-                            <div class="infoLine">
-                                <span class="circles"></span>
-                                <span>{{ eqs.name }}</span>
-                            </div>
-                            <el-row class="infoLine">
-                                <el-col :span="12">
-                                    <div><span class="infotitle">设备类型：</span>主要生产设备</div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div>
-                                        <span class="infotitle">电机功率：</span>
-                                        <span v-if="eqs.power_kw">{{ eqs.power_kw }}kw</span>
-                                    </div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div>
-                                        <span class="infotitle">生产能力：</span>
-                                        <span v-if="eqs.parameter_json && eqs.parameter_json.生产能力">{{
-        eqs.parameter_json.生产能力
-    }}</span>
-                                    </div>
-                                </el-col>
-                            </el-row>
-                            <div class="typeLine">
-                                <div class="greenBlock">
-                                    <div class="greenBlockInner"></div>
-                                </div>
-                                <span>治理设备</span>
-                            </div>
-                            <div class="infoLine">
-                                <span class="circles"></span>
-                                <span>{{ eqz.name }}</span>
-                            </div>
-                            <el-row class="infoLine">
-                                <el-col :span="12">
-                                    <div><span class="infotitle">风量：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.风量">{{
-        eqz.parameter_json.风量
-    }}m³/h</span>
-                                    </div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div><span class="infotitle">过滤面积：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.过滤面积">{{
-        eqz.parameter_json.过滤面积
-    }} m²</span>
-                                    </div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div><span class="infotitle">布袋材质：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.布袋材质">{{
-        eqz.parameter_json.布袋材质
-    }} </span>
-                                    </div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div><span class="infotitle">过滤风速：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.过滤风速">{{
-        eqz.parameter_json.过滤风速
-    }} </span>m/min
-                                    </div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div><span class="infotitle">额定功率：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.额定功率">{{
-                                            eqz.parameter_json.额定功率
-                                            }} </span> Kw
-                                    </div>
-                                </el-col>
-                            </el-row>
                             <div class="typeLine">
                                 <div class="greenBlock">
                                     <div class="greenBlockInner"></div>
@@ -153,7 +77,7 @@
                                 <span>排放口</span>
                             </div>
                             <div class="infoLine">
-                                <span class="circles"></span>
+                                <span class="circles circles_1"></span>
                                 <span>{{ detailItem.name }}</span>
                             </div>
                             <el-row class="infoLine">
@@ -172,6 +96,82 @@
                                     <div><span class="infotitle">治理措施： </span>{{ detailItem.measure }}</div>
                                 </el-col>
                             </el-row>
+                            <div class="typeLine">
+                                <div class="greenBlock">
+                                    <div class="greenBlockInner"></div>
+                                </div>
+                                <span>生产设备</span>
+                            </div>
+                            <div class="infoLine">
+                                <span :class="['circles', {'circles_1':eqs.running_state==10}]"></span>
+                                <span>{{ eqs.name }}</span>
+                            </div>
+                            <el-row class="infoLine">
+                                <el-col :span="12">
+                                    <div><span class="infotitle">设备类型：</span>主要生产设备</div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div>
+                                        <span class="infotitle">电机功率：</span>
+                                        <span v-if="eqs.power_kw">{{ eqs.power_kw }}kw</span>
+                                    </div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div>
+                                        <span class="infotitle">生产能力：</span>
+                                        <span v-if="eqs.parameter_json && eqs.parameter_json.生产能力">
+                                            {{eqs.parameter_json.生产能力}}
+                                        </span>
+                                    </div>
+                                </el-col>
+                            </el-row>
+                            <div class="typeLine">
+                                <div class="greenBlock">
+                                    <div class="greenBlockInner"></div>
+                                </div>
+                                <span>治理设备</span>
+                            </div>
+                            <div class="infoLine">
+                                <span :class="['circles', {'circles_1':eqz.running_state==10}]"></span>
+                                <span>{{ eqz.name }}</span>
+                            </div>
+                            <el-row class="infoLine">
+                                <el-col :span="12">
+                                    <div><span class="infotitle">风量：</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.风量">
+                                            {{eqz.parameter_json.风量}}m³/h
+                                        </span>
+                                    </div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div><span class="infotitle">过滤面积：</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.过滤面积">
+                                            {{eqz.parameter_json.过滤面积}} m²
+                                        </span>
+                                    </div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div><span class="infotitle">布袋材质：</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.布袋材质">
+                                            {{eqz.parameter_json.布袋材质}}
+                                        </span>
+                                    </div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div><span class="infotitle">过滤风速：</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.过滤风速">
+                                            {{eqz.parameter_json.过滤风速}} m/min
+                                        </span>
+                                    </div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div><span class="infotitle">额定功率：</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.额定功率">
+                                            {{eqz.parameter_json.额定功率}} Kw
+                                        </span>
+                                    </div>
+                                </el-col>
+                            </el-row>
                             <div class="typeLine">
                                 <div class="greenBlock">
                                     <div class="greenBlockInner"></div>
@@ -179,7 +179,7 @@
                                 <span>监测设备</span>
                             </div>
                             <div class="infoLine">
-                                <span class="circles"></span>
+                                <span :class="['circles', {'circles_1':eqc.running_state==10}]"></span>
                                 <span>{{ eqc.name }}</span>
                             </div>
                             <el-row class="infoLine">
@@ -217,10 +217,24 @@
                                     <div><span class="infotitle">含氧量：</span> 0.000 %</div>
                                 </el-col>
                             </el-row>
+                            <div class="typeLine">
+                                <div class="greenBlock">
+                                    <div class="greenBlockInner"></div>
+                                </div>
+                                <span>监控设备</span>
+                            </div>
+                            <div class="infoLine">
+                                <span :class="['circles', {'circles_1':eqk.running_state==10}]"></span>
+                                <span>{{ eqk.name }}</span>
+                            </div>
                         </div>
                     </div>
                 </el-aside>
-                <el-main>
+                <el-main style="position: relative;overflow: visible;">
+                    <div :class="{'hiddenIcon_hidden':!showEqInfo,'hiddenIcon':'1'}" class="hiddenIcon" @click="hiddenChange">
+                        <el-icon v-if="showEqInfo" class="hiddenImg"><ArrowLeftBold /></el-icon>
+                        <el-icon v-else class="hiddenImg"><ArrowRightBold /></el-icon>
+                    </div>
                     <div class="aside_side">
                         <div class="pageTitle">排放口及关联设备动态信息</div>
                         <div id="dataChart" style="width: 100%; height:280px;margin-top:4px; padding: 4px"></div>
@@ -229,7 +243,6 @@
                         <div style="height: 4px"></div>
                         <div id="dataChart3" style="width: 100%; height:140px;padding: 4px"></div>
                     </div>
-
                 </el-main>
             </el-container>
         </el-main>
@@ -331,12 +344,23 @@ export default {
                 yAxis: {},
                 series: [{ type: 'line' }]
             },
-            eqs: {},
-            eqc: {},
-            eqz: {}
+            showEqInfo:true,
+            eqs: {},//生产设备
+            eqc: {},//监测设备
+            eqz: {},//治理设备
+            eqk: {},//监控设备
+            resizeTimeout:null,
         }
     },
+    mounted() {
+        // this.addListener();
+    },
     methods: {
+        hiddenChange(){
+            let that = this;
+            that.showEqInfo = !that.showEqInfo;
+            that.addListener();
+        },
         handleQuery() {
             this.$refs.table.queryData(this.query);
         },
@@ -453,6 +477,25 @@ export default {
                 })
             })
         },
+        resizeChart(name) {
+			var myChart = echarts.getInstanceByDom(
+				document.getElementById(name)
+			);
+			if (myChart != undefined) {
+				myChart.resize();
+			}
+		},
+        addListener() {
+			var that = this;
+            if (this.resizeTimeout) {
+                clearTimeout(this.resizeTimeout);
+            }
+            this.resizeTimeout = setTimeout(function () {
+                that.resizeChart("dataChart");
+                that.resizeChart("dataChart2");
+                that.resizeChart("dataChart3");
+            }, 300); 
+		},
     }
 }
 </script>
@@ -600,4 +643,24 @@ export default {
     font-weight: normal;
     color: #dddddd;
 }
+
+.hiddenIcon{
+    top:45%;
+    left:-25px;
+    width:50px;
+    height:50px;
+    z-index: 100;
+    position: absolute;
+    border-radius: 25px;
+    border: 1px solid rgba(254,254,254,.3);
+    box-shadow: 0 0 7px 2px rgba(254,254,254,.5);
+    background: rgba(255,255,255,.5);
+}
+.hiddenIcon_hidden{
+    left:0;
+}
+.hiddenImg{
+    font-size:40px;
+    margin:4px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue
index 6fdb2f90..08c2181f 100644
--- a/src/views/bigScreen/enpComponents/pollutant.vue
+++ b/src/views/bigScreen/enpComponents/pollutant.vue
@@ -32,6 +32,10 @@
                                 <el-table-column prop="name" label="污染源名称" />
                                 <el-table-column prop="name" label="污染源类型" />
                                 <el-table-column prop="mgroup_name" label="所属工段" />
+                                <el-table-column prop="" label="生产设备" />
+                                <el-table-column prop="" label="治理设备" />
+                                <el-table-column prop="" label="监测设备" />
+                                <el-table-column prop="" label="监控设备" />
                             </scTable>
                         </el-main>
                     </el-container>
diff --git a/src/views/bigScreen/enpComponents/smartg.vue b/src/views/bigScreen/enpComponents/smartg.vue
deleted file mode 100644
index f37ddad4..00000000
--- a/src/views/bigScreen/enpComponents/smartg.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-    <el-container>
-        <el-header class="panel_title">
-            <el-menu mode="horizontal" :default-active="activeIndex" :ellipsis="false" @select="handleSelect">
-                <el-menu-item index="1">厂区环境治理</el-menu-item>
-                <el-menu-item index="2">生产过程治理</el-menu-item>
-                <el-menu-item index="3">物料输送治理</el-menu-item>
-            </el-menu>
-
-        </el-header>
-        <el-main class="nopadding">
-            <smartg_carwash v-if="activeIndex == '1'"></smartg_carwash>
-            <smartg_prod v-if="activeIndex == '2'"></smartg_prod>
-            <smartg_trans v-if="activeIndex == '3'"></smartg_trans>
-        </el-main>
-    </el-container>
-</template>
-<script>
-import smartg_carwash from "./smartg_carwash.vue";
-import smartg_prod from "./smartg_prod.vue";
-import smartg_trans from "./smarg_trans.vue";
-export default {
-    components: {
-        smartg_carwash,
-        smartg_prod,
-        smartg_trans
-    },
-    data() {
-        return {
-            activeIndex: "1",
-            tableData: [],
-        }
-    },
-    methods: {
-        handleSelect(key, keyPath) {
-            this.activeIndex = key;
-        }
-    }
-}
-</script>
-<style>
-.el-tabs {
-    height: 100%;
-}
-</style>
\ 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 854c7726..ab9cc3ba 100644
--- a/src/views/bigScreen/enpComponents/smartg_carwash.vue
+++ b/src/views/bigScreen/enpComponents/smartg_carwash.vue
@@ -1,64 +1,62 @@
 <template>
     <el-container>
-        <el-aside width="69%" style="margin-right:1%;border-right:0">
+        <el-header class="panel_title">
+            <div class="left-panel">洗车平台</div>
+            <div class="right-panel">
+                <el-button type="primary" @click="backtoMap">返回地图</el-button>
+            </div>
+        </el-header>
+        <el-main>
             <el-container>
-                <el-header class="searchWrap">
-                    <div class="left-panel">
-                        <div class="left-panel">洗车行为统计</div>
-                    </div>
-                    <div class="right-panel">
-                        <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>
-                        </el-select>
-                    </div>
-                </el-header>
-                <el-main class="nopadding">
-                    <scTable ref="table" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params"
-                        :query="query">
-                        <el-table-column type="index" width="50" />
-                        <el-table-column label="洗车台" prop="station_name" />
-                        <el-table-column label="车辆编号" prop="vehicle_number" />
-                        <el-table-column prop="start_time" label="开始时间" width="180" />
-                        <el-table-column label="洗车时长(s)" prop="duration"></el-table-column>
-                        <el-table-column label="压力" prop="pressure" />
-                        <el-table-column label="流量" prop="flux">
-                        </el-table-column>
-                    </scTable>
-                </el-main>
-            </el-container>
-        </el-aside>
-        <el-main class="nopadding">
-            <el-container>
-                <el-header class="searchWrap">
-                    <div class="left-panel">环卫车智能调度</div>
-                </el-header>
-                <el-main class="nopadding">
-                    <scTable style="width: 100%;" size="large" :apiObj="apiObj2" row-key="id" :params="params2"
-                        hidePagination hideDo>
-                        <el-table-column type="index" width="50" />
-                        <el-table-column prop="name" label="环卫车名称" />
-                        <el-table-column prop="type" label="环卫车类型" />
-                        <el-table-column label="今日工作时长">
-                            <template #default="scope">
-                                <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
-                            </template>
-                        </el-table-column>
-                    </scTable>
-                    <!-- <el-container>
-                        <el-header class="">
+                <el-aside width="69%" style="margin-right:1%;border-right:0">
+                    <el-container>
+                        <el-header class="searchWrap">
                             <div class="left-panel">
-                                <span>厂区环境(PM10):</span>
-                                <span style="color: green"> 36ug/m3</span>
+                                <div class="left-panel">洗车行为统计</div>
+                            </div>
+                            <div class="right-panel">
+                                <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>
+                                </el-select>
                             </div>
                         </el-header>
                         <el-main class="nopadding">
-                            
+                            <scTable ref="table" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params"
+                                :query="query">
+                                <el-table-column type="index" width="50" />
+                                <el-table-column label="洗车台" prop="station_name" />
+                                <el-table-column label="车辆编号" prop="vehicle_number" />
+                                <el-table-column prop="start_time" label="开始时间" width="180" />
+                                <el-table-column label="洗车时长(s)" prop="duration"></el-table-column>
+                                <el-table-column label="压力" prop="pressure" />
+                                <el-table-column label="流量" prop="flux">
+                                </el-table-column>
+                            </scTable>
                         </el-main>
-                    </el-container> -->
+                    </el-container>
+                </el-aside>
+                <el-main class="nopadding">
+                    <el-container>
+                        <el-header class="searchWrap">
+                            <div class="left-panel">环卫车智能调度</div>
+                        </el-header>
+                        <el-main class="nopadding">
+                            <scTable style="width: 100%;" size="large" :apiObj="apiObj2" row-key="id" :params="params2"
+                                hidePagination hideDo>
+                                <el-table-column type="index" width="50" />
+                                <el-table-column prop="name" label="环卫车名称" />
+                                <el-table-column prop="type" label="环卫车类型" />
+                                <el-table-column label="今日工作时长">
+                                    <template #default="scope">
+                                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                                    </template>
+                                </el-table-column>
+                            </scTable>
+                        </el-main>
+                    </el-container>
                 </el-main>
             </el-container>
-
         </el-main>
     </el-container>
 </template>
diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index 35ac2d91..dec3753f 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -72,8 +72,8 @@
 												command="pollutant2"
 												>污染源监测</el-dropdown-item
 											>
-											<el-dropdown-item command="smartg"
-												>智能治理</el-dropdown-item
+											<el-dropdown-item command="carwash"
+												>洗车平台</el-dropdown-item
 											>
 										</el-dropdown-menu>
 									</template>
@@ -157,7 +157,7 @@
 									@command="handleClick5"
 								>
 									<span class="el-dropdown-link">
-										台账管理
+										环境管理
 									</span>
 									<template #dropdown>
 										<el-dropdown-menu class="enpMenu">
@@ -214,30 +214,6 @@
 								class="bigScreenTable"
 								:noIndex="noIndex"
 							></scScrollTavle>
-							<!-- <div class="tableHear" style="padding: 0 1vh;">
-                <div style="flex:1;height:1vh"></div>
-                <div style="flex:5;margin: 0 1vh;">设备名称</div>
-                <div style="flex:2">颗粒物</div>
-                <div style="flex:2">SO₂</div>
-                <div style="flex:2">NOx</div>
-              </div>
-              <div class="rowItem">
-                <div class="rowindex">1</div>
-                <div class="rowname">设备名称</div>
-                <div class="rownum">
-                  <span v-if="cemsData.envdata && cemsData.envdata.dust_zs !== null">{{ cemsData.envdata.dust_zs }}</span>
-                  <span v-else>-</span>
-                </div>
-                <div class="rownum">
-                  <span v-if="cemsData.envdata && cemsData.envdata.so2_zs !== null">{{ cemsData.envdata.so2_zs
-                  }}</span>
-                  <span v-else>-</span>
-                </div>
-                <div class="rownum">
-                  <span v-if="cemsData.envdata && cemsData.envdata.nox_zs !== null">{{ cemsData.envdata.nox_zs }}</span>
-                  <span v-else>-</span>
-                </div>
-              </div> -->
 						</div>
 					</div>
 					<!-- 接入设备数量总览 -->
@@ -363,27 +339,6 @@
 							class="bigScreenTable"
 							:noIndex="noIndex"
 						></scScrollTavle>
-						<!-- <div>
-              <div class="tableHear"
-                style="margin:1vh 0;height:2.6vh;line-height:2.6vh;display:flex;padding:1vh;font-size:1.2vh">
-                <div style="flex:2">监测设备名称</div>
-                <div style="flex:1">PM10(μg/m³)</div>
-                <div style="flex:1">PM2.5(μg/m³)</div>
-              </div>
-              <div class="tableBody">
-                <div v-for="item in wData" :key="item">
-                  <div class="badyItem">
-                    <div style="flex:2">
-                      <img src="img/enp_blue/listImg.png"
-                        style="width:2vh;height:2vh;margin:1.2vh 1vh;vertical-align:middle">
-                      <span>{{ item.name }}</span>
-                    </div>
-                    <span style="flex:1" v-if="item.envdata">{{ item.envdata.pm10 }}</span>
-                    <span style="flex:1" v-if="item.envdata">{{ item.envdata.pm25 }}</span>
-                  </div>
-                </div>
-              </div>
-            </div> -->
 					</div>
 					<!-- 今日车辆统计数据 -->
 					<div class="panel panel2">
@@ -396,33 +351,28 @@
 						</div>
 						<div style="display: flex">
 							<div class="chart" id="pieChart"></div>
-							<div
-								style="
-									flex-shrink: 1;
-									width: 100px;
-									align-self: center;
-									display: flex;
-									flex-direction: column;
-								"
-							>
-								<div
-									class="todyCarItem"
-									v-for="item in pieData"
-									:key="item"
-								>
-									<span style="color: #d5d5d5">{{
-										item.name
-									}}</span>
-									<span
-										style="
-											font-size: 35px;
-											color: #00f6ff;
-											font-weight: bold;
-											display: inline-block;
-											text-align: center;
-										"
-										>{{ item.value }}</span
+							<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"
+										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>
 						</div>
@@ -443,11 +393,11 @@
 				<!-- <div v-show="activeIndex == 0" class="right_border"></div> -->
 				<!-- 设备分类 -->
 				<!-- <div v-show="activeIndex == 0" class="btns_enp">
-          <div class="btns" :class="bindBtnClass(10)" @click="equipmentTypeChange(10)">生产设备</div>
-          <div class="btns" :class="bindBtnClass(30)" @click="equipmentTypeChange(30)">治理设备</div>
-          <div class="btns" :class="bindBtnClass(40)" @click="equipmentTypeChange(40)">监测设备</div>
-          <div class="btns" :class="bindBtnClass(50)" @click="equipmentTypeChange(50)">监控设备</div>
-        </div> -->
+				<div class="btns" :class="bindBtnClass(10)" @click="equipmentTypeChange(10)">生产设备</div>
+				<div class="btns" :class="bindBtnClass(30)" @click="equipmentTypeChange(30)">治理设备</div>
+				<div class="btns" :class="bindBtnClass(40)" @click="equipmentTypeChange(40)">监测设备</div>
+				<div class="btns" :class="bindBtnClass(50)" @click="equipmentTypeChange(50)">监控设备</div>
+				</div> -->
 				<!-- 底部背景图片 -->
 				<div v-show="activeIndex == 0" class="bottom_enp"></div>
 				<div v-if="activeIndex != 0" class="container">
@@ -518,10 +468,10 @@
 							v-else-if="activeDrawerName == 'pollutant2'"
 							@close="closeDialog"
 						></pollutant2>
-						<smartg
-							v-else-if="activeDrawerName == 'smartg'"
+						<carwash
+							v-else-if="activeDrawerName == 'carwash'"
 							@close="closeDialog"
-						></smartg>
+						></carwash>
 						<videowall
 							v-else-if="activeDrawerName == 'video'"
 							@close="closeDialog"
@@ -548,7 +498,8 @@ import pollutecalendar from "./enpComponents/pollutecalendar.vue";
 import eqments from "./enpComponents/eqments.vue"; //台账
 import alarmrecord from "./enpComponents/alarmrecord.vue";
 import pollutant2 from "./enpComponents/pollutant2.vue";
-import smartg from "./enpComponents/smartg.vue";
+import carwash from "./enpComponents/smartg_carwash.vue";
+import carmanager from "./enpComponents/carManager.vue";
 import videowall from "./enpComponents/video.vue";
 import scScrollTavle from "@/components/scScrollTable.vue";
 // import 'babylonjs-loaders';
@@ -569,7 +520,7 @@ export default {
 		eqments,
 		alarmrecord,
 		pollutant2,
-		smartg,
+		carwash,
 		videowall,
 		scScrollTavle,
 	},
@@ -661,7 +612,7 @@ export default {
 			refValue1: "moocBox1",
 			table1Visible: false,
 			lineData: [],
-			liData1: ["设备名称", "颗粒物", "SO₂", "NOx"],
+			liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨气"],
 			refValue2: "moocBox2",
 			table2Visible: false,
 			lineData2: [],
@@ -733,7 +684,8 @@ export default {
 							obj1 = {},
 							obj2 = {},
 							obj3 = {},
-							obj4 = {};
+							obj4 = {},
+							obj5 = {};
 						obj1.elType = "primary";
 						obj1.value = item.name; //设备名称
 						obj2.elType = "primary";
@@ -751,10 +703,16 @@ export default {
 							item.envdata && item.envdata.nox_zs
 								? item.envdata.nox_zs
 								: "-"; //NOx折算值
+						obj5.elType = "primary";
+						obj5.value =
+							item.envdata && item.envdata.ammonia_e
+								? item.envdata.ammonia_e
+								: "-"; //氨气折算值
 						arr.push(obj1);
 						arr.push(obj2);
 						arr.push(obj3);
 						arr.push(obj4);
+						arr.push(obj5);
 						lineData.push(arr);
 					});
 					this.lineData = lineData;
@@ -1342,12 +1300,7 @@ header {
 #pieChart {
 	flex: 1;
 }
-.todyCarItem {
-	color: white;
-	font-size: 16px;
-	display: flex;
-	flex-direction: column;
-}
+
 .pieDataItem {
 	width: 50%;
 	height: 49%;
@@ -1451,4 +1404,31 @@ header {
 	background-image: url("/public/img/enp_blue/right_border.png");
 }
 /* 左右两边border，暂时没展示 */
+/* 车辆统计-start */
+.carStaticWrap{
+	flex-shrink: 1;
+	width: 150px;
+	align-self: center;
+	display: flex;
+	flex-direction: column;
+}
+.todyCarItem {
+	width:75px;
+	color: white;
+	font-size: 16px;
+	display: flex;
+	flex-direction: column;
+}
+.carStaticText{
+	display: inline-block;
+	text-align: center;
+}
+.carStaticNum{
+	font-size: 35px;
+	color: #00f6ff;
+	font-weight: bold;
+	display: inline-block;
+	text-align: center;
+}
+/* 车辆统计-end */
 </style>
diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index 2cfa1b47..0e42a5fb 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -514,9 +514,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "煤磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 8d7294b7..7a37da7b 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -668,9 +668,9 @@ export default {
 			let that = this;
 			let query = {};
 			query.page = 0;
-			query.year_s = year;
-			query.month_s = month;
-			query.day_s = days;
+			query.year = year;
+			query.month = month;
+			query.day = days;
 			query.type = "hour_s";
 			query.mgroup = that.query.mgroup;
 			this.$API.enm.enstat.req(query).then((response) => {
diff --git a/src/views/enm_coalbase/power.vue b/src/views/enm_coalbase/power.vue
index e3459391..9dff4487 100644
--- a/src/views/enm_coalbase/power.vue
+++ b/src/views/enm_coalbase/power.vue
@@ -466,9 +466,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "煤磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue
index 48651ce3..b14251a4 100644
--- a/src/views/enm_coalbase/report.vue
+++ b/src/views/enm_coalbase/report.vue
@@ -523,9 +523,9 @@ export default {
 				//上小时
 				let params4 = {};
 				params4.page = 0;
-				params4.year_s = year_h;
-				params4.month_s = month_h;
-				params4.day_s = days_h;
+				params4.year = year_h;
+				params4.month = month_h;
+				params4.day = days_h;
 				params4.hour = hours_h;
 				params4.type = "hour_s";
 				params4.mgroup = that.query.mgroup;
@@ -691,9 +691,9 @@ export default {
 			let that = this;
 			let query = {};
 			query.page = 0;
-			query.year_s = year;
-			query.month_s = month;
-			query.day_s = days;
+			query.year = year;
+			query.month = month;
+			query.day = days;
 			query.type = "hour_s";
 			query.mgroup = that.query.mgroup;
 			this.$API.enm.enstat.req(query).then((response) => {
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index da6ada11..93e4f780 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -631,9 +631,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index 9f928f85..d45f3055 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -932,9 +932,9 @@ export default {
 			let that = this;
 			let query = {};
 			query.page = 0;
-			query.year_s = year;
-			query.month_s = month;
-			query.day_s = days;
+			query.year = year;
+			query.month = month;
+			query.day = days;
 			query.type = "hour_s";
 			query.mgroup = that.query.mgroup;
 			this.$API.enm.enstat.req(query).then((response) => {
diff --git a/src/views/enm_kilnbase/power.vue b/src/views/enm_kilnbase/power.vue
index f41ac3c4..4dcbe760 100644
--- a/src/views/enm_kilnbase/power.vue
+++ b/src/views/enm_kilnbase/power.vue
@@ -464,9 +464,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_kilnbase/report.vue b/src/views/enm_kilnbase/report.vue
index 325e56d9..26a2f0cb 100644
--- a/src/views/enm_kilnbase/report.vue
+++ b/src/views/enm_kilnbase/report.vue
@@ -683,9 +683,9 @@ export default {
 				//上小时
 				let params4 = {};
 				params4.page = 0;
-				params4.year_s = year_h;
-				params4.month_s = month_h;
-				params4.day_s = days_h;
+				params4.year = year_h;
+				params4.month = month_h;
+				params4.day = days_h;
 				params4.hour = hours_h;
 				params4.type = "hour_s";
 				params4.mgroup = that.query.mgroup;
@@ -903,9 +903,9 @@ export default {
 			let that = this;
 			let query = {};
 			query.page = 0;
-			query.year_s = year;
-			query.month_s = month;
-			query.day_s = days;
+			query.year = year;
+			query.month = month;
+			query.day = days;
 			query.type = "hour_s";
 			query.mgroup = that.query.mgroup;
 			this.$API.enm.enstat.req(query).then((response) => {
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index 0e8299dc..ebe2e42d 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -586,9 +586,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "水泥磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index c4a9651b..a49aba20 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -843,9 +843,9 @@ export default {
 			let that = this;
 			let query = {};
 			query.page = 0;
-			query.year_s = year;
-			query.month_s = month;
-			query.day_s = days;
+			query.year = year;
+			query.month = month;
+			query.day = days;
 			query.type = "hour_s";
 			query.mgroup = that.query.mgroup;
 			this.$API.enm.enstat.req(query).then((response) => {
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index 5d480fff..b17ee554 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -565,9 +565,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 4c3051f6..86f3f4ce 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -1040,9 +1040,9 @@ export default {
 			let that = this;
 			let query = {};
 			query.page = 0;
-			query.year_s = year;
-			query.month_s = month;
-			query.day_s = days;
+			query.year = year;
+			query.month = month;
+			query.day = days;
 			query.type = "hour_s";
 			query.mgroup = that.query.mgroup;
 			this.$API.enm.enstat.req(query).then((response) => {
diff --git a/src/views/enm_rmbase/power.vue b/src/views/enm_rmbase/power.vue
index 90bf3def..7ccfd086 100644
--- a/src/views/enm_rmbase/power.vue
+++ b/src/views/enm_rmbase/power.vue
@@ -454,9 +454,9 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.type = "hour_s";
-			obj.year_s = year;
-			obj.month_s = month;
-			obj.day_s = days;
+			obj.year = year;
+			obj.month = month;
+			obj.day = days;
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			obj.mpoint__ep_monitored__isnull = 0;
diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue
index b1c23d11..d4a588fa 100644
--- a/src/views/enm_rmbase/report.vue
+++ b/src/views/enm_rmbase/report.vue
@@ -643,9 +643,9 @@ export default {
 					//上小时
 					let params4 = {};
 					params4.page = 0;
-					params4.year_s = year_h;
-					params4.month_s = month_h;
-					params4.day_s = days_h;
+					params4.year = year_h;
+					params4.month = month_h;
+					params4.day = days_h;
 					params4.hour = hours_h;
 					params4.type = "hour_s";
 					params4.mgroup = this.query.mgroup;
diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index 2fd9c93a..b81cdd54 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -71,6 +71,8 @@
 						</el-icon>
 					</template>
 				</el-table-column>
+				<el-table-column label="排序" prop="sort" min-width="60">
+				</el-table-column>
 				<el-table-column
 					label="操作"
 					fixed="right"
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index 676a23b3..8eb595cf 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -59,6 +59,14 @@
 								></el-switch>
 							</el-form-item>
 						</el-col>
+						<el-col :span="12">
+							<el-form-item label="排序">
+								<el-input-number
+									v-model="form.sort"
+									:min="0"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 			</el-main>