From d8c126fccff2ef86b78f337982425816cad30e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 1 Mar 2024 15:27:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  8 +--
 src/views/OperationalOverview/AGVBoard.vue    |  3 +-
 src/views/OperationalOverview/coldBoard.vue   | 46 ++++++-----------
 .../qualityInspectionBoxPermissions/index.vue | 22 ++++++--
 .../base/qualityHotMaterial/add-or-updata.vue | 13 +++--
 .../base/qualityScrapLog/add-or-updata.vue    |  4 +-
 .../base/qualityScrapLog/detail-or-updata.vue | 51 +++++++++----------
 .../monitoring/originalGlassRetrace/index.vue |  8 +--
 .../report/productionDayReport/index.vue      |  4 +-
 9 files changed, 79 insertions(+), 80 deletions(-)

diff --git a/.env.dev b/.env.dev
index e6eafbc1..6a03e051 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-26 08:45:43
- # @LastEditors: DY
+ # @LastEditTime: 2024-02-29 08:34:48
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置
@@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue
index 4ba4aed8..6493c3c5 100644
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-23 16:11:33
+ * @LastEditTime: 2024-02-29 15:48:47
  * @Description:
 -->
 <template>
@@ -715,6 +715,7 @@ export default {
       qualityMonthTableProps,
       modelMonth: '',
       qualityList1,
+      // logoutTime: 43200000,
       qualityTableProps2,
       qualityList2,
       dateType: '0',
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 3d07693d..b041214c 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-02-23 16:11:40
+ * @LastEditTime: 2024-02-29 15:48:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -341,7 +341,9 @@ export default {
       // offsetWidth: null,
       cxNameList,
       cxDataList,
+      // time:12,
       cutProps,
+      // logoutTime: 43200000,
       cutTableDataList:[],
       clientWidth: 0,
       containerWidth: 111111,
@@ -432,36 +434,15 @@ export default {
         this.beilv2 = _this.clientWidth / 1920
       })()
     }
-    // let obj = {
-    //   'a': 11111,
-    //   'b': 22222,
-    //   'c': 33333,
-    //   'd': 44444,
-    //   'e': 55555,
+    // logoutInterval = setInterval(() => {
+    //   this.logoutTime -= 1000
+    // }, 1000)
+    // if (this.logoutTime === 0) {
+    //   this.SJGInitWebSocket()
+    //   this.CutInitWebSocket()
+    //   this.funInitWebSocket()
+    //   this.logoutTimeReset()
     // }
-    // let index = 0
-    // for (let i in obj) {
-    //   index++,
-    //   console.log(index);
-    // }
-    // this.getList()
-    // const _this = this;
-    // window.onresize = () => {
-    //   return (() => {
-    //     _this.clientWidth = `${document.documentElement.clientWidth}`
-    //     this.beilv2 = _this.clientWidth / 1920
-    //   })()
-    // }
-    // this.beilv2 = window.innerWidth / 1920
-    // addEventListener('resize', resizeFun = () => {
-    //   this.beilv2 = window.innerWidth / 1920
-    // })
-    // erd.listenTo(document, (element) => {
-    //   this.beilv2 = element.offsetWidth / 1920
-
-    //   // var width = element.offsetWidth;
-    //   // var height = element.offsetHeight;
-    // });
   },
   // beforeDestroy() {
   //   //离开页面删除检测器和所有侦听器
@@ -469,13 +450,16 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    // logoutTimeReset() {
+    //   this.logoutTime = this.time * 60 * 60 * 1000
+    // },
     CutWebsocketClose(e) {
       console.log('WebSocket 断开连接', e)
     },
     SJGWebsocketClose(e) {
       console.log('WebSocket 断开连接', e)
     },
