From a2feea0b542af2e664da1ab7052174d09c5076a8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 13 Mar 2024 14:17:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20base=20=E9=80=80=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E7=94=A8location.reload=E9=87=8D=E7=BD=AE=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/userbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index c54d57c5..78cbb47c 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -166,7 +166,7 @@ export default {
         })
           .then(() => {
             this.$TOOL.data.remove("TOKEN")
-            this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+            this.$router.push(`/login?redirect=${this.$route.fullPath}`).then(() => { location.reload() })
           })
           .catch(() => {
             //取消退出

From ca925eb0a6b32078bb7cbaac02fb6710bc1e4298 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 13 Mar 2024 15:30:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=8E=AF=E5=A2=83=E5=92=8C=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/em.js                           |   9 ++
 src/utils/enum.js                             |  10 +-
 .../bigScreen/enpComponents/alarmrecord.vue   |  14 +-
 .../bigScreen/enpComponents/envirmonitor.vue  | 153 +++++++++---------
 .../enpComponents/envirqualmonitor.vue        |  34 ++--
 src/views/bigScreen/enpComponents/eqments.vue |  88 +++++-----
 6 files changed, 162 insertions(+), 146 deletions(-)

diff --git a/src/api/model/em.js b/src/api/model/em.js
index 5233d627..b8c954e6 100644
--- a/src/api/model/em.js
+++ b/src/api/model/em.js
@@ -4,6 +4,15 @@ import http from "@/utils/request"
 export default {
 	// 设备
 	equipment: {
+		count_running_state: {
+		    name: "设备状态统计",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/em/equipment/count_running_state/`,
+					data
+				);
+			}
+		},
 		list: {
 			name: "设备列表",
 			req: async function(data){
diff --git a/src/utils/enum.js b/src/utils/enum.js
index c5e8e91c..df90f8ab 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -61,4 +61,12 @@ export const drainTypeEnum = new EnumFactory({
     'product': '生产工艺', 
     'mtrans': '物料输送',
     'mstore':'物料储存' 
-})
\ No newline at end of file
+})
+
+export const eqTypeEnum = new EnumFactory({
+    10: { text: '生产设备', type: 'success' },
+    20: { text: '计量设备', type: 'primary' },
+    30: { text: '治理设备', type: 'warning' },
+    40: { text: '监测设备', type: 'danger' },
+    50: { text: '监控设备', type: 'info' },
+}, parseInt)
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/alarmrecord.vue b/src/views/bigScreen/enpComponents/alarmrecord.vue
index d354a8cf..7e1dd65a 100644
--- a/src/views/bigScreen/enpComponents/alarmrecord.vue
+++ b/src/views/bigScreen/enpComponents/alarmrecord.vue
@@ -5,17 +5,12 @@
                 <el-header class="panel_title">
                     <div class="left-panel">超标实时报警记录</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">
-                    <scTable ref="table" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params"
-                        :query="query" hideDo>
+                    <scTable ref="table" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id"
+                        :params="params" :query="query" hideDo>
                         <el-table-column type="index" width="50" />
                         <el-table-column prop="number" label="设备名称" />
                         <el-table-column prop="name" label="报警时间" />
@@ -76,6 +71,9 @@ export default {
         this.apiObj2
     },
     methods: {
+        backtoMap() {
+            this.$emit('close')
+        },
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/envirmonitor.vue b/src/views/bigScreen/enpComponents/envirmonitor.vue
index 8ff9a10f..e089b008 100644
--- a/src/views/bigScreen/enpComponents/envirmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirmonitor.vue
@@ -7,69 +7,55 @@
                         空气质量监测微站
                     </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"></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 type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-                            </div>
-                        </el-header>
-                        <el-main>
-                            <scTable :apiObj="apiObj" size="large" :params="params" :query="query" @row-click="rowClick">
-                                <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="cate_name" 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实测值">
-                                    <template #default="scope">
-                                         {{ scope.row.envdata.pm25 ? scope.row.envdata.pm25 : '-' }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="PM10实测值">
-                                    <template #default="scope">
-                                        {{ scope.row.envdata.pm10 ? scope.row.envdata.pm10 : '-' }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="湿度">
-                                    <template #default="scope">
-                                        {{ scope.row.envdata.humidity ? scope.row.envdata.humidity : '-' }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="温度">
-                                    <template #default="scope">
-                                        {{ scope.row.envdata.temperature ? scope.row.envdata.temperature : '-'}}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="大气压">
-                                    <template #default="scope">
-                                        {{ scope.row.envdata.pressure ? scope.row.envdata.pressure : '-' }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="风向">
-                                    <template #default="scope">
-                                        {{ scope.row.envdata.wind_direction ? scope.row.envdata.wind_direction : '-' }}
-                                    </template>
-                                </el-table-column>
-                            </scTable>
-                        </el-main>
-                    </el-container>
+
+                <el-main>
+                    <scTable :apiObj="apiObj" size="large" :params="params" :query="query" @row-click="rowClick">
+                        <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="cate_name" label="设备类型"></el-table-column>
+                        <el-table-column prop="mgroup_name" label="所属工序"></el-table-column>
+                        <el-table-column prop="running_state" label="运行状态">
+                            <template #default="scope">
+                                <!-- <span>{{ scope.row.running_state }}</span> -->
+                                <el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
+                            runningStateEnum[scope.row.running_state]?.text }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="PM2.5实测值">
+                            <template #default="scope">
+                                {{ scope.row.envdata.pm25 ? scope.row.envdata.pm25 : '-' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="PM10实测值">
+                            <template #default="scope">
+                                {{ scope.row.envdata.pm10 ? scope.row.envdata.pm10 : '-' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="湿度">
+                            <template #default="scope">
+                                {{ scope.row.envdata.humidity ? scope.row.envdata.humidity : '-' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="温度">
+                            <template #default="scope">
+                                {{ scope.row.envdata.temperature ? scope.row.envdata.temperature : '-' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="大气压">
+                            <template #default="scope">
+                                {{ scope.row.envdata.pressure ? scope.row.envdata.pressure : '-' }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="风向">
+                            <template #default="scope">
+                                {{ scope.row.envdata.wind_direction ? scope.row.envdata.wind_direction : '-' }}
+                            </template>
+                        </el-table-column>
+                    </scTable>
                 </el-main>
             </el-container>
         </el-header>
@@ -81,8 +67,7 @@
                     </div>
                     <div class="right-panel">
                         <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
-                            start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
-                            style="width: 100%" />
+                            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"
@@ -100,10 +85,13 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import { runningStateEnum } from "@/utils/enum.js";
 export default {
     data() {
         return {
-            params: { type: 20, cate__code: 'aqms', has_envdata: 'yes'  },
+            runningStateEnum,
+            apiObj: this.$API.em.equipment.list,
+            params: { cate__code: 'aqms', has_envdata: 'yes' },
             query: {
                 "end_time": "",
                 "start_time": "",
@@ -116,7 +104,6 @@ export default {
                 { label: '天', value: '1 day' },
             ],
             timeRange: [],
-            apiObj: this.$API.em.equipment.list,
             processOptions: [],
             currentEquipmentId: '',
             currentEquipmentName: '',
@@ -150,7 +137,12 @@ export default {
                 },
                 xAxis: { type: 'category' },
                 yAxis: {},
-                series: [{ type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }]
+                series: [{ type: 'line', encode: { y: 'pm25', seriesName: ["pm25"] } },
+                { type: 'line', encode: { y: 'pm10', seriesName: ["pm10"] } },
+                { type: 'line', encode: { y: '温度', seriesName: ["温度"] } },
+                { type: 'line', encode: { y: '压力', seriesName: ["压力"] } },
+                { type: 'line', encode: { y: '湿度', seriesName: ["湿度"] } },
+                ]
             },
         }
     },
@@ -158,18 +150,20 @@ export default {
         this.initTimeRange()
     },
     methods: {
-        handleQuery() { },
+        backtoMap() {
+            this.$emit('close')
+        },
         initTimeRange() {
             var now = new Date();
             var start = new Date();
             start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
             this.timeRange = [start, now]
         },
-         rowClick(row) {
+        rowClick(row) {
             this.currentEquipmentId = row.id;
             this.currentEquipmentName = row.name;
             this.query.equipment_id = row.id;
-            this.$nextTick(() => { this.handleQuery1() })
+            this.$nextTick(() => { this.handleQuery() })
 
         },
         initChart() {
@@ -184,23 +178,22 @@ export default {
                 raise_exception: true
             }).then(res => {
                 let newOption = Object.assign({}, this.basicOption);
-                let ds0 = res.data.ds0
-                ds0.pop()
-                let series = []
-                if (ds0) {
-                    let ds00 = ds0[0]
-                    for (var x = 1, y = ds00.length; x < y; x++) {
-                        series.push({ type: 'line' })
-                    }
-                }
+                // let ds0 = res.data.ds0
+                // ds0.pop()
+                // let series = []
+                // if (ds0) {
+                //     let ds00 = ds0[0]
+                //     for (var x = 1, y = ds00.length; x < y; x++) {
+                //         series.push({ type: 'line' })
+                //     }
+                // }
                 newOption.dataset.source = res.data.ds0;
-                newOption.series = series;
                 newOption.title.text = this.currentEquipmentName;
                 myChart.setOption(newOption);
             }).then(() => { myChart.hideLoading() })
 
         },
-        handleQuery1() {
+        handleQuery() {
             let that = this;
             let timeRange = Object.assign([], that.timeRange);;
             let time1 = timeRange[0]
diff --git a/src/views/bigScreen/enpComponents/envirqualmonitor.vue b/src/views/bigScreen/enpComponents/envirqualmonitor.vue
index 9e2b4645..9d5000c9 100644
--- a/src/views/bigScreen/enpComponents/envirqualmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirqualmonitor.vue
@@ -5,12 +5,7 @@
                 环境空气质量监测实时数据
             </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="nppadding">
@@ -19,23 +14,23 @@
                     <div class="left-panel">
                     </div>
                     <div class="right-panel">
-                        <el-select v-model="time_bucket" placeholder="周期" style="margin-left:4px"
-                           >
+                        <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.metric" placeholder="监测物" style="margin-left:4px"
-                           >
+                            @change="handleQuery">
                             <el-option v-for="item in metricOptions" :key="item.value" :label="item.label"
-                                :value="item.value"  />
+                                :value="item.value" />
                         </el-select>
                         <el-button @click="handleQuery">查询</el-button>
                     </div>
                 </el-header>
                 <el-main>
-                    <scTable :data="tableData"  hideDo v-show="time_bucket=='minute'">
+                    <scTable :data="tableData" hideDo v-show="time_bucket == 'minute'">
                         <el-table-column type="index" />
-                        <el-table-column prop="equipment_name" label="站点名称" />
+                        <el-table-column prop="equipment_name" label="站点名称" width="140" />
                         <el-table-column prop="metric_0" label="0" />
                         <el-table-column prop="metric_5" label="5" />
                         <el-table-column prop="metric_10" label="10" />
@@ -50,7 +45,7 @@
                         <el-table-column prop="metric_55" label="55" />
                         <el-table-column prop="metric_hour" label="小时均值" />
                     </scTable>
-                    <scTable :data="tableData"  hideDo v-show="time_bucket=='hour'">
+                    <scTable :data="tableData" hideDo v-show="time_bucket == 'hour'">
                         <el-table-column type="index" />
                         <el-table-column prop="equipment_name" label="站点名称" />
                         <el-table-column prop="val_1" label="1" />
@@ -88,7 +83,7 @@
 export default {
     data() {
         return {
-            tableData:[],
+            tableData: [],
             metricOptions: [
                 { label: 'PM2.5', value: 'pm25' },
                 { label: 'PM10', value: 'pm10' },
@@ -97,7 +92,7 @@ export default {
                 { label: '分钟上报值', value: 'minute' },
                 { label: '小时均值', value: 'hour' },
             ],
-            time_bucket:'minute',
+            time_bucket: 'minute',
             query: {
                 year: '',
                 month: '',
@@ -112,6 +107,9 @@ export default {
         this.getTime();
     },
     methods: {
+        backtoMap() {
+            this.$emit('close')
+        },
         getTime() {
             var now = new Date();
             this.query.year = now.getFullYear();
@@ -125,18 +123,18 @@ export default {
             console.log(that.query);
             that.getTableData();
         },
-        getTableData() { 
+        getTableData() {
             let that = this;
             let exec_search = '';
             if (that.time_bucket == 'minute') {
-                exec_search='enp_edata_metric_nodrain'
+                exec_search = 'enp_edata_metric_nodrain'
             } else if (that.time_bucket == 'hour') {
                 exec_search = 'enp_edata_hour_nodrain';
             }
             that.$API.bi.dataset.exec.req(exec_search, {
                 query: that.query,
                 raise_exception: true
-            }).then(res => { 
+            }).then(res => {
                 console.log(res.data2.ds0);
                 this.tableData = res.data2.ds0;
             })
diff --git a/src/views/bigScreen/enpComponents/eqments.vue b/src/views/bigScreen/enpComponents/eqments.vue
index 18c1435a..c635a66b 100644
--- a/src/views/bigScreen/enpComponents/eqments.vue
+++ b/src/views/bigScreen/enpComponents/eqments.vue
@@ -5,34 +5,34 @@
                 设备清单
             </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" 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>
+                        <span class="eqmCateName">设备总数:</span><span class="totalNumber">{{ tNumbers.count }}</span>
+                        <span class="eqmCateName">在线:</span><span class="totalNumber">{{ tNumbers.count_online }}</span>
+                        <span class="eqmCateName">离线:</span><span class="totalNumber">{{ tNumbers.count_offline
+                            }}</span>
+                        <span class="eqmCateName">运行:</span><span class="totalNumber">{{ tNumbers.count_running
+                            }}</span>
+                        <span class="eqmCateName">待机:</span><span class="totalNumber">{{ tNumbers.count_standby
+                            }}</span>
+                        <span class="eqmCateName">停机:</span><span class="totalNumber">{{ tNumbers.count_stop }}</span>
+                        <span class="eqmCateName">故障:</span><span class="totalNumber">{{ tNumbers.count_fail }}</span>
+                        <span class="eqmCateName">未知:</span><span class="totalNumber">{{ tNumbers.count_unknown
+                            }}</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-option v-for="item in mgroupOptions" :key="item.id" :label="item.name"
+                                :value="item.id"></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-option v-for="e in eqTypeEnum.values" :key="e.key" :value="e.key"
+                                :label="e.text"></el-option>
                         </el-select>
                         <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
                             placeholder="设备名称/设备编号"></el-input>
@@ -47,11 +47,17 @@
                         <el-table-column prop="name" label="设备名称"></el-table-column>
                         <el-table-column prop="type" label="设备类型">
                             <template #default="scope">
-                                {{ type_[scope.row.type] }}
+                                {{ eqTypeEnum[scope.row.type].text }}
                             </template>
                         </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="state" label="设备状态">
+                            <template #default="scope">
+                                <!-- <span>{{ scope.row.running_state }}</span> -->
+                                <el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
+                    runningStateEnum[scope.row.running_state]?.text }}</el-tag>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="description" label="备注信息"></el-table-column>
                     </scTable>
                 </el-main>
@@ -60,37 +66,40 @@
     </el-container>
 </template>
 <script>
+import { runningStateEnum, eqTypeEnum } from "@/utils/enum.js";
 export default {
     data() {
         return {
+            runningStateEnum, eqTypeEnum,
             query: {
-                type: 10,
+                type: null,
                 mgroup: null,
                 search: ''
             },
-            typeOptions: [
-                { id: 10, name: '生产设备' },
-                { id: 20, name: '检测设备' },
-                { id: 30, name: '治理设备' },
-            ],
-            type_: {
-                10: '生产设备',
-                20: '检测设备',
-                30: '治理设备',
-            },
-            state_: {
-                10: '完好',
-                20: '限用',
-                30: '在修',
-                40: '禁用',
-                50: '治理设备',
-            },
-            processOptions: [],
+            mgroupOptions: [],
             apiObj: this.$API.em.equipment.list,
             params: { type: 10 },
+            tNumbers: {}
         }
     },
+    mounted() {
+        this.getMgroup();
+        this.getEmState();
+    },
     methods: {
+        getEmState() {
+            this.$API.em.equipment.count_running_state.req().then(res => {
+                this.tNumbers = res;
+            })
+        },
+        getMgroup() {
+            this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => {
+                this.mgroupOptions = res;
+            })
+        },
+        backtoMap() {
+            this.$emit('close')
+        },
         handleQuery() {
             this.$refs.table.queryData(this.query);
         },
@@ -105,7 +114,8 @@ export default {
 }
 
 .totalNumber {
-    font-size: 0.8vw;
+    font-size: 1vw;
+    margin-left: 0.5vw;
     margin-right: 0.5vw;
 }
 </style>
\ No newline at end of file