From 918d45503e3afe201625fd76d6cd7f0b84f09fc7 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Mon, 30 Sep 2024 17:19:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E4=BF=AE=E6=94=B9=20=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/mpoint.vue            |  1 +
 src/views/em/mpoint_form.vue       |  1 +
 src/views/enm_energy/energy.vue    |  4 ++--
 src/views/enm_report/reportDay.vue |  6 +++---
 src/views/enm_rm/handover_form.vue |  2 +-
 src/views/enm_rm/logDetail.vue     |  9 +++++----
 src/views/fac_cal/mpointstat.vue   | 22 +++++++++++++++++-----
 src/views/home/event.vue           |  8 ++++++--
 src/views/ops/menu.vue             |  3 ++-
 9 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
index 4ead9a08..d9b2116c 100644
--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@@ -84,6 +84,7 @@
 					placeholder="名称/代号"
 					style="width: 200px"
 					clearable
+					@keyup.enter="handleQuery"
 				></el-input>
 				<el-button
 					type="primary"
diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index ea3b5f15..ea23d0b3 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -139,6 +139,7 @@
 									clearable
 									filterable
 									style="width: 100%"
+									@clear="() => { form.material=null } "
 								>
 									<el-option
 										v-for="item in materials"
diff --git a/src/views/enm_energy/energy.vue b/src/views/enm_energy/energy.vue
index 55e71184..d802afa6 100644
--- a/src/views/enm_energy/energy.vue
+++ b/src/views/enm_energy/energy.vue
@@ -93,8 +93,8 @@
                             <th rowspan="2">车间用水（t）</th>
                         </tr>
                         <tr v-if="deptName=='烧成车间'">
-                            <th colspan="11">回转窑</th>
-                            <th colspan="3">煤磨</th>
+                            <th colspan="10">回转窑</th>
+                            <th colspan="4">煤磨</th>
                             <th rowspan="2">压缩空气（m3）</th>
                             <th rowspan="2">车间用水（t）</th>
                         </tr>
diff --git a/src/views/enm_report/reportDay.vue b/src/views/enm_report/reportDay.vue
index dec49c2c..8fa6492e 100644
--- a/src/views/enm_report/reportDay.vue
+++ b/src/views/enm_report/reportDay.vue
@@ -286,9 +286,9 @@
             },
             
             getTableData(){
-                for(let i=0;i<39;i++){
-                    this.tableDatas[i][3] = '';
-                }
+                // for(let i=0;i<39;i++){
+                //     this.tableDatas[i][3] = '';
+                // }
                 this.getData();
             },
             handlePrint() {
diff --git a/src/views/enm_rm/handover_form.vue b/src/views/enm_rm/handover_form.vue
index 0efc5054..b7b33592 100644
--- a/src/views/enm_rm/handover_form.vue
+++ b/src/views/enm_rm/handover_form.vue
@@ -39,7 +39,7 @@
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24" v-if="form.shift_name == '白班' && mgroupId == '3347217246321065984'">
-              <el-form-item label="煤粉热值">
+              <el-form-item label="煤粉热值(大卡)">
                 <el-input-number v-model="form.pcoal_heat" controls-position="right" placeholder="煤粉热值" />
               </el-form-item>
             </el-col>
diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index bca4e089..4bc22536 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -113,9 +113,9 @@
 								<el-col
 									:md="12"
 									:sm="24"
-									v-if="form.mgroup_name == '回转窑'"
+									v-if="form.mgroup_name == '回转窑' && (form.shift_name == '白班' || form.shift_name == '早班')"
 								>
-									<el-form-item label="煤粉热值">
+									<el-form-item label="煤粉热值(大卡)">
 										<el-input-number
 											v-model="form.pcoal_heat"
 											controls-position="right"
@@ -461,8 +461,8 @@
 										prop="measure"
 									></el-table-column>
 									<el-table-column
-										label="停机时长"
-										prop="duration"
+										label="停机时长(s)"
+										prop="duration_sec"
 									></el-table-column>
 									<el-table-column
 										label="操作"
@@ -810,6 +810,7 @@ export default {
 						})
 						.catch((res) => {
 							that.isSaveing = false;
+							
 						});
 				}
 			});
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index 6f658343..f06c0529 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -6,6 +6,7 @@
 					v-model="query.mpoint"
 					placeholder="测点"
 					clearable
+					filterable
 					style="margin: 0 6px; width: 300px"
 					@change="handleQuery"
 				>
@@ -73,7 +74,7 @@
 					label="原始计算值"
 					prop="val_origin"
 				></el-table-column>
-				<!-- <el-table-column
+				<el-table-column
 					label="操作"
 					fixed="right"
 					align="center"
@@ -83,12 +84,13 @@
 						<el-button
 							link
 							size="small"
+							v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
 							@click="handle_edit(scope.row)"
 							type="primary"
 							>校正</el-button
 						>
 					</template>
-				</el-table-column> -->
+				</el-table-column>
 			</scTable>
 		</el-main>
 		<el-dialog title="校正" v-model="visible">
@@ -101,17 +103,27 @@
 					style="padding: 0 10px"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
+						<el-col :md="8" :sm="24">
 							<el-form-item label="所属部门">
 								<span>{{ form.belong_dept_name }}</span>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="8" :sm="24">
 							<el-form-item label="工段名称">
 								<span>{{ form.mgroup_name }}</span>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="8" :sm="24">
+							<el-form-item label="测点名">
+								<span>{{ form.mpoint_name }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :md="8" :sm="24">
+							<el-form-item label="时间范围">
+								<span>{{ form.year_s }}/{{ form.month_s }}/{{ form.day_s }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :md="8" :sm="24">
 							<el-form-item label="校正值">
 								<el-input-number
 									v-model="form.val_correct"
diff --git a/src/views/home/event.vue b/src/views/home/event.vue
index 0a2bc3a7..62c3d8a2 100644
--- a/src/views/home/event.vue
+++ b/src/views/home/event.vue
@@ -17,9 +17,13 @@
       <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" fit stripe
         @selection-change="handleSelectionChange" @resetQuery="resetQuery">
         <el-table-column type="selection" width="55" />
-        <el-table-column label="发生类型" prop="buy_date">
+        <el-table-column label="发生类型">
+          <template #default="scope">
+            <el-tag v-for="item in scope.row.cates_" :key="item.id" type="warning" effect="plain">{{ item.name
+              }}</el-tag>
+          </template>
         </el-table-column>
-        <el-table-column label="事件信息" prop="voice_msg" show-overflow-tooltip>
+        <el-table-column label="事件信息" prop="voice_msg" width="300" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="所属工段" prop="mgroupName">
           <template #default="scope">
diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index 67644e24..685cc34a 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -151,8 +151,9 @@ export default {
     addMenu() {
       this.type = "add";
       this.limitedVisible = true;
+      this.addForm = Object.assign({}, dForm);
       this.$nextTick(() => {
-        this.addForm = Object.assign({}, dForm);
+        // this.addForm = Object.assign({}, dForm);
       });
     },
     //编辑