fix some bugs

src/components/base-dialog/addOrUpdate/index.vue

@@ -147,13 +147,6 @@ export default {
 	components: { AttrForm },
 	props: {
 		configs: {
-			/**
-			 * TODO: 定义及使用方式，应改用README.md文件记录
-			 * type: 'dialog' | 'drawer' | 'page'
-			 * fields: Array<string|object>
-			 * - fields.object: { name, type: 'number'|'textarea'|'select'|'date'|.., required: boolean,  validator: boolean(是否需要验证), [options]: any[], api: string(自动获取数据的接口，一般为getcode接口)}
-			 * operations: Array[object], 操作名和对应的接口地址，还有permission(如，sys:dict:update)
-			 */
 			type: Object,
 			default: () => ({}) // 此处省去类型检查，使用者自行注意就好
 		}
@@ -533,7 +526,7 @@ export default {
 					}
 					break
 				case 'cancel':
-					this.visible = false
+					this.handleClose()
 				// add more..
 			}
 		},

src/views/main-navbar.vue

@@ -1,36 +1,20 @@
 <template>
-	<nav
+	<nav class="aui-navbar" :class="`aui-navbar--${$store.state.navbarLayoutType}`">
-		class="aui-navbar"
-		:class="`aui-navbar--${$store.state.navbarLayoutType}`"
-	>
 		<div class="aui-navbar__header">
 			<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
-				<a class="aui-navbar__brand-lg" href="javascript:;">{{
+				<a class="aui-navbar__brand-lg" href="javascript:;">{{ $t('brand.lg') }}</a>
-					$t('brand.lg')
+				<a class="aui-navbar__brand-mini" href="javascript:;">{{ $t('brand.mini') }}</a>
-				}}</a>
-				<a class="aui-navbar__brand-mini" href="javascript:;">{{
-					$t('brand.mini')
-				}}</a>
 			</h1>
 		</div>
 		<div class="aui-navbar__body">
 			<el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
-				<el-menu-item
+				<el-menu-item index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
-					index="1"
+					<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true">
-					@click="$store.state.sidebarFold = !$store.state.sidebarFold"
-				>
-					<svg
-						class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
-						aria-hidden="true"
-					>
 						<use xlink:href="#icon-outdent"></use>
 					</svg>
 				</el-menu-item>
 				<el-menu-item index="2" @click="refresh()">
-					<svg
+					<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh" aria-hidden="true">
-						class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh"
-						aria-hidden="true"
-					>
 						<use xlink:href="#icon-sync"></use>
 					</svg>
 				</el-menu-item>
@@ -47,11 +31,7 @@
 					</a>
 				</el-menu-item> -->
 				<el-menu-item index="3">
-					<el-dropdown
+					<el-dropdown placement="bottom" :show-timeout="0" @command="handleCommand">
-						placement="bottom"
-						:show-timeout="0"
-						@command="handleCommand"
-					>
 						<span class="el-dropdown-link">
 							<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
 								<use xlink:href="#icon-earth"></use>
@@ -59,12 +39,8 @@
 							<!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
 						</span>
 						<el-dropdown-menu slot="dropdown">
-							<el-dropdown-item :disabled="getLang() === 'zh-CN'" command="toCN"
+							<el-dropdown-item :disabled="getLang() === 'zh-CN'" command="toCN">中文</el-dropdown-item>
-								>中文</el-dropdown-item
+							<el-dropdown-item :disabled="getLang() === 'en'" command="toEN">En</el-dropdown-item>
-							>
-							<el-dropdown-item :disabled="getLang() === 'en'" command="toEN"
-								>En</el-dropdown-item
-							>
 						</el-dropdown-menu>
 					</el-dropdown>
 				</el-menu-item>
@@ -81,22 +57,15 @@
 							<i class="el-icon-arrow-down"></i>
 						</span>
 						<el-dropdown-menu slot="dropdown">
-							<el-dropdown-item @click.native="updatePasswordHandle()">{{
+							<el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
-								$t('updatePassword.title')
+							<el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
-							}}</el-dropdown-item>
-							<el-dropdown-item @click.native="logoutHandle()">{{
-								$t('logout')
-							}}</el-dropdown-item>
 						</el-dropdown-menu>
 					</el-dropdown>
 				</el-menu-item>
 			</el-menu>
 		</div>
 		<!-- 弹窗, 修改密码 -->
