Merge pull request 'lb' (#6) from lb into develop

Reviewed-on: #6

AddOrUpdateConfig.md

@@ -2,82 +2,6 @@
 
 > 通过传入合理的配置项来使用 addOrUpdate Dialog
 
-## 用途
-
-通过给对话框传递配置项，并自动根据这些配置项来初始化对话框的功能
-
-## props
-
-- configs 对象
-
-```
-<my-dialog :configs="SomeConfigs" ... />
-
-
-type Operation = {
-		name: 'add' | 'edit' | 'detail' | 'delete' | ...,
-		url: string, /** 该操作需要的接口地址，如删除接口 */
-		showAlways: boolean,
-		showOnEdit: boolean,
-		permission: string,
-	}
-
-type SubTableConfig = {
-		[_:string]: any,
-		title: string, /** 表格的名称 */
-		url: string, /** 涉及的接口 */
-		tableConfigs: {
-			[_:string]: any,
-			type?: 'index' | ...,
-			prop: string,
-			name: string,
-			rules?: any[],
-			fixed?: string,
-			width?: string,
-			subcomponent: VueComponent,
-			options: any[],
-			formField: boolean, /** 是否在新增编辑子表单里出现该字段 */
-		}[], /** 表格prop配置数组，参考 components/base-table 组件和 element-ui 文档 */
-	}
-
-type ExtraComponent = {
-		name: string,
-		label: string,
-		hasModel: boolean, /** 是否需要为该组件设置 v-model */
-		component: VueComponent, /** 动态加载的 vue 组件 */
-		props: {
-			[_:string]: string | object
-			extraParams?: { /** 上传组件使用 */
-				typeCode: string
-			}
-		}[]
-	}
-
-type Field = {
-	[_:string]: string | boolean | object | object[],
-	name: string,
-	type?: 'input' | 'select' | ...,
-	options?: any[], /** 设置 type 为 select 时的选项数据 */
-	label?: string, /** 没有时会用 name 替代 */
-	placeholder?: string, /** 没有时会生成默认占位符 */
-	api?: string, /** 如果有该字段，就自动从api地址获取数据并填充到对应的输入框里，一般为 getCode 的接口 */
-	relatedField?: string, /** 关联字段，当设置此字段时，意味着需要在对话框组件上监听 select-change 事件，并当该字段数据被改变时刷新 relatedField 的列表，一般是像选择产线时更新工段列表这样的场景使用 */,
-	required?: boolean, /** 验证规则的简写，只需要限制必填项时，不需要其他验证规则时使用 */
-	rules?: object[], /** 规则设置参考 element-ui 的表单验证配置 */
-}
-
-type Configs = {
-	type: 'dialog',
-	infoUrl: string, /** 编辑时获取信息的接口地址 */
-	fields: Field[],
-	extraComponents?: ExtraComponent[],
-	subtable?: SubTableConfig[],
-	operations?: Operation[]
-}
-
-
-```
-
 ## 示例
 
 ```js
@@ -155,7 +79,7 @@ const addOrUpdateConfigs = {
 }
 ```
 
-## 配置项解释
+## 配置项
 
 <br>
 
@@ -212,7 +136,6 @@ const addOrUpdateConfigs = {
 含义：有些对话框里需要额外的表格来展示更深层次的数据，如“产品属性”
 类型：object
 选项：
-
 - title, 内嵌表格的标题
 - url, 内嵌表格的数据地址
 - tableConfigs，内嵌表格的配置选项
@@ -231,14 +154,13 @@ const addOrUpdateConfigs = {
       - 值：`edit` | `delete` | `detail`，需要其他可自行添加（修改 base-table 组件）
 
 ### extraComponents
-
 含义: 需要在对话框里使用的自定义组件列表
 类型: Array<object>
 对象选项：
+ - name: 该组件对应的 dataForm 字段（需要参照后端文档来指定）
+ - hasModel: boolean, 上传组件一般设置为 false，设置是否和 dataForm 关联
+ - label
+ - fieldType: 设置该组件的数据将以什么数据类型形式来保存
+ - component: 组件
+ - props 传给组件的配置
  
-- name: 该组件对应的 dataForm 字段（需要参照后端文档来指定）
-- hasModel: boolean, 上传组件一般设置为 false，设置是否和 dataForm 关联
-- label
-- fieldType: 设置该组件的数据将以什么数据类型形式来保存
-- component: 组件
-- props 传给组件的配置

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

@@ -127,11 +127,18 @@ export default {
 		}
 	},
 	methods: {
+		/** filter tableConfigs */
 		filterTableConfigs() {
-			if (this.isDetail) {
+			// return this.tableConfigs.map(item => {
-				/** 如果是查看详情，就屏蔽操作列 */
+			// 	const {prop, name, filter} = item
-				return this.tableConfigs.filter(opt => opt.prop !== 'operations')
+			// 	const newConfigs = {prop,name,filter}
-			}
+			// 	if (item.type) newConfigs.type = item.type
+			// 	if (item.fixed) newConfigs.fixed = item.fixed
+			// 	if (item.width) newConfigs.width = item.width
+			// 	if (item.subcomponent) newConfigs.subcomponent = item.subcomponent
+			// 	if (item.options) newConfigs.options = item.options
+			// 	return newConfigs
+			// })
 			return this.tableConfigs
 		},
 		/** init dataform */

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

@@ -38,7 +38,7 @@
 								:disabled="isDetail"
 								@change="emitSelectChange(configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name, $event)"
 							>
-								<el-option v-for="opt in configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options" :key="opt.label + Math.random()" :label="opt.label" :value="opt.value" />
+								<el-option v-for="opt in configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options" :key="opt.label+Math.random()" :label="opt.label" :value="opt.value" />
 							</el-select>
 							<el-switch v-if="getType(n, c) === 'switch'" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]" :disabled="isDetail" />
 							<el-cascader
@@ -47,7 +47,6 @@
 								:options="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options"
 								:props="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].props"
 								:disabled="isDetail"
-								clearable
 							/>
 							<el-time-select v-if="getType(n, c) === 'time'" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]" :disabled="isDetail" />
 							<el-date-picker
@@ -114,7 +113,6 @@
 import CKEditor from 'ckeditor4-vue'
 import AttrForm from '../AttrForm'
 import { pick } from 'lodash/object'
-import { pick as __pick } from '@/utils/filters'
 import i18n from '@/i18n'
 // 标题 for i18n
 const title = {
@@ -149,6 +147,13 @@ 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: () => ({}) // 此处省去类型检查，使用者自行注意就好
 		}
@@ -256,27 +261,11 @@ export default {
 					})
 				} // end if (item.api)
 
