From 762f648d23df8499fe9661f0cc813adde32fecec Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 27 Feb 2024 14:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen/enpComponents/alarmrecord.vue   | 15 +++---
 src/views/bigScreen/enpComponents/cems2.vue   |  2 +-
 .../bigScreen/enpComponents/cemsExport.vue    |  2 +-
 .../bigScreen/enpComponents/envirmonitor.vue  | 29 +++++-----
 .../enpComponents/envirqualmonitor.vue        | 40 +++++++-------
 src/views/bigScreen/enpComponents/eqments.vue | 53 +++++++++---------
 .../bigScreen/enpComponents/innerclean.vue    | 39 ++++++--------
 .../bigScreen/enpComponents/orgwryList.vue    |  4 +-
 .../bigScreen/enpComponents/pollutant.vue     |  2 +-
 .../bigScreen/enpComponents/pollutant2.vue    |  4 +-
 .../bigScreen/enpComponents/transport.vue     | 54 ++++++++-----------
 src/views/bigScreen/index_enp_blue.vue        |  4 +-
 12 files changed, 112 insertions(+), 136 deletions(-)

diff --git a/src/views/bigScreen/enpComponents/alarmrecord.vue b/src/views/bigScreen/enpComponents/alarmrecord.vue
index 98d51353..d354a8cf 100644
--- a/src/views/bigScreen/enpComponents/alarmrecord.vue
+++ b/src/views/bigScreen/enpComponents/alarmrecord.vue
@@ -2,8 +2,9 @@
     <el-container>
         <el-header style="height: 50%;padding: 0;">
             <el-container>
-                <el-header>
-                    <div class="panel_title">超标实时报警记录
+                <el-header class="panel_title">
+                    <div class="left-panel">超标实时报警记录</div>
+                    <div class="right-panel">
                         <div class="backMap" @click="backtoMap">
                             切换地图
                             <el-icon>
@@ -32,13 +33,9 @@
             <el-container>
                 <el-main class="nopadding">
                     <el-container>
-                        <el-header>
-                            <div class="panel_title">
-                                <div style="display: flex;justify-content: space-between;">
-                                    <div class="left-panel">
-                                        设备实时报警记录
-                                    </div>
-                                </div>
+                        <el-header class="panel_title">
+                            <div class="left-panel">
+                                设备实时报警记录
                             </div>
                         </el-header>
                         <el-main class="nppadding">
diff --git a/src/views/bigScreen/enpComponents/cems2.vue b/src/views/bigScreen/enpComponents/cems2.vue
index c6dafa4b..86514b98 100644
--- a/src/views/bigScreen/enpComponents/cems2.vue
+++ b/src/views/bigScreen/enpComponents/cems2.vue
@@ -1,6 +1,6 @@
 <template>
     <el-container>
-        <el-header>
+        <el-header class="panel_title">
             <div class="left-panel">
                 CEMS监测预警
             </div>
diff --git a/src/views/bigScreen/enpComponents/cemsExport.vue b/src/views/bigScreen/enpComponents/cemsExport.vue
index dcdcbf13..9619c7df 100644
--- a/src/views/bigScreen/enpComponents/cemsExport.vue
+++ b/src/views/bigScreen/enpComponents/cemsExport.vue
@@ -1,6 +1,6 @@
 <template>
     <el-container>
-        <el-header>
+        <el-header class="panel_title">
             <div class="left-panel">CEMS报表导出</div>
         </el-header>
         <el-main class="nopadding">
diff --git a/src/views/bigScreen/enpComponents/envirmonitor.vue b/src/views/bigScreen/enpComponents/envirmonitor.vue
index 0929b5ab..6cebf209 100644
--- a/src/views/bigScreen/enpComponents/envirmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirmonitor.vue
@@ -1,8 +1,10 @@
 <template>
     <el-container>
-        <el-header>
-            <div class="panel_title">
+        <el-header class="panel_title">
+            <div class="left-panel">
                 环境监测清单
+            </div>
+            <div class="right-panel">
                 <div class="backMap" @click="backtoMap">
                     切换地图
                     <el-icon>
