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

Reviewed-on: #10

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

@@ -47,6 +47,7 @@
 								: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

src/i18n/en.js

@@ -62,9 +62,13 @@ 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'
@@ -162,6 +166,10 @@ 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.'
@@ -174,6 +182,7 @@ 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.upload2mPic = 'Image files only. File size cannot be larger than 2MB (2048KB)'
@@ -214,6 +223,9 @@ 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'
@@ -252,17 +264,17 @@ t.realtime.num = 'scrap quantity'
 t.realtime.rate = 'scrap rate'
 t.realtime.total = 'total production'
 t.realtime.goodrate = 'Passed Rate'
-t.realtime.runState = '是否运行'
-t.realtime.state = '状态'
-t.realtime.hasFault = '是否故障'
-t.realtime.recentParamValue = '参数近期值'
-t.realtime.view = '查看'
-t.realtime.input = '投入数'
-t.realtime.output = '产出数'
-t.realtime.eqName = '设备名称'
-t.realtime.eqCode = '设备编码'
-t.realtime.productionSnapshotTime = '生产量记录时间'
-t.realtime.statusSnapshotTime = '状态记录时间'
+t.realtime.runState = 'running state'
+t.realtime.state = 'status'
+t.realtime.hasFault = 'malfunction'
+t.realtime.recentParamValue = 'recent parameters'
+t.realtime.view = 'view'
+t.realtime.input = 'input' //'投入数'
+t.realtime.output = 'output' //'产出数'
+t.realtime.eqName = 'Equipment name'
+t.realtime.eqCode = 'Equipment cdoe'
+t.realtime.productionSnapshotTime = 'production recording time' // '生产量记录时间'
+t.realtime.statusSnapshotTime = 'status recording time' // '状态记录时间'
 t.realtime.refresh = 'Refresh data...'
 
 
@@ -316,6 +328,40 @@ 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 = {}
@@ -328,6 +374,7 @@ 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}?'
@@ -335,6 +382,7 @@ 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.'
@@ -350,6 +398,8 @@ 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

@@ -63,8 +63,12 @@ t.routes['设备分组报警信息'] = '设备分组报警信息'
 t.routes['设备历史参数'] = '设备历史参数'
 t.routes['质量检测类型'] = '质量检测类型'
 t.routes['质量检测信息'] = '质量检测信息'
+t.routes['安灯检测盒'] = '安灯检测盒'
 
-
+t.andeng = {}
+t.andeng.inspectContent = '检测内容'
+t.andeng.btnVal = '按钮值'
+t.andeng.btnBoxModel = '按钮盒模式'
 
 
 t.dictValueList = '查看值列表'
@@ -163,6 +167,10 @@ t.all = '全部'
 t.reset = '重置'
 t.preview = '预览'
 t.design = '设计'
+t.timetype = '时间类型'
+t.reftimerange = '按时间段'
+t.refdate = '按日期'
+t.hour = '小时'
 
 t.errors = {}
 t.errors.nosection = '该产线没有工段'
@@ -175,6 +183,7 @@ 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.upload2mPic = '上传图片文件，且大小不要超过 2MB (2048KB)'
@@ -216,6 +225,8 @@ t.alarm.content = '报警内容'
 t.alarm.source = '报警来源'
 t.alarm.det = '报警详细内容'
 t.alarm.externalCode = '外部编码'
+t.alarm.description = '描述'
+t.alarm.remark = '备注'
 
 t.report = {}
 t.report.name = '报表名称'
@@ -318,6 +329,39 @@ 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 = {}
@@ -337,6 +381,7 @@ t.prompt.sure = '确定删除这条记录吗?'
 t.prompt.success = '操作成功'
 t.prompt.failed = '操作失败'
 t.prompt.deleteBatch = '请选择删除项'
+t.prompt.month = '请选择月份'
 
 t.validate = {}
 t.validate.required = '必填项不能为空'
@@ -352,6 +397,8 @@ t.datePicker = {}
 t.datePicker.range = '至'
 t.datePicker.start = '开始日期'
 t.datePicker.end = '结束日期'
+t.datePicker.starttime = '开始时间'
+t.datePicker.endtime = '结束时间'
 
 t.fullscreen = {}
 t.fullscreen.prompt = '您的浏览器不支持此操作'

src/views/modules/monitoring/equipmentEfficiency.vue

@@ -5,33 +5,39 @@
 			<!-- 工厂 -->
 			<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="'工厂'" clearable @change="handleFactoryChange">
+				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" 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="'产线'" multiple clearable>
-					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id"
-						:label="productLine.name" />
+				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" 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="'时间类型'" clearable>
-					<el-option value="range" label="按时间段" />
-					<el-option value="date" label="按日期" />
+				<el-select v-model="timeType" :placeholder="$t('timetype')" clearable>
+					<el-option value="range" :label="$t('reftimerange')" />
+					<el-option value="date" :label="$t('refdate')" />
 				</el-select>
 			</el-form-item>
 			<!-- 日期选择 -->
 			<el-form-item v-if="timeType === 'date'">
-				<el-date-picker key="range-picker" v-model="rawTime" type="date" :placeholder="'请选择日期'" format="yyyy-MM-dd" />
+				<el-date-picker key="range-picker" v-model="rawTime" type="date" :placeholder="$t('hints.date')" format="yyyy-MM-dd" />
 			</el-form-item>
 			<!-- 时间段选择 -->
 			<el-form-item v-else>
