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 +642 -532
54 changed files with 642 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70303f3f06 - Show all commits

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

@ -94,7 +94,7 @@ import { pick } from 'lodash/object'
// 标题 for i18n // 标题 for i18n
const title = { const title = {
detail: '详情', detail: '详情',
add: '新增', add: i18n.t('add'),
edit: '编辑' edit: '编辑'
} }
@ -112,7 +112,7 @@ const btnName = {
save: '保存', save: '保存',
update: '更新', update: '更新',
reset: '重置', reset: '重置',
cancel: '取消' cancel: i18n.t('cancel')
// add more... // add more...
} }
@ -142,8 +142,8 @@ export default {
const defaultNames = { const defaultNames = {
name: '名称', name: '名称',
code: '编码', code: '编码',
remark: '备注', remark: i18n.t('remark'),
description: '描述', description: i18n.t('desc'),
specifications: '规格' specifications: '规格'
// add more... // add more...
} }
@ -166,8 +166,8 @@ export default {
defaultNames: { defaultNames: {
name: '名称', name: '名称',
code: '编码', code: '编码',
remark: '备注', remark: i18n.t('remark'),
description: '描述', description: i18n.t('desc'),
specifications: '规格' specifications: '规格'
// add more... // add more...
}, },
@ -320,11 +320,11 @@ export default {
: this.defaultPlaceholders[opt.name] : this.defaultPlaceholders[opt.name]
? this.defaultPlaceholders[opt.name] ? this.defaultPlaceholders[opt.name]
: opt.label : opt.label
? (opt.type === 'select' ? '请选择' : '请输入') + opt.label ? (opt.type === 'select' ? i18n.t('choose') : '请输入') + opt.label
: null : null
// : opt.type === 'select' // : opt.type === 'select'
// ? '请选择' // ? i18n.t('choose')
// : '请输入' // : '请输入'
} }
}, },

7
src/components/base-dialog/AttrForm/index.vue
View File