@@ -13,20 +15,15 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-header>
-                    <div class="searchWrap">
-                        <div style="font-size: 1vh;">
-                            车辆总数：<span class="totalNumber">0</span>
-                        </div>
-                        <div>
-                            <el-select v-model="query.mgroup" placeholder="全部工序" @change="handleQuery" clearable>
-                                <el-option v-for="item in processOptions" :key="item" :label="item"
-                                    :value="item"></el-option>
-                            </el-select>
-                            <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
-                                placeholder="设备名称/设备编号"></el-input>
-                            <el-button @click="handleQuery">查询</el-button>
-                        </div>
+                <el-header class="searchWrap">
+                    <div class="left-panel"></div>
+                    <div class="right-panel">
+                        <el-select v-model="query.mgroup" placeholder="全部工序" @change="handleQuery" clearable>
+                            <el-option v-for="item in processOptions" :key="item" :label="item" :value="item"></el-option>
+                        </el-select>
+                        <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
+                            placeholder="设备名称/设备编号"></el-input>
+                        <el-button @click="handleQuery">查询</el-button>
                     </div>
                 </el-header>
                 <el-main>
diff --git a/src/views/bigScreen/enpComponents/envirqualmonitor.vue b/src/views/bigScreen/enpComponents/envirqualmonitor.vue
index 9b3bb3a7..ec1aa0b7 100644
--- a/src/views/bigScreen/enpComponents/envirqualmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirqualmonitor.vue
@@ -2,8 +2,11 @@
     <el-container>
         <el-header style="height: 40%;padding: 0;">
             <el-container>
-                <el-header>
-                    <div class="panel_title">环境质量监测
+                <el-header class="panel_title">
+                    <div class="left-panel">
+                        环境质量监测
+                    </div>
+                    <div class="right-panel">
                         <div class="backMap" @click="backtoMap">
                             切换地图
                             <el-icon>
@@ -65,25 +68,20 @@
             <el-container>
                 <el-main class="nopadding">
                     <el-container>
-                        <el-header>
-                            <div class="panel_title">
-                                <div style="display: flex;justify-content: space-between;">
-                                    <div class="left-panel">
-                                        环境空气质量监测实时数据
-                                    </div>
-                                    <div class="right-panel">
-                                        <el-select v-model="query.time_bucket" placeholder="周期" style="margin-left:4px"
-                                            @change="handleQuery">
-                                            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label"
-                                                :value="item.value" />
-                                        </el-select>
-                                        <el-select v-model="query.type" placeholder="污染源" style="margin-left:4px"
-                                            @change="handleQuery">
-                                            <el-option v-for="item in typeOptions" :key="item" :label="item"
-                                                :value="item" />
-                                        </el-select>
-                                    </div>
-                                </div>
+                        <el-header class="panel_title">
+                            <div class="left-panel">
+                                环境空气质量监测实时数据
+                            </div>
+                            <div class="right-panel">
+                                <el-select v-model="query.time_bucket" placeholder="周期" style="margin-left:4px"
+                                    @change="handleQuery">
+                                    <el-option v-for="item in timeOptions" :key="item.value" :label="item.label"
+                                        :value="item.value" />
+                                </el-select>
+                                <el-select v-model="query.type" placeholder="污染源" style="margin-left:4px"
+                                    @change="handleQuery">
+                                    <el-option v-for="item in typeOptions" :key="item" :label="item" :value="item" />
+                                </el-select>
                             </div>
                         </el-header>
                         <el-main class="nppadding">
diff --git a/src/views/bigScreen/enpComponents/eqments.vue b/src/views/bigScreen/enpComponents/eqments.vue
index 061c2f6a..7afd346c 100644
--- a/src/views/bigScreen/enpComponents/eqments.vue
+++ b/src/views/bigScreen/enpComponents/eqments.vue
@@ -1,8 +1,10 @@
 <template>
     <el-container>
-        <el-header>
-            <div class="panel_title">
+        <el-header class="panel_title">
+            <div class="left-panel">
                 设备清单
+            </div>
+            <div class="right-panel">
                 <div class="backMap" @click="backtoMap">
                     切换地图
                     <el-icon>
