From dbdc20b42b48ba10b8dea454135734fcec259138 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 27 Feb 2024 13:44:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=89=E7=BB=84=E7=BB=87=E6=8E=92?=
 =?UTF-8?q?=E6=94=BE=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/enpComponents/cems.vue    | 28 ++++++--------
 src/views/bigScreen/enpComponents/cems2.vue   | 14 +++----
 .../bigScreen/enpComponents/cemsExport.vue    | 29 +++++----------
 .../bigScreen/enpComponents/orgwryList.vue    | 37 ++++++++++---------
 .../bigScreen/enpComponents/pollutant.vue     |  2 +-
 5 files changed, 48 insertions(+), 62 deletions(-)

diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue
index 69aa736a..68842939 100644
--- a/src/views/bigScreen/enpComponents/cems.vue
+++ b/src/views/bigScreen/enpComponents/cems.vue
@@ -59,22 +59,18 @@
                 <el-main class="nopadding">
                     <el-container>
                         <el-header>
-                            <div class="panel_title">
-                                <div style="display: flex;justify-content: space-between;">
-                                    <div class="left-panel">
-                                        CEMS监测详情
-                                    </div>
-                                    <div class="right-panel">
-                                        <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
-                                            start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
-                                            style="width: 100%" />
-                                        <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>
-                                    </div>
-                                </div>
+                            <div class="left-panel">
+                                CEMS监测详情
+                            </div>
+                            <div class="right-panel">
+                                <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
+                                    start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
+                                    style="width: 100%" />
+                                <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>
                             </div>
                         </el-header>
                         <el-main class="nppadding">
diff --git a/src/views/bigScreen/enpComponents/cems2.vue b/src/views/bigScreen/enpComponents/cems2.vue
index 162ed35d..c6dafa4b 100644
--- a/src/views/bigScreen/enpComponents/cems2.vue
+++ b/src/views/bigScreen/enpComponents/cems2.vue
@@ -1,15 +1,11 @@
 <template>
     <el-container>
         <el-header>
-            <div class="panel_title">
-                <div style="display: flex;justify-content: space-between;">
-                    <div class="left-panel">
-                        CEMS监测预警
-                    </div>
-                    <div class="right-panel">
-                        <el-button @click="getTableData">刷新</el-button>
-                    </div>
-                </div>
+            <div class="left-panel">
+                CEMS监测预警
+            </div>
+            <div class="right-panel">
+                <el-button @click="getTableData">刷新</el-button>
             </div>
         </el-header>
         <el-main class="nopadding">
diff --git a/src/views/bigScreen/enpComponents/cemsExport.vue b/src/views/bigScreen/enpComponents/cemsExport.vue
index cca5a6fe..dcdcbf13 100644
--- a/src/views/bigScreen/enpComponents/cemsExport.vue
+++ b/src/views/bigScreen/enpComponents/cemsExport.vue
@@ -1,27 +1,18 @@
 <template>
     <el-container>
         <el-header>
-            <div class="panel_title">CEMS报表导出</div>
+            <div class="left-panel">CEMS报表导出</div>
         </el-header>
         <el-main class="nopadding">
-            <el-container>
-                <el-header>
-                    <div class="searchWrap" style="margin-left: 8px">
-                        <div>
-                            <el-date-picker size="large" v-model="query.time" type="datetime"
-                                value-format="YYYY-MM-DD HH:mm:ss" placeholder="时间选择" style=" width: 400px" />
-                            <el-select size="large" v-model="query.type" placeholder="周期" style="margin-left:4px">
-                                <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
-                                    :value="item.value" />
-                            </el-select>
-                            <el-button size="large" type="primary" @click="exportExcel" style="margin-left: 4px"
-                                v-loading="eLoading">导出报表</el-button>
-                        </div>
-                    </div>
-                </el-header>
-                <el-main></el-main>
-            </el-container>
-
+            <div style="text-align: center;margin-top: 8px">
+                <el-date-picker size="large" v-model="query.time" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+                    placeholder="时间选择" style=" width: 400px" />
+                <el-select size="large" v-model="query.type" placeholder="周期" style="margin-left:4px">
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+                <el-button size="large" type="primary" @click="exportExcel" style="margin-left: 4px"
+                    v-loading="eLoading">导出报表</el-button>
+            </div>
         </el-main>
     </el-container>
     <!-- <div class="exportContainer">
diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 361e3c21..0efef9f2 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -13,25 +13,24 @@
         <el-main class="nopadding">
             <el-container>
                 <el-header>
-                    <div class="searchWrap">
-                        <div style="font-size: 1vh;">
-                            全场总排放口：<span class="totalNumber">5</span>
+                    <div class="left-panel searchWrap">
+                        <div style="font-size: 1.8vh;">
+                            全厂总排放口：<span class="totalNumber">{{ count }}</span>
                         </div>
-                        <div>
-                            <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>
-
+                    </div>
+                    <div class="right-panel">
+                        <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>
                 <el-main>
-                    <scTable :data="tableData" :apiObj="apiObj" size="large" style="" @row-click="rowClick">
+                    <scTable :data="tableData" :apiObj="apiObj" size="large" style="" @row-click="rowClick"
+                        @dataChange="updateCount">
                         <el-table-column prop="index" label="序号"></el-table-column>
                         <el-table-column prop="number" label="排放口编号"></el-table-column>
                         <el-table-column prop="name" label="排放口名称"></el-table-column>
@@ -40,7 +39,7 @@
                                 <span>{{ level_[scope.row.level] }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="mgroup" label="所属工段"></el-table-column>
+                        <el-table-column prop="mgroup_name" label="所属工段"></el-table-column>
                         <el-table-column prop="eqpment" label="监测设备">
                             <span
                                 style="width:0.6vh;height:0.6vh;border-radius:0.35vh;background:green;display:inline-block;margin-right:5px"></span>达标
@@ -231,6 +230,7 @@ import * as echarts from "echarts";
 export default {
     data() {
         return {
+            count: 0,
             apiObj: this.$API.enp.drain.list,
             params: { type: 10 },
             options: [],
@@ -303,6 +303,9 @@ export default {
         }
     },
     methods: {
+        updateCount(res, tableData) {
+            this.count = res.count
+        },
         initTimeNow() {
             var now = new Date();
             let year = now.getFullYear(); // 年份
@@ -472,7 +475,7 @@ export default {
 
 .totalNumber {
     color: #64D2FF;
-    font-size: 1.6vh;
+    font-size: 2vh;
     font-weight: bold;
 }
 
diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue
index 3d19719d..249d2220 100644
--- a/src/views/bigScreen/enpComponents/pollutant.vue
+++ b/src/views/bigScreen/enpComponents/pollutant.vue
@@ -3,7 +3,7 @@
         <el-main class="nopadding">
             <el-container>
                 <el-header>
-                    <div class="panel_title">污染源清单</div>
+                    <div class="left-panel">污染源清单</div>
                 </el-header>
                 <el-main class="nopadding">
                     <el-container>