diff --git a/src/views/modules/monitoring/equipmentFile.vue b/src/views/modules/monitoring/equipmentFile.vue index 31f5d6b..573eeef 100644 --- a/src/views/modules/monitoring/equipmentFile.vue +++ b/src/views/modules/monitoring/equipmentFile.vue @@ -68,7 +68,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentGroup.vue b/src/views/modules/monitoring/equipmentGroup.vue index 72f7d11..1eaec03 100644 --- a/src/views/modules/monitoring/equipmentGroup.vue +++ b/src/views/modules/monitoring/equipmentGroup.vue @@ -65,7 +65,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue index c9e5c43..37d6b05 100644 --- a/src/views/modules/monitoring/equipmentGroupAlarm.vue +++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue @@ -76,7 +76,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentPlc.vue b/src/views/modules/monitoring/equipmentPlc.vue index 73c10b6..da3e670 100644 --- a/src/views/modules/monitoring/equipmentPlc.vue +++ b/src/views/modules/monitoring/equipmentPlc.vue @@ -82,7 +82,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentPlcConnect.vue b/src/views/modules/monitoring/equipmentPlcConnect.vue index c67ede5..269f59b 100644 --- a/src/views/modules/monitoring/equipmentPlcConnect.vue +++ b/src/views/modules/monitoring/equipmentPlcConnect.vue @@ -65,7 +65,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentPlcParam.vue b/src/views/modules/monitoring/equipmentPlcParam.vue index f7b9670..21f24b5 100644 --- a/src/views/modules/monitoring/equipmentPlcParam.vue +++ b/src/views/modules/monitoring/equipmentPlcParam.vue @@ -89,7 +89,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentQuantity.vue b/src/views/modules/monitoring/equipmentQuantity.vue index 7d7c07e..e781d5d 100644 --- a/src/views/modules/monitoring/equipmentQuantity.vue +++ b/src/views/modules/monitoring/equipmentQuantity.vue @@ -75,7 +75,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentStatusLog.vue b/src/views/modules/monitoring/equipmentStatusLog.vue index 96a3885..b9c1ec1 100644 --- a/src/views/modules/monitoring/equipmentStatusLog.vue +++ b/src/views/modules/monitoring/equipmentStatusLog.vue @@ -73,7 +73,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentType.vue b/src/views/modules/monitoring/equipmentType.vue index 0a2883f..10bb98c 100644 --- a/src/views/modules/monitoring/equipmentType.vue +++ b/src/views/modules/monitoring/equipmentType.vue @@ -69,7 +69,7 @@ const tableConfigs =[ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentTypeFile.vue b/src/views/modules/monitoring/equipmentTypeFile.vue index 2b79def..18f52c5 100644 --- a/src/views/modules/monitoring/equipmentTypeFile.vue +++ b/src/views/modules/monitoring/equipmentTypeFile.vue @@ -71,7 +71,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/equipmentattr.vue b/src/views/modules/monitoring/equipmentattr.vue index 69f272c..5373da2 100644 --- a/src/views/modules/monitoring/equipmentattr.vue +++ b/src/views/modules/monitoring/equipmentattr.vue @@ -63,7 +63,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/factory.vue b/src/views/modules/monitoring/factory.vue index 6e7cccf..b557a51 100644 --- a/src/views/modules/monitoring/factory.vue +++ b/src/views/modules/monitoring/factory.vue @@ -57,30 +57,30 @@ 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": "id", "name": "id" }, - { "prop": "code", "name": "工厂编码" }, - { "prop": "name", "name": "工厂名称" }, - { "prop": "address", "name": "地址" }, - { "prop": "description", "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": "externalCode", "name": "外部系统编码" }, - { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } +const tableConfigs = [ + { prop: 'createTime', name: '添加时间' }, + { prop: 'name', name: '工厂名称' }, + { prop: 'code', name: '工厂编码' }, + { prop: 'address', name: '地址' }, + { prop: 'remark', name: '备注' }, + // { prop: 'id', name: 'id' }, + // { prop: 'description', 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: 'externalCode', name: '外部系统编码' }, + { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] - export default { data() { - return {tableConfigs, + return { + tableConfigs, dataForm: { key: '' }, @@ -94,7 +94,8 @@ export default { } }, components: { - AddOrUpdate,BaseTable + AddOrUpdate, + BaseTable }, activated() { this.getDataList() diff --git a/src/views/modules/monitoring/product.vue b/src/views/modules/monitoring/product.vue index b112088..ad143dc 100644 --- a/src/views/modules/monitoring/product.vue +++ b/src/views/modules/monitoring/product.vue @@ -86,7 +86,7 @@ const tableConfigs = [ // { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, // { "prop": "creatorId", "name": "创建人" }, // { "prop": "creatorName", "name": "创建人姓名" }, - // { "prop": "createTime", "name": "创建时间" }, + // { "prop": "createTime", "name": "添加时间" }, // { "prop": "updaterId", "name": "更新人" }, // { "prop": "updaterName", "name": "更新人姓名" }, // { "prop": "version", "name": "版本号" } diff --git a/src/views/modules/monitoring/productArrt.vue b/src/views/modules/monitoring/productArrt.vue index 485a5fc..f038496 100644 --- a/src/views/modules/monitoring/productArrt.vue +++ b/src/views/modules/monitoring/productArrt.vue @@ -71,7 +71,7 @@ const tableConfigs = [ { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "creatorId", "name": "创建人" }, { "prop": "creatorName", "name": "创建人姓名" }, - { "prop": "createTime", "name": "创建时间" }, + { "prop": "createTime", "name": "添加时间" }, { "prop": "updaterId", "name": "更新人" }, { "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updateTime", "name": "更新时间" }, diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue index 6a21199..1f5052c 100644 --- a/src/views/modules/monitoring/productionLine.vue +++ b/src/views/modules/monitoring/productionLine.vue @@ -37,7 +37,7 @@ --> - + --> - + --> - +