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 +91 -90
36 changed files with 91 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2df5897f3d - Show all commits

1
TODO.md
View File

@ -3,3 +3,4 @@
1. 按钮加权限
2. 国际化
3. 表格高度
4. 表格时间格式修改

5
src/utils/filters.js
View File

@ -1,7 +1,12 @@
/** filters */
import moment from 'moment'
export const dictFilter = dictTypeId => {
return val => {
return JSON.parse(localStorage.getItem('dictList'))[dictTypeId].find(item => item.dictValue === val)?.dictLabel || '-'
}
}
export const timeFilter = (val) => {
return moment(val).format('YYYY-MM-DD HH:mm:ss')
}

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

@ -1,36 +1,17 @@
<template>
<div class="mod-config">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<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="设备名称/设备编码" clearable></el-input>
</el-form-item>
<el-form-item>
<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 @click="exportHandle()">导出</el-button>
</el-form-item>
</el-form>
<base-table
:data="dataList"
:table-head-configs="tableConfigs"
:max-height="calcMaxHeight(8)"
@operate-event="handleOperations"
@refreshDataList="getDataList"
/>
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -41,13 +22,7 @@
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
:configs="addOrUpdateConfigs"
@refreshDataList="getDataList"
@destory-dialog="addOrUpdateVisible = false"
/>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
</div>
</template>
@ -58,9 +33,9 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
import moment from 'moment'
import CKEditor from 'ckeditor4-vue'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{
@ -75,7 +50,7 @@ const tableConfigs = [
{
prop: 'createTime',
name: i18n.t('createTime'),
filter: val => moment(val).format('YYYY-MM-DD HH:mm:ss')
filter: timeFilter
},
{ prop: 'name', name: '设备名称' },
{ prop: 'code', name: '设备编码' },
@ -235,7 +210,7 @@ const addOrUpdateConfigs = {
relatedField: 'equipmentId',
tableConfigs: [
{ type: 'index', name: '序号' },
{ prop: 'createTime', name: '创建时间' },
{ prop: 'createTime', name: '创建时间', filter: timeFilter },
{ prop: 'attrName', name: '属性名称', formField: true },
{ prop: 'attrValue', name: '属性值', formField: true },
{
@ -313,9 +288,7 @@ export default {
// key: this.dataForm.key
})
}).then(({ data }) => {
const eqTypeConfig = this.addOrUpdateConfigs.fields.find(
item => item.name === 'equipmentTypeId'
)
const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
eqTypeConfig.options =
data.data?.list?.map(item => ({
value: item.id,
@ -334,9 +307,7 @@ export default {
// key: this.dataForm.key
})
}).then(({ data }) => {
const groupConfig = this.addOrUpdateConfigs.fields.find(
item => item.name === 'groupId'
)
const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
groupConfig.options =
data.data?.list?.map(item => ({
value: item.id,
@ -412,9 +383,7 @@ export default {
let fileName = 'equipment-list.xls'
if (res.headers['content-disposition']) {
const contentDisposition = res.headers['content-disposition']
fileName = contentDisposition.slice(
contentDisposition.indexOf('filename=') + 9
)
fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
}
fileName = decodeURIComponent(fileName)
@ -456,15 +425,11 @@ export default {
: this.dataListSelections.map(item => {
return item.id
})
this.$confirm(
`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`,
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/monitoring/equipment'),
method: 'delete',

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

@ -32,6 +32,7 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{ prop: 'id', name: 'ID' },
{ prop: 'alarmId', name: '报警信息ID，关联T_equipment_group_alarm表' },
@ -42,10 +43,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '创建时间' },
{ prop: 'createTime', name: '创建时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

@ -57,6 +57,7 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{ prop: 'id', name: '' },
{ prop: 'equipmentId', name: '设备ID' },
@ -67,10 +68,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'typeCode', name: '文件类型编号' },
{ prop: 'fileName', name: '文件名字' },

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

@ -27,7 +27,8 @@
</template>
<script>
import { calcMaxHeight } from '@/utils'
import { calcMaxHeight } from '@/utils';
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './equipmentGroup-add-or-update'
import BaseTable from '@/components/base-table'
@ -35,7 +36,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '分组名称' },
{ prop: 'code', name: '分组编码' },
{ prop: 'remark', name: '备注' },

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

@ -65,6 +65,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'
@ -80,7 +81,7 @@ const dictEntries = {
}
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'code', name: '报警编码' },
{ prop: 'typeDictValue', name: '报警类型' },
{ prop: 'gradeDictValue', name: '报警级别' },

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentPlc-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'

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

@ -29,6 +29,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentPlcConnect-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentPlcParam-add-or-update'
import BaseTable from '@/components/base-table'
// import TableOperateComponent from '@/components/base-table/components/operationComponent'

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentQuantity-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
@ -49,10 +50,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'recordTime', name: '生产数量的记录时间' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentStatusLog-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
@ -46,10 +47,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './equipmentType-add-or-update'
import BaseTable from '@/components/base-table'
@ -35,7 +36,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
// import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '类型名称' },
{ prop: 'code', name: '类型编码' },
{ prop: 'remark', name: '备注' },

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentTypeFile-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
@ -46,10 +47,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

@ -49,13 +49,14 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './equipmentAttr-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'equipmentId', name: '设备ID' },
{ prop: 'attrName', name: '属性名' },
{ prop: 'attrValue', name: '属性值' },

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './factory-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'
@ -35,7 +36,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '工厂名称' },
{ prop: 'code', name: '工厂编码' },
{ prop: 'address', name: '地址' },

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

@ -32,6 +32,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './product-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
@ -45,7 +46,7 @@ const UnitDictTypeId = '1557173812109242370'
const ProductTypeDictTypeId = '1557179530308616193'
const tableConfigs = [
{ type: 'index', name: '序号' },
{ prop: 'createTime', name: '添加时间', filter: val => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '产品名称' },
{ prop: 'code', name: '产品编码' },
{ prop: 'specifications', name: '规格' },

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

@ -53,6 +53,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './productArrt-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'
@ -60,7 +61,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
// import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '属性名称' },
{ prop: 'code', name: '属性编码' },
{ prop: 'productId', name: '产品id' },

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

@ -28,13 +28,14 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
// import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'factoryName', name: '工厂' },
{ prop: 'name', name: '产线名称' },
{ prop: 'code', name: '产线编码' },

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

@ -44,6 +44,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './productionLineRecSch-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'

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

@ -61,6 +61,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import moment from 'moment'
import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title'

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './qualityInspectionDet-add-or-update'
import BaseTable from '@/components/base-table'
@ -35,7 +36,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
// import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'typeName', name: '检测类型' },
{ prop: 'content', name: '检测内容' },
{ prop: 'code', name: '检测编码' },

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

@ -37,6 +37,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
// import AddOrUpdate from './qualityInspectionRecord-add-or-update'
import BaseTable from '@/components/base-table'
@ -44,12 +45,12 @@ import TableOperateComponent from '@/components/base-table/components/operationC
// import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{
prop: 'inspectionDetContent',
name: '检测内容'
},
{ prop: 'checkTime', name: '检测时间' },
{ prop: 'checkTime', name: '检测时间', filter: timeFilter },
{ prop: 'productionId', name: '产线id' },
{ prop: 'sectionId', name: '工段id' },
{ prop: 'checkPerson', name: '检测人员' },

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

@ -33,8 +33,9 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
// import TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '检测类型名称' },
{ prop: 'code', name: '检测类型编码' },
{ prop: 'remark', name: '备注' },

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

@ -19,6 +19,7 @@ import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title'
import moment from 'moment'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
export default {
name: 'RealtimeDataOfEquipment',
components: { BaseTable, SmallTitle },

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

@ -19,6 +19,7 @@ import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title'
import moment from 'moment'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
export default {
name: 'RealtimeDataOfLine',
components: { BaseTable, SmallTitle },

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

@ -14,6 +14,7 @@ import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title'
import moment from 'moment'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// tslint: disable
export default {

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

@ -34,8 +34,9 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
// import TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '分类名称' },
{ prop: 'operations', name: '操作', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
@ -43,9 +44,7 @@ const tableConfigs = [
const addOrUpdateConfigs = {
type: 'dialog',
infoUrl: '/monitoring/reportSheetCategory',
fields: [
{ name: 'name', label: '分类名称', required: true, span: 24 }
],
fields: [{ name: 'name', label: '分类名称', required: true, span: 24 }],
operations: [
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/reportSheetCategory', permission: '', showOnEdit: false },

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

@ -30,6 +30,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from './equipmentPlcConnect-add-or-update'
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import BaseTable from '@/components/base-table'
@ -116,7 +117,7 @@ export default {
const categories = res.data.list.map(item => ({ label: item.name, value: item.id }))
this.tableConfigs = [
{ type: 'index', name: '序号' },
{ prop: 'createTime', name: '创建时间', width: 200 },
{ prop: 'createTime', name: '创建时间', filter: timeFilter, width: 200 },
{ prop: 'fileName', name: '报表名称' },
{ prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories },
{

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

@ -25,7 +25,7 @@
<script>
export default {
data() {
return { calcMaxHeight, dataList: [], pageIndex: 1, pageSize: 10, totalPage: 0, allNum: 0 }
return { dataList: [], pageIndex: 1, pageSize: 10, totalPage: 0, allNum: 0 }
},
created() {
this.getDataList()

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

@ -28,13 +28,14 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './reportSheet-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '创建时间' },
{ prop: 'createTime', name: '创建时间', filter: timeFilter },
{ prop: 'name', name: '报表名称' },
{ prop: 'code', name: '报表编码' },
{ prop: 'category', name: '报表分类' },

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

@ -51,13 +51,14 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './reportSheetCategory-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '分类名称' },
{ prop: 'code', name: '分类编码' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
import AddOrUpdate from './sysFile-add-or-update'
import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
@ -43,10 +44,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

@ -32,6 +32,7 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{ prop: 'id', name: '主键，自增' },
{ prop: 'typeCode', name: '文件类型编号' },
@ -40,10 +41,10 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'updateTime', name: '更新时间', filter: timeFilter },
{ prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]

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

@ -28,6 +28,7 @@
<script>
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
// import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
import AddOrUpdate from './workshopSectionDialog.vue'
import BaseTable from '@/components/base-table'
@ -35,7 +36,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'name', name: '工段名称' },
{ prop: 'code', name: '工段编码' },
{ prop: 'productionLineName', name: '产线' },

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

@ -32,8 +32,9 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent'
import { calcMaxHeight } from '@/utils'
import { timeFilter } from '@/utils/filters'
const tableConfigs = [
{ prop: 'createTime', name: '添加时间' },
{ prop: 'createTime', name: '添加时间', filter: timeFilter },
{ prop: 'workshopSectionId', name: '工段ID' },
{ prop: 'equipmentId', name: '设备ID' },
{ prop: 'sort', name: '排序' },