-				// 如果有 relatedField，就需要在当前item的数据加载后，刷新 relatedField 的列表
-				if (item.relatedField) {
-					this.$watch(
-						function() {
-							return this.dataForm[item.name]
-						},
-						function(val, old) {
-							if (val && val !== old) {
-								this.$emit('select-change', { name: item.name, id: val })
-							}
-						},
-						{ deep: true, immediate: true }
-					)
-				}
-
 				if (item.required) {
 					const requiredRule = {
 						required: true,
 						message: i18n.t('validate.required'),
-						// trigger: 'change'
+						trigger: 'change'
-						trigger: 'blur'
 					}
 					/** 检查是否已经存在该字段的规则 */
 					const exists = this.dataFormRules[item.name] || null
@@ -319,8 +308,7 @@ export default {
 			/** 检查是否需要额外的组件 */
 			this.configs.extraComponents &&
 				this.configs.extraComponents.forEach(item => {
-					// if (Object.hasOwn(this.dataForm, [item.name])) {
+					if (Object.hasOwn(this.dataForm, [item.name])) {
-					if (this.dataForm.hasOwnProperty(item.name)) {
 						return
 					} else {
 						this.$set(this.dataForm, [item.name], calDefault(item.fieldType))
@@ -347,11 +335,6 @@ export default {
 		},
 
 		getPlaceholder(n, c) {
-			if (this.isDetail) {
-				/** 如果是详情，就不展示 提示文本 */
-				return ''
-			}
-
 			const opt = this.configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]
 			if (opt) {
 				// if opt is valid
@@ -400,10 +383,9 @@ export default {
 					}).then(({ data: res }) => {
 						if (res && res.code === 0) {
 							const dataFormKeys = Object.keys(this.dataForm)
-							console.log('keys ===> ', dataFormKeys)
 							// console.log('data form keys: ', dataFormKeys, pick(res.data, dataFormKeys))
-							this.dataForm = __pick(res.data, dataFormKeys)
+							this.dataForm = pick(res.data, dataFormKeys)
-							console.log('pick(res.data, dataFormKeys) ===> ', __pick(res.data, dataFormKeys))
+
 							// LABEL: FILE_RELATED
 							/** 对文件下载进行分流 */
 							this.fileList = {}
@@ -412,8 +394,7 @@ export default {
 								this.dataForm.files.forEach(file => {
 									// const fileName = file.fileUrl.split('/').pop()
 									/** [1] 处理 fileList */
-									// if (Object.hasOwn(this.fileList, file.typeCode)) {
+									if (Object.hasOwn(this.fileList, file.typeCode)) {
-									if (this.fileList.hasOwnProperty(file.typeCode)) {
 										/** 已存在 */
 										// this.fileList[file.typeCode].push({ id: file.id, name: fileName, typeCode: file.typeCode })
 										this.fileList[file.typeCode].push(file)
@@ -423,8 +404,7 @@ export default {
 									}
 
 									/** [2] 处理 fileForm */
-									// if (Object.hasOwn(this.fileForm, file.typeCode)) {
+									if (Object.hasOwn(this.fileForm, file.typeCode)) {
-									if (this.fileForm.hasOwnProperty(file.typeCode)) {
 										this.fileForm[file.typeCode].push(file.id)
 									} else {
 										this.fileForm[file.typeCode] = [file.id]
@@ -445,17 +425,12 @@ export default {
 								})
 								// console.log('create new, dataform', JSON.stringify(this.dataForm))
 							}
-							this.shouldWait = null
 						})
 				}
 			})
 		},
 
 		emitSelectChange(name, id) {
-			const currentField = this.configs.fields.find(item => item.name === name)
-			if (currentField.relatedField) {
-				this.dataForm[currentField.relatedField] = null
-			}
 			this.$emit('select-change', { name, id })
 		},
 
@@ -535,7 +510,7 @@ export default {
 					}
 					break
 				case 'cancel':
-					this.handleClose()
+					this.visible = false
 				// add more..
 			}
 		},

src/components/base-upload/index.vue

@@ -58,14 +58,14 @@ export default {
 
 		this.$watch('uploaderInjectFileList', function(val) {
 			if (val && val.length) {
-				// console.log('this.uploaderInjectFileList', this.uploaderInjectFileList)
+				console.log('this.uploaderInjectFileList', this.uploaderInjectFileList)
 				/** uploaderInjectFileList 里关于文件的信息比较全，需要手动过滤一下 */
 				this.fileList = val.map(item => {
 					const name = item.fileUrl.split('/').pop()
 					return { ...pick(item, ['id', 'fileName', 'typeCode']), name }
 				})
 			}
-			// console.log('fillist: ', this.fileList)
+			console.log('fillist: ', this.fileList)
 		})
 
 		// if (this.parentDataForm) {
@@ -111,7 +111,7 @@ export default {
 
 		/** 图片验证，由配置文件开启 */
 		validateImage(file) {
-			// console.log('[*] 验证图片')
+			console.log('[*] 验证图片')
 
 			const isRightSize = file.size / 1024 / 1024 < 2
 			if (!isRightSize) {
@@ -146,10 +146,10 @@ export default {
 				responseType: 'blob'
 			}).then(({ data: res }) => {
 				const blob = new Blob([res])
-				// console.log('blob', blob)
+				console.log('blob', blob)
 				if ('download' in document.createElement('a')) {
 					const alink = document.createElement('a')
-					// console.log('filename: ', fileName)
+					console.log('filename: ', fileName)
 					alink.download = fileName
 					alink.style.display = 'none'
 					alink.target = '_blank'

src/i18n/en.js

@@ -35,7 +35,6 @@ t.routes['报表设计'] = 'Report Design'
 t.routes['报表预览'] = 'Report Preview'
 t.routes['质量检测基础数据'] = 'Quality Inspection Basic Data'
 t.routes['当前检测数据'] = 'Current Inspection Data'
-t.routes['检测统计数据'] = 'Statistics Data'
 t.routes['质量检查信息记录'] = 'Quality Inspection Records'
 t.routes['用户管理'] = 'User Management'
 t.routes['部门管理'] = 'Department Management'
@@ -62,16 +61,8 @@ t.routes['设备分组报警信息'] = 'Equipment Group Alarm'
 t.routes['设备历史参数'] = 'Equipment Historical Parameters'
 t.routes['质量检测类型'] = 'Quality Inpection Types'
 t.routes['质量检测信息'] = 'Quality Inpection Details'
-t.routes['安灯检测盒'] = 'Andeng inspection box'
 
 
-t.andeng = {}
-t.andeng.inspectContent = 'Inspection Content'
-t.andeng.btnVal = 'Button Value'
-t.andeng.btnBoxModel = 'Button Box Model'
-
-
-t.dictValueList = 'View Details'
 t.save = 'Save'
 t.add = 'Add'
 t.delete = 'Delete'
@@ -166,10 +157,6 @@ t.all = 'All'
 t.reset = 'Reset'
 t.preview = 'Preview'
 t.design = 'Design'
-t.timetype = 'Time Type'
-t.reftimerange = 'By time range'
-t.refdate = 'By date'
-t.hour = 'Hour(s)'
 
 t.errors = {}
 t.errors.nosection = 'There is no sections on this product line.'
@@ -182,10 +169,9 @@ t.hints.select = 'Please select '
 t.hints.date = 'Please select date'
 t.hints.checktime = 'Please select inspection time'
 t.hints.number = 'Please input correct number'
-t.hints.integer = 'Please input correct integer'
 t.hints.addr = 'Please input address'
-t.hints.upload2m = 'File size cannot be larger than 2MB (2048KB)'
+t.hints.upload2m = 'File size cannot be larger than 2mb (2048kb)'
-t.hints.upload2mPic = 'Image files only. File size cannot be larger than 2MB (2048KB)'
+t.hints.upload2mPic = 'Image files only. File size cannot be larger than 2mb (2048kb)'
 
 t.factory = {}
 t.factory.title = 'Factory'
@@ -223,9 +209,6 @@ t.alarm.content = 'Alarm Content'
 t.alarm.source = 'Alarm Source'
 t.alarm.det = 'Alarm Details'
 t.alarm.externalCode = 'External Code'
-t.alarm.description = 'Description'
-t.alarm.remark = 'Remark'
-
 
 t.report = {}
 t.report.name = 'Report Name'
@@ -245,7 +228,7 @@ t.inspect.typetotal = 'Total Inspection Types'
 t.inspect.typename = 'Inspection Type'
 t.inspect.typecode = 'Inspection Code'
 t.inspect.ioTotal = 'Data of input/output and total inspections'
-t.inspect.plTotal = 'Inspection contents in each line'
+t.inspect.plTotal = 'Inspection types per line'
 t.inspect.inTotal = 'Up Sum'
 t.inspect.outTotal = 'Down Sum'
 t.inspect.checkTotal = 'Total Inspections'
@@ -264,17 +247,17 @@ t.realtime.num = 'scrap quantity'
 t.realtime.rate = 'scrap rate'
 t.realtime.total = 'total production'
 t.realtime.goodrate = 'Passed Rate'
-t.realtime.runState = 'running state'
+t.realtime.runState = '是否运行'
-t.realtime.state = 'status'
+t.realtime.state = '状态'
-t.realtime.hasFault = 'malfunction'
+t.realtime.hasFault = '是否故障'
-t.realtime.recentParamValue = 'recent parameters'
+t.realtime.recentParamValue = '参数近期值'
-t.realtime.view = 'view'
+t.realtime.view = '查看'
-t.realtime.input = 'input' //'投入数'
+t.realtime.input = '投入数'
-t.realtime.output = 'output' //'产出数'
+t.realtime.output = '产出数'
-t.realtime.eqName = 'Equipment name'
+t.realtime.eqName = '设备名称'
-t.realtime.eqCode = 'Equipment cdoe'
+t.realtime.eqCode = '设备编码'
-t.realtime.productionSnapshotTime = 'production recording time' // '生产量记录时间'
+t.realtime.productionSnapshotTime = '生产量记录时间'
-t.realtime.statusSnapshotTime = 'status recording time' // '状态记录时间'
+t.realtime.statusSnapshotTime = '状态记录时间'
 t.realtime.refresh = 'Refresh data...'
 
 
@@ -328,40 +311,6 @@ t.eq.port = 'Port'
 t.eq.type = 'Type'
 t.eq.typecode = 'Type Code'
 t.eq.parent = 'Parent'
-t.eq.mtbf = 'Mean time between failures[MTBF] (h)'
-t.eq.mttr = 'Mean time to repair[MTTR] (h)'
-t.eq.efficienttimeh = 'Working time(h)'
-t.eq.shutdowntimeh = 'Off time(h)'
-t.eq.worktimeh = 'Working time(h)'
-t.eq.downtimeh = 'Malfunction duration(h)'
-t.eq.stoptimeh = 'Halt duration(h)'
-t.eq.worktime = 'Functioning duration'
-t.eq.stoptime = 'Halt duration'
-t.eq.downtime = 'Malfunction duration'
-t.eq.downcount = 'Malfunction counts'
-t.eq.downrate = 'Malfunction rates'
-t.eq.stoplost = 'Lost'
-t.eq.ratio = 'percentage'
-t.eq.time = 'time'
-t.eq.timetrend = 'trend'
-t.eq.nogap = 'no interval'
-t.eq.monthgap = 'by month'
-t.eq.daygap = 'by day'
-t.eq.weekgap = 'by week'
-t.eq.hourgap = 'by hour'
-t.eq.workdurationratio = 'Functioning duration ratio' // '工作时长比率'
-t.eq.stopdurationratio = 'Halt duration ratio' // '停机时长比率'
-t.eq.stopratio = 'Halt ratio' // '停机比率'
-t.eq.downdurationratio = 'Malfunction duration ratio' // '故障时长比率'
-t.eq.speedefficiency = 'Speed launch rate' //'速度开动率'
-t.eq.speedlost = 'Speed lost'
-t.eq.timeefficiency = 'Time launch rate' //'时间开动率'
-t.eq.year = 'year'
-t.eq.month = 'month'
-t.eq.realyield = 'Actual processing speed'
-t.eq.designyield = 'Theoretical processing speed'
-t.eq.viewtrend = 'View Trends'
-
 
 
 t.pl = {}
@@ -374,7 +323,6 @@ t.pl.belong = 'Product Line'
 t.pl.tvalue = 'TT Value'
 t.pl.factoryHints = 'Please select a factory'
 
-
 t.prompt = {}
 t.prompt.title = 'Prompt'
 t.prompt.info = 'Are you sure to {handle}?'
@@ -382,7 +330,6 @@ t.prompt.sure = 'Are you sure to delete this record?'
 t.prompt.success = 'success'
 t.prompt.failed = 'failed'
 t.prompt.deleteBatch = 'Please choose items to delete.'
-t.prompt.month = 'Please choose month'
 
 t.validate = {}
 t.validate.required = 'This is required.'
@@ -398,8 +345,6 @@ t.datePicker = {}
 t.datePicker.range = 'to'
 t.datePicker.start = 'Start Time'
 t.datePicker.end = 'End Time'
-t.datePicker.starttime = 'Start Time'
-t.datePicker.endtime = 'End Time'
 
 t.fullscreen = {}
 t.fullscreen.prompt = 'This operation is not supported by your browser.'

src/i18n/zh-CN.js

@@ -36,7 +36,6 @@ t.routes['报表设计'] = '报表设计'
 t.routes['报表预览'] = '报表预览'
 t.routes['质量检测基础数据'] = '质量检测基础数据'
 t.routes['当前检测数据'] = '当前检测数据'
-t.routes['检测统计数据'] = '检测统计数据'
 t.routes['质量检查信息记录'] = '质量检查信息记录'
 t.routes['用户管理'] = '用户管理'
 t.routes['部门管理'] = '部门管理'
@@ -63,15 +62,11 @@ t.routes['设备分组报警信息'] = '设备分组报警信息'
 t.routes['设备历史参数'] = '设备历史参数'
 t.routes['质量检测类型'] = '质量检测类型'
 t.routes['质量检测信息'] = '质量检测信息'
-t.routes['安灯检测盒'] = '安灯检测盒'
-
-t.andeng = {}
-t.andeng.inspectContent = '检测内容'
-t.andeng.btnVal = '按钮值'
-t.andeng.btnBoxModel = '按钮盒模式'
 
 
-t.dictValueList = '查看值列表'
+
+
+
 t.save = '保存'
 t.add = '新增' // 1
 t.delete = '删除' // 1
@@ -167,10 +162,6 @@ t.all = '全部'
 t.reset = '重置'
 t.preview = '预览'
 t.design = '设计'
-t.timetype = '时间类型'
-t.reftimerange = '按时间段'
-t.refdate = '按日期'
-t.hour = '小时'
 
 t.errors = {}
 t.errors.nosection = '该产线没有工段'
@@ -183,10 +174,9 @@ t.hints.select = '请选择'
 t.hints.date = '请选择日期'
 t.hints.checktime = '请选择检测时间'
 t.hints.number = '请输入正确的数值'
-t.hints.integer = '请输入正确的整数'
 t.hints.addr = '请输入地址'
-t.hints.upload2m = '上传文件大小不要超过 2MB (2048KB)'
+t.hints.upload2m = '上传文件大小不要超过 2mb (2048kb)'
-t.hints.upload2mPic = '上传图片文件，且大小不要超过 2MB (2048KB)'
+t.hints.upload2mPic = '上传图片文件，且大小不要超过 2mb (2048kb)'
 
 t.factory = {}
 t.factory.title = '工厂'
@@ -225,8 +215,6 @@ t.alarm.content = '报警内容'
 t.alarm.source = '报警来源'
 t.alarm.det = '报警详细内容'
 t.alarm.externalCode = '外部编码'
-t.alarm.description = '描述'
-t.alarm.remark = '备注'
 
 t.report = {}
 t.report.name = '报表名称'
@@ -246,7 +234,7 @@ t.inspect.typetotal = '检测类型总数'
 t.inspect.typename = '检测类型名称'
 t.inspect.typecode = '检测类型编码'
 t.inspect.ioTotal = '上下片及检测总数统计'
-t.inspect.plTotal = '各产线检测内容统计'
+t.inspect.plTotal = '各产线检测类型统计'
 t.inspect.inTotal = '上片总数'
 t.inspect.outTotal = '下片总数'
 t.inspect.checkTotal = '检测总数'
@@ -287,7 +275,7 @@ t.ws.code = '工段编码'
 t.ws.binded = '已绑定的设备'
 t.ws.unbind = '设备名称'
 t.ws.eqbindplaceholder = '选择一个设备进行绑定'
-t.ws.sort = '工段排序'
+t.ws.sort = '排序'
 t.ws.setorder = '请输入工段中设备的顺序'
 t.ws.bind = '绑定'
 t.ws.eqbind = '设备绑定'
@@ -329,39 +317,6 @@ t.eq.port = '端口'
 t.eq.type = '类型名称'
 t.eq.typecode = '类型编码'
 t.eq.parent = '父类'
-t.eq.mtbf = '平均故障间隔时间[MTBF] (h)'
-t.eq.mttr = '平均维修时间[MTTR] (h)'
-t.eq.efficienttimeh = '有效时间(h)'
-t.eq.shutdowntimeh = '关机时间(h)'
-t.eq.worktimeh = '工作时长(h)'
-t.eq.downtimeh = '故障时长(h)'
-t.eq.stoptimeh = '停机时长(h)'
-t.eq.worktime = '工作时长'
-t.eq.stoptime = '停机时长'
-t.eq.downtime = '故障时长'
-t.eq.downcount = '故障次数'
-t.eq.downrate = '故障比率'
-t.eq.stoplost = '中断损失'
-t.eq.ratio = '百分比'
-t.eq.time = '时间'
-t.eq.timetrend = '时间区间走势'
-t.eq.nogap = '无间隔'
-t.eq.monthgap = '按月'
-t.eq.daygap = '按天'
-t.eq.weekgap = '按周'
-t.eq.hourgap = '按小时'
-t.eq.workdurationratio = '工作时长比率'
-t.eq.stopdurationratio = '停机时长比率'
-t.eq.stopratio = '停机比率'
-t.eq.downdurationratio = '故障时长比率'
-t.eq.speedefficiency = '速度开动率'
-t.eq.speedlost = '速度损失'
-t.eq.timeefficiency = '时间开动率'
-t.eq.year='年'
-t.eq.month='月'
-t.eq.realyield = '实际加工速度'
-t.eq.designyield = '理论加工速度' 
-t.eq.viewtrend = '查看趋势' 
 
 
 t.pl = {}
@@ -381,7 +336,6 @@ t.prompt.sure = '确定删除这条记录吗?'
 t.prompt.success = '操作成功'
 t.prompt.failed = '操作失败'
 t.prompt.deleteBatch = '请选择删除项'
-t.prompt.month = '请选择月份'
 
 t.validate = {}
 t.validate.required = '必填项不能为空'
@@ -397,8 +351,6 @@ t.datePicker = {}
 t.datePicker.range = '至'
 t.datePicker.start = '开始日期'
 t.datePicker.end = '结束日期'
-t.datePicker.starttime = '开始时间'
-t.datePicker.endtime = '结束时间'
 
 t.fullscreen = {}
 t.fullscreen.prompt = '您的浏览器不支持此操作'

src/utils/filters.js

@@ -10,15 +10,3 @@ export const dictFilter = dictTypeId => {
 export const timeFilter = (val) => {
 	return moment(val).format('YYYY-MM-DD HH:mm:ss')
 }
-
-export const pick = (obj, paths) => {
-	let result = {}
-	paths.forEach(key => {
-		if (obj.hasOwnProperty(key)) {
-			result[key] = obj[key];
-		} else {
-			result[key] = null
-		}
-	})
-	return result
-}

src/utils/request.js

@@ -9,7 +9,6 @@ import merge from 'lodash/merge'
 const http = axios.create({
   // baseURL: window.SITE_CONFIG['apiURL'],
   baseURL: '/api',
-  // baseURL: '/yd-monitor',
   // baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor',
   timeout: 1000 * 180,
   withCredentials: true

src/views/main-navbar.vue

@@ -1,20 +1,36 @@
 <template>
-	<nav class="aui-navbar" :class="`aui-navbar--${$store.state.navbarLayoutType}`">
+	<nav
+		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:;">{{ $t('brand.lg') }}</a>
+				<a class="aui-navbar__brand-lg" href="javascript:;">{{
-				<a class="aui-navbar__brand-mini" href="javascript:;">{{ $t('brand.mini') }}</a>
+					$t('brand.lg')
+				}}</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 index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
+				<el-menu-item
-					<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true">
+					index="1"
+					@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 class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh" aria-hidden="true">
+					<svg
+						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>
@@ -31,7 +47,11 @@
 					</a>
 				</el-menu-item> -->
 				<el-menu-item index="3">
-					<el-dropdown placement="bottom" :show-timeout="0" @command="handleCommand">
+					<el-dropdown
+						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>
@@ -39,8 +59,12 @@
 							<!-- <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>
+							<el-dropdown-item :disabled="getLang() === 'zh-CN'" command="toCN"
-							<el-dropdown-item :disabled="getLang() === 'en'" command="toEN">En</el-dropdown-item>
+								>中文</el-dropdown-item
+							>
+							<el-dropdown-item :disabled="getLang() === 'en'" command="toEN"
+								>En</el-dropdown-item
+							>
 						</el-dropdown-menu>
 					</el-dropdown>
 				</el-menu-item>
@@ -57,15 +81,22 @@
 							<i class="el-icon-arrow-down"></i>
 						</span>
 						<el-dropdown-menu slot="dropdown">
-							<el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
+							<el-dropdown-item @click.native="updatePasswordHandle()">{{
-							<el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
+								$t('updatePassword.title')
+							}}</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 v-if="updatePasswordVisible" ref="updatePassword"></update-password>
+		<update-password
+			v-if="updatePasswordVisible"
+			ref="updatePassword"
+		></update-password>
 	</nav>
 </template>
 <script>
@@ -125,11 +156,15 @@ export default {
 		},
 		// 退出
 		logoutHandle() {
-			this.$confirm(this.$t('prompt.info', { handle: this.$t('logout') }), this.$t('prompt.title'), {
+			this.$confirm(
+				this.$t('prompt.info', { handle: this.$t('logout') }),
+				this.$t('prompt.title'),
+				{
 					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,12 +58,6 @@ 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,12 +56,6 @@ 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,12 +97,6 @@ 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

@@ -11,15 +11,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,14 +22,7 @@
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			:configs="addOrUpdateConfigs"
-			@refreshDataList="getDataList"
-			@select-change="handleDialogSelectChange"
-			@destory-dialog="handleDestroyDialog"
-		/>
 	</div>
 </template>
 
@@ -69,8 +54,6 @@ const tableConfigs = [
 	{ prop: 'groupName', name: i18n.t('eq.group') },
 	{ prop: 'enName', name: i18n.t('enname') },
 	{ prop: 'abbr', name: i18n.t('abbr') },
-	{ prop: 'lineName', name: i18n.t('pl.title') },
-	{ prop: 'sectionName', name: i18n.t('ws.title') },
 	{
 		prop: 'details',
 		name: i18n.t('detail'),
@@ -92,7 +75,7 @@ const addOrUpdateConfigs = {
 	infoUrl: '/monitoring/equipment',
 	fields: [
 		{ name: 'name', label: i18n.t('eq.name'), required: true },
-		{ name: 'code', label: i18n.t('eq.code'), required: true, api: '/monitoring/equipment/getCode' },
+		{ name: 'code', label: i18n.t('eq.code'), api: '/monitoring/equipment/getCode' },
 		{ name: 'enName', label: i18n.t('enname') },
 		{ name: 'abbr', label: i18n.t('abbr') },
 		{
@@ -102,27 +85,6 @@ const addOrUpdateConfigs = {
 			type: 'select',
 			options: []
 		},
-		{
-			name: 'lineId',
-			label: i18n.t('pl.title'),
-			required: true,
-			type: 'select',
-			options: [],
-			relatedField: 'sectionId' // 关联下面的id，在更换lineId时，会清空相应的sectionId选择结果
-		},
-		{
-			name: 'sectionId',
-			label: i18n.t('ws.title'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'sort',
-			label: i18n.t('ws.sort'),
-			type: 'number',
-			rules: [{ type: 'number', message: i18n.t('hints.number'), trigger: 'blur', transform: val => Number(val) }]
-		},
 		{
 			name: 'groupId',
 			label: i18n.t('eq.group'),
@@ -301,52 +263,9 @@ export default {
 		console.log('activated')
 		this.getDataList()
 		this.getGroupList()
-		this.getPlList()
 		this.getTypeList()
 	},
 	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible = false
-			}, /** after dialog animated */ 200)
-		},
-		// 获取产线列表，用于刷新工段列表
-		getPlList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/productionLine/list'),
-				method: 'get'
-			}).then(({ data: res }) => {
-				const plConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'lineId')
-				plConfig.options =
-					res.data?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取工段列表
-		getWsList(id) {
-			let params = {
-				page: 1,
-				limit: 999
-			}
-			if (id) {
-				params.lineId = id
-			}
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/workshopSection/page'),
-				method: 'get',
-				params: this.$http.adornParams(params)
-			}).then(({ data: res }) => {
-				const wsConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'sectionId')
-				wsConfig.options =
-					res.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
 		// 获取设备类型列表
 		getTypeList() {
 			this.$http({
@@ -424,13 +343,6 @@ export default {
 		selectionChangeHandle(val) {
 			this.dataListSelections = val
 		},
-		// 对话框里的某个选择改变了
-		handleDialogSelectChange({ name, id }) {
-			switch (name) {
-				case 'lineId':
-					this.getWsList(id)
-			}
-		},
 		handleOperations({ type, data: id }) {
 			switch (type) {
 				case 'view-detail':

src/views/modules/monitoring/equipmentAlarmLog.vue

@@ -77,12 +77,6 @@ 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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -128,12 +128,6 @@ export default {
 		this.getDataList()
 	},
 	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible= false
-			}, /** after dialog animated */ 200);
-		},
 		// 设备
 		getEqList() {
 			this.$http({

src/views/modules/monitoring/equipmentEfficiency.vue

@@ -5,27 +5,27 @@
 			<!-- 工厂 -->
 			<el-form-item>
 				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
-				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" clearable>
+				<el-select v-model="dataForm.ftId" :placeholder="'工厂'" clearable>
 					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
 				</el-select>
 			</el-form-item>
 			<!-- 产线 -->
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable>
+				<el-select v-model="dataForm.productlines" :placeholder="'产线'" multiple clearable>
 					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
 				</el-select>
 			</el-form-item>
 			<!-- 时间类型 -->
 			<!-- 按时间段 -->
 			<el-form-item>
-				<el-select v-model="timeType" :placeholder="$t('timetype')" clearable>
+				<el-select v-model="timeType" :placeholder="'时间类型'" clearable>
-					<el-option value="range" :label="$t('reftimerange')" />
+					<el-option value="range" label="按时间段" />
-					<el-option value="date" :label="$t('refdate')" />
+					<el-option value="date" label="按日期" />
 				</el-select>
 			</el-form-item>
 			<!-- 日期选择 -->
 			<el-form-item v-if="timeType === 'date'">
-				<el-date-picker key="range-picker" v-model="rawTime" type="date" :placeholder="$t('hints.date')" format="yyyy-MM-dd" />
+				<el-date-picker key="range-picker" v-model="rawTime" type="date" :placeholder="'请选择日期'" format="yyyy-MM-dd" />
 			</el-form-item>
 			<!-- 时间段选择 -->
 			<el-form-item v-else>
@@ -33,9 +33,9 @@
 					key="time-picker"
 					v-model="rawTime"
 					type="daterange"
-					:range-separator="$t('datePicker.range')"
+					:range-separator="'至'"
-					:start-placeholder="$t('datePicker.starttime')"
+					:start-placeholder="'开始时间'"
-					:end-placeholder="$t('datePicker.endtime')"
+					:end-placeholder="'结束时间'"
 					format="yyyy-MM-dd"
 				/>
 			</el-form-item>
@@ -48,8 +48,7 @@
 
 		<transition mode="out-in" name="slide-to-left">
 			<equipment-efficiency-graph v-if="showGraph" key="graph" ref="eegraph" @close-graph="showGraph = false" />
-			<base-table v-else :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)"
+			<base-table v-else :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-				@operate-event="handleOperations" @refreshDataList="getDataList" />
 			<!-- v-loading="dataIsLoading " -->
 		</transition>
 		<!-- <el-pagination
@@ -67,11 +66,11 @@
 <script>
 import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
-// import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 import EquipmentEfficiencyGraph from './equipmentEfficiencyGraph.vue'
 import { calcMaxHeight } from '@/utils'
-// import { timeFilter } from '@/utils/filters'
+import { timeFilter } from '@/utils/filters'
 import moment from 'moment'
 
 const tableConfigs = [
@@ -82,39 +81,39 @@ const tableConfigs = [
 	{
 		// name: i18n.t('createTime'),
 		prop: 'factoryName',
-		name: i18n.t('factory.title')
+		name: '工厂'
 	},
-	{ prop: 'pdName', name: i18n.t('pl.title') },
+	{ prop: 'pdName', name: '产线' },
-	{ prop: 'wsName', name: i18n.t('ws.title') },
+	{ prop: 'wsName', name: '工段' },
-	{ prop: 'eqName', name: i18n.t('eq.title') },
+	{ prop: 'eqName', name: '设备' },
 	{
-		name: i18n.t('eq.efficienttimeh'),
+		name: '有效时间(h)',
 		children: [
-			{ prop: 'workTime', name: i18n.t('eq.worktimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'workTime', name: '工作时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'workRate', name: i18n.t('eq.workdurationratio'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'workRate', name: '工作时长比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
-		name: i18n.t('eq.shutdowntimeh'),
+		name: '关机时间(h)',
 		children: [
-			{ prop: 'stopTime', name: i18n.t('eq.stoptimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'stopTime', name: '停机时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'stopRate', name: i18n.t('eq.stopratio'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'stopRate', name: '停机比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
-		name: i18n.t('eq.stoplost'),
+		name: '中断损失',
 		children: [
-			{ prop: 'downTime', name: i18n.t('eq.downtimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'downTime', name: '故障时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'downRate', name: i18n.t('eq.downrate'), width: 120, filter: val => (val * 100).toFixed(2) + '%' },
+			{ prop: 'downRate', name: '故障比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' },
-			{ prop: 'timeEfficiency', name: i18n.t('eq.timeefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'timeEfficiency', name: '时间开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
-		name: i18n.t('eq.speedlost'),
+		name: '速度损失',
 		children: [
-			{ prop: 'realYield', name: i18n.t('eq.realyield'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'realYield', name: '实际加工速度', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'designYield', name: i18n.t('eq.designyield'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'designYield', name: '理论加工速度', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'peEfficiency', name: i18n.t('eq.speedefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'peEfficiency', name: '速度开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
@@ -135,7 +134,7 @@ const tableConfigs = [
 		subcomponent: TableTextComponent,
 		// options: ['edit', 'delete']
 		// options: ['view-trend'] // 查看趋势
-		buttonContent: i18n.t('eq.viewtrend'),
+		buttonContent: '查看趋势',
 		actionName: 'view-trend',
 		emitFullData: true
 	}
@@ -172,10 +171,9 @@ export default {
 		EquipmentEfficiencyGraph
 	},
 
-	activated() {
+	created() {
-		this.getFactoryList().then(() => {
+		this.getFactoryList()
 		this.getProductLineList()
-		})
 	},
 	watch: {
 		timeType() {
@@ -186,12 +184,12 @@ export default {
 	methods: {
 		// 获取工厂列表
 		getFactoryList() {
-			return this.$http({
+			this.$http({
-				url: this.$http.adornUrl('/monitoring/factory/list'),
+				url: this.$http.adornUrl('/monitoring/factory/page'),
 				method: 'get'
-			}).then(({ data: res }) => {
+			}).then(({ data }) => {
-				if (res && res.code === 0) {
+				if (data && data.code === 0) {
-					this.factoryList = res.data
+					this.factoryList = data.data.list
 					/** set default */
 					if (this.factoryList.length) {
 						this.dataForm.ftId = this.factoryList[0].id
@@ -202,31 +200,20 @@ export default {
 				}
 			})
 		},
-
-		// 选择工厂时
-		handleFactoryChange(val) {
-			this.getProductLineList()
-		},
-
 		// 获取产线列表
 		getProductLineList() {
-			const query = {
+			this.$http({
-				url: this.$http.adornUrl('/monitoring/productionLine/list'),
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
 				method: 'get'
-			}
+			}).then(({ data }) => {
-			if (this.dataForm.ftId) {
+				if (data && data.code === 0) {
-				query.params = this.$http.adornParams({
+					this.productLineList = data.data.list
-					factoryId: this.dataForm.ftId
-				});
-			}
-			this.$http(query).then(({ data: res }) => {
-				if (res && res.code === 0 && res.data.length) {
-					this.productLineList = res.data
 					/** set default */
+					if (this.productLineList.length) {
 						this.dataForm.productlines = [this.productLineList[0].id]
+					}
 				} else {
 					this.productLineList = []
-					this.dataForm.productlines = []
 				}
 			})
 		},

src/views/modules/monitoring/equipmentEfficiencyGraph.vue

@@ -17,8 +17,8 @@
 
 		<div class="close-row">
 			<el-radio-group v-model="dataType" class="head-radio-group" size="small" @change="setLegend">
-				<el-radio-button :label="$t('eq.ratio')" />
+				<el-radio-button label="百分比" />
-				<el-radio-button :label="$t('eq.time')" />
+				<el-radio-button label="时间" />
 			</el-radio-group>
 
 			<el-radio-group v-if="1" v-model="searchType" class="head-radio-group" style="margin-left: 8px;" size="small" @change="handleRadioGroupChanged">
@@ -34,13 +34,12 @@
 import * as echarts from 'echarts'
 import moment from 'moment'
 import { pick } from 'lodash/object'
-import i18n from '../../../i18n'
 
 class EchartConfigs {
 	constructor() {
 		this.color = ['#e91e63', '#4caf50', '#3f51b5', '#ffc107', '#607d8b']
 		this.title = {
-			text: i18n.t('eq.timetrend'),
+			text: '时间区间走势',
 			top: 0,
 			left: 'center',
 			textStyle: {
@@ -114,10 +113,10 @@ export default {
 	props: {},
 	data() {
 		return {
-			searchType: i18n.t('eq.nogap'),
+			searchType: '无间隔',
-			searchRadioOptions: [i18n.t('eq.nogap'), i18n.t('eq.monthgap'), i18n.t('eq.weekgap'), i18n.t('eq.daygap')],
+			searchRadioOptions: ['无间隔', '按月', '按周', '按天'],
-			dataType: i18n.t('eq.time'),
+			dataType: '时间',
-			dataRadioOptions: [i18n.t('eq.time'), i18n.t('eq.ratio')],
+			dataRadioOptions: ['时间', '百分比'],
 			config: new EchartConfigs(),
 			chart: null,
 			rateList: [], // 对请求来的数据分流
@@ -128,7 +127,7 @@ export default {
 	},
 	methods: {
 		async initChart() {
-			this.config.setTitle(this.injectData.equipmentName + i18n.t('eq.timetrend'))
+			this.config.setTitle(this.injectData.equipmentName + '时间区间走势')
 			await this.getList()
 			this.setLegend()
 		},
@@ -147,11 +146,11 @@ export default {
 
 		makeQuerys() {
 			const searchTypeMap = {
-				[i18n.t('eq.nogap')]: 1,
+				无间隔: 1,
-				[i18n.t('eq.monthgap')]: 2,
+				按月: 2,
-				[i18n.t('eq.weekgap')]: 3,
+				按周: 3,
-				[i18n.t('eq.daygap')]: 4,
+				按天: 4,
-				[i18n.t('eq.hourgap')]: 5
+				按小时: 5
 			}
 
 			return {
@@ -190,11 +189,11 @@ export default {
 					// 分流
 					datalist.map(item => {
 						const time = moment(item.time)
-						if (this.searchType === i18n.t('eq.monthgap')) {
+						if (this.searchType === '按月') {
-							this.xAxis.push(`${time.year()}${i18n.t('eq.year')}${time.month() + 1}${i18n.t('eq.month')}`)
+							this.xAxis.push(`${time.year()}年${time.month() + 1}月`)
-						} else if (this.searchType === i18n.t('eq.weekgap')) {
+						} else if (this.searchType === '按周') {
 							this.xAxis.push(`${time.format('YYYY-MM-DD')}`)
-						} else if (this.searchType === i18n.t('eq.daygap')) {
+						} else if (this.searchType === '按天') {
 							this.xAxis.push(`${time.format('YY-M-D')}`)
 						} else {
 							this.xAxis.push(`${time.format('YYYY-MM-DD')}`)
@@ -219,16 +218,8 @@ export default {
 		setLegend() {
 			// 设置legend
 			const legendMap = {
-				[i18n.t('eq.ratio')]: [
+				百分比: ['工作时长比率', '停机时长比率', '故障时长比率', '速度开动率', '时间开动率', 'OEE', 'TEEP'],
-					i18n.t('eq.workdurationratio'),
+				时间: ['工作时长', '停机时长', '故障时长']
-					i18n.t('eq.stopdurationratio'),
-					i18n.t('eq.downdurationratio'),
-					i18n.t('eq.speedefficiency'),
-					i18n.t('eq.timeefficiency'),
-					'OEE',
-					'TEEP'
-				],
-				[i18n.t('eq.time')]: [i18n.t('eq.worktime'), i18n.t('eq.stoptime'), i18n.t('eq.downtime')]
 			}
 			this.config.setLegend(legendMap[this.dataType])
 			this.setData()
@@ -237,7 +228,7 @@ export default {
 		},
 
 		setData() {
-			if (this.dataType === i18n.t('eq.time')) {
+			if (this.dataType === '时间') {
 				const workTimeList = []
 				const stopTimeList = []
 				const downTimeList = []
@@ -247,9 +238,9 @@ export default {
 					downTimeList.push(item.downTime)
 				})
 				this.config.setSeries([
-					{ name: i18n.t('eq.worktime'), type: 'bar', data: workTimeList },
+					{ name: '工作时长', type: 'bar', data: workTimeList },
-					{ name: i18n.t('eq.stoptime'), type: 'bar', data: stopTimeList },
+					{ name: '停机时长', type: 'bar', data: stopTimeList },
-					{ name: i18n.t('eq.downtime'), type: 'bar', data: downTimeList }
+					{ name: '故障时长', type: 'bar', data: downTimeList }
 				])
 			} else {
 				// 百分比
@@ -270,11 +261,11 @@ export default {
 					teepList.push(item.teep)
 				})
 				this.config.setSeries([
-					{ name: i18n.t('eq.workdurationratio'), type: 'bar', data: workRateList },
+					{ name: '工作时长比率', type: 'bar', data: workRateList },
-					{ name: i18n.t('eq.stopdurationratio'), type: 'bar', data: stopRateList },
+					{ name: '停机时长比率', type: 'bar', data: stopRateList },
-					{ name: i18n.t('eq.downdurationratio'), type: 'bar', data: downRateList },
+					{ name: '故障时长比率', type: 'bar', data: downRateList },
-					{ name: i18n.t('eq.speedefficiency'), type: 'bar', data: peEfficiencyList },
+					{ name: '速度开动率', type: 'bar', data: peEfficiencyList },
-					{ name: i18n.t('eq.timeefficiency'), type: 'bar', data: timeEfficiencyList },
+					{ name: '时间开动率', type: 'bar', data: timeEfficiencyList },
 					{ name: 'OEE', type: 'bar', data: oeeList },
 					{ name: 'TEEP', type: 'bar', data: teepList }
 				])

src/views/modules/monitoring/equipmentException.vue

@@ -4,11 +4,11 @@
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
 			<!-- 月份 -->
 			<el-form-item>
-				<el-date-picker key="month-picker" v-model="rawTime" type="month" :placeholder="$t('prompt.month')" format="yyyy-MM" />
+				<el-date-picker key="month-picker" v-model="rawTime" type="month" :placeholder="'请选择月份'" format="yyyy-MM" />
 			</el-form-item>
 			<!-- 产线 -->
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable>
+				<el-select v-model="dataForm.productlines" :placeholder="'产线'" multiple clearable>
 					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
 				</el-select>
 			</el-form-item>
@@ -49,14 +49,14 @@ const tableConfigs = [
 		name: i18n.t('index')
 	},
 	// { prop: 'time', name: '时间', filter: timeFilter },
-	{ prop: 'pdName', name: i18n.t('pl.name') },
+	{ prop: 'pdName', name: '产线名称' },
-	{ prop: 'wsName', name: i18n.t('ws.title') },
+	{ prop: 'wsName', name: '工序' },
-	{ prop: 'eqName', name: i18n.t('eq.title') },
+	{ prop: 'eqName', name: '设备' },
-	{ prop: 'mtbf', name: i18n.t('eq.mtbf'), width: 220 },
+	{ prop: 'mtbf', name: '平均故障间隔时间[MTBF] (h)', width: 220 },
-	{ prop: 'mttr', name: i18n.t('eq.mttr'), width: 190 },
+	{ prop: 'mttr', name: '平均维修时间[MTTR] (h)', width: 190 },
-	{ prop: 'workTime', name: i18n.t('eq.worktimeh') },
+	{ prop: 'workTime', name: '工作时长 (h)' },
-	{ prop: 'downTime', name: i18n.t('eq.downtimeh') },
+	{ prop: 'downTime', name: '故障时长 (h)' },
-	{ prop: 'downCount', name: i18n.t('eq.downcount') }
+	{ prop: 'downCount', name: '故障次数' },
 	// {
 	// 	prop: 'operations',
 	// 	name: i18n.t('handle'),
@@ -96,7 +96,7 @@ export default {
 		BaseTable
 	},
 
-	activated() {
+	created() {
 		// this.getFactoryList()
 		this.getProductLineList()
 	},
@@ -123,18 +123,17 @@ export default {
 		// 获取产线列表
 		getProductLineList() {
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/productionLine/list'),
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
 				method: 'get'
-			}).then(({ data: res }) => {
+			}).then(({ data }) => {
-				if (res && res.code === 0) {
+				if (data && data.code === 0) {
-					this.productLineList = res.data
+					this.productLineList = data.data.list
 					/** set default */
 					if (this.productLineList.length) {
 						this.dataForm.productlines = [this.productLineList[0].id]
 					}
 				} else {
 					this.productLineList = []
-					this.dataForm.productlines = []
 				}
 			})
 		},

src/views/modules/monitoring/equipmentFile.vue

@@ -80,12 +80,6 @@ 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

@@ -10,15 +10,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -60,7 +52,7 @@ const tableConfigs = [
 const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/equipmentGroup',
-	fields: [{ name: 'name', required: true, label: i18n.t('eq.groupname') }, { name: 'code', required: true, label: i18n.t('eq.groupcode') }, 'remark'],
+	fields: [{ name: 'name', label: i18n.t('eq.groupname') }, { name: 'code', label: i18n.t('eq.groupcode') }, 'remark'],
 	operations: [
 		{ name: 'cancel', showAlways: true },
 		{ name: 'save', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:save', showOnEdit: false },
@@ -94,12 +86,6 @@ 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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -76,9 +76,7 @@ const tableConfigs = [
 	{ prop: 'typeDictValue', name: i18n.t('alarm.type'), filter: dictFilter(dictEntries.alarmType.value) },
 	{ prop: 'gradeDictValue', name: i18n.t('alarm.level'), filter: dictFilter(dictEntries.alarmLevel.value) },
 	{ prop: 'alarmContent', name: i18n.t('alarm.content') },
-	// { prop: 'externalCode', name: i18n.t('alarm.externalCode') },
+	{ prop: 'externalCode', name: i18n.t('alarm.externalCode') },
-	{ prop: 'description', name: i18n.t('alarm.description') },
-	{ prop: 'remark', name: i18n.t('alarm.remark') },
 	{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
@@ -90,9 +88,7 @@ const addOrUpdateConfigs = {
 		{ name: 'typeDictValue', label: i18n.t('alarm.type'), type: 'select', options: [] },
 		{ name: 'gradeDictValue', label: i18n.t('alarm.level'), type: 'select', options: [] },
 		{ name: 'alarmContent', label: i18n.t('alarm.content'), required: true },
-		{ name: 'description', label: i18n.t('alarm.description') },
+		{ name: 'externalCode', label: i18n.t('alarm.externalCode') }
-		{ name: 'remark', label: i18n.t('alarm.remark') }
-		// { name: 'externalCode', label: i18n.t('alarm.externalCode') }
 	],
 	operations: [
 		{ name: 'cancel', showAlways: true },
@@ -129,12 +125,6 @@ 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,12 +40,6 @@ 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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -106,12 +106,6 @@ 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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -141,12 +141,6 @@ 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,12 +79,6 @@ 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,12 +85,6 @@ 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,12 +81,6 @@ export default {
 		this.getDataList()
 	},
 	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible= false
-			}, /** after dialog animated */ 200);
-		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/equipmentTimesequence.vue

@@ -5,8 +5,7 @@
 			<!-- 产线 -->
 			<el-form-item>
 				<el-select v-model="dataForm.productlines" :placeholder="'产线'" @change="handleProductLineChange" clearable>
-					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id"
+					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
-						:label="productLine.name" />
 				</el-select>
 			</el-form-item>
 			<!-- 工序 -->
@@ -31,8 +30,14 @@
 		</el-form>
 
 		<div class="time-chart" style="margin-top: 10px;">
-			<div v-show="equipmentCount > 0" id="time-chart__inner" ref="time-chart__inner" class="time-chart__inner"
+			<div
-				style="min-height: 50vh;" :style="{ height: autoHeight + 'px', width: '100%' }" />
+				v-show="equipmentCount > 0"
+				id="time-chart__inner"
+				ref="time-chart__inner"
+				class="time-chart__inner"
+				style="min-height: 50vh;"
+				:style="{ height: autoHeight + 'px', width: '100%' }"
+			/>
 			<div v-show="equipmentCount === 0">请先查询数据</div>
 			<!-- <div v-show="equipmentCount === 0">{{ $t('module.basicData.visual.hints.searchFirst') }}</div> -->
 		</div>
@@ -102,7 +107,7 @@ class ChartOption {
 			}
 		}
 		this.tooltip = {
-			formatter: function (params) {
+			formatter: function(params) {
 				return moment(params.value[1]).format('YYYY-MM-DD HH:mm:ss') + ' - ' + moment(params.value[2]).format('YYYY-MM-DD HH:mm:ss') + ' : ' + params.name
 			}
 		}
@@ -127,7 +132,7 @@ class ChartOption {
 				show: true
 			},
 			axisLabel: {
-				formatter: function (val) {
+				formatter: function(val) {
 					const time = new Date(val)
 					const hour = time.getHours()
 					const minute = time.getMinutes()
@@ -218,14 +223,17 @@ export default {
 		BaseTable
 	},
 	computed: {
-		autoHeight: function () {
+		autoHeight: function() {
 			return Object.keys(this.equipments).length * 100 || 500
 		},
-		equipmentCount: function () {
+		equipmentCount: function() {
 			return Object.keys(this.equipments).length
 		}
 	},
 	created() {
+		this.getProductLineList().then(() => {
+			this.getWorksetionList()
+		})
 		this.getEqList()
 	},
 	mounted() {
@@ -233,11 +241,6 @@ export default {
 			this.initChart()
 		})
 	},
-	activated() {
-		this.getProductLineList().then(() => {
-			this.getWorksetionList()
-		})
-	},
 	updated() {
 		if (this.chart) this.chart.resize()
 	},
@@ -256,11 +259,11 @@ export default {
 		// 获取产线列表
 		getProductLineList() {
 			return this.$http({
-				url: this.$http.adornUrl('/monitoring/productionLine/list'),
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
 				method: 'get'
-			}).then(({ data: res }) => {
+			}).then(({ data }) => {
-				if (res && res.code === 0) {
+				if (data && data.code === 0) {
-					this.productLineList = res.data
+					this.productLineList = data.data.list
 					/** set default */
 					if (this.productLineList.length) {
 						this.dataForm.productlines = this.productLineList[0].id

src/views/modules/monitoring/equipmentType.vue

@@ -10,15 +10,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -60,8 +52,8 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/equipmentType',
 	fields: [
-		{ name: 'name', required: true, label: i18n.t('eq.type') },
+		{ name: 'name', label: i18n.t('eq.type') },
-		{ name: 'code', required: true, label: i18n.t('eq.typecode'), api: '/monitoring/equipmentType/getCode' },
+		{ name: 'code', label: i18n.t('eq.typecode'), api: '/monitoring/equipmentType/getCode' },
 		{ name: 'parentId', label: i18n.t('eq.parent'), type: 'cascader', props: { label: 'name', value: 'id', checkStrictly: true, emitPath: false }, options: [] },
 		'remark'
 	],
@@ -114,12 +106,6 @@ 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,12 +81,6 @@ 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,12 +79,6 @@ 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

@@ -10,15 +10,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -61,10 +53,9 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/factory',
 	fields: [
-		{ name: 'name', required: true },
+		'name',
 		{
 			name: 'code',
-			required: true,
 			api: '/monitoring/factory/getCode'
 		},
 		{
@@ -108,12 +99,6 @@ 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,15 +12,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			:page="pageIndex"
-			:size="pageSize"
-			:data="dataList"
-			:table-head-configs="tableConfigs"
-			:max-height="calcMaxHeight(8)"
-			@operate-event="handleOperations"
-			@refreshDataList="getDataList"
-		/>
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -33,7 +25,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" @destory-dialog="handleDestroyDialog" />
+		<base-dialog v-if="showbasedialog" ref="basedialog" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" />
 	</div>
 </template>
 
@@ -69,13 +61,11 @@ const addOrUpdateConfigs = {
 	fields: [
 		// 'name',
 		{
-			name: 'name',
+			name: 'name'
-			required: true
 			// label: i18n.t('pl.name')
 		},
 		{
 			name: 'code',
-			required: true,
 			// label: i18n.t('pl.code'),
 			api: '/monitoring/product/getCode'
 		},
@@ -181,12 +171,7 @@ 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" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" :configs="addOrUpdateConfigs" ref="addOrUpdate" @refreshDataList="getDataList" @destroy-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -111,12 +111,6 @@ 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

@@ -10,15 +10,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -52,7 +44,7 @@ const tableConfigs = [
 	{ prop: 'factoryName', name: i18n.t('factory.title') },
 	{ prop: 'name', name: i18n.t('pl.name') },
 	{ prop: 'code', name: i18n.t('pl.code') },
-	{ prop: 'status', name: i18n.t('pl.status'), filter: val => (val === 0 || val === 1 || val === 2) && ['停止', '运行', '未知'][val] },
+	{ prop: 'status', name: i18n.t('pl.status') },
 	{ prop: 'description', name: i18n.t('desc') },
 	{ prop: 'remark', name: i18n.t('remark') },
 	{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
@@ -63,8 +55,8 @@ const addOrUpdateConfigs = {
 	infoUrl: '/monitoring/productionLine',
 	fields: [
 		// 'name',
-		{ name: 'name', label: i18n.t('pl.name'), required: true },
+		{ name: 'name', label: i18n.t('pl.name') },
-		{ name: 'code', label: i18n.t('pl.code'), required: true, api: '/monitoring/productionLine/getCode' },
+		{ name: 'code', label: i18n.t('pl.code'), api: '/monitoring/productionLine/getCode' },
 		{
 			name: 'factoryId',
 			required: true,
@@ -119,12 +111,6 @@ 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,12 +72,6 @@ export default {
 		this.getDataList()
 	},
 	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible= false
-			}, /** after dialog animated */ 200);
-		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true

src/views/modules/monitoring/qualityInspectionBoxBtn.vue

@@ -1,368 +0,0 @@
-<template>
-	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
-			<!-- <el-form-item> -->
-			<!-- <el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
-			</el-form-item> -->
-			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('search') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:qualityInspectionBoxBtn:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-				<!-- <el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button> -->
-			</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"
-		/>
-		<el-pagination
-			@size-change="sizeChangeHandle"
-			@current-change="currentChangeHandle"
-			:current-page="pageIndex"
-			:page-sizes="[10, 20, 50, 100]"
-			:page-size="pageSize"
-			:total="totalPage"
-			layout="total, sizes, prev, pager, next, jumper"
-		></el-pagination>
-		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			:configs="addOrUpdateConfigs"
-			@refreshDataList="getDataList"
-			@select-change="handleDialogSelectChange"
-			@destory-dialog="handleDestroyDialog"
-		/>
-	</div>
-</template>
-
-<script>
-import i18n from '@/i18n'
-import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
-// import AddOrUpdate from './equipment-add-or-update'
-import BaseTable from '@/components/base-table'
-import TableOperateComponent from '@/components/base-table/components/operationComponent'
-// import TableTextComponent from '@/components/base-table/components/detailComponent'
-// import CKEditor from 'ckeditor4-vue'
-import { calcMaxHeight } from '@/utils'
-import { timeFilter } from '@/utils/filters'
-// import Cookies from 'js-cookie'
-
-const tableConfigs = [
-	{
-		type: 'index',
-		name: i18n.t('index')
-	},
-	{
-		prop: 'createTime',
-		name: i18n.t('createTime'),
-		filter: timeFilter
-	},
-	{ prop: 'inspectionDetContent', name: i18n.t('andeng.inspectContent') }, // name: '检测内容' },
-	{ prop: 'keyValue', name: i18n.t('andeng.btnVal') }, // name: '按钮值' },
-	{ prop: 'model', name: i18n.t('andeng.btnBoxModel') }, // name: '按钮盒模式' },
-
-	{
-		prop: 'operations',
-		name: i18n.t('handle'),
-		fixed: 'right',
-		width: 180,
-		subcomponent: TableOperateComponent,
-		options: ['edit', 'delete']
-	}
-]
-
-const addOrUpdateConfigs = {
-	type: 'dialog',
-	infoUrl: '/monitoring/qualityInspectionBoxBtn',
-	fields: [
-		// { name: 'productionId', label: i18n.t('eq.name'), required: true },
-		{ name: 'productionId', label: i18n.t('pl.title'), required: true, type: 'select', options: [], relatedField: 'sectionId' },
-		{ name: 'sectionId', label: i18n.t('ws.title'), required: true, type: 'select', options: [] },
-		{ name: 'model', label: i18n.t('andeng.btnBoxModel') },
-		{
-			name: 'keyValue',
-			label: i18n.t('andeng.btnVal'),
-			required: true,
-			rules: [{ type: 'integer', trigger: 'blur', message: i18n.t('hints.integer'), transform: val => Number(val) }]
-		},
-		{
-			name: 'inspectionDetContent',
-			label: i18n.t('andeng.inspectContent')
-		}
-	],
-	operations: [
-		{ name: 'cancel', showAlways: true },
-		{
-			name: 'save',
-			url: '/monitoring/qualityInspectionBoxBtn',
-			permission: 'monitoring:qualityInspectionBoxBtn:save',
-			showOnEdit: false
-		},
-		{
-			name: 'update',
-			url: '/monitoring/qualityInspectionBoxBtn',
-			permission: 'monitoring:qualityInspectionBoxBtn:update',
-			showOnEdit: true
-		}
-	]
-}
-
-export default {
-	data() {
-		return {
-			calcMaxHeight,
-			tableConfigs,
-			addOrUpdateConfigs,
-			dataForm: {
-				key: ''
-			},
-			dataList: [],
-			pageIndex: 1,
-			pageSize: 10,
-			totalPage: 0,
-			dataListLoading: false,
-			dataListSelections: [],
-			addOrUpdateVisible: false
-		}
-	},
-	components: {
-		AddOrUpdate,
-		BaseTable
-	},
-	activated() {
-		this.getDataList()
-		this.getPlList()
-		this.getWsList()
-	},
-	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible = false
-			}, /** after dialog animated */ 200)
-		},
-		// 获取产线列表，用于刷新工段列表
-		getPlList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/productionLine/list'),
-				method: 'get'
-			}).then(({ data: res }) => {
-				const plConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'productionId')
-				plConfig.options =
-					res.data?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取工段列表
-		getWsList(id) {
-			let params = {
-				page: 1,
-				limit: 999
-			}
-			if (id) {
-				params.lineId = id
-			}
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/workshopSection/page'),
-				method: 'get',
-				params: this.$http.adornParams(params)
-			}).then(({ data: res }) => {
-				const wsConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'sectionId')
-				wsConfig.options =
-					res.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取设备类型列表
-		getTypeList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
-				eqTypeConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取设备分组列表
-		getGroupList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
-				groupConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/qualityInspectionBoxBtn/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					page: this.pageIndex,
-					limit: this.pageSize
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				if (data && data.code === 0) {
-					this.dataList = data.data.list
-					// this.dataList = new Array(20).fill('1')
-					// console.log('data list', this.dataList)
-					this.totalPage = data.data.total
-				} else {
-					this.dataList = []
-					this.totalPage = 0
-				}
-				this.dataListLoading = false
-			})
-		},
-		// 每页数
-		sizeChangeHandle(val) {
-			this.pageSize = val
-			this.pageIndex = 1
-			this.getDataList()
-		},
-		// 当前页
-		currentChangeHandle(val) {
-			this.pageIndex = val
-			this.getDataList()
-		},
-		// 多选
-		selectionChangeHandle(val) {
-			this.dataListSelections = val
-		},
-		// 对话框里的某个选择改变了
-		handleDialogSelectChange({ name, id }) {
-			switch (name) {
-				case 'productionId':
-					this.getWsList(id)
-			}
-		},
-		handleOperations({ type, data: id }) {
-			switch (type) {
-				case 'view-detail':
-					// const { name, code } = this.dataList.find(item => item.id === id)
-					// this.$router.push({
-					// 	name: 'monitoring-equipmentAdd',
-					// 	params: {
-					// 		isdetail: true,
-					// 		equipmentId: id
-					// 	}
-					// })
-					// break
-					return this.addOrUpdateHandle(id, true)
-				case 'edit':
-					return this.addOrUpdateHandle(id)
-				case 'delete':
-					return this.deleteHandle(id)
-			}
-		},
-		exportHandle() {
-			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/export'),
-				method: 'get',
-				responseType: 'blob'
-			}).then(res => {
-				let fileName = 'equipment-list.xls'
-				if (res.headers['content-disposition']) {
-					const contentDisposition = res.headers['content-disposition']
-					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
-				}
-
-				fileName = decodeURIComponent(fileName)
-
-				const blob = new Blob([res.data])
-
-				if ('download' in document.createElement('a')) {
-					const alink = document.createElement('a')
-					alink.download = fileName
-					alink.style.display = 'none'
-					alink.target = '_blank'
-					alink.href = URL.createObjectURL(blob)
-					document.body.appendChild(alink)
-					alink.click()
-					URL.revokeObjectURL(alink.href)
-					document.body.removeChild(alink)
-				} else {
-					navigator.msSaveBlob(blob, fileName)
-				}
-			})
-		},
-		// 新增 / 修改
-		addOrUpdateHandle(id, isdetail = false) {
-			this.addOrUpdateVisible = true
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, isdetail)
-			})
-			// this.$router.push({
-			// 	name: 'monitoring-equipmentAdd',
-			// 	params: {
-			// 		equipmentId: id
-			// 	}
-			// })
-		},
-		// 删除
-		deleteHandle(id) {
-			var ids = id
-				? [id]
-				: this.dataListSelections.map(item => {
-						return item.id
-				  })
-			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
-				confirmButtonText: i18n.t('confirm'),
-				cancelButtonText: i18n.t('cancel'),
-				type: 'warning'
-			}).then(() => {
-				this.$http({
-					url: this.$http.adornUrl('/monitoring/qualityInspectionBoxBtn'),
-					method: 'delete',
-					data: this.$http.adornData(ids, false, 'raw')
-				}).then(({ data }) => {
-					if (data && data.code === 0) {
-						this.$message({
-							message: i18n.t('prompt.success'),
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getDataList()
-							}
-						})
-					} else {
-						this.$message.error(data.msg)
-					}
-				})
-			})
-		}
-	}
-}
-</script>

src/views/modules/monitoring/qualityInspectionCurrent.vue

@@ -70,7 +70,6 @@ import * as echarts from 'echarts'
 
 const tableConfigStatic = [
 	{ type: 'index', width: 100, name: i18n.t('index') },
-	{ name: i18n.t('pl.title'), prop: 'lineName' },
 	{ name: i18n.t('inspect.inTotal'), prop: 'sumUp' },
 	{ name: i18n.t('inspect.outTotal'), prop: 'sumDown' },
 	{ name: i18n.t('inspect.checkTotal'), prop: 'sumCheck' },
@@ -78,7 +77,7 @@ const tableConfigStatic = [
 ]
 const tableConfigDynamic = [
 	{ type: 'index', width: 100, name: i18n.t('index') },
-	{ name: i18n.t('inspect.det'), prop: 'inspectionContent' },
+	{ name: i18n.t('inspect.type'), prop: 'inspectionContent' },
 	/** dynamic */
 	{ name: i18n.t('inspect.typetotal'), prop: '' },
 	{ name: i18n.t('inspect.rate'), prop: '' }
@@ -105,31 +104,17 @@ const FakeChart = {
 			calcMaxHeight,
 			chart: null,
 			defaultOpts: {
-				grid: {
-					left: '5%',
-					right: '12%',
-					top: '20%',
-					bottom: '10%'
-				},
 				title: {
 					text: i18n.t('inspect.typeCount')
 				},
 				tooltip: {},
 				legend: {
 					orient: 'vertical',
-					type: 'scroll',
 					top: 10,
-					right: 0,
+					right: 20,
-					width: '12%',
+					data: [
-					/** 修复文本太长时显示问题 */
+						/** dynamic */
-					formatter: function(name) {
+					]
-						return echarts.format.truncateText(name, 120, '14px Microsoft Yahei', '...')
-					},
-					tooltip: {
-						show: true
-					},
-					/** end */
-					data: []
 				},
 				xAxis: {
 					data: [
@@ -235,25 +220,11 @@ export default {
 				]
 			},
 			echartCategories: null,
-			echartCheckTypes: [],
+			echartCheckTypes: []
-			interval: null
 		}
 	},
 	mounted() {
 		this.getDataList()
-
-		this.interval = setInterval(() => {
-			this.$message.info(i18n.t('refresh'))
-			this.dataListStatic.splice(0)
-			this.dataListDynamic.splice(0)
-			this.getDataList()
-		}, 1000 * 5 * 60)
-	},
-	deactivated() {
-		if (this.interval) {
-			clearInterval(this.interval)
-			this.interval = null
-		}
 	},
 	methods: {
 		handleOperations() {},
@@ -279,12 +250,12 @@ export default {
 
 			/** [1] 获取上下片数据 */
 			this.fetchList('sx', startTime, endTime).then(({ data: res }) => {
-				// console.log('sx: ', res)
+				console.log('sx: ', res)
 				this.dataListStatic = res.data || []
 			})
 			/** [2] 获取产线检测类型 */
 			this.fetchList('pl', startTime, endTime).then(({ data: res }) => {
-				// console.log('pl: ', res)
+				console.log('pl: ', res)
 				/** TODO: 解析 nameData */
 				this.parseTableProps(res.data.nameData)
 
@@ -310,7 +281,7 @@ export default {
 
 			this.tableConfigDynamic = [
 				{ type: 'index', width: 100, name: i18n.t('index') },
-				{ name: i18n.t('inspect.det'), prop: 'inspectionContent' },
+				{ name: i18n.t('inspect.type'), prop: 'inspectionContent' },
 				...subProps,
 				{ name: i18n.t('inspect.typetotal'), prop: 'sumInput' },
 				{ name: i18n.t('inspect.rate'), prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') }

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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -53,9 +53,9 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/qualityInspectionDet',
 	fields: [
-		{ name: 'typeId', label: i18n.t('inspect.type'), required: true, type: 'select', options: [] },
+		{ name: 'typeId', label: i18n.t('inspect.type'), type: 'select', options: [] },
-		{ name: 'content', label: i18n.t('inspect.det'), required: true },
+		{ name: 'content', label: i18n.t('inspect.det') },
-		{ name: 'code', label: i18n.t('inspect.code'), api: '/monitoring/qualityInspectionDet/getCode' },
+		{ name: 'code', label: i18n.t('inspect.detcode'), api: '/monitoring/qualityInspectionDet/getCode' },
 		'remark'
 	],
 	operations: [
@@ -92,12 +92,6 @@ 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

@@ -1,29 +1,16 @@
 <template>
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
-			<el-form-item>
+			<!-- <el-form-item>
-				<el-select v-model="dataForm.lineId" :placeholder="$t('pl.title')" clearable filterable>
+				<el-input v-model="dataForm.key" :placeholder="$t('parameter')" clearable></el-input>
-					<el-option v-for="pl in plList" :key="pl.value" :value="pl.value" :label="pl.label" />
+			</el-form-item> -->
-				</el-select>
-			</el-form-item>
-			<el-form-item>
-				<el-input v-model="dataForm.key" :placeholder="$t('inspect.det')" clearable></el-input>
-			</el-form-item>
 			<el-form-item>
 				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
 				<el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			:page="pageIndex"
-			:size="pageSize"
-			:data="dataList"
-			:table-head-configs="tableConfigs"
-			:max-height="calcMaxHeight(8)"
-			@operate-event="handleOperations"
-			@refreshDataList="getDataList"
-		/>
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -42,7 +29,7 @@
 			ref="addOrUpdate"
 			:configs="addOrUpdateConfigs"
 			@refreshDataList="getDataList"
-			@destory-dialog="handleDestroyDialog"
+			@destory-dialog="addOrUpdateVisible = false"
 			@select-change="handleSelectChange"
 		/>
 	</div>
@@ -84,9 +71,9 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/qualityInspectionRecord',
 	fields: [
-		{ name: 'checkTime', required: true, label: i18n.t('inspect.time'), type: 'date', props: { style: 'width: 100%', type: 'datetime' }, placeholder: i18n.t('hints.checktime') },
+		{ name: 'checkTime', label: i18n.t('inspect.time'), type: 'date', props: { style: 'width: 100%', type: 'datetime' }, placeholder: i18n.t('hints.checktime') },
-		{ name: 'productionId', required: true, label: i18n.t('pl.title'), type: 'select', options: [] },
+		{ name: 'productionId', label: i18n.t('pl.title'), type: 'select', options: [] },
-		{ name: 'sectionId', required: true, label: i18n.t('ws.title'), type: 'select', options: [] },
+		{ name: 'sectionId', label: i18n.t('ws.title'), type: 'select', options: [] },
 		{
 			name: 'source',
 			label: i18n.t('source'),
@@ -96,7 +83,7 @@ const addOrUpdateConfigs = {
 				{ value: 2, label: i18n.t('auto') }
 			]
 		},
-		{ name: 'inspectionDetId', required: true, label: i18n.t('inspect.det'), type: 'select', options: [] },
+		{ name: 'inspectionDetId', label: i18n.t('inspect.det'), type: 'select', options: [] },
 		{ name: 'checkPerson', label: i18n.t('inspect.people') },
 		{ name: 'explainText', label: i18n.t('desc') },
 		'remark'
@@ -115,10 +102,8 @@ export default {
 			addOrUpdateConfigs,
 			tableConfigs,
 			dataForm: {
-				key: '',
+				key: ''
-				lineId: ''
 			},
-			plList: [],
 			dataList: [],
 			pageIndex: 1,
 			pageSize: 10,
@@ -139,12 +124,6 @@ export default {
 		this.getProductLines()
 	},
 	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible = false
-			}, /** after dialog animated */ 200)
-		},
 		// handle
 		async handleSelectChange({ name, id }) {
 			if (name === 'productionId') {
@@ -173,14 +152,18 @@ export default {
 		// 获取产线
 		getProductLines() {
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/productionLine/list'),
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
-				method: 'get'
+				method: 'get',
+				params: this.$http.adornParams({
+					// 	page: this.pageIndex,
+					// 	limit: this.pageSize,
+					// 	key: this.dataForm.key
+				})
 			}).then(({ data: res }) => {
 				const plOpt = this.addOrUpdateConfigs.fields.find(item => item.name === 'productionId')
 				if (plOpt) {
-					plOpt.options = res.data.map(item => ({ value: item.id, label: item.name })) || []
+					plOpt.options = res.data.list.map(item => ({ value: item.id, label: item.name })) || []
 				}
-				this.plList = res.data.map(item => ({ value: item.id, label: item.name })) || []
 			})
 		},
 		// 获取工段
@@ -214,22 +197,14 @@ export default {
 		getDataList() {
 			this.addOrUpdateVisible = false
 			this.dataListLoading = true
-
-			const queryParams = {
-				page: this.pageIndex,
-				limit: this.pageSize
-			}
-
-			if (this.dataForm.key) {
-				queryParams['key'] = this.dataForm.key
-			}
-			if (this.dataForm.lineId) {
-				queryParams['lineId'] = this.dataForm.lineId
-			}
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/qualityInspectionRecord/page'),
 				method: 'get',
-				params: this.$http.adornParams(queryParams)
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
 					this.dataList = data.data.list

src/views/modules/monitoring/qualityInspectionType.vue

@@ -10,15 +10,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -50,7 +42,7 @@ const tableConfigs = [
 	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('inspect.typename') },
-	{ prop: 'code', name: i18n.t('inspect.typecode') },
+	{ prop: 'code', name: i18n.t('inspect.typename') },
 	{ prop: 'remark', name: i18n.t('remark') },
 	{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
@@ -58,11 +50,7 @@ const tableConfigs = [
 const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/qualityInspectionType',
-	fields: [
+	fields: [{ name: 'name', label: i18n.t('inspect.type') }, { name: 'code', label: i18n.t('inspect.typename'), api: '/monitoring/qualityInspectionType/getCode' }, 'remark'],
-		{ 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 },
@@ -96,12 +84,6 @@ 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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -83,12 +83,6 @@ 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="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -55,12 +55,6 @@ 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', {
@@ -118,12 +112,6 @@ 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.vue

@@ -73,12 +73,6 @@ 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.vue

@@ -67,12 +67,6 @@ 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,12 +78,6 @@ 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,12 +75,6 @@ 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

@@ -10,15 +10,7 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table
+		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-			: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"
@@ -30,7 +22,7 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -62,8 +54,8 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/workshopSection',
 	fields: [
-		{ name: 'name', required: true, label: i18n.t('ws.name') },
+		{ name: 'name', label: i18n.t('ws.name') },
-		{ name: 'code', required: true, label: i18n.t('ws.code'), api: '/monitoring/workshopSection/getCode' },
+		{ name: 'code', label: i18n.t('ws.code'), api: '/monitoring/workshopSection/getCode' },
 		{ name: 'productionLineId', label: i18n.t('ws.belong'), type: 'select', options: [] },
 		'description',
 		'remark'
@@ -104,12 +96,6 @@ 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,12 +68,6 @@ 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

@@ -39,18 +39,10 @@
 			<section class="attr-form-section" v-if="dataForm.id">
 				<h3>
 					{{ $t('ws.eqbind') }}
-					<!-- <el-button type="text" v-if="!showAttrForm" @click="addEq">{{ $t('add') }}</el-button> -->
+					<el-button type="text" v-if="!showAttrForm" @click="addEq">{{ $t('add') }}</el-button>
 				</h3>
 				<div class="table" v-if="!showAttrForm">
-					<base-table
+					<base-table :page="page" :size="limit" :data="eqList" :table-head-configs="tableProps" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-						:page="page"
-						:size="limit"
-						:data="eqList"
-						:table-head-configs="tableProps"
-						:max-height="calcMaxHeight(8)"
-						@operate-event="handleOperations"
-						@refreshDataList="getDataList"
-					/>
 					<el-pagination
 						@size-change="sizeChangeHandle"
 						@current-change="currentChangeHandle"
@@ -76,8 +68,8 @@
 import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
 import SmallTitle from '@/components/small-title'
-// import { pick } from 'lodash/object'
+import { pick } from 'lodash/object'
-// import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import AttrForm from './workshopSectionDialogAttrForm.vue'
 import { calcMaxHeight } from '@/utils'
 const tableProps = [
@@ -86,15 +78,15 @@ const tableProps = [
 		name: i18n.t('index')
 	},
 	{ name: i18n.t('eq.name'), prop: 'equipmentName' },
-	{ name: i18n.t('dept.sort'), prop: 'sort' }
+	{ name: i18n.t('dept.sort'), prop: 'sort' },
-	// {
+	{
-	// 	name: i18n.t('handle'),
+		name: i18n.t('handle'),
-	// 	prop: 'operations',
+		prop: 'operations',
-	// 	fixed: 'right',
+		fixed: 'right',
-	// 	width: 180,
+		width: 180,
-	// 	subcomponent: TableOperateComponent,
+		subcomponent: TableOperateComponent,
-	// 	options: ['edit', 'delete']
+		options: ['edit', 'delete']
-	// }
+	}
 ]
 
 export default {
@@ -122,12 +114,9 @@ export default {
 				// 备注
 				remark: ''
 			},
-			dataFormRules: {
-				name: [{ required: true, message: i18n.t('validate.required'), trigger: 'blur' }],
-				code: [{ required: true, message: i18n.t('validate.required'), trigger: 'blur' }]
-			},
 			limit: 5,
 			page: 1,
+			dataFormRules: {},
 			showAttrForm: false
 		}
 	},
@@ -290,8 +279,6 @@ export default {
 			}
 		},
 		handleCreateOrUpdate() {
-			this.$refs['dataForm'].validate(valid => {
-				if (valid) {
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/workshopSection'),
 				method: this.dataForm.id ? 'put' : 'post',
@@ -308,8 +295,6 @@ export default {
 				})
 			})
 		}
-			})
-		}
 	}
 }
 </script>

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

@@ -152,12 +152,6 @@ 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,12 +20,6 @@ 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,12 +64,6 @@ 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,12 +65,6 @@ 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,12 +47,6 @@ 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,12 +77,6 @@ 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,12 +46,6 @@ 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

@@ -24,18 +24,16 @@
 			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
 				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
 				<el-table-column prop="dictName" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column>
-				<el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center">
-				<!-- <el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center">
 					<template slot-scope="scope">
 						<el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>
 					</template>
-				</el-table-column> -->
+				</el-table-column>
 				<el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column>
 				<el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column>
 				<el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="240">
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
 					<template slot-scope="scope">
-						<el-button type="text" size="small" @click="childHandle(scope.row)">{{ $t('dictValueList') }}</el-button>
 						<el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
 						<el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
 					</template>
@@ -87,12 +85,6 @@ 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,12 +54,6 @@ 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,12 +95,6 @@ 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,12 +41,6 @@ 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,12 +52,6 @@ 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,12 +111,6 @@ export default {
 		}
 	},
 	methods: {
-		// destroy dialog
-		handleDestroyDialog() {
-			setTimeout(() => {
-				this.addOrUpdateVisible= false
-			}, /** after dialog animated */ 200);
-		},
 		init() {
 			this.visible = true
 			this.dataForm.deptId = ''

vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
         target: 'http://india.mes.picaiba.com/'
       },
       '/yd-monitor': {
-        target: 'http://192.168.1.18:8080/' // 开发地址
+        target: 'http://192.168.1.20:8080/' // 开发地址
       },
       '/ureport': {
         target: 'http://india.mes.picaiba.com/' // ureporter