-				<el-date-picker key="time-picker" v-model="rawTime" type="daterange" :range-separator="'至'"
-					:start-placeholder="'开始时间'" :end-placeholder="'结束时间'" format="yyyy-MM-dd" />
+				<el-date-picker
+					key="time-picker"
+					v-model="rawTime"
+					type="daterange"
+					:range-separator="$t('datePicker.range')"
+					:start-placeholder="$t('datePicker.starttime')"
+					:end-placeholder="$t('datePicker.endtime')"
+					format="yyyy-MM-dd"
+				/>
 			</el-form-item>
 			<!-- 按钮 -->
 			<el-form-item>
@@ -76,39 +82,39 @@ const tableConfigs = [
 	{
 		// name: i18n.t('createTime'),
 		prop: 'factoryName',
-		name: '工厂'
+		name: i18n.t('factory.title')
 	},
-	{ prop: 'pdName', name: '产线' },
-	{ prop: 'wsName', name: '工段' },
-	{ prop: 'eqName', name: '设备' },
+	{ prop: 'pdName', name: i18n.t('pl.title') },
+	{ prop: 'wsName', name: i18n.t('ws.title') },
+	{ prop: 'eqName', name: i18n.t('eq.title') },
 	{
-		name: '有效时间(h)',
+		name: i18n.t('eq.efficienttimeh'),
 		children: [
-			{ prop: 'workTime', name: '工作时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'workRate', name: '工作时长比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'workTime', name: i18n.t('eq.worktimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'workRate', name: i18n.t('eq.workdurationratio'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
-		name: '关机时间(h)',
+		name: i18n.t('eq.shutdowntimeh'),
 		children: [
-			{ prop: 'stopTime', name: '停机时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'stopRate', name: '停机比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'stopTime', name: i18n.t('eq.stoptimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'stopRate', name: i18n.t('eq.stopratio'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
-		name: '中断损失',
+		name: i18n.t('eq.stoplost'),
 		children: [
-			{ prop: 'downTime', name: '故障时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'downRate', name: '故障比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' },
-			{ prop: 'timeEfficiency', name: '时间开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'downTime', name: i18n.t('eq.downtimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'downRate', name: i18n.t('eq.downrate'), width: 120, filter: val => (val * 100).toFixed(2) + '%' },
+			{ prop: 'timeEfficiency', name: i18n.t('eq.timeefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
-		name: '速度损失',
+		name: i18n.t('eq.speedlost'),
 		children: [
-			{ prop: 'realYield', name: '实际加工速度', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'designYield', name: '理论加工速度', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'peEfficiency', name: '速度开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+			{ prop: 'realYield', name: i18n.t('eq.realyield'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'designYield', name: i18n.t('eq.designyield'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'peEfficiency', name: i18n.t('eq.speedefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
 	{
@@ -129,7 +135,7 @@ const tableConfigs = [
 		subcomponent: TableTextComponent,
 		// options: ['edit', 'delete']
 		// options: ['view-trend'] // 查看趋势
-		buttonContent: '查看趋势',
+		buttonContent: i18n.t('eq.viewtrend'),
 		actionName: 'view-trend',
 		emitFullData: true
 	}

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

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="'请选择月份'" format="yyyy-MM" />
+				<el-date-picker key="month-picker" v-model="rawTime" type="month" :placeholder="$t('prompt.month')" format="yyyy-MM" />
 			</el-form-item>
 			<!-- 产线 -->
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="'产线'" multiple clearable>
+				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" 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: '产线名称' },
-	{ prop: 'wsName', name: '工序' },
-	{ prop: 'eqName', name: '设备' },
-	{ prop: 'mtbf', name: '平均故障间隔时间[MTBF] (h)', width: 220 },
-	{ prop: 'mttr', name: '平均维修时间[MTTR] (h)', width: 190 },
-	{ prop: 'workTime', name: '工作时长 (h)' },
-	{ prop: 'downTime', name: '故障时长 (h)' },
-	{ prop: 'downCount', name: '故障次数' },
+	{ prop: 'pdName', name: i18n.t('pl.name') },
+	{ prop: 'wsName', name: i18n.t('ws.title') },
+	{ prop: 'eqName', name: i18n.t('eq.title') },
+	{ prop: 'mtbf', name: i18n.t('eq.mtbf'), width: 220 },
+	{ prop: 'mttr', name: i18n.t('eq.mttr'), width: 190 },
+	{ prop: 'workTime', name: i18n.t('eq.worktimeh') },
+	{ prop: 'downTime', name: i18n.t('eq.downtimeh') },
+	{ prop: 'downCount', name: i18n.t('eq.downcount') }
 	// {
 	// 	prop: 'operations',
 	// 	name: i18n.t('handle'),

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -76,7 +76,9 @@ 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'] }
 ]
 
@@ -88,7 +90,9 @@ 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: 'externalCode', label: i18n.t('alarm.externalCode') }
+		{ name: 'description', label: i18n.t('alarm.description') },
+		{ name: 'remark', label: i18n.t('alarm.remark') }
+		// { name: 'externalCode', label: i18n.t('alarm.externalCode') }
 	],
 	operations: [
 		{ name: 'cancel', showAlways: true },

src/views/modules/monitoring/productionLine.vue

@@ -52,7 +52,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') },
+	{ prop: 'status', name: i18n.t('pl.status'), filter: val => (val === 0 || val === 1 || val === 2) && ['停止', '运行', '未知'][val] },
 	{ 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'] }

src/views/modules/monitoring/qualityInspectionBoxBtn.vue

@@ -0,0 +1,368 @@
+<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>