@@ -13,31 +15,28 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-header>
-                    <div class="searchWrap">
-                        <div style="font-size: 1vh;">
-                            <span class="eqmCateName">设备总数:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">在线:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">离线:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">运行:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">待机:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">停机:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">故障:</span><span class="totalNumber">0</span>
-                            <span class="eqmCateName">未知:</span><span class="totalNumber">0</span>
-                        </div>
-                        <div>
-                            <el-select v-model="query.mgroup" placeholder="全部工序" @change="handleQuery" clearable>
-                                <el-option v-for="item in processOptions" :key="item" :label="item"
-                                    :value="item"></el-option>
-                            </el-select>
-                            <el-select v-model="query.type" placeholder="设备类型" @change="handleQuery" clearable>
-                                <el-option v-for="item in typeOptions" :key="item.id" :label="item.name"
-                                    :value="item.id"></el-option>
-                            </el-select>
-                            <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
-                                placeholder="设备名称/设备编号"></el-input>
-                            <el-button @click="handleQuery">查询</el-button>
-                        </div>
+                <el-header class="searchWrap">
+                    <div class="left-panel" style="font-size: 1vh;">
+                        <span class="eqmCateName">设备总数:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">在线:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">离线:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">运行:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">待机:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">停机:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">故障:</span><span class="totalNumber">0</span>
+                        <span class="eqmCateName">未知:</span><span class="totalNumber">0</span>
+                    </div>
+                    <div class="right-panel">
+                        <el-select v-model="query.mgroup" placeholder="全部工序" @change="handleQuery" clearable>
+                            <el-option v-for="item in processOptions" :key="item" :label="item" :value="item"></el-option>
+                        </el-select>
+                        <el-select v-model="query.type" placeholder="设备类型" @change="handleQuery" clearable>
+                            <el-option v-for="item in typeOptions" :key="item.id" :label="item.name"
+                                :value="item.id"></el-option>
+                        </el-select>
+                        <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
+                            placeholder="设备名称/设备编号"></el-input>
+                        <el-button @click="handleQuery">查询</el-button>
                     </div>
                 </el-header>
                 <el-main>
diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue
index 3f4c01e7..95567dde 100644
--- a/src/views/bigScreen/enpComponents/innerclean.vue
+++ b/src/views/bigScreen/enpComponents/innerclean.vue
@@ -1,7 +1,10 @@
 <template>
     <el-container>
-        <el-header>
-            <div class="panel_title">厂内清洁
+        <el-header class="panel_title">
+            <div class="left-panel">
+                厂内清洁
+            </div>
+            <div class="right-panel">
                 <div class="backMap" @click="backtoMap">
                     切换地图
                     <el-icon>
@@ -12,26 +15,18 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-header>
-                    <div class="searchWrap">
-                        <div style="font-size: 1vh;">
-                            车辆总数：<span class="totalNumber">0</span>
-                        </div>
-                        <div>
-                            <el-select v-model="query.cate" placeholder="车辆分类" @change="handleQuery" clearable>
-                                <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
-                                    :value="item.id"></el-option>
-                            </el-select>
-                            <!-- <el-select v-model="query.area" placeholder="" style="width:7vw">
-                                <el-option v-for="item in options" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select> -->
-                            <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
-                                placeholder=""></el-input>
-                            <el-button @click="handleQuery">查询</el-button>
-                        </div>
-
+                <el-header class="searchWrap">
+                    <div class="left-panel">
+                        车辆总数：<span class="totalNumber">0</span>
+                    </div>
+                    <div class="right-panel">
+                        <el-select v-model="query.cate" placeholder="车辆分类" @change="handleQuery" clearable>
+                            <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
+                                :value="item.id"></el-option>
+                        </el-select>
+                        <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
+                            placeholder=""></el-input>
+                        <el-button @click="handleQuery">查询</el-button>
                     </div>
                 </el-header>
                 <el-main>
diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 0efef9f2..a1fc2d6f 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -12,8 +12,8 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-header>
-                    <div class="left-panel searchWrap">
+                <el-header class="searchWrap">
+                    <div class="left-panel">
                         <div style="font-size: 1.8vh;">
                             全厂总排放口：<span class="totalNumber">{{ count }}</span>
                         </div>
diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue
index 249d2220..4adbe3cc 100644
--- a/src/views/bigScreen/enpComponents/pollutant.vue
+++ b/src/views/bigScreen/enpComponents/pollutant.vue
@@ -2,7 +2,7 @@
     <el-container v-if="!pollutantDetail">
         <el-main class="nopadding">
             <el-container>
-                <el-header>
+                <el-header class="panel_title">
                     <div class="left-panel">污染源清单</div>
                 </el-header>
                 <el-main class="nopadding">