@ -48,6 +48,7 @@
</template> </template>
<script> <script>
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import { pick } from 'lodash/object' import { pick } from 'lodash/object'
@ -200,9 +201,9 @@ export default {
deleteHandle(id) { deleteHandle(id) {
var ids = id ? [id] : [] var ids = id ? [id] : []
this.$confirm(`确定对id=${ids.join(',')}进行${id ? '删除' : '批量删除'}操作?`, '提示', { this.$confirm(`确定对id=${ids.join(',')}进行${id ? i18n.t('delete') : i18n.t('deleteBatch')}操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -105,11 +105,11 @@
<script> <script>
import AttrForm from '../AttrForm' import AttrForm from '../AttrForm'
import { pick } from 'lodash/object' import { pick } from 'lodash/object'
import i18n from '@/i18n'
// 标题 for i18n // 标题 for i18n
const title = { const title = {
detail: '详情', detail: '详情',
add: '新增', add: i18n.t('add'),
edit: '编辑' edit: '编辑'
} }
@ -127,7 +127,7 @@ const btnName = {
save: '保存', save: '保存',
update: '更新', update: '更新',
reset: '重置', reset: '重置',
cancel: '取消' cancel: i18n.t('cancel')
// add more... // add more...
} }
@ -157,8 +157,8 @@ export default {
const defaultNames = { const defaultNames = {
name: '名称', name: '名称',
code: '编码', code: '编码',
remark: '备注', remark: i18n.t('remark'),
description: '描述', description: i18n.t('desc'),
specifications: '规格' specifications: '规格'
// add more... // add more...
} }
@ -181,8 +181,8 @@ export default {
defaultNames: { defaultNames: {
name: '名称', name: '名称',
code: '编码', code: '编码',
remark: '备注', remark: i18n.t('remark'),
description: '描述', description: i18n.t('desc'),
specifications: '规格' specifications: '规格'
// add more... // add more...
}, },
@ -335,11 +335,11 @@ export default {
: this.defaultPlaceholders[opt.name] : this.defaultPlaceholders[opt.name]
? this.defaultPlaceholders[opt.name] ? this.defaultPlaceholders[opt.name]
: opt.label : opt.label
? (opt.type === 'select' ? '请选择' : '请输入') + opt.label ? (opt.type === 'select' ? i18n.t('choose') : '请输入') + opt.label
: null : null
// : opt.type === 'select' // : opt.type === 'select'
// ? '请选择' // ? i18n.t('choose')
// : '请输入' // : '请输入'
} }
}, },

74
src/i18n/en.js
View File

@ -3,4 +3,78 @@ const t = {}
t.loading = 'Loading...' t.loading = 'Loading...'
t.createTime = 'Create Time' t.createTime = 'Create Time'
t.brand = {}
t.brand.lg = 'Monitoring System'
t.brand.mini = 'PMS'
t.add = 'Add'
t.delete = 'Delete'
t.deleteBatch = 'Delete Batch'
t.update = 'Update'
t.query = 'Search'
t.export = 'Export'
t.handle = 'Operations'
t.confirm = 'Confirm'
t.cancel = 'Cancel'
t.clear = 'Clear'
t.logout = 'Logout'
t.manage = 'Handle'
t.createDate = 'Create Date'
t.keyword = 'Keyword(s): '
t.choose = 'Please Choose '
t.remark = 'Remark'
t.delMark = 'Delete Mark '
t.isvalid = 'is valid'
t.available = 'available'
t.unavailable = 'unavailable'
t.alert = 'alert'
t.creator = 'Creator'
t.creatorName = 'Creator\'s name'
t.updator = 'Updator'
t.updatorName = 'Updator\'s name'
t.updateTime = 'Update Time'
t.version = 'Version'
t.search = 'Search'
t.countPerPage = '每页数'
t.currentPage = '当前页'
t.fetchList = '获取数据列表' // ?
t.multi = '多选' // ?
t.do = '进行' // ?
t.submit = '表单提交' // ?
t.desc = 'Description'
t.disable = 'Disable'
t.equipment = 'Equipment'
t.enabled = 'Enabled'
t.cannotempty = 'can\'t be empty'
t.parameter = 'Parameters'
t.enable = 'Enable'
t.index = 'Index'
t.relation = '关联'
t.fetchInfo = 'Fetch Info'
t.name = 'Name'
t.code = 'Code'
t.attrName = 'Attribute name'
t.attrValue = 'Attribute value'
t.unit = 'Unit'
t.table = 'Table'
t.table2 = 'Table'
t.downloadurl = 'Download Url'
t.recordTime = 'Record Time'
t.notCollect = 'No'
t.collect = 'Yes'
t.required = 'Required'
t.paramUrl = 'Parameter url'
t.enname = 'English Name'
t.collectOrNot = 'Collect or not'
t.min = 'Min Value'
t.max = 'Max Value'
t.status = 'Status',
t.normal = 'Normal'
t.addr = 'Address'
t.planStop = 'Plan to stop'
t.startTime = 'Start Time'
t.endTime = 'End Time'
t.today = 'Today'
export default t export default t

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

@ -7,21 +7,104 @@ t.brand = {}
t.brand.lg = '生产监控系统' t.brand.lg = '生产监控系统'
t.brand.mini = '监控' t.brand.mini = '监控'
t.add = '新增' t.add = '新增' // 1
t.delete = '删除' t.delete = '删除' // 1
t.deleteBatch = '删除' t.deleteBatch = '批量删除' // 1
t.update = '修改' t.update = '修改' // 1
t.query = '查询' t.query = '查询' // 1
t.export = '导出' t.export = '导出' // 1
t.handle = '操作' t.handle = '操作' // 1
t.confirm = '确定' t.confirm = '确定' // 1
t.cancel = '取消' t.cancel = '取消' // 1
t.clear = '清除' t.clear = '清除' // 1
t.logout = '退出' t.logout = '退出' // 1
t.manage = '处理' t.manage = '处理' // 1
t.createDate = '创建时间' t.createDate = '创建时间' // 1
t.keyword = '关键字：' t.keyword = '关键字：' // 1
t.choose = '请选择' t.choose = '请选择' // 1
t.remark = '备注' // 1
t.delMark = '删除标志' // 0
t.isvalid = '是否有效' // 0
t.available = '可用' // 0
t.unavailable = '不可用' // 0
t.alert = '弹窗' // 0
t.creator = '创建人' // 1
t.creatorName = '创建人姓名' // 1
t.updator = '更新人' // 1
t.updatorName = '更新人姓名' // 1
t.updateTime = '更新时间'
t.version = '版本号' // 1
t.search = '查询' // 1
t.countPerPage = '每页数' // ?
t.currentPage = '当前页' // ?
t.fetchList = '获取数据列表' // ?
t.multi = '多选' // ?
t.do = '进行' // ?
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.alarm = {}
t.alarm.info = '报警信息'
t.alarm.eq = '报警设备'
t.report = {}
t.report.name = '报表名称'
t.inspect = {}
t.inspect.type = '检测类型'
t.inspect.det = '检测内容'
t.ws = {}
t.ws.title = '工段'
t.ws.name = '工段名称'
t.file = {}
t.file.title = '文件'
t.file.name = '文件名称'
t.file.typeCode = '文件类型编号'
t.eq = {}
t.eq.title = '设备'
t.eq.name = '设备名称'
t.eq.code = '设备编码'
t.eq.type = '设备类型'
t.pl = {}
t.pl.title = '产线'
t.prompt = {} t.prompt = {}
t.prompt.title = '提示' t.prompt.title = '提示'
@ -225,6 +308,8 @@ t.menu.resourceMethod = '请求方式'
t.menu.resourceAddItem = '添加一项' t.menu.resourceAddItem = '添加一项'
t.params = {} t.params = {}
t.params.name = '参数名称'
t.params.code = '参数编码'
t.params.paramCode = '编码' t.params.paramCode = '编码'
t.params.paramValue = '值' t.params.paramValue = '值'
t.params.remark = '备注' t.params.remark = '备注'

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

@ -7,7 +7,7 @@
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('search') }}</el-button> <el-button @click="getDataList()">{{ $t('search') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">导出</el-button> <el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -66,7 +66,7 @@ const tableConfigs = [
}, },
{ {
prop: 'operations', prop: 'operations',
name: '操作', name: i18n.t('handle'),
fixed: 'right', fixed: 'right',
width: 180, width: 180,
subcomponent: TableOperateComponent, subcomponent: TableOperateComponent,
@ -210,12 +210,12 @@ const addOrUpdateConfigs = {
relatedField: 'equipmentId', relatedField: 'equipmentId',
tableConfigs: [ tableConfigs: [
{ type: 'index', name: '序号' }, { type: 'index', name: '序号' },
{ prop: 'createTime', name: '创建时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'attrName', name: '属性名称', formField: true }, { prop: 'attrName', name: '属性名称', formField: true },
{ prop: 'attrValue', name: '属性值', formField: true }, { prop: 'attrValue', name: '属性值', formField: true },
{ {
prop: 'operations', prop: 'operations',
name: '操作', name: i18n.t('handle'),
fixed: 'right', fixed: 'right',
width: 180, width: 180,
subcomponent: TableOperateComponent, subcomponent: TableOperateComponent,
@ -240,15 +240,7 @@ const addOrUpdateConfigs = {
] ]
} }
const i18nLocal = {
messages: {
'en': { search: 'Search', add: 'Add', createTime: 'create time' },
'zh-CN': { search: '查询', add: '新建', createTime: '创建时间' }
}
}
export default { export default {
i18n: i18nLocal,
data() { data() {
return { return {
calcMaxHeight, calcMaxHeight,
@ -425,9 +417,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

26
src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="报警信息ID，关联T_equipment_group_alarm表" prop="alarmId"> <el-form-item label="报警信息ID，关联T_equipment_group_alarm表" prop="alarmId">
<el-input v-model="dataForm.alarmId" placeholder="报警信息ID，关联T_equipment_group_alarm表"></el-input> <el-input v-model="dataForm.alarmId" placeholder="报警信息ID，关联T_equipment_group_alarm表"></el-input>
@ -19,26 +19,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenalarmlog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenalarmlog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -28,6 +28,7 @@
<script> <script>
import AddOrUpdate from './equipmentAlarmLog-add-or-update' import AddOrUpdate from './equipmentAlarmLog-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -39,16 +40,16 @@ const tableConfigs = [
{ prop: 'alarmSource', name: '报警来源' }, { prop: 'alarmSource', name: '报警来源' },
{ prop: 'alarmContent', name: '报警详细内容' }, { prop: 'alarmContent', name: '报警详细内容' },
{ prop: 'alarmEquipmentId', name: '报警设备id 关联equipment表' }, { prop: 'alarmEquipmentId', name: '报警设备id 关联equipment表' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '创建时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -127,9 +128,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

26
src/views/modules/monitoring/equipmentAttr-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="设备ID" prop="equipmentId"> <el-form-item label="设备ID" prop="equipmentId">
<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input> <el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
@ -16,26 +16,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

30
src/views/modules/monitoring/equipmentFile-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="设备ID" prop="equipmentId"> <el-form-item label="设备ID" prop="equipmentId">
<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input> <el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
@ -7,8 +7,8 @@
<el-form-item label="文件ID" prop="fileId"> <el-form-item label="文件ID" prop="fileId">
<el-input v-model="dataForm.fileId" placeholder="文件ID"></el-input> <el-input v-model="dataForm.fileId" placeholder="文件ID"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="description"> <el-form-item label=$t('desc') prop="description">
<el-input v-model="dataForm.description" placeholder="描述"></el-input> <el-input v-model="dataForm.description" placeholder=$t('desc')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled"> <el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input> <el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
@ -19,26 +19,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="文件类型编号" prop="typeCode"> <el-form-item label="文件类型编号" prop="typeCode">
<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input> <el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -28,6 +28,7 @@
<script> <script>
import AddOrUpdate from './equipmentFile-add-or-update' import AddOrUpdate from './equipmentFile-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -37,13 +38,13 @@ const tableConfigs = [
{ prop: 'id', name: '' }, { prop: 'id', name: '' },
{ prop: 'equipmentId', name: '设备ID' }, { prop: 'equipmentId', name: '设备ID' },
{ prop: 'fileId', name: '文件ID' }, { prop: 'fileId', name: '文件ID' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'enabled', name: '启用状态:0 、停用，1、启用' }, { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
@ -51,7 +52,7 @@ const tableConfigs = [
{ prop: 'typeCode', name: '文件类型编号' }, { prop: 'typeCode', name: '文件类型编号' },
{ prop: 'fileName', name: '文件名字' }, { prop: 'fileName', name: '文件名字' },
{ prop: 'fileUrl', name: '下载地址' }, { prop: 'fileUrl', name: '下载地址' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -130,9 +131,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

17
src/views/modules/monitoring/equipmentGroup.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="分组编码/分组名称" clearable></el-input> <el-input v-model="dataForm.key" placeholder="分组编码/分组名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -27,21 +27,22 @@
</template> </template>
<script> <script>
import { calcMaxHeight } from '@/utils'; import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './equipmentGroup-add-or-update' // import AddOrUpdate from './equipmentGroup-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '分组名称' }, { prop: 'name', name: '分组名称' },
{ prop: 'code', name: '分组编码' }, { prop: 'code', name: '分组编码' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent, actionName: 'view-alarm' }, { prop: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent, actionName: 'view-alarm' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -152,9 +153,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -13,7 +13,7 @@
</el-form-item> --> </el-form-item> -->
<br /> <br />
<el-form-item> <el-form-item>
<!-- <el-button @click="getDataList()">查询</el-button> --> <!-- <el-button @click="getDataList()">{{ $t('query') }}</el-button> -->
<el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0"> <!-- <el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
批量删除 批量删除
@ -41,6 +41,7 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentGroupAlarm-add-or-update' // import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import dictListMixin from '@/mixins/dictlist-module' import dictListMixin from '@/mixins/dictlist-module'
import TableOperateComponent from '@/components/base-table/components/operationComponent' import TableOperateComponent from '@/components/base-table/components/operationComponent'
@ -54,12 +55,12 @@ const dictEntries = {
} }
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'code', name: '报警编码' }, { prop: 'code', name: '报警编码' },
{ prop: 'typeDictValue', name: '报警类型' }, { prop: 'typeDictValue', name: '报警类型' },
{ prop: 'gradeDictValue', name: '报警级别' }, { prop: 'gradeDictValue', name: '报警级别' },
{ prop: 'alarmContent', name: '报警内容' }, { prop: 'alarmContent', name: '报警内容' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -185,9 +186,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="名称/编码" clearable></el-input> <el-input v-model="dataForm.key" placeholder="名称/编码" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmentplc:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmentplc:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,6 +31,7 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentPlc-add-or-update' // import AddOrUpdate from './equipmentPlc-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -40,13 +41,13 @@ const tableConfigs = [
{ prop: 'code', name: '编码' }, { prop: 'code', name: '编码' },
{ prop: 'name', name: '名称' }, { prop: 'name', name: '名称' },
{ prop: 'enName', name: '英文名称' }, { prop: 'enName', name: '英文名称' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'barcode', name: 'plc条码' }, { prop: 'barcode', name: 'plc条码' },
{ prop: 'collection', name: '是否采集', filter: val => ({ 0: '不采集', 1: '采集' }[val]) }, { prop: 'collection', name: '是否采集', filter: val => ({ 0: '不采集', 1: '采集' }[val]) },
{ prop: 'ip', name: 'IP' }, { prop: 'ip', name: 'IP' },
{ prop: 'port', name: '端口号' }, { prop: 'port', name: '端口号' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -165,9 +166,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="设备名称/设备编码" clearable></el-input> <el-input v-model="dataForm.key" placeholder="设备名称/设备编码" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmentplcconnect:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmentplcconnect:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -32,6 +32,7 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentPlcConnect-add-or-update' // import AddOrUpdate from './equipmentPlcConnect-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -42,12 +43,12 @@ const tableConfigs = [
{ type: 'index', name: '序号' }, { type: 'index', name: '序号' },
{ prop: 'lineName', name: '产线' }, { prop: 'lineName', name: '产线' },
{ prop: 'sectionName', name: '工段' }, { prop: 'sectionName', name: '工段' },
{ prop: 'equName', name: '设备' }, { prop: 'equName', name: i18n.t('equipment') },
{ prop: 'equCode', name: '设备编码' }, { prop: 'equCode', name: '设备编码' },
{ prop: 'plcCode', name: 'PLC编码' }, { prop: 'plcCode', name: 'PLC编码' },
{ prop: 'plcName', name: 'PLC名称' }, { prop: 'plcName', name: 'PLC名称' },
{ prop: 'plcIp', name: 'PLC IP' }, { prop: 'plcIp', name: 'PLC IP' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const UnitDictTypeId = '1557173812109242370' const UnitDictTypeId = '1557173812109242370'
@ -59,7 +60,7 @@ const addOrUpdateConfigs = {
type: 'dialog', type: 'dialog',
infoUrl: '/monitoring/equipmentPlcConnect', infoUrl: '/monitoring/equipmentPlcConnect',
fields: [ fields: [
{ name: 'equipmentId', label: '设备', required: true, type: 'select', options: [] }, { name: 'equipmentId', label: i18n.t('equipment'), required: true, type: 'select', options: [] },
{ name: 'plcId', label: 'PLC名称', required: true, type: 'select', options: [] } { name: 'plcId', label: 'PLC名称', required: true, type: 'select', options: [] }
], ],
operations: [ operations: [
@ -81,22 +82,22 @@ const addOrUpdateConfigs = {
{ prop: 'minValue', name: '最小值', formField: true }, { prop: 'minValue', name: '最小值', formField: true },
{ prop: 'maxValue', name: '最大值', formField: true }, { prop: 'maxValue', name: '最大值', formField: true },
{ prop: 'defaultValue', name: '参数设定标准值', formField: true }, { prop: 'defaultValue', name: '参数设定标准值', formField: true },
{ prop: 'description', name: '描述', formField: true }, { prop: 'description', name: i18n.t('desc'), formField: true },
{ {
prop: 'enabled', prop: 'enabled',
name: '启用状态', name: '启用状态',
filter: val => ['停用', '启用'][+val], filter: val => [i18n.t('disable'), '启用'][+val],
// filter: val => ({0:'停用', 1:'启用'}[+val]), // filter: val => ({0:i18n.t('disable'), 1:'启用'}[+val]),
rules: [{ required: true, message: '必填', trigger: 'blur' }], rules: [{ required: true, message: '必填', trigger: 'blur' }],
formField: true, formField: true,
formType: 'select', formType: 'select',
formOptions: [ formOptions: [
{ value: 0, label: '停用' }, { value: 0, label: i18n.t('disable') },
{ value: 1, label: '启用' } { value: 1, label: '启用' }
] ]
}, },
{ prop: 'remark', name: '备注', formField: true }, { prop: 'remark', name: i18n.t('remark'), formField: true },
// { prop: 'createTime', name: '添加时间' }, // { prop: 'createTime', name: i18n.t('createTime') },
{ {
prop: 'collection', prop: 'collection',
name: '是否采集', name: '是否采集',
@ -109,7 +110,7 @@ const addOrUpdateConfigs = {
{ value: 1, label: '采集' } { value: 1, label: '采集' }
] ]
}, },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
} }
} }
@ -231,9 +232,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

30
src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="plc连接表ID" prop="plcConId"> <el-form-item label="plc连接表ID" prop="plcConId">
<el-input v-model="dataForm.plcConId" placeholder="plc连接表ID"></el-input> <el-input v-model="dataForm.plcConId" placeholder="plc连接表ID"></el-input>
@ -31,8 +31,8 @@
<el-form-item label="参数设定标准值" prop="defaultValue"> <el-form-item label="参数设定标准值" prop="defaultValue">
<el-input v-model="dataForm.defaultValue" placeholder="参数设定标准值"></el-input> <el-input v-model="dataForm.defaultValue" placeholder="参数设定标准值"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="description"> <el-form-item label=$t('desc') prop="description">
<el-input v-model="dataForm.description" placeholder="描述"></el-input> <el-input v-model="dataForm.description" placeholder=$t('desc')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled"> <el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input> <el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
@ -43,26 +43,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="0 代表不采集, 1 代表采集" prop="collection"> <el-form-item label="0 代表不采集, 1 代表采集" prop="collection">
<el-input v-model="dataForm.collection" placeholder="0 代表不采集, 1 代表采集"></el-input> <el-input v-model="dataForm.collection" placeholder="0 代表不采集, 1 代表采集"></el-input>

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenplcparam:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenplcparam:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,6 +30,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentPlcParam-add-or-update' import AddOrUpdate from './equipmentPlcParam-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -47,9 +48,9 @@ const tableConfigs = [
{ prop: 'minValue', name: '最小值' }, { prop: 'minValue', name: '最小值' },
{ prop: 'maxValue', name: '最大值' }, { prop: 'maxValue', name: '最大值' },
{ prop: 'defaultValue', name: '参数设定标准值' }, { prop: 'defaultValue', name: '参数设定标准值' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'enabled', name: '启用状态', filter: val => ['停用', '启用'][+val] }, { prop: 'enabled', name: '启用状态', filter: val => [i18n.t('disable'), '启用'][+val] },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'collection', name: '是否采集', filter: val => ['不采集', '采集'][+val] } { prop: 'collection', name: '是否采集', filter: val => ['不采集', '采集'][+val] }
] ]
@ -129,9 +130,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="设备外部编码" prop="externalCode"> <el-form-item label="设备外部编码" prop="externalCode">
<el-input v-model="dataForm.externalCode" placeholder="设备外部编码"></el-input> <el-input v-model="dataForm.externalCode" placeholder="设备外部编码"></el-input>
@ -28,26 +28,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="生产数量的记录时间" prop="recordTime"> <el-form-item label="生产数量的记录时间" prop="recordTime">
<el-input v-model="dataForm.recordTime" placeholder="生产数量的记录时间"></el-input> <el-input v-model="dataForm.recordTime" placeholder="生产数量的记录时间"></el-input>

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenquantity:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenquantity:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,6 +30,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentQuantity-add-or-update' import AddOrUpdate from './equipmentQuantity-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -46,17 +47,17 @@ const tableConfigs = [
{ prop: 'okQuantity', name: '' }, { prop: 'okQuantity', name: '' },
{ prop: 'nokQuantity', name: '设备上报的报废数量' }, { prop: 'nokQuantity', name: '设备上报的报废数量' },
{ prop: 'description', name: '' }, { prop: 'description', name: '' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'recordTime', name: '生产数量的记录时间' }, { prop: 'recordTime', name: '生产数量的记录时间' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -135,9 +136,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

26
src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="设备外部代码" prop="externalCode"> <el-form-item label="设备外部代码" prop="externalCode">
<el-input v-model="dataForm.externalCode" placeholder="设备外部代码"></el-input> <el-input v-model="dataForm.externalCode" placeholder="设备外部代码"></el-input>
@ -28,26 +28,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenstatuslog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenstatuslog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,6 +30,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentStatusLog-add-or-update' import AddOrUpdate from './equipmentStatusLog-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -43,16 +44,16 @@ const tableConfigs = [
{ prop: 'equipmentName', name: '设备名称' }, { prop: 'equipmentName', name: '设备名称' },
{ prop: 'status', name: '状态，0正常 1计划停机 2故障' }, { prop: 'status', name: '状态，0正常 1计划停机 2故障' },
{ prop: 'logTime', name: '记录时间' }, { prop: 'logTime', name: '记录时间' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -131,9 +132,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

15
src/views/modules/monitoring/equipmentType.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="设备类型" clearable></el-input> <el-input v-model="dataForm.key" placeholder="设备类型" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenttype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenttype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,16 +31,17 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './equipmentType-add-or-update' // import AddOrUpdate from './equipmentType-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '类型名称' }, { prop: 'name', name: '类型名称' },
{ prop: 'code', name: '类型编码' }, { prop: 'code', name: '类型编码' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -176,9 +177,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

30
src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="设备类型ID" prop="equipmentTypeId"> <el-form-item label="设备类型ID" prop="equipmentTypeId">
<el-input v-model="dataForm.equipmentTypeId" placeholder="设备类型ID"></el-input> <el-input v-model="dataForm.equipmentTypeId" placeholder="设备类型ID"></el-input>
@ -16,8 +16,8 @@
<el-form-item label="下载地址" prop="fileUrl"> <el-form-item label="下载地址" prop="fileUrl">
<el-input v-model="dataForm.fileUrl" placeholder="下载地址"></el-input> <el-input v-model="dataForm.fileUrl" placeholder="下载地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="description"> <el-form-item label=$t('desc') prop="description">
<el-input v-model="dataForm.description" placeholder="描述"></el-input> <el-input v-model="dataForm.description" placeholder=$t('desc')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled"> <el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input> <el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
@ -28,26 +28,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmentypefile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmentypefile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,6 +30,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentTypeFile-add-or-update' import AddOrUpdate from './equipmentTypeFile-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -41,18 +42,18 @@ const tableConfigs = [
{ prop: 'typeCode', name: '文件类型编码' }, { prop: 'typeCode', name: '文件类型编码' },
{ prop: 'fileName', name: '文件名称' }, { prop: 'fileName', name: '文件名称' },
{ prop: 'fileUrl', name: '下载地址' }, { prop: 'fileUrl', name: '下载地址' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'enabled', name: '启用状态:0 、停用，1、启用' }, { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -131,9 +132,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenattr:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:equipmenattr:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,18 +30,19 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentAttr-add-or-update' import AddOrUpdate from './equipmentAttr-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'equipmentId', name: '设备ID' }, { prop: 'equipmentId', name: '设备ID' },
{ prop: 'attrName', name: '属性名' }, { prop: 'attrName', name: '属性名' },
{ prop: 'attrValue', name: '属性值' }, { prop: 'attrValue', name: '属性值' },
{ {
prop: 'operations', prop: 'operations',
name: '操作', name: i18n.t('handle'),
fixed: 'right', fixed: 'right',
width: 180, width: 180,
subcomponent: TableOperateComponent, subcomponent: TableOperateComponent,
@ -125,9 +126,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="工厂编码/工厂名称" clearable></el-input> <el-input v-model="dataForm.key" placeholder="工厂编码/工厂名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:factory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:factory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,17 +31,18 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './factory-add-or-update' // import AddOrUpdate from './factory-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '工厂名称' }, { prop: 'name', name: '工厂名称' },
{ prop: 'code', name: '工厂编码' }, { prop: 'code', name: '工厂编码' },
{ prop: 'address', name: '地址' }, { prop: 'address', name: '地址' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -154,9 +155,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="产品编号/产品名称" clearable></el-input> <el-input v-model="dataForm.key" placeholder="产品编号/产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<!-- <el-button @click="addOrEdit()">测试</el-button> --> <!-- <el-button @click="addOrEdit()">测试</el-button> -->
<!-- <el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> --> <!-- <el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> -->
<el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrEdit()">新增</el-button> <el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrEdit()">新增</el-button>
@ -34,6 +34,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './product-add-or-update' // import AddOrUpdate from './product-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -46,12 +47,12 @@ const UnitDictTypeId = '1557173812109242370'
const ProductTypeDictTypeId = '1557179530308616193' const ProductTypeDictTypeId = '1557179530308616193'
const tableConfigs = [ const tableConfigs = [
{ type: 'index', name: '序号' }, { type: 'index', name: '序号' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '产品名称' }, { prop: 'name', name: '产品名称' },
{ prop: 'code', name: '产品编码' }, { prop: 'code', name: '产品编码' },
{ prop: 'specifications', name: '规格' }, { prop: 'specifications', name: '规格' },
{ prop: 'unitDictValue', name: '单位', filter: dictFilter(UnitDictTypeId) }, { prop: 'unitDictValue', name: '单位', filter: dictFilter(UnitDictTypeId) },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['viewAttr', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['viewAttr', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -116,10 +117,10 @@ const addOrUpdateConfigs = {
relatedField: 'productId', relatedField: 'productId',
tableConfigs: [ tableConfigs: [
{ type: 'index', name: '序号' }, { type: 'index', name: '序号' },
{ prop: 'createTime', name: '添加时间', filter: val => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') }, { 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: 'name', name: '属性名', formField: true, rules: [{ required: true, message: '必填', trigger: 'blur' }] },
{ prop: 'code', name: '属性值', formField: true }, { prop: 'code', name: '属性值', formField: true },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
} }
} }
@ -236,9 +237,9 @@ export default {
this.dataListSelections.map(item => { this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:productarrt:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:productarrt:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,18 +31,19 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './productArrt-add-or-update' // import AddOrUpdate from './productArrt-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '属性名称' }, { prop: 'name', name: '属性名称' },
{ prop: 'code', name: '属性编码' }, { prop: 'code', name: '属性编码' },
{ prop: 'productId', name: '产品id' }, { prop: 'productId', name: '产品id' },
{ prop: 'value', name: '属性值' }, { prop: 'value', name: '属性值' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -72,7 +73,7 @@ const addOrUpdateConfigs = {
}, },
{ {
name: 'description', name: 'description',
label: '描述', label: i18n.t('desc'),
placeholder: '请输入描述' placeholder: '请输入描述'
} }
], ],
@ -191,9 +192,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

17
src/views/modules/monitoring/productionLine.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="产线名称" clearable></el-input> <el-input v-model="dataForm.key" placeholder="产线名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:productionline:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:productionline:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,19 +30,20 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'factoryName', name: '工厂' }, { prop: 'factoryName', name: '工厂' },
{ prop: 'name', name: '产线名称' }, { prop: 'name', name: '产线名称' },
{ prop: 'code', name: '产线编码' }, { prop: 'code', name: '产线编码' },
{ prop: 'status', name: '产线状态' }, { prop: 'status', name: '产线状态' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -180,9 +181,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:productionlinerecsch:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:productionlinerecsch:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,6 +30,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './productionLineRecSch-add-or-update' import AddOrUpdate from './productionLineRecSch-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -43,7 +44,7 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'sumInputNum', name: '该记录时间点的累计上片数量' }, { prop: 'sumInputNum', name: '该记录时间点的累计上片数量' },
{ prop: 'sumOutputNum', name: '该记录时间点的累计下片数量' }, { prop: 'sumOutputNum', name: '该记录时间点的累计下片数量' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -122,9 +123,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

2
src/views/modules/monitoring/productionlinerecsch-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="产线id" prop="productionLineId"> <el-form-item label="产线id" prop="productionLineId">
<el-input v-model="dataForm.productionLineId" placeholder="产线id"></el-input> <el-input v-model="dataForm.productionLineId" placeholder="产线id"></el-input>

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

@ -16,7 +16,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<!-- <el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> --> <!-- <el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -63,6 +63,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import moment from 'moment' import moment from 'moment'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title' import SmallTitle from '@/components/small-title'
import * as echarts from 'echarts' import * as echarts from 'echarts'

15
src/views/modules/monitoring/qualityInspectionDet.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="检测内容" clearable></el-input> <el-input v-model="dataForm.key" placeholder="检测内容" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:qualityinspectiondet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:qualityinspectiondet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,17 +31,18 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './qualityInspectionDet-add-or-update' // import AddOrUpdate from './qualityInspectionDet-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'typeName', name: '检测类型' }, { prop: 'typeName', name: '检测类型' },
{ prop: 'content', name: '检测内容' }, { prop: 'content', name: '检测内容' },
{ prop: 'code', name: '检测编码' }, { prop: 'code', name: '检测编码' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -168,9 +169,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -40,12 +40,13 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './qualityInspectionRecord-add-or-update' // import AddOrUpdate from './qualityInspectionRecord-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ {
prop: 'inspectionDetContent', prop: 'inspectionDetContent',
name: '检测内容' name: '检测内容'
@ -55,9 +56,9 @@ const tableConfigs = [
{ prop: 'sectionId', name: '工段id' }, { prop: 'sectionId', name: '工段id' },
{ prop: 'checkPerson', name: '检测人员' }, { prop: 'checkPerson', name: '检测人员' },
{ prop: 'source', name: '来源', filter: val => ({ 1: '手动', 2: '自动' }[val]) }, { prop: 'source', name: '来源', filter: val => ({ 1: '手动', 2: '自动' }[val]) },
{ prop: 'explainText', name: '描述' }, { prop: 'explainText', name: i18n.t('desc') },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -78,7 +79,7 @@ const addOrUpdateConfigs = {
}, },
{ name: 'inspectionDetId', label: '检测内容', type: 'select', options: [] }, { name: 'inspectionDetId', label: '检测内容', type: 'select', options: [] },
{ name: 'checkPerson', label: '检测人员' }, { name: 'checkPerson', label: '检测人员' },
{ name: 'explainText', label: '描述' }, { name: 'explainText', label: i18n.t('desc') },
'remark' 'remark'
], ],
operations: [ operations: [
@ -246,9 +247,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

15
src/views/modules/monitoring/qualityInspectionType.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="检测类型名称" clearable></el-input> <el-input v-model="dataForm.key" placeholder="检测类型名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:qualityinspectiontype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:qualityinspectiontype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -29,17 +29,18 @@
<script> <script>
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './qualityInspectionType-add-or-update' // import AddOrUpdate from './qualityInspectionType-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '检测类型名称' }, { prop: 'name', name: '检测类型名称' },
{ prop: 'code', name: '检测类型编码' }, { prop: 'code', name: '检测类型编码' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -139,9 +140,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

3
src/views/modules/monitoring/realtimeEquipment.vue
View File

@ -15,6 +15,7 @@
</template> </template>
<script> <script>
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title' import SmallTitle from '@/components/small-title'
import moment from 'moment' import moment from 'moment'
@ -174,7 +175,7 @@ export default {
// Step1: 设置静态的 table props // Step1: 设置静态的 table props
const staticTableProps = [ const staticTableProps = [
{ prop: 'lineName', label: '产线', fixed: true }, { prop: 'lineName', label: '产线', fixed: true },
{ prop: 'equName', label: '设备', fixed: true }, { prop: 'equName', label: i18n.t('equipment'), fixed: true },
{ prop: 'totalProduction', label: '总产量', fixed: true } { prop: 'totalProduction', label: '总产量', fixed: true }
] ]
this.tableProps = staticTableProps this.tableProps = staticTableProps

1
src/views/modules/monitoring/realtimeProductLine.vue
View File

@ -15,6 +15,7 @@
</template> </template>
<script> <script>
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title' import SmallTitle from '@/components/small-title'
import moment from 'moment' import moment from 'moment'

1
src/views/modules/monitoring/realtimeQualityInspection.vue
View File

@ -10,6 +10,7 @@
<script> <script>
// @ts-nocheck // @ts-nocheck
/* eslint-disable */ /* eslint-disable */
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title' import SmallTitle from '@/components/small-title'
import moment from 'moment' import moment from 'moment'

13
src/views/modules/monitoring/reportCategory.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.name" placeholder="分类名称" clearable></el-input> <el-input v-model="dataForm.name" placeholder="分类名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:reportsheetcategory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:reportsheetcategory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,15 +30,16 @@
<script> <script>
// import AddOrUpdate from './reportSheetCategory-add-or-update' // import AddOrUpdate from './reportSheetCategory-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '分类名称' }, { prop: 'name', name: '分类名称' },
{ prop: 'operations', name: '操作', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -137,9 +138,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.name" placeholder="报表名称" clearable></el-input> <el-input v-model="dataForm.name" placeholder="报表名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<!-- <el-button v-if="$hasPermission('')" type="primary" @click="addOrUpdateHandle()">新增(跳到设计)</el-button> --> <!-- <el-button v-if="$hasPermission('')" type="primary" @click="addOrUpdateHandle()">新增(跳到设计)</el-button> -->
<el-button v-if="$hasPermission('monitoring:reportsheet:save')" type="primary" @click="handleAdd()">新增</el-button> <el-button v-if="$hasPermission('monitoring:reportsheet:save')" type="primary" @click="handleAdd()">新增</el-button>
</el-form-item> </el-form-item>
@ -33,6 +33,7 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentPlcConnect-add-or-update' // import AddOrUpdate from './equipmentPlcConnect-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent' import TableOperateComponent from '@/components/base-table/components/operationComponent'
import axios from '@/utils/request' import axios from '@/utils/request'
@ -117,12 +118,12 @@ export default {
const categories = res.data.list.map(item => ({ label: item.name, value: item.id })) const categories = res.data.list.map(item => ({ label: item.name, value: item.id }))
this.tableConfigs = [ this.tableConfigs = [
{ type: 'index', name: '序号' }, { type: 'index', name: '序号' },
{ prop: 'createTime', name: '创建时间', filter: timeFilter, width: 200 }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter, width: 200 },
{ prop: 'fileName', name: '报表名称' }, { prop: 'fileName', name: '报表名称' },
{ prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories }, { prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories },
{ {
prop: 'operations', prop: 'operations',
name: '操作', name: i18n.t('handle'),
fixed: 'right', fixed: 'right',
width: 180, width: 180,
subcomponent: TableOperateComponent, subcomponent: TableOperateComponent,
@ -234,9 +235,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="分类：关联report_sheet_category" prop="category"> <el-form-item label="分类：关联report_sheet_category" prop="category">
<el-input v-model="dataForm.category" placeholder="分类：关联report_sheet_category"></el-input> <el-input v-model="dataForm.category" placeholder="分类：关联report_sheet_category"></el-input>
@ -16,8 +16,8 @@
<el-form-item label="链接地址" prop="url"> <el-form-item label="链接地址" prop="url">
<el-input v-model="dataForm.url" placeholder="链接地址"></el-input> <el-input v-model="dataForm.url" placeholder="链接地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="description"> <el-form-item label=$t('desc') prop="description">
<el-input v-model="dataForm.description" placeholder="描述"></el-input> <el-input v-model="dataForm.description" placeholder=$t('desc')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled"> <el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input> <el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
@ -28,26 +28,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报表内容" prop="content"> <el-form-item label="报表内容" prop="content">
<el-input v-model="dataForm.content" placeholder="报表内容"></el-input> <el-input v-model="dataForm.content" placeholder="报表内容"></el-input>

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:reporsheet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:reporsheet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,21 +30,22 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './reportSheet-add-or-update' import AddOrUpdate from './reportSheet-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '创建时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '报表名称' }, { prop: 'name', name: '报表名称' },
{ prop: 'code', name: '报表编码' }, { prop: 'code', name: '报表编码' },
{ prop: 'category', name: '报表分类' }, { prop: 'category', name: '报表分类' },
{ prop: 'fileName', name: '文件名称' }, { prop: 'fileName', name: '文件名称' },
{ prop: 'url', name: '链接地址' }, { prop: 'url', name: '链接地址' },
{ prop: 'description', name: '描述' }, { prop: 'description', name: i18n.t('desc') },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'content', name: '报表内容' }, { prop: 'content', name: '报表内容' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -123,9 +124,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="编码" prop="code"> <el-form-item label="编码" prop="code">
<el-input v-model="dataForm.code" placeholder="编码"></el-input> <el-input v-model="dataForm.code" placeholder="编码"></el-input>
@ -7,8 +7,8 @@
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="dataForm.name" placeholder="名称"></el-input> <el-input v-model="dataForm.name" placeholder="名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="description"> <el-form-item label=$t('desc') prop="description">
<el-input v-model="dataForm.description" placeholder="描述"></el-input> <el-input v-model="dataForm.description" placeholder=$t('desc')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="外部编码，用于对照外部系统的编码" prop="externalCode"> <el-form-item label="外部编码，用于对照外部系统的编码" prop="externalCode">
<el-input v-model="dataForm.externalCode" placeholder="外部编码，用于对照外部系统的编码"></el-input> <el-input v-model="dataForm.externalCode" placeholder="外部编码，用于对照外部系统的编码"></el-input>
@ -22,26 +22,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:reporsheecategory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:reporsheecategory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,15 +30,16 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './reportSheetCategory-add-or-update' import AddOrUpdate from './reportSheetCategory-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '分类名称' }, { prop: 'name', name: '分类名称' },
{ prop: 'code', name: '分类编码' }, { prop: 'code', name: '分类编码' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -117,9 +118,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

26
src/views/modules/monitoring/sysfile-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="文件类型编号" prop="typeCode"> <el-form-item label="文件类型编号" prop="typeCode">
<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input> <el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
@ -19,26 +19,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:sysfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:sysfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -30,6 +30,7 @@
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './sysFile-add-or-update' import AddOrUpdate from './sysFile-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -40,16 +41,16 @@ const tableConfigs = [
{ prop: 'fileCode', name: '文件编号' }, { prop: 'fileCode', name: '文件编号' },
{ prop: 'fileName', name: '文件名称' }, { prop: 'fileName', name: '文件名称' },
{ prop: 'fileUrl', name: '文件路径URL' }, { prop: 'fileUrl', name: '文件路径URL' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -128,9 +129,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:sysfiletype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:sysfiletype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -28,6 +28,7 @@
<script> <script>
import AddOrUpdate from './sysFileType-add-or-update' import AddOrUpdate from './sysFileType-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
@ -37,16 +38,16 @@ const tableConfigs = [
{ prop: 'id', name: '主键，自增' }, { prop: 'id', name: '主键，自增' },
{ prop: 'typeCode', name: '文件类型编号' }, { prop: 'typeCode', name: '文件类型编号' },
{ prop: 'typeName', name: '文件类型名称' }, { prop: 'typeName', name: '文件类型名称' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter }, { prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -125,9 +126,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

26
src/views/modules/monitoring/sysfiletype-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="文件类型编号" prop="typeCode"> <el-form-item label="文件类型编号" prop="typeCode">
<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input> <el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
@ -13,26 +13,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

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

@ -5,6 +5,7 @@
</template> </template>
<script> <script>
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
export default { export default {

15
src/views/modules/monitoring/workShopSection.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="工段名称" clearable></el-input> <el-input v-model="dataForm.key" placeholder="工段名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:workshopsection:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:workshopsection:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,17 +31,18 @@ import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from '@/components/base-dialog/addOrUpdate' // import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import AddOrUpdate from './workshopSectionDialog.vue' import AddOrUpdate from './workshopSectionDialog.vue'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '工段名称' }, { prop: 'name', name: '工段名称' },
{ prop: 'code', name: '工段编码' }, { prop: 'code', name: '工段编码' },
{ prop: 'productionLineName', name: '产线' }, { prop: 'productionLineName', name: '产线' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
const addOrUpdateConfigs = { const addOrUpdateConfigs = {
@ -165,9 +166,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

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

@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button v-if="$hasPermission('monitoring:workshopsectionequipment:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="$hasPermission('monitoring:workshopsectionequipment:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -28,18 +28,19 @@
<script> <script>
import AddOrUpdate from './workshopSectionEquipment-add-or-update' import AddOrUpdate from './workshopSectionEquipment-add-or-update'
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' 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 TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils' import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters' import { timeFilter } from '@/utils/filters'
const tableConfigs = [ const tableConfigs = [
{ prop: 'createTime', name: '添加时间', filter: timeFilter }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'workshopSectionId', name: '工段ID' }, { prop: 'workshopSectionId', name: '工段ID' },
{ prop: 'equipmentId', name: '设备ID' }, { prop: 'equipmentId', name: '设备ID' },
{ prop: 'sort', name: '排序' }, { prop: 'sort', name: '排序' },
{ prop: 'remark', name: '备注' }, { prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
@ -118,9 +119,9 @@ export default {
: this.dataListSelections.map(item => { : this.dataListSelections.map(item => {
return item.id return item.id
}) })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? i18n.t('delete') : i18n.t('deleteBatch')}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

92
src/views/modules/monitoring/workshopSectionDialog.vue
View File

@ -1,59 +1,31 @@
<template> <template>
<el-dialog <el-dialog class="super-flexible-dialog" :title="isDetail ? '详情' : !dataForm.id ? i18n.t('add') : '编辑'" :visible.sync="visible">
class="super-flexible-dialog"
:title="isDetail ? '详情' : !dataForm.id ? '新增' : '编辑'"
:visible.sync="visible"
>
<div style="max-height: 60vh; overflow-y: scroll; overflow-x: hidden;"> <div style="max-height: 60vh; overflow-y: scroll; overflow-x: hidden;">
<el-form ref="dataForm" :model="dataForm" :rules="dataFormRules"> <el-form ref="dataForm" :model="dataForm" :rules="dataFormRules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" <el-col :span="12"
><el-form-item label="工段名称" prop="name"> ><el-form-item label="工段名称" prop="name"> <el-input v-model="dataForm.name" placeholder="请输入工段名称" /> </el-form-item
<el-input
v-model="dataForm.name"
placeholder="请输入工段名称"
/> </el-form-item
></el-col> ></el-col>
<el-col :span="12" <el-col :span="12"
><el-form-item label="工段编码" prop="code"> ><el-form-item label="工段编码" prop="code"> <el-input v-model="dataForm.code" placeholder="请输入工段编码" /> </el-form-item
<el-input
v-model="dataForm.code"
placeholder="请输入工段编码"
/> </el-form-item
></el-col> ></el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" <el-col :span="12"
><el-form-item label="所属产线" prop="productionLineId"> ><el-form-item label="所属产线" prop="productionLineId">
<el-select <el-select v-model="dataForm.productionLineId" placeholder="请输入所属产线">
v-model="dataForm.productionLineId" <el-option v-for="line in lineList" :key="line.id" :value="line.id" :label="line.name" />
placeholder="请输入所属产线"
>
<el-option
v-for="line in lineList"
:key="line.id"
:value="line.id"
:label="line.name"
/>
</el-select> </el-form-item </el-select> </el-form-item
></el-col> ></el-col>
<el-col :span="12" <el-col :span="12"
><el-form-item label="描述" prop="description"> ><el-form-item label=$t('desc') prop="description"> <el-input v-model="dataForm.description" placeholder="请输入描述" /> </el-form-item
<el-input
v-model="dataForm.description"
placeholder="请输入描述"
/> </el-form-item
></el-col> ></el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" <el-col :span="12"
><el-form-item label="备注" prop="remark"> ><el-form-item label="备注" prop="remark"> <el-input v-model="dataForm.remark" placeholder="请输入备注" /> </el-form-item
<el-input
v-model="dataForm.remark"
placeholder="请输入备注"
/> </el-form-item
></el-col> ></el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -61,18 +33,10 @@
<section class="attr-form-section" v-if="dataForm.id"> <section class="attr-form-section" v-if="dataForm.id">
<h3> <h3>
设备绑定 设备绑定
<el-button type="text" v-if="!showAttrForm" @click="addEq" <el-button type="text" v-if="!showAttrForm" @click="addEq">新增</el-button>
>新增</el-button
>
</h3> </h3>
<div class="table" v-if="!showAttrForm"> <div class="table" v-if="!showAttrForm">
<base-table <base-table :data="eqList" :table-head-configs="tableProps" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
:data="eqList"
:table-head-configs="tableProps"
:max-height="calcMaxHeight(8)"
@operate-event="handleOperations"
@refreshDataList="getDataList"
/>
<el-pagination <el-pagination
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@current-change="currentChangeHandle" @current-change="currentChangeHandle"
@ -83,31 +47,19 @@
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
/> />
</div> </div>
<attr-form <attr-form v-else ref="AttrFrom" :workshop-section-id="dataForm.id" @close-attr-form="showAttrForm = false" @refresh-list="handleRefreshList" />
v-else
ref="AttrFrom"
:workshop-section-id="dataForm.id"
@close-attr-form="showAttrForm = false"
@refresh-list="handleRefreshList"
/>
</section> </section>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClick({ name: 'cancel' })">返回</el-button> <el-button @click="handleClick({ name: 'cancel' })">返回</el-button>
<el-button <el-button type="primary" v-if="dataForm.id" @click="handleClick({ name: 'update' })">更新</el-button>
type="primary" <el-button type="success" v-else @click="handleClick({ name: 'save' })">保存</el-button>
v-if="dataForm.id"
@click="handleClick({ name: 'update' })"
>更新</el-button
>
<el-button type="success" v-else @click="handleClick({ name: 'save' })"
>保存</el-button
>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import i18n from '@/i18n'
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title' import SmallTitle from '@/components/small-title'
import { pick } from 'lodash/object' import { pick } from 'lodash/object'
@ -118,7 +70,7 @@ const tableProps = [
{ name: '设备名', prop: 'equipmentName' }, { name: '设备名', prop: 'equipmentName' },
{ name: '排序', prop: 'sort' }, { name: '排序', prop: 'sort' },
{ {
name: '操作', name: i18n.t('handle'),
prop: 'operations', prop: 'operations',
fixed: 'right', fixed: 'right',
width: 180, width: 180,
@ -178,19 +130,11 @@ export default {
if (id) { if (id) {
// 编辑 // 编辑
this.$http({ this.$http({
url: this.$http.adornUrl( url: this.$http.adornUrl('/monitoring/workshopSection/' + this.dataForm.id),
'/monitoring/workshopSection/' + this.dataForm.id
),
method: 'get' method: 'get'
}).then(({ data: res }) => { }).then(({ data: res }) => {
if (res.data) { if (res.data) {
const { const { name, code, productionLineId, description, remark } = res.data
name,
code,
productionLineId,
description,
remark
} = res.data
this.dataForm.name = name this.dataForm.name = name
this.dataForm.code = code this.dataForm.code = code
this.dataForm.productionLineId = productionLineId this.dataForm.productionLineId = productionLineId
@ -276,8 +220,8 @@ export default {
handleDeleteEq(id) { handleDeleteEq(id) {
this.$confirm(`确定删除这条记录吗?`, '提示', { this.$confirm(`确定删除这条记录吗?`, '提示', {
// this.$confirm(`确定删除 ${id} 吗?`, '提示', { // this.$confirm(`确定删除 ${id} 吗?`, '提示', {
confirmButtonText: '确定', confirmButtonText: i18n.t('confirm'),
cancelButtonText: '取消', cancelButtonText: i18n.t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({

47
src/views/modules/monitoring/workshopSectionDialogAttrForm.vue
View File

@ -4,40 +4,21 @@
<el-form ref="dataForm" :model="dataForm" :rules="dataFormRules"> <el-form ref="dataForm" :model="dataForm" :rules="dataFormRules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item :label="edit ? '已绑定的设备' : '选择一个设备进行绑定'" prop="equipmentId">
:label="edit ? '已绑定的设备' : '选择一个设备进行绑定'"
prop="equipmentId"
>
<el-select v-if="!edit" clearable v-model="dataForm.equipmentId"> <el-select v-if="!edit" clearable v-model="dataForm.equipmentId">
<el-option <el-option v-for="eq in eqList" :key="eq.id" :label="eq.name" :value="eq.id" />
v-for="eq in eqList"
:key="eq.id"
:label="eq.name"
:value="eq.id"
/>
</el-select> </el-select>
<el-input <el-input v-else disabled v-model="bindedEquipmentName" /> </el-form-item
v-else
disabled
v-model="bindedEquipmentName"
/> </el-form-item
></el-col> ></el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort"> <el-input v-model="dataForm.sort" placeholder="请输入工段中设备的顺序" clearable /> </el-form-item
<el-input
v-model="dataForm.sort"
placeholder="请输入工段中设备的顺序"
clearable
/> </el-form-item
></el-col> ></el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-row> </el-row>
<el-row style="text-align: right"> <el-row style="text-align: right">
<el-button size="small" @click="handleCancel">取消</el-button> <el-button size="small" @click="handleCancel">取消</el-button>
<el-button size="small" type="success" @click="handleSave">{{ <el-button size="small" type="success" @click="handleSave">{{ edit ? i18n.t('update') : '绑定' }}</el-button>
edit ? '修改' : '绑定'
}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
@ -127,15 +108,15 @@ export default {
} }
}).then(({ data: res }) => { }).then(({ data: res }) => {
if (res.data) { if (res.data) {
this.$message.success({ this.$message.success({
message: '操作成功', message: '操作成功',
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.$emit('refresh-list') this.$emit('refresh-list')
this.handleCancel() this.handleCancel()
} }
}) })
} }
}) })
} }
} }

26
src/views/modules/monitoring/workshopsectionequipment-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> <el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="工段ID" prop="workshopSectionId"> <el-form-item label="工段ID" prop="workshopSectionId">
<el-input v-model="dataForm.workshopSectionId" placeholder="工段ID"></el-input> <el-input v-model="dataForm.workshopSectionId" placeholder="工段ID"></el-input>
@ -16,26 +16,26 @@
<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid"> <el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input> <el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="creatorId"> <el-form-item label=$t('creator') prop="creatorId">
<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input> <el-input v-model="dataForm.creatorId" placeholder=$t('creator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人姓名" prop="creatorName"> <el-form-item label=$t('creatorName') prop="creatorName">
<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input> <el-input v-model="dataForm.creatorName" placeholder=$t('creatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updaterId"> <el-form-item label=$t('updator') prop="updaterId">
<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input> <el-input v-model="dataForm.updaterId" placeholder=$t('updator')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新人姓名" prop="updaterName"> <el-form-item label=$t('updatorName') prop="updaterName">
<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input> <el-input v-model="dataForm.updaterName" placeholder=$t('updatorName')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label=$t('updateTime') prop="updateTime">
<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input> <el-input v-model="dataForm.updateTime" placeholder=$t('updateTime')></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label=$t('version') prop="version">
<el-input v-model="dataForm.version" placeholder="版本号"></el-input> <el-input v-model="dataForm.version" placeholder=$t('version')></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">