-    funInitWebSocket(e) {
+    funWebSocketClose(e) {
       console.log('WebSocket 断开连接', e)
     },
     formatTime(time, option) {
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
index b553af67..364770fe 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@@ -51,8 +51,16 @@ export default {
           label: '用户名称',
           selectOptions: [],
           labelField: 'name',
-          valueField: 'id',
+          valueField: 'name',
           param: 'userName',
+        },
+        {
+          type: 'select',
+          label: '用户昵称',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'name',
+          param: 'nickName',
         },
 				{
 					type: 'button',
@@ -143,10 +151,16 @@ export default {
       }).then((res) => {
         this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
           return {
-            id: item.id,
+            id: item.username,
             name:item.username
           }
         })
+        this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
+          return {
+            id: item.nickname,
+            name: item.nickname
+          }
+        })
       })
     },
     getDataList() {
@@ -206,7 +220,9 @@ export default {
         case 'search':
           this.listQuery.pageNo = 1;
           this.listQuery.pageSize = 10;
-          this.listQuery.inspectionDetContent = val.inspectionDetContent ? val.inspectionDetContent : undefined;
+          this.listQuery.userName = val.userName ? val.userName : undefined;
+          this.listQuery.nickName = val.nickName ? val.nickName : undefined;
+
           // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
           this.getDataList()
           break;
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index a7959590..1a974283 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-01-22 15:29:53
+ * @LastEditTime: 2024-03-01 15:22:06
  * @LastEditors: zhp
  * @Description:
 -->
@@ -80,8 +80,9 @@
           <el-col :span="8">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
-              <el-input :disabled="isdetail" style="width: 90%;margin-right: 10px;" :max="item.maxValue"
-                :min='item.minValue' v-model="dataForm.checkValueList[index].checkValue"
+              <el-input  oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+                style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
+                v-model.number="dataForm.checkValueList[index].checkValue"
                 @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
               <span v-if="dataForm.checkValueList[index].showIcon">
                 <!-- <i class="el-icon-success"></i> -->
@@ -91,14 +92,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值"
-             >
+            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值"
-              >
+            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 48866b9e..dc063ca6 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 09:58:34
+ * @LastEditTime: 2024-03-01 10:33:48
  * @LastEditors: zhp
  * @Description:
 -->
@@ -130,7 +130,7 @@ export default {
 	mounted() {
 		this.getDict()
     console.log('我看看', this.dataForm)
-    this.getCurrentTime()
+    // this.getCurrentTime()
     this.getWorksectionById()
 	},
   methods: {
diff --git a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
index 7a6acef7..165c2921 100644
--- a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 10:13:10
+ * @LastEditTime: 2024-03-01 10:18:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import basicAdd from '../../../core/mixins/basic-add';
+import basicAdd from './basic-add';
 import {
   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
   getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
@@ -151,8 +151,8 @@ export default {
       // this.dataForm.logTime = year + "-" + month + "-" + day;
       console.log(this.dataForm.logTime);
     },
-		async getDict() {
-			// 物料列表
+    async getDict() {
+      // 物料列表
       const res = await getList()
       this.typeList = res.data
       getWorkOrderList().then((res) => {
@@ -182,16 +182,15 @@ export default {
       getDetList().then((res) => {
         console.log(res);
         // console.log(response);
-        this.workOrderList = res.data.map((item) => {
+        this.detList = res.data.map((item) => {
           return {
-            name: item.name,
+            name: item.content,
             id: item.id
           }
         })
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
-
       getTeamList().then((res) => {
         console.log(res);
         // console.log(response);
@@ -201,29 +200,12 @@ export default {
             id: item.id
           }
         })
-        this.$axios({
-          url: '/base/core-workshop-section/listAll',
-          method: 'get',
-          // params: {
-          //   id: lineId,
-          // },
-        }).then((res) => {
-          // console.log(data)
-          this.sectionList = res.data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        })
-        // if (code == 0) {
-
-        // }
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
     },
     async getWorksectionById(lineId) {
+      if (lineId) {
         const { code, data } = await this.$axios({
           url: '/base/core-workshop-section/listByParentId',
           method: 'get',
@@ -240,7 +222,24 @@ export default {
             };
           });
         }
-    }
+      } else {
+        this.$axios({
+          url: '/base/core-workshop-section/listAll',
+          method: 'get',
+          // params: {
+          //   id: lineId,
+          // },
+        }).then((res) => {
+          // console.log(data)
+          this.sectionList = res.data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        })
+      }
+    },
 	},
 };
 </script>
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index 71231acf..75faf29f 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-23 09:16:24
+ * @LastEditTime: 2024-03-01 10:27:29
  * @Description:
 -->
 <template>
@@ -124,8 +124,8 @@ export default {
           label: '工单',
           selectOptions: [],
           labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId'
+          valueField: 'name',
+          param: 'workOrderName'
         },
         // {
         //   type: 'datePicker',
@@ -233,7 +233,7 @@ export default {
     buttonClick(val) {
       console.log(val)
       if (val.btnName === 'search') {
-        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
+        this.listQuery.workOrderName = val.workOrderName ? val.workOrderName :undefined
         // this.queryParams.status = val.status
         // if (val.timeVal && val.timeVal.length != 0 ) {
         // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
diff --git a/src/views/report/productionDayReport/index.vue b/src/views/report/productionDayReport/index.vue
index 71b69624..9b3a60ba 100644
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 16:53:41
+ * @LastEditTime: 2024-03-01 15:26:38
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <div class="app-container">
     <el-form :inline="true" :model="dataForm" class="demo-form-inline">
       <el-form-item label="日" prop="reportTime">
-        <el-date-picker v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
+        <el-date-picker v-model="dataForm.reportTime" @change="changeTime" type="date" placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-button type="primary" @click="getDataList()">查询</el-button>

From 48e7612a787cd8d12567d6f7419e9491afa619c2 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Fri, 1 Mar 2024 20:39:52 +0800
Subject: [PATCH 2/2] bug second

---
 .env.dev                                      |   2 +-
 .../base/coreProductionLine/add-or-updata.vue |  25 +-
 .../base/alarm/Record/AddOrUpdate.vue         |   2 +-
 .../base/alarm/Record/DialogForm.vue          | 520 ++++++++++++++++++
 .../config/DataCollection/TableConfig.vue     |   6 +-
 .../base/inspection/Confirm/add-or-updata.vue |  16 +-
 .../base/inspection/Confirm/index.vue         |  19 +-
 .../base/inspection/Settings/add.vue          |  29 +-
 .../base/repair/CustomDialogForm.vue          |   1 +
 .../equipment/base/repair/Repair--add.vue     |  19 +-
 10 files changed, 604 insertions(+), 35 deletions(-)
 create mode 100644 src/views/equipment/base/alarm/Record/DialogForm.vue

diff --git a/.env.dev b/.env.dev
index 78b9f3e6..b6e1c73b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-29 15:53:50
+ # @LastEditTime: 2024-03-01 18:43:05
  # @LastEditors: DY
  # @Description:
 ###
diff --git a/src/views/base/coreProductionLine/add-or-updata.vue b/src/views/base/coreProductionLine/add-or-updata.vue
index 0916b746..703339b8 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-02-18 13:53:09
+ * @LastEditTime: 2024-03-01 19:52:55
  * @Description:
 -->
 <template>
@@ -33,14 +33,13 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
-						:disabled="isdetail || isedit"
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
 							v-for="(dict, index) in getDictDatas('workshop')"
 							:key="index"
 							:label="dict.label"
-							:value="dict.value" />
+							:value="Number(dict.value)" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -125,6 +124,26 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+            // this.dataForm.roomNameDict = String(this.dataForm.roomNameDict)
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
 		async getDict() {
 			// 工厂列表
 			const factoryRes = await getFactoryList();
diff --git a/src/views/equipment/base/alarm/Record/AddOrUpdate.vue b/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
index 28544fe2..3f180f43 100644
--- a/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
+++ b/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
@@ -38,7 +38,7 @@
 import SmallTitle from './SmallTitle';
 import { getworkerAll } from '@/api/base/materialUseLog';
 import Editor from '@/components/Editor';
-import DialogForm from '@/components/DialogForm';
+import DialogForm from './DialogForm';
 
 export default {
 	name: 'AlarmHandle',
diff --git a/src/views/equipment/base/alarm/Record/DialogForm.vue b/src/views/equipment/base/alarm/Record/DialogForm.vue
new file mode 100644
index 00000000..e400bf53
--- /dev/null
+++ b/src/views/equipment/base/alarm/Record/DialogForm.vue
@@ -0,0 +1,520 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:label-width="`${labelWidth}px`"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
+			<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
+				<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
+					<el-input
+						v-if="col.input"
+						v-model="form[col.prop]"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						:disabled="disabled"
+						v-bind="col.bind" />
+					<el-input
+						v-if="col.textarea"
+						type="textarea"
+						v-model="form[col.prop]"
+						:disabled="disabled"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						v-bind="col.bind" />
+					<el-select
+						v-if="col.select"
+						v-model="form[col.prop]"
+						:placeholder="`请选择${col.label}`"
+						:disabled="disabled"
+						@change="$emit('update', form)"
+						v-bind="col.bind">
+						<el-option
+							v-for="opt in optionListOf[col.prop]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+					<el-date-picker
+						v-if="col.datetime"
+						v-model="form[col.prop]"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择${col.label}`"
+						value-format="timestamp"
+						@change="$emit('update', form)"
+						v-bind="col.bind"></el-date-picker>
+					<el-switch
+						v-if="col.switch"
+						v-model="form[col.prop]"
+						:disabled="disabled"
+						active-color="#0b58ff"
+						inactive-color="#e1e1e1"
+						@change="$emit('update', form)"
+						v-bind="col.bind"></el-switch>
+					<component
+						v-if="col.subcomponent"
+						:key="col.key"
+						:disabled="disabled"
+						:read-only="disabled"
+						:is="col.subcomponent"
+						v-model="form[col.prop]"
+						:inlineStyle="col.style"
+						@on-change="$emit('update', form)"
+						v-bind="col.bind"></component>
+
+					<div
+						class="upload-area"
+						:class="uploadOpen ? '' : 'height-48'"
+						ref="uploadArea"
+						:key="col.prop"
+						v-if="col.upload">
+						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
+							<el-button
+								type="text"
+								icon="el-icon-arrow-right"
+								@click="handleFilesOpen" />
+						</span>
+						<!-- :file-list="uploadedFileList" -->
+						<el-upload
+							v-if="col.upload"
+							class="upload-in-dialog"
+							:key="col.prop + '__el-upload'"
+							:action="uploadUrl"
+							:headers="uploadHeaders"
+							:show-file-list="false"
+							icon="el-icon-upload2"
+							:disabled="disabled"
+							:before-upload="beforeUpload"
+							:on-success="
+								(response, file, fileList) => {
+									handleUploadSuccess(response, file, col.prop);
+								}
+							"
+							v-bind="col.bind">
+							<el-button
+								size="mini"
+								:disabled="disabled || col.bind?.disabled || false">
+								<svg-icon
+									icon-class="icon-upload"
+									style="color: inherit"></svg-icon>
+								上传文件
+							</el-button>
+							<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
+								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
+							</div>
+						</el-upload>
+
+						<uploadedFile
+							class="file"
+							v-for="file in form[col.prop]"
+							:file="file"
+							:key="file.fileUrl"
+							:disabled="disabled"
+							@delete="!disabled && handleDeleteFile(file, col.prop)" />
+					</div>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import { getAccessToken } from '@/utils/auth';
+import tupleImg from '@/assets/images/tuple.png';
+import cache from '@/utils/cache';
+
+/**
+ * 找到最长的label
+ * @param {*} options
+ */
+function findMaxLabelWidth(rows) {
+	let max = 0;
+	rows.forEach((row) => {
+		row.forEach((opt) => {
+			// debugger;
+			if (!opt.label) return 0;
+			if (opt.label.length > max) {
+				max = opt.label.length;
+				if (opt.label.includes('(')) {
+					max = max - 3;
+				}
+			}
+		});
+	});
+	return max;
+}
+
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file', 'disabled'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				{!this.disabled && (
+					<el-button
+						type="text"
+						icon="el-icon-close"
+						style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+						class="dialog__upload_component__close"
+						onClick={this.handleDelete}
+					/>
+				)}
+			</div>
+		);
+	},
+};
+
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { uploadedFile },
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			uploadOpen: false,
+			form: {},
+			formLoading: true,
+			optionListOf: {},
+			uploadedFileList: [],
+			dataLoaded: false,
+			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
+			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
+		};
+	},
+	computed: {
+		labelWidth() {
+			let max = findMaxLabelWidth(this.rows);
+			// 每个汉字占20px
+			return max * 20;
+			// return max * 20 + 'px';
+		},
+	},
+	watch: {
+		rows: {
+			handler() {
+				this.$nextTick(() => {
+					this.handleOptions('watch');
+				});
+			},
+			deep: true,
+			immediate: false,
+		},
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		// 处理 options
+		this.handleOptions();
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+		async handleOptions(trigger = 'monuted') {
+			console.log('[dialogForm:handleOptions]');
+			const promiseList = [];
+			this.rows.forEach((cols) => {
+				cols.forEach((opt) => {
+					if (opt.value && !this.form[opt.prop]) {
+						// 默认值
+						this.form[opt.prop] = opt.value;
+					}
+
+					if (opt.options) {
+						this.$set(this.optionListOf, opt.prop, opt.options);
+					} else if (opt.url) {
+						// 如果有 depends，则暂时先不获取，注册一个watcher
+						if (opt.depends) {
+							this.$watch(
+								() => this.form[opt.depends],
+								(id) => {
+									console.log('<', opt.depends, '>', 'changed', id);
+									if (id == null) return;
+									// 清空原有选项
+									this.form[opt.prop] = null;
+									// 获取新的选项
+									this.$axios({
+										url: `${opt.url}?id=${id}`,
+									}).then((res) => {
+										this.$set(
+											this.optionListOf,
+											opt.prop,
+											res.data.map((item) => ({
+												label: item[opt.labelKey ?? 'name'],
+												value: item[opt.valueKey ?? 'id'],
+											}))
+										);
+									});
+								},
+								{
+									immediate: false,
+								}
+							);
+							return;
+						}
+						// 如果是下拉框，或者新增模式下的输入框，才去请求
+						if (opt.select || (opt.input && !this.form?.id)) {
+							promiseList.push(async () => {
+								const response = await this.$axios(opt.url, {
+									method: opt.method ?? 'get',
+									// data: opt.method == 'post' ? opt.queryParams : null
+								});
+								// console.log('[dialogForm:handleOptions:response]', response);
+								if (opt.select) {
+									// 处理下拉框选项
+									const list =
+										'list' in response.data
+											? response.data.list
+											: response.data;
+
+									if (opt.cache) {
+										cache.store(opt.cache, list);
+									}
+
+									this.$set(
+										this.optionListOf,
+										opt.prop,
+										list.map((item) => ({
+											label: item[opt.labelKey ?? 'name'],
+											value: item[opt.valueKey ?? 'id'],
+										}))
+									);
+								} else if (opt.input) {
+									console.log('setting code: ', response.data);
+									// 处理输入框数据
+									this.form[opt.prop] = response.data;
+									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
+									this.$emit('update', this.form);
+								}
+							});
+						}
+					}
+				});
+			});
+
+			console.log('[dialogForm:handleOptions] done!');
+
+			// 如果是 watch 触发的，不需要执行进一步的请求
+			if (trigger == 'watch') {
+				this.formLoading = false;
+				return;
+			}
+			try {
+				await Promise.all(promiseList.map((fn) => fn()));
+				this.formLoading = false;
+				this.dataLoaded = true;
+				// console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
+			} catch (error) {
+				console.log('[dialogForm:handleOptions:error]', error);
+				this.formLoading = false;
+			}
+			if (!promiseList.length) this.formLoading = false;
+		},
+
+		// 上传成功的特殊处理
+		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();
+			return checkFileSize();
+		},
+
+		// 上传前的验证规则可通过 bind 属性传入
+		handleUploadSuccess(response, file, prop) {
+			console.log('[handleUploadSuccess]', response, file, prop);
+			this.form[prop].push({
+				fileName: file.name,
+				fileUrl: response.data,
+				fileType: prop == 'files' ? 2 : 1,
+			});
+			this.$modal.msgSuccess('上传成功');
+			this.$emit('update', this.form);
+		},
+
+		getFileName(fileUrl) {
+			return fileUrl.split('/').pop();
+		},
+
+		handleFilesOpen() {
+			this.uploadOpen = !this.uploadOpen;
+		},
+
+		handleDeleteFile(file, prop) {
+			this.form[prop] = this.form[prop].filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+			this.$emit('update', this.form);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+
+.upload-area {
+	// background: #ccc;
+	// display: grid;
+	// grid-auto-rows: 34px;
+	// grid-template-columns: repeat(6, minmax(32px, max-content));
+	// gap: 8px;
+	// align-items: center;
+	position: relative;
+	overflow: hidden;
+	transition: height 0.3s ease-out;
+}
+
+.upload-in-dialog {
+	// display: inline-block;
+	margin-right: 24px;
+	// background: #ccc;
+	position: relative;
+	// top: -13px;
+	float: left;
+}
+
+.close-icon {
+	// background: #ccc;
+	position: absolute;
+	top: 0;
+	right: 12px;
+	z-index: 100;
+	transition: transform 0.3s ease-out;
+}
+
+.close-icon.open {
+	transform: rotateZ(90deg);
+}
+</style>
+
+<style>
+.dialog__upload_component__close {
+	color: #ccc;
+}
+.dialog__upload_component__close:hover {
+	/* color: #777; */
+	color: red;
+}
+
+.height-48 {
+	height: 35px !important;
+}
+</style>
diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue
index 2f9dda7a..2b08eada 100644
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@@ -218,9 +218,9 @@ export default {
 						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
 						prop: 'collection',
 						bind: {
-                            'active-value': 1,
+              'active-value': 1,
 							'inactive-value': 0,
-                            value: 1,
+              value: 1,
 						},
 					},
 				],
@@ -294,7 +294,7 @@ export default {
 				name: undefined,
 				enName: undefined,
 				description: undefined,
-				collection: undefined,
+				collection: 1,
 			};
 			this.resetForm('form');
 		},
diff --git a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
index ad653212..af2c6992 100644
--- a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 14:59:28
+ * @LastEditTime: 2024-03-01 18:57:31
  * @Description:
 -->
 <template>
@@ -78,7 +78,7 @@
 										v-for="opt in inspectorOptions"
 										:key="opt.value"
 										:label="opt.label"
-										:value="opt.value" />
+										:value="opt.label" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -418,7 +418,7 @@ export default {
 			});
 		},
 		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+			return this.$confirm('是否直接确认巡检单', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -431,10 +431,16 @@ export default {
 				}
 				this.$nextTick(() => {
 					this.getConfirmed().then(confirm => {
+						let checkPersonParam = '';
+						if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') {
+							/** 如有必要，更新巡检人 */
+							checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+						} else {
+							checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}`
+						}
 						this.$axios({
 							url:
-								'/base/equipment-check-order/confirm?confirmPerson=' +
-								this.$store.getters.userId,
+								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
 								method: 'put',
 								data: [this.dataForm.id],
 						}).then(res =>{
diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue
index eed73765..dc8d983c 100644
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@@ -179,8 +179,13 @@ export default {
 					this.$modal
 						.confirm('是否确认所有选中巡检单"?')
 						.then(() => {
+							let checkPersonParam = '';
+							if (!row.checkPerson || row.checkPerson.trim() == '') {
+								/** 如有必要，更新巡检人 */
+								checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+							}
 							return this.$axios({
-								url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,
+								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
 								method: 'put',
 								data: this.$refs['waiting-list-table'].selectedPlan.map(
 									(item) => item.id
@@ -394,11 +399,17 @@ export default {
 			this.$modal
 				.confirm('是否确认巡检单"' + row.name + '"?')
 				.then(() => {
+					let checkPersonParam = '';
+					const nickname = this.$store.getters.nickname;
+					if (!row.checkPerson || row.checkPerson.trim() == '') {
+						/** 如有必要，更新巡检人 */
+						checkPersonParam = `&checkPerson=${nickname}`;
+					} else {
+						checkPersonParam = `&checkPerson=${row.checkPerson}`
+					}
 					return this.$axios({
 						url:
-							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
-						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
+							`/base/equipment-check-order/confirm?confirmPerson=${nickname}` + checkPersonParam,
 						method: 'put',
 						data: [row.id],
 					});
diff --git a/src/views/equipment/base/inspection/Settings/add.vue b/src/views/equipment/base/inspection/Settings/add.vue
index 166d054e..4c49f261 100644
--- a/src/views/equipment/base/inspection/Settings/add.vue
+++ b/src/views/equipment/base/inspection/Settings/add.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 14:58:37
+ * @LastEditTime: 2024-03-01 19:44:59
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="120px">
+		label-width="150px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="巡检单名称" prop="name">
@@ -27,8 +27,6 @@
 						placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
 					label="部门"
@@ -57,8 +55,13 @@
 						style="width: 100%" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="巡检频率（天/次）" prop="checkPeriod">
+					<el-input
+						v-model="dataForm.checkPeriod"
+						placeholder="请输入巡检频率(天/次)" />
+				</el-form-item>
+			</el-col>
 			<el-col :span="12">
 				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
 					<el-input
@@ -83,8 +86,6 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@@ -121,7 +122,8 @@ export default {
 				planCheckTime: null,
 				confirmTimeLimit: null,
 				groupClass: null,
-				remark: null
+				remark: null,
+				checkPeriod: null
 			},
 			groupOptions: [],
 			departmentOptions: [],
@@ -137,6 +139,15 @@ export default {
 				],
 				planCheckTime: [
 					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' }
+				],
+				checkPeriod: [
+					{ required: true, message: '巡检频率不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					}
 				]
       }
 		};
diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue
index 611f0918..ad0ff21e 100644
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@@ -160,6 +160,7 @@ import Editor from "@/components/Editor";
 import { getDictDatas } from "@/utils/dict";
 import { parseTime } from '@/utils/ruoyi'
 import { getDictDataLabel } from '@/utils/dict';
+import tupleImg from '@/assets/images/tuple.png';
 
 const uploadedFile = {
 	name: 'UploadedFile',
diff --git a/src/views/equipment/base/repair/Repair--add.vue b/src/views/equipment/base/repair/Repair--add.vue
index 469ae381..712e3103 100644
--- a/src/views/equipment/base/repair/Repair--add.vue
+++ b/src/views/equipment/base/repair/Repair--add.vue
@@ -29,7 +29,7 @@
 			</el-col>
 
 			<!-- 产线名  -->
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="产线名" prop="lineId">
 					<el-select
 						v-model="formFilters.lineId"
@@ -45,10 +45,10 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 
 			<!-- 工段名  -->
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="工段名" prop="sectionId">
 					<el-select
 						v-model="formFilters.sectionId"
@@ -64,7 +64,7 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 
 			<!-- 设备名称  -->
 			<el-col :span="8">
@@ -234,7 +234,7 @@
 							v-for="opt in workerOptions"
 							:key="opt.value"
 							:label="opt.label"
-							:value="opt.value" />
+							:value="opt.label" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -597,9 +597,9 @@ export default {
 		/** 设置默认维修工为用户自己 */
 		setInitWorker() {
 			/** 获取用户自身id */
-			const userId = this.$store.getters.userId;
+			const nickname = this.$store.getters.nickname;
 			this.$nextTick(() => {
-				this.form.repairman = [userId];
+				this.form.repairman = [nickname];
 			});
 		},
 
@@ -630,8 +630,8 @@ export default {
 		/** 获取设备 */
 		async initEquipment() {
 			const response = await this.$axios('/base/core-equipment/listAll');
-			this.equipmentList = response.data || [];
-			this.equipmentOptions = response.data || [];
+			this.equipmentList = response.data.filter(item => item.special === false) || [];
+			this.equipmentOptions = response.data.filter(item => item.special === false) || [];
 			// this.allSpeicalEquipments = equipmentOptions;
 		},
 		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
@@ -737,6 +737,7 @@ export default {
 				fileType: prop == 'files' ? 2 : 1,
 			});
 			this.$modal.msgSuccess('上传成功');
+			console.log('为我', this.form.files)
 			this.$emit('update', this.form);
 		},