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

update 产品属性、报表和质量模块的字段

Browse Source
This commit is contained in:
lb 2022-08-08 15:02:30 +08:00
parent 1e118a6d5d
commit c15671c496
7 changed files with 138 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,10 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="设备分组名称">
<el-label><strong>111</strong></el-label>
</el-form-item>
<el-form-item label="设备分组名称"> <strong>111</strong></el-form-item>
<el-form-item label="设备分组编码">
<el-label><strong>111</strong></el-label>
<strong>111</strong>
</el-form-item>
<!-- <el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>

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

@ -36,7 +36,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -59,28 +59,30 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "code", "name": "编码" },
{ "prop": "name", "name": "名称" },
{ "prop": "productId", "name": "产品id,关联产品表" },
{ "prop": "value", "name": "属性值" },
{ "prop": "description", "name": "描述" },
{ "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
{ "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'createTime', name: '添加时间' },
{ prop: 'name', name: '属性名称' },
{ prop: 'code', name: '属性编码' },
{ prop: 'productId', name: '产品id,关联产品表' },
{ prop: 'value', name: '属性值' },
{ prop: 'description', name: '描述' },
// { prop: 'id', name: 'ID' },
// { prop: 'externalCode', name: '外部编码，用于对照外部系统的编码' },
// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
// { prop: 'remark', name: '备注' },
// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
// { prop: 'creatorId', name: '创建人' },
// { prop: 'creatorName', name: '创建人姓名' },
// { prop: 'updaterId', name: '更新人' },
// { prop: 'updaterName', name: '更新人姓名' },
// { prop: 'updateTime', name: '更新时间' },
// { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
dataForm: {
key: ''
},
@ -94,7 +96,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

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

@ -34,7 +34,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -57,24 +57,26 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "typeId", "name": "检测类型id" },
{ "prop": "content", "name": "检测内容" },
{ "prop": "code", "name": "检测编码" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'createTime', name: '添加时间' },
{ prop: 'typeId', name: '检测类型id' },
{ prop: 'content', name: '检测内容' },
{ prop: 'code', name: '检测编码' },
{ prop: 'remark', name: '备注' },
// { prop: 'id', name: 'ID' },
// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
// { prop: 'creatorId', name: '创建人' },
// { prop: 'creatorName', name: '创建人姓名' },
// { prop: 'updaterId', name: '更新人' },
// { prop: 'updaterName', name: '更新人姓名' },
// { prop: 'updateTime', name: '更新时间' },
// { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
dataForm: {
key: ''
},
@ -88,7 +90,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

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

@ -39,7 +39,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -62,32 +62,37 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "inspectionDetId", "name": "检测内容id" },
{
"prop": "inspectionDetContent",
"name": "检测内容（设备推送消息时，可能无对应id，只填这个字段）"
},
{ "prop": "productionId", "name": "产线id" },
{ "prop": "sectionId", "name": "工段id" },
{ "prop": "checkPerson", "name": "检测人员，可以多个" },
{ "prop": "checkTime", "name": "检测时间" },
{ "prop": "source", "name": "来源 1，手动（默认） 2，自动" },
{ "prop": "explainText", "name": "描述" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'createTime', name: '添加时间' },
{
prop: 'inspectionDetContent',
name: '检测内容'
// "name": "检测内容（设备推送消息时，可能无对应id，只填这个字段）"
},
{ prop: 'checkTime', name: '检测时间' },
{ prop: 'productionId', name: '产线id' },
{ prop: 'sectionId', name: '工段id' },
{ prop: 'checkPerson', name: '检测人员' },
// { prop: 'checkPerson', name: '检测人员，可以多个' },
{ prop: 'source', name: '来源' },
// { prop: 'source', name: '来源 1，手动（默认） 2，自动' },
{ prop: 'explainText', name: '描述' },
{ prop: 'remark', name: '备注' },
// { prop: 'inspectionDetId', name: '检测内容id' },
// { prop: 'id', name: 'ID' },
// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
// { prop: 'creatorId', name: '创建人' },
// { prop: 'creatorName', name: '创建人姓名' },
// { prop: 'updaterId', name: '更新人' },
// { prop: 'updaterName', name: '更新人姓名' },
// { prop: 'updateTime', name: '更新时间' },
// { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
dataForm: {
key: ''
},
@ -101,7 +106,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

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

@ -33,7 +33,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -56,23 +56,25 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "name", "name": "检测类型名称" },
{ "prop": "code", "name": "检测类型编码" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'createTime', name: '添加时间' },
{ prop: 'name', name: '检测类型名称' },
{ prop: 'code', name: '检测类型编码' },
{ prop: 'remark', name: '备注' },
// { prop: 'id', name: 'ID' },
// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
// { prop: 'creatorId', name: '创建人' },
// { prop: 'creatorName', name: '创建人姓名' },
// { prop: 'updaterId', name: '更新人' },
// { prop: 'updaterName', name: '更新人姓名' },
// { prop: 'updateTime', name: '更新时间' },
// { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
dataForm: {
key: ''
},
@ -86,7 +88,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

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

@ -37,7 +37,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -60,24 +60,32 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "name", "name": "检测类型名称" },
{ "prop": "code", "name": "检测类型编码" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'createTime', name: '创建时间' },
{ prop: 'name', name: '报表名称' },
{ prop: 'code', name: '报表编码' },
{ prop: 'category', name: '报表分类' },
// { prop: 'id', name: 'ID' },
// { prop: 'category', name: '分类：关联report_sheet_category' },
{ prop: 'fileName', name: '文件名称' },
{ prop: 'url', name: '链接地址' },
{ prop: 'description', name: '描述' },
{ prop: 'remark', name: '备注' },
{ prop: 'content', name: '报表内容' },
// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
// { prop: 'creatorId', name: '创建人' },
// { prop: 'creatorName', name: '创建人姓名' },
// { prop: 'updaterId', name: '更新人' },
// { prop: 'updaterName', name: '更新人姓名' },
// { prop: 'updateTime', name: '更新时间' },
// { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
dataForm: {
key: ''
},
@ -91,7 +99,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

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

@ -36,7 +36,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -59,26 +59,28 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "code", "name": "编码" },
{ "prop": "name", "name": "名称" },
{ "prop": "description", "name": "描述" },
{ "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
{ "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'createTime', name: '添加时间' },
{ prop: 'name', name: '分类名称' },
{ prop: 'code', name: '分类编码' },
// { "prop": "id", "name": "ID" },
// { "prop": "description", "name": "描述" },
// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
// { "prop": "remark", "name": "备注" },
// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
// { "prop": "creatorId", "name": "创建人" },
// { "prop": "creatorName", "name": "创建人姓名" },
// { "prop": "updaterId", "name": "更新人" },
// { "prop": "updaterName", "name": "更新人姓名" },
// { "prop": "updateTime", "name": "更新时间" },
// { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
dataForm: {
key: ''
},
@ -92,7 +94,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()