From 7b4cd85ba0f55f9ce872105d76f53574712a17c8 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 14 Mar 2024 14:36:52 +0800
Subject: [PATCH 1/3] 1

---
 src/views/specialEquipment/check/Record.vue    | 13 ++++++++++++-
 src/views/specialEquipment/maintain/Record.vue | 12 ++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index aa32bf39..815f81de 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -49,12 +49,21 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { parseTime } from '../../core/mixins/code-filter';
 import RecordDetail from './Record-detail.vue';
+import moment from 'moment';
 
 export default {
 	name: 'SpecialEquipmentCheckRecord',
 	components: { RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
+		const today = new Date();
+		const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
+		twoDaysAgo.setHours(0, 0, 0, 0);
+		const t = [
+			moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
+			moment(today).format('yyyy-MM-DD HH:mm:ss'),
+		];
+
 		return {
 			detailOpen: false,
 			addOrUpdateVisible: false,
@@ -151,6 +160,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'actualCheckTime',
+					defaultSelect: t,
 					// width: 350,
 				},
 				{
@@ -189,6 +199,7 @@ export default {
 				pageSize: 10,
 				special: true,
 				status: 2,
+				actualCheckTime: t,
 			},
 			// 表单参数
 			form: {},
@@ -204,7 +215,7 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv(this.queryParams).then((response) => {
+			this.recv({ ...this.queryParams }).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 87f59e7e..5e0b7a97 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -108,6 +108,14 @@ export default {
 	components: { DialogForm, RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
+		const today = new Date();
+		const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
+		twoDaysAgo.setHours(0, 0, 0, 0);
+		const t = [
+			moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
+			moment(today).format('yyyy-MM-DD HH:mm:ss'),
+		];
+
 		return {
 			recordDetailVisible: false,
 			searchBarKeys: [
@@ -301,7 +309,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
-					defaultSelect: null,
+					defaultSelect: t,
 					// width: 350,
 				},
 				// {
@@ -500,7 +508,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				maintainPlanId: null,
-				startTime: null,
+				startTime: t,
 				// relatePlan: null,
 				// equipmentId: null,
 				special: true,

From 67948c10cb123e857ce5c6a7f26db2c53fc0bf29 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Thu, 14 Mar 2024 20:19:42 +0800
Subject: [PATCH 2/3] bug --

---
 src/api/equipment/base/config/config.js       |  20 +++-
 src/views/base/coreAlarmLog/index.vue         |   5 +-
 .../components/EquipmentDrawer.vue            |  24 +++-
 src/views/base/coreEquipment/index.vue        |   1 +
 .../base/coreEquipmentLineBind/index.vue      |   4 +-
 .../base/coreHotMaterial/add-or-updata.vue    |   6 +-
 src/views/base/coreProduct/add-or-updata.vue  |   4 +-
 .../base/coreProductionLine/add-or-updata.vue |   3 +-
 src/views/base/coreWorkOrder/addWorkOrder.vue |  14 ++-
 src/views/base/coreWorkOrder/allocation.vue   |  43 +++++--
 src/views/base/coreWorkOrder/detail.vue       |   6 +-
 .../AlarmGroup/components/dialogForm.vue      |   2 +-
 .../BindGroup/components/BasicDrawer.vue      | 109 ++++++++++++++++--
 .../equipment/base/config/BindGroup/index.vue |   8 +-
 .../DataCollection/CollectionConfig.vue       |   7 +-
 .../config/DataCollection/add-or-updata.vue   |  35 +++---
 .../base/inspection/Record/index.vue          |  22 ++--
 .../equipment/base/maintain/Monitor/index.vue |  55 +++++----
 .../maintain/PlanConfig/add-or-updata.vue     |   4 +-
 .../equipment/base/maintain/Record/index.vue  |  39 ++++---
 20 files changed, 299 insertions(+), 112 deletions(-)

diff --git a/src/api/equipment/base/config/config.js b/src/api/equipment/base/config/config.js
index 71f73aa9..b1afbb25 100644
--- a/src/api/equipment/base/config/config.js
+++ b/src/api/equipment/base/config/config.js
@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2024-02-21 13:43:02
- * @LastEditTime: 2024-02-21 15:00:17
+ * @LastEditTime: 2024-03-14 19:12:31
  * @LastEditors: DY
  * @Description: 
  */
@@ -33,3 +33,21 @@ export function listByParentId(query) {
     params: query
   })
 }
+
+// 获得产线工段设备树形结构
+export function getTree(query) {
+  return request({
+    url: '/base/core-factory/getTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备分组列表
+export function getgroupAllList(query) {
+  return request({
+    url: '/base/equipment-group/listAll',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/base/coreAlarmLog/index.vue b/src/views/base/coreAlarmLog/index.vue
index e9853140..23b46378 100644
--- a/src/views/base/coreAlarmLog/index.vue
+++ b/src/views/base/coreAlarmLog/index.vue
@@ -32,7 +32,7 @@ import { parseTime } from '../../core/mixins/code-filter';
 import {
 	getcoreAlarmLogPage
 } from '@/api/base/coreAlarmLog';
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
 
 const tableProps = [
 	{
@@ -50,7 +50,8 @@ const tableProps = [
 	},
 	{
 		prop: 'alarmGrade',
-		label: '报警级别'
+		label: '报警级别',
+		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL)
 	},
 	{
 		prop: 'alarmReason',
diff --git a/src/views/base/coreEquipment/components/EquipmentDrawer.vue b/src/views/base/coreEquipment/components/EquipmentDrawer.vue
index 3c58a5c9..1cbcf25f 100644
--- a/src/views/base/coreEquipment/components/EquipmentDrawer.vue
+++ b/src/views/base/coreEquipment/components/EquipmentDrawer.vue
@@ -7,10 +7,11 @@
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
 		custom-class="mes-drawer"
 		size="60%"
 		@closed="$emit('destroy')">
@@ -81,12 +82,12 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="mode == 'edit'" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				</el-button> -->
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@@ -298,6 +299,17 @@ export default {
 		}
 	},
 	methods: {
+		beforeClose(done) {
+			if (this.mode.includes('edit')) {
+				this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+			} else {
+				done()
+			}
+		},
 		handleTableBtnClick({ type, data }) {
 			switch (type) {
 				case 'edit':
diff --git a/src/views/base/coreEquipment/index.vue b/src/views/base/coreEquipment/index.vue
index 4a191a3b..d7ffd5b5 100644
--- a/src/views/base/coreEquipment/index.vue
+++ b/src/views/base/coreEquipment/index.vue
@@ -486,6 +486,7 @@ export default {
 				pageSize: 10,
 				code: '',
 				name: '',
+				special: false
 			},
 			// 表单参数
 			form: {
diff --git a/src/views/base/coreEquipmentLineBind/index.vue b/src/views/base/coreEquipmentLineBind/index.vue
index 608a7022..1e2811f5 100644
--- a/src/views/base/coreEquipmentLineBind/index.vue
+++ b/src/views/base/coreEquipmentLineBind/index.vue
@@ -298,9 +298,9 @@ export default {
 				// 工段排序
 				sort: undefined,
 				// 产线统计类型
-				lineDataType: undefined,
+				lineDataType: 0,
 				// 工段统计类型
-				sectionDataType: undefined,
+				sectionDataType: 0,
 			};
 			this.resetForm('form');
 		},
diff --git a/src/views/base/coreHotMaterial/add-or-updata.vue b/src/views/base/coreHotMaterial/add-or-updata.vue
index 95484ca1..f28fc696 100644
--- a/src/views/base/coreHotMaterial/add-or-updata.vue
+++ b/src/views/base/coreHotMaterial/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-12-14 13:52:42
+ * @LastEditTime: 2024-03-14 10:02:53
  * @Description:
 -->
 <template>
@@ -169,7 +169,7 @@ export default {
         // 修改的提交
         if (this.dataForm.id) {
           this.urlOptions.updateURL(this.dataForm).then(response => {
-						if (this.test.length > 1 || this.test[0].name) {
+						if (this.test.length > 1 || this.test[0]?.name) {
 							this.test.forEach(check => {
 								check.hotMaterialId = this.dataForm.id
 								if (check.id) {
@@ -191,7 +191,7 @@ export default {
         }
         // 添加的提交
         this.urlOptions.createURL(this.dataForm).then(response => {
-					if (this.test.length > 1 || this.test[0].name) {
+					if (this.test.length > 1 || this.test[0]?.name) {
 						this.test.forEach(check => {
 							check.hotMaterialId = response.data
 							createHotMaterialCheck(check).then(res => {
diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue
index c39e7584..0ec802ba 100644
--- a/src/views/base/coreProduct/add-or-updata.vue
+++ b/src/views/base/coreProduct/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 15:01:25
+ * @LastEditTime: 2024-03-13 13:54:01
  * @Description:
 -->
 <template>
@@ -254,7 +254,7 @@ export default {
 			dataRule: {
         code: [{ required: true, message: "产品编码不能为空", trigger: "blur" }],
         name: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
-				specifications: [{ required: true, message: "规格不能为空", trigger: "blur" }],
+				specifications: [{ required: false, message: "规格不能为空", trigger: "blur" }],
 				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
 				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }]
       }
diff --git a/src/views/base/coreProductionLine/add-or-updata.vue b/src/views/base/coreProductionLine/add-or-updata.vue
index 703339b8..c2eeef95 100644
--- a/src/views/base/coreProductionLine/add-or-updata.vue
+++ b/src/views/base/coreProductionLine/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-01 19:52:55
+ * @LastEditTime: 2024-03-13 13:54:48
  * @Description:
 -->
 <template>
@@ -33,6 +33,7 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
+						clearable
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
diff --git a/src/views/base/coreWorkOrder/addWorkOrder.vue b/src/views/base/coreWorkOrder/addWorkOrder.vue
index 646047e0..9e1bc3ff 100644
--- a/src/views/base/coreWorkOrder/addWorkOrder.vue
+++ b/src/views/base/coreWorkOrder/addWorkOrder.vue
@@ -84,7 +84,7 @@
             <el-radio :label="1">产品基础BOM</el-radio>
             <el-radio :label="2">工艺扩展BOM</el-radio>
           </el-radio-group> -->
-          <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" @change="materialMethodChange">
+          <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" clearable @change="materialMethodChange">
             <el-option key="1" label="产品基础BOM" :value="1" />
             <el-option key="2" label="工艺扩展BOM" :value="2" />
           </el-select>
@@ -92,7 +92,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="优先级" prop="priority">
-          <el-select v-model="dataForm.priority" placeholder="请选择优先级" style="width: 100%;">
+          <el-select v-model="dataForm.priority" clearable placeholder="请选择优先级" style="width: 100%;">
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
               :key="item.value"
@@ -104,7 +104,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="工单类型" prop="type">
-          <el-select v-model="dataForm.type" placeholder="请选择工单类型" style="width: 100%;">
+          <el-select v-model="dataForm.type" clearable placeholder="请选择工单类型" style="width: 100%;">
             <el-option
               v-for="item in workOrderTypeList"
               :key="item.id"
@@ -121,6 +121,7 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
+            clearable
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
@@ -133,7 +134,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="关联产线" prop="productLineIds">
-          <el-select v-model="dataForm.productLineIds" placeholder="请选择关联产线" multiple style="width: 100%;">
+          <el-select v-model="dataForm.productLineIds" clearable placeholder="请选择关联产线" multiple style="width: 100%;">
             <el-option
               v-for="item in productLineList"
               :key="item.id"
@@ -145,7 +146,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="负责人" prop="workers">
-          <el-input v-model="dataForm.workers" placeholder="请输入负责人"></el-input>
+          <el-input v-model="dataForm.workers" clearable placeholder="请输入负责人"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -204,7 +205,8 @@ export default {
         planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
         roomNameDict: [{ required: true, message: "车间名称不能为空", trigger: "blur" }],
-        productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }]
+        productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }],
+        materialMethod: [{ required: true, message: "物料计算方式不能为空", trigger: "change" }]
       },
       productList: [],
       processFlowList: [],
diff --git a/src/views/base/coreWorkOrder/allocation.vue b/src/views/base/coreWorkOrder/allocation.vue
index 79e43ad2..c0c17869 100644
--- a/src/views/base/coreWorkOrder/allocation.vue
+++ b/src/views/base/coreWorkOrder/allocation.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 10:01:52
+ * @LastEditTime: 2024-03-13 14:47:44
  * @Description:
 -->
 <template>
@@ -18,15 +18,28 @@
 		<div class="content">
 			<div class="formContent">
 				<el-row :gutter="20">
-					<el-col :span="12">工单名称:{{ dataForm.name }}</el-col>
-					<el-col :span="12">工单编码:{{ dataForm.code }}</el-col>
+					<el-col :span="8">
+						<div class="blodTip">工单名称</div>
+						<div class="lightTip">{{ dataForm.name }}</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="blodTip">工单编码</div>
+						<div class="lightTip">{{ dataForm.code }}</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="blodTip">产品名称</div>
+						<div class="lightTip">{{ dataForm.productName }}</div>
+					</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="12">产品名称:{{ dataForm.productName }}</el-col>
-					<el-col :span="12">产品规格:{{ dataForm.specifications }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="12">实际生产数量:{{ dataForm.expectedTime }}</el-col>
+					<el-col :span="8">
+						<div class="blodTip">产品规格</div>
+						<div class="lightTip">{{ dataForm.specifications }}</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="blodTip">实际生产数量</div>
+						<div class="lightTip">{{ dataForm.expectedTime }}</div>
+					</el-col>
 				</el-row>
 			</div>
 
@@ -296,4 +309,18 @@ export default {
 	margin-bottom: 10px;
 	width: 100%;
 }
+.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;
+}
 </style>
diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue
index 326e2b3c..be37fe79 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: 2024-02-29 15:35:02
+ * @LastEditTime: 2024-03-13 14:42:32
  * @Description:
 -->
 <template>
@@ -274,6 +274,10 @@ const tableProps1 = [
 		prop: 'remaining',
 		label: '剩余生产预计消耗'
 	},
+	{
+		prop: 'num',
+		label: '库存数量'
+	}
 ];
 
 export default {
diff --git a/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
index cab8b8fd..f3dc2215 100644
--- a/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
+++ b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
@@ -28,7 +28,7 @@
 				<el-form-item
 					label="报警级别"
 					prop="grade"
-					:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
+					:rules="[{ required: false, message: '报警级别不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
 						v-model="dataForm.grade"
diff --git a/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue b/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
index 036fd885..4d96c26b 100644
--- a/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
@@ -7,10 +7,11 @@
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
 		@closed="$emit('destroy')">
@@ -43,7 +44,51 @@
 							:rows="formRows" /> -->
 
 						<!-- <el-row v-if="mode.includes('detail')" style="margin-bottom: 24px"> -->
-						<el-row style="margin-bottom: 24px">
+						<el-form
+							ref="form"
+							:model="dataForm"
+							label-width="100px"
+							v-loading="formLoading">
+							<el-row :gutter="20">
+								<el-col :span="12">
+									<el-form-item
+										label="设备"
+										prop="equipmentId"
+										:rules="[{ required: true, message: '设备不能为空', trigger: 'change' }]">
+										<el-select
+											:disabled="isdetail"
+											v-model="dataForm.equipmentId"
+											placeholder="请选择设备"
+											@change="$emit('update', dataForm)">
+											<el-option
+												v-for="opt in equipmentList"
+												:key="opt.id"
+												:label="opt.name"
+												:value="opt.id" />
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="12">
+									<el-form-item
+										label="报警分组"
+										prop="groupId"
+										:rules="[{ required: true, message: '报警分组不能为空', trigger: 'change' }]">
+										<el-select
+											:disabled="isdetail"
+											v-model="dataForm.groupId"
+											placeholder="请选择报警分组"
+											@change="$emit('update', dataForm)">
+											<el-option
+												v-for="opt in grouList"
+												:key="opt.id"
+												:label="opt.name"
+												:value="opt.id" />
+										</el-select>
+									</el-form-item>
+								</el-col>
+							</el-row>
+						</el-form>
+						<!-- <el-row style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
 									class="title"
@@ -62,7 +107,7 @@
 									{{ form.code }}
 								</div>
 							</el-col>
-						</el-row>
+						</el-row> -->
 						<!-- <el-row v-else style="margin-bottom: 24px" :gutter="20">
 							<el-form ref="form" :model="form">
 								<el-col :span="8">
@@ -128,12 +173,11 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
-					v-if="!mode.includes('detail')"
-					@click="handleCancel">
+					@click="handleSave">
 					确定
 				</el-button>
 			</div>
@@ -163,6 +207,8 @@
 <script>
 import BaseInfoForm from '@/components/DialogForm';
 import DialogForm from './dialogForm';
+import { getEquipmentList, getgroupAllList } from '@/api/equipment/base/config/config'
+import { updateEquipmentBindGroup } from '@/api/base/equipmentBindGroup';
 
 const SmallTitle = {
 	name: 'SmallTitle',
@@ -191,16 +237,21 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'defaultMode', 'dataId', 'size', 'equipmentId', 'id'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			mode: '',
 			visible: false,
 			showForm: false,
+			isdetail: false,
+			formLoading: false,
+			grouList: [],
+			equipmentList: [],
 			total: 0,
 			form: {},
 			list: [],
 			attrTitle: '',
+			dataForm: {},
 			attrForm: {
 				id: null,
 				equipmentGroupId: '',
@@ -325,6 +376,34 @@ export default {
 		}
 	},
 	methods: {
+		// handleSave() {
+		// 	updateEquipmentBindGroup(this.form).then((response) => {
+		// 		this.$modal.msgSuccess('修改成功');
+		// 		this.open = false;
+		// 		this.getList();
+		// 	});
+		// },
+		async getDict() {
+			const res = await getEquipmentList({
+				pageNo: 1,
+				pageSize: 100,
+				special: false
+			})
+			this.equipmentList = res.data.list
+			const groupRes = await getgroupAllList()
+			this.grouList = groupRes.data
+		},
+		beforeClose(done) {
+			if (this.mode.includes('edit')) {
+				this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+			} else {
+				done()
+			}
+		},
 		handleTableBtnClick({ type, data }) {
 			switch (type) {
 				case 'edit':
@@ -342,6 +421,16 @@ export default {
 
 		init() {
 			this.visible = true;
+			// 设备分组传值
+			// this.dataForm = {
+			// 	equipmentId: this.equipmentId,
+			// 	groupId: this.dataId
+			// }
+			this.getDict()
+			this.$set(this.dataForm, 'equipmentId', this.equipmentId)
+			this.$set(this.dataForm, 'groupId', this.dataId)
+			this.$set(this.dataForm, 'id', this.id)
+			this.isdetail = this.mode === 'detail' ? true : false
 		},
 
 		async getAttrList() {
@@ -360,9 +449,9 @@ export default {
 				if (valid) {
 					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						url: '/base/equipment-bind-group/update',
 						method: isEdit ? 'put' : 'post',
-						data: this.form,
+						data: this.dataForm,
 					});
 					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
 					this.visible = false;
diff --git a/src/views/equipment/base/config/BindGroup/index.vue b/src/views/equipment/base/config/BindGroup/index.vue
index 81c2295d..af742be9 100644
--- a/src/views/equipment/base/config/BindGroup/index.vue
+++ b/src/views/equipment/base/config/BindGroup/index.vue
@@ -48,6 +48,8 @@
 			size="45%"
 			:default-mode="editMode"
 			:data-id="alarmForm.id"
+			:equipment-id="equipmentId"
+			:id="id"
 			:sections="[
 				{
 					name: '基本信息',
@@ -220,7 +222,7 @@ export default {
 					{
 						select: true,
 						label: '设备',
-						url: '/base/core-equipment/page?pageNo=1&pageSize=100',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
 						prop: 'equipmentId',
 						bind: {
 							filterable: true,
@@ -266,6 +268,8 @@ export default {
 				equipmentGroupCode: undefined,
 				equipmentGroupName: undefined,
 			},
+			equipmentId: undefined,
+			id: undefined,
 			editVisible: false,
 			editMode: '',
 			drawerBaseInfoRows: [
@@ -440,6 +444,8 @@ export default {
 			this.alarmForm.id = groupId;
 			this.alarmForm.equipmentGroupCode = groupCode;
 			this.alarmForm.equipmentGroupName = groupName;
+			this.equipmentId = equipmentId;
+			this.id = id;
 			this.editVisible = true;
 			this.$nextTick(() => {
 				this.$refs['drawer'].init();
diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
index 2f15d7b1..27dd544a 100644
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@@ -379,7 +379,7 @@ export default {
 					});
 					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
 						return {
-							name: item.name,
+							name: item.code,
 							id: item.id,
 						};
 					});
@@ -463,7 +463,8 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加设备与实时采集关系表（一对多）';
+			this.title = '添加设备采集配置';
+			this.$refs.addOrUpdate.init()
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -472,7 +473,7 @@ export default {
 			getEquipmentPlcConnect(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改设备与实时采集关系表（一对多）';
+				this.title = '修改设备采集配置';
 			});
 		},
 		/** 提交按钮 */
diff --git a/src/views/equipment/base/config/DataCollection/add-or-updata.vue b/src/views/equipment/base/config/DataCollection/add-or-updata.vue
index 06a6e6d9..6c9d1621 100644
--- a/src/views/equipment/base/config/DataCollection/add-or-updata.vue
+++ b/src/views/equipment/base/config/DataCollection/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-22 10:08:13
+ * @LastEditTime: 2024-03-13 16:47:02
  * @Description:
 -->
 <template>
@@ -39,9 +39,9 @@
 
 <script>
 import basicAdd from '../../../../core/mixins/basic-add';
-import { createCorePL, updateCorePL, getCorePL, getCode, getCorePLList } from "@/api/base/coreProductionLine";
+import { createCorePL, updateCorePL, getCorePL, getCode } from "@/api/base/coreProductionLine";
 import { createEquipmentPlcConnect, updateEquipmentPlcConnect } from '@/api/base/equipmentPlcConnect';
-import { getplcAllList, listByParentId } from "@/api/equipment/base/config/config";
+import { getplcAllList, getTree } from "@/api/equipment/base/config/config";
 
 export default {
 	mixins: [basicAdd],
@@ -95,22 +95,29 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+			})
+		},
 		async getDict() {
 			// 关联表名列表
 			const res = await getplcAllList();
 			this.plcList = res.data;
-			// 产线列表
-			const res1 = await getCorePLList();
+			// 树形结构
+			const res1 = await getTree();
 			this.plLineList = res1.data;
-			this.plLineList.forEach(item => {
-				listByParentId({ id: item.id }).then(resp => {
-					if (resp.data.length > 0) {
-						// item.children = resp.data
-						this.$set(item, 'children', resp.data)
-						// this.$forceUpdate()
-					}
-				})
-			})
+			// const res1 = await getCorePLList();
+			// this.plLineList = res1.data;
+			// this.plLineList.forEach(item => {
+			// 	listByParentId({ id: item.id }).then(resp => {
+			// 		if (resp.data.length > 0) {
+			// 			// item.children = resp.data
+			// 			this.$set(item, 'children', resp.data)
+			// 			// this.$forceUpdate()
+			// 		}
+			// 	})
+			// })
 		},
 		// 表单提交
     dataFormSubmit() {
diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue
index 5c829b09..62e36af8 100644
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@@ -98,12 +98,12 @@ export default {
 			addContent: false,
 			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
-				// this.$auth.hasPermi('equipment:check-record:detail')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '详情',
-				// 	  }
-				// 	: undefined,
+				this.$auth.hasPermi('equipment:check-record:detail')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
 				// this.$auth.hasPermi('equipment:check-record:update')
 				// 	? {
 				// 			type: 'edit',
@@ -122,7 +122,7 @@ export default {
 				{ prop: 'department', label: '部门' },
 				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
 				{ prop: 'groupClass', label: '班次' },
-				{ prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
+				// { prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
 				{ prop: 'remark', label: '备注' }
 				// { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },
 				// { prop: 'sectionName', label: '计划巡检时间' },
@@ -416,10 +416,14 @@ export default {
 				.catch(() => {});
 		},
 		handleDetail({ id }) {
-			this.addOrUpdateVisible = true
+			this.addContent = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, true);
+				this.$refs.addContent.init(id, true);
 			});
+			// this.addOrUpdateVisible = true
+			// this.$nextTick(() => {
+			// 	this.$refs.addOrUpdate.init(id, true);
+			// });
 		},
 		/** 导出按钮操作 */
 		handleExport() {
diff --git a/src/views/equipment/base/maintain/Monitor/index.vue b/src/views/equipment/base/maintain/Monitor/index.vue
index 65a843c9..2c40215f 100644
--- a/src/views/equipment/base/maintain/Monitor/index.vue
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@@ -73,7 +73,7 @@ const remainBox = {
 		color() {
 			if (this.value) {
 				const v = +this.value;
-				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+				return v <= 1 ? 'red' : v > 1 && v <= 2 ? 'yellow' : 'green';
 			}
 			return 'unset';
 		},
@@ -84,9 +84,10 @@ const remainBox = {
 				style={`background: ${
 					this.color
 				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
-					this.color == 'red' ? '#fff' : 'unset'
+					// this.color == 'red' ? '#fff' : 'unset'
+					'#fff'
 				}`}>
-				{this.injectData[this.injectData.prop] || ''}
+				{this.injectData[this.injectData.prop]?.toFixed(0) || ''}
 			</div>
 		);
 	},
@@ -128,22 +129,26 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'code', label: '保养计划单号' },
-				{ prop: 'name', label: '保养计划名称' },
-				{ prop: 'departmentName', label: '部门' },
-				{ prop: 'lineName', label: '产线名' },
+				{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true },
+				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
+				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'lastPlanMaintainTime',
 					label: '上次计划保养时间',
 					filter: parseTime,
+					minWidth: 160,
+					showOverflowtooltip: true
 				},
 				{
 					prop: 'lastMaintainTime',
 					label: '上次实际保养时间',
 					filter: parseTime,
+					minWidth: 160,
+					showOverflowtooltip: true
 				},
-				{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime },
-				{ prop: 'maintainer', label: '计划保养人员' },
+				{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime, minWidth: 160, showOverflowtooltip: true },
+				{ prop: 'maintainer', label: '计划保养人员', minWidth: 160, showOverflowtooltip: true },
 				// { prop: 'equipmentName', label: '设备名称' },
 				// { prop: 'equipmentCode', label: '设备编码' },
 				// { prop: 'maintenancePeriod', label: '保养频率' },
@@ -153,11 +158,12 @@ export default {
 				// 	filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
 				// },
 				// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn },
+				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 },
 				{
 					prop: 'remainDays',
 					label: '距离下次保养剩余时间(天)',
 					subcomponent: remainBox,
+					minWidth: 210,
 				}
 			],
 			searchBarFormConfig: [
@@ -232,23 +238,24 @@ export default {
 				.catch(() => { });
 		},
 		initSearchBar() {
-			this.http('/base/core-equipment/page', 'get', {
-				special: false,
-				pageNo: 1,
-				pageSize: 99
-			}).then(({ data }) => {
-				this.$set(
-					this.searchBarFormConfig[1],
-					'selectOptions',
-					(data?.list || []).map((item) => ({
-						name: item.name,
-						id: item.id,
-					}))
-				);
-			});
+			// this.http('/base/core-equipment/page', 'get', {
+			// 	special: false,
+			// 	pageNo: 1,
+			// 	pageSize: 99
+			// }).then(({ data }) => {
+			// 	this.$set(
+			// 		this.searchBarFormConfig[1],
+			// 		'selectOptions',
+			// 		(data?.list || []).map((item) => ({
+			// 			name: item.name,
+			// 			id: item.id,
+			// 		}))
+			// 	);
+			// });
 			this.http('/base/equipment-maintain-plan/page', 'get', {
 				pageNo: 1,
 				pageSize: 100,
+				special: false
 			}).then(({ data }) => {
 				this.$set(
 					this.searchBarFormConfig[0],
diff --git a/src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue b/src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue
index f1ba695c..649eb237 100644
--- a/src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-28 19:52:13
+ * @LastEditTime: 2024-03-13 15:55:36
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="确认时限(h)" prop="confirmTimeLimit">
-							<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入单位平方数" />
+							<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入确认时限" />
 						</el-form-item>
 					</el-col>
 				</el-row>
diff --git a/src/views/equipment/base/maintain/Record/index.vue b/src/views/equipment/base/maintain/Record/index.vue
index dbec53dd..40339717 100644
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@@ -64,6 +64,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import Editor from '@/components/Editor';
 import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
 import AddContent from './addContent.vue';
+import { parseTime } from '../../../../core/mixins/code-filter';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -174,6 +175,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
+					defaultSelect: []
 					// width: 350,
 				},
 				// {
@@ -349,23 +351,28 @@ export default {
 		};
 	},
 	created() {
+		let end = moment().format('YYYY-MM-DD 08:00:00')
+		const current = new Date()
+    let start = parseTime(new Date(current.getFullYear(), current.getMonth(), current.getDate() - 3, 8, 0, 0))
+    this.searchBarFormConfig[1].defaultSelect = [start, end]
+		this.queryParams.startTime = [start, end]
 		this.initSearchBar();
-		if (this.$route.query) {
-			// this.queryParams.equipmentId =
-			// 	this.$route.query?.equipmentId ?? undefined;
-			this.queryParams.maintainPlanId =
-				this.$route.query?.maintainPlanId ?? undefined;
-			// this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
-			this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
-			// this.searchBarFormConfig[0].defaultSelect =
-			// 	this.$route.query.equipmentId ?? undefined;
-			this.searchBarFormConfig[0].defaultSelect =
-				this.$route.query.maintainPlanId ?? undefined;
-			this.searchBarFormConfig[1].defaultSelect =
-				this.$route.query?.createTime ?? undefined;
-			// this.searchBarFormConfig[3].defaultSelect =
-			// 	Number(this.$route.query.relatePlan) ?? undefined;
-		}
+		// if (this.$route.query) {
+		// 	// this.queryParams.equipmentId =
+		// 	// 	this.$route.query?.equipmentId ?? undefined;
+		// 	this.queryParams.maintainPlanId =
+		// 		this.$route.query?.maintainPlanId ?? undefined;
+		// 	// this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
+		// 	this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+		// 	// this.searchBarFormConfig[0].defaultSelect =
+		// 	// 	this.$route.query.equipmentId ?? undefined;
+		// 	this.searchBarFormConfig[0].defaultSelect =
+		// 		this.$route.query.maintainPlanId ?? undefined;
+		// 	this.searchBarFormConfig[1].defaultSelect =
+		// 		this.$route.query?.createTime ?? undefined;
+		// 	// this.searchBarFormConfig[3].defaultSelect =
+		// 	// 	Number(this.$route.query.relatePlan) ?? undefined;
+		// }
 		this.getList();
 		if (this.$route.query.addRecord) {
 			this.handleAdd()

From 73928a0ed0a92251c45c491908d6e6e0dfb95ac7 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 15 Mar 2024 13:33:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=82=E5=8A=A1=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=87=8C=E6=94=B9=E4=B8=AA=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/orderManage.js                   |   9 +
 .../base/energyQuantityManual/index.vue       |  92 ++++-----
 .../energyType/components/energyTypeAdd.vue   |  91 ++++-----
 .../components/groupTeamViewDetail.vue        |   2 +-
 .../orderManage/components/addWorkOrder.vue   | 179 ++++++++----------
 5 files changed, 151 insertions(+), 222 deletions(-)

diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js
index 732e13c7..00174a7d 100644
--- a/src/api/base/orderManage.js
+++ b/src/api/base/orderManage.js
@@ -34,6 +34,15 @@ export function workOrderList(query) {
   })
 }
 
+// 条件获得工单列表
+export function getFreeWOlist(query) {
+  return request({
+    url: '/base/core-work-order/getFreeWOlist',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获得订单分页
 export function getOrderPage(query) {
   return request({
diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue
index 49f6329b..14dd96e6 100644
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -2,44 +2,20 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
     <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-      @selection-change="selectChange"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="120"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+      :max-height="tableH" @selection-change="selectChange">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
     </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+      @pagination="getList" />
     <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-quantity-manual-add ref="energyQuantityManualAdd" :energyTypeList="energyTypeList" @successSubmit="successSubmit" />
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
+      @confirm="handleConfirm" :before-close="handleCancel">
+      <energy-quantity-manual-add ref="energyQuantityManualAdd" :energyTypeList="energyTypeList"
+        @successSubmit="successSubmit" />
     </base-dialog>
   </div>
 </template>
@@ -68,7 +44,7 @@ const tableProps = [
   },
   {
     prop: 'tableName',
-    label: '水/气表名',
+    label: '能源表名',
     filter: publicFormatter('table_name'),
     minWidth: 110
   },
@@ -142,25 +118,25 @@ export default {
       // 班次基础信息列表
       list: [],
       tableBtn: [
-      this.$auth.hasPermi('base:energy-quantity-manual:create')
+        this.$auth.hasPermi('base:energy-quantity-manual:create')
           ? {
-              type: 'meterReading',
-              btnName: '抄表'
-            }
+            type: 'meterReading',
+            btnName: '抄表'
+          }
           : undefined,
         this.$auth.hasPermi('base:energy-quantity-manual:update')
           ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
+            type: 'edit',
+            btnName: '编辑'
+          }
           : undefined,
         this.$auth.hasPermi('base:energy-quantity-manual:delete')
           ? {
-              type: 'delete',
-              btnName: '删除'
-            }
+            type: 'delete',
+            btnName: '删除'
+          }
           : undefined
-      ].filter((v)=>v),
+      ].filter((v) => v),
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -209,10 +185,10 @@ export default {
           break
         default:
           this.$modal.confirm('是否确认导出').then(() => {
-              return energyQuantityManualExport({...this.queryParams});
-            }).then(response => {
-              this.$download.excel(response, '能源报表.xls');
-            }).catch(() => {})
+            return energyQuantityManualExport({ ...this.queryParams });
+          }).then(response => {
+            this.$download.excel(response, '能源报表.xls');
+          }).catch(() => { })
       }
     },
     /** 查询列表 */
@@ -281,13 +257,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row.id)
-      this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function() {
-          return energyQuantityManualDelete({id: row.id});
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function () {
+        return energyQuantityManualDelete({ id: row.id });
+      }).then(() => {
+        this.queryParams.pageNo = 1;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
     }
   }
 };
diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
index 1b808543..efe5b35a 100644
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@@ -16,10 +16,7 @@
       <el-col :span="12">
         <el-form-item label="单位" prop="unit">
           <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)"
-              :key="item.value"
-              :label="item.label"
+            <el-option v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)" :key="item.value" :label="item.label"
               :value="item.value">
             </el-option>
           </el-select>
@@ -28,9 +25,9 @@
       <el-col :span="12">
         <el-form-item label="计价方式" prop="pricingMethod">
           <el-select v-model="form.pricingMethod" placeholder="请选择" style="width: 100%;">
-            <el-option label="时间段" :value= '0' ></el-option>
-            <el-option label="使用量" :value= '1' ></el-option>
-            <el-option label="固定价位" :value= '2' ></el-option>
+            <el-option label="时间段" :value='0'></el-option>
+            <el-option label="使用量" :value='1'></el-option>
+            <el-option label="固定价位" :value='2'></el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -38,56 +35,33 @@
     <el-row>
       <el-col :span="12" v-show="form.pricingMethod === 2">
         <el-form-item label="单价(元)" prop="pricingMethod">
-          <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999" style="width: 100%;"></el-input-number>
+          <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999"
+            style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-show="form.pricingMethod === 1">
         <el-form-item label="计量维度" prop="dim">
           <el-select v-model="form.dim" placeholder="请选择" style="width: 100%;">
-            <el-option label="月" :value= '4' ></el-option>
-            <el-option label="年" :value= '5' ></el-option>
+            <el-option label="月" :value='4'></el-option>
+            <el-option label="年" :value='5'></el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="24"  v-show="form.pricingMethod === 0">
+      <el-col :span="24" v-show="form.pricingMethod === 0">
         <el-form-item label="时间段" prop="pricingMethod">
-          <base-table
-            :key='timeKye'
-            :table-props="tableProps1"
-            :table-data="tableData1"
-            :add-button-show="addButtonShow"
-            @emitButtonClick="emitButtonClick1"
-            @emitFun="inputChange1"
-          >
-            <method-btn
-              v-if="tableBtn.length"
-              slot="handleBtn"
-              :width="80"
-              label="操作"
-              :method-list="tableBtn"
-              @clickBtn="handleClick1"
-            />
+          <base-table :key='timeKye' :table-props="tableProps1" :table-data="tableData1"
+            :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick1" @emitFun="inputChange1">
+            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+              @clickBtn="handleClick1" />
           </base-table>
         </el-form-item>
       </el-col>
       <el-col :span="24" v-show="form.pricingMethod === 1">
         <el-form-item label="使用量" prop="pricingMethod">
-          <base-table
-            :key='usedKye'
-            :table-props="tableProps2"
-            :table-data="tableData2"
-            :add-button-show="addButtonShow"
-            @emitButtonClick="emitButtonClick2"
-            @emitFun="inputChange2"
-          >
-            <method-btn
-              v-if="tableBtn.length"
-              slot="handleBtn"
-              :width="80"
-              label="操作"
-              :method-list="tableBtn"
-              @clickBtn="handleClick2"
-            />
+          <base-table :key='usedKye' :table-props="tableProps2" :table-data="tableData2"
+            :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick2" @emitFun="inputChange2">
+            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+              @clickBtn="handleClick2" />
           </base-table>
         </el-form-item>
       </el-col>
@@ -182,15 +156,15 @@ export default {
       if (id) {
         this.isEdit = true
         this.form.id = id
-        getEnergyType( id ).then((res) => {
+        getEnergyType(id).then((res) => {
           if (res.code === 0) {
             this.form.name = res.data.name
             this.form.code = res.data.code
             this.form.unit = res.data.unit
             this.form.pricingMethod = res.data.pricingMethod
             this.form.leaderName = res.data.leaderName
-            this.form.push =  res.data.push ? true : false
-            switch(this.form.pricingMethod) {
+            this.form.push = res.data.push ? true : false
+            switch (this.form.pricingMethod) {
               case 0:
                 this.tableData1 = res.data.segPriceList || []
                 break;
@@ -198,6 +172,7 @@ export default {
                 this.tableData2 = res.data.usedPriceList || []
                 break;
               default:
+                this.form.singlePrice = res.data.singlePrice || 0
             }
           }
         })
@@ -234,7 +209,7 @@ export default {
     emitButtonClick1() {
       let n = this.tableData1.length
       let obj = {}
-      obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
+      obj.startTime = n === 0 ? '' : this.tableData1[n - 1].endTime
       obj.endTime = ''
       obj.price = 0
       this.tableData1.push(obj)
@@ -242,7 +217,7 @@ export default {
     emitButtonClick2() {
       let n = this.tableData2.length
       let obj = {}
-      obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
+      obj.startUsed = n === 0 ? 0 : this.tableData2[n - 1].endUsed
       obj.endUsed = 0
       obj.price = 0
       this.tableData2.push(obj)
@@ -259,7 +234,7 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          switch(this.form.pricingMethod) {
+          switch (this.form.pricingMethod) {
             case 0:// 时间段
               if (this.tableData1.length === 0) {
                 this.$modal.msgError('时间段表格数据不能为空')
@@ -289,7 +264,7 @@ export default {
             default:// 固定单价
               if (!this.form.singlePrice) {
                 this.$modal.msgError('单价有误请检查，请检查')
-                  return false
+                return false
               }
           }
           console.log(this.form)
@@ -302,11 +277,11 @@ export default {
               unit: this.form.unit,
               pricingMethod: this.form.pricingMethod,
               description: this.form.description,
-              dim: this.form.pricingMethod === 1 ? this.form.dim: '',
+              dim: this.form.pricingMethod === 1 ? this.form.dim : '',
               singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-              segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: [],
-              push:this.form.push ? 1 : 0
+              segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
+              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
+              push: this.form.push ? 1 : 0
             }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
@@ -320,11 +295,11 @@ export default {
               unit: this.form.unit,
               pricingMethod: this.form.pricingMethod,
               description: this.form.description,
-              dim: this.form.pricingMethod === 1 ? this.form.dim: '',
+              dim: this.form.pricingMethod === 1 ? this.form.dim : '',
               singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-              segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: [],
-              push:this.form.push ? 1 : 0
+              segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
+              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
+              push: this.form.push ? 1 : 0
             }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
diff --git a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
index 3e46b185..de22d382 100644
--- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
+++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer title="查看详情" :visible.sync="visible" size="70%">
+    <el-drawer title="查看详情" :visible.sync="visible" size="70%" :show-close='false'>
       <div class="box">
         <el-row class="topBox">
           <el-col :span="6">
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index ea46e766..e340cfe3 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -5,13 +5,10 @@
         <el-form-item label="工单名称" prop="name" v-if='!isBind'>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
-        <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
-            <el-option
-              v-for="item in workOrderList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+        <el-form-item label="工单名称" prop="workOrderId" v-if='isBind'>
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable
+            @change="getWorkOrderMsg">
+            <el-option v-for="item in workOrderList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -23,12 +20,8 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" disabled  style="width: 100%;">
-            <el-option
-              v-for="item in productList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="form.planProductId" placeholder="请选择" disabled style="width: 100%;">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -42,36 +35,28 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="计划开始时间">
-          <el-date-picker
-            v-model="planStartTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 100%;"
-            placeholder="选择日期"
-            :disabled="isBind">
+          <el-date-picker v-model="planStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;" placeholder="选择日期" :disabled="isBind">
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
         <el-form-item label="计划完成时间">
-          <el-date-picker
-            v-model="planFinishTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 100%;"
-            placeholder="选择日期"
-            :disabled="isBind">
+          <el-date-picker v-model="planFinishTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;" placeholder="选择日期" :disabled="isBind">
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
         <el-form-item label="计划投入数量" prop="planAssignQuantity">
-          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
+          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind"
+            style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
         <el-form-item label="计划生产数量" prop="planQuantity">
-          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind"
+            style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
@@ -79,18 +64,15 @@
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
           <el-select v-model="form.processFlowId" placeholder="请选择" :disabled="isBind" style="width: 100%;">
-            <el-option
-              v-for="item in processFlowList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+            <el-option v-for="item in processFlowList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" :disabled="isBind" @change='selectMethod'>
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" :disabled="isBind"
+            @change='selectMethod'>
             <el-option label="产品基础BOM" :value="1"></el-option>
             <el-option label="工艺扩展BOM" :value="2"></el-option>
           </el-select>
@@ -99,10 +81,7 @@
       <el-col :span='6'>
         <el-form-item label="优先级" prop="priority">
           <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
-              :key="item.value"
-              :label="item.label"
+            <el-option v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)" :key="item.value" :label="item.label"
               :value="item.value">
             </el-option>
           </el-select>
@@ -111,11 +90,7 @@
       <el-col :span='6'>
         <el-form-item label="工单类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in workOrderTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+            <el-option v-for="item in workOrderTypeList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -123,45 +98,39 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span='6'>
-      <el-form-item label="关联产线" prop="productLineId">
-        <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
-          <el-option
-            v-for="item in productLineList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-    </el-col>
-  <el-col :span='6'>
-      <el-form-item label="负责车间" prop="roomNameDict">
-        <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-          <el-option
-            v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-    </el-col>
-    <el-col :span='6'>
-      <el-form-item label="负责人" prop="workers">
-        <el-input v-model="form.workers" :disabled="isBind"></el-input>
-      </el-form-item>
-    </el-col>
-    <el-col :span='6'>
-      <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
-        <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
-      </el-form-item>
-    </el-col>
+        <el-form-item label="关联产线" prop="productLineId">
+          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
+            <el-option v-for="item in productLineList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="负责车间" prop="roomNameDict">
+          <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+            <el-option v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)" :key="item.value" :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="form.workers" :disabled="isBind"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
+          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999"
+            style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
 import { getProductAll } from '@/api/base/product'
-import { getProcessFlowList, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
+import { getProcessFlowList, getWorkOrderCode, orderIssue, getFreeWOlist, getWorkOrderById } from '@/api/base/orderManage'
 import { getLineAll } from '@/api/base/productionLine'
 import moment from 'moment'
 export default {
@@ -202,8 +171,8 @@ export default {
       processFlowList: [],
       productLineList: [],
       workOrderTypeList: [
-        {id: 1,name:'普通'},
-        {id: 2, name:'特殊'}
+        { id: 1, name: '普通' },
+        { id: 2, name: '特殊' }
       ],
       planStartTime: '',
       planFinishTime: '',
@@ -223,7 +192,7 @@ export default {
         this.form.planProductId = data.planProductId
         // this.form.processFlowId = data.processFlowId
         // this.form.materialMethod = data.materialMethod
-      }else{//绑定
+      } else {//绑定
         this.isBind = true
       }
     },
@@ -244,7 +213,7 @@ export default {
         this.processFlowList = res.data || []
       })
       // 工单list
-      workOrderList({
+      getFreeWOlist({
         status: 1
       }).then(res => {
         this.workOrderList = res.data || []
@@ -252,10 +221,10 @@ export default {
     },
     // 物料变动
     selectMethod(val) {
-      if (val === 2 && !this.form.processFlowId ) {
+      if (val === 2 && !this.form.processFlowId) {
         this.form.materialMethod = 1
         this.$modal.msgError("请先选择关联工艺");
-      }else if (val === 1) {
+      } else if (val === 1) {
         this.form.processFlowId = ''
       }
     },
@@ -273,32 +242,32 @@ export default {
           workOrderId: this.form.workOrderId,
           orderId: this.form.orderId,
           planAssignmentQuantity: this.form.planAssignmentQuantity
-          }).then((res) => {
+        }).then((res) => {
           if (res.code === 0) {
             this.$modal.msgSuccess("操作成功")
             this.$emit('addWorkOrderSubmit')
           }
         })
-      }else{// 新增工单
+      } else {// 新增工单
         this.$refs['addWorkOrder'].validate((valid) => {
           if (valid) {
-              // 新增工单
-              let _this = this
-              _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
-              _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
-              orderIssue({ ..._this.form }).then(res => {
-                if (res.code === 0) {
-                  _this.$modal.msgSuccess("操作成功")
-                  let name = this.form.name
-                  _this.$emit('addWorkOrderSubmit')
-                  // // 询问是否添加预使用主原料
-                  // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                  //     _this.$router.push({
-                  //       path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                  //     })
-                  //   })
-                }
-              })
+            // 新增工单
+            let _this = this
+            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+            orderIssue({ ..._this.form }).then(res => {
+              if (res.code === 0) {
+                _this.$modal.msgSuccess("操作成功")
+                let name = this.form.name
+                _this.$emit('addWorkOrderSubmit')
+                // // 询问是否添加预使用主原料
+                // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                //     _this.$router.push({
+                //       path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                //     })
+                //   })
+              }
+            })
           } else {
             return false
           }
@@ -319,7 +288,7 @@ export default {
     // 绑定工单，选择工单时获取工单信息
     getWorkOrderMsg() {
       if (this.form.workOrderId) {
-        getWorkOrderById({id:this.form.workOrderId}).then(res => {
+        getWorkOrderById({ id: this.form.workOrderId }).then(res => {
           if (res.code === 0) {
             this.form.code = res.data.code
             this.form.planProductId = res.data.planProductId
@@ -345,7 +314,7 @@ export default {
     getSpecifications(val) {
       for (let i of this.productList) {
         if (i.id === val) {
-          this.form.specifications =  i.specifications
+          this.form.specifications = i.specifications
           return
         }
       }