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 +182 -108
41 changed files with 182 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b71a61191b - Show all commits

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

@ -41,7 +41,7 @@
</el-row>
<el-row style="text-align: right;">
<el-button size="small" @click="handleCloseAttrForm">取消</el-button>
<el-button type="success" size="small" @click="handleSaveAttrForm">保存</el-button>
<el-button type="success" size="small" @click="handleSaveAttrForm">{{ $t('save') }}</el-button>
</el-row>
</div>
</div>

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

@ -97,7 +97,7 @@
>{{ btnName[operate.name] }}</el-button
>
</template>
<el-button v-if="isDetail" @click="handleClick({ name: 'cancel' })">返回</el-button>
<el-button v-if="isDetail" @click="handleClick({ name: 'cancel' })">{{ $t('cancel') }}</el-button>
</span>
</el-dialog>
</template>

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

@ -9,7 +9,12 @@ t.brand.mini = '监控'
// 1 代表 '' 号的替换完成
// 2 代表 "" 号的替换完成
// 3 代表不带引号，或 {{ }} 的替换，这三种替换需按顺序执行
// ? 代表需要单独review
// 基本上完成了template模板里的替换工作
// 对比 v2, v3 的结果，补充此文件和 en.js 文件
// 然后替换vue文件的内容
t.add = '新增' // 1
t.delete = '删除' // 1
@ -78,27 +83,88 @@ t.addr = '地址' // 1
t.planStop = '计划停机' // ?
t.startTime = '开始时间' // 1
t.endTime = '结束时间' // 1
t.to = '至' // 1
t.today = '今天' // 1
t.graph = '图形'
t.category = '分类'
t.categoryName = '分类名称'
t.categoryCode = '分类编码'
t.rate = '比例'
t.link = '链接地址'
t.refresh = '刷新'
t.abbr = '缩写'
t.detail = '详情'
t.edit = '编辑'
t.source = '来源'
t.auto = '自动'
t.manual = '手动'
t.loaddone = '加载完成'
t.produceTime = '生产日期'
t.enterTime = '进厂日期'
t.manufacturer = '制造商'
t.factory = {}
t.factory.title = '工厂'
t.factory.name = '工厂名称'
t.factory.code = '工厂编码'
t.prod = {}
t.prod.name = '产品名称'
t.prod.code = '产品编码'
t.alarm = {}
t.alarm.info = '报警信息'
t.alarm.eq = '报警设备'
t.alarm.type = '报警类型'
t.alarm.code = '报警编码'
t.alarm.level = '报警级别'
t.alarm.content = '报警内容'
t.alarm.source = '报警来源'
t.alarm.det = '报警详细内容'
t.report = {}
t.report.name = '报表名称'
t.report.det = '报表内容'
t.inspect = {}
t.inspect.type = '检测类型'
t.inspect.det = '检测内容'
t.inspect.people = '检测人员'
t.inspect.time = '检测时间'
t.inspect.typetotal = '检测类型总数'
t.inspect.typename = '检测类型名称'
t.inspect.typecode = '检测类型编码'
t.inspect.ioTotal = '上下片及检测总数统计'
t.inspect.plTotal = '各产线检测类型统计'
t.realtime = {}
t.realtime.eq = '设备生产实时数据'
t.realtime.pl = '产线生产实时数据'
t.realtime.inspect = '质量检查实时数据'
t.realtime.in = '进数据'
t.realtime.out = '出数据'
t.realtime.rate = '报废比例'
t.ws = {}
t.ws.title = '工段'
t.ws.name = '工段名称'
t.ws.code = '工段编码'
t.ws.binded = '已绑定的设备'
t.ws.unbind = '选择一个设备进行绑定'
t.ws.sort = '排序'
t.ws.setorder = '请输入工段中设备的顺序'
t.ws.bind = '绑定'
t.ws.eqbind = '设备绑定'
t.ws.belong = '所属产线'
t.file = {}
t.file.title = '文件'
t.file.name = '文件名称'
t.file.code = '文件编号'
t.file.typeName = '文件类型名称'
t.file.typeCode = '文件类型编号'
t.eq = {}
@ -106,9 +172,18 @@ t.eq.title = '设备'
t.eq.name = '设备名称'
t.eq.code = '设备编码'
t.eq.type = '设备类型'
t.eq.grade = '设备规格'
t.eq.group = '设备分组'
t.eq.groupname = '分组名称'
t.eq.groupcode = '分组编码'
t.eq.excode = '设备外部代码'
t.eq.input = '上片数据设备'
t.eq.output = '下片数据设备'
t.pl = {}
t.pl.title = '产线'
t.pl.name = '产线名称'
t.pl.belong = '所属产线'
t.prompt = {}
t.prompt.title = '提示'

2
src/views/main-sidebar.vue
View File

