src/views/specialEquipment/basic/FireFighthing.vue

@@ -117,12 +117,12 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import EquipmentDrawer from '../components/firefightingDrawer';
-import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 import {
 	createEquipment,
 	updateEquipment,
 	deleteEquipment,
+	getEquipment,
 	getEquipmentPage,
 	exportEquipmentExcel,
 } from '@/api/base/equipment';
@@ -134,7 +134,6 @@ export default {
 	components: {
 		Editor,
 		EquipmentDrawer,
-		BaseDialog: BaseDialogWrapper
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/basic/Manage.vue

@@ -116,12 +116,12 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import EquipmentDrawer from '../components/manageDrawer';
-import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 import {
 	createEquipment,
 	updateEquipment,
 	deleteEquipment,
+	getEquipment,
 	getEquipmentPage,
 	exportEquipmentExcel,
 } from '@/api/base/equipment';
@@ -133,7 +133,6 @@ export default {
 	components: {
 		Editor,
 		EquipmentDrawer,
-		BaseDialog: BaseDialogWrapper
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/basic/Safety.vue

@@ -126,14 +126,12 @@ import {
 } from '@/api/base/equipment';
 import Editor from '@/components/Editor';
 import AssetsUpload from '../components/AssetsUpload.vue';
-import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentForSafety',
 	components: {
 		Editor,
 		EquipmentDrawer,
-		BaseDialog: BaseDialogWrapper,
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/check/Config.vue

@@ -51,8 +51,7 @@
 		<addOrUpdata
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList"
+			@refreshDataList="getList" />
-			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -61,11 +60,10 @@ 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 BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: { addOrUpdata, add, BaseDialog: BaseDialogWrapperVue },
+	components: { addOrUpdata, add },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -190,7 +188,6 @@ export default {
 				pageSize: 10,
 				name: null,
 				status: 0,
-				special: true,
 			},
 			// 表单参数
 			form: {},

src/views/specialEquipment/check/Content-edit.vue

@@ -9,9 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
-		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -173,7 +171,7 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button v-if="!disableEdit" @click="handleCancel">
+				<el-button style="" @click="handleCancel">
 					{{ disableEdit ? '返回' : '取消' }}
 				</el-button>
 				<el-button
@@ -208,11 +206,35 @@
 <script>
 import DialogForm from '../../../components/DialogForm/index.vue';
 import { groupConnectWorkshop } from '@/utils/equipment-module';
-import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
+
-import SmallTitle from '../components/SmallTitle.js';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
-	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
+	components: { SmallTitle, DialogForm },
 	props: ['dataId'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
@@ -389,35 +411,6 @@ export default {
 		this.getList('inspector');
 	},
 	methods: {
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			if (this.disableEdit) return this.handleCancel();
-
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.handleCancel();
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':

src/views/specialEquipment/check/Content.vue

@@ -64,18 +64,10 @@ import { parseTime } from '../../core/mixins/code-filter';
 import CheckOrderListTable from './CheckOrderListTable.vue';
 import edit from './Content-edit.vue';
 import AddCheckDet from './Content-add_detail.vue';
-import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: {
+	components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
-		addOrUpdata,
-		add,
-		edit,
-		AddCheckDet,
-		BaseDialog: BaseDialogWrapperVue,
-		CheckOrderListTable,
-	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -94,7 +86,7 @@ export default {
 					? {
 							type: 'edit',
 							btnName: '修改',
-					  }
+						}
 					: undefined,
 				{
 					type: 'detail',
@@ -104,7 +96,7 @@ export default {
 					? {
 							type: 'delete',
 							btnName: '删除',
-					  }
+						}
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
@@ -342,8 +334,9 @@ export default {
 					}
 
 					return this.$axios({
-						url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+						url:
-						// + checkPersonParam,
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+							// + checkPersonParam,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: [id],

src/views/specialEquipment/check/Record-detail.vue

@@ -7,10 +7,9 @@
 
 <template>
 	<el-drawer
-		:visible.sync="visible"
+		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -31,13 +30,13 @@
 						<el-row :gutter="20">
 							<el-col :span="8">
 								<el-form-item label="巡检单名称" prop="name">
-									<div style="">{{ form.name || '---' }}</div>
+									<div style="">{{ form.name }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="部门" prop="department">
-									<div style="">{{ form.department || '---' }}</div>
+									<div style="">{{ form.department }}</div>
 								</el-form-item>
 							</el-col>
 
@@ -112,7 +111,7 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button v-if="!disableEdit" @click="handleCancel">
+				<el-button style="" @click="handleCancel">
 					{{ disableEdit ? '返回' : '取消' }}
 				</el-button>
 				<el-button
@@ -147,11 +146,35 @@
 <script>
 import { parseTime } from '../../core/mixins/code-filter';
 import DialogForm from '../../../components/DialogForm/index.vue';
-import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
+
-import SmallTitle from '../components/SmallTitle.js';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
-	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
+	components: { SmallTitle, DialogForm },
 	props: ['dataId'], // dataId 作为一个通用的存放id的字段
 	filters: { parseTime },
 	data() {

src/views/specialEquipment/check/add-or-updata.vue

@@ -9,9 +9,7 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="true"
-		:close-on-click-modal="true"
-		@closed="$emit('destroy')"
 		class="drawer"
 		size="50%">
 		<small-title slot="title" :no-padding="true">
@@ -39,12 +37,12 @@
 						</el-col> -->
 						<el-col :span="8">
 							<el-form-item label="巡检单名称" prop="name">
-								{{ dataForm.name || '---' }}
+								{{ dataForm.name }}
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="部门" prop="department">
-								{{ dataForm.department || '---' }}
+								{{ dataForm.department }}
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -96,7 +94,7 @@
 					@pagination="getList" />
 
 				<!-- <div class="drawer-body__footer">
-					<el-button type="primary" @click="goback()">返回</el-button>
+					<el-button type="primary" @click="goback()">关闭</el-button>
 				</div> -->
 			</div>
 		</div>
@@ -113,7 +111,7 @@
 <script>
 import SmallTitle from './SmallTitle';
 import attrAdd from './attr-add';
-// import { DICT_TYPE, getDictDatas } from '@/utils/dict';
+import { DICT_TYPE, getDictDatas } from '@/utils/dict';
 import { parseTime } from '../../core/mixins/code-filter';
 
 const tableBtn = [
@@ -185,33 +183,6 @@ export default {
 	},
 	mounted() {},
 	methods: {
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.visible = false;
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		initData() {
 			this.checkDetList.splice(0);
 			this.checkDetList.total = 0;
@@ -274,7 +245,7 @@ export default {
 			});
 		},
 		goback() {
-			// this.$emit('refreshDataList');
+			this.$emit('refreshDataList');
 			this.visible = false;
 			// this.initData();
 		},

src/views/specialEquipment/check/attr-add.vue

@@ -51,7 +51,7 @@
 
 		<el-row style="text-align: right">
 			<el-button @click="visible = false">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</el-row>
 	</el-dialog>
 </template>

src/views/specialEquipment/components/BaseDialogWrapper.vue

@@ -1,59 +0,0 @@
-<!-- 
-    filename: BaseDialogWrapper.vue
-    author: liubin
-    date: 2024-03-13 13:51:14
-    description: 对BaseDialog的封装，自定义保存、取消按钮
--->
-
-<template>
-	<base-dialog
-		:dialogTitle="dialogTitle"
-		:dialogVisible="dialogVisible"
-		:width="width"
-		:custom-class="customClass"
-		:append-to-body="appendToBody"
-		@close="$emit('close')">
-		<slot />
-		<template #footer>
-			<el-row slot="footer" type="flex" justify="end">
-				<el-col :span="24">
-					<el-button size="small" class="btnTextStyle" @click="$emit('cancel')">
-						取消
-					</el-button>
-					<el-button
-						type="primary"
-						class="btnTextStyle"
-						size="small"
-						@click="$emit('confirm')">
-						保存
-					</el-button>
-				</el-col>
-			</el-row>
-		</template>
-	</base-dialog>
-</template>
-
-<script>
-export default {
-	name: 'BaseDialogWrapper',
-	components: {},
-	props: [
-		'dialogTitle',
-		'dialogVisible',
-		'appendToBody',
-		'width',
-		'customClass',
-	],
-	data() {
-		return {};
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.baseDialog .btnTextStyle {
-	letter-spacing: 6px;
-	padding: 9px 10px 9px 16px;
-	font-size: 14px;
-}
-</style>

src/views/specialEquipment/components/SmallTitle.js

@@ -1,32 +0,0 @@
-// <!--
-//     filename: SmallTitle.js
-//     author: liubin
-//     date: 2024-03-13 14:21:01
-//     description:
-// -->
-
-export default {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};

src/views/specialEquipment/components/firefightingDrawer.vue

@@ -121,16 +121,35 @@
 <script>
 import DialogForm from './DialogForm';
 import EquipmentInfoForm from './EquipmentInfoForm.vue';
-import BaseDialogWrapper from './BaseDialogWrapper.vue';
+
-import SmallTitle from './SmallTitle.js';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
-	components: {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
-		SmallTitle,
-		DialogForm,
-		EquipmentInfoForm,
-		BaseDialog: BaseDialogWrapper,
-	},
 	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {

src/views/specialEquipment/components/manageDrawer.vue

@@ -5,6 +5,7 @@
     description: 
 -->
 
+
 <template>
 	<el-drawer
 		:visible="visible"
@@ -121,16 +122,35 @@
 <script>
 import DialogForm from './DialogForm';
 import EquipmentInfoForm from './manageDrawerForm.vue';
-import BaseDialogWrapper from './BaseDialogWrapper.vue';
+
-import SmallTitle from './SmallTitle.js';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
-	components: {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
-		SmallTitle,
-		DialogForm,
-		EquipmentInfoForm,
-		BaseDialog: BaseDialogWrapper,
-	},
 	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {

src/views/specialEquipment/components/safetyDrawer.vue

@@ -5,6 +5,7 @@
     description: 
 -->
 
+
 <template>
 	<el-drawer
 		:visible="visible"
@@ -121,16 +122,35 @@
 <script>
 import DialogForm from './DialogForm';
 import EquipmentInfoForm from './EquipmentInfoForm.vue';
-import BaseDialogWrapper from './BaseDialogWrapper.vue';
+
-import SmallTitle from './SmallTitle.js';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
-	components: {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
-		SmallTitle,
-		DialogForm,
-		EquipmentInfoForm,
-		BaseDialog: BaseDialogWrapper,
-	},
 	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {

src/views/specialEquipment/maintain/Monitor--detail.vue

@@ -9,9 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
-		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -117,7 +115,7 @@
 		</div>
 
 		<div class="drawer-body__footer">
-			<!-- <el-button style="" @click="cancel">返回</el-button> -->
+			<el-button style="" @click="cancel">返回</el-button>
 			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 				编辑
 			</el-button>
@@ -145,7 +143,32 @@
 
 <script>
 import DialogForm from '@/components/DialogForm';
-import SmallTitle from '../components/SmallTitle.js';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
 	name: 'PlanConfig--addContent',
@@ -240,35 +263,6 @@ export default {
 		this.loadEquipments();
 	},
 	methods: {
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			if (this.mode.includes('detail')) return this.cancel();
-
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.cancel();
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		show({
 			departmentName,
 			id,

src/views/specialEquipment/maintain/Monitor.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script>
-// import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict';
 // import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record';

src/views/specialEquipment/maintain/PlanConfig--add.vue

@@ -123,8 +123,7 @@
 							type: 'number',
 							message: '请输入正确的数字',
 							trigger: 'blur',
-							transform: (val) =>
+							transform: (val) => Number(val) && parseInt(val) === Number(val),
-								Number(val) && parseInt(val) === Number(val) && Number(val),
 						},
 						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
 					]">

src/views/specialEquipment/maintain/PlanConfig--addContent.vue

@@ -2,16 +2,14 @@
     filename: PlanConfig--addContent.vue
     author: liubin
     date: 2024-02-04 09:40:04
-    description: 计划配置-添加内容
+    description: 
 -->
 
 <template>
 	<el-drawer
-		:visible.sync="visible"
+		:visible="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
-		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -21,7 +19,7 @@
 				mode.includes('detail')
 					? '详情'
 					: mode.includes('edit')
-					? '添加内容'
+					? '编辑'
 					: '新增'
 			}}
 		</SmallTitle>
@@ -40,37 +38,37 @@
 							<el-row :gutter="20">
 								<el-col :span="8">
 									<el-form-item label="保养计划名称" prop="name">
-										<span>{{ form.name || '---' }}</span>
+										<span>{{ form.name }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="部门" prop="departmentName">
-										<span>{{ form.departmentName || '---' }}</span>
+										<span>{{ form.departmentName }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="产线名" prop="lineName">
-										<span>{{ form.lineName || '---' }}</span>
+										<span>{{ form.lineName }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="保养频率" prop="maintenancePeriod">
-										<span>{{ form.maintenancePeriod || '---' }}</span>
+										<span>{{ form.maintenancePeriod }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="保养时长" prop="maintainDuration">
-										<span>{{ form.maintainDuration || '---' }}</span>
+										<span>{{ form.maintainDuration }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="计划保养人员" prop="maintainer">
-										<span>{{ form.maintainer || '---' }}</span>
+										<span>{{ form.maintainer }}</span>
 									</el-form-item>
 								</el-col>
 							</el-row>
@@ -145,12 +143,36 @@
 
 <script>
 import DialogForm from '@/components/DialogForm';
-import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
+
-import SmallTitle from '../components/SmallTitle.js';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
 	name: 'PlanConfig--addContent',
-	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
+	components: { SmallTitle, DialogForm },
 	props: ['maintainData'],
 	data() {
 		return {
@@ -241,35 +263,6 @@ export default {
 		this.loadEquipments();
 	},
 	methods: {
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			if (this.mode.includes('detail')) return this.cancel();
-			if (document.querySelector('.small-title').innerText.includes('添加内容')) return this.cancel();
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.cancel();
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		show({
 			departmentName,
 			id,

src/views/specialEquipment/maintain/PlanConfig.vue

@@ -65,15 +65,10 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
 import PlanConfigAdd from './PlanConfig--add.vue';
 import PlanConfigAddContent from './PlanConfig--addContent.vue';
-import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentPlanConfig',
-	components: {
+	components: { DialogForm: PlanConfigAdd, PlanConfigAddContent },
-		BaseDialog: BaseDialogWrapper,
-		DialogForm: PlanConfigAdd,
-		PlanConfigAddContent,
-	},
 	mixins: [basicPageMixin],
 	data() {
 		const t = new Date();
@@ -103,7 +98,7 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '保养计划名称' },
+				{ prop: 'name', label: '计划名称' },
 				{ prop: 'departmentName', label: '部门' },
 				{ width: 144, prop: 'lineName', label: '产线名' },
 				{ width: 132, prop: 'maintenancePeriod', label: '保养频率(天/次)' },

src/views/specialEquipment/maintain/Record--detail.vue

@@ -9,9 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
-		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -86,7 +84,7 @@
 		</div>
 
 		<div class="drawer-body__footer">
-			<!-- <el-button style="" @click="cancel">返回</el-button> -->
+			<el-button style="" @click="cancel">返回</el-button>
 			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 				编辑
 			</el-button>
@@ -114,12 +112,36 @@
 
 <script>
 import DialogForm from '@/components/DialogForm';
-import SmallTitle from '../components/SmallTitle.js';
+
-import BaseDialogWrapper from '../components/BaseDialogWrapper';
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
 
 export default {
 	name: 'PlanConfig--addContent',
-	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
+	components: { SmallTitle, DialogForm },
 	props: ['maintainData'],
 	data() {
 		return {
@@ -207,35 +229,6 @@ export default {
 		this.loadEquipments();
 	},
 	methods: {
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			if (this.mode.includes('detail')) return this.cancel();
-
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.cancel();
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		show({ planMaintainWorker, id, maintainWorker }) {
 			this.form = Object.assign(
 				{},
@@ -312,14 +305,17 @@ export default {
 			}
 
 			try {
-				const res = await this.$axios('/base/equipment-maintain-log-det/page', {
+				const res = await this.$axios(
-					params: {
+					'/base/equipment-maintain-log-det/page',
-						pageNo: this.detailTableQuery.pageNo,
+					{
-						pageSize: this.detailTableQuery.pageSize,
+						params: {
-						// planId: this.form.id,
+							pageNo: this.detailTableQuery.pageNo,
-						logId: this.form.id,
+							pageSize: this.detailTableQuery.pageSize,
-					},
+							// planId: this.form.id,
-				});
+							logId: this.form.id,
+						},
+					}
+				);
 				this.detailList = res.data?.list || [];
 				this.detailTotal = res.data?.total || 0;
 				this.detailLoading = false;

src/views/specialEquipment/maintain/Repair.vue

@@ -70,11 +70,10 @@ import {
 import { parseTime } from '@/utils/ruoyi';
 import htmls from './htmls.vue';
 import DialogForm from './Repair--add.vue';
-import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentRepair',
-	components: { DetailDrawer, DialogForm, BaseDialog: BaseDialogWrapperVue },
+	components: { DetailDrawer, DialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {

src/views/specialEquipment/maintain/WaitingList.vue

@@ -97,39 +97,42 @@
 </template>
 
 <script>
+import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
 import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
 import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
 import UnplannedAddDet from './WaitingListUnplanned--add_detail.vue';
-import { exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
+import {
+	exportMaintainLogExcel,
+} from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
 import RecordDetail from './Record--detail.vue';
-import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
-// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
-// const btn = {
+
-// 	name: 'tableBtn',
+const btn = {
-// 	props: ['injectData'],
+	name: 'tableBtn',
-// 	data() {
+	props: ['injectData'],
-// 		return {};
+	data() {
-// 	},
+		return {};
-// 	methods: {
+	},
-// 		handleClick() {
+	methods: {
-// 			this.$emit('emitData', {
+		handleClick() {
-// 				action: this.injectData.label,
+			this.$emit('emitData', {
-// 				value: this.injectData,
+				action: this.injectData.label,
-// 			});
+				value: this.injectData,
-// 		},
+			});
-// 	},
+		},
-// 	render: function (h) {
+	},
-// 		return (
+	render: function (h) {
-// 			<el-button type="text" onClick={this.handleClick}>
+		return (
-// 				{this.injectData.name}
+			<el-button type="text" onClick={this.handleClick}>
-// 			</el-button>
+				{this.injectData.name}
-// 		);
+			</el-button>
-// 	},
+		);
-// };
+	},
+};
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
@@ -140,7 +143,6 @@ export default {
 		UnplannedEditDrawer,
 		UnplannedAddDet,
 		PlannedEditDrawer,
-		BaseDialog: BaseDialogWrapper,
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue

@@ -9,9 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
-		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -484,33 +482,6 @@ export default {
 		this.getList('line');
 	},
 	methods: {
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.handleCancel();
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':

src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue

@@ -9,9 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapperClosable="true"
+		:wrapper-closable="false"
-		:close-on-click-modal="true"
-		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -421,34 +419,6 @@ export default {
 		this.getList('line');
 	},
 	methods: {
-		
-		/** 确认是否关闭 */
-		async handleConfirmClose() {
-			try {
-				if (
-					await this.$confirm(
-						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
-							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
-								确认要关闭页面吗?
-							</h1>
-							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
-								确定关闭将不保留编辑内容
-							</p>
-						</div>,
-						{
-							confirmButtonText: '确 定',
-							cancelButtonText: '取 消',
-							type: 'warning',
-						}
-					)
-				) {
-					this.handleCancel();
-				}
-			} catch (err) {
-				return false;
-			}
-		},
-
 		handleSearchBarBtnClick(btn) {
 			console.log('btn', btn);
 			switch (btn.btnName) {