diff --git a/src/views/bigScreen/enpComponents/pollutant2.vue b/src/views/bigScreen/enpComponents/pollutant2.vue
index b7267b1e..437bb458 100644
--- a/src/views/bigScreen/enpComponents/pollutant2.vue
+++ b/src/views/bigScreen/enpComponents/pollutant2.vue
@@ -42,9 +42,9 @@
             <el-container>
                 <el-main class="nopadding">
                     <el-container>
-                        <el-header>
+                        <el-header class="panel_title">
                             <div class="left-panel">
-                                <div class="panel_title">污染源监测详情</div>
+                                <div>污染源监测详情</div>
                             </div>
                             <div class="right-panel">
                                 <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue
index 3909c4a2..1d95316d 100644
--- a/src/views/bigScreen/enpComponents/transport.vue
+++ b/src/views/bigScreen/enpComponents/transport.vue
@@ -1,7 +1,10 @@
 <template>
     <el-container>
-        <el-header>
-            <div class="panel_title">进出厂记录
+        <el-header class="panel_title">
+            <div class="left-panel">
+                进出厂记录
+            </div>
+            <div class="right-panel">
                 <div class="backMap" @click="backtoMap">
                     切换地图
                     <el-icon>
@@ -12,36 +15,23 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-header>
-                    <div class="searchWrap">
-                        <div style="font-size: 1vh;">
-                            车辆总数：<span class="totalNumber">0</span>
-                        </div>
-                        <div>
-                            <!-- <el-select v-model="query.timetype" placeholder="时间类型" @change="timeHandleQuery" clearable>
-                                <el-option v-for="item in timeOptions" :key="item" :label="item" :value="item"></el-option>
-                            </el-select> -->
-                            <!-- 时间 -->
-                            <el-date-picker v-model="query.time" type="date" placeholder="开始时间" format="YYYY-MM-DD"
-                                value-format="YYYY-MM-DD" :picker-options="pickerOptions" />
-                            <el-date-picker v-model="query.time" type="date" placeholder="结束时间" format="YYYY-MM-DD"
-                                value-format="YYYY-MM-DD" :picker-options="pickerOptions" />
-                            <!-- <el-select v-model="query.cate" placeholder="车辆分类" @change="carHandleQuery" clearable>
-                                <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
-                                    :value="item.id"></el-option>
-                            </el-select> -->
-                            <el-select v-model="query.type" placeholder="出入类型" style="width:7vw">
-                                <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select>
-                            <!-- <el-select v-model="query.status" placeholder="行驶证状态" style="width:7vw">
-                                <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select> -->
-                            <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
-                                placeholder=""></el-input>
-                            <el-button @click="handleQuery">查询</el-button>
-                        </div>
+                <el-header class="searchWrap">
+                    <div class="left-panel">
+                        车辆总数：<span class="totalNumber">0</span>
+                    </div>
+
+                    <div class="right-panel">
+                        <el-date-picker v-model="query.time" type="date" placeholder="开始时间" format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD" :picker-options="pickerOptions" />
+                        <el-date-picker v-model="query.time" type="date" placeholder="结束时间" format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD" :picker-options="pickerOptions" />
+                        <el-select v-model="query.type" placeholder="出入类型" style="width:7vw">
+                            <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                        <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
+                            placeholder=""></el-input>
+                        <el-button @click="handleQuery">查询</el-button>
                     </div>
                 </el-header>
                 <el-main>
diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index 192b9291..35d03fa8 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -77,8 +77,8 @@
                 </span>
                 <template #dropdown>
                   <el-dropdown-menu class="enpMenu">
-                    <el-dropdown-item command="envirqualmonitor">环境质量监测</el-dropdown-item>
                     <el-dropdown-item command="envirmonitor">环境监测清单</el-dropdown-item>
+                    <el-dropdown-item command="envirqualmonitor">环境质量监测</el-dropdown-item>
                     <!-- <el-dropdown-item command="pollutecalendar">污染日历</el-dropdown-item> -->
                     <!-- <el-dropdown-item command="">决策分析</el-dropdown-item> -->
                   </el-dropdown-menu>
@@ -89,7 +89,7 @@
           <div :class="bindClass(5)" @click="menuClick(5)">
             <!-- <div class="menuItem">台账管理</div> -->
             <div class="menuItem">
-              <el-dropdown class="dropdown" trigger="click" @command="handleClick4">
+              <el-dropdown class="dropdown" trigger="click" @command="handleClick5">
                 <span class="el-dropdown-link">
                   台账管理
                 </span>