From b5c55075649735167123db469e9558bcb53628b0 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 27 Feb 2024 18:21:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen/enpComponents/envirmonitor.vue  | 10 ++--
 src/views/bigScreen/enpComponents/eqments.vue | 10 ++--
 .../bigScreen/enpComponents/innerclean.vue    | 19 ++++----
 .../bigScreen/enpComponents/orgwryList.vue    | 22 +++++----
 .../bigScreen/enpComponents/pollutant.vue     | 12 ++++-
 .../bigScreen/enpComponents/transport.vue     | 46 +++++++++++++------
 6 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/src/views/bigScreen/enpComponents/envirmonitor.vue b/src/views/bigScreen/enpComponents/envirmonitor.vue
index 6cebf209..46e4df9f 100644
--- a/src/views/bigScreen/enpComponents/envirmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirmonitor.vue
@@ -23,17 +23,17 @@
                         </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>
+                        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
                     </div>
                 </el-header>
                 <el-main>
                     <scTable :apiObj="apiObj" size="large" :params="params" :query="query">
-                        <el-table-column prop="index" label="序号"></el-table-column>
+                        <el-table-column type="index" width="50" />
                         <el-table-column prop="number" label="设备编号"></el-table-column>
                         <el-table-column prop="level" label="设备名称"></el-table-column>
-                        <el-table-column prop="mgroup" label="设备类型"></el-table-column>
-                        <el-table-column prop="eqpment" label="所属工序"></el-table-column>
-                        <el-table-column prop="mgroup" label="当前状态"></el-table-column>
+                        <el-table-column prop="type" label="设备类型"></el-table-column>
+                        <el-table-column prop="mgroup_name" label="所属工序"></el-table-column>
+                        <el-table-column prop="running_state" label="运行状态"></el-table-column>
                         <el-table-column label="PM2.5" align="center">
                             <el-table-column prop="mgroup" label="实测值"></el-table-column>
                             <el-table-column prop="mgroup" label="预警值"></el-table-column>
diff --git a/src/views/bigScreen/enpComponents/eqments.vue b/src/views/bigScreen/enpComponents/eqments.vue
index 7afd346c..18c1435a 100644
--- a/src/views/bigScreen/enpComponents/eqments.vue
+++ b/src/views/bigScreen/enpComponents/eqments.vue
@@ -36,13 +36,13 @@
                         </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>
+                        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
                     </div>
                 </el-header>
                 <el-main>
                     <scTable ref="table" :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large"
                         style="" @row-click="rowClick">
-                        <el-table-column prop="index" label="序号"></el-table-column>
+                        <el-table-column type="index" width="50" />
                         <el-table-column prop="number" label="设备编号"></el-table-column>
                         <el-table-column prop="name" label="设备名称"></el-table-column>
                         <el-table-column prop="type" label="设备类型">
