From 9561dc27e332c62f73ad325aa8601286d32a1123 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 20 Dec 2023 10:26:38 +0800
Subject: [PATCH 1/7] fix some bugs

---
 src/components/DialogForm/index.vue           | 24 +++++++++++++++++--
 .../specialEquipment/basic/FireFighthing.vue  |  8 +++----
 src/views/specialEquipment/basic/Safety.vue   |  4 ++--
 .../specialEquipment/check/Record-add.vue     |  3 +++
 .../specialEquipment/maintain/PlanConfig.vue  |  2 +-
 .../specialEquipment/maintain/Record.vue      | 13 ++++++++++
 6 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 3248ce17..ac7e32ac 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -101,7 +101,9 @@
 								}
 							"
 							v-bind="col.bind">
-							<el-button size="mini" :disabled="disabled || col.bind?.disabled || false">
+							<el-button
+								size="mini"
+								:disabled="disabled || col.bind?.disabled || false">
 								<svg-icon
 									icon-class="icon-upload"
 									style="color: inherit"></svg-icon>
@@ -410,8 +412,26 @@ export default {
 			}
 			if (!promiseList.length) this.formLoading = false;
 		},
+
 		// 上传成功的特殊处理
-		beforeUpload() {},
+		beforeUpload(file) {
+			const checkFileSize = () => {
+				const isLt2M = file.size / 1024 / 1024 < 2;
+				if (!isLt2M) {
+					this.$modal.msgError('上传文件大小不能超过 2MB!');
+				}
+				return isLt2M;
+			};
+			const checkFileType = () => {
+				const isJPG =
+					file.type === 'image/jpeg' ||
+					file.type === 'image/png' ||
+					file.type === 'image/jpg';
+				return isJPG;
+			};
+			return checkFileSize() && checkFileType();
+		},
+
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, prop) {
 			console.log('[handleUploadSuccess]', response, file, prop);
diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index 341d4883..9f925444 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -170,19 +170,19 @@ export default {
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'location', label: '位置' },
 				{ prop: 'responsiblePeopleName', label: '负责人' },
-				{ prop: 'dueDate', label: '有效期至' },
+				{ prop: 'dueTime', label: '有效期至' },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '名称',
+					label: '设备名称',
 					placeholder: '请输入设备名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '编码',
+					label: '设备编码',
 					placeholder: '请输入设备编码',
 					param: 'code',
 				},
@@ -251,7 +251,7 @@ export default {
 					{
 						datetime: true,
 						label: '有效期至',
-						prop: 'dueDate',
+						prop: 'dueTime',
 						bind: { clearable: true },
 					},
 					{},
diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue
index 25cd5a61..b91767fb 100644
--- a/src/views/specialEquipment/basic/Safety.vue
+++ b/src/views/specialEquipment/basic/Safety.vue
@@ -175,13 +175,13 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '名称',
+					label: '设备名称',
 					placeholder: '请输入设备名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '编码',
+					label: '设备编码',
 					placeholder: '请输入设备编码',
 					param: 'code',
 				},
diff --git a/src/views/specialEquipment/check/Record-add.vue b/src/views/specialEquipment/check/Record-add.vue
index c5935113..79e9c659 100644
--- a/src/views/specialEquipment/check/Record-add.vue
+++ b/src/views/specialEquipment/check/Record-add.vue
@@ -54,6 +54,7 @@
 						<el-select
 							v-model="dataForm.equipmentId"
 							filterable
+							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择设备名称"
@@ -74,6 +75,7 @@
 						<el-select
 							v-model="dataForm.configId"
 							filterable
+							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择巡检配置"
@@ -121,6 +123,7 @@
 						<el-select
 							v-model="dataForm.origin"
 							filterable
+							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择数据来源">
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index 217e61fe..c4559687 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -353,7 +353,7 @@ export default {
 				queryData.createTime = this.queryParams.createTime;
 			}
 			this.$router.push({
-				path: '/equipment/base/maintain/record',
+				path: '/safety-environmental/special-equipment/equipment-maintain/maintain-record',
 				query: queryData,
 			});
 			// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 3d18b73e..bf33d9a0 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -556,6 +556,19 @@ export default {
 				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
 				this.form.startTime = tempRow.nextMaintainTime;
 				this.form.maintainPlanId = tempRow.id;
+				// await (() => {
+				// 	return new Promise((acpt, rejt) => {
+				// 		this.form.relatePlan =
+				// 			this.$route.query.relatePlan ||
+				// 			(tempRow.nextMaintainTime ? 1 : 2);
+				// 		this.form.startTime = tempRow.nextMaintainTime;
+				// 		acpt();
+				// 	});
+				// })();
+				// this.$nextTick(() => {
+				// 	this.form.maintainPlanId = tempRow.id;
+				// 	this.form.equipmentId = tempRow.equipmentId;
+				// });
 			}
 			if (this.$route.query.isAdd) {
 				// 赋值

From a764e20bd4497a7b3f336346e8ef468e5510fd52 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 20 Dec 2023 10:45:00 +0800
Subject: [PATCH 2/7] update

---
 src/views/specialEquipment/check/Record-add.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/specialEquipment/check/Record-add.vue b/src/views/specialEquipment/check/Record-add.vue
index 79e9c659..3da17625 100644
--- a/src/views/specialEquipment/check/Record-add.vue
+++ b/src/views/specialEquipment/check/Record-add.vue
@@ -50,7 +50,12 @@
 				</el-col>
 
 				<el-col :span="8">
-					<el-form-item label="设备名称" prop="equipmentId">
+					<el-form-item
+						label="设备名称"
+						prop="equipmentId"
+						:rules="[
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						]">
 						<el-select
 							v-model="dataForm.equipmentId"
 							filterable
@@ -71,7 +76,12 @@
 					<!-- <el-form-item label="物料名称" prop="name">
 						<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
 					</el-form-item> -->
-					<el-form-item label="巡检配置名称" prop="configId">
+					<el-form-item
+						label="巡检配置名称"
+						prop="configId"
+						:rules="[
+							{ required: true, message: '巡检配置不能为空', trigger: 'blur' },
+						]">
 						<el-select
 							v-model="dataForm.configId"
 							filterable

From 39d2c4a95920bf08cee4506c8a3c7d815b1f8ad1 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 20 Dec 2023 14:11:05 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/Item.vue        |  2 +
 src/layout/components/Sidebar/Logo.vue        | 10 +-
 src/layout/components/Sidebar/SidebarItem.vue |  9 +-
 .../components/Sidebar/SidebarItemSub.vue     | 96 +++++++++++++++++++
 src/layout/components/Sidebar/index.vue       |  8 +-
 src/views/system/menu/index.vue               | 16 ++--
 6 files changed, 122 insertions(+), 19 deletions(-)
 create mode 100644 src/layout/components/Sidebar/SidebarItemSub.vue

diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index be3285df..07dca92a 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -18,6 +18,8 @@ export default {
 
     if (icon) {
       vnodes.push(<svg-icon icon-class={icon}/>)
+    } else {
+      vnodes.push(<span style="display: inline-block; width: 10px;"/>)
     }
 
     if (title) {
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 91a437be..c02cd648 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -15,7 +15,7 @@
 				key="collapse"
 				class="sidebar-logo-link"
 				to="/">
-				<img v-if="logo" :src="logo" class="sidebar-logo" />
+				<img v-if="logo" :src="logo" class="sidebar-logo-close" />
 				<h1
 					v-else
 					class="sidebar-title"
@@ -118,7 +118,13 @@ export default {
 	}
 
 	&.collapse {
-		.sidebar-logo {
+		// .sidebar-logo {
+		// 	margin-right: 0px;
+		// }
+		.sidebar-logo-close {
+			width: 54px;
+			height: 19px;
+			vertical-align: middle;
 			margin-right: 0px;
 		}
 	}
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 7880cbba..7de4c11c 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -3,16 +3,16 @@
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+          <item icon="menuIcon" :title="onlyOneChild.meta.title" />
         </el-menu-item>
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <item v-if="item.meta" icon="menuIcon" :title="item.meta.title" />
       </template>
-      <sidebar-item
+      <sidebar-item-sub
         v-for="(child, index) in item.children"
         :key="child.path + index"
         :is-nest="true"
@@ -30,10 +30,11 @@ import { isExternal } from '@/utils/validate'
 import Item from './Item'
 import AppLink from './Link'
 import FixiOSBug from './FixiOSBug'
+import SidebarItemSub from './SidebarItemSub'
 
 export default {
   name: 'SidebarItem',
-  components: { Item, AppLink },
+  components: { Item, AppLink, SidebarItemSub },
   mixins: [FixiOSBug],
   props: {
     // route object
diff --git a/src/layout/components/Sidebar/SidebarItemSub.vue b/src/layout/components/Sidebar/SidebarItemSub.vue
new file mode 100644
index 00000000..934d617d
--- /dev/null
+++ b/src/layout/components/Sidebar/SidebarItemSub.vue
@@ -0,0 +1,96 @@
+<template>
+  <div v-if="!item.hidden">
+    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+          <item icon="" :title="onlyOneChild.meta.title" />
+        </el-menu-item>
+      </app-link>
+    </template>
+
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+      <template slot="title">
+        <item v-if="item.meta" icon="" :title="item.meta.title" />
+      </template>
+      <sidebar-item-sub
+        v-for="(child, index) in item.children"
+        :key="child.path + index"
+        :is-nest="true"
+        :item="child"
+        :base-path="resolvePath(child.path)"
+        class="nest-menu"
+      />
+    </el-submenu>
+  </div>
+</template>
+
+<script>
+import path from 'path'
+import { isExternal } from '@/utils/validate'
+import Item from './Item'
+import AppLink from './Link'
+import FixiOSBug from './FixiOSBug'
+
+export default {
+  name: 'SidebarItemSub',
+  components: { Item, AppLink },
+  mixins: [FixiOSBug],
+  props: {
+    // route object
+    item: {
+      type: Object,
+      required: true
+    },
+    isNest: {
+      type: Boolean,
+      default: false
+    },
+    basePath: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    this.onlyOneChild = null
+    return {}
+  },
+  methods: {
+    hasOneShowingChild(children = [], parent) {
+      if (!children) {
+        children = [];
+      }
+      const showingChildren = children.filter(item => {
+        if (item.hidden) {
+          return false
+        } else {
+          // Temp set(will be used if only has one showing child)
+          this.onlyOneChild = item
+          return true
+        }
+      })
+
+      // When there is only one child router, the child router is displayed by default
+      if (showingChildren.length === 1) {
+        return true
+      }
+
+      // Show parent if there are no child router to display
+      if (showingChildren.length === 0) {
+        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
+        return true
+      }
+
+      return false
+    },
+    resolvePath(routePath) {
+      if (isExternal(routePath)) {
+        return routePath
+      }
+      if (isExternal(this.basePath)) {
+        return this.basePath
+      }
+      return path.resolve(this.basePath, routePath)
+    }
+  }
+}
+</script>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index bac19f28..5c46634d 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -28,10 +28,10 @@
 				mode="vertical">
 				<!-- 根据 sidebarRouters 路由，生成菜单 -->
 				<sidebar-item
-					v-for="(route, index) in routeList"
+					v-for="(route, index) in routeList.children"
 					:key="route.path + index"
 					:item="route"
-					:base-path="route.path" />
+					:base-path="routeList.path+ '/'+ route.path" />
 			</el-menu>
 		</el-scrollbar>
 	</div>
@@ -49,9 +49,7 @@ export default {
 		...mapState(['settings']),
 		...mapGetters(['sidebarRouters', 'sidebar', 'choicepart']),
     routeList() {
-      // return [this.partList[this.choicepart]]
-			// return [this.sidebarRouters[29]]
-			return [this.sidebarRouters[this.choicepart]]
+			return this.sidebarRouters[this.choicepart]
     },
 		activeMenu() {
 			const route = this.$route;
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index efb4df49..082db5a8 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -32,11 +32,11 @@
     <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="250"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <!-- <el-table-column prop="icon" label="图标" align="center" width="100">
         <template v-slot="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="sort" label="排序" width="60"></el-table-column>
       <el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" />
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
@@ -76,7 +76,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item v-if="form.type !== 3" label="菜单图标">
               <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
                 <IconSelect ref="iconSelect" @selected="selected" />
@@ -87,7 +87,7 @@
                 </el-input>
               </el-popover>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="菜单名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入菜单名称" />
@@ -263,9 +263,9 @@ export default {
   },
   methods: {
     // 选择图标
-    selected(name) {
-      this.form.icon = name;
-    },
+    // selected(name) {
+    //   this.form.icon = name;
+    // },
     /** 查询菜单列表 */
     getList() {
       this.loading = true;
@@ -305,7 +305,7 @@ export default {
         id: undefined,
         parentId: 0,
         name: undefined,
-        icon: undefined,
+        // icon: undefined,
         type: SystemMenuTypeEnum.DIR,
         sort: undefined,
         status: CommonStatusEnum.ENABLE,

From 4c99d39f8a2dea42289a641d91c7c9d754d54856 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 20 Dec 2023 14:22:30 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/Item.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 07dca92a..30873bd5 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -17,7 +17,7 @@ export default {
     const vnodes = []
 
     if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
+      vnodes.push(<svg-icon style="font-size: 18px;margin-right: 10px;vertical-align: middle;" icon-class={icon}/>)
     } else {
       vnodes.push(<span style="display: inline-block; width: 10px;"/>)
     }

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 5/7] =?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 6/7] =?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 7/7] 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