From 216aa6291dbd7a842a162101fe206b8f82ec4600 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 27 Oct 2023 14:24:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=86=E7=BB=84=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DialogForm/index.vue | 3 +- src/mixins/lb/basicPageMixin.js | 27 +- .../base/coreEquipmentLineBind/index.vue | 223 +++++++---- .../AlarmGroup}/components/BasicDrawer.vue | 0 .../AlarmGroup}/components/dialogForm.vue | 2 +- .../base/config/AlarmGroup}/index.vue | 33 +- .../BindGroup}/components/BasicDrawer.vue | 0 .../BindGroup}/components/dialogForm.vue | 0 .../base/config/BindGroup}/index.vue | 8 +- .../config/DataCollection/TableConfig.vue | 0 .../base/config/deprecated/dialogForm.vue | 187 +++++++++ .../base/config/deprecated/index.vue | 361 ++++++++++++++++++ 12 files changed, 733 insertions(+), 111 deletions(-) rename src/views/{base/equipmentGroup => equipment/base/config/AlarmGroup}/components/BasicDrawer.vue (100%) rename src/views/{base/equipmentGroup => equipment/base/config/AlarmGroup}/components/dialogForm.vue (98%) rename src/views/{base/equipmentGroup => equipment/base/config/AlarmGroup}/index.vue (92%) rename src/views/{base/equipmentBindGroup => equipment/base/config/BindGroup}/components/BasicDrawer.vue (100%) rename src/views/{base/equipmentBindGroup => equipment/base/config/BindGroup}/components/dialogForm.vue (100%) rename src/views/{base/equipmentBindGroup => equipment/base/config/BindGroup}/index.vue (97%) create mode 100644 src/views/equipment/base/config/DataCollection/TableConfig.vue create mode 100644 src/views/equipment/base/config/deprecated/dialogForm.vue create mode 100644 src/views/equipment/base/config/deprecated/index.vue diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 4542b5fc..4fba783c 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -277,7 +277,6 @@ export default { } else if (opt.url) { // 如果有 depends，则暂时先不获取，注册一个watcher if (opt.depends) { - console.log('[handleOptions] setting watch'); this.$watch( () => this.form[opt.depends], (id) => { @@ -300,7 +299,7 @@ export default { }); }, { - immediate: true, + immediate: false, } ); return; diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 44f9cd94..c131407b 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -32,9 +32,28 @@ export default { updateUrl: '', addUrl: '', pageUrl: '', + infoUrl: '', + basePath: '', form: {} }; }, + computed: { + addPath() { + return this.basePath + '/create' + }, + updatePath() { + return this.basePath + '/update' + }, + deletePath() { + return this.basePath + '/delete' + }, + infoPath() { + return this.basePath + '/get' + }, + pagePath() { + return this.basePath + '/page' + } + }, methods: { // utils http(url, method, payload) { @@ -46,16 +65,16 @@ export default { }) }, put(payload) { - return this.http(this.updateUrl, 'put', payload); + return this.http(this.updateUrl == '' ? this.updatePath : this.updateUrl, 'put', payload); }, post(payload) { - return this.http(this.addUrl, 'post', payload); + return this.http(this.addUrl == '' ? this.addPath : this.addUrl, 'post', payload); }, recv(payload) { - return this.http(this.pageUrl, 'get', payload); + return this.http(this.pageUrl == '' ? this.pagePath : this.pageUrl, 'get', payload); }, info(payload) { - return this.http(this.infoUrl, 'get', payload); + return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); }, diff --git a/src/views/base/coreEquipmentLineBind/index.vue b/src/views/base/coreEquipmentLineBind/index.vue index bfc18f3c..8c5dcebd 100644 --- a/src/views/base/coreEquipmentLineBind/index.vue +++ b/src/views/base/coreEquipmentLineBind/index.vue @@ -1,22 +1,48 @@ @@ -25,36 +51,28 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; -import { - createEquipmentType, - updateEquipmentType, - deleteEquipmentType, - getEquipmentType, - getEquipmentTypePage, - exportEquipmentTypeExcel, -} from '@/api/base/equipmentType'; - // import { getAccessToken } from '@/utils/auth'; export default { - name: 'EquipmentType', + name: 'EquipmentLineBind', components: {}, mixins: [basicPageMixin], data() { return { - searchBarKeys: ['name'], + basePath: '/base/core-equipment-bind-section', + searchBarKeys: ['equipmentName', 'productionLineId'], tableBtn: [ - this.$auth.hasPermi('base:core-equipment-type:update') + this.$auth.hasPermi('base:core-equipment-bind-section:update') ? { - type: 'edit', - btnName: '修改', - } + type: 'edit', + btnName: '修改', + } : undefined, - this.$auth.hasPermi('base:core-equipment-type:delete') + this.$auth.hasPermi('base:core-equipment-bind-section:delete') ? { - type: 'delete', - btnName: '删除', - } + type: 'delete', + btnName: '删除', + } : undefined, ].filter((v) => v), tableProps: [ @@ -65,24 +83,38 @@ export default { width: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, - { prop: 'name', label: '设备类型名称' }, - { prop: 'code', label: '检测类型编码' }, - { prop: 'remark', label: '备注' }, + { prop: 'productionLineName', label: '产线名称' }, + { prop: 'workshopSectionName', label: '工段名称' }, + { prop: 'equipmentName', label: '设备名称' }, + { prop: 'sort', label: '工段中排序' }, + { + prop: 'lineDataType', + label: '产线统计类型', + filter: (val) => + val != null ? ['无类型', '进片数量统计', '出片数量统计'][val] : '', + }, + { + prop: 'sectionDataType', + label: '工段统计类型', + filter: (val) => + val != null ? ['无类型', '进片数量统计', '出片数量统计'][val] : '', + }, + // { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ { type: 'select', label: '产线', placeholder: '请选择产线', - param: 'lineId', + param: 'productionLineId', selectOptions: [], - filterable: true + filterable: true, }, { type: 'input', label: '设备名', placeholder: '请输入设备名称', - param: 'name', + param: 'equipmentName', }, { type: 'button', @@ -94,7 +126,7 @@ export default { type: 'separate', }, { - type: this.$auth.hasPermi('base:core-equipment-type:create') + type: this.$auth.hasPermi('base:core-equipment-bind-section:create') ? 'button' : '', btnName: '新增', @@ -114,38 +146,61 @@ export default { rows: [ [ { - input: true, - label: '设备类型名称', - prop: 'name', + select: true, + label: '产线', + prop: 'productionLineId', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], - // bind: { - // disabled: true, // some condition, like detail mode... - // } + url: '/base/core-production-line/listAll', + bind: { clearable: true, filterable: true }, + // watch: 'workshopSectionId' }, { - input: true, - label: '设备类型编码', - prop: 'code', - url: '/base/core-equipment-type/getCode', + select: true, + label: '工段', + prop: 'workshopSectionId', + depends: 'productionLineId', + rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { clearable: true, filterable: true }, + url: '/base/core-workshop-section/listByParentId', }, ], [ { select: true, - label: '父类', - prop: 'parentId', - url: '/base/core-equipment-type/page?pageNo=1&pageSize=100', + label: '设备', + prop: 'equipmentId', + rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { clearable: true, filterable: true }, + url: '/base/core-equipment/listAll', + }, + { + input: true, + label: '工段排序', + prop: 'sort', }, - {}, ], [ { - upload: true, - label: '上传资料', - prop: 'files', + select: true, + options: [ + { label: '无类型', value: 0 }, + { label: '进片数量统计', value: 1 }, + { label: '出片数量统计', value: 2 }, + ], + label: '产线统计类型', + prop: 'lineDataType', + }, + { + select: true, + options: [ + { label: '无类型', value: 0 }, + { label: '进片数量统计', value: 1 }, + { label: '出片数量统计', value: 2 }, + ], + label: '工段统计类型', + prop: 'sectionDataType', }, ], - [{ input: true, label: '备注', prop: 'remark' }], ], // 是否显示弹出层 open: false, @@ -153,22 +208,15 @@ export default { queryParams: { pageNo: 1, pageSize: 10, - name: '', + equipmentName: null, + productionLineId: null, }, // 表单参数 form: {}, }; }, - watch: { - // form: { - // handler: function (val, oldVal) { - // console.log('[watch:form]', val, oldVal); - // }, - // deep: true, - // }, - }, created() { - this.initSearchOptions() + this.initSearchOptions(); this.getList(); }, methods: { @@ -191,11 +239,18 @@ export default { getList() { this.loading = true; // 执行查询 - getEquipmentTypePage(this.queryParams).then((response) => { - this.list = response.data.list; - this.total = response.data.total; + this.recv(this.queryParams).then(({ code, data }) => { + // if (code == 0) { + this.list = data.list; + this.total = data.total; this.loading = false; + // } }); + // .catch(err => { + // this.list = []; + // this.total = 0; + // this.loading = false; + // }) }, /** 取消按钮 */ cancel() { @@ -206,10 +261,17 @@ export default { reset() { this.form = { id: undefined, - code: undefined, - name: undefined, - parentId: undefined, - remark: undefined, + productionLineId: undefined, + // 工段 + workshopSectionId: undefined, + // 设备 + equipmentId: undefined, + // 工段排序 + sort: undefined, + // 产线统计类型 + lineDataType: undefined, + // 工段统计类型 + sectionDataType: undefined, }; this.resetForm('form'); }, @@ -227,16 +289,16 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = '添加设备类型'; + this.title = '添加设备工段绑定'; }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); const id = row.id; - getEquipmentType(id).then((response) => { - this.form = response.data; + this.info({ id }).then(({ code, data }) => { + this.form = data; this.open = true; - this.title = '修改设备类型'; + this.title = '修改设备工段绑定'; }); }, /** 提交按钮 */ @@ -247,16 +309,15 @@ export default { } // 修改的提交 if (this.form.id != null) { - updateEquipmentType(this.form).then((response) => { + this.put(this.form).then(({ code, data }) => { this.$modal.msgSuccess('修改成功'); this.open = false; this.getList(); }); return; } - // 添加的提交 - createEquipmentType(this.form).then((response) => { - this.$modal.msgSuccess('新增成功'); + this.post(this.form).then(({ code, data }) => { + this.$modal.msgSuccess('修改成功'); this.open = false; this.getList(); }); @@ -266,7 +327,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除设备类型"' + row.name + '"?') + .confirm('是否确认删除绑定"' + row.name + '"?') .then(function () { return deleteEquipmentType(id); }) @@ -274,7 +335,7 @@ export default { this.getList(); this.$modal.msgSuccess('删除成功'); }) - .catch(() => { }); + .catch(() => {}); }, /** 导出按钮操作 */ handleExport() { @@ -283,16 +344,16 @@ export default { params.pageNo = undefined; params.pageSize = undefined; this.$modal - .confirm('是否确认导出所有设备类型数据项?') + .confirm('是否确认导出所有设备工段绑定?') .then(() => { this.exportLoading = true; - return exportEquipmentTypeExcel(params); + // return exportEquipmentTypeExcel(params); }) .then((response) => { - this.$download.excel(response, '设备类型.xls'); + this.$download.excel(response, '设备工段绑定.xls'); this.exportLoading = false; }) - .catch(() => { }); + .catch(() => {}); }, }, }; diff --git a/src/views/base/equipmentGroup/components/BasicDrawer.vue b/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue similarity index 100% rename from src/views/base/equipmentGroup/components/BasicDrawer.vue rename to src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue diff --git a/src/views/base/equipmentGroup/components/dialogForm.vue b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue similarity index 98% rename from src/views/base/equipmentGroup/components/dialogForm.vue rename to src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue index 519b435e..ec7a67a0 100644 --- a/src/views/base/equipmentGroup/components/dialogForm.vue +++ b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue @@ -21,7 +21,7 @@ :disabled="disabled" v-model="dataForm.code" @change="$emit('update', dataForm)" - placeholder="请输入工段排序" /> + placeholder="请输入报警编码" /> + + + + + + diff --git a/src/views/equipment/base/config/deprecated/index.vue b/src/views/equipment/base/config/deprecated/index.vue new file mode 100644 index 00000000..dda58f82 --- /dev/null +++ b/src/views/equipment/base/config/deprecated/index.vue @@ -0,0 +1,361 @@ + + +