@@ -50,9 +50,9 @@
                                 {{ type_[scope.row.type] }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="mgroup" label="所属工序"></el-table-column>
-                        <el-table-column prop="state" label="当前状态"></el-table-column>
-                        <el-table-column prop="description" label="设备信息"></el-table-column>
+                        <el-table-column prop="mgroup_name" label="所属工序"></el-table-column>
+                        <el-table-column prop="state" label="设备状态"></el-table-column>
+                        <el-table-column prop="description" label="备注信息"></el-table-column>
                     </scTable>
                 </el-main>
             </el-container>
diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue
index 95567dde..7363d914 100644
--- a/src/views/bigScreen/enpComponents/innerclean.vue
+++ b/src/views/bigScreen/enpComponents/innerclean.vue
@@ -5,19 +5,16 @@
                 厂内清洁
             </div>
             <div class="right-panel">
-                <div class="backMap" @click="backtoMap">
-                    切换地图
-                    <el-icon>
-                        <Switch />
-                    </el-icon>
-                </div>
+                <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">
-                        车辆总数：<span class="totalNumber">0</span>
+                        <div style="font-size: 1.8vh;">
+                            车辆总数：<span class="totalNumber">{{ count }}</span>
+                        </div>
                     </div>
                     <div class="right-panel">
                         <el-select v-model="query.cate" placeholder="车辆分类" @change="handleQuery" clearable>
@@ -26,7 +23,7 @@
                         </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>
+                        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
                     </div>
                 </el-header>
                 <el-main>
@@ -52,6 +49,7 @@
 export default {
     data() {
         return {
+            count: 0,
             query: {},
             params: { type: 30, tags: 'carwash' },
             cateOptions: [
@@ -67,7 +65,10 @@ export default {
     methods: {
         handleQuery() {
             this.$refs.table.queryData(this.query);
-        }
+        },
+        backtoMap() {
+            this.$emit('close')
+        },
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 510302ab..f6e3e5c1 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -22,19 +22,20 @@
                         </div>
                     </div>
                     <div class="right-panel">
-                        <el-select v-model="query.area" placeholder="" style="width:7vw">
+                        <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>
-                        <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
+                        <!-- <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
                             placeholder=""></el-input>
-                        <el-button @click="handleQuery">查询</el-button>
+                        <el-button @click="handleQuery">查询</el-button> -->
                     </div>
                 </el-header>
                 <el-main>
-                    <scTable :data="tableData" :apiObj="apiObj" :params="params" size="large" style="" @row-click="rowClick"
-                        @dataChange="updateCount">
-                        <el-table-column prop="index" label="序号"></el-table-column>
+                    <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="排放口名称"></el-table-column>
                         <el-table-column prop="level" label="排放口等级">
@@ -239,9 +240,11 @@ export default {
             count: 0,
             apiObj: this.$API.enp.drain.list,
             params: { type: 10 },
-            options: [],
+            options: [
+                { value: '10', label: '主要排放口' },
+                { value: '20', label: '次要排放口' }
+            ],
             query: {
-                area: '',
                 search: ''
             },
             searchInputStyle: {
@@ -309,6 +312,9 @@ export default {
         }
     },
     methods: {
+        handleQuery() {
+            this.$refs.table.queryData(this.query);
+        },
         updateCount(res, tableData) {
             this.count = res.count
         },
diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue
index a2aad2d8..ba5ca705 100644
--- a/src/views/bigScreen/enpComponents/pollutant.vue
+++ b/src/views/bigScreen/enpComponents/pollutant.vue
@@ -9,6 +9,11 @@
                     <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.cate" placeholder="污染源分类" @change="handleQuery" clearable>
                                     <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
                                         :value="item.id"></el-option>
@@ -17,7 +22,8 @@
                         </el-header>
                         <el-main class="nopadding">
                             <scTable ref="table" :data="tableData" style="width: 100%;" size="large" :apiObj="apiObj"
-                                row-key="id" :params="params" :query="query" hidePagination @row-click="rowClick">
+                                row-key="id" :params="params" :query="query" @row-click="rowClick"
+                                @dataChange="updateCount">
                                 <el-table-column type="index" width="50" />
                                 <el-table-column prop="number" label="污染源编号" width="180" />
                                 <el-table-column prop="name" label="污染源名称" />
@@ -215,6 +221,7 @@ import * as echarts from "echarts";
 export default {
     data() {
         return {
+            count: 0,
             eqs: {},
             eqc: {},
             eqz: {},
@@ -277,6 +284,9 @@ export default {
         }
     },
     methods: {
+        updateCount(res, tableData) {
+            this.count = res.count
+        },
         initTimeNow() {
             var now = new Date();
             let year = now.getFullYear(); // 年份
diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue
index 1d95316d..b55723db 100644
--- a/src/views/bigScreen/enpComponents/transport.vue
+++ b/src/views/bigScreen/enpComponents/transport.vue
@@ -5,38 +5,40 @@
                 进出厂记录
             </div>
             <div class="right-panel">
-                <div class="backMap" @click="backtoMap">
+                <!-- <div class="backMap" @click="backtoMap">
                     切换地图
                     <el-icon>
                         <Switch />
                     </el-icon>
-                </div>
+                </div> -->
+                <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">
-                        车辆总数：<span class="totalNumber">0</span>
+                        <div style="font-size: 1.8vh;">
+                            车辆进出次数：<span class="totalNumber">{{ count }}</span>
+                        </div>
                     </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-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
+                            start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
+                            clearable />
+                        <el-select v-model="query.type" placeholder="出入类型" clearable @change="handleQuery">
                             <el-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>
+                        <el-input :input-style="searchInputStyle" style="width:12vw;margin:0 5px" v-model="query.search"
+                            placeholder="车牌号"></el-input>
+                        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
                     </div>
                 </el-header>
                 <el-main>
-                    <scTable ref="table" :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large"
-                        style="" @row-click="rowClick">
+                    <scTable ref="table" :apiObj="apiObj" :params="params" :query="query" size="large" style=""
+                        @row-click="rowClick" @dataChange="updateCount">
                         <el-table-column type="index" width="50" />
                         <el-table-column prop="vehicle_number" label="车牌号码"></el-table-column>
                         <el-table-column prop="access_time" label="过门禁时间"></el-table-column>
@@ -59,12 +61,13 @@ export default {
     data() {
         return {
             query: {},
+            count: 0,
+            timeRange: [],
             cateOptions: [
                 { id: 1, name: '货车' },
                 { id: 2, name: '罐车' },
             ],
             typeOptions: [
-                { id: '', name: '全部' },
                 { id: 1, name: '进厂' },
                 { id: 2, name: '出厂' }
             ],
@@ -79,15 +82,28 @@ export default {
             },
             timeOptions: ['日', '月', '年'],
             apiObj: this.$API.enp.vehicle_access,
-            params: { type: 2 },
+            params: {},
         }
     },
     methods: {
+        updateCount(res, tableData) {
+            this.count = res.count
+        },
         handleQuery() {
+            if (this.timeRange) {
+                this.query.access_time__gte = this.timeRange[0]
+                this.query.access_time__lte = this.timeRange[1]
+            } else {
+                this.query.access_time__gte = null
+                this.query.access_time__lte = null
+            }
             this.$refs.table.queryData(this.query);
         },
         timeHandleQuery() { },
         carHandleQuery() { },
+        backtoMap() {
+            this.$emit('close')
+        },
     }
 }
 </script>
\ No newline at end of file