@ -46,7 +46,7 @@ export default {
}
list.push(newRouteItem)
} else {
console.log(menu.name, '是应该被隐藏的路由')
// console.log(menu.name, '是应该被隐藏的路由')
}
})
}

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

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="设备名称/设备编码" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('search') }}</el-button>
@ -209,7 +209,7 @@ const addOrUpdateConfigs = {
url: '/monitoring/equipmentAttr',
relatedField: 'equipmentId',
tableConfigs: [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },

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

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

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="分组编码/分组名称" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('eq.groupname')+' / '+$t('eq.groupcode')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

@ -1,20 +1,20 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="设备分组名称">
<el-form-item :label="$t('eq.groupname')">
<strong>{{ $route.params.groupName }}</strong></el-form-item
>
<el-form-item label="设备分组编码">
<el-form-item :label="$t('eq.groupcode')">
<strong>{{ $route.params.groupCode }}</strong>
</el-form-item>
<!-- <el-form-item>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('parameter')" clearable></el-input>
</el-form-item> -->
<br />
<el-form-item>
<!-- <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()">{{ $t('add') }}</el-button>
<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
批量删除
</el-button> -->

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="名称/编码" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('name') + ' / ' + $t('code')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -37,7 +37,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'code', name: i18n.t('code') },
{ prop: 'name', name: i18n.t('name') },
{ prop: 'enName', name: i18n.t('enname') },

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="设备名称/设备编码" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -40,7 +40,7 @@ import { dictFilter } from '@/utils/filters'
// import axios from '@/utils/request.js'
const tableConfigs = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'lineName', name: '产线' },
{ prop: 'sectionName', name: '工段' },
{ prop: 'equName', name: i18n.t('equipment') },
@ -73,7 +73,7 @@ const addOrUpdateConfigs = {
url: '/monitoring/equipmentPlcParam',
relatedField: 'plcConId',
tableConfigs: [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
// { prop: 'plcConId', name: 'plc连接表ID' },
{ prop: 'paramCode', name: '参数编码', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'paramName', name: '参数名称', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -39,7 +39,7 @@ import { dictFilter } from '@/utils/filters'
const UnitDictTypeId = '1557173812109242370'
const tableConfigs = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'plcConId', name: 'plc连接表ID' },
{ prop: 'paramCode', name: '参数编码' },
{ prop: 'paramName', name: '参数名称' },

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

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

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="设备类型" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('eq.type')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -38,7 +38,7 @@ import TableTextComponent from '@/components/base-table/components/detailCompone
const tableConfigs = [
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'equipmentId', name: '设备ID' },
{ prop: 'attrName', name: '属性名' },
{ prop: 'attrName', name: '属性名称' },
{ prop: 'attrValue', name: i18n.t('attrValue') },
{
prop: 'operations',

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="工厂编码/工厂名称" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('factory.name') + ' / ' + $t('factory.code')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

@ -2,13 +2,13 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="产品编号/产品名称" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('prod.name') + ' / ' + $t('prod.code')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</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="addOrEdit()">新增</el-button>
<!-- <el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
<el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrEdit()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -46,7 +46,7 @@ import { dictFilter } from '@/utils/filters'
const UnitDictTypeId = '1557173812109242370'
const ProductTypeDictTypeId = '1557179530308616193'
const tableConfigs = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '产品名称' },
{ prop: 'code', name: '产品编码' },
@ -116,9 +116,9 @@ const addOrUpdateConfigs = {
url: '/monitoring/productArrt',
relatedField: 'productId',
tableConfigs: [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: val => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
{ prop: 'name', name: '属性名', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'name', name: '属性名称', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'code', name: i18n.t('attrValue'), formField: true },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="产线名称" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('pl.name')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

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

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

@ -7,9 +7,9 @@
type="daterange"
v-model="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
range-separator="至"
:start-placeholder="$t('startTime')"
:end-placeholder="$t('endTime')"
:range-separator="$t('to')"
:default-time="['00:00:00', '23:59:59']"
:picker-options="quickOptions"
clearable
@ -17,14 +17,14 @@
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button> -->
</el-form-item>
</el-form>
<div class="quality-inspection-current base-container">
<el-row>
<el-col>
<small-title :size="'md'">上下片及检测总数统计</small-title>
<small-title :size="'md'">{{ $t('inspect.ioTotal') }}</small-title>
<el-row style="margin-top: 12px;">
<base-table :data="dataListStatic" :table-head-configs="tableConfigStatic" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
</el-row>
@ -34,12 +34,12 @@
<el-row style="margin-top: 28px;">
<el-col>
<el-row>
<small-title :size="'md'">各产线检测类型统计</small-title>
<small-title :size="'md'">{{ $t('inspect.plTotal') }}</small-title>
</el-row>
<el-row style="margin-top: 8px;">
<el-radio-group v-model="dataType" size="medium" @change="handleDataTypeChange">
<el-radio-button label="表格"></el-radio-button>
<el-radio-button label="图形"></el-radio-button>
<el-radio-button :label="$t('table2')"></el-radio-button>
<el-radio-button :label="$t('graph')"></el-radio-button>
</el-radio-group>
</el-row>
<el-row style="margin-top: 12px;">
@ -69,14 +69,14 @@ import SmallTitle from '@/components/small-title'
import * as echarts from 'echarts'
const tableConfigStatic = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ name: '上片总数', prop: 'sumUp' },
{ name: '下片总数', prop: 'sumDown' },
{ name: '检测总数', prop: 'sumCheck' },
{ name: '比例', prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') }
]
const tableConfigDynamic = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ name: '检测类型', prop: 'inspectionContent' },
/** dynamic */
{ name: '检测类型总数', prop: '' },
@ -192,7 +192,7 @@ const FakeChart = {
}
}
const dict = [i18n.t('table2'), '图形']
const dict = [i18n.t('table2'), i18n.t('graph')]
export default {
name: 'QualityInspectionCurrent',
components: { BaseTable, SmallTitle, FakeChart },
@ -280,7 +280,7 @@ export default {
}
this.tableConfigDynamic = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ name: '检测类型', prop: 'inspectionContent' },
...subProps,
{ name: '检测类型总数', prop: 'sumInput' },

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="检测内容" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('inspect.det')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="检测类型名称" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('inspect.typename')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

@ -8,7 +8,7 @@
<template>
<div>
<div class="app-container">
<small-title :size="'md'">设备生产实时数据</small-title>
<small-title :size="'md'">{{ $t('realtime.eq') }}</small-title>
<base-table v-if="loadTable" :table-head-configs="tableProps" :data="tableData.length ? tableData : []" :span-method="spanMethod" />
</div>
</div>

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

@ -8,7 +8,7 @@
<template>
<div>
<div class="app-container">
<small-title :size="'md'">产线生产实时数据</small-title>
<small-title :size="'md'">{{ $t('realtime.pl') }}</small-title>
<base-table v-if="loadTable" :table-head-configs="tableProps" :data="tableData.length ? tableData : []" />
</div>
</div>

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

@ -1,7 +1,7 @@
<template>
<div>
<div class="app-container">
<small-title :size="'md'">质量检查实时数据</small-title>
<small-title :size="'md'">{{ $t('realtime.inspect') }}</small-title>
<base-table v-if="loadTable" :table-head-configs="tableProps" :data="tableData.length ? tableData : []" />
</div>
</div>

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.name" placeholder="分类名称" clearable></el-input>
<el-input v-model="dataForm.name" :placeholder="$t('categoryName')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

@ -23,7 +23,6 @@ export default {
const ifream = document.getElementById('zgboke')
ifream.onload = function() {
console.log('加载完成')
vm.loading = false
}
},

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

@ -2,12 +2,12 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.name" placeholder="报表名称" clearable></el-input>
<el-input v-model="dataForm.name" :placeholder="$t('report.name')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -117,7 +117,7 @@ export default {
if (res.data && res.data.list) {
const categories = res.data.list.map(item => ({ label: item.name, value: item.id }))
this.tableConfigs = [
{ type: 'index', name: i18n.t('index') },
{ type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter, width: 200 },
{ prop: 'fileName', name: '报表名称' },
{ prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories },

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

@ -7,7 +7,7 @@
-->
<template>
<div v-loading="loading" :class="$style.container">
<small-title :size="'md'" style="margin-bottom: 10px">报表名称：{{ $route.query.name }}</small-title>
<small-title :size="'md'" style="margin-bottom: 10px">{{ $t('report.name') + ': ' + $route.query.name }}</small-title>
<iframe id="reportView" :class="$style.mainIframe" name="mainIframe" :src="url" frameborder="0" scrolling="auto" />
</div>

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="$t('parameter')" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('parameter')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
@ -37,8 +37,8 @@ import TableTextComponent from '@/components/base-table/components/detailCompone
const tableConfigs = [
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '分类名称' },
{ prop: 'code', name: '分类编码' },
{ prop: 'name', name: i18n.t('categoryName') },
{ prop: 'code', name: i18n.t('categoryCode') },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

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

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

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

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

@ -2,11 +2,11 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="工段名称" clearable></el-input>
<el-input v-model="dataForm.key" :placeholder="$t('ws.name')" clearable></el-input>
</el-form-item>
<el-form-item>
<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()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>

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

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

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

@ -1,39 +1,39 @@
<template>
<el-dialog class="super-flexible-dialog" :title="isDetail ? '详情' : !dataForm.id ? i18n.t('add') : '编辑'" :visible.sync="visible">
<el-dialog class="super-flexible-dialog" :title="isDetail ? $t('ws.detail') : !dataForm.id ? $t('add') : $t('ws.edit')" :visible.sync="visible">
<div style="max-height: 60vh; overflow-y: scroll; overflow-x: hidden;">
<el-form ref="dataForm" :model="dataForm" :rules="dataFormRules">
<el-row :gutter="20">
<el-col :span="12"
><el-form-item label="工段名称" prop="name"> <el-input v-model="dataForm.name" placeholder="请输入工段名称" /> </el-form-item
><el-form-item :label="$t('ws.name')" prop="name"> <el-input v-model="dataForm.name" :placeholder="$t('ws.name')" /> </el-form-item
></el-col>
<el-col :span="12"
><el-form-item label="工段编码" prop="code"> <el-input v-model="dataForm.code" placeholder="请输入工段编码" /> </el-form-item
><el-form-item :label="$t('ws.code')" prop="code"> <el-input v-model="dataForm.code" :placeholder="$t('ws.code')" /> </el-form-item
></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"
><el-form-item label="所属产线" prop="productionLineId">
<el-select v-model="dataForm.productionLineId" placeholder="请输入所属产线">
><el-form-item :label="$t('ws.belong')" prop="productionLineId">
<el-select v-model="dataForm.productionLineId" :placeholder="$t('ws.belong')">
<el-option v-for="line in lineList" :key="line.id" :value="line.id" :label="line.name" />
</el-select> </el-form-item
></el-col>
<el-col :span="12"
><el-form-item label=$t('desc') prop="description"> <el-input v-model="dataForm.description" placeholder="请输入描述" /> </el-form-item
><el-form-item :label="$t('desc')" prop="description"> <el-input v-model="dataForm.description" :placeholder="$t('desc')" /> </el-form-item
></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"
><el-form-item label="备注" prop="remark"> <el-input v-model="dataForm.remark" placeholder="请输入备注" /> </el-form-item
><el-form-item :label="$t('remark')" prop="remark"> <el-input v-model="dataForm.remark" :placeholder="$t('remark')" /> </el-form-item
></el-col>
</el-row>
</el-form>
<section class="attr-form-section" v-if="dataForm.id">
<h3>
设备绑定
<el-button type="text" v-if="!showAttrForm" @click="addEq">新增</el-button>
{{ $t('ws.eqbind') }}
<el-button type="text" v-if="!showAttrForm" @click="addEq">{{ $t('add') }}</el-button>
</h3>
<div class="table" v-if="!showAttrForm">
<base-table :data="eqList" :table-head-configs="tableProps" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
@ -51,9 +51,9 @@
</section>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClick({ name: 'cancel' })">返回</el-button>
<el-button type="primary" v-if="dataForm.id" @click="handleClick({ name: 'update' })">更新</el-button>
<el-button type="success" v-else @click="handleClick({ name: 'save' })">保存</el-button>
<el-button @click="handleClick({ name: 'cancel' })">{{ $t('cancel') }}</el-button>
<el-button type="primary" v-if="dataForm.id" @click="handleClick({ name: 'update' })">{{ $t('update') }}</el-button>
<el-button type="success" v-else @click="handleClick({ name: 'save' })">{{ $t('save') }}</el-button>
</span>
</el-dialog>
</template>

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

@ -4,21 +4,21 @@
<el-form ref="dataForm" :model="dataForm" :rules="dataFormRules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item :label="edit ? '已绑定的设备' : '选择一个设备进行绑定'" prop="equipmentId">
<el-form-item :label="edit ? $t('ws.binded') : $t('ws.unbind')" prop="equipmentId">
<el-select v-if="!edit" clearable v-model="dataForm.equipmentId">
<el-option v-for="eq in eqList" :key="eq.id" :label="eq.name" :value="eq.id" />
</el-select>
<el-input v-else disabled v-model="bindedEquipmentName" /> </el-form-item
></el-col>
<el-col :span="12">
<el-form-item label="排序" prop="sort"> <el-input v-model="dataForm.sort" placeholder="请输入工段中设备的顺序" clearable /> </el-form-item
<el-form-item :label="$t('ws.sort')" prop="sort"> <el-input v-model="dataForm.sort" :placeholder="$t('ws.setorder')" clearable /> </el-form-item
></el-col>
</el-row>
</el-form>
</el-row>
<el-row style="text-align: right">
<el-button size="small" @click="handleCancel">取消</el-button>
<el-button size="small" type="success" @click="handleSave">{{ edit ? i18n.t('update') : '绑定' }}</el-button>
<el-button size="small" @click="handleCancel">{{ $t('cancel') }}</el-button>
<el-button size="small" type="success" @click="handleSave">{{ edit ? $t('update') : $t('ws.bind') }}</el-button>
</el-row>
</div>
</template>