mt-fe-group/mt-yd-ui
12
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
pull from: fzq
merge into: mt-fe-group:test
Conversation 0 Commits 215 Files Changed 195 +141 -126
29 changed files with 141 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b37798a20 - Show all commits

8
src/components/base-detail-page/index.vue
View File

@ -140,8 +140,8 @@ export default {
if (!name) return null
// for i18n
const defaultNames = {
name: '名称',
code: '编码',
name: i18n.t('name'),
code: i18n.t('code'),
remark: i18n.t('remark'),
description: i18n.t('desc'),
specifications: '规格'
@ -164,8 +164,8 @@ export default {
btnName,
btnType,
defaultNames: {
name: '名称',
code: '编码',
name: i18n.t('name'),
code: i18n.t('code'),
remark: i18n.t('remark'),
description: i18n.t('desc'),
specifications: '规格'

8
src/components/base-dialog/addOrUpdate/index.vue
View File

@ -155,8 +155,8 @@ export default {
if (!name) return null
// for i18n
const defaultNames = {
name: '名称',
code: '编码',
name: i18n.t('name'),
code: i18n.t('code'),
remark: i18n.t('remark'),
description: i18n.t('desc'),
specifications: '规格'
@ -179,8 +179,8 @@ export default {
btnName,
btnType,
defaultNames: {
name: '名称',
code: '编码',
name: i18n.t('name'),
code: i18n.t('code'),
remark: i18n.t('remark'),
description: i18n.t('desc'),
specifications: '规格'

15
src/i18n/en.js
View File

@ -35,8 +35,8 @@ t.updatorName = 'Updator\'s name'
t.updateTime = 'Update Time'
t.version = 'Version'
t.search = 'Search'
t.countPerPage = '每页数'
t.currentPage = '当前页'
t.countPerPage = '每页数' // ?
t.currentPage = '当前页' // ?
t.fetchList = '获取数据列表' // ?
t.multi = '多选' // ?
t.do = '进行' // ?
@ -77,4 +77,15 @@ t.endTime = 'End Time'
t.today = 'Today'
t.login = {}
t.login.title = 'Login'
t.login.username = 'Username'
t.login.password = 'Password'
t.login.captcha = 'Validation Code'
t.login.demo = 'Demo'
t.login.copyright = 'CNBM'
export default t

66
src/i18n/zh-CN.js
View File

@ -7,6 +7,10 @@ t.brand = {}
t.brand.lg = '生产监控系统'
t.brand.mini = '监控'
// 1 代表 '' 号的替换完成
// 2 代表 "" 号的替换完成
// ? 代表需要单独review
t.add = '新增' // 1
t.delete = '删除' // 1
t.deleteBatch = '批量删除' // 1
@ -44,37 +48,37 @@ t.submit = '表单提交' // ?
t.desc = '描述' // 1
t.disable = '停用' // 1
t.equipment = '设备' // 1
t.enabled = '启用状态'
t.cannotempty = '不能为空'
t.parameter = '参数名'
t.enable = '启用'
t.index = '序号'
t.relation = '关联'
t.fetchInfo = '获取信息'
t.name = '名称'
t.code = '编码'
t.attrName = '属性名称'
t.attrValue = '属性值'
t.unit = '单位'
t.table = '表'
t.table2 = '表格'
t.downloadurl = '下载地址'
t.recordTime = '记录时间'
t.notCollect = '不采集'
t.collect = '采集'
t.required = '必填'
t.paramUrl = '参数地址'
t.enname = '英文名称'
t.collectOrNot = '是否采集'
t.min = '最小值'
t.max = '最大值'
t.status = '状态',
t.normal = '正常'
t.addr = '地址'
t.planStop = '计划停机'
t.startTime = '开始时间'
t.endTime = '结束时间'
t.today = '今天'
t.enabled = '启用状态' // ?
t.cannotempty = '不能为空' // ?
t.parameter = '参数名' // 1
t.enable = '启用' // 1
t.index = '序号' // 1
t.relation = '关联' // ?
t.fetchInfo = '获取信息' // ?
t.name = '名称' // 1
t.code = '编码' // 1
t.attrName = '属性名称' // 1
t.attrValue = '属性值' // 1
t.unit = '单位' // 1
t.table = '表' // 1
t.table2 = '表格' // 1
t.downloadurl = '下载地址' // 1
t.recordTime = '记录时间' // 1
t.notCollect = '不采集' // 1
t.collect = '采集' // 1
t.required = '必填' // 1
t.paramUrl = '参数地址' // 1
t.enname = '英文名称' // 1
t.collectOrNot = '是否采集' // 1
t.min = '最小值' // 1
t.max = '最大值' // 1
t.status = '状态' // 1
t.normal = '正常' // ?
t.addr = '地址' // 1
t.planStop = '计划停机' // ?
t.startTime = '开始时间' // 1
t.endTime = '结束时间' // 1
t.today = '今天' // 1
t.alarm = {}

12
src/views/modules/monitoring/equipment.vue
View File

@ -40,7 +40,7 @@ import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{
type: 'index',
name: '序号'
name: i18n.t('index')
// more: {
// index: function(index) {
// return (index + 1) * 2
@ -56,7 +56,7 @@ const tableConfigs = [
{ prop: 'code', name: '设备编码' },
{ prop: 'equipmentTypeName', name: '设备类型' },
{ prop: 'groupName', name: '设备分组' },
{ prop: 'enName', name: '英文名称' },
{ prop: 'enName', name: i18n.t('enname') },
{ prop: 'abbr', name: '缩写' },
{
prop: 'details',
@ -80,7 +80,7 @@ const addOrUpdateConfigs = {
fields: [
{ name: 'name', label: '设备名称', required: true },
{ name: 'code', label: '设备编码' },
{ name: 'enName', label: '英文名称' },
{ name: 'enName', label: i18n.t('enname') },
{ name: 'abbr', label: '缩写' },
{
name: 'equipmentTypeId',
@ -209,10 +209,10 @@ const addOrUpdateConfigs = {
url: '/monitoring/equipmentAttr',
relatedField: 'equipmentId',
tableConfigs: [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'attrName', name: '属性名称', formField: true },
{ prop: 'attrValue', name: '属性值', formField: true },
{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
{
prop: 'operations',
name: i18n.t('handle'),

2
src/views/modules/monitoring/equipmentAlarmLog.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

4
src/views/modules/monitoring/equipmentFile.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -51,7 +51,7 @@ const tableConfigs = [
{ prop: 'version', name: '版本号' },
{ prop: 'typeCode', name: '文件类型编号' },
{ prop: 'fileName', name: '文件名字' },
{ prop: 'fileUrl', name: '下载地址' },
{ prop: 'fileUrl', name: i18n.t('downloadurl') },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

2
src/views/modules/monitoring/equipmentGroupAlarm.vue
View File

@ -9,7 +9,7 @@
<strong>{{ $route.params.groupCode }}</strong>
</el-form-item>
<!-- <el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item> -->
<br />
<el-form-item>

18
src/views/modules/monitoring/equipmentPlc.vue
View File

@ -37,13 +37,13 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ type: 'index', name: '序号' },
{ prop: 'code', name: '编码' },
{ prop: 'name', name: '名称' },
{ prop: 'enName', name: '英文名称' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'code', name: i18n.t('code') },
{ prop: 'name', name: i18n.t('name') },
{ prop: 'enName', name: i18n.t('enname') },
{ prop: 'description', name: i18n.t('desc') },
{ prop: 'barcode', name: 'plc条码' },
{ prop: 'collection', name: '是否采集', filter: val => ({ 0: '不采集', 1: '采集' }[val]) },
{ prop: 'collection', name: i18n.t('collectOrNot'), filter: val => ({ 0: i18n.t('notCollect'), 1: i18n.t('collect') }[val]) },
{ prop: 'ip', name: 'IP' },
{ prop: 'port', name: '端口号' },
{ prop: 'remark', name: i18n.t('remark') },
@ -56,15 +56,15 @@ const addOrUpdateConfigs = {
fields: [
{ name: 'name', required: true },
{ name: 'code', required: true },
{ name: 'enName', label: '英文名称' },
{ name: 'enName', label: i18n.t('enname') },
{
name: 'collection',
label: '是否采集',
label: i18n.t('collectOrNot'),
required: true,
type: 'select',
options: [
{ label: '采集', value: 1 },
{ label: '不采集', value: 0 }
{ label: i18n.t('collect'), value: 1 },
{ label: i18n.t('notCollect'), value: 0 }
]
},
{ name: 'ip', label: 'IP', required: true, placeholder: '0.0.0.0' },

36
src/views/modules/monitoring/equipmentPlcConnect.vue
View File

@ -40,7 +40,7 @@ import { dictFilter } from '@/utils/filters'
// import axios from '@/utils/request.js'
const tableConfigs = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'lineName', name: '产线' },
{ prop: 'sectionName', name: '工段' },
{ prop: 'equName', name: i18n.t('equipment') },
@ -73,41 +73,41 @@ const addOrUpdateConfigs = {
url: '/monitoring/equipmentPlcParam',
relatedField: 'plcConId',
tableConfigs: [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
// { prop: 'plcConId', name: 'plc连接表ID' },
{ prop: 'paramCode', name: '参数编码', formField: true, rules: [{ required: true, message: '必填', trigger: 'blur' }] },
{ prop: 'paramName', name: '参数名称', formField: true, rules: [{ required: true, message: '必填', trigger: 'blur' }] },
{ prop: 'paramAddress', name: '参数地址', formField: true },
{ prop: 'unitDictValue', name: '单位', filter: dictFilter(UnitDictTypeId), formField: true, formType: 'select', formOptions: getUnitList() },
{ prop: 'minValue', name: '最小值', formField: true },
{ prop: 'maxValue', name: '最大值', formField: true },
{ prop: 'paramCode', name: '参数编码', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'paramName', name: '参数名称', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'paramAddress', name: i18n.t('paramUrl'), formField: true },
{ prop: 'unitDictValue', name: i18n.t('unit'), filter: dictFilter(UnitDictTypeId), formField: true, formType: 'select', formOptions: getUnitList() },
{ prop: 'minValue', name: i18n.t('min'), formField: true },
{ prop: 'maxValue', name: i18n.t('max'), formField: true },
{ prop: 'defaultValue', name: '参数设定标准值', formField: true },
{ prop: 'description', name: i18n.t('desc'), formField: true },
{
prop: 'enabled',
name: '启用状态',
filter: val => [i18n.t('disable'), '启用'][+val],
// filter: val => ({0:i18n.t('disable'), 1:'启用'}[+val]),
rules: [{ required: true, message: '必填', trigger: 'blur' }],
name: i18n.t('enabled'),
filter: val => [i18n.t('disable'), i18n.t('enable')][+val],
// filter: val => ({0:i18n.t('disable'), 1:i18n.t('enable')}[+val]),
rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }],
formField: true,
formType: 'select',
formOptions: [
{ value: 0, label: i18n.t('disable') },
{ value: 1, label: '启用' }
{ value: 1, label: i18n.t('enable') }
]
},
{ prop: 'remark', name: i18n.t('remark'), formField: true },
// { prop: 'createTime', name: i18n.t('createTime') },
{
prop: 'collection',
name: '是否采集',
filter: val => ['不采集', '采集'][+val],
rules: [{ required: true, message: '必填', trigger: 'blur' }],
name: i18n.t('collectOrNot'),
filter: val => [i18n.t('notCollect'), i18n.t('collect')][+val],
rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }],
formField: true,
formType: 'select',
formOptions: [
{ value: 0, label: '不采集' },
{ value: 1, label: '采集' }
{ value: 0, label: i18n.t('notCollect') },
{ value: 1, label: i18n.t('collect') }
]
},
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }

16
src/views/modules/monitoring/equipmentPlcParam.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -39,19 +39,19 @@ import { dictFilter } from '@/utils/filters'
const UnitDictTypeId = '1557173812109242370'
const tableConfigs = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'plcConId', name: 'plc连接表ID' },
{ prop: 'paramCode', name: '参数编码' },
{ prop: 'paramName', name: '参数名称' },
{ prop: 'paramAddress', name: '参数地址' },
{ prop: 'unitDictValue', name: '单位', filter: dictFilter(UnitDictTypeId) },
{ prop: 'minValue', name: '最小值' },
{ prop: 'maxValue', name: '最大值' },
{ prop: 'paramAddress', name: i18n.t('paramUrl') },
{ prop: 'unitDictValue', name: i18n.t('unit'), filter: dictFilter(UnitDictTypeId) },
{ prop: 'minValue', name: i18n.t('min') },
{ prop: 'maxValue', name: i18n.t('max') },
{ prop: 'defaultValue', name: '参数设定标准值' },
{ prop: 'description', name: i18n.t('desc') },
{ prop: 'enabled', name: '启用状态', filter: val => [i18n.t('disable'), '启用'][+val] },
{ prop: 'enabled', name: i18n.t('enabled'), filter: val => [i18n.t('disable'), i18n.t('enable')][+val] },
{ prop: 'remark', name: i18n.t('remark') },
{ prop: 'collection', name: '是否采集', filter: val => ['不采集', '采集'][+val] }
{ prop: 'collection', name: i18n.t('collectOrNot'), filter: val => [i18n.t('notCollect'), i18n.t('collect')][+val] }
]
export default {

4
src/views/modules/monitoring/equipmentQuantity-add-or-update.vue
View File

@ -90,9 +90,9 @@ export default {
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
inQuantity: [{ required: true, message: '进入设备的数量不能为空', trigger: 'blur' }],
outQuantity: [{ required: true, message: '离开设备的数量，若plc只记录一个生产数量，也写入该字段不能为空', trigger: 'blur' }],
okQuantity: [{ required: true, message: '不能为空', trigger: 'blur' }],
okQuantity: [{ required: true, message: i18n.t('cannotempty'), trigger: 'blur' }],
nokQuantity: [{ required: true, message: '设备上报的报废数量不能为空', trigger: 'blur' }],
description: [{ required: true, message: '不能为空', trigger: 'blur' }],
description: [{ required: true, message: i18n.t('cannotempty'), trigger: 'blur' }],
remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],

2
src/views/modules/monitoring/equipmentQuantity.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

4
src/views/modules/monitoring/equipmentStatusLog.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -43,7 +43,7 @@ const tableConfigs = [
{ prop: 'equipmentId', name: '设备id' },
{ prop: 'equipmentName', name: '设备名称' },
{ prop: 'status', name: '状态，0正常 1计划停机 2故障' },
{ prop: 'logTime', name: '记录时间' },
{ prop: 'logTime', name: i18n.t('recordTime') },
{ prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },

4
src/views/modules/monitoring/equipmentTypeFile.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -41,7 +41,7 @@ const tableConfigs = [
{ prop: 'fileId', name: '文件ID' },
{ prop: 'typeCode', name: '文件类型编码' },
{ prop: 'fileName', name: '文件名称' },
{ prop: 'fileUrl', name: '下载地址' },
{ prop: 'fileUrl', name: i18n.t('downloadurl') },
{ prop: 'description', name: i18n.t('desc') },
{ prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
{ prop: 'remark', name: i18n.t('remark') },

4
src/views/modules/monitoring/equipmentattr.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -39,7 +39,7 @@ const tableConfigs = [
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'equipmentId', name: '设备ID' },
{ prop: 'attrName', name: '属性名' },
{ prop: 'attrValue', name: '属性值' },
{ prop: 'attrValue', name: i18n.t('attrValue') },
{
prop: 'operations',
name: i18n.t('handle'),

4
src/views/modules/monitoring/factory.vue
View File

@ -40,7 +40,7 @@ const tableConfigs = [
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '工厂名称' },
{ prop: 'code', name: '工厂编码' },
{ prop: 'address', name: '地址' },
{ prop: 'address', name: i18n.t('addr') },
{ prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
@ -56,7 +56,7 @@ const addOrUpdateConfigs = {
},
{
name: 'address',
label: '地址',
label: i18n.t('addr'),
placeholder: '请输入地址'
},
'remark'

12
src/views/modules/monitoring/product.vue
View File

@ -46,12 +46,12 @@ import { dictFilter } from '@/utils/filters'
const UnitDictTypeId = '1557173812109242370'
const ProductTypeDictTypeId = '1557179530308616193'
const tableConfigs = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '产品名称' },
{ prop: 'code', name: '产品编码' },
{ prop: 'specifications', name: '规格' },
{ prop: 'unitDictValue', name: '单位', filter: dictFilter(UnitDictTypeId) },
{ prop: 'unitDictValue', name: i18n.t('unit'), filter: dictFilter(UnitDictTypeId) },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['viewAttr', 'delete'] }
]
@ -89,7 +89,7 @@ const addOrUpdateConfigs = {
},
{
name: 'unitDictValue',
label: '单位',
label: i18n.t('unit'),
type: 'select',
// placeholder: '请选择单位',
options: [
@ -116,10 +116,10 @@ const addOrUpdateConfigs = {
url: '/monitoring/productArrt',
relatedField: 'productId',
tableConfigs: [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: val => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
{ prop: 'name', name: '属性名', formField: true, rules: [{ required: true, message: '必填', trigger: 'blur' }] },
{ prop: 'code', name: '属性值', formField: true },
{ prop: 'name', name: '属性名', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'code', name: i18n.t('attrValue'), formField: true },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
}

10
src/views/modules/monitoring/productArrt.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -38,10 +38,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
const tableConfigs = [
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '属性名称' },
{ prop: 'name', name: i18n.t('attrName') },
{ prop: 'code', name: '属性编码' },
{ prop: 'productId', name: '产品id' },
{ prop: 'value', name: '属性值' },
{ prop: 'value', name: i18n.t('attrValue') },
{ prop: 'description', name: i18n.t('desc') },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
@ -52,7 +52,7 @@ const addOrUpdateConfigs = {
fields: [
{
name: 'name',
label: '属性名称',
label: i18n.t('attrName'),
placeholder: '请输入属性名称'
},
{
@ -68,7 +68,7 @@ const addOrUpdateConfigs = {
},
{
name: 'value',
label: '属性值',
label: i18n.t('attrValue'),
placeholder: '请输入属性值'
},
{

4
src/views/modules/monitoring/productionLineRecSch.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -40,7 +40,7 @@ const tableConfigs = [
{ prop: 'productionLineId', name: '产线id' },
{ prop: 'inputNum', name: '上一次记录时间至该条记录时间端内上片数量' },
{ prop: 'outputNum', name: '上一次记录时间至该条记录时间端内下片数量' },
{ prop: 'recordTime', name: '记录时间' },
{ prop: 'recordTime', name: i18n.t('recordTime') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'sumInputNum', name: '该记录时间点的累计上片数量' },
{ prop: 'sumOutputNum', name: '该记录时间点的累计下片数量' },

12
src/views/modules/monitoring/qualityInspectionCurrent.vue
View File

@ -69,14 +69,14 @@ import SmallTitle from '@/components/small-title'
import * as echarts from 'echarts'
const tableConfigStatic = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ name: '上片总数', prop: 'sumUp' },
{ name: '下片总数', prop: 'sumDown' },
{ name: '检测总数', prop: 'sumCheck' },
{ name: '比例', prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') }
]
const tableConfigDynamic = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ name: '检测类型', prop: 'inspectionContent' },
/** dynamic */
{ name: '检测类型总数', prop: '' },
@ -192,7 +192,7 @@ const FakeChart = {
}
}
const dict = ['表格', '图形']
const dict = [i18n.t('table2'), '图形']
export default {
name: 'QualityInspectionCurrent',
components: { BaseTable, SmallTitle, FakeChart },
@ -209,7 +209,7 @@ export default {
quickOptions: {
shortcuts: [
{
text: '今天',
text: i18n.t('today'),
onClick(picker) {
const baseTime = moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
const startTime = baseTime.format('yyyy-MM-DDTHH:mm:ss')
@ -233,7 +233,7 @@ export default {
},
getDataList() {
this.showGraph = false
this.dataType = '表格'
this.dataType = i18n.t('table2')
this.echartCategories = null
this.echartCheckTypes.splice(0)
/** 设置默认日期 */
@ -280,7 +280,7 @@ export default {
}
this.tableConfigDynamic = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ name: '检测类型', prop: 'inspectionContent' },
...subProps,
{ name: '检测类型总数', prop: 'sumInput' },

2
src/views/modules/monitoring/qualityInspectionRecord.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<!-- <el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item> -->
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

2
src/views/modules/monitoring/reportDetail.vue
View File

@ -117,7 +117,7 @@ export default {
if (res.data && res.data.list) {
const categories = res.data.list.map(item => ({ label: item.name, value: item.id }))
this.tableConfigs = [
{ type: 'index', name: '序号' },
{ type: 'index', name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter, width: 200 },
{ prop: 'fileName', name: '报表名称' },
{ prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories },

2
src/views/modules/monitoring/reportSheet.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

2
src/views/modules/monitoring/reportSheetCategory.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

2
src/views/modules/monitoring/sysfile.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

2
src/views/modules/monitoring/sysfileType.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>

6
src/views/modules/monitoring/testMultiBaseTable.vue
View File

@ -15,9 +15,9 @@ export default {
return {
configs: [
{ prop: 'createTime', name: '创建日期' },
{ prop: 'name', name: '名称' },
{ prop: 'name', name: i18n.t('name') },
{
label: '地址',
label: i18n.t('addr'),
children: [
{ prop: 'province', name: '省' },
{
@ -30,7 +30,7 @@ export default {
}
]
},
{ prop: 'status', name: '状态', filter: val => ['激活', '注销'][val] }
{ prop: 'status', name: i18n.t('status'), filter: val => ['激活', '注销'][val] }
],
dataList: [
{ createTime: '2022-01-01', name: '奥特曼', province: '北京', city: '昌平', county: '怀宁', downtown: '石牌', status: 0 },

2
src/views/modules/monitoring/workShopSectionEquipment.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>