-		<update-password
+		<update-password v-if="updatePasswordVisible" ref="updatePassword"></update-password>
-			v-if="updatePasswordVisible"
-			ref="updatePassword"
-		></update-password>
 	</nav>
 </template>
 <script>
@@ -128,11 +97,11 @@ export default {
 					this.$root.$i18n.locale = 'zh-CN'
 					window.navigator.language = 'zh-cn'
 					break
-					case 'toEN':
+				case 'toEN':
-						console.log('root', this.$root.$i18n.locale)
+					console.log('root', this.$root.$i18n.locale)
-						this.$root.$i18n.locale = 'en'
+					this.$root.$i18n.locale = 'en'
-						location.reload()
+					location.reload()
-						window.navigator.language = 'en-US'
+					window.navigator.language = 'en-US'
 					break
 			}
 		},
@@ -156,15 +125,11 @@ export default {
 		},
 		// 退出
 		logoutHandle() {
-			this.$confirm(
+			this.$confirm(this.$t('prompt.info', { handle: this.$t('logout') }), this.$t('prompt.title'), {
-				this.$t('prompt.info', { handle: this.$t('logout') }),
+				confirmButtonText: this.$t('confirm'),
-				this.$t('prompt.title'),
+				cancelButtonText: this.$t('cancel'),
-				{
+				type: 'warning'
-					confirmButtonText: this.$t('confirm'),
+			})
-					cancelButtonText: this.$t('cancel'),
-					type: 'warning'
-				}
-			)
 				.then(() => {
 					this.$http
 						.post(this.$http.adornUrl('/logout'))

src/views/modules/job/schedule-add-or-update.vue

@@ -58,6 +58,12 @@ export default {
     }
   },
   methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
     init () {
       this.visible = true
       this.$nextTick(() => {

src/views/modules/job/schedule-log.vue

@@ -56,6 +56,12 @@ export default {
     }
   },
   methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
     init () {
       this.visible = true
       this.getDataList()

src/views/modules/job/schedule.vue

@@ -97,6 +97,12 @@ export default {
     Log
   },
   methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
     // 暂停
     pauseHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {

src/views/modules/monitoring/equipment.vue

@@ -30,7 +30,14 @@
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @select-change="handleDialogSelectChange" />
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:configs="addOrUpdateConfigs"
+			@refreshDataList="getDataList"
+			@select-change="handleDialogSelectChange"
+			@destory-dialog="handleDestroyDialog"
+		/>
 	</div>
 </template>
 
@@ -297,6 +304,12 @@ export default {
 		this.getTypeList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取产线列表，用于刷新工段列表
 		getPlList() {
 			this.$http({

src/views/modules/monitoring/equipmentAlarmLog.vue

@@ -77,6 +77,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentCurrentState.vue

@@ -29,7 +29,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -128,6 +128,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 设备
 		getEqList() {
 			this.$http({

src/views/modules/monitoring/equipmentFile.vue

@@ -80,6 +80,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentGroup.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -86,6 +86,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.addOrUpdateVisible = false

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -44,7 +44,7 @@
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -125,6 +125,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取字典数据
 		getDictData() {
 			this.initDictList(Object.entries(dictEntries).map(([_, item]) => item.value))

src/views/modules/monitoring/equipmentHistoricalParameters.vue

@@ -40,6 +40,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentPlc.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -106,6 +106,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		//handleOperations
 		handleOperations({ type, data: id }) {
 			switch (type) {

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -23,7 +23,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -141,6 +141,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 设备列表
 		getEqList() {
 			this.$http({

src/views/modules/monitoring/equipmentPlcParam.vue

@@ -79,6 +79,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentQuantity.vue

@@ -85,6 +85,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentStatusLog.vue

@@ -81,6 +81,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentType.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -106,6 +106,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取设备类型树形数据
 		getTreeEquipmentType() {
 			this.$http({

src/views/modules/monitoring/equipmentTypeFile.vue

@@ -81,6 +81,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentattr.vue

@@ -79,6 +79,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/factory.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -99,6 +99,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.addOrUpdateVisible = false

src/views/modules/monitoring/product.vue

@@ -12,7 +12,15 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table
+			:page="pageIndex"
+			:size="pageSize"
+			:data="dataList"
+			:table-head-configs="tableConfigs"
+			:max-height="calcMaxHeight(8)"
+			@operate-event="handleOperations"
+			@refreshDataList="getDataList"
+		/>
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -25,7 +33,7 @@
 		></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
 		<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
-		<base-dialog v-if="showbasedialog" ref="basedialog" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" />
+		<base-dialog v-if="showbasedialog" ref="basedialog" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -171,7 +179,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
-		//
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.showbasedialog = false
+			}, /** after dialog animated */ 200);
+		},
 		addOrEdit(id) {
 			this.showbasedialog = true
 			this.$nextTick(() => {

src/views/modules/monitoring/productArrt.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" :configs="addOrUpdateConfigs" ref="addOrUpdate" @refreshDataList="getDataList" @destroy-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" :configs="addOrUpdateConfigs" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -111,6 +111,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible = false
+			}, /** after dialog animated */ 200)
+		},
 		// 获取产品列表
 		getProductList() {
 			this.$http({

src/views/modules/monitoring/productionLine.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -111,6 +111,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取工厂列表
 		getFactoryList() {
 			this.$http.get(this.$http.adornUrl('/monitoring/factory/list')).then(({ data: res }) => {

src/views/modules/monitoring/productionLineRecSch.vue

@@ -72,6 +72,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -53,8 +53,8 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/qualityInspectionDet',
 	fields: [
-		{ name: 'typeId', label: i18n.t('inspect.type'), type: 'select', options: [] },
+		{ name: 'typeId', label: i18n.t('inspect.type'), required: true, type: 'select', options: [] },
-		{ name: 'content', label: i18n.t('inspect.det') },
+		{ name: 'content', label: i18n.t('inspect.det'), required: true },
 		{ name: 'code', label: i18n.t('inspect.detcode'), api: '/monitoring/qualityInspectionDet/getCode' },
 		'remark'
 	],
@@ -92,6 +92,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取产检测类型列表
 		getInspectionTypeList() {
 			this.$http({

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -29,7 +29,7 @@
 			ref="addOrUpdate"
 			:configs="addOrUpdateConfigs"
 			@refreshDataList="getDataList"
-			@destory-dialog="addOrUpdateVisible = false"
+			@destory-dialog="handleDestroyDialog"
 			@select-change="handleSelectChange"
 		/>
 	</div>
@@ -124,6 +124,12 @@ export default {
 		this.getProductLines()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// handle
 		async handleSelectChange({ name, id }) {
 			if (name === 'productionId') {

src/views/modules/monitoring/qualityInspectionType.vue

@@ -10,7 +10,15 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table
+			:page="pageIndex"
+			:size="pageSize"
+			:data="dataList"
+			:table-head-configs="tableConfigs"
+			:max-height="calcMaxHeight(8)"
+			@operate-event="handleOperations"
+			@refreshDataList="getDataList"
+		/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -22,7 +30,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -42,7 +50,7 @@ const tableConfigs = [
 	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('inspect.typename') },
-	{ prop: 'code', name: i18n.t('inspect.typename') },
+	{ prop: 'code', name: i18n.t('inspect.typecode') },
 	{ prop: 'remark', name: i18n.t('remark') },
 	{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
@@ -50,7 +58,11 @@ const tableConfigs = [
 const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/qualityInspectionType',
-	fields: [{ name: 'name', label: i18n.t('inspect.type') }, { name: 'code', label: i18n.t('inspect.typename'), api: '/monitoring/qualityInspectionType/getCode' }, 'remark'],
+	fields: [
+		{ name: 'name', label: i18n.t('inspect.type'), required: true },
+		{ name: 'code', label: i18n.t('inspect.typecode'), api: '/monitoring/qualityInspectionType/getCode' },
+		'remark'
+	],
 	operations: [
 		{ name: 'cancel', showAlways: true },
 		{ name: 'save', url: '/monitoring/qualityInspectionType', permission: 'monitoring:qualityinspectiontype:save', showOnEdit: false },
@@ -84,6 +96,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible = false
+			}, /** after dialog animated */ 200)
+		},
 		// 获取数据列表
 		getDataList() {
 			this.addOrUpdateVisible = false

src/views/modules/monitoring/reportCategory.vue

@@ -23,7 +23,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -83,6 +83,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		handleOperations({ type, data: id }) {
 			switch (type) {
 				case 'edit':

src/views/modules/monitoring/reportDetail.vue

@@ -24,7 +24,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -55,6 +55,12 @@ const CategoryList = {
 		this.pickedId = this.injectData[this.injectData.head.prop]
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		handleChange(id) {
 			this.pickedId = id
 			this.$emit('emit-data', {
@@ -112,6 +118,12 @@ export default {
 	},
 	computed: {},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		getAllCategories() {
 			axios.get(axios.adornUrl('/monitoring/reportSheetCategory/page')).then(({ data: res }) => {
 				if (res.data && res.data.list) {

src/views/modules/monitoring/reportSheet-add-or-update.vue

@@ -106,7 +106,7 @@ export default {
 			}
 		}
 	},
-	methods: {
+	methods: { 
 		init(id) {
 			this.dataForm.id = id || 0
 			this.visible = true

src/views/modules/monitoring/reportSheet.vue

@@ -73,6 +73,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/reportSheetCategory-add-or-update.vue

@@ -91,7 +91,7 @@ export default {
 			}
 		}
 	},
-	methods: {
+	methods: { 
 		init(id) {
 			this.dataForm.id = id || 0
 			this.visible = true

src/views/modules/monitoring/reportSheetCategory.vue

@@ -67,6 +67,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/sysfile.vue

@@ -78,6 +78,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/sysfileType.vue

@@ -75,6 +75,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/workShopSection.vue

@@ -22,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -96,6 +96,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取产线列表
 		getProductLine() {
 			this.$http.get(this.$http.adornUrl('/monitoring/productionLine/list')).then(({ data: res }) => {

src/views/modules/monitoring/workShopSectionEquipment.vue

@@ -68,6 +68,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/workshopSectionDialog.vue

@@ -123,7 +123,7 @@ export default {
 	mounted() {
 		this.getLineList()
 	},
-	methods: {
+	methods: { 
 		init(id) {
 			this.dataForm = {
 				id: null,

src/views/modules/oss/oss-config.vue

@@ -152,6 +152,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/oss/oss-upload.vue

@@ -20,6 +20,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			// this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`

src/views/modules/oss/oss.vue

@@ -64,6 +64,12 @@ export default {
 		Upload
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 云存储配置
 		configHandle() {
 			this.configVisible = true

src/views/modules/sys/dept-add-or-update.vue

@@ -65,6 +65,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/sys/dict-data-add-or-update.vue

@@ -47,6 +47,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/sys/dict-data.vue

@@ -77,6 +77,12 @@ export default {
 		this.getDataList()
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 新增 / 修改
 		addOrUpdateHandle(id) {
 			this.addOrUpdateVisible = true

src/views/modules/sys/dict-type-add-or-update.vue

@@ -46,6 +46,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/sys/dict-type.vue

@@ -87,6 +87,12 @@ export default {
 		IconsDialog
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		//
 		showIcons() {
 			this.displayIcon = true

src/views/modules/sys/log-error.vue

@@ -54,6 +54,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		// 异常信息
 		infoHandle(info) {
 			this.$alert(info, this.$t('logError.errorInfo'), {

src/views/modules/sys/menu-add-or-update.vue

@@ -95,6 +95,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/sys/params-add-or-update.vue

@@ -41,6 +41,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/sys/role-add-or-update.vue

@@ -52,6 +52,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.$nextTick(() => {

src/views/modules/sys/user-add-or-update.vue

@@ -111,6 +111,12 @@ export default {
 		}
 	},
 	methods: {
+		// destroy dialog
+		handleDestroyDialog() {
+			setTimeout(() => {
+				this.addOrUpdateVisible= false
+			}, /** after dialog animated */ 200);
+		},
 		init() {
 			this.visible = true
 			this.dataForm.deptId = ''

src/views/pages/login.vue

@@ -93,9 +93,9 @@ export default {
 					this.$root.$i18n.locale = 'zh-CN'
 					// location.reload()
 					break
-					case 'en':
+				case 'en':
-						this.$root.$i18n.locale = 'en'
+					this.$root.$i18n.locale = 'en'
-						location.reload()
+					location.reload()
 					break
 			}
 		},