bug 2

src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -2,14 +2,15 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-04 11:14:28
+ * @LastEditTime: 2024-03-18 15:47:20
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="isdetail"
+		:wrapper-closable="true"
+		:before-close="beforeClose"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -269,6 +270,17 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		beforeClose(done) {
+			if (!this.isdetail) {
+				this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+			} else {
+				done()
+			}
+		},
 		async getDict() {
 			// 班次列表
 			const res = await groupClassesListAll();
@@ -372,6 +384,7 @@ export default {
 			if (id) {
 				this.idAttrShow = true
 			} else {
+				this.dataForm.checkPerson = [this.$store.getters.nickname]
 				this.idAttrShow = false
 			}
 

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-03-01 19:44:59
+ * @LastEditTime: 2024-03-15 18:38:52
  * @Description:
 -->
 <template>
@@ -27,7 +27,7 @@
 				<el-form-item
 					label="部门"
 					prop="departmentId"
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					:rules="[{ required: false, message: '请选择部门', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.departmentId"
 						:placeholder="`请选择部门`"

src/views/equipment/base/inspection/Settings/index.vue

@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="180"
+				:width="120"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -52,6 +52,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
 import { parseTime } from '../../../../core/mixins/code-filter';
+import { groupClassesListAll } from '@/api/monitoring/teamProduction';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -111,6 +112,12 @@ export default {
 					width: 150,
 					filter: parseTime,
 				},
+				{
+					prop: 'checkPeriod',
+					label: '巡检频率（天/次）',
+					width: 150,
+					showOverflowtooltip: true,
+				},
 				{
 					prop: 'confirmTimeLimit',
 					label: '确认时限',