From df7bc08f71a657789dc9a78d54d875487f2f012f Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Fri, 22 Dec 2023 16:35:03 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/coreAlarmLog/index.vue         |   2 +-
 src/views/base/coreWorkOrder/detail.vue       | 309 +++++++++++-------
 .../monitoring/equipmentFullParams/index.vue  |  46 ++-
 3 files changed, 219 insertions(+), 138 deletions(-)

diff --git a/src/views/base/coreAlarmLog/index.vue b/src/views/base/coreAlarmLog/index.vue
index 731bb4ab..e9853140 100644
--- a/src/views/base/coreAlarmLog/index.vue
+++ b/src/views/base/coreAlarmLog/index.vue
@@ -90,7 +90,7 @@ export default {
 				{
           type: 'datePicker',
           label: '时间段',
-          dateType: 'datetimerange',
+          dateType: 'daterange',
           format: 'yyyy-MM-dd',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           rangeSeparator: '-',
diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue
index d3859ebf..53d181d1 100644
--- a/src/views/base/coreWorkOrder/detail.vue
+++ b/src/views/base/coreWorkOrder/detail.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-23 18:45:15
+ * @LastEditTime: 2023-12-22 16:02:25
  * @Description:
 -->
 <template>
@@ -12,86 +12,153 @@
 		:wrapper-closable="false"
 		class="drawer"
 		size="50%"> -->
-	<div class="app-container">
+	<div class="container">
 		<!-- <small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title> -->
-		<el-button style="float: right" type="primary" @click="goback()">返回</el-button>
 		<div v-show="workOrderButton.length">
 			<el-button  v-for="(work, index) in workOrderButton" :key="index" type="primary" @click="init(work.id, true)">{{ work.name }}</el-button>
 		</div>
 		<div class="content">
-			<div>
-				<h1>工单编码：{{ dataForm.code }}</h1>
-			</div>
-			<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true">
-					基本信息
-			</small-title>
-			<div class="formContent">
-				<el-row :gutter="20">
-					<el-col :span="8">工单名称:{{ dataForm.name }}</el-col>
-					<el-col :span="8">工单来源:{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}</el-col>
-					<el-col :span="8">所属订单:
-						<span v-for="(item, index) in orderList" :key="index" style="margin-right: 10px">{{ item.orderName }}</span>
-					</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">产品名称:{{ dataForm.productName }}</el-col>
-					<el-col :span="8">规  格:{{ dataForm.specifications }}</el-col>
-					<el-col :span="8">计划生产数量:{{ dataForm.planQuantity }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">预计用时(小时):{{ dataForm.remainingTime }}</el-col>
-					<el-col :span="8">计划投入数量:{{ dataForm.planAssignQuantity }}</el-col>
-					<el-col :span="8">优先级:{{ fitlerP(dataForm.priority) }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">负责人:{{ dataForm.workers }}</el-col>
-					<el-col :span="8">关联产线:
-						<span v-for="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px">{{ item }}</span>
-					</el-col>
-					<el-col :span="8">物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">关联工艺:{{ dataForm.processFlowName }}</el-col>
-				</el-row>
+			<div class="card">
+				<div class="boxTitle">
+					<span class="blueTitle"></span>
+					<span>工单编码：{{ dataForm.code }}</span>
+				</div>
+				<el-button style="float: right" type="primary" size="small" plain @click="goback()">
+					<svg-icon icon-class="return"/>返回
+				</el-button>
+				<div class="formContent">
+					<el-row :gutter="20">
+						<el-col :span="3">
+							<div class="blodTip">工单名称</div>
+							<div class="lightTip">{{ dataForm.name }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">工单来源</div>
+							<div class="lightTip">{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">所属订单</div>
+							<div class="lightTip">
+								<span v-for="(item, index) in orderList" :key="index" style="margin-right: 10px">{{ item.orderName }}</span>
+							</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">产品名称</div>
+							<div class="lightTip">{{ dataForm.productName }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">规  格</div>
+							<div class="lightTip">{{ dataForm.specifications }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">计划生产数量</div>
+							<div class="lightTip">{{ dataForm.planQuantity }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">预计用时(小时)</div>
+							<div class="lightTip">{{ dataForm.remainingTime }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">计划投入数量</div>
+							<div class="lightTip">{{ dataForm.planAssignQuantity }}</div>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="3">
+							<div class="blodTip">优先级</div>
+							<div class="lightTip">{{ fitlerP(dataForm.priority) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">负责人</div>
+							<div class="lightTip">{{ dataForm.workers }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">关联产线</div>
+							<div class="lightTip">
+								<span v-for="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px">{{ item }}</span>
+							</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">物料计算方式</div>
+							<div class="lightTip">{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">关联工艺</div>
+							<div class="lightTip">{{ dataForm.processFlowName }}</div>
+						</el-col>
+					</el-row>
+				</div>
 			</div>
 
-			<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true">
-					生产信息
-			</small-title>
-			<div class="formContent">
-				<el-row :gutter="20">
-					<el-col :span="8">工单创建时间:{{ parseTime(dataForm.createTime) }}</el-col>
-					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
-					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col>
-					<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col>
-					<el-col :span="8">实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col>
-					<el-col :span="8">实际投入数量:{{ dataForm.assignQuantity }}</el-col>
-					<el-col :span="8">实际生产数量:{{ dataForm.actualQuantity }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="8">废片数量:{{ dataForm.nokQuantity }}</el-col>
-					<el-col :span="8">检测瑕疵数:{{ }}</el-col>
-				</el-row>
+			<div class="card">
+				<!-- <small-title
+						style="margin: 16px 0; padding-left: 8px"
+						:no-padding="true">
+						生产信息
+				</small-title> -->
+				<div class="boxTitle">
+					<span class="blueTitle"></span>
+					<span>生产信息</span>
+				</div>
+				<div class="formContent">
+					<el-row :gutter="20">
+						<el-col :span="3">
+							<div class="blodTip">工单创建时间</div>
+							<div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">计划开始时间</div>
+							<div class="lightTip">{{ parseTime(dataForm.planStartTime) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">计划完成时间</div>
+							<div class="lightTip">{{ parseTime(dataForm.planFinishTime) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">预计结束时间</div>
+							<div class="lightTip">{{ parseTime(dataForm.computeFinishTime) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">实际开始时间</div>
+							<div class="lightTip">{{ parseTime(dataForm.startProduceTime) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">实际完成时间</div>
+							<div class="lightTip">{{ parseTime(dataForm.finishProduceTime) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">工单状态</div>
+							<div class="lightTip">{{ fitlerS(dataForm.status) }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">实际投入数量</div>
+							<div class="lightTip">{{ dataForm.assignQuantity }}</div>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="3">
+							<div class="blodTip">实际生产数量</div>
+							<div class="lightTip">{{ dataForm.actualQuantity }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">废片数量</div>
+							<div class="lightTip">{{ dataForm.nokQuantity }}</div>
+						</el-col>
+						<el-col :span="3">
+							<div class="blodTip">检测瑕疵数</div>
+							<div class="lightTip">{{ }}</div>
+						</el-col>
+					</el-row>
+				</div>
 			</div>
 
-			<div class="attr-list">
-				<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true">
-					订单相关信息
-				</small-title>
+			<div class="card" style="padding-bottom: 16px; margin-bottom: 10px">
+				<div class="boxTitle">
+					<span class="blueTitle"></span>
+					<span>订单相关信息</span>
+				</div>
 				<base-table
 					:table-props="tableProps"
 					:page="listQuery.pageNo"
@@ -114,12 +181,11 @@
 					@pagination="getList" /> -->
 			</div>
 
-			<div class="attr-list">
-				<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true">
-					预计用料信息
-				</small-title>
+			<div class="card" style="padding-bottom: 16px;">
+				<div class="boxTitle">
+					<span class="blueTitle"></span>
+					<span>预计用料信息</span>
+				</div>
 				<base-table
 					:table-props="tableProps1"
 					:page="listQuery1.pageNo"
@@ -228,7 +294,8 @@ export default {
 			visible: false,
 			isdetail: false,
 			workOrderButton: [],
-			processFlowList: []
+			processFlowList: [],
+			// tableH: this.tableHeight(510) / 2
 		};
 	},
 	created() {
@@ -391,59 +458,12 @@ export default {
 };
 </script>
 <style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-}
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .content {
-	padding: 10px 24px;
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	/* height: 100%; */
-}
-
-.drawer >>> .visual-part {
-	flex: 1 auto;
-	max-height: 76vh;
-	overflow: hidden;
-	overflow-y: scroll;
-	padding-right: 10px; /* 调整滚动条样式 */
-}
-
-.drawer >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
 .formContent {
 	font-size: 16px;
 	line-height: 1.5;
 	margin-bottom: 10px;
 	width: 100%;
+	padding: 0 14px;
 }
 .action_btn {
   float: right;
@@ -453,4 +473,43 @@ export default {
 .add {
 	color: #0b58ff;
 }
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
+.container {
+	background-color: rgb(242, 244, 249);
+}
+.card {
+	padding: 16px 16px 0 16px;
+	background-color: #fff;
+  border-radius: 9px;
+}
+.boxTitle {
+	display: inline-block;
+	font-size: 16px;
+	font-weight: 400;
+	color: #000000;
+	margin:0 10px 20px 0;
+}
+.blueTitle {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 18px;
+	background-color: #0B58FF;
+	border-radius: 1px;
+	margin-right: 8px;
+	vertical-align: bottom;
+}
 </style>
diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index 463c788c..0601cd16 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -44,6 +44,7 @@ import { Message } from 'element-ui';
 import LocalDataManager from './utils/local-data-manager';
 // import response from './response';
 import moment from 'moment';
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
 	name: 'EquipmentFullParams',
@@ -51,9 +52,9 @@ export default {
 	props: {},
 	data() {
 		const now = new Date();
-		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
-		const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
-		const aWeekAgo = today - 3600 * 1000 * 24 * 7;
+		// const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
+		const today = new Date().getTime();
+		const tenminAgo = today - (10 * 60 * 1000);
 		return {
 			searchBarFormConfig: [
 				{
@@ -73,7 +74,7 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间段',
-					dateType: 'daterange', // datetimerange
+					dateType: 'datetimerange', // datetimerange
 					format: 'yyyy-MM-dd HH:mm:ss',
 					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'timestamp',
@@ -94,13 +95,19 @@ export default {
 			],
 			queryParams: {
 				id: null,
-				time: [new Date(aWeekAgo), new Date(today)],
+				time: [tenminAgo, today],
 			},
 			tableList: [
 				// {
 				// 	key: 'base-table__key__1',
-				// 	tableProps: [],
-				// 	list: [],
+				// 	tableProps: [{
+				// 		prop: 'name',
+				// 		label: 'name'
+				// 	}],
+				// 	dataManager: {dataList: [{name: '1'}]},
+				// 	list: [{
+				// 		name: '11'
+				// 	}],
 				// 	pageNo: 1,
 				// 	pageSize: 3,
 				// 	total: 0,
@@ -122,6 +129,11 @@ export default {
 					'defaultSelect',
 					to.params.equipmentCode
 				);
+				vm.$set(
+					vm.searchBarFormConfig[2],
+					'defaultSelect',
+					vm.queryParams.time
+				);
 				vm.handleQuery();
 			});
 		} else {
@@ -268,11 +280,17 @@ export default {
 
 		async handleSearchBarBtnClick({ btnName, timeVal }) {
 			if (timeVal && timeVal.length > 0) {
-				this.queryParams.time = timeVal;
+				if (timeVal[1] - timeVal[0] <= 10 * 60 * 1000) {
+					this.queryParams.time = timeVal;
+					await this.handleQuery();
+				} else {
+					this.$message.warning('时间范围最大一小时限制！')
+				}
 			} else {
 				this.queryParams.time = [];
+				this.$message.warning('时间段必选！')
 			}
-			await this.handleQuery();
+			
 		},
 
 		handleEmitFun(table, val) {
@@ -295,9 +313,12 @@ export default {
 }
 
 .tables {
-	display: grid;
-	grid-template-columns: 1fr 1fr;
-	gap: 18px;
+	/* display: grid; */
+	/* grid-template-columns: 1fr 1fr; */
+	/* gap: 18px; */
+	display: flex;
+	flex-direction: column;
+	width: 100%;
 }
 
 .tables >>> .baseTable {
@@ -306,5 +327,6 @@ export default {
 
 .custom-table {
 	overflow-x: hidden;
+	margin-bottom: 10px;
 }
 </style>

From a8ca7c37f202af5bca274085f018b0062235dc8e Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Thu, 28 Dec 2023 09:02:31 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/coreWorkOrder/detail.vue       | 62 +++++++++++++++++--
 .../core/analysis/balanceAnalysis/index.vue   |  2 +-
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue
index 53d181d1..36111c47 100644
--- a/src/views/base/coreWorkOrder/detail.vue
+++ b/src/views/base/coreWorkOrder/detail.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-12-22 16:02:25
+ * @LastEditTime: 2023-12-26 16:59:25
  * @Description:
 -->
 <template>
@@ -16,8 +16,17 @@
 		<!-- <small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title> -->
-		<div v-show="workOrderButton.length">
-			<el-button  v-for="(work, index) in workOrderButton" :key="index" type="primary" @click="init(work.id, true)">{{ work.name }}</el-button>
+		<div v-show="workOrderButton.length" class="buttonDiv">
+			<div style="display: flex; width: 100%;">
+				<el-button v-show="showScroll" type="text" style="width: 30px; background: white; margin-right: 8px" @click="scrollLeft" icon="el-icon-caret-left"></el-button>
+				<div ref="content" class="scrollDiv">
+					<el-button style="border: none" v-for="(work, index) in workOrderButton" :key="index" @click="init(work.id, true)">{{ work.name }}</el-button>
+				</div>
+				<el-button v-show="showScroll" type="text" @click="scrolRight" style="width: 30px; background: white; margin-left: 8px" icon="el-icon-caret-right"></el-button>
+				<el-button style="float: right" type="primary" size="small" plain @click="goback()">
+					<svg-icon icon-class="return"/>返回
+				</el-button>
+			</div>
 		</div>
 		<div class="content">
 			<div class="card">
@@ -25,7 +34,7 @@
 					<span class="blueTitle"></span>
 					<span>工单编码：{{ dataForm.code }}</span>
 				</div>
-				<el-button style="float: right" type="primary" size="small" plain @click="goback()">
+				<el-button v-if="!workOrderButton.length" style="float: right" type="primary" size="small" plain @click="goback()">
 					<svg-icon icon-class="return"/>返回
 				</el-button>
 				<div class="formContent">
@@ -293,8 +302,10 @@ export default {
 			// orderArray: [],
 			visible: false,
 			isdetail: false,
+			showScroll: false,
 			workOrderButton: [],
 			processFlowList: [],
+			timer: null
 			// tableH: this.tableHeight(510) / 2
 		};
 	},
@@ -311,13 +322,38 @@ export default {
 						name: work.name
 					}
 				})
+				const contentRef = this.$refs.content
+				if (contentRef.scrollWidth > contentRef.clientWidth) {
+					this.showScroll = true
+				} else {
+					this.showScroll = false
+				}
+				console.log(contentRef.scrollWidth, contentRef.clientWidth)
 				this.init(this.workOrderButton[0].id, true)
 			})
-		}  else {
+		} else {
 			this.init(this.$route.query.id, true)
 		}
 	},
 	methods: {
+		scrolRight() {
+			// let contentRef = this.$refs.content
+			// console.log('你好啊啊', contentRef.scrollWidth, contentRef.clientWidth)
+			this.stopScroll()
+			this.timer = setTimeout(() => {
+				this.$refs.content.scrollLeft += 50
+			}, 100)
+			// if (contentRef.scrollWidth > contentRef.clientWi)
+		},
+		scrollLeft() {
+			this.stopScroll()
+			this.timer = setTimeout(() => {
+				this.$refs.content.scrollLeft -= 50
+			}, 100)
+		},
+		stopScroll() {
+			clearTimeout(this.timer)
+		},
 		getDict() {
 			// 工艺
       getProcessFlowList().then(res => {
@@ -458,6 +494,20 @@ export default {
 };
 </script>
 <style scoped>
+.scrollDiv {
+	width: 100%;
+	overflow-x: hidden;
+	/* height: 50px; */
+	display: flex;
+	/* padding-bottom: -10px; */
+}
+.scrollDiv::-webkit-scrollbar-track {
+	display: none;
+}
+.buttonDiv {
+	margin-bottom: 8px;
+	display: flex;
+}
 .formContent {
 	font-size: 16px;
 	line-height: 1.5;
@@ -481,7 +531,7 @@ export default {
 	margin-bottom: 8px;
 }
 .lightTip {
-	height: 16px;
+	/* height: 16px; */
 	font-size: 14px;
 	font-weight: 400;
 	color: rgba(102,102,102,0.75);
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index a4877d42..ac203453 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -84,7 +84,7 @@ export default {
 					label: '时间',
 					dateType: 'monthrange',
 					format: 'yyyy-MM',
-					valueFormat: 'yyyy-MM-ddTHH:mm:ss',
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',

From 41e1f46cfcedd1d85b69a874d49285c7db38db13 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 28 Dec 2023 16:16:25 +0800
Subject: [PATCH 03/11] 1

---
 src/assets/icons/svg/fullScreenView.svg      |  12 ++
 src/assets/icons/svg/fullscreen.svg          |   1 -
 src/assets/icons/svg/unFullScreenView.svg    |  10 +
 src/store/getters.js                         |   5 +-
 src/store/index.js                           |   4 +-
 src/store/modules/websocket.js               |  26 +++
 src/views/databoard/assets/check.png         | Bin 0 -> 492 bytes
 src/views/databoard/assets/energeCost.png    | Bin 0 -> 322 bytes
 src/views/databoard/assets/msg.png           | Bin 0 -> 507 bytes
 src/views/databoard/components/Container.vue |  10 +-
 src/views/databoard/components/GasChart.vue  |   7 +-
 src/views/databoard/components/Header.vue    |  94 +++++----
 src/views/databoard/components/ISRAChart.vue |  20 +-
 src/views/databoard/components/Switcher.vue  |   4 +-
 src/views/databoard/kiln/EnergeCost.vue      |  18 +-
 src/views/databoard/kiln/EnergeTop.vue       |   1 +
 src/views/databoard/kiln/FanSequence.vue     |  32 +--
 src/views/databoard/kiln/GasHandle.vue       |  34 ++--
 src/views/databoard/kiln/IsraCheck.vue       |   7 +-
 src/views/databoard/kiln/KilnInfo.vue        |  71 ++++---
 src/views/databoard/kiln/LeftFour.vue        |   2 +-
 src/views/databoard/kiln/MaterialCost.vue    |   4 +-
 src/views/databoard/kiln/RightTwo.vue        |   8 +-
 src/views/databoard/kiln/index.vue           | 164 ++++++++++++---
 src/views/databoard/mixins/resize.js         |  55 +++++
 src/views/databoard/utils/dcs.js             |  34 ++++
 src/views/databoard/utils/mes.js             |  34 ++++
 src/views/databoard/utils/websocket.js       | 204 +++++++++++++++++++
 28 files changed, 704 insertions(+), 157 deletions(-)
 create mode 100644 src/assets/icons/svg/fullScreenView.svg
 delete mode 100644 src/assets/icons/svg/fullscreen.svg
 create mode 100644 src/assets/icons/svg/unFullScreenView.svg
 create mode 100644 src/store/modules/websocket.js
 create mode 100644 src/views/databoard/assets/check.png
 create mode 100644 src/views/databoard/assets/energeCost.png
 create mode 100644 src/views/databoard/assets/msg.png
 create mode 100644 src/views/databoard/mixins/resize.js
 create mode 100644 src/views/databoard/utils/dcs.js
 create mode 100644 src/views/databoard/utils/mes.js
 create mode 100644 src/views/databoard/utils/websocket.js

diff --git a/src/assets/icons/svg/fullScreenView.svg b/src/assets/icons/svg/fullScreenView.svg
new file mode 100644
index 00000000..8b1bceb6
--- /dev/null
+++ b/src/assets/icons/svg/fullScreenView.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 54</title>
+    <g id="驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="运营总览_生产线监控驾驶舱" transform="translate(-1866.000000, -36.000000)">
+            <g id="编组-54" transform="translate(1866.000000, 36.000000)">
+                <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="21" height="21"></rect>
+                <path d="M18.4001211,1 L18.574731,1.00571398 C18.8641421,1.02474925 19.1451559,1.09128771 19.4122178,1.20447947 C19.7221027,1.33395436 19.9991094,1.52058631 20.2392616,1.76073844 C20.4776764,1.99915325 20.6652172,2.27804627 20.7953442,2.58736464 C20.9313506,2.90825642 21,3.24882158 21,3.59987893 L21,3.59987893 L21,18.4001211 L20.994286,18.574731 C20.9752507,18.8641421 20.9087123,19.1451559 20.7955205,19.4122178 C20.6660456,19.7221027 20.4794137,19.9991094 20.2392616,20.2392616 C20.0008468,20.4776764 19.7219537,20.6652172 19.4126354,20.7953442 C19.0917436,20.9313506 18.7511784,21 18.4001211,21 L18.4001211,21 L3.59987893,21 L3.42526905,20.994286 C3.13585794,20.9752507 2.85484405,20.9087123 2.58778224,20.7955205 C2.2778973,20.6660456 2.00089057,20.4794137 1.76073844,20.2392616 C1.52232363,20.0008468 1.33478285,19.7219537 1.20465581,19.4126354 C1.06864936,19.0917436 1,18.7511784 1,18.4001211 L1,18.4001211 L1,3.59987893 L1.00571398,3.42526905 C1.02474925,3.13585794 1.09128771,2.85484405 1.20447947,2.58778224 C1.33395436,2.2778973 1.52058631,2.00089057 1.76073844,1.76073844 C1.99915325,1.52232363 2.27804627,1.33478285 2.58736464,1.20465581 C2.90825642,1.06864936 3.24882158,1 3.59987893,1 L3.59987893,1 L18.4001211,1 Z M18.4001211,2.29539952 L3.59987893,2.29539952 L3.49797651,2.2993263 C2.82542992,2.35136056 2.29539952,2.9140495 2.29539952,3.59987893 L2.29539952,3.59987893 L2.29539952,18.4001211 L2.2993263,18.5020235 C2.35136056,19.1745701 2.9140495,19.7046005 3.59987893,19.7046005 L3.59987893,19.7046005 L18.4001211,19.7046005 L18.5020235,19.7006737 C19.1745701,19.6486394 19.7046005,19.0859505 19.7046005,18.4001211 L19.7046005,18.4001211 L19.7046005,3.59987893 L19.7006737,3.49797651 C19.6486394,2.82542992 19.0859505,2.29539952 18.4001211,2.29539952 L18.4001211,2.29539952 Z M4.56580299,11.8731508 L4.63987359,11.8789244 C4.95620444,11.9219442 5.20096852,12.1943435 5.20096852,12.5208838 L5.20096852,12.5208838 L5.20096852,15.8606113 L8.39814764,12.6634321 L8.45892035,12.6098356 C8.71226443,12.4133149 9.08161636,12.4311804 9.3138681,12.6634321 C9.56547415,12.9150382 9.56547415,13.3275466 9.3138681,13.5791526 L9.3138681,13.5791526 L6.09149511,16.7990315 L9.4155569,16.7990315 L9.49368756,16.8035151 C9.82695229,16.8420028 10.0864105,17.123441 10.081435,17.4601165 C10.0742517,17.8119637 9.78624591,18.094431 9.43371671,18.094431 L9.43371671,18.094431 L4.5691586,18.094431 L4.49163938,18.0899766 C4.16113157,18.051728 3.90556901,17.7718105 3.90556901,17.4308414 L3.90556901,17.4308414 L3.90556901,12.5367736 L3.91007171,12.4587841 C3.94871707,12.1260764 4.23118526,11.8665247 4.56580299,11.8731508 L4.56580299,11.8731508 Z M17.4353814,3.90556901 L17.512257,3.91000958 C17.8400885,3.94813523 18.094431,4.22707005 18.094431,4.56461864 L18.094431,4.56461864 L18.094431,9.46095642 L18.0899283,9.53894589 C18.0512829,9.87165361 17.7688147,10.1312053 17.434197,10.1245792 C17.0828999,10.1173731 16.7990315,9.82850504 16.7990315,9.47684625 L16.7990315,9.47684625 L16.7990315,6.13938874 L13.6018524,9.33656786 L13.5410796,9.39016441 C13.2877356,9.58668512 12.9183836,9.5688196 12.6861319,9.33656786 C12.4345258,9.08496181 12.4345258,8.67245345 12.6861319,8.4208474 L12.6861319,8.4208474 L15.9060108,5.20096852 L12.5821731,5.20096852 L12.5040246,5.19648608 C12.170734,5.1580095 11.9119308,4.876675 11.9185506,4.54071802 C11.9257483,4.18803625 12.2137541,3.90556901 12.5662833,3.90556901 L12.5662833,3.90556901 L17.4353814,3.90556901 Z" id="形状结合" fill="#52FFF1" fill-rule="nonzero" opacity="0.79078311"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/fullscreen.svg b/src/assets/icons/svg/fullscreen.svg
deleted file mode 100644
index 0e86b6fa..00000000
--- a/src/assets/icons/svg/fullscreen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M38.47 52L52 38.462l-23.648-23.67L43.209 0H.035L0 43.137l14.757-14.865L38.47 52zm74.773 47.726L89.526 76 76 89.536l23.648 23.672L84.795 128h43.174L128 84.863l-14.757 14.863zM89.538 52l23.668-23.648L128 43.207V.038L84.866 0 99.73 14.76 76 38.472 89.538 52zM38.46 76L14.792 99.651 0 84.794v43.173l43.137.033-14.865-14.757L52 89.53 38.46 76z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/unFullScreenView.svg b/src/assets/icons/svg/unFullScreenView.svg
new file mode 100644
index 00000000..5454a880
--- /dev/null
+++ b/src/assets/icons/svg/unFullScreenView.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 54备份</title>
+    <g id="驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-54备份">
+            <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="21" height="21"></rect>
+            <path d="M18.4001211,1 L18.574731,1.00571398 C18.8641421,1.02474925 19.1451559,1.09128771 19.4122178,1.20447947 C19.7221027,1.33395436 19.9991094,1.52058631 20.2392616,1.76073844 C20.4776764,1.99915325 20.6652172,2.27804627 20.7953442,2.58736464 C20.9313506,2.90825642 21,3.24882158 21,3.59987893 L21,3.59987893 L21,18.4001211 L20.994286,18.574731 C20.9752507,18.8641421 20.9087123,19.1451559 20.7955205,19.4122178 C20.6660456,19.7221027 20.4794137,19.9991094 20.2392616,20.2392616 C20.0008468,20.4776764 19.7219537,20.6652172 19.4126354,20.7953442 C19.0917436,20.9313506 18.7511784,21 18.4001211,21 L18.4001211,21 L3.59987893,21 L3.42526905,20.994286 C3.13585794,20.9752507 2.85484405,20.9087123 2.58778224,20.7955205 C2.2778973,20.6660456 2.00089057,20.4794137 1.76073844,20.2392616 C1.52232363,20.0008468 1.33478285,19.7219537 1.20465581,19.4126354 C1.06864936,19.0917436 1,18.7511784 1,18.4001211 L1,18.4001211 L1,3.59987893 L1.00571398,3.42526905 C1.02474925,3.13585794 1.09128771,2.85484405 1.20447947,2.58778224 C1.33395436,2.2778973 1.52058631,2.00089057 1.76073844,1.76073844 C1.99915325,1.52232363 2.27804627,1.33478285 2.58736464,1.20465581 C2.90825642,1.06864936 3.24882158,1 3.59987893,1 L3.59987893,1 L18.4001211,1 Z M18.4001211,2.29539952 L3.59987893,2.29539952 L3.49797651,2.2993263 C2.82542992,2.35136056 2.29539952,2.9140495 2.29539952,3.59987893 L2.29539952,3.59987893 L2.29539952,18.4001211 L2.2993263,18.5020235 C2.35136056,19.1745701 2.9140495,19.7046005 3.59987893,19.7046005 L3.59987893,19.7046005 L18.4001211,19.7046005 L18.5020235,19.7006737 C19.1745701,19.6486394 19.7046005,19.0859505 19.7046005,18.4001211 L19.7046005,18.4001211 L19.7046005,3.59987893 L19.7006737,3.49797651 C19.6486394,2.82542992 19.0859505,2.29539952 18.4001211,2.29539952 L18.4001211,2.29539952 Z M9.43538136,11.905569 L9.512257,11.9100096 C9.84008849,11.9481352 10.094431,12.2270701 10.094431,12.5646186 L10.094431,12.5646186 L10.094431,17.4609564 L10.0899283,17.5389459 C10.0512829,17.8716536 9.76881474,18.1312053 9.43419701,18.1245792 C9.08289988,18.1173731 8.79903148,17.828505 8.79903148,17.4768462 L8.79903148,17.4768462 L8.79903148,14.1393887 L5.60185236,17.3365679 L5.54107965,17.3901644 C5.28773557,17.5866851 4.91838364,17.5688196 4.6861319,17.3365679 C4.43452585,17.0849618 4.43452585,16.6724534 4.6861319,16.4208474 L4.6861319,16.4208474 L7.90601077,13.2009685 L4.58217312,13.2009685 L4.50402457,13.1964861 C4.17073404,13.1580095 3.9119308,12.876675 3.91855064,12.540718 C3.92574827,12.1880363 4.21375409,11.905569 4.56628329,11.905569 L4.56628329,11.905569 L9.43538136,11.905569 Z M12.565803,3.8731508 L12.6398736,3.87892442 C12.9562044,3.92194416 13.2009685,4.19434347 13.2009685,4.52088378 L13.2009685,4.52088378 L13.2009685,7.86061126 L16.3981476,4.66343214 L16.4589204,4.60983559 C16.7122644,4.41331488 17.0816164,4.4311804 17.3138681,4.66343214 C17.5654742,4.91503819 17.5654742,5.32754655 17.3138681,5.5791526 L17.3138681,5.5791526 L14.0914951,8.79903148 L17.4155569,8.79903148 L17.4936876,8.80351509 C17.8269523,8.84200281 18.0864105,9.12344101 18.081435,9.46011654 C18.0742517,9.81196375 17.7862459,10.094431 17.4337167,10.094431 L17.4337167,10.094431 L12.5691586,10.094431 L12.4916394,10.0899766 C12.1611316,10.051728 11.905569,9.77181051 11.905569,9.4308414 L11.905569,9.4308414 L11.905569,4.53677361 L11.9100717,4.45878413 C11.9487171,4.12607641 12.2311853,3.86652471 12.565803,3.8731508 L12.565803,3.8731508 Z" id="形状结合" fill="#52FFF1" fill-rule="nonzero" opacity="0.79078311"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/store/getters.js b/src/store/getters.js
index 16103f89..1f08b7bd 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,6 +19,9 @@ const getters = {
   sidebarRouters:state => state.permission.sidebarRouters,
   choicepart: state => state.app.choicepart,
   // 数据字典
-  dict_datas: state => state.dict.dictDatas
+  dict_datas: state => state.dict.dictDatas,
+  //ws
+  fanFrequencyInfo: state => state.websocket.FanFrequencyInfo,
+  kilnInfo: state => state.websocket.kilnInfo,
 }
 export default getters
diff --git a/src/store/index.js b/src/store/index.js
index 116d6d68..7f8369bb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,6 +6,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import dict from './modules/dict'
+import websocket from './modules/websocket'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -17,7 +18,8 @@ const store = new Vuex.Store({
     tagsView,
     permission,
     settings,
-    dict
+    dict,
+    websocket
   },
   getters
 })
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
new file mode 100644
index 00000000..3191b86e
--- /dev/null
+++ b/src/store/modules/websocket.js
@@ -0,0 +1,26 @@
+const state = {
+  fanFrequencyInfo:{},
+  kilnInfo:{}
+};
+const mutations = {
+  SET_FANFREQUENCYINFO: (state, fanFrequencyInfo) => {
+    state.fanFrequencyInfo = fanFrequencyInfo
+  },
+  SET_KILNINFO: (state, kilnInfo) => {
+    state.kilnInfo = kilnInfo
+  }
+};
+const actions = {
+  setFanFrequencyInfo({ commit }, fanFrequencyInfo) {
+    commit('SET_FANFREQUENCYINFO', fanFrequencyInfo.payload)
+  },
+  setKilnInfo({ commit }, kilnInfo) {
+    commit('SET_KILNINFO', kilnInfo.payload)
+  }
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+}
diff --git a/src/views/databoard/assets/check.png b/src/views/databoard/assets/check.png
new file mode 100644
index 0000000000000000000000000000000000000000..8793b99a833f7d73c4792ed9022d9746c2f12457
GIT binary patch
literal 492
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAZ4B@UaRt&0|Nl4q{~x;Qzvu1S
zQI{S@o_Q8|`Ci1iN1<n)0lDFqAH|$~9CiM2%*ChC=N?9%e;9S)N!0mAk>?*pU3eUM
z;bG*3M-dku0U2QOaTJhy5vU$0{xAZl2B;FO03;4ke-W$;ECm#d1PMNhya+M@$c_Rr
zAP8hK8u|}(>Z7H$KsQ^K1o;IsFfuW-3yO$K$tfwTsH$sOJNgF%g(W7XXXMt_H#D|(
z_e`ELbIGbT8@KJ;d-(ME2M^!9|MdCW_aFa$FPY{KG=wq9+ug;=kMqbcAZLlEi(`n!
z`MH;_3pE)CuwG!<*wiJvJBcSLJm=?sd1J=OiF2Q}*6!MzZkFrh@$uDKc9GZqtpeUW
zc|z|_bm)fMTo8V%;M`#rr<qLN&Dsf;QnTtGWEFfm5arsh<FhMtbNyegv`2jt4P)M>
zEZ~2bl)#=iv25=}yW73n4u8qanm_09KfNC|$2DZMm((0spc~9xIcfW?{(T`i84HS!
j&6w{Jzf4m1hxxu0zfE`-9JO8rbT5OatDnm{r-UW|FxLAd

literal 0
HcmV?d00001

diff --git a/src/views/databoard/assets/energeCost.png b/src/views/databoard/assets/energeCost.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6b5ac66d42e3f75c54712326113b7c161d7ca4
GIT binary patch
literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA<plVIxB}_WRsS9K{|~+JIO@{F
zsB5nxFWry6{y6IVlZXosfFhBXo`jvd7kTM%#Q6siKs7*g@loW3M-f2s;=_mwkD|^$
z0t!Z6cnA^%F+j2)1XczmFFgAH|NrEb7bgSlQz{Aa3ua(ukycXG&^0hLwzRYN4h)JY
zE~#wlo;Yd7%ysLx@7{ml*T+NsY(UkFN#5=*%34V|RzOaer;B5V#`)v~i7W?)ATC}G
z<EA4sMQ`k=oXE((dWV8XlebR@r|5~#oX#pwE~tq7Oqo&Op;0(NOYtnnGy%uS6Ivtq
tO7yJNxe_KaSWj=1Kiurp<E%H0p*%+9`25eNtw0+XJYD@<);T3K0RS$jjNSkM

literal 0
HcmV?d00001

diff --git a/src/views/databoard/assets/msg.png b/src/views/databoard/assets/msg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2100324a2655aff6a4429d65612a260847621107
GIT binary patch
literal 507
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA?F#S-aRt&0|NlGe{~vnnap={@
zaVMWdUcMJ|=0WI%$I%y`L|lFvb?IUF<wr3WpN3z424qK^dlYryNz}QA5f>guUVI#N
z{$b<=Ao~%J4Psn;6nP#f{xI_VBai}+_#>b=m;^J<14%Ffi31gY)j&i*BuFDv0fc)2
zXdSW$l>Ptze}$i1AYa&&1o;IsFtTt835!cg%g8Dzt7{sYIJyJ|hlYixq?eRdw$0qW
zd*6XG=PzEmeC_&!r_Y|hc=_h-yN{o~eEs(Q=kI^I;_DXz&0$RPc6YJ8kQ*2Y<Sh4e
zaSYKopPZn;-tpqr0tQ>d4vWPLd8G`}n7j>cCoqKVXqh>wX_25AC!-l3pI)#uXI))g
zV73Y;H=C}sw4bSTWME*RWQy#w1kO;O#R^tea+kEUw5SBW5qR?K>C?>{CLWuxAt*R(
z<AG;dbN)@3-ptIJ!kMk-a^mBH7aL5Pn7u_fb5kuYI2v}bCW=^h@$s@+Tu^xv<HlT4
nDD2^4$nknX*X!=dQ=J$x*Et=rxw~En=wt>@S3j3^P6<r_wk7q~

literal 0
HcmV?d00001

diff --git a/src/views/databoard/components/Container.vue b/src/views/databoard/components/Container.vue
index e7985f05..36a8742e 100644
--- a/src/views/databoard/components/Container.vue
+++ b/src/views/databoard/components/Container.vue
@@ -11,12 +11,12 @@
 			<i
 				class=""
 				style="display: inline-block; margin-left: 12px; padding-top: 4px">
-				<img :src="imgSrc" width="18" height="16" alt="" />
+				<img :src="imgSrc" width="20" height="20" alt="" />
 			</i>
 			<span
 				style="
 					color: #fff;
-					font-size: 20px;
+					font-size: 24px;
 					line-height: 2;
 					margin-left: 6px;
 					display: inline-block;
@@ -48,11 +48,11 @@ export default {
 				case '风机运行频率':
 					return require('../assets/flow.png');
 				case 'ISRA缺陷检测':
-					return require('../assets/gas.png');
+					return require('../assets/check.png');
 				case '能耗':
-					return require('../assets/gas.png');
+					return require('../assets/energeCost.png');
 				case '窑炉信息':
-					return require('../assets/gas.png');
+					return require('../assets/msg.png');
 				case '烟气处理':
 					return require('../assets/gas.png');
 			}
diff --git a/src/views/databoard/components/GasChart.vue b/src/views/databoard/components/GasChart.vue
index 3fec8ab3..366c7b10 100644
--- a/src/views/databoard/components/GasChart.vue
+++ b/src/views/databoard/components/GasChart.vue
@@ -11,9 +11,11 @@
 
 <script>
 import * as echarts from 'echarts';
+import resize from './../mixins/resize'
 
 export default {
 	name: 'GasChart',
+	mixins: [resize],
 	components: {},
 	props: {},
 	data() {
@@ -110,7 +112,6 @@ export default {
 			},
 		};
 	},
-	inject: ['resizeChart'],
 	computed: {
 		sidebarStatus() {
 			return this.$store.state.app.sidebar.opened;
@@ -126,10 +127,6 @@ export default {
 				this.chart.setOption(this.option);
 			}, 500);
 		},
-		// resizeChart(val) {
-		// 	console.log('resizeChart', val);
-		// 	val && this.chart && this.chart.resize();
-		// },
 	},
 	mounted() {
 		this.$el.addEventListener('resize', () => {
diff --git a/src/views/databoard/components/Header.vue b/src/views/databoard/components/Header.vue
index ee87ff79..8ac700cc 100644
--- a/src/views/databoard/components/Header.vue
+++ b/src/views/databoard/components/Header.vue
@@ -7,69 +7,93 @@
 
 <template>
 	<header class="kiln-header">
-		<h1
-			style="
-				font-size: 32px;
-				margin-bottom: 36px;
-				color: #0ee8e4;
-				letter-spacing: 5px;
-			">
+		<h1>
 			窑炉生产运行驾驶舱
 		</h1>
 		<!-- left: 312px; -->
 		<div
-			class="firm"
-			style="
-				position: absolute;
-				bottom: 24px;
-				left: 16.5vw;
-				color: #fff;
-				font-size: 16px;
-				letter-spacing: 1px;
-			">
+			class="firm">
 			单位: 河南汇融科技服务有限公司
 		</div>
 		<div
-			class="datetime"
-			style="
-				position: absolute;
-				bottom: 18px;
-				right: 15.5vw;
-				color: #fff;
-				font-size: 16px;
-				letter-spacing: 1px;
-                display: flex;
-                align-items: center;
-                gap: 16px;
-			">
-			<DateBtnGroup />
+			class="datetime">
+			<!-- <DateBtnGroup /> -->
 			{{ new Date().toLocaleString() }}
 		</div>
+		<el-button
+			type="text"
+			class="screen-btn"
+			@click="changeFullScreen"
+		>
+			<svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
+			<svg-icon v-else icon-class="fullScreenView" />
+		</el-button>
 	</header>
 </template>
 
 <script>
-import DateBtnGroup from './DateBtnGroup.vue';
+// import DateBtnGroup from './DateBtnGroup.vue';
+
 export default {
 	name: 'KilnHeader',
-	components: { DateBtnGroup },
-	props: {},
+	// components: { DateBtnGroup },
+	props: {
+		isFullScreen:false
+	},
 	data() {
-		return {};
+		return {
+			
+		};
 	},
 	computed: {},
-	methods: {},
+	methods: {
+    changeFullScreen() {
+			this.$emit('screenfullChange')
+		}
+	},
 };
 </script>
 
 <style scoped lang="scss">
 .kiln-header {
 	background: url('../assets/head.png') no-repeat;
-	height: 88px;
+	height: 96px;
 	background-size: 100%;
 	background-position: 0 0;
 	display: grid;
 	place-content: center;
 	position: relative;
+	h1{
+		font-size: 32px;
+		margin-bottom: 36px;
+		color: #0ee8e4;
+		letter-spacing: 8px;
+	}
+	.firm{
+		position: absolute;
+		top: 45px;
+		left: 325px;
+		color: #fff;
+		font-size: 20px;
+		letter-spacing: 1px;
+	}
+	.datetime {
+		position: absolute;
+		top: 45px;
+		right: 240px;
+		color: #fff;
+		font-size: 20px;
+		letter-spacing: 1px;
+		display: flex;
+		align-items: center;
+		gap: 16px;
+	}
+	.screen-btn{
+		color: #00fff0;
+		font-size: 32px;
+		position: absolute;
+		right: 32px;
+		top:28px
+	}
 }
 </style>
diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue
index f57f84de..2f8baf7c 100644
--- a/src/views/databoard/components/ISRAChart.vue
+++ b/src/views/databoard/components/ISRAChart.vue
@@ -11,9 +11,11 @@
 
 <script>
 import * as echarts from 'echarts';
+import resize from './../mixins/resize'
 
 export default {
 	name: 'ISRAChart',
+	mixins: [resize],
 	components: {},
 	props: {},
 	data() {
@@ -24,6 +26,14 @@ export default {
 				tooltip: {
 					trigger: 'item',
 				},
+				legend: {
+					bottom: '3%',
+					left: 'center',
+					icon: 'circle',
+					textStyle: {
+						color: '#fff'
+					}
+				},
 				title: {
 					text: 11234,
 					subtext: '总数',
@@ -44,7 +54,7 @@ export default {
 					{
 						name: 'Access From',
 						type: 'pie',
-						radius: ['60%', '85%'],
+						radius: ['45%', '65%'],
 						avoidLabelOverlap: true,
 						label: {
 							show: true,
@@ -60,25 +70,25 @@ export default {
 							rich: {
 								a: {
 									color: '#2760ff',
-									fontSize: 18,
+									fontSize: 24,
 									borderWidth: 0,
 									textBorderWidth: 0,
 								},
 								b: {
 									color: '#518eec',
-									fontSize: 18,
+									fontSize: 24,
 									borderWidth: 0,
 									textBorderWidth: 0,
 								},
 								c: {
 									color: '#0ee8e4',
-									fontSize: 18,
+									fontSize: 24,
 									borderWidth: 0,
 									textBorderWidth: 0,
 								},
 								d: {
 									color: '#ddb523',
-									fontSize: 18,
+									fontSize: 24,
 									borderWidth: 0,
 									textBorderWidth: 0,
 								},
diff --git a/src/views/databoard/components/Switcher.vue b/src/views/databoard/components/Switcher.vue
index 06a0a9c7..341e8946 100644
--- a/src/views/databoard/components/Switcher.vue
+++ b/src/views/databoard/components/Switcher.vue
@@ -36,7 +36,7 @@ export default {
 .switcher {
 	:deep(.el-switch__core) {
         border: none;
-        background-color: #213d566b;
+        background-color:rgba(3, 35, 60, 1);
         
 		&::after {
             background-color: #02457e;
@@ -46,7 +46,7 @@ export default {
 	:deep(.is-checked) {
         .el-switch__core {
             border: none;
-            background-color: #b4fffc;
+            background-color: rgba(180, 255, 252, 0.71);
 
 			&::after {
 				background-color: #08d8cd;
diff --git a/src/views/databoard/kiln/EnergeCost.vue b/src/views/databoard/kiln/EnergeCost.vue
index 4d121b4a..d7e49ed2 100644
--- a/src/views/databoard/kiln/EnergeCost.vue
+++ b/src/views/databoard/kiln/EnergeCost.vue
@@ -12,13 +12,13 @@
 		<div class="" style="flex: 2; padding: 8px">
 			<div
 				class="header-line"
-				style="margin-bottom: 8px; display: flex; align-items: center">
+				style="margin: 8px 0 16px; display: flex; align-items: center">
 				<h2 class="" style="margin: 0; color: #0ee8fe; margin-right: 12px">
-					烟气趋势图
+					能耗趋势图
 				</h2>
-				<Switcher />
+				<!-- <Switcher /> -->
 				<div>
-					<span class="lgd lgd-total">总量</span>
+					<!-- <span class="lgd lgd-total">总量</span> -->
 					<!-- <span class="lgd lgd-day">白班</span>
 						<span class="lgd lgd-night">夜班</span> -->
 				</div>
@@ -31,10 +31,10 @@
 					justify-content: space-between;
 				">
 				<SelectorBtnGroup
-					:options="['氧气含量', '二氧化硫', '一氧化氢', '二氧化氢']" />
-				<SelectorBtnGroup :options="['日', '周', '月', '年']" />
+					:options="['电耗能', '天然气I', '天然气II']" />
+				<SelectorBtnGroup :options="['周', '月', '年']" />
 			</div>
-			<div class="chart" style="height: 150px; margin-top: 8px;">
+			<div class="chart" style="height: 200px; margin-top: 8px;">
 				<GasChart />
 			</div>
 		</div>
@@ -45,8 +45,8 @@
 import Container from '../components/Container.vue';
 import ShadowRect from '../components/ShadowRect.vue';
 import SplitLine from '../components/line';
-import Switcher from '../components/Switcher.vue';
-import EnergeTop from './EnergeTop.vue';
+import Switcher from '../components/Switcher';
+import EnergeTop from './EnergeTop';
 import GasChart from '../components/GasChart.vue';
 import SelectorBtnGroup from '../components/SelectorBtnGroup.vue';
 export default {
diff --git a/src/views/databoard/kiln/EnergeTop.vue b/src/views/databoard/kiln/EnergeTop.vue
index 214a2735..8f28b29b 100644
--- a/src/views/databoard/kiln/EnergeTop.vue
+++ b/src/views/databoard/kiln/EnergeTop.vue
@@ -15,6 +15,7 @@
 			grid-template-rows: auto;
 			gap: 8px;
 			padding: 4px;
+			margin-bottom: 6px;
 		">
 		<ShadowRect
 			style="grid-row: 1 / 3; flex-direction: column; justify-content: center">
diff --git a/src/views/databoard/kiln/FanSequence.vue b/src/views/databoard/kiln/FanSequence.vue
index 56bf99da..ca8b8648 100644
--- a/src/views/databoard/kiln/FanSequence.vue
+++ b/src/views/databoard/kiln/FanSequence.vue
@@ -7,7 +7,7 @@
 
 <template>
 	<Container name="风机运行频率" size="middle" style="">
-		<div class="" style="position: absolute; top: 18px; left: 180px">
+		<div class="" style="position: absolute; top: 26px; left: 220px">
 			<Switcher />
 		</div>
 		<div
@@ -17,22 +17,22 @@
 				display: grid;
 				grid-template-columns: repeat(2, 1fr);
 				grid-auto-rows: auto;
-				gap: 8px;
+				gap: 10px;
 			">
-			<ShadowRect v-for="n in 14" :key="n" :rounded="false">
+			<ShadowRect v-for="(value, key, i) in fanFrequencyInfo" :key="i" :rounded="false">
 				<span
 					style="
-						font-size: 16px;
-						line-height: 1.24;
-						flex: 1.2;
+						font-size: 18px;
+						line-height: 1.1;
+						flex: 3.5;
 						text-align: right;
 						padding-right: 8px;
 						letter-spacing: 1px;
 					">
-					{{ n }}#风机
+					{{ key }}:
 				</span>
-				<span style="font-size: 16px; line-height: 1.24; flex: 1">
-					{{ Math.floor(Math.random() * 100) }}Hz
+				<span style="font-size: 20px; line-height: 1; flex: 1">
+					{{ value }}Hz
 				</span>
 			</ShadowRect>
 		</div>
@@ -42,16 +42,24 @@
 <script>
 import Container from '../components/Container.vue';
 import ShadowRect from '../components/ShadowRect.vue';
-import Switcher from '../components/Switcher.vue';
+import Switcher from '../components/Switcher';
 export default {
 	name: 'FanSequence',
 	components: { Container, ShadowRect, Switcher },
+	computed: {
+		fanFrequencyInfo() {
+			return this.$store.state.websocket.fanFrequencyInfo
+		}
+	},
 	props: {},
 	data() {
 		return {};
 	},
-	computed: {},
-	methods: {},
+	mounted() {
+
+	},
+	methods: {
+	}
 };
 </script>
 
diff --git a/src/views/databoard/kiln/GasHandle.vue b/src/views/databoard/kiln/GasHandle.vue
index 7de6c616..c719f9a2 100644
--- a/src/views/databoard/kiln/GasHandle.vue
+++ b/src/views/databoard/kiln/GasHandle.vue
@@ -21,7 +21,7 @@
 				<ShadowRect>
 					<span
 						style="
-							font-size: 16px;
+							font-size: 20px;
 							line-height: 1.24;
 							flex: 1.2;
 							text-align: right;
@@ -30,12 +30,12 @@
 						">
 						氧气含量
 					</span>
-					<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1">82%</span>
 				</ShadowRect>
 				<ShadowRect>
 					<div
 						style="
-							font-size: 16px;
+							font-size: 20px;
 							line-height: 1.5;
 							flex: 1.2;
 							text-align: right;
@@ -45,13 +45,13 @@
 						<p style="margin: 0; line-height: inherit">一氧化氮</p>
 						<p style="margin: 0; line-height: inherit">排放浓度</p>
 					</div>
-					<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1">82%</span>
 				</ShadowRect>
 
 				<ShadowRect>
 					<div
 						style="
-							font-size: 16px;
+							font-size: 20px;
 							line-height: 1.5;
 							flex: 1.2;
 							text-align: right;
@@ -61,13 +61,13 @@
 						<p style="margin: 0; line-height: inherit">二氧化硫</p>
 						<p style="margin: 0; line-height: inherit">排放浓度</p>
 					</div>
-					<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1">59mg/m³</span>
 				</ShadowRect>
 
 				<ShadowRect>
 					<div
 						style="
-							font-size: 16px;
+							font-size: 20px;
 							line-height: 1.5;
 							flex: 1.2;
 							text-align: right;
@@ -77,22 +77,22 @@
 						<p style="margin: 0; line-height: inherit">二氧化氮</p>
 						<p style="margin: 0; line-height: inherit">排放浓度</p>
 					</div>
-					<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
+					<span style="font-size: 20px; line-height: 1.24; flex: 1">82%</span>
 				</ShadowRect>
 			</div>
 			<KilnLine :horizontal="true" />
 			<div class="" style="flex: 2; padding: 8px">
 				<div
 					class="header-line"
-					style="margin-bottom: 8px; display: flex; align-items: center">
-					<h2 class="" style="margin: 0; color: #0ee8fe; margin-right: 12px">
+					style="margin-bottom: 10px; display: flex; align-items: center">
+					<h2 class="" style="margin: 5px 0; color: #0ee8fe; margin-right: 12px">
 						烟气趋势图
 					</h2>
-					<Switcher />
+					<!-- <Switcher /> -->
 					<div>
-						<span class="lgd lgd-total">总量</span>
-						<span class="lgd lgd-day">白班</span>
-						<span class="lgd lgd-night">夜班</span>
+						<!-- <span class="lgd lgd-total">总量</span> -->
+						<!-- <span class="lgd lgd-day">白班</span>
+						<span class="lgd lgd-night">夜班</span> -->
 					</div>
 				</div>
 				<div
@@ -103,10 +103,10 @@
 						justify-content: space-between;
 					">
 					<SelectorBtnGroup
-						:options="['氧气含量', '二氧化硫', '一氧化氢', '二氧化氢']" />
+						:options="['氧气含量', '二氧化硫', '一氧化氮', '二氧化氮']" />
 					<SelectorBtnGroup :options="['日', '周', '月', '年']" />
 				</div>
-				<div class="chart" style="height: 220px">
+				<div class="chart" style="height: 250px;margin-top: 10px;">
 					<GasChart />
 				</div>
 			</div>
@@ -118,7 +118,7 @@
 import Container from '../components/Container.vue';
 import ShadowRect from '../components/ShadowRect.vue';
 import KilnLine from '../components/line';
-import Switcher from '../components/Switcher.vue';
+import Switcher from '../components/Switcher';
 import SelectorBtnGroup from '../components/SelectorBtnGroup.vue';
 import GasChart from '../components/GasChart.vue';
 
diff --git a/src/views/databoard/kiln/IsraCheck.vue b/src/views/databoard/kiln/IsraCheck.vue
index 271c3fdd..a583f2f9 100644
--- a/src/views/databoard/kiln/IsraCheck.vue
+++ b/src/views/databoard/kiln/IsraCheck.vue
@@ -7,9 +7,10 @@
 
 <template>
 	<Container name="ISRA缺陷检测" size="middle" style="">
-		<div style="padding: 12px; display: flex; flex-direction: column; gap: 8px; height: 100%;">
+		<ISRAChart />
+		<!-- <div style="padding: 12px; display: flex; flex-direction: column; gap: 8px; height: 100%;">
 			<div class="f" style="flex: 9;">
-				<ISRAChart />
+				
 			</div>
 			<ul
 				class="legend"
@@ -27,7 +28,7 @@
 				<li class="fault-3">缺陷3</li>
 				<li class="fault-4">缺陷4</li>
 			</ul>
-		</div>
+		</div> -->
 	</Container>
 </template>
 
diff --git a/src/views/databoard/kiln/KilnInfo.vue b/src/views/databoard/kiln/KilnInfo.vue
index c4341541..503c9dc8 100644
--- a/src/views/databoard/kiln/KilnInfo.vue
+++ b/src/views/databoard/kiln/KilnInfo.vue
@@ -17,22 +17,37 @@
 					grid-auto-rows: auto;
 					gap: 8px;
 				">
-				<ShadowRect v-for="info in kilnInfo" :key="info.name" :rounded="false">
-					<span
-						style="
-							font-size: 16px;
-							line-height: 1.45;
-							flex: 1.2;
-							text-align: right;
-							padding-right: 8px;
-							letter-spacing: 1px;
-						">
-						{{ info.name }}
-					</span>
-					<span style="font-size: 16px; line-height: 1.45; flex: 1">
-						{{ info.value }}
-						<!-- {{ Math.floor(Math.random() * 100) }}Hz -->
-					</span>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">窑炉压力:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.kilnPressure }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">循环水温度:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.waterTemp }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">循环水流量:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.waterFlow }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">循环水压力:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.waterPressure }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">助燃风压力:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.combustionAirPressure }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">碹顶加权温度:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.topTemp }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">压缩气压力:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.compressedAirPressure }}</span>
+				</ShadowRect>
+				<ShadowRect :rounded="false">
+					<span class="kiln-info-item">熔化加权温度:</span>
+					<span style="font-size: 20px; line-height: 1.7; flex: 1">{{ kilnInfoMsg?.meltTemp }}</span>
 				</ShadowRect>
 			</div>
 		</Container>
@@ -48,24 +63,26 @@ export default {
 	props: {},
 	data() {
 		return {
-			kilnInfo: [
-				{ name: '窑炉压力', value: '83Kpa' },
-				{ name: '循环水温度', value: '53℃' },
-				{ name: '循环水流量', value: '23m³/h' },
-				{ name: '循环水压力', value: '33Kpa' },
-				{ name: '助燃风压力', value: '12Kpa' },
-				{ name: '碹顶加权温度', value: '32℃' },
-				{ name: '压缩气压力', value: '83Kpa' },
-				{ name: '融化加权温度', value: '123℃' },
-			],
 		};
 	},
-	computed: {},
+	computed: {
+		kilnInfoMsg() {
+			return this.$store.state.websocket.kilnInfo
+		}
+	},
 	methods: {},
 };
 </script>
 
 <style scoped lang="scss">
 .kiln-info {
+	.kiln-info-item {
+		font-size: 20px;
+		line-height: 1.7;
+		flex: 1.5;
+		text-align: right;
+		padding-right: 8px;
+		letter-spacing: 1px;
+	}
 }
 </style>
diff --git a/src/views/databoard/kiln/LeftFour.vue b/src/views/databoard/kiln/LeftFour.vue
index 14028e92..8ce225ff 100644
--- a/src/views/databoard/kiln/LeftFour.vue
+++ b/src/views/databoard/kiln/LeftFour.vue
@@ -12,7 +12,7 @@
 			display: grid;
 			gap: 16px;
 			grid-template-columns: 1fr 1fr;
-			grid-template-rows: 1fr 1fr;
+			grid-template-rows: 462px 462px;
 		">
 		<MaterialCost />
 		<IsraCheck />
diff --git a/src/views/databoard/kiln/MaterialCost.vue b/src/views/databoard/kiln/MaterialCost.vue
index 319dab01..e6aa548a 100644
--- a/src/views/databoard/kiln/MaterialCost.vue
+++ b/src/views/databoard/kiln/MaterialCost.vue
@@ -21,7 +21,7 @@
 					class="material"
 					style="
 						flex: 1;
-						padding: 6px;
+						padding: 12px 6px 20px;
 						display: flex;
 						flex-direction: column;
 						gap: 4px;
@@ -31,7 +31,7 @@
 					<span style="color: #0ee8e4; font-weight: 500; font-size: 32px">
 						234
 					</span>
-					<span style="color: #fff; font-size: 14px; letter-spacing: 1px">
+					<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
 						- 原料1/吨 -
 					</span>
 				</div>
diff --git a/src/views/databoard/kiln/RightTwo.vue b/src/views/databoard/kiln/RightTwo.vue
index 001e7116..7f628b19 100644
--- a/src/views/databoard/kiln/RightTwo.vue
+++ b/src/views/databoard/kiln/RightTwo.vue
@@ -8,7 +8,11 @@
 <template>
 	<div
 		class="right-two"
-		style="display: flex; gap: 16px; flex-direction: column">
+		style="
+			display: grid;
+			gap: 16px;
+			grid-template-rows: 320px 605px;
+		">
 		<KilnInfo />
 		<GasHandle />
 	</div>
@@ -18,7 +22,7 @@
 import Container from '../components/Container.vue';
 import ShadowRect from '../components/ShadowRect.vue';
 import KilnLine from '../components/line';
-import Switcher from '../components/Switcher.vue';
+import Switcher from '../components/Switcher';
 import SelectorBtnGroup from '../components/SelectorBtnGroup.vue';
 import KilnInfo from './KilnInfo.vue';
 import GasHandle from './GasHandle.vue';
diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index 6d005504..f59ef9c0 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -6,36 +6,46 @@
 -->
 
 <template>
-	<div
-		class="KilnDataBoard"
-		style="
-			position: absolute;
-			top: -8px;
-			left: -16px;
-			width: calc(100% + 28px);
-			height: calc(100% + 38px);
-			display: flex;
-			flex-direction: column;
-			gap: 16px;
-		">
-		<KHeader />
+	<div id='kilnContainer' style="width: 100%;height: 100%;">
 		<div
-			class="main-body"
-			style="flex: 1; display: flex; gap: 16px; padding: 8px 16px">
-			<div class="left-side" style="flex: 2">
-				<LeftFour />
-			</div>
-			<div class="right-side" style="flex: 1">
-				<RightTwo />
+			id='kilnContainerB'
+			ref='kilnContainer'
+			class="KilnDataBoard"
+			style="
+				position: absolute;
+				transform-origin: 16px 8px;
+				font-size: 16px;
+				top: -8px;
+				left: -16px;
+				width: 1920px;
+				height: 1080px;
+				display: flex;
+				flex-direction: column;
+				gap: 24px;
+			"
+			:style="{transform:'scale('+scaleNum+')'}">
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange'/>
+			<div
+				class="main-body"
+				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
+				<div class="left-side" style="flex: 2">
+					<LeftFour />
+				</div>
+				<div class="right-side" style="flex: 1">
+					<RightTwo />
+				</div>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script>
-import KHeader from '../components/Header.vue';
-import LeftFour from './LeftFour.vue';
+import KHeader from '../components/Header';
+import LeftFour from './LeftFour';
 import RightTwo from './RightTwo.vue';
+import screenfull from 'screenfull'
+import { debounce } from '@/utils/debounce'
+import { getDcsMsg } from './../utils/dcs'
 
 export default {
 	name: 'KilnDataBoard',
@@ -49,15 +59,110 @@ export default {
 	// 		resizeChart: null,
 	// 	};
 	// },
-	mounted() {
-		// this.$el.addEventListener('resize', () => {
-		// 	console.log('resizzzze...')
-		// 	this.resizeChart = Math.random();
-		// });
-	},
 	data() {
-		return {};
+		return {
+			isFullScreen: false,
+			scaleNum: 0.8
+		};
 	},
+	created() {
+		this.init()
+	},
+	destroy() {
+		this.destroy()
+	},
+	mounted() {
+		this.boxReset = debounce(() => {
+      this.resetSize()
+    }, 300)
+    this.boxReset()
+    window.addEventListener('resize', () => {
+      this.boxReset()
+    })
+		// this.getMes()
+		// closeWebsocket()
+		getDcsMsg()
+		console.log('mounted...........')
+	},
+	destroyed() {
+		console.log('destroyed...........')
+	},
+	methods: {
+		change() {
+      this.isFullScreen = screenfull.isFullscreen
+    },
+
+    init() {
+      if (screenfull.isEnabled) {
+        screenfull.on('change', this.change)
+      }
+    },
+
+    destroy() {
+      if (screenfull.isEnabled) {
+        screenfull.off('change', this.change)
+      }
+    },
+		// 全屏
+		screenfullChange() {
+      if (!screenfull.isEnabled) {
+        this.$message({
+          message: 'you browser can not work',
+          type: 'warning'
+        })
+        return false
+      }
+      screenfull.toggle(this.$refs.kilnContainer)
+			console.log('11111')
+			// this.resetSize()
+			console.log('2222')
+    },
+		resetSize() {
+      let kilnContainerBox = document.querySelector('#kilnContainerB')
+      let rw = parseFloat(window.innerWidth)
+      let rh = parseFloat(window.innerHeight)
+      let bw = parseFloat(kilnContainerBox.style.width)
+      let bh = parseFloat(kilnContainerBox.style.height)
+			let wx = 0
+			let hx = 0
+			if (screenfull.isFullscreen) {
+				console.log('全屏')
+				wx = rw / bw
+				hx = rh / bh
+				console.log(this.scaleNum)
+			}else{
+				console.log('非全屏')
+				console.log(this.$store.state.app.sidebar.opened)
+				if (this.$store.state.app.sidebar.opened) {
+					wx = (rw-264) / bw
+					hx = (rh-116) / bh
+				}else{
+					wx = (rw-78) / bw
+					hx = (rh-116) / bh
+				}
+			}
+			this.scaleNum = wx
+    },
+		// 获取ws
+		getMes() {
+			const userId = 'dcsmsg' + new Date().getTime()
+			connectWebsocket(
+				// 测试地址
+				'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
+				// 传递给后台的数据
+				'',
+				// 成功拿到后台返回的数据的回调函数
+				(data) => {
+					console.log('成功的回调函数, 接收到的data数据: ', data)
+
+				},
+				// websocket连接失败的回调函数
+				(err) => {
+					console.log('失败的回调函数', err)
+				}
+			)
+		}
+	}
 };
 </script>
 
@@ -66,5 +171,6 @@ export default {
 	background: url(../assets/bg.png) no-repeat;
 	background-size: cover;
 	background-position: 0 0;
+	overflow: auto;
 }
 </style>
diff --git a/src/views/databoard/mixins/resize.js b/src/views/databoard/mixins/resize.js
new file mode 100644
index 00000000..234953b1
--- /dev/null
+++ b/src/views/databoard/mixins/resize.js
@@ -0,0 +1,55 @@
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.$_resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  beforeDestroy() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  // to fixed bug when cached by keep-alive
+  // https://github.com/PanJiaChen/vue-element-admin/issues/2116
+  activated() {
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  deactivated() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_initResizeEvent() {
+      window.addEventListener('resize', this.$_resizeHandler)
+    },
+    $_destroyResizeEvent() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+    },
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    $_initSidebarResizeEvent() {
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    $_destroySidebarResizeEvent() {
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    }
+  }
+}
diff --git a/src/views/databoard/utils/dcs.js b/src/views/databoard/utils/dcs.js
new file mode 100644
index 00000000..0edd8ff5
--- /dev/null
+++ b/src/views/databoard/utils/dcs.js
@@ -0,0 +1,34 @@
+import { connectWebsocket, closeWebsocket } from './../utils/websocket'
+import store from "@/store";
+
+// 创建dcs链接
+export const getDcsMsg = () => {
+  const userId = 'dcsmsg' + new Date().getTime()
+  connectWebsocket(
+    // 测试地址
+    'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
+    // 传递给后台的数据
+    '',
+    // 成功拿到后台返回的数据的回调函数
+    (data) => {
+      console.log('成功的回调函数, 接收到的data数据: ', data)
+      let msgData = JSON.parse(data)
+      switch (msgData?.type) {
+        case "FanFrequencyInfo": {
+          store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
+          break;
+        }
+        case "KilnInfo": {
+          store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+          break;
+        }
+        default:
+          console.log('++++++++')
+      }
+    },
+    // websocket连接失败的回调函数
+    (err) => {
+      console.log('失败的回调函数', err)
+    }
+  )
+}
\ No newline at end of file
diff --git a/src/views/databoard/utils/mes.js b/src/views/databoard/utils/mes.js
new file mode 100644
index 00000000..0edd8ff5
--- /dev/null
+++ b/src/views/databoard/utils/mes.js
@@ -0,0 +1,34 @@
+import { connectWebsocket, closeWebsocket } from './../utils/websocket'
+import store from "@/store";
+
+// 创建dcs链接
+export const getDcsMsg = () => {
+  const userId = 'dcsmsg' + new Date().getTime()
+  connectWebsocket(
+    // 测试地址
+    'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
+    // 传递给后台的数据
+    '',
+    // 成功拿到后台返回的数据的回调函数
+    (data) => {
+      console.log('成功的回调函数, 接收到的data数据: ', data)
+      let msgData = JSON.parse(data)
+      switch (msgData?.type) {
+        case "FanFrequencyInfo": {
+          store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
+          break;
+        }
+        case "KilnInfo": {
+          store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+          break;
+        }
+        default:
+          console.log('++++++++')
+      }
+    },
+    // websocket连接失败的回调函数
+    (err) => {
+      console.log('失败的回调函数', err)
+    }
+  )
+}
\ No newline at end of file
diff --git a/src/views/databoard/utils/websocket.js b/src/views/databoard/utils/websocket.js
new file mode 100644
index 00000000..52fbd44b
--- /dev/null
+++ b/src/views/databoard/utils/websocket.js
@@ -0,0 +1,204 @@
+// websocket实例
+let wsObj = null;
+// ws连接地址
+let wsUrl = null;
+// let userId = null;
+// 是否执行重连 true/不执行 ； false/执行
+let lockReconnect = false;
+// 重连定时器
+let wsCreateHandler = null;
+// 连接成功，执行回调函数
+let messageCallback = null;
+// 连接失败，执行回调函数
+let errorCallback = null;
+// 发送给后台的数据
+let sendDatas = {};
+ 
+ 
+/**
+ * 发起websocket请求函数
+ * @param {string} url ws连接地址
+ * @param {Object} agentData 传给后台的参数
+ * @param {function} successCallback 接收到ws数据，对数据进行处理的回调函数
+ * @param {function} errCallback ws连接错误的回调函数
+ */
+export const connectWebsocket = (url, agentData, successCallback, errCallback) => {
+  wsUrl = url;
+  createWebSoket();
+  messageCallback = successCallback;
+  errorCallback = errCallback;
+  sendDatas = agentData;
+}
+ 
+// 手动关闭websocket （这里手动关闭会执行onclose事件）
+export const closeWebsocket = () => {
+  if (wsObj) {
+    writeToScreen('手动关闭websocket');
+    wsObj.close() // 关闭websocket
+    // wsObj.onclose() // 关闭websocket(如果上面的关闭不生效就加上这一条)
+    // 关闭重连
+    lockReconnect = true;
+    wsCreateHandler && clearTimeout(wsCreateHandler);
+    // 关闭心跳检查
+    heartCheck.stop();
+  }
+}
+ 
+// 创建ws函数
+const createWebSoket = () => {
+  if (typeof (WebSocket) === 'undefined') {
+    writeToScreen("您的浏览器不支持WebSocket，无法获取数据");
+    return false
+  }
+  // const host = window.location.host;
+  // userId = GetQueryString("userId");
+  // wsUrl = "ws://" + host + "/websoket" + userId;
+ 
+  try {
+    wsObj = new WebSocket(wsUrl);
+    initWsEventHandle();
+  } catch (e) {
+    writeToScreen("连接异常，开始重连");
+    reconnect();
+  }
+}
+ 
+const initWsEventHandle = () => {
+  try {
+    // 连接成功
+    wsObj.onopen = (event) => {
+      onWsOpen(event);
+      heartCheck.start();
+    }
+ 
+    // 监听服务器端返回的信息
+    wsObj.onmessage = (event) => {
+      onWsMessage(event);
+      heartCheck.start();
+    }
+ 
+    wsObj.onclose = (event) => {
+      writeToScreen('onclose执行关闭事件');
+      onWsClose(event);
+    }
+ 
+    wsObj.onerror = (event) => {
+      writeToScreen('onerror执行error事件，开始重连');
+      onWsError(event);
+      reconnect();
+    }
+  } catch (err) {
+    writeToScreen('绑定事件没有成功，开始重连');
+    reconnect();
+  }
+}
+ 
+const onWsOpen = (event) => {
+  writeToScreen('CONNECT');
+  // // 客户端与服务器端通信
+  // wsObj.send('我发送消息给服务端');
+  // 添加状态判断，当为OPEN时，发送消息
+  if (wsObj.readyState === wsObj.OPEN) { // wsObj.OPEN = 1 
+    // 发给后端的数据需要字符串化
+    wsObj.send(JSON.stringify(sendDatas));
+  }
+  if (wsObj.readyState === wsObj.CLOSED) { // wsObj.CLOSED = 3 
+    writeToScreen('wsObj.readyState=3, ws连接异常，开始重连');
+    reconnect();
+    errorCallback(event);
+  }
+}
+const onWsMessage = (event) => {
+  const jsonStr = event.data;
+  writeToScreen('onWsMessage接收到服务器的数据: ', jsonStr);
+  messageCallback(jsonStr);
+}
+const onWsClose = (event) => {
+  writeToScreen('DISCONNECT');
+  // e.code === 1000  表示正常关闭。 无论为何目的而创建, 该链接都已成功完成任务。
+  // e.code !== 1000  表示非正常关闭。
+  console.log('onclose event: ', event)
+  if (event && event.code !== 1000) {
+    writeToScreen('非正常关闭');
+    errorCallback(event);
+    // 如果不是手动关闭，这里的重连会执行；如果调用了手动关闭函数，这里重连不会执行
+    reconnect();
+  }
+}
+const onWsError = (event) => {
+  writeToScreen('onWsError: ', event.data);
+  errorCallback(event);
+}
+ 
+const writeToScreen = (massage) => {
+  console.log(massage);
+}
+ 
+// 重连函数
+const reconnect = () => {
+  if (lockReconnect) {
+    return;
+  }
+  writeToScreen('3秒后重连');
+  lockReconnect = true;
+  // 没连接上会一直重连，设置延迟避免请求过多
+  wsCreateHandler && clearTimeout(wsCreateHandler);
+  wsCreateHandler = setTimeout(() => {
+    writeToScreen('重连...' + wsUrl);
+    createWebSoket();
+    lockReconnect = false;
+    writeToScreen('重连完成');
+  }, 3000);
+}
+ 
+// 从浏览器地址中获取对应参数
+const GetQueryString = (name) => {
+  let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+  // 获取url中 ? 符后的字符串并正则匹配
+  let r = window.location.search.substr(1).match(reg);
+  let context = "";
+  r && (context = r[2]);
+  reg = null;
+  r = null;
+  return context;
+}
+ 
+ 
+// 心跳检查（看看websocket是否还在正常连接中）
+let heartCheck = {
+  timeout: 15000,
+  timeoutObj: null,
+  serverTimeoutObj: null,
+  // 重启
+  reset() {
+    clearTimeout(this.timeoutObj);
+    clearTimeout(this.serverTimeoutObj);
+    this.start();
+  },
+  // 停止
+  stop() {
+    clearTimeout(this.timeoutObj);
+    clearTimeout(this.serverTimeoutObj);
+  },
+  // 开启定时器
+  start() {
+    this.timeoutObj && clearTimeout(this.timeoutObj);
+    this.serverTimeoutObj && clearTimeout(this.serverTimeoutObj);
+    // 15s之内如果没有收到后台的消息，则认为是连接断开了，需要重连
+    this.timeoutObj = setTimeout(() => {
+      writeToScreen("心跳检查，发送ping到后台");
+      try {
+        const datas = { ping: true };
+        wsObj.send(JSON.stringify(datas));
+      } catch (err) {
+        writeToScreen("发送ping异常");
+      }
+      console.log("内嵌定时器this.serverTimeoutObj: ", this.serverTimeoutObj)
+      // 内嵌定时器
+      this.serverTimeoutObj = setTimeout(() => {
+        writeToScreen("没有收到后台的数据，重新连接");
+        reconnect();
+      }, this.timeout)
+    }, this.timeout)
+  }
+}
\ No newline at end of file

From 9e2da2ddc2c6cd970fd3e9addf061bc3fa5eb982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 29 Dec 2023 09:00:00 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |    6 +-
 src/assets/icons/svg/energyMonitoring.svg     |   14 +
 src/assets/icons/svg/eqAlarm.svg              |   14 +
 src/assets/icons/svg/eqMonitoring.svg         |   17 +
 src/assets/icons/svg/productLine.svg          |   14 +
 src/assets/icons/svg/scrap.svg                |   16 +
 src/views/OperationalOverview/coldBoard.vue   | 1316 ++++++-----------
 .../components/baseTable.vue                  |    5 +-
 .../components/doubleYChart .vue              |  177 +--
 .../components/linearBarChart.vue             |  163 +-
 .../components/pileBarChart.vue               |  235 +++
 .../OperationalOverview/processingBoard.vue   |  459 +++---
 12 files changed, 1153 insertions(+), 1283 deletions(-)
 create mode 100644 src/assets/icons/svg/energyMonitoring.svg
 create mode 100644 src/assets/icons/svg/eqAlarm.svg
 create mode 100644 src/assets/icons/svg/eqMonitoring.svg
 create mode 100644 src/assets/icons/svg/productLine.svg
 create mode 100644 src/assets/icons/svg/scrap.svg
 create mode 100644 src/views/OperationalOverview/components/pileBarChart.vue

diff --git a/.env.dev b/.env.dev
index 40a1806e..a3f5a522 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,12 +1,12 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-12-18 13:35:00
+ # @LastEditTime: 2023-12-29 08:57:36
  # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置
-ENV = 'development' 
+ENV = 'development'
 
 # 页面标题
 VUE_APP_TITLE = MES系统
@@ -19,7 +19,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
diff --git a/src/assets/icons/svg/energyMonitoring.svg b/src/assets/icons/svg/energyMonitoring.svg
new file mode 100644
index 00000000..ba27b0f4
--- /dev/null
+++ b/src/assets/icons/svg/energyMonitoring.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>能源监控</title>
+    <g id="mes-看板/驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="冷端看板" transform="translate(-685.000000, -149.000000)" fill-rule="nonzero">
+            <g id="编组-26备份-4" transform="translate(661.000000, 127.000000)">
+                <g id="能源监控" transform="translate(24.000000, 22.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                    <path d="M5.56606392,22 L5.56606392,8.69394435 C5.56606392,8.16339333 5.15113542,7.75513729 4.65294365,7.75513729 L1.91312026,7.75513729 C1.41539106,7.75513729 1,8.20385524 1,8.69394435 L1,22 L5.56606392,22 L5.56606392,22 Z M11.3773759,22 L11.3773759,2.97972358 C11.3773759,2.44871795 10.9624474,2 10.4642557,2 L7.72443229,2 C7.22624054,2 6.81131201,2.44871795 6.81131201,2.97972358 L6.81131201,22 L11.3773759,22 Z M17.188688,22 L17.188688,13.591653 C17.188688,13.061102 16.7737595,12.6123841 16.2755677,12.6123841 L13.5362069,12.6123841 C13.0380151,12.6123841 12.622624,13.061102 12.622624,13.591653 L12.622624,22 L17.188688,22 Z M23,22 L23,8.69394435 C23,8.16339333 22.5850715,7.75513729 22.0868797,7.75513729 L19.3470564,7.75513729 C18.8493272,7.75513729 18.4339361,8.20385524 18.4339361,8.69394435 L18.4339361,22 L23,22 L23,22 Z" id="形状" fill="#59D0E2"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/eqAlarm.svg b/src/assets/icons/svg/eqAlarm.svg
new file mode 100644
index 00000000..7b37c5be
--- /dev/null
+++ b/src/assets/icons/svg/eqAlarm.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>报警</title>
+    <g id="新增看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="深加工看板" transform="translate(-64.000000, -149.000000)" fill-rule="nonzero">
+            <g id="编组-26" transform="translate(40.000000, 127.000000)">
+                <g id="报警" transform="translate(24.000000, 22.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                    <path d="M20.7657338,18.1387399 L13.9284614,22.3462921 C13.4025174,22.6969215 12.8765734,22.3462921 12.8765734,21.6450334 L12.8765734,11.8274116 C12.8765734,11.6520969 13.0518881,11.3014676 13.2272027,11.1261529 L20.0644751,6.91860067 C20.5904191,6.56797132 21.1163631,6.91860067 21.1163631,7.61985938 L21.1163631,17.6127959 C21.1163631,17.7881106 20.9410485,18.1387399 20.7657338,18.1387399 Z M3.23426622,18.1387399 L10.0715386,22.3462921 C10.5974826,22.6969215 11.1234266,22.3462921 11.1234266,21.6450334 L11.1234266,11.8274116 C11.1234266,11.6520969 10.9481119,11.3014676 10.7727973,11.1261529 L3.93552492,6.91860067 C3.58489557,6.743286 2.88363686,7.09391535 2.88363686,7.61985938 L2.88363686,17.6127959 C2.88363686,17.7881106 3.05895154,18.1387399 3.23426622,18.1387399 Z M11.8246853,1.48384573 L3.93552492,4.46419521 C3.58489557,4.63950989 3.58489557,5.16545392 3.93552492,5.34076859 L11.8246853,10.2495795 C12,10.2495795 12.1753147,10.2495795 12.1753147,10.2495795 L20.2397898,5.34076859 C20.5904191,5.16545392 20.5904191,4.63950989 20.2397898,4.46419521 L12.1753147,1.48384573 C12,1.48384573 12,1.48384573 11.8246853,1.48384573 Z" id="形状" fill="#59D0E2"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/eqMonitoring.svg b/src/assets/icons/svg/eqMonitoring.svg
new file mode 100644
index 00000000..66ac7afa
--- /dev/null
+++ b/src/assets/icons/svg/eqMonitoring.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="19.7127155px" height="19.7127155px" viewBox="0 0 19.7127155 19.7127155" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>设备监控</title>
+    <g id="mes-看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="深加工看板" transform="translate(-1309.143642, -151.143642)">
+            <g id="编组-26备份-4" transform="translate(1283.000000, 127.000000)">
+                <g id="设备监控" transform="translate(24.000000, 22.000000)">
+                    <rect id="矩形" x="0" y="0" width="24" height="24"></rect>
+                    <g id="异常" transform="translate(2.143642, 2.143642)" fill-rule="nonzero">
+                        <rect id="矩形" fill="#000000" opacity="0" x="0.856357767" y="0.856357767" width="17" height="17"></rect>
+                        <path d="M9.85640228,0.000116285784 C7.94997171,-0.0106702658 6.11587607,0.729338602 4.75082135,2.0602014 C3.41793975,3.37801839 2.66584368,5.173105 2.66128994,7.04744966 L2.66128994,16.6671387 L16.9726637,16.6671387 L16.9726637,7.04743041 C16.9710126,5.1705386 16.2144177,3.37320892 14.8732566,2.06018215 C13.5319151,0.748116476 11.7327241,0.00936885323 9.85638303,0.000116285784 L9.85640228,0.000116285784 Z M9.26502002,14.3607842 L9.05803623,9.69875531 L5.52947465,9.69875531 L10.1619113,3.85402838 L10.5561661,7.61911494 L13.9073323,7.73739052 L9.22555602,14.3607842 L9.26502002,14.3607842 Z M4.37471863e-05,18.6383791 C-0.00254075641,18.3517467 0.109484124,18.0759491 0.311244358,17.8723357 C0.513004592,17.6687223 0.787767718,17.5541863 1.07441422,17.5541863 L18.6383903,17.5541863 C18.9225391,17.5577245 19.1943787,17.6707029 19.3973309,17.8696071 C19.5968337,18.0761491 19.7096866,18.3512359 19.7127155,18.6383791 C19.7127155,19.2317112 19.2317269,19.7127155 18.6383903,19.7127155 L1.07441422,19.7127155 C0.481077682,19.7127155 4.37471863e-05,19.2317112 4.37471863e-05,18.6383791 L4.37471863e-05,18.6383791 Z" id="形状" fill="#59D0E2"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/productLine.svg b/src/assets/icons/svg/productLine.svg
new file mode 100644
index 00000000..a05d5c87
--- /dev/null
+++ b/src/assets/icons/svg/productLine.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>库存管理</title>
+    <g id="新增看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="周转看板" transform="translate(-64.000000, -618.000000)" fill-rule="nonzero">
+            <g id="编组-26备份" transform="translate(40.000000, 596.000000)">
+                <g id="库存管理" transform="translate(24.000000, 22.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                    <path d="M17.5599807,5.95300863 L17.5599807,7.05052701 L6.39641163,7.05052701 L6.39641163,5.95300863 L5.15061552,5.95300863 C4.59833077,5.95300863 4.15061552,6.40072388 4.15061552,6.95300863 L4.15061552,21.465846 C4.15061552,22.0181307 4.59833077,22.465846 5.15061552,22.465846 L18.8493845,22.465846 C19.4016692,22.465846 19.8493845,22.0181307 19.8493845,21.465846 L19.8493845,6.95300863 C19.8493845,6.40072388 19.4016692,5.95300863 18.8493845,5.95300863 L17.5599807,5.95300863 L17.5599807,5.95300863 Z M6.35280394,9.22062017 L17.516373,9.22062017 L17.516373,11.3240808 L6.35280394,11.3240808 L6.35280394,9.22062017 Z M14.2456217,20.2200499 L6.3962372,20.2200499 L6.3962372,18.0396653 L14.2456217,18.0396653 L14.2456217,20.2200499 Z M17.5709698,15.8758516 L6.40740077,15.8758516 L6.40740077,13.6570923 L17.5709698,13.6570923 L17.5709698,15.8758516 Z M10.7650186,1.53415402 L13.234807,1.53415402 C13.7870917,1.53415402 14.234807,1.98186927 14.234807,2.53415402 L14.234807,4.82653474 L14.234807,4.82653474 L9.76501859,4.82653474 L9.76501859,2.53415402 C9.76501859,1.98186927 10.2127338,1.53415402 10.7650186,1.53415402 Z M16.4807775,4.75814629 L16.4807775,5.95300863 L16.4807775,5.95300863 L7.51922248,5.95300863 L7.51922248,4.75814629 C7.51922248,4.20586154 7.96693773,3.75814629 8.51922248,3.75814629 L15.4807775,3.75814629 C16.0330623,3.75814629 16.4807775,4.20586154 16.4807775,4.75814629 Z" id="形状" fill="#59D0E2"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/scrap.svg b/src/assets/icons/svg/scrap.svg
new file mode 100644
index 00000000..5f72b0e5
--- /dev/null
+++ b/src/assets/icons/svg/scrap.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23.9999981px" height="23.9999981px" viewBox="0 0 23.9999981 23.9999981" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>缺陷</title>
+    <g id="mes-看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="深加工看板" transform="translate(-686.000000, -149.000000)" fill-rule="nonzero">
+            <g id="编组-26备份-2" transform="translate(662.000000, 127.000000)">
+                <g id="编组-24" transform="translate(24.000000, 22.000000)">
+                    <g id="缺陷" transform="translate(0.000000, 0.000000)">
+                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="23.9999981" height="23.9999981"></rect>
+                        <path d="M20.2321175,10.4550863 L18.9032068,10.4550863 L18.9032068,6.47221732 C18.9010796,5.9702116 18.4935224,5.56438134 17.9915122,5.56438585 L13.108538,5.56438585 L13.108538,3.98437284 C13.1108007,3.21607553 12.8028771,2.47938539 12.2545397,1.94122931 C11.7062023,1.40307324 10.9638711,1.1090093 10.1957511,1.12566955 C8.60430329,1.19855778 7.3587693,2.52279309 7.38340516,4.11571867 L7.38340516,5.56438585 L2.5004309,5.56438585 C1.99842068,5.56438134 1.59086349,5.9702116 1.58870356,6.47221732 L1.58870356,9.53566556 C1.58667583,9.77879788 1.68181868,10.0126808 1.85301841,10.1853314 C2.02421815,10.3579819 2.25728984,10.4550951 2.5004309,10.4550863 L3.01036175,10.4550863 C4.60185595,10.4303757 5.92550348,11.6736467 6.00041086,13.2635692 C6.0149973,14.0317095 5.71894789,14.773225 5.17934105,15.3201042 C4.63973421,15.8669834 3.90224815,16.1729324 3.13398136,16.1686298 L2.5004309,16.1686298 C1.9969159,16.1686298 1.58870356,16.5768093 1.58870356,17.0803243 L1.58870356,21.9632986 C1.58870356,22.4668136 1.9969159,22.8750014 2.5004309,22.8750014 L6.47171061,22.8750014 C6.71382208,22.8760256 6.94631552,22.780304 7.11751574,22.6091037 C7.28871596,22.4379035 7.38443764,22.2054101 7.38340516,21.9632986 L7.38340516,21.5113144 C7.3587693,19.9183889 8.60430329,18.5941536 10.1957511,18.5212653 C10.9638711,18.5046051 11.7062023,18.798669 12.2545397,19.3368251 C12.8028771,19.8749812 13.1108007,20.6116713 13.108538,21.3799686 L13.108538,21.9632986 C13.1075105,22.2047391 13.202703,22.4366433 13.3730659,22.6077311 C13.5434288,22.778819 13.7749267,22.8750014 14.0163694,22.8750014 L17.9915122,22.8750014 C18.4950272,22.8750014 18.9032068,22.4668136 18.9032068,21.9632986 L18.9032068,16.1686298 L20.3596002,16.1686298 C21.127882,16.1719118 21.8649697,15.8649752 22.403851,15.3173671 C22.9427323,14.769759 23.2377892,14.027836 23.2221666,13.259706 C23.1452437,11.6713093 21.8221825,10.4302984 20.2321175,10.4550863 Z" id="路径" fill="#59D0E2"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 3127d186..57e845e9 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,213 +1,163 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-07-19 15:18:30
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-12-28 11:52:08
+ * @Description:
+-->
 <template>
   <div id="container" ref="container" class="visual-container" :style="styles">
     <el-row class="container-title" :style="{
-        height: 88 + 'px',
-        lineHeight: 88 + 'px',
-        fontSize: 30 + 'px'
-      }">
+      height: 88 + 'px',
+      lineHeight: 88 + 'px',
+      fontSize: 31 + 'px'
+    }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
       许昌安彩冷端看板
       <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>
-      <!-- <el-button type="text" class="title-button" :style="{ right: 33 + 'px', top: 37 + 'px' }"
-        @click="changeFullScreen">
+      <!-- <el-button
+        type="text"
+        class="title-button"
+        :style="{ right: 33 + 'px', top: 37 + 'px' }"
+        @click="changeFullScreen"
+      >
         <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
         <svg-icon v-else icon-class="fullScreenView" />
       </el-button> -->
     </el-row>
-
     <el-row class="container-main flex-col" type="flex">
-      <el-row>
-        <el-col :span="8" :style="{ padding: '0 ' + 8 + 'px' }">
-          <el-row>
-            <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-              <base-container :beilv="1" :height="460" :title="'切割数据'" :title-icon="'1_1'">
-                <!-- <div style="width:100%">
-                  <el-row style="margin-bottom: 1em">
-                    <p class="now-team-title main-title">- 报警总数 -</p>
-                    <p class="now-team-content" style="margin:0">{{ exceptionAlarm.total }}</p>
-                  </el-row>
-                </div> -->
-                <base-table1 :page="1" :limit="10" :show-index="false" :beilv="1" :table-config="inciseTableProps"
-                  :table-data="inciseList" />
-              </base-container>
-            </el-col>
-            <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-              <!-- 各产线投入数量和产出 -->
-              <base-container :beilv="1" :height="180" :title="'缺陷数据'" :title-icon="'1_3'">
-                <!-- <top-radio-group :data-type="0" @change-time-range="handleChangeChartTable3" /> -->
-                <base-table :page="1" :limit="10" :show-index="false" :beilv="1" :table-config="qualityTableProps"
-                  :table-data="qualityList" />
-              </base-container>
-            </el-col>
-          </el-row>
+      <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
+        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
+          <base-container :title="'切割数据'" :title-icon="'eqAlarm'">
+            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="cutProps"
+              :table-data="cutTableDataList" />
+          </base-container>
         </el-col>
 
-        <el-col :span="16" :style="{ padding: '0 ' + 8 + 'px' }">
-          <!-- 中间栏 -->
-          <el-row>
-            <el-col>
-              <!-- 各产线投入数量折线展示 -->
-              <el-row>
-                <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                  <base-container1 :beilv="1" :title="'能源监控'" :title-icon="'1_5'">
-                    <linear-bar-chart :name-list="cxNameList" :data-list="cxDataList" :height="200" :beilv="1"
-                      :show-legend="true" />
-                  </base-container1>
-                </el-col>
-              </el-row>
+        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
+          <base-container :title="'产量及良率统计'" :title-icon="'productLine'">
+            <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
+              <top-radio-group />
+            </div> -->
+            <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
+            <double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList" :height="359"
+              :show-legend="true" />
+          </base-container>
+        </el-col>
 
-              <!-- 各产线投入产出折线展示 -->
-              <el-row>
-                <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                  <base-container1 :beilv="1" :title="'设备状态监控'" :title-icon="'1_5'">
-                    <div class="visual-select">
-                      <el-select class="coldSelect" v-model="modelMonth" size="mini" placeholder="">
-                        <el-option key="1" value="钢1线" label="钢1线" default />
-                      </el-select>
-                    </div>
-                    <base-table1 :page="1" :limit="5" :show-index="false" :beilv="1"
-                      :table-config="qualityMonthTableProps" :table-data="qualityMonthList" />
-                  </base-container1>
-                </el-col>
-              </el-row>
-
-              <!-- 成品率折线展示 -->
-              <el-row>
-                <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                  <base-container1 :beilv="1" :title="'下片数量统计'" :title-icon="'1_5'">
-                    <linear-bar-chart :id=" 'NumCharts' " :name-list="NumList" :data-list="NumDataList" :height="235"
-                      :beilv="1" :show-legend="true" />
-                  </base-container1>
-                  <!-- <base-container :beilv="1" :title="'成品率折线展示'" :title-icon="'1_6'">
-                    <div style="position:absolute;right:2em;top:3em;width:30em;">
-                      <top-radio-group />
-                    </div>
-                    <line-chart2
-                      :id="'line-chart2'"
-                      :show-legend="true"
-                      :legend-position="'center'"
-                      :legend-data="legendData"
-                      :beilv="1"
-                      :height="'200'"
-                    />
-                  </base-container> -->
-                </el-col>
-              </el-row>
-
-              <!-- 成品率条形图展示 -->
-              <!-- <el-row style="flex-grow: 1; display: flex;">
-                <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                  <base-container title="成品率条形图展示" title-icon="yieldline" :beilv="1">
-                    <linear-bar-chart
-                      :name-list="cplNameList"
-                      :data-list="cplDataList"
-                      :beilv="1"
-                      :show-legend="true"
-                    />
-                  </base-container>
-                </el-col>
-              </el-row> -->
-            </el-col>
-          </el-row>
+        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
+          <base-container :title="'ISRA 缺陷数据'" :title-icon="'eqMonitoring'">
+            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="ISRATableProps"
+              :table-data="ISRAList" />
+          </base-container>
         </el-col>
       </el-row>
+
+      <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="10" type="flex" class="flex-1">
+        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
+          <base-container :height="256" :title="'废片 缺陷数据'" :title-icon="'energyMonitoring'">
+            <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
+              <top-radio-group />
+            </div> -->
+            <!-- <el-row :gutter="9"> -->
+            <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> -->
+            <pile-bar-chart  ref="pileChart" :name-list="EnergyMonitoringNameList" :data-list="EnergyMonitoringList"
+              :height="359" />
+            <!-- </el-col> -->
+            <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
+                <base-table3
+                  :page="2"
+                  :limit="5"
+
+                  :table-config="qualityTableProps2"
+                  :table-data="qualityList2"
+                />
+              </el-col> -->
+            <!-- </el-row> -->
+          </base-container>
+        </el-col>
+        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="14">
+          <base-container :height="318 + 338 + 16" :title="'设备状态监控'" :title-icon="'scrap'">
+            <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
+              <top-radio-group />
+            </div> -->
+            <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
+            <el-col :span="12">
+              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
+                :table-data="funList" />
+            </el-col>
+            <el-col :span="12" style="float: right;">
+              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
+                :table-data="realEqList" />
+            </el-col>
+            <!-- <double-y-chart :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList" :height="359"
+              :show-legend="true" /> -->
+          </base-container>
+        </el-col>
+      </el-row>
+
+      <!-- end  -->
+      <!-- <el-col :span="16">
+              <el-row>
+                <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
+                  <base-container  :height="672">
+                    <base-video :video-height="624"  />
+                  </base-container>
+                </el-col>
+              </el-row>
+            </el-col>
+      -->
     </el-row>
   </div>
 </template>
 
 <script>
 import baseContainer from './components/baseContainer'
-import baseContainer1 from './components/baseContainer1'
-import baseTable from './components/baseTable'
 import baseTable1 from './components/baseTable'
+// import baseTable2 from './components/baseTable'
 // import baseTable3 from './components/baseTable'
-// import TopRadioGroup from './components/topRadioGroup'
-// import LineChart1 from './components/LineChart'
-// import LineChart2 from './components/LineChart'
-import LinearBarChart from './components/linearBarChart'
+import TopRadioGroup from './components/topRadioGroup'
+// import pieChart1 from './components/PieChart'
+// import pieChart2 from './components/PieChart'
+// import pieChart3 from './components/PieChart'
 // import { mapGetters } from 'vuex'
 import screenfull from 'screenfull'
-// import ThreeBarChart from './components/threeBarChart.vue'
-// import SimpleLineChart from './components/SimpleLineChart.vue'
 // import BaseVideo from './components/baseVideo.vue'
+import alarmLevel from './components/alarmLevel'
+import pileBarChart from './components/pileBarChart'
+
 // import axios from '@/utils/request'
-// import { timeFormatter } from '@/filters'
-// import moment from 'moment'
+import doubleYChart from './components/doubleYChart '
 // import elementResizeDetectorMaker from 'element-resize-detector';
 // var erd = elementResizeDetectorMaker(); //创建实例
-const qualityTableProps1 = [
-  {
-    prop: 'createTime',
-    label: '报警时间'
-  },
-  {
-    prop: 'alarmCode',
-    label: '报警编码'
-  },
-  {
-    prop: 'alarmContent',
-    label: '报警内容'
-  }
-]
-const qualityTableProps2 = [
-  {
-    prop: 'createTime',
-    label: '下单时间'
-  },
-  {
-    prop: 'orderCode',
-    label: '订单编码'
-  },
-  {
-    prop: 'orderNumber',
-    label: '订单数量'
-  }
-]
-
-const qualityList1 = [
-  { createTime: '2020/01/01', alarmCode: '3928498293', alarmContent: '故障' },
-  { createTime: '2020/01/02', alarmCode: '3928498294', alarmContent: '故障' },
-  { createTime: '2020/01/03', alarmCode: '3928498292', alarmContent: '故障' },
-  { createTime: '2020/01/04', alarmCode: '3928498291', alarmContent: '故障' },
-  { createTime: '2020/01/05', alarmCode: '3928498296', alarmContent: '故障' },
-  { createTime: '2020/01/06', alarmCode: '3928498298', alarmContent: '故障' }
+// let resizeFun = null
 
+import LinearBarChart from './components/linearBarChart'
+const qualityYearTableProps= []
+const EqMonitoringProps = [
+  { prop: 'productLine', label: '产线' },
+  { prop: 'equipmentName', label: '设备名称' },
+  { prop: 'equipmentCode', label: '设备编码' },
+  {
+    prop: 'status',
+    label: '运行状态',
+    filter: (val) =>
+      val != null ? ['正常', '计划停机', '故障'][val] : '',
+  },
+  {
+    prop: 'error',
+    label: '故障状态',
+    filter: (val) => (val != null ? (val ? '是' : '否') : ''),
+  },
 ]
-const qualityList2 = [
-  { createTime: '2020/01/11', orderCode: '3928498292', orderNumber: '12312' },
-  { createTime: '2020/01/12', orderCode: '3928498291', orderNumber: '21321' },
-  { createTime: '2020/01/13', orderCode: '3928498293', orderNumber: '32121321' },
-  { createTime: '2020/01/14', orderCode: '3928498294', orderNumber: '323213' },
-  { createTime: '2020/01/15', orderCode: '3928498295', orderNumber: '2312312' },
-  { createTime: '2020/01/16', orderCode: '3928498297', orderNumber: '2312312' }
-]
-
-const legendData = [
-  {
-    name: '产线1',
-    icon: 'circle'
-  },
-  {
-    name: '产线2',
-    icon: 'circle'
-  },
-  {
-    name: '产线3',
-    icon: 'circle'
-  },
-  {
-    name: '产线4',
-    icon: 'circle'
-  },
-  {
-    name: '产线5',
-    icon: 'circle'
-  },
-  {
-    name: '产线6',
-    icon: 'circle'
-  }
+const cutProps = [
+  { prop: 'lineName', label: '产线' },
+  { prop: 'time', label: '时间' },
+  { prop: 'size', label: '规格' },
+  { prop: 'productArea', label: '良品面积' },
+  { prop: 'wasteArea', label: '废片面积' },
+  { prop: 'product', label: '良品率' },
 ]
 const cxNameList = ['周一', '周二', '周三', '周四', '周五']
 
@@ -249,381 +199,74 @@ const cxDataList = [
     data: [140, 160, 121, 57, 170]
   }
 ]
-
-const NumList = ['2023.9.11', '2023.9.12', '2023.9.13', '2023.9.14', '2023.9.15', '2023.9.16', '2023.9.17']
-
-const NumDataList = [
+const ISRATableProps = [
   {
-    topColor: '#9DD5FF',
-    bottomColor: '#1295FF',
-    name: '钢一线',
-    data: [100, 150, 121, 97, 140, 132, 123]
+    prop: 'linename',
+    label:'产线'
   },
   {
-    topColor: '#FF8BC3',
-    bottomColor: '#EB46A1',
-    name: '钢二线',
-    data: [110, 110, 151, 77, 110, 55, 111]
+    prop: 'time',
+    label: '时间'
   },
   {
-    topColor: '#85F6E9',
-    bottomColor: '#2EC6B4',
-    name: '钢三线',
-    data: [110, 120, 171, 287, 40, 100, 232]
+    prop: 'type',
+    label:'缺陷类型'
   },
   {
-    topColor: '#9496FF',
-    bottomColor: '#6567FF',
-    name: '钢四线',
-    data: [140, 157, 122, 27, 123, 132, 32]
+    prop: 'num',
+    label: '缺陷数量'
   },
   {
-    topColor: '#9496FF',
-    bottomColor: '#6567FF',
-    name: '钢五线',
-    data: [140, 157, 122, 27, 111, 154, 132]
-  },
-  {
-    topColor: '#9496FF',
-    bottomColor: '#6567FF',
-    name: '钢六线',
-    data: [140, 157, 122, 27, 240, 143, 122]
+    prop: 'percent',
+    label: '占比'
   }
 ]
-
-const cplNameList = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-const cplDataList = [
-  {
-    topColor: '#9DD5FF',
-    bottomColor: '#1295FF',
-    name: '钢一线',
-    data: [100, 150, 121, 97, 140, 180, 127]
-  },
-  {
-    topColor: '#FF8BC3',
-    bottomColor: '#EB46A1',
-    name: '钢二线',
-    data: [110, 110, 151, 77, 110, 151, 77]
-  },
-  {
-    topColor: '#85F6E9',
-    bottomColor: '#2EC6B4',
-    name: '钢三线',
-    data: [110, 120, 171, 287, 40, 160, 127]
-  },
-  {
-    topColor: '#9496FF',
-    bottomColor: '#6567FF',
-    name: '钢四线',
-    data: [140, 157, 122, 27, 240, 180, 127]
-  },
-  {
-    topColor: '#F68E8A',
-    bottomColor: '#E95552',
-    name: '钢五线',
-    data: [170, 180, 127, 17, 340, 180, 255]
-  },
-  {
-    topColor: '#FFE873',
-    bottomColor: '#E7AE2A',
-    name: '钢六线',
-    data: [140, 160, 121, 57, 170, 3, 127]
-  }
-]
-const qualityMonthTableProps = [
-  {
-    prop: 'lineName',
-    label: '产线名'
-  },
-  {
-    prop: 'process',
-    label: '工序'
-  },
-  {
-    prop: 'eqName',
-    label: '设备名'
-  },
-  {
-    prop: 'eqCode',
-    label: '设备编码'
-  },
-  {
-    prop: 'long',
-    label: '总运行时长(h)'
-  },
-  // {
-  //   prop: 'createTime',
-  //   label: '保养时间'
-  // },
-  {
-    prop: 'status',
-    label: '设备状态'
-  }
-  // {
-  //   prop: 'nextCreateTime',
-  //   label: '下次保养时间'
-  // }
-  // {
-  //   prop: 'nextLong',
-  //   label: '距离保养时间(天)',
-  //   // subcomponent: nextDay,
-  //   align: 'center'
-  // }
-]
-
-const qualityMonthList = [
-  {
-    lineName: '钢一线',
-    process: '41',
-    eqName: '设备1',
-    eqCode: '2312312',
-    long: '255',
-    // createTime: '2021-02-25 12:00:01',
-    status: '报警'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 365
-  },
-  {
-    lineName: '钢二线',
-    process: '41',
-    eqName: '设备2',
-    eqCode: '43434',
-    long: '255',
-    // createTime: '2021-11-25 12:00:01',
-    status: '正常'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 4
-  },
-  {
-    lineName: '钢三线',
-    process: '41',
-    eqName: '设备3',
-    eqCode: '23213212',
-    long: '255',
-    // createTime: '2021-10-25 12:00:01',
-    status: '故障停机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 24
-  },
-  {
-    lineName: '钢四线',
-    process: '41',
-    eqName: '设备4',
-    eqCode: '23213',
-    long: '255',
-    // createTime: '2021-02-25 12:00:01',
-    status: '故障停机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: -36
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '255',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '255',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '255',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '255',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '255',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  }
-]
-const qualityTableProps = [
-  {
-    prop: 'createTime',
-    label: '发生时间'
-  },
-  {
-    prop: 'content',
-    label: '缺陷内容'
-  },
-  {
-    prop: 'productLine',
-    label: '产线'
-  },
-  {
-    prop: 'process',
-    label: '发生工序'
-  }
-]
-
-const qualityList = [
-  { createTime: '12:00:01', content: '报废', productLine: '钢一线', process: '磨边' },
-  { createTime: '12:20:51', content: '报废', productLine: '钢二线', process: '镀膜' },
-  { createTime: '11:15:21', content: '报废', productLine: '钢三线', process: '钢化' },
-  { createTime: '11:22:16', content: '报废', productLine: '钢四线', process: '镀膜' },
-  { createTime: '10:30:49', content: '报废', productLine: '钢五线', process: '包装' },
-  { createTime: '10:40:35', content: '报废', productLine: '钢六线', process: '钢化' },
-  { createTime: '10:31:35', content: '报废', productLine: '钢七线', process: '包装' },
-  { createTime: '10:32:35', content: '报废', productLine: '钢八线', process: '钢化' },
-  { createTime: '10:33:35', content: '报废', productLine: '钢一线', process: '磨边' },
-  { createTime: '10:34:35', content: '报废', productLine: '钢二线', process: '镀膜' },
-  { createTime: '10:38:35', content: '报废', productLine: '钢三线', process: '钢化' },
-  { createTime: '10:31:35', content: '报废', productLine: '钢四线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
-  // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' }
-
-  // { createTime: '10:30:35', content: '报废', productLine: '钢六线', process: '镀膜' },
-  // { createTime: '10:30:35', content: '报废', productLine: '钢六线', process: '镀膜' }
-]
-const inciseTableProps = [
-  { prop: 'finishNum', label: '成品数' },
-  { prop: 'scrapNum', label: '废片数' },
-  { prop: 'area', label: '面积' }
-  // { prop: 'count', label: '总数' },
-  // { prop: 'equipmentName', label: '设备名称' }
-]
-// total: 0,
-const inciseList = [
-  { finishNum: '21312', scrapNum: '23', area: '10576.2' },
-  { finishNum: '12353', scrapNum: '20', area: '10572.04' },
-  { finishNum: '32313', scrapNum: '13', area: '12334.24' },
-  { finishNum: '43434', scrapNum: '14', area: '12344.24' },
-  { finishNum: '34334', scrapNum: '15', area: '12344.24' },
-  { finishNum: '43434', scrapNum: '16', area: '12344.24' },
-  { finishNum: '32353', scrapNum: '17', area: '12344.24' },
-  { finishNum: '43434', scrapNum: '10', area: '12434.24' },
-  { finishNum: '43434', scrapNum: '13', area: '12344.24' },
-  { finishNum: '32353', scrapNum: '14', area: '12337.24' },
-  { finishNum: '43434', scrapNum: '10', area: '12323.24' },
-  { finishNum: '43423', scrapNum: '14', area: '12235.24' },
-  { finishNum: '32343', scrapNum: '15', area: '12345.24' },
-  { finishNum: '43434', scrapNum: '18', area: '12455.24' },
-  { finishNum: '43432', scrapNum: '19', area: '12345.24' },
-  { finishNum: '43432', scrapNum: '19', area: '12345.24' }
-]
 export default {
   name: 'ProductionMonitoringCockpit',
   components: {
     baseContainer,
-    baseTable,
     baseTable1,
-    baseContainer1,
-    // baseTable3,
-    // TopRadioGroup,
-    // ThreeBarChart,
-    // SimpleLineChart,
-    // LineChart1,
-    // LineChart2,
+    pileBarChart,
+    TopRadioGroup,
+    doubleYChart,
     LinearBarChart
+    // pieChart1,
+    // pieChart2
+    // pieChart3
     // BaseVideo
   },
   data() {
     return {
-      exceptionAlarm: {
-        inciseTableProps: [
-          { prop: 'finishNum', label: '成品数' },
-          { prop: 'scrapNum', label: '废片数' },
-          { prop: 'area', label: '面积' }
-          // { prop: 'count', label: '总数' },
-          // { prop: 'equipmentName', label: '设备名称' }
-        ],
-        total: 0,
-        inciseList: [
-          { finishNum: '21312', scrapNum: '23', area: '10576.2' },
-          { finishNum: '12353', scrapNum: '10', area: '1057.04' },
-          { finishNum: '32353', scrapNum: '10', area: '12333.24' }
-        ]
-      },
-      inAndOutOfEachLine: {
-        tableProps: [
-          { prop: 'pdName', label: '产线名' },
-          { prop: 'in', label: '上片数量' },
-          { prop: 'out', label: '下片数量' },
-          { prop: 'rate', label: '比率' }
-          // {
-          //   prop: 'rate',
-          //   label: '比率',
-          //   filter: val => {
-          //     if (val !== null && val !== undefined && val.trim() !== '') return `${(val * 100).toFixed(2)}%`
-          //     else return '-'
-          //   }
-          // }
-        ],
-        total: 0,
-        list: []
-      },
-      qualityMonthTableProps,
-      qualityMonthList,
-      orderProcessList: [],
-      beilv: 1,
       beilv2: 1,
+      beilv: 1,
       value: 100,
-      isFullScreen: false,
-      qualityTableProps1,
-      qualityList1,
-      qualityList,
-      qualityTableProps,
-      qualityTableProps2,
-      qualityList2,
-      dateType: '0',
-      inciseTableProps,
-      inciseList,
-      legendData,
+      EqMonitoringProps,
+      realEqList:[],
+      qualityYearTableProps,
+      ISRATableProps,
+      orderList: [],
+      times: '',
+      ISRAList:[],
+      EnergyMonitoringNameList: [],
+      equipmentList: [],
+      EnergyMonitoringList: [],
+      // offsetWidth: null,
       cxNameList,
       cxDataList,
-      NumList,
-      NumDataList,
-      modelMonth: '',
-      cplNameList,
-      cplDataList,
-      times:'',
-      plInput: {},
-      plOutput: {},
-      plRate: {},
-      loadTable: false,
-      standardCategory: null
+      cutProps,
+      cutTableDataList:[],
+      clientWidth: 0,
+      containerWidth: 111111,
+      isFullScreen: false,
+      // orderProcessList: [],
+      dateType: '0',
+      funList:[],
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        equipmentId: null,
+        productionLineId: null,
+      },
     }
   },
   computed: {
@@ -632,35 +275,35 @@ export default {
       const v = Math.floor(this.value * this.beilv2 * 100) / 10000
       return {
         transform: `scale(${v})`,
-        transformOrigin: 'left top'
-        // overflow: hidden;
+        transformOrigin: 'top left'
       }
     }
   },
-  // watch: {
-  //   clientWidth(val) {
-  //     if (!this.timer) {
-  //       this.clientWidth = val
-  //       this.beilv2 = this.clientWidth / 1920
-  //       this.timer = true
-  //       let _this = this
-  //       setTimeout(function () {
-  //         _this.timer = false
-  //       }, 500)
-  //     }
-  //     // 这里可以添加修改时的方法
-  //     this.windowWidth(val);
-  //   }
-  // },
+
+  watch: {
+    clientWidth(val) {
+      if (!this.timer) {
+        this.clientWidth = val
+        this.beilv2 = this.clientWidth / 1920
+        this.timer = true
+        let _this = this
+        setTimeout(function () {
+          _this.timer = false
+        }, 500)
+      }
+      // 这里可以添加修改时的方法
+      this.windowWidth(val);
+    }
+  },
   created() {
     // this.fetchList('exception-alarm')
     // this.fetchList('inAndOutOfEachLine')
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
-    this.windowWidth(document.documentElement.clientWidth)
   },
   mounted() {
+    this.initWebSocket()
     this.getTimes()
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
@@ -670,6 +313,14 @@ export default {
         this.beilv2 = _this.clientWidth / 1920
       })()
     }
+    this.getList()
+    // const _this = this;
+    // window.onresize = () => {
+    //   return (() => {
+    //     _this.clientWidth = `${document.documentElement.clientWidth}`
+    //     this.beilv2 = _this.clientWidth / 1920
+    //   })()
+    // }
     // this.beilv2 = window.innerWidth / 1920
     // addEventListener('resize', resizeFun = () => {
     //   this.beilv2 = window.innerWidth / 1920
@@ -688,6 +339,32 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getList() {
+      // this.loading = true;
+      // 执行查询
+      // let data = '{ "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }'
+      // let obj = JSON.parse(data)
+      // console.log('data', obj.data.FanFrequencyInfo)
+      // // for()
+      // let arr = []
+      // for (let i in obj.data.FanFrequencyInfo) {
+      //   arr.push({
+      //     equipmentName: i,
+      //     status: obj.data.FanFrequencyInfo[i]
+      //   })
+      // }
+      this.funList = arr``
+      this.$axios.get(
+        '/monitoring/equipment-monitor/realtime-page',
+        'get',
+        this.queryParams
+      ).then((res) => {
+        console.log(res);
+        this.realEqList = res.data.list;
+        // this.total = response.data.total;
+        // this.loading = false;
+      });
+    },
     getTimes() {
       setInterval(this.getTimesInterval, 1000);
     },
@@ -712,36 +389,237 @@ export default {
       //拼接格式化当前时间
       this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
     },
+    initWebSocket() {
+      if (typeof (WebSocket) === 'undefined') {
+        alert('您的浏览器不支持WebSocket')
+      } else {
+        // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
+        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
+        let date = new Date().valueOf()
+        console.log(date);
+        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=COLD${date}`
+        this.SJGWebsocket = new WebSocket(SJGWsUrl)
+        // 监听 WebSocket 连接
+        this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.SJGWebsocket.onerror = this.SJGWebsocketOnError
+        // 监听 WebSocket 消息
+        this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.SJGWebsocket.onclose = this.SJGWebsocketClose
+        const cutWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=CUTTING${date}`
+
+        this.cutWebsocket = new WebSocket(cutWsUrl)
+        // 监听 WebSocket 连接
+        this.cutWebsocket.onopen = this.cutWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.cutWebsocket.onerror = this.cutWebsocketOnError
+        // 监听 WebSocket 消息
+        this.cutWebsocket.onmessage = this.cutWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.cutWebsocket.onclose = this.cutWebsocketClose
+        const funWsUrl = `ws://10.70.180.10:8081/xc-screen/websocket/${date}`
+        this.funWebsocket = new WebSocket(funWsUrl)
+        // 监听 WebSocket 连接
+        this.funWebsocket.onopen = this.funWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.funWebsocket.onerror = this.funWebsocketOnError
+        // 监听 WebSocket 消息
+        this.funWebsocket.onmessage = this.funWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.funWebsocket.onclose = this.funWebsocketClose
+        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
+        // 实例化 WebSocket
+        // this.websocket = new WebSocket(wsUrl)
+        // // 监听 WebSocket 连接
+        // this.websocket.onopen = this.websocketOnOpen
+        // // 监听 WebSocket 错误信息
+        // this.websocket.onerror = this.websocketOnError
+        // // 监听 WebSocket 消息
+        // this.websocket.onmessage = this.websocketOnMessage
+        // // 监听 webSocket 断开信息
+        // this.websocket.onclose = this.websocketClose
+      }
+    },
+    funWebsocketOnOpen() {
+      console.log('socket连接成功')
+      // console.log(this.SJGWebsocket.onmessage);
+      this.SJGWebsocket.onmessage()
+    },
+    // 连接建立失败重连
+    funWebsocketOnError(e) {
+      console.log('222222', e)
+      this.initWebSocket()
+    },
+    // 数据接收
+    funWebsocketOnMessage(e) {
+      // console.log(1111, e)
+      // console.log(this.wsData)
+      // console.log('22222', this.wsData.data)
+      this.wsData = JSON.parse(e.data)
+      if (this.wsData.type === 'FanFrequencyInfo') {
+        // let arr = []
+        // for (let i in this.wsData.FanFrequencyInfo) {
+        //   arr.push({
+        //     equipmentName: i,
+        //     status: obj.data.FanFrequencyInfo[i]
+        //   })
+        // }
+        // this.funList = arr
+      }
+    },
+    cutWebsocketOnOpen() {
+      console.log('socket连接成功')
+      // console.log(this.SJGWebsocket.onmessage);
+      this.SJGWebsocket.onmessage()
+    },
+    // 连接建立失败重连
+    cutWebsocketOnError(e) {
+      console.log('11111', e)
+      this.initWebSocket()
+    },
+    // 数据接收
+    cutWebsocketOnMessage(e) {
+      // console.log(1111, e)
+      this.wsData = JSON.parse(e.data)
+      console.log(this.wsData)
+      // console.log('22222', this.wsData.data)
+      if (this.wsData.type === 'cutting' && this.wsData.name === 'table' ) {
+        this.cutTableDataList = this.wsData.productHourData.map((ele, index) => {
+          // if (ele.progressRate != 1) {
+          return {
+            id: ele.id,
+            lineName: ele.lineName,
+            time: ele.time,
+            size: ele.size,
+            productArea: ele.productArea + '㎡',
+            wasteArea: ele.wasteArea + '㎡',
+            product: (ele.product *100).toFixed + '%'
+
+          }
+          // }
+        });
+        // console.log(this.orderList)
+      } else if (this.wsData.type === 'cutting' && this.wsData.name === 'chart') {
+        let nameList = []
+        let nameWasteList = []
+        let topNameList = []
+        let productList = []
+        let wasteList = []
+        let sumAreaList = []
+        let yieldList = []
+        this.cutTableDataList = this.wsData.detData.forEach((ele, index) => {
+          nameList.push(ele.lineName)
+          topNameList.push(ele.lineName + '   ' + '总面积' + ele.sumArea)
+          productList.push(ele.productArea)
+          wasteList.push(ele.wastArea)
+          nameWasteList.push('缺陷面积:'+ele.wastArea)
+        })
+        this.$refs.pileChart.initChart(nameList, topNameList, nameWasteList, productList, wasteList)
+        this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
+        // this.$refs.pileChart.initWebSocket
+        // console.log(this.orderList)
+      }
+    },
+    SJGWebsocketOnOpen() {
+      console.log('socket连接成功')
+      // console.log(this.SJGWebsocket.onmessage);
+      this.SJGWebsocket.onmessage()
+    },
+    // 连接建立失败重连
+    SJGWebsocketOnError(e) {
+      console.log('11111', e)
+      this.initWebSocket()
+    },
+    // 数据接收
+    SJGWebsocketOnMessage(e) {
+      console.log(e);
+      // console.log(1111, e)
+      // let data = { "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }
+      // let obj = JSON.parse(data.data)
+      // console.log(obj);
+      this.wsData = JSON.parse(e.data)
+      console.log(this.wsData)
+      // console.log('22222', this.wsData.data)
+      if (this.wsData.type === 'isra') {
+        this.ISRAList = this.wsData.detData.map((ele, index) => {
+          // if (ele.progressRate != 1) {
+          return {
+            id: ele.id,
+            linename: ele.linename,
+            type: ele.type,
+            num: ele.num,
+            time:ele.time,
+            percent: ele.percent
+          }
+          // }
+        });
+        // console.log(this.orderList)
+      }
+    },
+    // 数据发送
+    // SJGWebsocketSend() {
+    //   this.websocket.send('11111')
+    // },
+    // // 关闭
+    // SJGWebsocketClose(e) {
+    //   console.log('WebSocket 断开连接', e)
+    // },
+    // // 连接建立之后执行send方法发送数据
+    // websocketOnOpen() {
+    //   console.log('socket连接成功')
+    //   this.websocket.onmessage()
+    // },
+    // // 连接建立失败重连
+    // websocketOnError(e) {
+    //   console.log('11111', e)
+    //   this.initWebSocket()
+    // },
+    // // 数据接收
+    // websocketOnMessage(e) {
+    //   console.log(1111, e)
+    //   this.wsData = JSON.parse(e.data)
+    //   // console.log('22222', this.wsData.data)
+    //   if (this.wsData.type === 'EnergyMonitoring') {
+    //     let EnergyNameList = []
+    //     this.wsData.data.forEach((ele) => {
+    //       EnergyNameList.push(ele.lineName)
+    //     })
+    //     this.EnergyMonitoringNameList = EnergyNameList
+    //     let EnergyDataList = []
+    //     this.wsData.data.forEach((ele) => {
+    //       EnergyDataList.push(ele.useQuantity
+    //         // {
+    //         //   type: 'bar',
+    //         //   data: ele.useQuantity,
+    //         //   barWidth: 6
+
+    //         // }
+    //       )
+    //     })
+    //     this.EnergyMonitoringList = EnergyDataList
+    //     console.log(EnergyDataList)
+    //     // console.log(this.EnergyMonitoringNameList)
+    //     // console.log(this.EnergyMonitoringList)
+    //     // this.$nextTick(() => {
+    //     this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
+    //     // })
+    //   }
+    // },
+    // // 数据发送
+    // websocketSend() {
+    //   this.websocket.send('11111')
+    // },
+    // // 关闭
+    // websocketClose(e) {
+    //   console.log('WebSocket 断开连接', e)
+    // },
     windowWidth(value) {
       this.clientWidth = value
       this.beilv2 = this.clientWidth / 1920
     },
-    // erd.listenTo(document.getElementById("box"), (element) => {
-    //   var width = element.offsetWidth;
-    //   var height = element.offsetHeight;
-    // })
     // fetchList(type) {
     //   switch (type) {
-    //     case 'exception-alarm': {
-    //       return axios({
-    //         url: '/analysis/factory-monitor/alarm',
-    //         method: 'post'
-    //       }).then(res => {
-    //         if (res.data.length) {
-    //           this.exceptionAlarm.list = res.data
-    //           res.data.forEach(item => {
-    //             if (item.count) {
-    //               this.exceptionAlarm.total = item.count
-    //             }
-    //           })
-    //         } else {
-    //           this.exceptionAlarm.total = 0
-    //           this.exceptionAlarm.list.splice(0)
-    //         }
-    //       })
-    //     }
-    //     case 'inAndOutOfEachLine':
-    //       return this.handleChangeChartTable3('0')
     //     case 'order-process':
     //       return axios({
     //         url: '/analysis/factory-monitor/order',
@@ -763,28 +641,23 @@ export default {
     //           this.orderProcessList.splice(0)
     //         }
     //       })
-    //     case 'line-chart-data':
-    //       return this.handleChangeOptions('all', '0')
     //   }
     // },
-
     change() {
       this.isFullScreen = screenfull.isFullscreen
     },
-
     init() {
       if (screenfull.enabled) {
         screenfull.on('change', this.change)
       }
     },
-
     destroy() {
       if (screenfull.enabled) {
         screenfull.off('change', this.change)
       }
     },
-
     changeFullScreen() {
+      this.containerWidth = 223223223
       if (!screenfull.enabled) {
         this.$message({
           message: 'you browser can not work',
@@ -793,275 +666,49 @@ export default {
         return false
       }
       screenfull.toggle(this.$refs.container)
-    },
-
-    /**
-     * 当切换当天、一周、一个月数据时
-     * @param {string} chartId - '投入数量图', '产出数量图', '投入产出比'
-     * @param {string} optValue - '0','1','2'
-     */
-    // handleChangeOptions(chartId, optValue) {
-    //   let startTime
-    //   let endTime
-    //   const url = '/analysis/factory-monitor/pdlNumTime'
-    //   const method = 'post'
-    //   switch (optValue) {
-    //     case '0': {
-    //       const baseTime = moment().set({ hour: 0, minute: 0, second: 0 })
-    //       startTime = baseTime.format('YYYY-MM-DDTHH:mm:ss')
-    //       endTime = baseTime.set({ hour: 23, minute: 59, second: 59 }).format('YYYY-MM-DDTHH:mm:ss')
-    //       break
-    //     }
-    //     case '1': {
-    //       startTime = moment()
-    //         .subtract(1, 'week')
-    //         .set({ hour: 0, minute: 0, second: 0 })
-    //         .format('YYYY-MM-DDTHH:mm:ss')
-    //       endTime = moment().format('YYYY-MM-DDTHH:mm:ss')
-    //       break
-    //     }
-    //     case '2': {
-    //       startTime = moment()
-    //         .subtract(1, 'month')
-    //         .set({ hour: 0, minute: 0, second: 0 })
-    //         .format('YYYY-MM-DDTHH:mm:ss')
-    //       endTime = moment().format('YYYY-MM-DDTHH:mm:ss')
-    //       break
-    //     }
-    //   }
-
-    //   return axios({
-    //     url,
-    //     method,
-    //     data: {
-    //       startTime,
-    //       endTime
-    //     }
-    //   }).then(res => {
-    //     console.log('res', res)
-    //     switch (chartId) {
-    //       case '投入数量图':
-    //         this.plInput = {}
-    //         res.data.forEach(item => {
-    //           if (!this.standardCategory) {
-    //             this.standardCategory = item.series
-    //           }
-
-    //           item.data.forEach((category, index) => {
-    //             if (!isNaN(Number(category.time))) {
-    //               category.time = +category.time
-    //             }
-    //             if (this.plInput[item.pdName]) {
-    //               this.$set(this.plInput[item.pdName], [category.time], category.in)
-    //             } else {
-    //               this.$set(this.plInput, [item.pdName], { [category.time]: category.in })
-    //             }
-    //           })
-    //         })
-    //         /** 填充 key */
-    //         this.fillKey(this.plInput, this.standardCategory)
-    //         this.standardCategory = null
-    //         break
-    //       case '产出数量图':
-    //         this.plOutput = {}
-    //         res.data.forEach(item => {
-    //           if (!this.standardCategory) {
-    //             this.standardCategory = item.series
-    //           }
-
-    //           item.data.forEach((category, index) => {
-    //             if (!isNaN(Number(category.time))) {
-    //               category.time = +category.time
-    //             }
-    //             if (this.plOutput[item.pdName]) {
-    //               this.$set(this.plOutput[item.pdName], [category.time], category.out)
-    //             } else {
-    //               this.$set(this.plOutput, [item.pdName], { [category.time]: category.out })
-    //             }
-    //           })
-    //         })
-    //         /** 填充 key */
-    //         this.fillKey(this.plOutput, this.standardCategory)
-    //         this.standardCategory = null
-    //         break
-    //       case '投入产出比':
-    //         this.plRate = {}
-    //         res.data.forEach(item => {
-    //           if (!this.standardCategory) {
-    //             this.standardCategory = item.series
-    //           }
-
-    //           item.data.forEach((category, index) => {
-    //             if (!isNaN(Number(category.time))) {
-    //               category.time = +category.time
-    //             }
-    //             if (this.plRate[item.pdName]) {
-    //               this.$set(this.plRate[item.pdName], [category.time], category.rate)
-    //             } else {
-    //               this.$set(this.plRate, [item.pdName], { [category.time]: category.rate })
-    //             }
-    //           })
-    //         })
-    //         /** 填充 key */
-    //         this.fillKey(this.plRate, this.standardCategory)
-    //         this.standardCategory = null
-    //         break
-    //       case 'all':
-    //         res.data.forEach(item => {
-    //           /** 保存x轴的标准分类，因为数据会有缺失，标准分类用于校验哪些数据缺失 */
-    //           if (!this.standardCategory) {
-    //             this.standardCategory = item.series
-    //           }
-    //           /** if valid */
-    //           if (item.data.length) {
-    //             /** handle data */
-    //             item.data.forEach((category, index) => {
-    //               if (!isNaN(Number(category.time))) {
-    //                 category.time = +category.time
-    //               }
-
-    //               if (this.plInput[item.pdName]) {
-    //                 this.$set(this.plInput[item.pdName], [category.time], category.in)
-    //               } else {
-    //                 this.$set(this.plInput, [item.pdName], { [category.time]: category.in })
-    //               }
-
-    //               if (this.plOutput[item.pdName]) {
-    //                 this.$set(this.plOutput[item.pdName], [category.time], category.out)
-    //               } else {
-    //                 this.$set(this.plOutput, [item.pdName], { [category.time]: category.out })
-    //               }
-
-    //               if (this.plRate[item.pdName]) {
-    //                 this.$set(this.plRate[item.pdName], [category.time], category.rate)
-    //               } else {
-    //                 this.$set(this.plRate, [item.pdName], { [category.time]: category.rate })
-    //               }
-    //             })
-    //           }
-    //         })
-
-    //         /** 填充 key */
-    //         this.fillKey(this.plInput, this.standardCategory)
-    //         this.fillKey(this.plOutput, this.standardCategory)
-    //         this.fillKey(this.plRate, this.standardCategory)
-
-    //         this.loadTable = true
-    //         this.standardCategory = null
-    //         break
-    //     }
-    //   })
-    // },
-
-    fillKey(obj, keyList) {
-      for (const [legend, child] of Object.entries(obj)) {
-        /** 数量相等，就不继续执行了 */
-        if (Object.keys(child).length === keyList) return
-        const newChild = {}
-        keyList.forEach(key => {
-          if (!isNaN(Number(key))) {
-            key = +key
-          }
-
-          if (child[key] === undefined) {
-            newChild[key] = null
-          } else {
-            newChild[key] = child[key]
-          }
-        })
-        obj[legend] = newChild
-      }
-    },
-
-    // handleChangeChartTable3(v) {
-    //   let startTime
-    //   let endTime
-    //   switch (v) {
-    //     case '0': {
-    //       const baseTime = moment().set({ hour: 0, minute: 0, second: 0 })
-    //       startTime = baseTime.format('YYYY-MM-DDTHH:mm:ss')
-    //       endTime = baseTime.add(1, 'd').format('YYYY-MM-DDTHH:mm:ss')
-    //       break
-    //     }
-    //     case '1': {
-    //       startTime = moment()
-    //         .startOf('week')
-    //         .set({ hour: 0, minute: 0, second: 0 })
-    //         .format('YYYY-MM-DDTHH:mm:ss')
-    //       endTime = moment(new Date()).format('YYYY-MM-DDTHH:mm:ss')
-    //       break
-    //     }
-    //     case '2': {
-    //       startTime = moment()
-    //         .startOf('month')
-    //         .set({ hour: 0, minute: 0, second: 0 })
-    //         .format('YYYY-MM-DDTHH:mm:ss')
-    //       endTime = moment(new Date()).format('YYYY-MM-DDTHH:mm:ss')
-    //       break
-    //     }
-    //   }
-    //   /** 请求数据 */
-    //   axios({
-    //     url: '/analysis/factory-monitor/pdlNum',
-    //     method: 'post',
-    //     data: {
-    //       startTime,
-    //       endTime
-    //     }
-    //   }).then(res => {
-    //     // inAndOutOfEachLine
-    //     if (res.data) {
-    //       this.inAndOutOfEachLine.total = res.data.length
-    //       this.inAndOutOfEachLine.list = res.data
-    //     } else {
-    //       this.inAndOutOfEachLine.total = 0
-    //       this.inAndOutOfEachLine.list.splice(0)
-    //     }
-    //   })
-    // }
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
 .visual-container {
-  // width: 100%;
   width: 1920px;
   height: 1080px;
   background: url('../../assets/img/OperationalOverview/back.png') no-repeat;
   background-size: cover;
-  // height: 100vh;
+
+  // opacity: .8;
   .container-title {
     width: 100%;
     background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
     background-size: 100% 100%;
     color: #00fff0;
     text-align: center;
-   .unit {
+
+    .unit {
       position: absolute;
       left: 260px;
       top: 25px;
       font-size: 20px;
     }
+
     .time {
       position: absolute;
       left: 1360px;
       top: 25px;
       font-size: 20px;
     }
+
     .title-button {
       color: #00fff0;
       font-size: 20px;
       position: absolute;
     }
   }
- .visual-select {
-   position: absolute;
-   right: 1em;
-   top: 2em;
- }
+
   .container-main {
-    padding: 6px;
+    padding: 10px;
   }
 }
 
@@ -1095,9 +742,19 @@ export default {
   background-color: unset;
   background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }
+
+.visual-select {
+  position: absolute;
+  right: 1em;
+  top: 2em;
+}
+
+// .container-main {
+//    padding: 5px;
+//  }
 </style>
 
-<style lang="scss" >
+<style lang="scss">
 .visual-container {
   ::-webkit-scrollbar {
     width: 8px;
@@ -1136,24 +793,25 @@ export default {
     background-color: rgba($color: #5bc4be, $alpha: 1);
   }
 }
-.coldSelect{
+
+.coldSelect {
   .el-input {
-      min-height: 10px;
-    }
+    min-height: 10px;
+  }
 
-    .el-input__inner {
-      background-color: rgba($color: #31878c, $alpha: 0.29);
-      border: rgba($color: #31878c, $alpha: 0.29);
-      color: aliceblue;
-    }
+  .el-input__inner {
+    background-color: rgba($color: #31878c, $alpha: 0.29);
+    border: rgba($color: #31878c, $alpha: 0.29);
+    color: aliceblue;
+  }
 
-    .el-divider--vertical {
-      height: 174px;
-      width: 1px;
-      border: rgba(255, 255, 255, 0.15);
-      color: rgba(255, 255, 255, 0.15);
-      margin-left: 3em;
-    }
+  .el-divider--vertical {
+    height: 174px;
+    width: 1px;
+    border: rgba(255, 255, 255, 0.15);
+    color: rgba(255, 255, 255, 0.15);
+    margin-left: 3em;
+  }
 }
 </style>
 
@@ -1165,9 +823,11 @@ export default {
 .flex-1 {
   flex: 1 1;
 }
- .h-full {
-  height: calc(100vh);
+
+.h-full {
+  height: calc(100vh - 150px);
 }
+
 /* .container-main {
   min-height: calc(100vh - 10em);
 } */
diff --git a/src/views/OperationalOverview/components/baseTable.vue b/src/views/OperationalOverview/components/baseTable.vue
index 52fc5ca8..83fbf703 100644
--- a/src/views/OperationalOverview/components/baseTable.vue
+++ b/src/views/OperationalOverview/components/baseTable.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2020-12-14 09:07:03
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-14 10:11:09
+ * @LastEditTime: 2023-12-28 09:00:44
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseTable.vue
  * @Description:
 -->
@@ -16,9 +16,8 @@
       style="width: 100%; background: transparent"
     >
       <el-table-column
-        v-if="page && limit && showIndex"
         prop="_pageIndex"
-        :label="'tableHeader.index' | i18nFilter"
+        label="序号"
         :width="70"
         align="center"
       />
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index 3b91bfb8..7355968c 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue	
+++ b/src/views/OperationalOverview/components/doubleYChart .vue	
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2023-10-16 14:20:45
+ * @LastEditTime: 2023-12-27 18:28:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -60,98 +60,17 @@ export default {
   data() {
     return {
       chart: null,
-      series: []
+      nameList: [],
+      series: [{
+        type: 'bar',
+        data: [],
+        barWidth: 6
+      }]
     }
   },
   mounted() {
     console.log('mounted')
     console.log('borderRadius: ', this.borderRadius)
-
-    this.series = [
-      {
-        name: this.dataList[0].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[0].topColor },
-            { offset: 1, color: this.dataList[0].bottomColor }
-          ]),
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[0].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[1].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[1].topColor },
-            { offset: 1, color: this.dataList[1].bottomColor }
-          ]),
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[1].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[2].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[2].topColor },
-            { offset: 1, color: this.dataList[2].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[2].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[3].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[3].topColor },
-            { offset: 1, color: this.dataList[3].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[3].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[4].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[4].topColor },
-            { offset: 1, color: this.dataList[4].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[4].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[5].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[5].topColor },
-            { offset: 1, color: this.dataList[5].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[5].data,
-        barWidth: 6
-      }
-    ]
-
     this.$nextTick(() => {
       this.initChart()
     })
@@ -164,8 +83,50 @@ export default {
     this.chart = null
   },
   methods: {
-    initChart() {
-      console.log(1)
+    initChart(nameList, passRateList, outputNumList) {
+     let  series= [
+        {
+          name: '产线产量',
+          type: 'bar',
+          yAxisIndex: 1,
+          itemStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#9DD5FF' },
+              { offset: 1, color: '#1295FF' }
+            ])
+            // barBorderRadius: this.borderRadius
+          },
+          barWidth: 12,
+         data: outputNumList
+        },
+        {
+          name: '产线良品率',
+          type: 'line',
+          yAxisIndex: 0,
+          areaStyle: {
+            opacity: 0.8,
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgba(255, 209, 96, 0.18)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(255, 234, 153, 0)'
+              }
+            ])
+          },
+          itemStyle: {
+            normal: {
+              color: 'rgba(255, 209, 96, 1)', //改变折线点的颜色
+              lineStyle: {
+                color: 'rgba(255, 209, 96, 1)' //改变折线颜色
+              }
+            }
+          },
+          data: passRateList
+        }
+      ]
       const colors = ['#5470C6', '#91CC75', '#EE6666']
       this.chart = echarts.init(document.getElementById(this.id))
       this.chart.setOption({
@@ -177,7 +138,12 @@ export default {
           }
         },
         grid: {
-          right: '20%'
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          width: 'auto',
+          height: "auto",
+          containLabel: true
         },
         legend: {
           data: ['产线产量', '产线良品率'],
@@ -205,7 +171,7 @@ export default {
               color: '#213259'
             }
           },
-          data: ['钢一线', '钢二线', '钢三线', '钢四线', '钢五线', '钢六线', '钢七线', '钢八线']
+          data: nameList
         },
         // yAxis: {
 
@@ -236,8 +202,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: '#ced1d5', // 坐标值得具体的颜色
-                formatter: '{value} 片'
-
+                formatter: '{value}%'
               }
             },
             splitLine: {
@@ -295,29 +260,7 @@ export default {
             // },
           }
         ],
-        series: [
-          {
-            name: '产线产量',
-            type: 'bar',
-            yAxisIndex: 1,
-            itemStyle: {
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 0, color: '#9DD5FF' },
-                { offset: 1, color: '#1295FF' }
-              ])
-              // barBorderRadius: this.borderRadius
-            },
-            data: [
-              2032, 3032, 1802, 2932, 2322, 2613, 2873, 2561
-            ]
-          },
-          {
-            name: '产线良品率',
-            type: 'line',
-            yAxisIndex: 0,
-            data: [98, 97, 94, 97.6, 98.2, 98.2, 97.4, 98.5]
-          }
-        ]
+        series: series
       })
     }
   }
diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue
index 9dea0694..a2e9f1c1 100644
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -41,113 +41,39 @@ export default {
       type: Boolean,
       default: false
     },
-    nameList: {
-      type: Array,
-      default: () => []
-    },
-    dataList: {
-      type: Array,
-      default: () => []
-    }
+    // nameList: {
+    //   type: Array,
+    //   default: () => []
+    // },
+    // dataList: {
+    //   type: Array,
+    //   default: () => []
+    // }
   },
   data() {
     return {
       chart: null,
-      series: []
+      nameList: [],
+      series: [{
+        type: 'bar',
+        data: [],
+        barWidth: 6
+
+      }]
     }
   },
   mounted() {
     console.log('mounted')
     console.log('borderRadius: ', this.borderRadius)
-
-    this.series = [
-      {
-        name: this.dataList[0].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[0].topColor },
-            { offset: 1, color: this.dataList[0].bottomColor }
-          ]),
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[0].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[1].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[1].topColor },
-            { offset: 1, color: this.dataList[1].bottomColor }
-          ]),
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[1].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[2].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[2].topColor },
-            { offset: 1, color: this.dataList[2].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[2].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[3].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[3].topColor },
-            { offset: 1, color: this.dataList[3].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[3].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[4].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[4].topColor },
-            { offset: 1, color: this.dataList[4].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[4].data,
-        barWidth: 6
-      },
-      {
-        name: this.dataList[5].name,
-        type: 'bar',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: this.dataList[5].topColor },
-            { offset: 1, color: this.dataList[5].bottomColor }
-          ]),
-          // borderRadius: [5, 5, 0, 0]
-          barBorderRadius: this.borderRadius
-        },
-        data: this.dataList[5].data,
-        barWidth: 6
-      }
-    ]
-
-    this.$nextTick(() => {
-      this.initChart()
-    })
+    // console.log('33333', this.dataList)
+    // let arr = []
+    // this.dataList.forEach(ele => {
+      // console.log(ele);
+    // this.series = []
+    this.initChart()
+    // this.$nextTick(() => {
+    //   // this.initChart()
+    // })
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -157,9 +83,20 @@ export default {
     this.chart = null
   },
   methods: {
-    initChart() {
-      console.log(1)
+    initChart(nameList,dataList) {
+      // console.log(1)
       this.chart = echarts.init(document.getElementById(this.id))
+      if (dataList.length !== 0) {
+        // this.$set(this.series, "data", dataList);
+        this.series = [{
+          type: 'bar',
+          data: dataList,
+          barWidth: 6
+        }]
+      }
+      if (nameList.length !== 0) {
+        this.nameList = nameList
+      }
       this.chart.setOption({
         tooltip: {
           trigger: 'axis',
@@ -216,19 +153,19 @@ export default {
           },
           type: 'value'
         },
-        legend: {
-          itemHeight: 10,
-          itemWidth: 10,
-          x: 'center', // 可设定图例在左、右、居中
-          y: 'top', // 可设定图例在上、下、居中
-          show: this.showLegend,
-          data: this.dataList,
-          right: '1%',
-          textStyle: {
-            fontSize: 12 * this.beilv,
-            color: '#ced1d5'
-          }
-        },
+        // legend: {
+        //   itemHeight: 10,
+        //   itemWidth: 10,
+        //   x: 'center', // 可设定图例在左、右、居中
+        //   y: 'top', // 可设定图例在上、下、居中
+        //   show: this.showLegend,
+        //   data: this.dataList,
+        //   right: '1%',
+        //   textStyle: {
+        //     fontSize: 12 * this.beilv,
+        //     color: '#ced1d5'
+        //   }
+        // },
         series: this.series
       })
     }
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
new file mode 100644
index 00000000..01d7a6b3
--- /dev/null
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -0,0 +1,235 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-12-27 13:54:52
+ * @LastEditTime: 2023-12-27 19:47:27
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <div :id="id" :class="className" :style="{ height: height + 'px', width: width }" />
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import 'echarts/theme/macarons' // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  name: 'OverviewBar',
+  mixins: [resize],
+  props: {
+    id: {
+      type: String,
+      default: 'linearBarChart'
+    },
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    borderRadius: {
+      type: Array,
+      default: () => [9, 9, 0, 0]
+    },
+    beilv: {
+      type: Number,
+      default: 1
+    },
+    height: {
+      type: Number,
+      default: 200
+    },
+    showLegend: {
+      type: Boolean,
+      default: false
+    },
+    // nameList: {
+    //   type: Array,
+    //   default: () => []
+    // },
+    // dataList: {
+    //   type: Array,
+    //   default: () => []
+    // }
+  },
+  data() {
+    return {
+      chart: null,
+      nameList: [],
+      series: [{
+        type: 'bar',
+        data: [],
+        barWidth: 6
+
+      }]
+    }
+  },
+  mounted() {
+    console.log('mounted')
+    // console.log('borderRadius: ', this.borderRadius)
+    // console.log('33333', this.dataList)
+    // let arr = []
+    // this.dataList.forEach(ele => {
+      // console.log(ele);
+    // this.series = []
+    this.initChart()
+    // this.$nextTick(() => {
+    //   // this.initChart()
+    // })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
+      // console.log(1)
+      this.chart = echarts.init(document.getElementById(this.id))
+      let series = [{
+        name: '成品面积',
+        type: 'bar',
+        stack: 'total',
+        // label: {
+        //   show: true
+        // },
+        emphasis: {
+          focus: 'series'
+        },
+        data: passRateList,
+        itemStyle: {
+          normal: { color: '#2359ec' }
+        }
+      },
+      {
+        name: '废片面积',
+        type: 'bar',
+        stack: 'total',
+        // label: {
+        //   show: true
+        // },
+        emphasis: {
+          focus: 'series'
+        },
+        barWidth: 12,
+        data: wasteList,
+        itemStyle: {
+          normal: { color: '#745fe4' }
+        }
+      },]
+      // for (i = 0; i < 5; i++) {
+      //   series.push({
+
+      //   })
+      // }
+      const yAxisDataLeft = topNameList;
+      // const yAxisDataRight = ['服装', '矿产', '服务业', '建筑业', '金融业'];
+      const yAxisDataRight = nameWasteList
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            // Use axis to trigger tooltip
+            type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+          }
+        },
+        // legend: {},
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          width: 'auto',
+          height: 'auto',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'value',
+          show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+          axisTick: {
+            show: false // 不显示坐标轴刻度线
+          },
+          axisLine: {
+            show: false, // 不显示坐标轴线
+          },
+          axisLabel: {
+            show: false, // 不显示坐标轴上的文字
+          },
+          splitLine: {
+            show: false // 不显示网格线
+          },
+        },
+        yAxis: [
+          {
+            inverse: true,
+            data: yAxisDataLeft,
+            axisLabel: {
+              show: true,
+              inside: true,
+              textStyle: {
+                color: '#ffffff',
+                fontSize: 12,
+                align: 'left',
+              },
+              formatter: '{value}\n{a|占位}\n{a|占位}',
+              rich: {
+                a: {
+                  color: 'transparent',
+                  lineHeight: 24,
+                }
+              }
+            },
+            //offset: 30,
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            }
+          },
+          {
+            inverse: false,
+            data: yAxisDataRight,
+            axisLabel: {
+              inside: true,
+              textStyle: {
+                color: '#ffffff',
+                fontSize: 12,
+                align: 'right',
+              },
+              formatter: '{value}\n{a|占位}\n{a|占位}',
+              rich: {
+                a: {
+                  color: 'transparent',
+                  lineHeight: 24,
+                  fontFamily: 'digital'
+                }
+              }
+            },
+            offset: 0,
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            }
+          }
+        ],
+        series: series
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 76e95645..33f03ab2 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,16 +2,16 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-19 14:25:07
+ * @LastEditTime: 2023-12-28 10:22:06
  * @Description:
 -->
 <template>
   <div id="container" ref="container" class="visual-container" :style="styles">
     <el-row class="container-title" :style="{
-        height: 88 + 'px',
-        lineHeight: 88 + 'px',
-        fontSize: 31 + 'px'
-      }">
+      height: 88 + 'px',
+      lineHeight: 88 + 'px',
+      fontSize: 31 + 'px'
+    }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
       许昌安彩深加工看板
       <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
@@ -29,26 +29,21 @@
     <el-row class="container-main flex-col" type="flex">
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
-          <base-container :title="'设备报警'" :title-icon="'5_1'">
+          <base-container :title="'设备报警'" :title-icon="'eqAlarm'">
             <base-table1 :page="1" :limit="9" :show-index="false" :table-config="qualityYearTableProps"
-              :table-data="qualityYearList" />
+              :table-data="equipmentList" />
           </base-container>
         </el-col>
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
-          <base-container :title="'各工序缺陷汇总'" :title-icon="'5_2'">
-            <div class="visual-select">
-              <el-select class="coldSelect" v-model="modelMonth" size="mini" placeholder="">
-                <el-option key="1" value="钢1线" label="钢1线" default />
-              </el-select>
-            </div>
+          <base-container :title="'各工序缺陷汇总'" :title-icon="'scrap'">
             <base-table1 :page="1" :limit="9" :show-index="false" :table-config="qualityMonthTableProps"
               :table-data="qualityMonthList" />
           </base-container>
         </el-col>
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
-          <base-container :title="'设备监控'" :title-icon="'5_3'">
+          <base-container :title="'工单监控'" :title-icon="'eqMonitoring'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -59,13 +54,15 @@
               <!-- <el-row style="margin-bottom: 1em">
                     <p class="now-team-title">加工工单进度</p>
                   </el-row> -->
-              <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em">
-                <el-progress :percentage="op.outRate * 100" class="custom-progress-bar" />
-                <p v-if="op.outRate === 1" class="now-secondary-title" style="color:#4679FD">
+              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: 1em">
+                <!-- <el-col :span="12"> -->
+                  <el-progress :percentage="op.progressRate * 100" class="custom-progress-bar" />
+                  <!-- <p v-if="op.progressRate === 1" class="now-secondary-title" style="color:#4679FD">
                   <i class="el-icon-check" />
                   {{ op.name }}
-                </p>
-                <p v-else class="now-secondary-title">{{ op.name }}</p>
+                </p> -->
+                  <p class="now-secondary-title">{{ op.name }}</p>
+                <!-- </el-col> -->
               </el-row>
               <!-- <el-row>
                     <el-progress :percentage="100" class="custom-progress-bar" />
@@ -98,13 +95,14 @@
 
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :height="256" :title="'能源监控'" :title-icon="'5_5'">
-            <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
+          <base-container :height="256" :title="'能源监控'" :title-icon="'energyMonitoring'">
+            <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
-            </div>
+            </div> -->
             <el-row :gutter="9">
               <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                <linear-bar-chart :name-list="cxNameList" :data-list="cxDataList" :height="359" :show-legend="true" />
+                <linear-bar-chart ref="EnergyMonitoringChart" :name-list="EnergyMonitoringNameList"
+                  :data-list="EnergyMonitoringList" :height="359" />
               </el-col>
               <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
                 <base-table3
@@ -119,13 +117,13 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :height="318 + 338 + 16" :title="'产线产量及良品率'" :title-icon="'5_4'">
-            <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
+          <base-container :height="318 + 338 + 16" :title="'产线产量及良品率'" :title-icon="'productLine'">
+            <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
-            </div>
+            </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <double-y-chart :id=" 'doubleYChart' " :name-list="cxNameList" :data-list="cxDataList" :height="359"
-              :show-legend="true" />
+            <double-y-chart ref="productLineChart" :id=" 'doubleYChart' " :name-list="cxNameList"
+              :data-list="cxDataList" :height="359" :show-legend="true" />
           </base-container>
         </el-col>
       </el-row>
@@ -400,22 +398,22 @@ const legendData3 = [
 ]
 const qualityYearTableProps = [
   {
-    prop: 'eqName',
+    prop: 'name',
     label: '设备名称'
   },
   {
-    prop: 'eqCode',
+    prop: 'code',
     label: '设备编码'
   },
   {
-    prop: 'level',
-    label: '报警级别',
-    subcomponent: alarmLevel,
+    prop: 'status',
+    label: '设备状态',
+    // subcomponent: alarmLevel,
     align: 'center'
   },
   {
-    prop: 'content',
-    label: '报警内容'
+    prop: 'error',
+    label: '是否故障'
   }
 ]
 
@@ -439,206 +437,39 @@ const qualityYearList = [
 ]
 const qualityMonthTableProps = [
   {
-    prop: 'lineName',
+    prop: 'productionLineName',
     label: '产线名'
   },
   {
-    prop: 'process',
+    prop: 'sectionName',
     label: '工序'
   },
   {
-    prop: 'eqName',
-    label: '设备名'
+    prop: 'count',
+    label: '损耗片数'
   },
   {
-    prop: 'eqCode',
-    label: '设备编码'
+    prop: 'inspectionTypeName',
+    label: '缺陷类型'
   },
-  {
-    prop: 'long',
-    label: '总运行时长(h)'
-  },
-  // {
-  //   prop: 'createTime',
-  //   label: '保养时间'
-  // },
-  {
-    prop: 'status',
-    label: '设备状态'
-  }
-  // {
-  //   prop: 'nextCreateTime',
-  //   label: '下次保养时间'
-  // }
-  // {
-  //   prop: 'nextLong',
-  //   label: '距离保养时间(天)',
-  //   // subcomponent: nextDay,
-  //   align: 'center'
-  // }
 ]
 
-const qualityMonthList = [
-  {
-    lineName: '钢一线',
-    process: '41',
-    eqName: '二次清洗机',
-    eqCode: '2312312',
-    long: '200',
-    // createTime: '2021-02-25 12:00:01',
-    status: '报警'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 365
-  },
-  {
-    lineName: '钢二线',
-    process: '41',
-    eqName: '锻造机',
-    eqCode: '43434',
-    long: '252',
-    // createTime: '2021-11-25 12:00:01',
-    status: '正常'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 4
-  },
-  {
-    lineName: '钢三线',
-    process: '41',
-    eqName: '设备3',
-    eqCode: '23213212',
-    long: '100',
-    // createTime: '2021-10-25 12:00:01',
-    status: '故障停机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 24
-  },
-  {
-    lineName: '钢四线',
-    process: '41',
-    eqName: '设备4',
-    eqCode: '23213',
-    long: '322',
-    // createTime: '2021-02-25 12:00:01',
-    status: '故障停机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: -36
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '232',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '212',
-    // createTime: '2021-06-25 12:00:01',
-    status: '待机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '设备5',
-    eqCode: '23121312',
-    long: '123',
-    // createTime: '2021-06-25 12:00:01',
-    status: '镀膜机'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '清洗机',
-    eqCode: '23121312',
-    long: '322',
-    // createTime: '2021-06-25 12:00:01',
-    status: 'Remote'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '磨边机',
-    eqCode: '23121312',
-    long: '232',
-    // createTime: '2021-06-25 12:00:01',
-    status: 'Non-scheduled'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '磨边机',
-    eqCode: '23121312',
-    long: '232',
-    // createTime: '2021-06-25 12:00:01',
-    status: 'Non-scheduled'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '磨边机',
-    eqCode: '23121312',
-    long: '232',
-    // createTime: '2021-06-25 12:00:01',
-    status: 'Non-scheduled'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '磨边机',
-    eqCode: '23121312',
-    long: '232',
-    // createTime: '2021-06-25 12:00:01',
-    status: 'Non-scheduled'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  },
-  {
-    lineName: '钢五线',
-    process: '41',
-    eqName: '磨边机',
-    eqCode: '23121312',
-    long: '232',
-    // createTime: '2021-06-25 12:00:01',
-    status: 'Non-scheduled'
-    // nextCreateTime: '2022-12-25 12:00:01',
-    // nextLong: 111
-  }
-]
 const orderProcessList = [
   {
     id: '1', outRate: '.8', name: '凯盛0322'
   }, {
-    id: '1', outRate: '.4', name: '光伏玻璃4.0'
+    id: '2', outRate: '.4', name: '光伏玻璃4.0'
   }, {
-    id: '1', outRate: '.5', name: '光伏玻璃3.0'
+    id: '3', outRate: '.5', name: '光伏玻璃3.0'
   }, {
-    id: '1', outRate: '.3', name: '光伏玻璃2.0'
+    id: '4', outRate: '.3', name: '光伏玻璃2.0'
   }, {
-    id: '1', outRate: '.5', name: '光伏玻璃1.0'
+    id: '5', outRate: '.5', name: '光伏玻璃1.0'
   }, {
-    id: '1', outRate: '.8', name: '光伏玻璃'
+    id: '6', outRate: '.8', name: '光伏玻璃'
   },
   {
-    id: '1', outRate: '.8', name: '统计订单'
+    id: '7', outRate: '.8', name: '统计订单'
   }
 ]
 export default {
@@ -661,11 +492,16 @@ export default {
       beilv2: 1,
       beilv: 1,
       value: 100,
-      times:'',
+      orderList:[],
+      times: '',
+      EnergyMonitoringNameList: [],
+      equipmentList:[],
+      EnergyMonitoringList: [],
       // offsetWidth: null,
       qualityYearTableProps,
       cxNameList,
       cxDataList,
+      productLineList:[],
       qualityYearList,
       clientWidth: 0,
       containerWidth: 111111,
@@ -673,7 +509,7 @@ export default {
       // orderProcessList: [],
       orderProcessList,
       qualityTableProps1,
-      qualityMonthList,
+      qualityMonthList:[],
       qualityMonthTableProps,
       modelMonth: '',
       qualityList1,
@@ -719,8 +555,17 @@ export default {
     this.init()
   },
   mounted() {
+    this.getList()
+    this.initWebSocket()
     this.getTimes()
-    this.windowWidth(document.documentElement.clientWidth)
+    const _this = this;
+    _this.beilv2 = document.documentElement.clientWidth / 1920
+    window.onresize = () => {
+      return (() => {
+        _this.clientWidth = `${document.documentElement.clientWidth}`
+        this.beilv2 = _this.clientWidth / 1920
+      })()
+    }
     // const _this = this;
     // window.onresize = () => {
     //   return (() => {
@@ -746,6 +591,23 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getList() {
+      this.$axios.get(
+        'base/core-production-line/listAll',
+        'get',
+        this.queryParams
+      ).then((res) => {
+        console.log('11111', res);
+        this.productLineList = res.data
+      })
+      this.$axios.get(
+        'base/quality-inspection-record/dayStatistics',
+        'get',
+      ).then((res) => {
+        console.log('11111', res);
+        this.qualityMonthList = res.data
+      })
+    },
     getTimes() {
       setInterval(this.getTimesInterval, 1000);
     },
@@ -770,6 +632,165 @@ export default {
       //拼接格式化当前时间
       this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
     },
+    initWebSocket() {
+      if (typeof (WebSocket) === 'undefined') {
+        alert('您的浏览器不支持WebSocket')
+      } else {
+        const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
+        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
+        let date = new Date().valueOf()
+        console.log(date);
+        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
+        this.SJGWebsocket = new WebSocket(SJGWsUrl)
+        // 监听 WebSocket 连接
+        this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.SJGWebsocket.onerror = this.SJGWebsocketOnError
+        // 监听 WebSocket 消息
+        this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.SJGWebsocket.onclose = this.SJGWebsocketClose
+        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
+        // 实例化 WebSocket
+        this.websocket = new WebSocket(wsUrl)
+        // 监听 WebSocket 连接
+        this.websocket.onopen = this.websocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.websocket.onerror = this.websocketOnError
+        // 监听 WebSocket 消息
+        this.websocket.onmessage = this.websocketOnMessage
+        // 监听 webSocket 断开信息
+        this.websocket.onclose = this.websocketClose
+      }
+    },
+    SJGWebsocketOnOpen() {
+      console.log('socket连接成功')
+      console.log(this.SJGWebsocket.onmessage);
+      this.SJGWebsocket.onmessage()
+    },
+    // 连接建立失败重连
+    SJGWebsocketOnError(e) {
+      // console.log('11111', e)
+      this.initWebSocket()
+    },
+    // 数据接收
+    SJGWebsocketOnMessage(e) {
+      // console.log(1111, e)
+      this.wsData = JSON.parse(e.data)
+      // console.log(this.wsData.detData);
+      // console.log('22222', this.wsData.data)
+      if (this.wsData.type === 'order') {
+        this.orderList = this.wsData.detData.map((ele, index) => {
+          if (ele.progressRate != 1) {
+            return {
+              id: ele.id,
+              name: ele.name,
+              progressRate: ele.progressRate.toFixed(3)
+            }
+          }
+        });
+        console.log(this.orderList)
+      } else if (this.wsData.type === 'equipment') {
+        this.equipmentList = this.wsData.detData.map((ele, index) => {
+          // if (ele.progressRate != 1) {
+            return {
+              id: ele.id,
+              name: ele.name,
+              code: ele.code,
+              status: ele.status,
+              error: ele.error=== true ? '是' : '否'
+            }
+          // }
+        });
+        // console.log(this.orderList)
+      } else if (this.wsData.type === 'productline') {
+        console.log(this.wsData.detData);
+        let nameList = []
+        let passRateList = []
+        let outputNumList = []
+
+        // console.log('2222222222', this.productLineList);
+        this.productLineList.forEach((item) => {
+          this.wsData.detData.forEach((ele) => {
+            if (item.id == ele.productionLineId) {
+              nameList.push(item.name)
+            }
+          })
+        })
+        console.log(Array.from(new Set(nameList)))
+        // progressRateList = EnergyNameList
+        // let EnergyDataList = []
+        this.wsData.detData.forEach((ele) => {
+          passRateList.push(ele.passRate *100
+          )
+        })
+        this.wsData.detData.forEach((ele) => {
+          outputNumList.push(ele.outputNum
+          )
+        })
+        // console.log(this.EnergyMonitoringNameList)
+        // console.log(this.EnergyMonitoringList)
+        // this.$nextTick(() => {
+        this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList)
+      }
+    },
+    // 数据发送
+    // SJGWebsocketSend() {
+    //   this.websocket.send('11111')
+    // },
+    // // 关闭
+    // SJGWebsocketClose(e) {
+    //   console.log('WebSocket 断开连接', e)
+    // },
+    // // 连接建立之后执行send方法发送数据
+    websocketOnOpen() {
+      console.log('socket连接成功')
+      this.websocket.onmessage()
+    },
+    // 连接建立失败重连
+    websocketOnError(e) {
+      console.log('11111', e)
+      this.initWebSocket()
+    },
+    // 数据接收
+    websocketOnMessage(e) {
+      // console.log(1111, e)
+      this.wsData = JSON.parse(e.data)
+      // console.log('22222', this.wsData.data)
+      if (this.wsData.type === 'EnergyMonitoring') {
+        let EnergyNameList = []
+        this.wsData.data.forEach((ele) => {
+          EnergyNameList.push(ele.lineName)
+        })
+        this.EnergyMonitoringNameList = EnergyNameList
+        let EnergyDataList = []
+        this.wsData.data.forEach((ele) => {
+          EnergyDataList.push(ele.useQuantity
+            // {
+            //   type: 'bar',
+            //   data: ele.useQuantity,
+            //   barWidth: 6
+
+            // }
+          )
+        })
+        this.EnergyMonitoringList = EnergyDataList
+        console.log(EnergyDataList)
+        // console.log(this.EnergyMonitoringNameList)
+        // console.log(this.EnergyMonitoringList)
+        // this.$nextTick(() => {
+        this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
+        // })
+      }
+    },
+    // 数据发送
+    websocketSend() {
+      this.websocket.send('11111')
+    },
+    // 关闭
+    websocketClose(e) {
+      // console.log('WebSocket 断开连接', e)
+    },
     windowWidth(value) {
       this.clientWidth = value
       this.beilv2 = this.clientWidth / 1920
@@ -901,8 +922,8 @@ export default {
    top: 2em;
  }
 
-//  .container-main {
-//    padding: 0px;
+// .container-main {
+//    padding: 5px;
 //  }
 
 

From 35bcb23920e076ae279d037f9a5c8d27e4d608e4 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 29 Dec 2023 09:26:07 +0800
Subject: [PATCH 05/11] 12.29

---
 src/store/modules/websocket.js                |  32 ++-
 src/views/databoard/components/GasChart.vue   |  11 +
 src/views/databoard/components/Header.vue     |   8 +-
 src/views/databoard/components/ISRAChart.vue  | 221 +++++++-----------
 .../databoard/components/SelectorBtnGroup.vue |   4 +-
 .../databoard/deepProcessing/BottomTwo.vue    |  29 +++
 .../databoard/deepProcessing/OrderStatus.vue  |  14 ++
 .../databoard/deepProcessing/TopThree.vue     |  29 +++
 .../databoard/deepProcessing/YieldRate.vue    |  14 ++
 src/views/databoard/deepProcessing/index.vue  | 145 ++++++++++++
 src/views/databoard/kiln/EnergeCost.vue       |  15 +-
 src/views/databoard/kiln/LeftFour.vue         |   2 +-
 src/views/databoard/kiln/MaterialCost.vue     |  97 +++++---
 src/views/databoard/kiln/index.vue            |  37 +--
 src/views/databoard/utils/dcs.js              |  34 ---
 src/views/databoard/utils/mes.js              |  34 ---
 src/views/databoard/utils/wsInterface.js      | 100 ++++++++
 src/views/databoard/wholePlant/LeftTwo.vue    |  29 +++
 src/views/databoard/wholePlant/MiddleTwo.vue  |  29 +++
 .../databoard/wholePlant/OrderStatus.vue      |  14 ++
 src/views/databoard/wholePlant/RightTwo.vue   |  29 +++
 src/views/databoard/wholePlant/YieldRate.vue  |  14 ++
 src/views/databoard/wholePlant/index.vue      | 150 ++++++++++++
 23 files changed, 809 insertions(+), 282 deletions(-)
 create mode 100644 src/views/databoard/deepProcessing/BottomTwo.vue
 create mode 100644 src/views/databoard/deepProcessing/OrderStatus.vue
 create mode 100644 src/views/databoard/deepProcessing/TopThree.vue
 create mode 100644 src/views/databoard/deepProcessing/YieldRate.vue
 create mode 100644 src/views/databoard/deepProcessing/index.vue
 delete mode 100644 src/views/databoard/utils/dcs.js
 delete mode 100644 src/views/databoard/utils/mes.js
 create mode 100644 src/views/databoard/utils/wsInterface.js
 create mode 100644 src/views/databoard/wholePlant/LeftTwo.vue
 create mode 100644 src/views/databoard/wholePlant/MiddleTwo.vue
 create mode 100644 src/views/databoard/wholePlant/OrderStatus.vue
 create mode 100644 src/views/databoard/wholePlant/RightTwo.vue
 create mode 100644 src/views/databoard/wholePlant/YieldRate.vue
 create mode 100644 src/views/databoard/wholePlant/index.vue

diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 3191b86e..7dde1bb3 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -1,6 +1,10 @@
 const state = {
-  fanFrequencyInfo:{},
-  kilnInfo:{}
+  fanFrequencyInfo:{},// 分机运行频率
+  kilnInfo:{},// 窑炉信息
+  gasInfo:{},// 天然气
+
+  israKiln:[],// ISRA缺陷检测
+  material:[]// 原料
 };
 const mutations = {
   SET_FANFREQUENCYINFO: (state, fanFrequencyInfo) => {
@@ -8,6 +12,17 @@ const mutations = {
   },
   SET_KILNINFO: (state, kilnInfo) => {
     state.kilnInfo = kilnInfo
+  },
+  SET_GASINFO: (state, gasInfo) => {
+    state.gasInfo = gasInfo
+  },
+
+
+  SET_ISRAKILN: (state, israKiln) => {
+    state.israKiln = israKiln
+  },
+  SET_MATERIAL: (state, material) => {
+    state.material = material
   }
 };
 const actions = {
@@ -16,7 +31,18 @@ const actions = {
   },
   setKilnInfo({ commit }, kilnInfo) {
     commit('SET_KILNINFO', kilnInfo.payload)
-  }
+  },
+  setGasInfo({ commit }, gasInfo) {
+    commit('SET_GASINFO', gasInfo.payload)
+  },
+
+
+  setIsraKiln({ commit }, israKiln) {
+    commit('SET_ISRAKILN', israKiln.payload)
+  },
+  setMaterial({ commit }, material) {
+    commit('SET_MATERIAL', material.payload)
+  },
 };
 export default {
   namespaced: true,
diff --git a/src/views/databoard/components/GasChart.vue b/src/views/databoard/components/GasChart.vue
index 366c7b10..5b70f50e 100644
--- a/src/views/databoard/components/GasChart.vue
+++ b/src/views/databoard/components/GasChart.vue
@@ -116,6 +116,9 @@ export default {
 		sidebarStatus() {
 			return this.$store.state.app.sidebar.opened;
 		},
+		gasChartMsg() {
+			return this.$store.state.websocket.gasInfo
+		}
 	},
 	watch: {
 		sidebarStatus(val) {
@@ -127,6 +130,14 @@ export default {
 				this.chart.setOption(this.option);
 			}, 500);
 		},
+		gasChartMsg: {
+			handler(newVal, oldVal) {
+				console.log(newVal)
+				// this.chartData = newVal
+				console.log('newVal============')
+				// this.updateChart()
+			}
+		}
 	},
 	mounted() {
 		this.$el.addEventListener('resize', () => {
diff --git a/src/views/databoard/components/Header.vue b/src/views/databoard/components/Header.vue
index 8ac700cc..3312fc46 100644
--- a/src/views/databoard/components/Header.vue
+++ b/src/views/databoard/components/Header.vue
@@ -7,9 +7,7 @@
 
 <template>
 	<header class="kiln-header">
-		<h1>
-			窑炉生产运行驾驶舱
-		</h1>
+		<h1>{{topTitle}}</h1>
 		<!-- left: 312px; -->
 		<div
 			class="firm">
@@ -38,7 +36,9 @@ export default {
 	name: 'KilnHeader',
 	// components: { DateBtnGroup },
 	props: {
-		isFullScreen:false
+		isFullScreen:false,
+		topTitle: ''
+
 	},
 	data() {
 		return {
diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue
index 2f8baf7c..49b0968a 100644
--- a/src/views/databoard/components/ISRAChart.vue
+++ b/src/views/databoard/components/ISRAChart.vue
@@ -21,8 +21,9 @@ export default {
 	data() {
 		return {
 			chart: null,
+			colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
+			chartData: [],
 			option: {
-				color: ['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
 				tooltip: {
 					trigger: 'item',
 				},
@@ -35,7 +36,7 @@ export default {
 					}
 				},
 				title: {
-					text: 11234,
+					text: 0,
 					subtext: '总数',
 					top: '43%',
 					left: '49%',
@@ -47,11 +48,62 @@ export default {
 					},
 					subtextStyle: {
 						fontSize: 16,
-						color: '#fff7',
+						color: '#fff00',
 					},
 				},
-				series: [
-					{
+				series: []
+			},
+		};
+	},
+	mounted() {
+		this.initChart();
+	},
+	activated() {
+	},
+	computed: {
+		israChartMsg() {
+			return this.$store.state.websocket.israKiln
+		}
+	},
+	watch: {
+		israChartMsg: {
+			handler(newVal, oldVal) {
+				console.log(newVal)
+				this.chartData = newVal
+				console.log('newVal============')
+				this.updateChart()
+			}
+		}
+	},
+	methods: {
+		initChart() {
+			this.chart = echarts.init(this.$el);
+			this.chart.setOption(this.option);
+		},
+		updateChart() {
+			console.log('update')
+			let num = 0
+			this.chartData && this.chartData.length > 0 && this.chartData.map(i => {
+				num+=i.num
+			})
+			this.chart.setOption({
+				title:{
+					text: num,
+					subtext: '总数',
+					top: '43%',
+					left: '49%',
+					textAlign: 'center',
+					textStyle: {
+						fontSize: 32,
+						lineHeight: 16,
+						color: '#fff',
+					},
+					subtextStyle: {
+						fontSize: 16,
+						color: '#fff00',
+					},
+				},
+				series:[{
 						name: 'Access From',
 						type: 'pie',
 						radius: ['45%', '65%'],
@@ -60,10 +112,6 @@ export default {
 							show: true,
 							position: 'outside',
 							formatter: ({ dataIndex, percent }) => {
-								// console.log(
-								// 	['#2760ff', '#518eec', '#0ee8e4', '#ddb523'][dataIndex % 4],
-								// 	percent
-								// );
 								const styleName = ['a', 'b', 'c', 'd'][dataIndex % 4];
 								return `{${styleName}|${percent}%}`;
 							},
@@ -98,141 +146,28 @@ export default {
 							show: true,
 						},
 						itemStyle: {
-							borderRadius: 12,
-							// borderColor: 'transparent',
-							// borderWidth: 20
+							borderRadius: 12
 						},
-						data: [
-							{
-								value: 1048,
-								name: '缺陷1',
-								itemStyle: {
-									color: {
-										type: 'linear',
-										x: 1,
-										y: 1,
-										x2: 0,
-										y2: 0,
-										colorStops: [
-											{
-												offset: 0,
-												color: '#2760ff', // 0% 处的颜色
-											},
-											// {
-											// 	offset: 0.6,
-											// 	color: 'transparent', // 80% 处的颜色
-											// },
-											{
-												offset: 1,
-												color: '#2760ff33', // 100% 处的颜色
-											},
-										],
-										global: false, // 缺省为 false
-									},
-								},
-							},
-							{
-								value: 735,
-								name: '缺陷2',
-								itemStyle: {
-									color: {
-										type: 'linear',
-										x: 0,
-										y: 0,
-										x2: 1,
-										y2: 0,
-										colorStops: [
-											{
-												offset: 0,
-												color: '#518eec', // 0% 处的颜色
-											},
-											// {
-											// 	offset: 0.6,
-											// 	color: 'transparent', // 80% 处的颜色
-											// },
-											{
-												offset: 1,
-												color: '#518eec33', // 100% 处的颜色
-											},
-										],
-										global: false, // 缺省为 false
-									},
-								},
-							},
-							{
-								value: 580,
-								name: '缺陷3',
-								itemStyle: {
-									color: {
-										type: 'linear',
-										x: 0,
-										y: 0,
-										x2: 1,
-										y2: 1,
-										colorStops: [
-											{
-												offset: 0,
-												color: '#0ee8e4', // 0% 处的颜色
-											},
-											// {
-											// 	offset: 0.6,
-											// 	color: 'transparent', // 80% 处的颜色
-											// },
-											{
-												offset: 1,
-												color: '#0ee8e433', // 100% 处的颜色
-											},
-										],
-										global: false, // 缺省为 false
-									},
-								},
-							},
-							{
-								value: 484,
-								name: '缺陷4',
-								itemStyle: {
-									color: {
-										type: 'linear',
-										x: 1,
-										y: 0,
-										x2: 0,
-										y2: 0,
-										colorStops: [
-											{
-												offset: 0,
-												color: '#ddb523', // 0% 处的颜色
-											},
-											// {
-											// 	offset: 0.6,
-											// 	color: 'transparent', // 70% 处的颜色
-											// },
-											{
-												offset: 1,
-												color: '#ddb52333', // 100% 处的颜色
-											},
-										],
-										global: false, // 缺省为 false
-									},
-								},
-							},
-						],
-					},
-				],
-			},
-		};
-	},
-	mounted() {
-		this.initChart();
-	},
-	activated() {
-		// this.initChart();
-	},
-	computed: {},
-	methods: {
-		initChart() {
-			this.chart = echarts.init(this.$el);
-			this.chart.setOption(this.option);
-		},
+						data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
+						name:item.name,
+						value: item.num,
+						itemStyle:{
+							color:{
+								type: 'linear',
+								x: 1,
+								y: 1,
+								x2: 0,
+								y2: 0,
+								global: false,
+								colorStops:[
+									{offset: 0,color: this.colors[index%4]},
+									{offset: 1,color: this.colors[index%4]+'33'}
+								]
+							}
+						}
+					}))}]
+			})
+		}
 	},
 };
 </script>
diff --git a/src/views/databoard/components/SelectorBtnGroup.vue b/src/views/databoard/components/SelectorBtnGroup.vue
index a4a889b4..5df5b3a9 100644
--- a/src/views/databoard/components/SelectorBtnGroup.vue
+++ b/src/views/databoard/components/SelectorBtnGroup.vue
@@ -29,7 +29,9 @@ export default {
 		};
 	},
 	computed: {},
-	methods: {},
+	methods: {
+		
+	},
 };
 </script>
 
diff --git a/src/views/databoard/deepProcessing/BottomTwo.vue b/src/views/databoard/deepProcessing/BottomTwo.vue
new file mode 100644
index 00000000..d7dda8dc
--- /dev/null
+++ b/src/views/databoard/deepProcessing/BottomTwo.vue
@@ -0,0 +1,29 @@
+<template>
+	<div
+		class="bottom-two"
+		style="
+			display: grid;
+			gap: 16px;
+			grid-template-rows: 462px 462px;
+		">
+		<OrderStatus />
+		<YieldRate />
+	</div>
+</template>
+
+<script>
+import OrderStatus from './OrderStatus.vue';
+import YieldRate from './YieldRate.vue';
+export default {
+	name: 'BottomTwo',
+	components: { OrderStatus, YieldRate },
+	props: {},
+	data() {
+		return {};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/databoard/deepProcessing/OrderStatus.vue b/src/views/databoard/deepProcessing/OrderStatus.vue
new file mode 100644
index 00000000..4021eda7
--- /dev/null
+++ b/src/views/databoard/deepProcessing/OrderStatus.vue
@@ -0,0 +1,14 @@
+<template>
+  <div style="flex: 1;">
+    <Container name="订单完成情况" size="small" style="">
+      digndna
+    </Container>
+  </div>
+</template>
+<script>
+import Container from '../components/Container.vue';
+export default {
+  name: 'OrderStatus',
+  components: { Container },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/databoard/deepProcessing/TopThree.vue b/src/views/databoard/deepProcessing/TopThree.vue
new file mode 100644
index 00000000..8caf0354
--- /dev/null
+++ b/src/views/databoard/deepProcessing/TopThree.vue
@@ -0,0 +1,29 @@
+<template>
+	<div
+		class="top-three"
+		style="
+			display: grid;
+			gap: 16px;
+			grid-template-rows: 462px 462px;
+		">
+		<OrderStatus />
+		<YieldRate />
+	</div>
+</template>
+
+<script>
+import OrderStatus from './OrderStatus.vue';
+import YieldRate from './YieldRate.vue';
+export default {
+	name: 'TopThree',
+	components: { OrderStatus, YieldRate },
+	props: {},
+	data() {
+		return {};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/databoard/deepProcessing/YieldRate.vue b/src/views/databoard/deepProcessing/YieldRate.vue
new file mode 100644
index 00000000..cfdd2c92
--- /dev/null
+++ b/src/views/databoard/deepProcessing/YieldRate.vue
@@ -0,0 +1,14 @@
+<template>
+  <div style="flex: 1;">
+    <Container name="本日生产良品率" size="small" style="">
+      0000987
+    </Container>
+  </div>
+</template>
+<script>
+import Container from '../components/Container.vue';
+export default {
+  name: 'YieldRate',
+  components: { Container },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/databoard/deepProcessing/index.vue b/src/views/databoard/deepProcessing/index.vue
new file mode 100644
index 00000000..be0a7d28
--- /dev/null
+++ b/src/views/databoard/deepProcessing/index.vue
@@ -0,0 +1,145 @@
+<template>
+	<div id='deepProcessingContainerB' ref='deepProcessingContainerB' style="width: 100%;height: 100%;">
+		<div
+			id='deepProcessingContainer'
+			ref='deepProcessingContainer'
+			class="deepProcessingBoard"
+			style="
+				position: absolute;
+				transform-origin: 16px 8px;
+				font-size: 16px;
+				top: -8px;
+				left: -16px;
+				width: 1920px;
+				height: 1080px;
+				display: flex;
+				flex-direction: column;
+				gap: 24px;
+			"
+			:style="{transform:'scale('+scaleNum+')'}">
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='全厂总览驾驶舱'/>
+			<div
+				class="main-body"
+				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
+				<div class="left-side" style="flex: 1">
+					<TopThree />
+				</div>
+				<div class="middle-side" style="flex: 1">
+					<BottomTwo />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import KHeader from '../components/Header';
+import TopThree from './TopThree';
+import BottomTwo from './BottomTwo';
+import screenfull from 'screenfull'
+import { debounce } from '@/utils/debounce'
+import { getDcsMsg, getMesMsg } from './../utils/wsInterface'
+
+export default {
+	name: 'deepProcessingBoard',
+	components: {
+		KHeader,
+		TopThree,
+		BottomTwo
+	},
+	// provide() {
+	// 	return {
+	// 		resizeChart: null,
+	// 	};
+	// },
+	data() {
+		return {
+			isFullScreen: false,
+			scaleNum: 0.8
+		};
+	},
+	created() {
+		this.init()
+	},
+	destroy() {
+		this.destroy()
+	},
+	mounted() {
+		this.boxReset = debounce(() => {
+      this.resetSize()
+    }, 300)
+    this.boxReset()
+    window.addEventListener('resize', () => {
+      this.boxReset()
+    })
+		// closeWebsocket()
+		// getDcsMsg()
+		// getMesMsg()
+		console.log('mounted...........')
+	},
+	destroyed() {
+		console.log('destroyed...........')
+	},
+	methods: {
+		change() {
+      this.isFullScreen = screenfull.isFullscreen
+    },
+    init() {
+      if (screenfull.isEnabled) {
+        screenfull.on('change', this.change)
+      }
+    },
+    destroy() {
+      if (screenfull.isEnabled) {
+        screenfull.off('change', this.change)
+      }
+    },
+		// 全屏
+		screenfullChange() {
+      if (!screenfull.isEnabled) {
+        this.$message({
+          message: 'you browser can not work',
+          type: 'warning'
+        })
+        return false
+      }
+      screenfull.toggle(this.$refs.wholePlantContainerB)
+    },
+		resetSize() {
+      let wholePlantContainerBox = document.querySelector('#wholePlantContainer')
+      let rw = parseFloat(window.innerWidth)
+      let rh = parseFloat(window.innerHeight)
+      let bw = parseFloat(wholePlantContainerBox.style.width)
+      let bh = parseFloat(wholePlantContainerBox.style.height)
+			let wx = 0
+			let hx = 0
+			if (screenfull.isFullscreen) {
+				console.log('全屏')
+				wx = rw / bw
+				hx = rh / bh
+				console.log(this.scaleNum)
+			}else{
+				console.log('非全屏')
+				console.log(this.$store.state.app.sidebar.opened)
+				if (this.$store.state.app.sidebar.opened) {
+					wx = (rw-264) / bw
+					hx = (rh-116) / bh
+				}else{
+					wx = (rw-78) / bw
+					hx = (rh-116) / bh
+				}
+			}
+			this.scaleNum = wx
+    }
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.deepProcessingBoard {
+	background: url(../assets/bg.png) no-repeat;
+	background-size: cover;
+	background-position: 0 0;
+	overflow: auto;
+}
+</style>
diff --git a/src/views/databoard/kiln/EnergeCost.vue b/src/views/databoard/kiln/EnergeCost.vue
index d7e49ed2..53fedfc0 100644
--- a/src/views/databoard/kiln/EnergeCost.vue
+++ b/src/views/databoard/kiln/EnergeCost.vue
@@ -31,8 +31,8 @@
 					justify-content: space-between;
 				">
 				<SelectorBtnGroup
-					:options="['电耗能', '天然气I', '天然气II']" />
-				<SelectorBtnGroup :options="['周', '月', '年']" />
+					:options="['电耗能', '天然气I', '天然气II']" @emitFun='toggleType'/>
+				<SelectorBtnGroup :options="['周', '月', '年']" @emitFun='toggleDate'/>
 			</div>
 			<div class="chart" style="height: 200px; margin-top: 8px;">
 				<GasChart />
@@ -65,7 +65,16 @@ export default {
 		return {};
 	},
 	computed: {},
-	methods: {},
+	methods: {
+		// 切换能源
+		toggleType() {
+
+		},
+		// 切换时间
+		toggleDate() {
+			
+		}
+	},
 };
 </script>
 
diff --git a/src/views/databoard/kiln/LeftFour.vue b/src/views/databoard/kiln/LeftFour.vue
index 8ce225ff..3dc26580 100644
--- a/src/views/databoard/kiln/LeftFour.vue
+++ b/src/views/databoard/kiln/LeftFour.vue
@@ -25,7 +25,7 @@
 import MaterialCost from './MaterialCost.vue';
 import FanSequence from './FanSequence.vue';
 import IsraCheck from './IsraCheck.vue';
-import EnergeCost from './EnergeCost.vue';
+import EnergeCost from './EnergeCost';
 export default {
 	name: 'LeftFour',
 	components: { MaterialCost, EnergeCost, IsraCheck, FanSequence },
diff --git a/src/views/databoard/kiln/MaterialCost.vue b/src/views/databoard/kiln/MaterialCost.vue
index e6aa548a..808f1b22 100644
--- a/src/views/databoard/kiln/MaterialCost.vue
+++ b/src/views/databoard/kiln/MaterialCost.vue
@@ -7,36 +7,66 @@
 
 <template>
 	<Container name="原料用量统计" size="middle" style="">
-		<div
-			class="absolute"
-			style="
-				padding: 12px;
-				display: grid;
-				grid-template-columns: repeat(3, 1fr);
-				grid-auto-rows: auto;
-				gap: 8px;
-			">
-			<ShadowRect v-for="n in 9" :key="n" :rounded="false">
-				<div
-					class="material"
-					style="
-						flex: 1;
-						padding: 12px 6px 20px;
-						display: flex;
-						flex-direction: column;
-						gap: 4px;
-						align-items: center;
-						justify-content: center;
-					">
-					<span style="color: #0ee8e4; font-weight: 500; font-size: 32px">
-						234
-					</span>
-					<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
-						- 原料1/吨 -
-					</span>
-				</div>
-			</ShadowRect>
+		<div style="flex: 1; display: flex; gap: 8px;flex-direction: column;">
+			<div
+				class="absolute"
+				style="
+					flex:3;
+					padding: 12px 12px 0 12px;
+					display: grid;
+					grid-template-columns: repeat(3, 1fr);
+					grid-auto-rows: repeat(4, 1fr);
+					gap: 8px;
+				">
+				<ShadowRect v-for="(item, index) in materialMsg1" :key="index" :rounded="false">
+					<div
+						class="material"
+						style="
+							flex: 1;
+							padding-bottom: 3px;
+							display: flex;
+							flex-direction: column;
+							gap: 4px;
+							align-items: center;
+							justify-content: center;
+						">
+						<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
+							{{item.materialUsed}}
+						</span>
+						<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
+							- {{item.materialName}} -
+						</span>
+					</div>
+				</ShadowRect>
+			</div>
+			<div style="flex:1;
+					padding: 0 12px 12px 12px;
+					display: grid;
+					grid-template-columns: repeat(4, 1fr);
+					gap: 8px;">
+				<ShadowRect v-for="(item, index) in materialMsg2" :key="index" :rounded="false">
+					<div
+						class="material"
+						style="
+							flex: 1;
+							padding-bottom: 3px;
+							display: flex;
+							flex-direction: column;
+							gap: 4px;
+							align-items: center;
+							justify-content: center;
+						">
+						<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
+							{{item.materialUsed}}
+						</span>
+						<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
+							- {{item.materialName}} -
+						</span>
+					</div>
+				</ShadowRect>
+			</div>
 		</div>
+		
 	</Container>
 </template>
 
@@ -50,7 +80,14 @@ export default {
 	data() {
 		return {};
 	},
-	computed: {},
+	computed: {
+		materialMsg1() {
+			return this.$store.state.websocket.material.slice(0,9)
+		},
+		materialMsg2() {
+			return this.$store.state.websocket.material.slice(9)
+		}
+	},
 	methods: {},
 };
 </script>
diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index f59ef9c0..2d99117b 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -6,9 +6,9 @@
 -->
 
 <template>
-	<div id='kilnContainer' style="width: 100%;height: 100%;">
+	<div id='kilnContainerB' ref='kilnContainerB' style="width: 100%;height: 100%;">
 		<div
-			id='kilnContainerB'
+			id='kilnContainer'
 			ref='kilnContainer'
 			class="KilnDataBoard"
 			style="
@@ -24,7 +24,7 @@
 				gap: 24px;
 			"
 			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange'/>
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='窑炉生产运行驾驶舱'/>
 			<div
 				class="main-body"
 				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
@@ -45,7 +45,7 @@ import LeftFour from './LeftFour';
 import RightTwo from './RightTwo.vue';
 import screenfull from 'screenfull'
 import { debounce } from '@/utils/debounce'
-import { getDcsMsg } from './../utils/dcs'
+import { getDcsMsg, getMesMsg } from './../utils/wsInterface'
 
 export default {
 	name: 'KilnDataBoard',
@@ -82,6 +82,7 @@ export default {
 		// this.getMes()
 		// closeWebsocket()
 		getDcsMsg()
+		// getMesMsg()
 		console.log('mounted...........')
 	},
 	destroyed() {
@@ -112,13 +113,10 @@ export default {
         })
         return false
       }
-      screenfull.toggle(this.$refs.kilnContainer)
-			console.log('11111')
-			// this.resetSize()
-			console.log('2222')
+      screenfull.toggle(this.$refs.kilnContainerB)
     },
 		resetSize() {
-      let kilnContainerBox = document.querySelector('#kilnContainerB')
+      let kilnContainerBox = document.querySelector('#kilnContainer')
       let rw = parseFloat(window.innerWidth)
       let rh = parseFloat(window.innerHeight)
       let bw = parseFloat(kilnContainerBox.style.width)
@@ -142,26 +140,7 @@ export default {
 				}
 			}
 			this.scaleNum = wx
-    },
-		// 获取ws
-		getMes() {
-			const userId = 'dcsmsg' + new Date().getTime()
-			connectWebsocket(
-				// 测试地址
-				'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
-				// 传递给后台的数据
-				'',
-				// 成功拿到后台返回的数据的回调函数
-				(data) => {
-					console.log('成功的回调函数, 接收到的data数据: ', data)
-
-				},
-				// websocket连接失败的回调函数
-				(err) => {
-					console.log('失败的回调函数', err)
-				}
-			)
-		}
+    }
 	}
 };
 </script>
diff --git a/src/views/databoard/utils/dcs.js b/src/views/databoard/utils/dcs.js
deleted file mode 100644
index 0edd8ff5..00000000
--- a/src/views/databoard/utils/dcs.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { connectWebsocket, closeWebsocket } from './../utils/websocket'
-import store from "@/store";
-
-// 创建dcs链接
-export const getDcsMsg = () => {
-  const userId = 'dcsmsg' + new Date().getTime()
-  connectWebsocket(
-    // 测试地址
-    'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
-    // 传递给后台的数据
-    '',
-    // 成功拿到后台返回的数据的回调函数
-    (data) => {
-      console.log('成功的回调函数, 接收到的data数据: ', data)
-      let msgData = JSON.parse(data)
-      switch (msgData?.type) {
-        case "FanFrequencyInfo": {
-          store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
-          break;
-        }
-        case "KilnInfo": {
-          store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
-          break;
-        }
-        default:
-          console.log('++++++++')
-      }
-    },
-    // websocket连接失败的回调函数
-    (err) => {
-      console.log('失败的回调函数', err)
-    }
-  )
-}
\ No newline at end of file
diff --git a/src/views/databoard/utils/mes.js b/src/views/databoard/utils/mes.js
deleted file mode 100644
index 0edd8ff5..00000000
--- a/src/views/databoard/utils/mes.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { connectWebsocket, closeWebsocket } from './../utils/websocket'
-import store from "@/store";
-
-// 创建dcs链接
-export const getDcsMsg = () => {
-  const userId = 'dcsmsg' + new Date().getTime()
-  connectWebsocket(
-    // 测试地址
-    'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
-    // 传递给后台的数据
-    '',
-    // 成功拿到后台返回的数据的回调函数
-    (data) => {
-      console.log('成功的回调函数, 接收到的data数据: ', data)
-      let msgData = JSON.parse(data)
-      switch (msgData?.type) {
-        case "FanFrequencyInfo": {
-          store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
-          break;
-        }
-        case "KilnInfo": {
-          store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
-          break;
-        }
-        default:
-          console.log('++++++++')
-      }
-    },
-    // websocket连接失败的回调函数
-    (err) => {
-      console.log('失败的回调函数', err)
-    }
-  )
-}
\ No newline at end of file
diff --git a/src/views/databoard/utils/wsInterface.js b/src/views/databoard/utils/wsInterface.js
new file mode 100644
index 00000000..33534c6b
--- /dev/null
+++ b/src/views/databoard/utils/wsInterface.js
@@ -0,0 +1,100 @@
+import { connectWebsocket, closeWebsocket } from './../utils/websocket'
+import store from "@/store";
+
+// 创建dcs链接
+export const getDcsMsg = () => {
+  const userId = 'dcsmsg' + new Date().getTime()
+  connectWebsocket(
+    // 测试地址
+    'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
+    // 传递给后台的数据
+    '',
+    // 成功拿到后台返回的数据的回调函数
+    (data) => {
+      console.log('dcs成功的回调函数, 接收到的data数据: ', data)
+      let msgData = JSON.parse(data)
+      if (msgData == null) return;
+      switch (msgData?.type) {
+        case "FanFrequencyInfo": {
+          store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
+          break;
+        }
+        case "KilnInfo": {
+          store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+          break;
+        }
+        case "GasInfo": {
+          store.dispatch({type: "websocket/setGasInfo", payload: msgData.data})
+          break;
+        }
+        default:
+      }
+    },
+    // websocket连接失败的回调函数
+    (err) => {
+      console.log('失败的回调函数', err)
+    }
+  )
+}
+
+// 创建mes链接
+export const getMesMsg = () => {
+  const sj = new Date().getTime()
+  // ISRA
+  connectWebsocket(
+    // 测试地址
+    'ws://10.70.2.2:8080/websocket/message?userId=KI'+sj,
+    // 传递给后台的数据
+    '',
+    // 成功拿到后台返回的数据的回调函数
+    (data) => {
+      console.log('mes ISRA成功的回调函数, 接收到的data数据: ', data)
+      let msgData = JSON.parse(data)
+      if (msgData == null) return;
+      switch (msgData?.type) {
+        case "israKiln": {
+          store.dispatch({type: "websocket/setIsraKiln", payload:msgData.detData.dayStatistic})
+          break;
+        }
+        // case "KilnInfo": {
+        //   // store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+        //   break;
+        // }
+        default:
+      }
+    },
+    // websocket连接失败的回调函数
+    (err) => {
+      console.log('失败的回调函数', err)
+    }
+  )
+
+  // 原料 MA
+  connectWebsocket(
+    // 测试地址
+    'ws://10.70.2.2:8080/websocket/message?userId=MA'+sj,
+    // 传递给后台的数据
+    '',
+    // 成功拿到后台返回的数据的回调函数
+    (data) => {
+      console.log('mes 原料成功的回调函数, 接收到的data数据: ', data)
+      let msgData = JSON.parse(data)
+      if (msgData == null) return;
+      switch (msgData?.type) {
+        case "material": {
+          store.dispatch({type: "websocket/setMaterial", payload:msgData.data})
+          break;
+        }
+        // case "KilnInfo": {
+        //   // store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+        //   break;
+        // }
+        default:
+      }
+    },
+    // websocket连接失败的回调函数
+    (err) => {
+      console.log('失败的回调函数', err)
+    }
+  )
+}
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/LeftTwo.vue b/src/views/databoard/wholePlant/LeftTwo.vue
new file mode 100644
index 00000000..0a21c83e
--- /dev/null
+++ b/src/views/databoard/wholePlant/LeftTwo.vue
@@ -0,0 +1,29 @@
+<template>
+	<div
+		class="left-two"
+		style="
+			display: grid;
+			gap: 16px;
+			grid-template-rows: 462px 462px;
+		">
+		<OrderStatus />
+		<YieldRate />
+	</div>
+</template>
+
+<script>
+import OrderStatus from './OrderStatus.vue';
+import YieldRate from './YieldRate.vue';
+export default {
+	name: 'LeftFour',
+	components: { OrderStatus, YieldRate },
+	props: {},
+	data() {
+		return {};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/databoard/wholePlant/MiddleTwo.vue b/src/views/databoard/wholePlant/MiddleTwo.vue
new file mode 100644
index 00000000..9a65aeba
--- /dev/null
+++ b/src/views/databoard/wholePlant/MiddleTwo.vue
@@ -0,0 +1,29 @@
+<template>
+	<div
+		class="middle-two"
+		style="
+			display: grid;
+			gap: 16px;
+			grid-template-rows: 462px 462px;
+		">
+		<OrderStatus />
+		<YieldRate />
+	</div>
+</template>
+
+<script>
+import OrderStatus from './OrderStatus.vue';
+import YieldRate from './YieldRate.vue';
+export default {
+	name: 'MiddleFour',
+	components: { OrderStatus, YieldRate },
+	props: {},
+	data() {
+		return {};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/databoard/wholePlant/OrderStatus.vue b/src/views/databoard/wholePlant/OrderStatus.vue
new file mode 100644
index 00000000..4021eda7
--- /dev/null
+++ b/src/views/databoard/wholePlant/OrderStatus.vue
@@ -0,0 +1,14 @@
+<template>
+  <div style="flex: 1;">
+    <Container name="订单完成情况" size="small" style="">
+      digndna
+    </Container>
+  </div>
+</template>
+<script>
+import Container from '../components/Container.vue';
+export default {
+  name: 'OrderStatus',
+  components: { Container },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/RightTwo.vue b/src/views/databoard/wholePlant/RightTwo.vue
new file mode 100644
index 00000000..0cc9ec58
--- /dev/null
+++ b/src/views/databoard/wholePlant/RightTwo.vue
@@ -0,0 +1,29 @@
+<template>
+	<div
+		class="right-two"
+		style="
+			display: grid;
+			gap: 16px;
+			grid-template-rows: 462px 462px;
+		">
+		<OrderStatus />
+		<YieldRate />
+	</div>
+</template>
+
+<script>
+import OrderStatus from './OrderStatus.vue';
+import YieldRate from './YieldRate.vue';
+export default {
+	name: 'RightFour',
+	components: { OrderStatus, YieldRate },
+	props: {},
+	data() {
+		return {};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/databoard/wholePlant/YieldRate.vue b/src/views/databoard/wholePlant/YieldRate.vue
new file mode 100644
index 00000000..cfdd2c92
--- /dev/null
+++ b/src/views/databoard/wholePlant/YieldRate.vue
@@ -0,0 +1,14 @@
+<template>
+  <div style="flex: 1;">
+    <Container name="本日生产良品率" size="small" style="">
+      0000987
+    </Container>
+  </div>
+</template>
+<script>
+import Container from '../components/Container.vue';
+export default {
+  name: 'YieldRate',
+  components: { Container },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/index.vue b/src/views/databoard/wholePlant/index.vue
new file mode 100644
index 00000000..d1941e73
--- /dev/null
+++ b/src/views/databoard/wholePlant/index.vue
@@ -0,0 +1,150 @@
+<template>
+	<div id='wholePlantContainerB' ref='wholePlantContainerB' style="width: 100%;height: 100%;">
+		<div
+			id='wholePlantContainer'
+			ref='wholePlantContainer'
+			class="wholePlantBoard"
+			style="
+				position: absolute;
+				transform-origin: 16px 8px;
+				font-size: 16px;
+				top: -8px;
+				left: -16px;
+				width: 1920px;
+				height: 1080px;
+				display: flex;
+				flex-direction: column;
+				gap: 24px;
+			"
+			:style="{transform:'scale('+scaleNum+')'}">
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='全厂总览驾驶舱'/>
+			<div
+				class="main-body"
+				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
+				<div class="left-side" style="flex: 1">
+					<LeftTwo />
+				</div>
+				<div class="middle-side" style="flex: 1">
+					<MiddleTwo />
+				</div>
+				<div class="right-side" style="flex: 1">
+					<RightTwo />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import KHeader from '../components/Header';
+import LeftTwo from './LeftTwo';
+import MiddleTwo from './MiddleTwo';
+import RightTwo from './RightTwo';
+import screenfull from 'screenfull'
+import { debounce } from '@/utils/debounce'
+import { getDcsMsg, getMesMsg } from './../utils/wsInterface'
+
+export default {
+	name: 'wholePlantBoard',
+	components: {
+		KHeader,
+		LeftTwo,
+		MiddleTwo,
+		RightTwo
+	},
+	// provide() {
+	// 	return {
+	// 		resizeChart: null,
+	// 	};
+	// },
+	data() {
+		return {
+			isFullScreen: false,
+			scaleNum: 0.8
+		};
+	},
+	created() {
+		this.init()
+	},
+	destroy() {
+		this.destroy()
+	},
+	mounted() {
+		this.boxReset = debounce(() => {
+      this.resetSize()
+    }, 300)
+    this.boxReset()
+    window.addEventListener('resize', () => {
+      this.boxReset()
+    })
+		// closeWebsocket()
+		// getDcsMsg()
+		// getMesMsg()
+		console.log('mounted...........')
+	},
+	destroyed() {
+		console.log('destroyed...........')
+	},
+	methods: {
+		change() {
+      this.isFullScreen = screenfull.isFullscreen
+    },
+    init() {
+      if (screenfull.isEnabled) {
+        screenfull.on('change', this.change)
+      }
+    },
+    destroy() {
+      if (screenfull.isEnabled) {
+        screenfull.off('change', this.change)
+      }
+    },
+		// 全屏
+		screenfullChange() {
+      if (!screenfull.isEnabled) {
+        this.$message({
+          message: 'you browser can not work',
+          type: 'warning'
+        })
+        return false
+      }
+      screenfull.toggle(this.$refs.wholePlantContainerB)
+    },
+		resetSize() {
+      let wholePlantContainerBox = document.querySelector('#wholePlantContainer')
+      let rw = parseFloat(window.innerWidth)
+      let rh = parseFloat(window.innerHeight)
+      let bw = parseFloat(wholePlantContainerBox.style.width)
+      let bh = parseFloat(wholePlantContainerBox.style.height)
+			let wx = 0
+			let hx = 0
+			if (screenfull.isFullscreen) {
+				console.log('全屏')
+				wx = rw / bw
+				hx = rh / bh
+				console.log(this.scaleNum)
+			}else{
+				console.log('非全屏')
+				console.log(this.$store.state.app.sidebar.opened)
+				if (this.$store.state.app.sidebar.opened) {
+					wx = (rw-264) / bw
+					hx = (rh-116) / bh
+				}else{
+					wx = (rw-78) / bw
+					hx = (rh-116) / bh
+				}
+			}
+			this.scaleNum = wx
+    }
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.wholePlantBoard {
+	background: url(../assets/bg.png) no-repeat;
+	background-size: cover;
+	background-position: 0 0;
+	overflow: auto;
+}
+</style>

From 286a9a1a0a4411d6b061bf65d1b1726248de0811 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Fri, 29 Dec 2023 09:41:45 +0800
Subject: [PATCH 06/11] '1'

---
 .env.dev            | 4 ++--
 .env.prod           | 2 +-
 src/views/login.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.dev b/.env.dev
index 40a1806e..d8cb0b8a 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,7 +13,7 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
@@ -24,7 +24,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.prod b/.env.prod
index d89ed16a..1576c746 100644
--- a/.env.prod
+++ b/.env.prod
@@ -19,7 +19,7 @@ VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://10.70.2.32'
+PUBLIC_PATH = ''
 
 # 二级部署路径
 # VUE_APP_APP_NAME ='yudao-admin'
diff --git a/src/views/login.vue b/src/views/login.vue
index baa1dd27..453819d6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -47,7 +47,7 @@
 						向世界先进水平挑战，为人类社会文明做贡献
 					</p>
 				</div>
-				<video
+				<!-- <video
 					src="/static/videos/login.webm"
 					muted
 					autoplay
@@ -58,7 +58,7 @@
 						top: 28%;
 						width: 100%;
 						height: 70%;
-					"></video>
+					"></video> -->
 			</div>
 			<!-- 表单 -->
 			<div class="field">

From ebd7cb02ffe26f475d4b3718a862a65488065e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 29 Dec 2023 16:29:15 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OperationalOverview/coldBoard.vue   | 185 +++++++-----------
 .../components/doubleYChart .vue              |   4 +-
 .../components/pileBarChart.vue               | 168 +++++++---------
 .../OperationalOverview/processingBoard.vue   |  62 +++---
 4 files changed, 186 insertions(+), 233 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 57e845e9..b4b12afb 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-28 11:52:08
+ * @LastEditTime: 2023-12-29 16:19:38
  * @Description:
 -->
 <template>
@@ -132,6 +132,8 @@ import doubleYChart from './components/doubleYChart '
 // import elementResizeDetectorMaker from 'element-resize-detector';
 // var erd = elementResizeDetectorMaker(); //创建实例
 // let resizeFun = null
+import { parseTime } from '../core/mixins/code-filter';
+
 
 import LinearBarChart from './components/linearBarChart'
 const qualityYearTableProps= []
@@ -153,7 +155,10 @@ const EqMonitoringProps = [
 ]
 const cutProps = [
   { prop: 'lineName', label: '产线' },
-  { prop: 'time', label: '时间' },
+  {
+    prop: 'time', label: '时间',
+    filter: parseTime
+  },
   { prop: 'size', label: '规格' },
   { prop: 'productArea', label: '良品面积' },
   { prop: 'wasteArea', label: '废片面积' },
@@ -303,7 +308,10 @@ export default {
     this.init()
   },
   mounted() {
-    this.initWebSocket()
+    this.funInitWebSocket()
+    this.CutInitWebSocket()
+    this.SJGInitWebSocket()
+
     this.getTimes()
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
@@ -353,13 +361,13 @@ export default {
       //     status: obj.data.FanFrequencyInfo[i]
       //   })
       // }
-      this.funList = arr``
+      // this.funList = arr``
       this.$axios.get(
         '/monitoring/equipment-monitor/realtime-page',
         'get',
         this.queryParams
       ).then((res) => {
-        console.log(res);
+        console.log('222222222222222', res);
         this.realEqList = res.data.list;
         // this.total = response.data.total;
         // this.loading = false;
@@ -389,7 +397,7 @@ export default {
       //拼接格式化当前时间
       this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
     },
-    initWebSocket() {
+    SJGInitWebSocket() {
       if (typeof (WebSocket) === 'undefined') {
         alert('您的浏览器不支持WebSocket')
       } else {
@@ -397,7 +405,7 @@ export default {
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
         console.log(date);
-        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=COLD${date}`
+        const SJGWsUrl = `ws://192.168.0.30:8888/websocket/message?userId=COLD${date}`
         this.SJGWebsocket = new WebSocket(SJGWsUrl)
         // 监听 WebSocket 连接
         this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
@@ -407,7 +415,17 @@ export default {
         this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.SJGWebsocket.onclose = this.SJGWebsocketClose
-        const cutWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=CUTTING${date}`
+      }
+    },
+    CutInitWebSocket() {
+      if (typeof (WebSocket) === 'undefined') {
+        alert('您的浏览器不支持WebSocket')
+      } else {
+        // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
+        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
+        let date = new Date().valueOf()
+        console.log(date);
+        const cutWsUrl = `ws://192.168.0.30:8888/websocket/message?userId=CUTTING${date}`
 
         this.cutWebsocket = new WebSocket(cutWsUrl)
         // 监听 WebSocket 连接
@@ -418,29 +436,27 @@ export default {
         this.cutWebsocket.onmessage = this.cutWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.cutWebsocket.onclose = this.cutWebsocketClose
-        const funWsUrl = `ws://10.70.180.10:8081/xc-screen/websocket/${date}`
-        this.funWebsocket = new WebSocket(funWsUrl)
-        // 监听 WebSocket 连接
-        this.funWebsocket.onopen = this.funWebsocketOnOpen
-        // 监听 WebSocket 错误信息
-        this.funWebsocket.onerror = this.funWebsocketOnError
-        // 监听 WebSocket 消息
-        this.funWebsocket.onmessage = this.funWebsocketOnMessage
-        // 监听 webSocket 断开信息
-        this.funWebsocket.onclose = this.funWebsocketClose
-        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
-        // 实例化 WebSocket
-        // this.websocket = new WebSocket(wsUrl)
-        // // 监听 WebSocket 连接
-        // this.websocket.onopen = this.websocketOnOpen
-        // // 监听 WebSocket 错误信息
-        // this.websocket.onerror = this.websocketOnError
-        // // 监听 WebSocket 消息
-        // this.websocket.onmessage = this.websocketOnMessage
-        // // 监听 webSocket 断开信息
-        // this.websocket.onclose = this.websocketClose
       }
     },
+    funInitWebSocket() {
+      // if (typeof (WebSocket) === 'undefined') {
+      //   alert('您的浏览器不支持WebSocket')
+      // } else {
+      //   // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
+      //   // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
+      //   let date = new Date().valueOf()
+      //   const funWsUrl = `ws://10.70.2.2:8080/xc-screen/websocket/${date}`
+      //   this.funWebsocket = new WebSocket(funWsUrl)
+      //   // 监听 WebSocket 连接
+      //   this.funWebsocket.onopen = this.funWebsocketOnOpen
+      //   // 监听 WebSocket 错误信息
+      //   this.funWebsocket.onerror = this.funWebsocketOnError
+      //   // 监听 WebSocket 消息
+      //   this.funWebsocket.onmessage = this.funWebsocketOnMessage
+      //   // 监听 webSocket 断开信息
+      //   this.funWebsocket.onclose = this.funWebsocketClose
+      // }
+    },
     funWebsocketOnOpen() {
       console.log('socket连接成功')
       // console.log(this.SJGWebsocket.onmessage);
@@ -449,23 +465,23 @@ export default {
     // 连接建立失败重连
     funWebsocketOnError(e) {
       console.log('222222', e)
-      this.initWebSocket()
+      this.funInitWebSocket()
     },
     // 数据接收
     funWebsocketOnMessage(e) {
       // console.log(1111, e)
       // console.log(this.wsData)
       // console.log('22222', this.wsData.data)
-      this.wsData = JSON.parse(e.data)
-      if (this.wsData.type === 'FanFrequencyInfo') {
-        // let arr = []
-        // for (let i in this.wsData.FanFrequencyInfo) {
-        //   arr.push({
-        //     equipmentName: i,
-        //     status: obj.data.FanFrequencyInfo[i]
-        //   })
-        // }
-        // this.funList = arr
+      this.funWsData = JSON.parse(e.data)
+      if (this.funWsData.type === 'FanFrequencyInfo') {
+        let arr = []
+        for (let i in this.funWsData.FanFrequencyInfo) {
+          arr.push({
+            equipmentName: i,
+            status: obj.data.FanFrequencyInfo[i]
+          })
+        }
+        this.funList = arr
       }
     },
     cutWebsocketOnOpen() {
@@ -476,16 +492,16 @@ export default {
     // 连接建立失败重连
     cutWebsocketOnError(e) {
       console.log('11111', e)
-      this.initWebSocket()
+      this.CutInitWebSocket()
     },
     // 数据接收
     cutWebsocketOnMessage(e) {
       // console.log(1111, e)
-      this.wsData = JSON.parse(e.data)
-      console.log(this.wsData)
+      this.cutWsData = JSON.parse(e.data)
       // console.log('22222', this.wsData.data)
-      if (this.wsData.type === 'cutting' && this.wsData.name === 'table' ) {
-        this.cutTableDataList = this.wsData.productHourData.map((ele, index) => {
+      console.log('table', this.cutWsData)
+      if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
+        this.cutTableDataList = this.cutWsData.productHourData.map((ele, index) => {
           // if (ele.progressRate != 1) {
           return {
             id: ele.id,
@@ -500,7 +516,7 @@ export default {
           // }
         });
         // console.log(this.orderList)
-      } else if (this.wsData.type === 'cutting' && this.wsData.name === 'chart') {
+      } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
         let nameList = []
         let nameWasteList = []
         let topNameList = []
@@ -508,14 +524,18 @@ export default {
         let wasteList = []
         let sumAreaList = []
         let yieldList = []
-        this.cutTableDataList = this.wsData.detData.forEach((ele, index) => {
+        this.cutTableDataList = this.cutWsData.coldDetData.forEach((ele, index) => {
           nameList.push(ele.lineName)
-          topNameList.push(ele.lineName + '   ' + '总面积' + ele.sumArea)
+          topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea)
           productList.push(ele.productArea)
           wasteList.push(ele.wastArea)
-          nameWasteList.push('缺陷面积:'+ele.wastArea)
+          nameWasteList.push('缺陷面积:' + ele.wastArea)
+          sumAreaList.push(ele.sumArea)
+          yieldList.push(ele.yield)
         })
         this.$refs.pileChart.initChart(nameList, topNameList, nameWasteList, productList, wasteList)
+        // console.log(this.cutWsData)
+        // console.log('chart',nameList, topNameList, nameWasteList, productList, wasteList);
         this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
         // this.$refs.pileChart.initWebSocket
         // console.log(this.orderList)
@@ -529,7 +549,7 @@ export default {
     // 连接建立失败重连
     SJGWebsocketOnError(e) {
       console.log('11111', e)
-      this.initWebSocket()
+      this.SJGInitWebSocket()
     },
     // 数据接收
     SJGWebsocketOnMessage(e) {
@@ -538,11 +558,11 @@ export default {
       // let data = { "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }
       // let obj = JSON.parse(data.data)
       // console.log(obj);
-      this.wsData = JSON.parse(e.data)
-      console.log(this.wsData)
+      this.SJGWsData = JSON.parse(e.data)
+      console.log(this.SJGWsData)
       // console.log('22222', this.wsData.data)
-      if (this.wsData.type === 'isra') {
-        this.ISRAList = this.wsData.detData.map((ele, index) => {
+      if (this.SJGWsData.type === 'isra') {
+        this.ISRAList = this.SJGWsData.detData.map((ele, index) => {
           // if (ele.progressRate != 1) {
           return {
             id: ele.id,
@@ -557,63 +577,6 @@ export default {
         // console.log(this.orderList)
       }
     },
-    // 数据发送
-    // SJGWebsocketSend() {
-    //   this.websocket.send('11111')
-    // },
-    // // 关闭
-    // SJGWebsocketClose(e) {
-    //   console.log('WebSocket 断开连接', e)
-    // },
-    // // 连接建立之后执行send方法发送数据
-    // websocketOnOpen() {
-    //   console.log('socket连接成功')
-    //   this.websocket.onmessage()
-    // },
-    // // 连接建立失败重连
-    // websocketOnError(e) {
-    //   console.log('11111', e)
-    //   this.initWebSocket()
-    // },
-    // // 数据接收
-    // websocketOnMessage(e) {
-    //   console.log(1111, e)
-    //   this.wsData = JSON.parse(e.data)
-    //   // console.log('22222', this.wsData.data)
-    //   if (this.wsData.type === 'EnergyMonitoring') {
-    //     let EnergyNameList = []
-    //     this.wsData.data.forEach((ele) => {
-    //       EnergyNameList.push(ele.lineName)
-    //     })
-    //     this.EnergyMonitoringNameList = EnergyNameList
-    //     let EnergyDataList = []
-    //     this.wsData.data.forEach((ele) => {
-    //       EnergyDataList.push(ele.useQuantity
-    //         // {
-    //         //   type: 'bar',
-    //         //   data: ele.useQuantity,
-    //         //   barWidth: 6
-
-    //         // }
-    //       )
-    //     })
-    //     this.EnergyMonitoringList = EnergyDataList
-    //     console.log(EnergyDataList)
-    //     // console.log(this.EnergyMonitoringNameList)
-    //     // console.log(this.EnergyMonitoringList)
-    //     // this.$nextTick(() => {
-    //     this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
-    //     // })
-    //   }
-    // },
-    // // 数据发送
-    // websocketSend() {
-    //   this.websocket.send('11111')
-    // },
-    // // 关闭
-    // websocketClose(e) {
-    //   console.log('WebSocket 断开连接', e)
-    // },
     windowWidth(value) {
       this.clientWidth = value
       this.beilv2 = this.clientWidth / 1920
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index 7355968c..4e5a4816 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue	
+++ b/src/views/OperationalOverview/components/doubleYChart .vue	
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2023-12-27 18:28:45
+ * @LastEditTime: 2023-12-29 16:18:17
  * @LastEditors: zhp
  * @Description:
 -->
@@ -138,7 +138,7 @@ export default {
           }
         },
         grid: {
-          left: "3%",
+          left: "4%",
           right: "4%",
           bottom: "3%",
           width: 'auto',
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index 01d7a6b3..8aa32129 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2023-12-27 19:47:27
+ * @LastEditTime: 2023-12-29 16:28:26
  * @LastEditors: zhp
  * @Description:
 -->
@@ -93,54 +93,50 @@ export default {
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
       // console.log(1)
       this.chart = echarts.init(document.getElementById(this.id))
-      let series = [{
-        name: '成品面积',
-        type: 'bar',
-        stack: 'total',
-        // label: {
-        //   show: true
-        // },
-        emphasis: {
-          focus: 'series'
+      let series = [
+        {
+          // 辅助系列
+          name: '良品',
+          type: 'bar',
+          stack: 'total',
+          // silent: true,
+          // itemStyle: {
+            color: '#0fdedb',
+          // },
+          barWidth: 10,
+          data: passRateList
         },
-        data: passRateList,
-        itemStyle: {
-          normal: { color: '#2359ec' }
+        {
+          type: 'bar',
+          stack: 'total',
+          name: '废品',
+          data: wasteList,
+          barWidth: 10,
+          // barWidth: 15,
+          // label: {
+          //   position: [10, 10],
+          //   normal: {
+          //     position: [800, -24],
+          //     show: true,
+          //     textStyle: {
+          //       color: '#2359ec',
+          //       fontSize: 16,
+          //     },
+          //   },
+          // },
         }
-      },
-      {
-        name: '废片面积',
-        type: 'bar',
-        stack: 'total',
-        // label: {
-        //   show: true
-        // },
-        emphasis: {
-          focus: 'series'
-        },
-        barWidth: 12,
-        data: wasteList,
-        itemStyle: {
-          normal: { color: '#745fe4' }
-        }
-      },]
+      ]
       // for (i = 0; i < 5; i++) {
       //   series.push({
 
       //   })
       // }
-      const yAxisDataLeft = topNameList;
-      // const yAxisDataRight = ['服装', '矿产', '服务业', '建筑业', '金融业'];
-      const yAxisDataRight = nameWasteList
       this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            // Use axis to trigger tooltip
-            type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+        legend: {
+          textStyle: {
+            color: '#ffffff'
           }
         },
-        // legend: {},
         grid: {
           left: '3%',
           right: '4%',
@@ -149,73 +145,38 @@ export default {
           height: 'auto',
           containLabel: true
         },
-        xAxis: {
-          type: 'value',
-          show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
-          axisTick: {
-            show: false // 不显示坐标轴刻度线
-          },
-          axisLine: {
-            show: false, // 不显示坐标轴线
-          },
-          axisLabel: {
-            show: false, // 不显示坐标轴上的文字
-          },
-          splitLine: {
-            show: false // 不显示网格线
-          },
-        },
         yAxis: [
           {
+            type: 'category',
             inverse: true,
-            data: yAxisDataLeft,
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
             axisLabel: {
               show: true,
               inside: true,
+              interval: 0, //横轴信息全部显
+              splitNumber: 50,
+              // boundaryGap: [20, 20],
               textStyle: {
                 color: '#ffffff',
+                verticalAlign: 'bottom',
                 fontSize: 12,
                 align: 'left',
-              },
-              formatter: '{value}\n{a|占位}\n{a|占位}',
-              rich: {
-                a: {
-                  color: 'transparent',
-                  lineHeight: 24,
-                }
+                padding: [0, 0, 15, -5]
               }
             },
-            //offset: 30,
-            splitLine: {
-              show: false
-            },
-            axisTick: {
-              show: false
-            },
-            axisLine: {
-              show: false
-            }
+            data: topNameList
           },
           {
-            inverse: false,
-            data: yAxisDataRight,
-            axisLabel: {
-              inside: true,
-              textStyle: {
-                color: '#ffffff',
-                fontSize: 12,
-                align: 'right',
-              },
-              formatter: '{value}\n{a|占位}\n{a|占位}',
-              rich: {
-                a: {
-                  color: 'transparent',
-                  lineHeight: 24,
-                  fontFamily: 'digital'
-                }
-              }
-            },
-            offset: 0,
+            type: 'category',
+            inverse: true,
             splitLine: {
               show: false
             },
@@ -224,10 +185,29 @@ export default {
             },
             axisLine: {
               show: false
-            }
+            },
+            axisLabel: {
+              show: true,
+              inside: true,
+              interval: 0, //横轴信息全部显
+              splitNumber: 50,
+              // boundaryGap: [20, 20],
+              textStyle: {
+                color: '#ffffff',
+                verticalAlign: 'bottom',
+                fontSize: 12,
+                align: 'right',
+                padding: [0, 0, 15, -5]
+              }
+            },
+            data: nameWasteList
           }
         ],
-        series: series
+        xAxis: {
+          // max: 120,
+          show: false,
+        },
+        series:series
       })
     }
   }
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 33f03ab2..1c678278 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-28 10:22:06
+ * @LastEditTime: 2023-12-29 15:15:50
  * @Description:
 -->
 <template>
@@ -557,6 +557,7 @@ export default {
   mounted() {
     this.getList()
     this.initWebSocket()
+    this.SJGInitWebSocket()
     this.getTimes()
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
@@ -597,14 +598,14 @@ export default {
         'get',
         this.queryParams
       ).then((res) => {
-        console.log('11111', res);
+        // console.log('11111', res);
         this.productLineList = res.data
       })
       this.$axios.get(
         'base/quality-inspection-record/dayStatistics',
         'get',
       ).then((res) => {
-        console.log('11111', res);
+        // console.log('11111', res);
         this.qualityMonthList = res.data
       })
     },
@@ -639,17 +640,6 @@ export default {
         const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
-        console.log(date);
-        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
-        this.SJGWebsocket = new WebSocket(SJGWsUrl)
-        // 监听 WebSocket 连接
-        this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
-        // 监听 WebSocket 错误信息
-        this.SJGWebsocket.onerror = this.SJGWebsocketOnError
-        // 监听 WebSocket 消息
-        this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
-        // 监听 webSocket 断开信息
-        this.SJGWebsocket.onclose = this.SJGWebsocketClose
         // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
         // 实例化 WebSocket
         this.websocket = new WebSocket(wsUrl)
@@ -663,6 +653,26 @@ export default {
         this.websocket.onclose = this.websocketClose
       }
     },
+    SJGInitWebSocket() {
+      if (typeof (WebSocket) === 'undefined') {
+        alert('您的浏览器不支持WebSocket')
+      } else {
+        // const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
+        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
+        let date = new Date().valueOf()
+        // console.log(date);
+        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
+        this.SJGWebsocket = new WebSocket(SJGWsUrl)
+        // 监听 WebSocket 连接
+        this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.SJGWebsocket.onerror = this.SJGWebsocketOnError
+        // 监听 WebSocket 消息
+        this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.SJGWebsocket.onclose = this.SJGWebsocketClose
+      }
+    },
     SJGWebsocketOnOpen() {
       console.log('socket连接成功')
       console.log(this.SJGWebsocket.onmessage);
@@ -671,16 +681,16 @@ export default {
     // 连接建立失败重连
     SJGWebsocketOnError(e) {
       // console.log('11111', e)
-      this.initWebSocket()
+      this.SJGInitWebSocket()
     },
     // 数据接收
     SJGWebsocketOnMessage(e) {
       // console.log(1111, e)
-      this.wsData = JSON.parse(e.data)
+      this.SJGWsData = JSON.parse(e.data)
       // console.log(this.wsData.detData);
       // console.log('22222', this.wsData.data)
-      if (this.wsData.type === 'order') {
-        this.orderList = this.wsData.detData.map((ele, index) => {
+      if (this.SJGWsData.type === 'order') {
+        this.orderList = this.SJGWsData.detData.map((ele, index) => {
           if (ele.progressRate != 1) {
             return {
               id: ele.id,
@@ -690,8 +700,8 @@ export default {
           }
         });
         console.log(this.orderList)
-      } else if (this.wsData.type === 'equipment') {
-        this.equipmentList = this.wsData.detData.map((ele, index) => {
+      } else if (this.SJGWsData.type === 'equipment') {
+        this.equipmentList = this.SJGWsData.detData.map((ele, index) => {
           // if (ele.progressRate != 1) {
             return {
               id: ele.id,
@@ -702,16 +712,16 @@ export default {
             }
           // }
         });
-        // console.log(this.orderList)
-      } else if (this.wsData.type === 'productline') {
-        console.log(this.wsData.detData);
+        // console.log(SJGWsData.orderList)
+      } else if (this.SJGWsData.type === 'productline') {
+        // console.log(this.wsData.detData);
         let nameList = []
         let passRateList = []
         let outputNumList = []
 
         // console.log('2222222222', this.productLineList);
         this.productLineList.forEach((item) => {
-          this.wsData.detData.forEach((ele) => {
+          this.SJGWsData.detData.forEach((ele) => {
             if (item.id == ele.productionLineId) {
               nameList.push(item.name)
             }
@@ -720,11 +730,11 @@ export default {
         console.log(Array.from(new Set(nameList)))
         // progressRateList = EnergyNameList
         // let EnergyDataList = []
-        this.wsData.detData.forEach((ele) => {
+        this.SJGWsData.detData.forEach((ele) => {
           passRateList.push(ele.passRate *100
           )
         })
-        this.wsData.detData.forEach((ele) => {
+        this.SJGWsData.detData.forEach((ele) => {
           outputNumList.push(ele.outputNum
           )
         })

From 0e0171cc0f3387ab26d0af7c8629338dccd23844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 29 Dec 2023 16:44:25 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OperationalOverview/coldBoard.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index b4b12afb..a32cbc2b 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-29 16:19:38
+ * @LastEditTime: 2023-12-29 16:41:18
  * @Description:
 -->
 <template>
@@ -531,7 +531,7 @@ export default {
           wasteList.push(ele.wastArea)
           nameWasteList.push('缺陷面积:' + ele.wastArea)
           sumAreaList.push(ele.sumArea)
-          yieldList.push(ele.yield)
+          yieldList.push((ele.yield *100).toFixed(3))
         })
         this.$refs.pileChart.initChart(nameList, topNameList, nameWasteList, productList, wasteList)
         // console.log(this.cutWsData)

From 91526eb84729c92b3b30eb0a8be0dae2b6c247d1 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Fri, 29 Dec 2023 17:57:29 +0800
Subject: [PATCH 09/11] '1'

---
 src/views/OperationalOverview/coldBoard.vue       | 8 ++++----
 src/views/OperationalOverview/processingBoard.vue | 6 +++---
 src/views/databoard/kiln/index.vue                | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 57e845e9..470c8f08 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -397,7 +397,7 @@ export default {
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
         console.log(date);
-        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=COLD${date}`
+        const SJGWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=COLD${date}`
         this.SJGWebsocket = new WebSocket(SJGWsUrl)
         // 监听 WebSocket 连接
         this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
@@ -407,7 +407,7 @@ export default {
         this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.SJGWebsocket.onclose = this.SJGWebsocketClose
-        const cutWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=CUTTING${date}`
+        const cutWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=CUTTING${date}`
 
         this.cutWebsocket = new WebSocket(cutWsUrl)
         // 监听 WebSocket 连接
@@ -418,7 +418,7 @@ export default {
         this.cutWebsocket.onmessage = this.cutWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.cutWebsocket.onclose = this.cutWebsocketClose
-        const funWsUrl = `ws://10.70.180.10:8081/xc-screen/websocket/${date}`
+        const funWsUrl = `ws://10.70.2.2:8080/xc-screen/websocket/${date}`
         this.funWebsocket = new WebSocket(funWsUrl)
         // 监听 WebSocket 连接
         this.funWebsocket.onopen = this.funWebsocketOnOpen
@@ -428,7 +428,7 @@ export default {
         this.funWebsocket.onmessage = this.funWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.funWebsocket.onclose = this.funWebsocketClose
-        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
+        // const wsUrl = 'ws://10.70.2.2:8080/websocket/message?userId=EN111'
         // 实例化 WebSocket
         // this.websocket = new WebSocket(wsUrl)
         // // 监听 WebSocket 连接
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 33f03ab2..6c771f72 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -636,11 +636,11 @@ export default {
       if (typeof (WebSocket) === 'undefined') {
         alert('您的浏览器不支持WebSocket')
       } else {
-        const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
+        const wsUrl = `ws://10.70.2.2:8080/websocket/message?userId=EN${date}`
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
         console.log(date);
-        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
+        const SJGWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=SJG${date}`
         this.SJGWebsocket = new WebSocket(SJGWsUrl)
         // 监听 WebSocket 连接
         this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
@@ -650,7 +650,7 @@ export default {
         this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.SJGWebsocket.onclose = this.SJGWebsocketClose
-        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
+        // const wsUrl = 'ws://10.70.2.2:8080/websocket/message?userId=EN111'
         // 实例化 WebSocket
         this.websocket = new WebSocket(wsUrl)
         // 监听 WebSocket 连接
diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index 2d99117b..f39a213c 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -82,7 +82,7 @@ export default {
 		// this.getMes()
 		// closeWebsocket()
 		getDcsMsg()
-		// getMesMsg()
+		getMesMsg()
 		console.log('mounted...........')
 	},
 	destroyed() {

From 3d198d83cb41dea940e01562b126f4e1edb99031 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Sat, 30 Dec 2023 09:23:37 +0800
Subject: [PATCH 10/11] '1'

---
 .env.prod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.prod b/.env.prod
index 1576c746..12538daa 100644
--- a/.env.prod
+++ b/.env.prod
@@ -15,7 +15,7 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
+VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
 
 
 # 根据服务器或域名修改

From bdf292654b74e68b8c7c2e80370c9de547ceae48 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Tue, 2 Jan 2024 09:20:55 +0800
Subject: [PATCH 11/11] 'update_coldboard'

---
 src/views/OperationalOverview/coldBoard.vue   | 115 +++++++++---------
 .../components/baseTable.vue                  |   2 +-
 .../components/doubleYChart .vue              |   3 +-
 3 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index c262ff02..a92aad06 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -83,10 +83,14 @@
               <top-radio-group />
             </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <el-col :span="12">
-              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
+            <el-col :span="6">
+              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
                 :table-data="funList" />
             </el-col>
+            <el-col :span="6">
+              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
+                :table-data="annealFunList" />
+            </el-col>
             <el-col :span="12" style="float: right;">
               <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
                 :table-data="realEqList" />
@@ -137,6 +141,10 @@ import { parseTime } from '../core/mixins/code-filter';
 
 import LinearBarChart from './components/linearBarChart'
 const qualityYearTableProps= []
+const EqMonitoringPropsFun = [
+  { prop: 'equipmentName', label: '设备名称' },
+  { prop: 'status', label: '运行状态', width: 80}
+]
 const EqMonitoringProps = [
   { prop: 'productLine', label: '产线' },
   { prop: 'equipmentName', label: '设备名称' },
@@ -154,15 +162,15 @@ const EqMonitoringProps = [
   },
 ]
 const cutProps = [
-  { prop: 'lineName', label: '产线' },
+  { prop: 'lineName', label: '产线', width: 50 },
   {
     prop: 'time', label: '时间',
     filter: parseTime
   },
   { prop: 'size', label: '规格' },
-  { prop: 'productArea', label: '良品面积' },
-  { prop: 'wasteArea', label: '废片面积' },
-  { prop: 'product', label: '良品率' },
+  { prop: 'productArea', label: '良品面积', width: 80 },
+  { prop: 'wasteArea', label: '废片面积', width: 80 },
+  { prop: 'product', label: '良品率', width: 80 },
 ]
 const cxNameList = ['周一', '周二', '周三', '周四', '周五']
 
@@ -246,6 +254,7 @@ export default {
       beilv: 1,
       value: 100,
       EqMonitoringProps,
+      EqMonitoringPropsFun,
       realEqList:[],
       qualityYearTableProps,
       ISRATableProps,
@@ -263,9 +272,13 @@ export default {
       clientWidth: 0,
       containerWidth: 111111,
       isFullScreen: false,
+      cutWsData: {},
+      funWsData: {},
+      SJGWsData: {},
       // orderProcessList: [],
       dateType: '0',
       funList:[],
+      annealFunList: [],
       queryParams: {
         pageNo: 1,
         pageSize: 10,
@@ -334,7 +347,6 @@ export default {
     //   this.beilv2 = window.innerWidth / 1920
     // })
     // erd.listenTo(document, (element) => {
-    //   console.log(element.offsetWidth)
     //   this.beilv2 = element.offsetWidth / 1920
 
     //   // var width = element.offsetWidth;
@@ -352,7 +364,6 @@ export default {
       // 执行查询
       // let data = '{ "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }'
       // let obj = JSON.parse(data)
-      // console.log('data', obj.data.FanFrequencyInfo)
       // // for()
       // let arr = []
       // for (let i in obj.data.FanFrequencyInfo) {
@@ -367,7 +378,6 @@ export default {
         'get',
         this.queryParams
       ).then((res) => {
-        console.log('222222222222222', res);
         this.realEqList = res.data.list;
         // this.total = response.data.total;
         // this.loading = false;
@@ -404,7 +414,6 @@ export default {
         // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
-        console.log(date);
         const SJGWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=COLD${date}`
         this.SJGWebsocket = new WebSocket(SJGWsUrl)
         // 监听 WebSocket 连接
@@ -424,7 +433,6 @@ export default {
         // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
-        console.log(date);
         const cutWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=CUTTING${date}`
 
         this.cutWebsocket = new WebSocket(cutWsUrl)
@@ -439,46 +447,52 @@ export default {
       }
     },
     funInitWebSocket() {
-      // if (typeof (WebSocket) === 'undefined') {
-      //   alert('您的浏览器不支持WebSocket')
-      // } else {
-      //   // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
-      //   // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
-      //   let date = new Date().valueOf()
-      //   const funWsUrl = `ws://10.70.2.2:8080/xc-screen/websocket/${date}`
-      //   this.funWebsocket = new WebSocket(funWsUrl)
-      //   // 监听 WebSocket 连接
-      //   this.funWebsocket.onopen = this.funWebsocketOnOpen
-      //   // 监听 WebSocket 错误信息
-      //   this.funWebsocket.onerror = this.funWebsocketOnError
-      //   // 监听 WebSocket 消息
-      //   this.funWebsocket.onmessage = this.funWebsocketOnMessage
-      //   // 监听 webSocket 断开信息
-      //   this.funWebsocket.onclose = this.funWebsocketClose
-      // }
+      if (typeof (WebSocket) === 'undefined') {
+        alert('您的浏览器不支持WebSocket')
+      } else {
+        // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
+        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
+        let date = new Date().valueOf()
+        const funWsUrl = `ws://10.70.180.10:8081/xc-screen/websocket/${date}`
+        this.funWebsocket = new WebSocket(funWsUrl)
+        // 监听 WebSocket 连接
+        this.funWebsocket.onopen = this.funWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.funWebsocket.onerror = this.funWebsocketOnError
+        // 监听 WebSocket 消息
+        this.funWebsocket.onmessage = this.funWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.funWebsocket.onclose = this.funWebsocketClose
+      }
     },
     funWebsocketOnOpen() {
       console.log('socket连接成功')
-      // console.log(this.SJGWebsocket.onmessage);
       this.SJGWebsocket.onmessage()
     },
     // 连接建立失败重连
     funWebsocketOnError(e) {
-      console.log('222222', e)
       this.funInitWebSocket()
     },
     // 数据接收
     funWebsocketOnMessage(e) {
-      // console.log(1111, e)
-      // console.log(this.wsData)
-      // console.log('22222', this.wsData.data)
-      this.funWsData = JSON.parse(e.data)
-      if (this.funWsData.type === 'FanFrequencyInfo') {
+      this.funWsData = e?.data ? JSON.parse(e?.data) : {}
+      // FanInfo
+      if (this.funWsData.type === 'AnnealFanInfo') {
         let arr = []
-        for (let i in this.funWsData.FanFrequencyInfo) {
+        for (let i in this.funWsData.data.annealFanInfo) {
           arr.push({
             equipmentName: i,
-            status: obj.data.FanFrequencyInfo[i]
+            status: this.funWsData.data.annealFanInfo[i]
+          })
+        }
+        this.annealFunList = arr
+      }
+      if (this.funWsData.type === 'FanInfo') {
+        let arr = []
+        for (let i in this.funWsData.data.fanInfo) {
+          arr.push({
+            equipmentName: i,
+            status: this.funWsData.data.fanInfo[i]
           })
         }
         this.funList = arr
@@ -486,20 +500,15 @@ export default {
     },
     cutWebsocketOnOpen() {
       console.log('socket连接成功')
-      // console.log(this.SJGWebsocket.onmessage);
       this.SJGWebsocket.onmessage()
     },
     // 连接建立失败重连
     cutWebsocketOnError(e) {
-      console.log('11111', e)
       this.CutInitWebSocket()
     },
     // 数据接收
     cutWebsocketOnMessage(e) {
-      // console.log(1111, e)
-      this.cutWsData = JSON.parse(e.data)
-      // console.log('22222', this.wsData.data)
-      console.log('table', this.cutWsData)
+      this.cutWsData = e?.data ? JSON.parse(e?.data) : {}
       if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
         this.cutTableDataList = this.cutWsData.productHourData.map((ele, index) => {
           // if (ele.progressRate != 1) {
@@ -510,12 +519,11 @@ export default {
             size: ele.size,
             productArea: ele.productArea + '㎡',
             wasteArea: ele.wasteArea + '㎡',
-            product: (ele.product *100).toFixed + '%'
+            product: (ele.product * 100).toFixed(2) + '%'
 
           }
           // }
         });
-        // console.log(this.orderList)
       } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
         let nameList = []
         let nameWasteList = []
@@ -524,7 +532,8 @@ export default {
         let wasteList = []
         let sumAreaList = []
         let yieldList = []
-        this.cutTableDataList = this.cutWsData.coldDetData.forEach((ele, index) => {
+        // this.cutTableDataList = 
+        this.cutWsData.coldDetData.forEach((ele, index) => {
           nameList.push(ele.lineName)
           topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea)
           productList.push(ele.productArea)
@@ -534,33 +543,22 @@ export default {
           yieldList.push((ele.yield *100).toFixed(3))
         })
         this.$refs.pileChart.initChart(nameList, topNameList, nameWasteList, productList, wasteList)
-        // console.log(this.cutWsData)
-        // console.log('chart',nameList, topNameList, nameWasteList, productList, wasteList);
         this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
-        // this.$refs.pileChart.initWebSocket
-        // console.log(this.orderList)
       }
     },
     SJGWebsocketOnOpen() {
       console.log('socket连接成功')
-      // console.log(this.SJGWebsocket.onmessage);
       this.SJGWebsocket.onmessage()
     },
     // 连接建立失败重连
     SJGWebsocketOnError(e) {
-      console.log('11111', e)
       this.SJGInitWebSocket()
     },
     // 数据接收
     SJGWebsocketOnMessage(e) {
-      console.log(e);
-      // console.log(1111, e)
       // let data = { "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }
       // let obj = JSON.parse(data.data)
-      // console.log(obj);
-      this.SJGWsData = JSON.parse(e.data)
-      console.log(this.SJGWsData)
-      // console.log('22222', this.wsData.data)
+      this.SJGWsData = e?.data ? JSON.parse(e?.data) : {}
       if (this.SJGWsData.type === 'isra') {
         this.ISRAList = this.SJGWsData.detData.map((ele, index) => {
           // if (ele.progressRate != 1) {
@@ -574,7 +572,6 @@ export default {
           }
           // }
         });
-        // console.log(this.orderList)
       }
     },
     windowWidth(value) {
diff --git a/src/views/OperationalOverview/components/baseTable.vue b/src/views/OperationalOverview/components/baseTable.vue
index 83fbf703..2865e710 100644
--- a/src/views/OperationalOverview/components/baseTable.vue
+++ b/src/views/OperationalOverview/components/baseTable.vue
@@ -18,7 +18,7 @@
       <el-table-column
         prop="_pageIndex"
         label="序号"
-        :width="70"
+        :width="50"
         align="center"
       />
       <el-table-column
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index 4e5a4816..0ad2990a 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue	
+++ b/src/views/OperationalOverview/components/doubleYChart .vue	
@@ -60,7 +60,6 @@ export default {
   data() {
     return {
       chart: null,
-      nameList: [],
       series: [{
         type: 'bar',
         data: [],
@@ -227,7 +226,7 @@ export default {
             },
             scale: true,
             type: 'value',
-            name: '产量/片', // y轴上方的单位
+            name: '产量/㎡', // y轴上方的单位
             nameTextStyle: {// y轴上方单位的颜色
               color: '#fff'
             },