From 4db4a87d99c61d6ac22902294ff51e61b3014d45 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 3 Dec 2024 11:44:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20tkx=20=E5=A2=9E=E5=8A=A0=E6=9F=B1?=
 =?UTF-8?q?=E7=8A=B6=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js             |  2 +-
 src/views/em/equipment.vue      | 22 +++++++-
 src/views/em/equipment_form.vue |  2 +-
 src/views/em/mpoint.vue         |  5 ++
 src/views/enm_base/mgroup.vue   | 11 +---
 src/views/enm_energy/value.vue  | 99 +++++++++++++++++++++++++++++++++
 src/views/enm_slag/report.vue   |  4 +-
 src/views/home/event.vue        | 11 +---
 8 files changed, 134 insertions(+), 22 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index a4ccdeb8..4c1132d1 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -1021,7 +1021,7 @@ const routes = [
 						meta: {
 							title: "水报表",
 							// icon: "el-icon-grid",
-							perms: ["hour_base"],
+							perms: ["water_base"],
 						},
 						component: "enm_energy/water",
 					},
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 7424ed7d..b29d5203 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -42,12 +42,27 @@
         </el-table-column>
         <el-table-column label="生产厂" prop="factory" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="设备重要性" prop="importance">
+        <el-table-column label="设备重要性">
+          <template #default="scope">
+            <el-tag v-if="scope.row.importance === 10" type="A">
+              {{ importance_[scope.row.importance] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.importance === 20" type="B">
+              {{ importance_[scope.row.importance] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.importance === 30" type="C">
+              {{ importance_[scope.row.importance] }}
+            </el-tag>
+  
+          </template>
         </el-table-column>
         <el-table-column label="购置日期" prop="buy_date">
         </el-table-column>
+        <el-table-column label="工段运行" prop="indicate_mgroup_running">
+        </el-table-column>
         <el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
         </el-table-column>
+        
         <el-table-column label="更新时间" prop="update_time"></el-table-column>
         <el-table-column label="状态">
           <template #default="scope">
@@ -243,6 +258,11 @@ export default {
         30: '在修',
         40: '禁用',
       },
+      importance_: {
+        10: 'A',
+        20: 'B',
+        30: 'C',
+      },
       groupsProps: {
         // value: "id",
         multiple: false,
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 9e2fd53d..0a8d4f8e 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -28,7 +28,7 @@
                 <el-input v-model="form.number" placeholder="设备位号" />
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24" v-if="form.type == 10">
+            <el-col :md="12" :sm="24" v-if="form.type == 10" v-auth="['equipment.running']">
               <el-form-item
 								label="表明工段运行的方式"
 								label-width="160"
diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
index d9b2116c..ce1683fb 100644
--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@@ -175,6 +175,11 @@
 					prop="material_name"
 					width="100"
 				></el-table-column>
+				<el-table-column
+					label="计算系数"
+					prop="coefficient"
+					width="100"
+				></el-table-column>
 				<el-table-column
 					label="所属工段"
 					prop="mgroup_name"
diff --git a/src/views/enm_base/mgroup.vue b/src/views/enm_base/mgroup.vue
index ff159fd4..54637970 100644
--- a/src/views/enm_base/mgroup.vue
+++ b/src/views/enm_base/mgroup.vue
@@ -53,19 +53,12 @@
 				></el-table-column>
 				<el-table-column label="开启能源监测" min-width="100">
 					<template #default="scope">
-						<el-icon v-if="scope.row.need_enm" color="green"
-							><CircleCheckFilled
-						/></el-icon>
-						<el-icon v-else color="red"
-							><CircleCloseFilled
-						/></el-icon>
+						<span v-if="scope.row.need_enm" style="color: green">是</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="是否正在运行" min-width="100">
 					<template #default="scope">
-						<el-icon v-if="scope.row.is_running" color="green"
-							><CircleCheckFilled
-						/></el-icon>
+						<span v-if="scope.row.is_running" style="color: green">是</span>
 					</template>
 				</el-table-column>
 				<el-table-column
diff --git a/src/views/enm_energy/value.vue b/src/views/enm_energy/value.vue
index e3f70e8e..1c1ef0fe 100644
--- a/src/views/enm_energy/value.vue
+++ b/src/views/enm_energy/value.vue
@@ -52,15 +52,100 @@
 				</table>
 			</div>
 		</el-card>
+		<div class="chartWrap">
+			<div class="chartTitle">本年工业总产值</div>
+			<scEcharts
+				height="400px"
+				width="1033px"
+				:option="optionMonth"
+			></scEcharts>
+		</div>
 	</div>
 </template>
 <script>
+import scEcharts from "@/components/scEcharts";
+import { defineAsyncComponent } from "vue";
+const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC", "#551e13"];
+let tooltip = {
+	show: true,
+	trigger: "axis",
+	axisPointer: {
+		type: "cross",
+	},
+	confine: false,
+	showContent: true,
+	triggerOn: "mousemove",
+};
+let grid = {
+	right: "7%",
+	left: "4%",
+	top: "15%",
+};
+let toolbox = {
+	right: "5%",
+	feature: {
+		dataView: { show: true, readOnly: false },
+		saveAsImage: { show: true },
+	},
+};
+let legend = {
+	top: "2%",
+	data: ["总产量", "分布电耗", "总电耗", "成本", "消耗", "进厂"],
+};
+let yAxis = [
+	{
+		type: "value",
+		name: "产值 (万元)",
+		position: "left",
+		alignTicks: true,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[0],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	}
+];
 export default {
+	components: {
+		scEcharts,
+		charts: defineAsyncComponent(() =>
+			import("@/components/scEnm/lineChartsdialog.vue")
+		),
+	},
 	data() {
 		return {
 			timeStamp: 0,
 			year_s: "",
 			tableDatas: [],
+			optionMonth:{},
+			option1: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "工业总产值",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					}
+				],
+			},
 		};
 	},
 	mounted() {
@@ -69,6 +154,7 @@ export default {
 		let year = myDate.getFullYear();
 		that.year_s = year;
 		this.getData();
+		let month = (that.month = myDate.getMonth() + 1);
 	},
 	methods: {
 		getData() {
@@ -93,6 +179,7 @@ export default {
 				obj2.page = 0;
 				obj2.type = 'month_s';
 				that.$API.enm.enstat2.req(obj2).then((res2) => {
+					let seriesData0 = [];
 					if (res2.length > 0) {
 						res2.forEach((item2) => {
 							let ind2 = item2.month_s - 1;
@@ -100,17 +187,20 @@ export default {
 						});
 					} else {
 					}
+					
 					for (let i = 0; i < wrapArr2.length; i++) {
 						if (Boolean(wrapArr2[i])) {
 							if (this.tableDatas[i]) {
 							} else {
 								this.tableDatas[i] = [];
 							}
+							let ind =  wrapArr2[i].month_s - 1;
 							let time =
 								wrapArr2[i].year_s + "." + wrapArr2[i].month_s;
 							this.tableDatas[i][0] = time;
 							this.tableDatas[i][1] =
 								wrapArr2[i].industry_total_val;
+							seriesData0[ind] = wrapArr2[i].industry_total_val;
 							this.tableDatas[i][2] =
 								wrapArr2[i].industry_add_val;
 							this.tableDatas[i][3] = wrapArr2[i].en_consume; //当期值
@@ -230,6 +320,15 @@ export default {
 						} else {
 						}
 					}
+					let options = { ...that.option1 };
+					options.series[0].data = seriesData0;
+					let monthXAxis = [];
+					for (let i = 1; i <= that.month; i++) {
+						let item = i + "月";
+						monthXAxis.push(item);
+					}
+					options.xAxis.data = monthXAxis;
+					that.optionMonth = options;
 				});
 			});
 		},
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 3ed394af..c210b5ac 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -641,9 +641,9 @@ export default {
 								if (data1.imaterial_data.length > 0) {
 									data1.imaterial_data.forEach((item) => {
 									if (item.material_name == "湿电石渣消耗") {
-										that.tableDatas[4][4] = item.amount_consume;
+										that.tableDatas[4][4] = (item.amount_consume).toFixed(2);
 									}else if(item.material_name == "湿电石渣进厂"){
-										that.tableDatas[5][4] = item.amount_consume;
+										that.tableDatas[5][4] = (item.amount_consume).toFixed(2);
 									} 
 						});	
 								}
diff --git a/src/views/home/event.vue b/src/views/home/event.vue
index abe2131c..67a0230c 100644
--- a/src/views/home/event.vue
+++ b/src/views/home/event.vue
@@ -71,12 +71,7 @@
             <el-col :span='12'>
               <el-form-item label="所属工段：">{{ eventItem.enm_data.mgroup_name }}</el-form-item>
             </el-col>
-            <el-col :span='12'>
-              <el-form-item label="所在班组：">{{ eventItem.enm_data.team_name }}</el-form-item>
-            </el-col>
-            <el-col :span='12'>
-              <el-form-item label="所在班次：">{{ eventItem.enm_data.shift_name }}</el-form-item>
-            </el-col>
+            
             <el-col :span='12'>
               <el-form-item label="发生时间：">{{ eventItem.create_time }}</el-form-item>
             </el-col>
@@ -107,7 +102,7 @@
           <el-descriptions-item label="处理时间">
             {{ eventItem.handle_time }}
           </el-descriptions-item>
-          <el-descriptions-item label="处理描述" column="3">
+          <el-descriptions-item label="异常分析" column="3">
             {{ eventItem.handle_desc }}
           </el-descriptions-item>
         </el-descriptions>
@@ -126,7 +121,7 @@
           </el-row>
           <el-row>
             <el-col :span='12'>
-              <el-form-item label="处理描述">
+              <el-form-item label="异常分析">
                 <el-input v-model="form.handle_desc" clearable type="textarea"></el-input>
               </el-form-item>
             </el-col>

From f6770824806f3a92614a131917ac604e765f5148 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 3 Dec 2024 15:21:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20tkx=20=E6=A3=80=E9=AA=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=B8=B4=E6=9C=9F=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment_form.vue | 11 +++++++++--
 src/views/em/equipmentjl.vue    | 30 +++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 0a8d4f8e..2a817c0e 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -193,8 +193,15 @@
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="检定周期(月)">
-                <el-input-number v-model="form.cycle" :precision="1" :min="0" controls-position="right"
-                  style="width: 100%;" placeholder="检定周期（月）" />
+                <el-input-number v-model="form.cycle" :min="0" controls-position="right"
+                
+                  placeholder="检定周期（月）" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="检定临期预警(天)">
+                <el-input-number v-model="form.check_days_number" :min="0" controls-position="right" 
+                  placeholder="临期预警" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index 34cdcdc6..0d6537c4 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -53,9 +53,10 @@
         </el-table-column>
         <el-table-column label="生产厂家" prop="factory" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="检定周期/月" prop="cycle" width="100">
+        <el-table-column label="检定日期" prop="check_date" ></el-table-column>
+        <el-table-column label="检定周期/月" prop="cycle" width="70">
         </el-table-column>
-        <el-table-column label="检定日期" prop="check_date" width="100">
+        <el-table-column label="设备状态" width="70">
           <template #default="scope">
             <el-tag v-if="scope.row.state === 10" type="success">
               {{ state_[scope.row.state] }}
@@ -71,7 +72,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="下次检定日期" prop="next_check_date" width="100">
+        <el-table-column label="下次检定日期" prop="next_check_date" width="70">
         </el-table-column>
         <el-table-column label="精度等级" prop="accuracy_level" show-overflow-tooltip>
         </el-table-column>
@@ -80,6 +81,23 @@
         <el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="更新时间" prop="update_time"></el-table-column>
+        <el-table-column label="临期预警(天)" prop="check_days_number"></el-table-column>
+        <el-table-column label="检定状态" prop="state_measure" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.state_measure === 10" type="success">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state_measure === 20" type="warning">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state_measure === 30" type="danger">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state_measure === 40" type="normal">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
@@ -207,6 +225,12 @@ export default {
         20: 'B',
         30: 'C',
       },
+      state_measure: {
+        10: '正常',
+        20: '临期',
+        30: '过期',
+        40: '待检',
+        },
       options: [
         { id: 10, name: '正常' },
         { id: 20, name: '异常' }