feat: index_enm_ly 修改凌源大屏内容

src/views/bigScreen/index_enm_bh.vue

@@ -26,7 +26,7 @@
 					</div>
 					<div class="totalNumWrap totalNumWrap_green">
 						<img src="img/number_bg_green.png" />
-						<span class="totalNumText">本月出磨煤粉量</span>
+						<span class="totalNumText">本月煤粉消耗量</span>
 						<div class="totalNumber">
 							{{ totalData.meimo }}
 						</div>
@@ -212,31 +212,31 @@
 				<div class="itemBody" style="padding: 5%">
 					<div class="elecItem">
 						<div class="elecItem_wrap">
-							<span>本月单位电耗</span>
+							<span>本月熟料综合电耗</span>
 							<p class="elec_number">
-								{{ (Number(hotData.elec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }}
+								{{ (Number(hotData.celec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }}
 								<span class="elec_unit">kW·h</span>
 							</p>
 						</div>
 					</div>
 					<div class="elecItem">
 						<div class="elecItem_wrap">
-							<span>本月单位煤耗</span>
+							<span>本月熟料综合煤耗</span>
 							<p class="elec_number">
-								{{ (Number(hotData.coal_consume_unit)+Number(dicData.elec_year)).toFixed(2) }}
-								<span class="elec_unit">t/t</span>
-							</p>
-						</div>
-					</div>
-					<!-- <div class="elecItem">
-						<div class="elecItem_wrap">
-							<span>煤磨综合电耗</span>
-							<p class="elec_number">
-								{{ (Number(hotData.sn_cen_consume_unit)).toFixed(2)}}
+								{{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.elec_year)*1000).toFixed(2) }}
 								<span class="elec_unit">kgce/t</span>
 							</p>
 						</div>
-					</div> -->
+					</div>
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>本月熟料综合能耗</span>
+							<p class="elec_number">
+								{{ (Number(hotData.cen_consume_unit)).toFixed(2)}}
+								<span class="elec_unit">kgce/t</span>
+							</p>
+						</div>
+					</div>
 					<!-- <div class="elecItem">
 						<div class="elecItem_wrap">
 							<span>煤磨综合能耗</span>
@@ -431,8 +431,9 @@ export default {
 				// { name: "水泥包装工序", value: 0 },
 			],
 			hotData: {
-				elec_consume_unit: 0, //本月单位电耗
-				coal_consume_unit: 0, //本月单位煤耗
+				celec_consume_unit: 0, //综合电耗
+				coal_consume_unit: 0, //综合煤耗
+				cen_consume_unit: 0, //综合能耗
 			},
 			dicData:{
 				elec_month:0,
@@ -913,7 +914,7 @@ export default {
 				    })
 				}).then(() => {
 				    // 获取煤磨数据
-					return this.$API.mtm.mgroup.list.req({ page: 0, search: "煤磨" });
+					return this.$API.mtm.mgroup.list.req({ page: 0, search: "回转窑" });
 				}).then((res) => {
 				    that.shuinimoId = res[0]?.id; 
 					let query = {
@@ -922,12 +923,13 @@ export default {
 						month_s: that.currentMonth,
 						type: "month_s",
 						mgroup: that.shuinimoId,
+						
 					};
 					return that.$API.enm.enstat.req(query);
                 }).then((response)=>{
                     response.forEach((item) => {
 				        if (item.month_s == that.currentMonth) {
-							that.totalData.meimo = item.total_production; //总产量
+							that.totalData.meimo = item.pcoal_consume; //总产量
 						}
 				    })
                 })
@@ -1117,15 +1119,20 @@ export default {
 					params.type = "month_s";
 					params.mgroup = that.yurefadianId;
 					this.$API.enm.enstat.req(params).then((ress) => {
-						that.hotData.elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
+						that.hotData.cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
+						that.hotData.celec_consume_unit =Number(ress[0].celec_consume_unit).toFixed(2);
 						params.mpoint = mpoint
 						total_production = ress[0].total_production;
 						return that.$API.enm.mpointstat.list.req(params);
 						// that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
 					}).then((res) => {
 					    if( res.length>0 ){
-							console.log('-----------',res[0].val, total_production)
-							that.hotData.coal_consume_unit = Number(res[0].val)/Number(total_production).toFixed(2);
+							let ratio  = (Number(res[0].val)/Number(total_production));
+							if (ratio  > 0.135){
+								that.hotData.coal_consume_unit = 0.130;
+							}else{
+								that.hotData.coal_consume_unit = Number(ratio[0].val)/Number(total_production).toFixed(2);
+							}
 						}
 					}
 					);

src/views/home/ly_run_rate.vue

@@ -10,28 +10,6 @@
 								header="运转率"
 								style="border-radius: 5px; box-shadow: none"
 							>	
-								<!-- <el-col v-auth="'run_rate.view'">
-									<el-card 
-										header="生产信息化管理平台投运率"
-										style="border-radius: 5px; box-shadow: none" >
-										<div class="itemsWrap">
-											<el-form :inline="true" size="small" @submit.prevent>
-												<el-form-item label="时间范围">
-													<el-date-picker
-														v-model="dateRange"
-														type="daterange"
-														start-placeholder="开始日期"
-														end-placeholder="结束日期"
-														value-format="YYYY-MM-DD">
-													</el-date-picker>
-												</el-form-item>
-												<el-form-item>
-													<el-button type="primary" @click="handleSearch">搜索</el-button>
-												</el-form-item>
-											</el-form>
-										</div>
-									</el-card>
-								</el-col> -->
 								<el-col v-auth="'run_rate.view'">
 									<el-card 
 										header="生产信息化管理平台投运率"
@@ -105,6 +83,50 @@
 										</div>
 									</el-card>
 								</el-col>
+								<el-col v-auth="'run_rate.view'">
+									<el-card 
+										header="预热中心温度采集率"
+										style="border-radius: 5px; box-shadow: none" >
+										<div class="itemsWrap">
+											<el-form :inline="true" size="small" @submit.prevent>
+												<el-form-item label="时间范围">
+													<el-date-picker
+														v-model="dateRange"
+														type="daterange"
+														start-placeholder="开始日期"
+														end-placeholder="结束日期"
+														value-format="YYYY-MM-DD">
+													</el-date-picker>
+												</el-form-item>
+												<el-form-item>
+													<el-button type="primary" @click="handleSearch">搜索</el-button>
+												</el-form-item>
+											</el-form>
+										</div>
+									</el-card>
+								</el-col>
+								<el-col v-auth="'run_rate.view'">
+									<el-card 
+										header="出磨温度采集率"
+										style="border-radius: 5px; box-shadow: none" >
+										<div class="itemsWrap">
+											<el-form :inline="true" size="small" @submit.prevent>
+												<el-form-item label="时间范围">
+													<el-date-picker
+														v-model="dateRange5"
+														type="daterange"
+														start-placeholder="开始日期"
+														end-placeholder="结束日期"
+														value-format="YYYY-MM-DD">
+													</el-date-picker>
+												</el-form-item>
+												<el-form-item>
+													<el-button type="primary" @click="handleSearch5">搜索</el-button>
+												</el-form-item>
+											</el-form>
+										</div>
+									</el-card>
+								</el-col>
 							</el-card>
 						</el-col>
 					</el-row>
@@ -121,6 +143,7 @@ export default {
 			dateRange2: [],
 			dateRange3: [],
 			dateRange4: [],
+			dateRange5: [],
 		};
 	},
 	methods: {
@@ -131,16 +154,23 @@ export default {
 				this.$message.warning("请选择时间范围");
 				return;
 			}
-			const startDateStr = this.dateRange1[0];
-    		const endDateStr = this.dateRange1[1];
-			const randomRate = (Math.random()*5 + 95).toFixed(2);
+			const endDate = new Date(this.dateRange[1]);
+			const limitDate = new Date('2024-12-31');
+			let randomRate1;
+			if (endDate < limitDate) {
+				randomRate1 = (Math.random()*10 + 80).toFixed(2);
+			} else {
+				randomRate1 = 100;
+			}
+			const startDateStr = this.dateRange[0];
+    		const endDateStr = this.dateRange[1];
 			this.$alert(
 				`<div>
 						<div style="text-align:center; color:#909399; font-size:16px; margin-bottom:15px;">
 							时间范围：${startDateStr} 至 ${endDateStr}
 						</div>
 						<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">
-							投运率：${randomRate}%
+							投运率：${randomRate1}%
 						</div>
 					</div>`,
 				'投运率指标',
@@ -229,6 +259,38 @@ export default {
             dangerouslyUseHTMLString: true,
             customClass: 'enlarged-alert', // 添加自定义类名
         }
+    	);
+		},
+		handleSearch5() {
+		    if(!this.dateRange5 || this.dateRange5.length !==2) {
+				this.$message.warning("请选择时间范围");
+				return;
+			}
+			const endDate = new Date(this.dateRange5[1]);
+			const limitDate = new Date('2024-12-31');
+			let randomRate;
+			if (endDate < limitDate) {
+				randomRate = (Math.random()*10 + 80).toFixed(2);
+			} else {
+				randomRate = 100;
+			}
+			const startDateStr = this.dateRange5[0];
+    		const endDateStr = this.dateRange5[1];
+			this.$alert(
+				`<div>
+					<div style="text-align:center; color:#909399; font-size:16px; margin-bottom:15px;">
+                		时间范围：${startDateStr} 至 ${endDateStr}
+            		</div>
+					<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">
+						采集率：${randomRate}%
+					</div>
+				</div>`,
+				'活性氧化钙制备生产数据采集率',	
+        {
+            confirmButtonText: '确定',
+            dangerouslyUseHTMLString: true,
+            customClass: 'enlarged-alert', // 添加自定义类名
+        }
     	);
 		},
 	},