diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 53655af5..3c92a2f4 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -347,6 +347,8 @@ export default { console.log('setting code: ', response.data); // 处理输入框数据 this.form[opt.prop] = response.data; + // 更新下外部的 dataForm，防止code字段有数据也报空的bug + this.$emit('update', this.form) } }); } diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue index ac03952d..1e7de18e 100644 --- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue +++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue @@ -61,7 +61,7 @@ rows: drawerBaseInfoRows, }, { - name: '属性列表', + name: '采集参数', key: 'attrs', props: drawerListProps, url: '/base/equipment-plc-param/page', @@ -75,18 +75,26 @@ pageSize: 10, }, tableBtn: [ - this.$auth.hasPermi('equipment:collection-config-param:update') - ? { - type: 'edit', - btnName: '修改', - } - : undefined, - this.$auth.hasPermi('equipment:collection-config-param:delete') - ? { - type: 'delete', - btnName: '删除', - } - : undefined, + { + type: 'edit', + btnName: '修改', + }, + { + type: 'delete', + btnName: '删除', + }, + // this.$auth.hasPermi('equipment:collection-config-param:update') + // ? { + // type: 'edit', + // btnName: '修改', + // } + // : undefined, + // this.$auth.hasPermi('equipment:collection-config-param:delete') + // ? { + // type: 'delete', + // btnName: '删除', + // } + // : undefined, ].filter((v) => v), allowAdd: true, }, @@ -106,7 +114,6 @@ import { getEquipmentPlcConnectPage, exportEquipmentPlcConnectExcel, } from '@/api/base/equipmentPlcConnect'; -import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import './http'; import BasicDrawer from './components/BasicDrawer.vue'; @@ -182,13 +189,15 @@ export default { placeholder: '请选择设备', param: 'equipmentId', selectOptions: [], + filterable: true }, { type: 'select', - label: '编码', - placeholder: '请选择编码', + label: '关联表编码', + placeholder: '请选择关联表编码', param: 'plcId', selectOptions: [], + filterable: true }, { type: 'button', @@ -224,7 +233,9 @@ export default { prop: 'plcId', labelKey: `plcTableName`, url: '/base/equipment-plc/listAll', - rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '关联表名不能为空', trigger: 'blur' }, + ], bind: { filterable: true, }, @@ -236,7 +247,9 @@ export default { label: '设备', prop: 'equipmentId', url: '/base/core-equipment/page?pageNo=1&pageSize=99', - rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '设备不能为空', trigger: 'blur' }, + ], bind: { filterable: true, }, @@ -262,7 +275,9 @@ export default { input: true, label: '设备名', prop: 'equipmentName', - rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '设备名不能为空', trigger: 'blur' }, + ], // bind: { // disabled: this.editMode == 'detail', // some condition, like detail mode... // } @@ -296,7 +311,8 @@ export default { label: '生产参数类型', filter: (val) => val != null - ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val] + // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val] + ? ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val] : '-', }, { diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue index 42e204f5..2f9dda7a 100644 --- a/src/views/equipment/base/config/DataCollection/TableConfig.vue +++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue @@ -59,7 +59,6 @@ import { getEquipmentPlcPage, exportEquipmentPlcExcel, } from '@/api/base/equipmentPlc'; -import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; const switchBtn = { @@ -352,7 +351,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?') + .confirm('是否确认删除该配置?') .then(function () { return deleteEquipmentPlc(id); }) diff --git a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue index 45983d2b..3b27c92c 100644 --- a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue +++ b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue @@ -194,13 +194,17 @@ export default { input: true, label: '参数列名', prop: 'plcParamName', - rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '参数列名不能为空', trigger: 'blur' }, + ], }, { input: true, label: '参数名称', prop: 'name', - rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '参数名称不能为空', trigger: 'blur' }, + ], }, ], [ @@ -230,19 +234,35 @@ export default { { label: '工艺参数', value: 2 }, { label: '报警参数', value: 3 }, ], - rules: [{ required: true, message: '设备参数类型不能为空', trigger: 'blur' }], + rules: [ + { + required: true, + message: '设备参数类型不能为空', + trigger: 'blur', + }, + ], }, { select: true, label: '生产参数类型', prop: 'production_param_type', options: [ - { label: '进片数量', value: 1 }, - { label: '出片数量', value: 2 }, - { label: '破损数量', value: 3 }, + // { label: '进片数量', value: 1 }, + // { label: '出片数量', value: 2 }, + // { label: '破损数量', value: 3 }, + // { label: '无类型', value: 4 }, + { label: '进口计数', value: 1 }, + { label: '出口计数', value: 2 }, + { label: '损耗计数', value: 3 }, { label: '无类型', value: 4 }, ], - rules: [{ required: true, message: '生产参数类型不能为空', trigger: 'blur' }], + rules: [ + { + required: true, + message: '生产参数类型不能为空', + trigger: 'blur', + }, + ], }, ], [ @@ -305,6 +325,7 @@ export default { infoQuery: null, // 基本信息的请求 attrFormSubmitting: false, attrListLoading: false, + shouldRefreshPageView: false, }; }, computed: { @@ -323,10 +344,12 @@ export default { }); }, tableBtn() { - return this.mode == 'detail' ? [] : this.sections[1].tableBtn; + return this.sections[1].tableBtn; + // return this.mode == 'detail' ? [] : this.sections[1].tableBtn; }, }, mounted() { + this.shouldRefreshPageView = false; this.mode = this.defaultMode || 'detail'; for (const section of this.sections) { // 请求具体信息 @@ -403,6 +426,9 @@ export default { }, handleCancel() { + if (this.shouldRefreshPageView) { + this.$emit('refreshDataList'); + } this.visible = false; }, @@ -426,7 +452,7 @@ export default { remark: '', alarmContent: '', }; - this.attrTitle = '添加设备绑定信息'; + this.attrTitle = '添加参数绑定信息'; this.attrFormVisible = true; }, @@ -439,14 +465,14 @@ export default { }); if (res.code == 0) { this.attrForm = res.data; - this.attrTitle = '编辑设备绑定信息'; + this.attrTitle = '编辑参数绑定信息'; this.attrFormVisible = true; } }, // 删除属性 handleDeleteAttr(attrId) { - this.$confirm('确定删除该分组报警?', '提示', { + this.$confirm('确定删除该参数?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -458,6 +484,7 @@ export default { params: { id: attrId }, }); if (res.code == 0) { + this.shouldRefreshPageView = true; this.$message({ message: '删除成功', type: 'success', @@ -472,35 +499,37 @@ export default { }, // 提交属性表 - async submitAttrForm() { - this.$refs['attrForm'].validate((valid) => { + submitAttrForm() { + this.$refs['attrForm'].validate(async (valid) => { if (!valid) { return; } - }); - const isEdit = this.attrForm.id != null; - this.attrFormSubmitting = true; - const res = await this.$axios({ - url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate, - method: isEdit ? 'put' : 'post', - data: { - ...this.attrForm, - connectId: this.infoData.id, - }, - }); - if (res.code == 0) { - this.closeAttrForm(); - this.$message({ - message: `${isEdit ? '更新' : '创建'}成功`, - type: 'success', - duration: 1500, - onClose: () => { - this.getAttrList(); + const isEdit = this.attrForm.id != null; + this.attrFormSubmitting = true; + const res = await this.$axios({ + url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate, + method: isEdit ? 'put' : 'post', + data: { + ...this.attrForm, + connectId: this.infoData.id, }, }); - } - this.attrFormSubmitting = false; + + if (res.code == 0) { + this.closeAttrForm(); + this.$message({ + message: `${isEdit ? '更新' : '创建'}成功`, + type: 'success', + duration: 1500, + onClose: () => { + this.getAttrList(); + this.shouldRefreshPageView = true; + }, + }); + } + this.attrFormSubmitting = false; + }); }, closeAttrForm() { @@ -509,7 +538,7 @@ export default { handleClick(raw) { if (raw.type === 'delete') { - this.$confirm(`确定删除该报警?`, '提示', { + this.$confirm(`确定删除该参数?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning',