fix: 智能治理结构优化

src/views/bigScreen/enpComponents/smarg_trans.vue

@@ -2,9 +2,9 @@
     <el-container>
         <el-header>
             <div class="left-panel">
-                <el-select></el-select>
+                <el-select v-model="query.mgroup" placeholder="工段 " @change="handleQuery" clearable>
-                <span style="width: 4px;"></span>
+                    <el-option v-for="item in mgroupOptions" :key="item" :label="item.name" :value="item.id"></el-option>
-                <el-button type="primary">查询</el-button>
+                </el-select>
             </div>
             <div class="right-panel">
                 <div class="typebox">
@@ -32,27 +32,47 @@
             </div>
         </el-header>
         <el-main class="nopadding">
-            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination hideDo>
+            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination hideDo
-                <el-table-column prop="name" label="污染源编号" />
+                :query="query">
-                <el-table-column prop="type" label="污染源名称" />
+                <el-table-column prop="number" label="污染源编号" />
-                <el-table-column label="生产设备名称">
+                <el-table-column prop="name" label="污染源名称" />
+                <el-table-column prop="mgroup_name" label="所在工段" />
+                <el-table-column label="生产设备">
                     <template #default="scope">
-                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                            <div v-if="item.type == 10">
+                                <span>{{ item.name }} |
+                                    待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
+                                    }}</span> h
+                                </span>
+                            </div>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="生产设备名称">
+                <el-table-column label="治理设备">
                     <template #default="scope">
-                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                            <div v-if="item.type == 30">
+                                <span>{{ item.name }} |
+                                    待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
+                                    }}</span> h
+                                </span>
+                            </div>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="待机时间" />
+                <el-table-column label="监测设备">
-                <el-table-column label="治理设备名称">
                     <template #default="scope">
-                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                            <div v-if="item.type == 20">
+                                <span>{{ item.name }} |
+                                    待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
+                                    }}</span> h
+                                </span>
+                            </div>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="待机时间" />
-                <el-table-column prop="type" label="污染浓度" />
             </scTable>
         </el-main>
     </el-container>
@@ -62,7 +82,20 @@ export default {
     data() {
         return {
             apiObj: null,
-            params: {}
+            params: { type: 20, has_equipdata: 'yes', cate: 'mtrans' },
+            query: {},
+            mgroupOptions: []
+        }
+    },
+    mounted() {
+        this.apiObj = this.$API.enp.drain.list
+        this.getMgroup()
+    },
+    methods: {
+        getMgroup() {
+            this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => {
+                this.mgroupOptions = res
+            })
         }
     }
 }
@@ -111,4 +144,5 @@ export default {
 
 .grayb {
     background: #cbcbcb
-}</style>
+}
+</style>

src/views/bigScreen/enpComponents/smartg_carwash.vue

@@ -6,15 +6,21 @@
                     <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 style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination
+                    <scTable ref="table" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params"
-                        hideDo>
+                        :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="120" />
+                        <el-table-column prop="start_time" label="开始时间" width="180" />
-                        <el-table-column prop="end_time" label="结束时间" width="120" />
+                        <el-table-column label="洗车时长(s)" prop="duration"></el-table-column>
-                        <el-table-column label="洗车时长" prop="duration"></el-table-column>
                         <el-table-column label="压力" prop="pressure" />
                         <el-table-column label="流量" prop="flux">
                         </el-table-column>
@@ -48,9 +54,6 @@
                                 </el-table-column>
                             </scTable>
                         </el-main>
-                        <el-footer height="400px">
-                            xx
-                        </el-footer>
                     </el-container>
                 </el-main>
             </el-container>
@@ -66,10 +69,23 @@ export default {
             params: {},
             apiObj2: null,
             params2: {},
+            stationOptions: [],
+            query: {}
         }
     },
     mounted() {
         this.apiObj = this.$API.enp.carwash;
+        this.getStations();
+    },
+    methods: {
+        getStations() {
+            this.$API.em.equipment.list.req({ cate__code: 'wstation', page: 0 }).then(res => {
+                this.stationOptions = res;
+            })
+        },
+        handleQuery() {
+            this.$refs.table.queryData(this.query);
+        },
     }
 }
 </script>

src/views/bigScreen/enpComponents/smartg_prod.vue

@@ -2,9 +2,9 @@
     <el-container>
         <el-header>
             <div class="left-panel">
-                <el-select></el-select>
+                <el-select v-model="query.mgroup" placeholder="工段 " @change="handleQuery" clearable>
-                <span style="width: 4px;"></span>
+                    <el-option v-for="item in mgroupOptions" :key="item" :label="item.name" :value="item.id"></el-option>
-                <el-button type="primary">查询</el-button>
+                </el-select>
             </div>
             <div class="right-panel">
                 <div class="typebox">
@@ -32,27 +32,47 @@
             </div>
         </el-header>
         <el-main class="nopadding">
-            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination hideDo>
+            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination hideDo
-                <el-table-column prop="name" label="污染源编号" />
+                :query="query">
-                <el-table-column prop="type" label="污染源名称" />
+                <el-table-column prop="number" label="污染源编号" />
-                <el-table-column label="生产设备名称">
+                <el-table-column prop="name" label="污染源名称" />
+                <el-table-column prop="mgroup_name" label="所在工段" />
+                <el-table-column label="生产设备">
                     <template #default="scope">
-                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                            <div v-if="item.type == 10">
+                                <span>{{ item.name }} |
+                                    待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
+                                    }}</span> h
+                                </span>
+                            </div>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="生产设备名称">
+                <el-table-column label="治理设备">
                     <template #default="scope">
-                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                            <div v-if="item.type == 30">
+                                <span>{{ item.name }} |
+                                    待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
+                                    }}</span> h
+                                </span>
+                            </div>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="待机时间" />
+                <el-table-column label="监测设备">
-                <el-table-column label="治理设备名称">
                     <template #default="scope">
-                        <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                            <div v-if="item.type == 20">
+                                <span>{{ item.name }} |
+                                    待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
+                                    }}</span> h
+                                </span>
+                            </div>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="待机时间" />
-                <el-table-column prop="type" label="污染浓度" />
             </scTable>
         </el-main>
     </el-container>
@@ -62,7 +82,20 @@ export default {
     data() {
         return {
             apiObj: null,
-            params: {}
+            params: { type: 20, has_equipdata: 'yes', cate: 'product' },
+            query: {},
+            mgroupOptions: []
+        }
+    },
+    mounted() {
+        this.apiObj = this.$API.enp.drain.list
+        this.getMgroup()
+    },
+    methods: {
+        getMgroup() {
+            this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => {
+                this.mgroupOptions = res
+            })
         }
     }
 }
@@ -111,4 +144,5 @@ export default {
 
 .grayb {
     background: #cbcbcb
-}</style>
+}
+</style>