From 5511837e90beac669f7086fb908e833016206163 Mon Sep 17 00:00:00 2001 From: fanzhiqin <12345678@qq.com> Date: Thu, 28 Sep 2023 10:09:45 +0530 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=A8=E9=87=8F=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base-detail-page/index.vue | 2 +- .../base-dialog/addOrUpdate/index.vue | 25 +++++++++++++++---- src/i18n/en.js | 5 ++++ src/i18n/zh-CN.js | 6 +++++ src/views/modules/monitoring/downloadLog.vue | 4 +-- .../monitoring/equipmentCurrentState.vue | 1 + .../modules/monitoring/productionLine.vue | 2 +- .../monitoring/qualityInspectionBoxBtn.vue | 21 ++++++++++------ .../monitoring/qualityInspectionCurrent.vue | 14 +++++------ .../monitoring/qualityInspectionRecord.vue | 2 +- src/views/modules/monitoring/unloadDetail.vue | 4 +-- 11 files changed, 60 insertions(+), 26 deletions(-) diff --git a/src/components/base-detail-page/index.vue b/src/components/base-detail-page/index.vue index c136ba5..e68b87b 100644 --- a/src/components/base-detail-page/index.vue +++ b/src/components/base-detail-page/index.vue @@ -359,7 +359,7 @@ export default { }).then(({ data: res }) => { if (res && res.code === 0) { const dataFormKeys = Object.keys(this.dataForm) - console.log('data form keys: ', dataFormKeys, pick(res.data, dataFormKeys)) + // console.log('data form keys: ', dataFormKeys, pick(res.data, dataFormKeys)) this.dataForm = pick(res.data, dataFormKeys) // LABEL: FILE_RELATED diff --git a/src/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue index 37a79db..4e14306 100644 --- a/src/components/base-dialog/addOrUpdate/index.vue +++ b/src/components/base-dialog/addOrUpdate/index.vue @@ -184,6 +184,8 @@ export default { // }, data() { return { + //按钮盒用 + idMark: 1, // 按钮防重复点击 isDisabled: false, COLUMN_PER_ROW, @@ -411,10 +413,10 @@ export default { }).then(({ data: res }) => { if (res && res.code === 0) { const dataFormKeys = Object.keys(this.dataForm) - console.log('keys ===> ', dataFormKeys) + // console.log('keys ===> ', dataFormKeys) // console.log('data form keys: ', dataFormKeys, pick(res.data, dataFormKeys)) this.dataForm = __pick(res.data, dataFormKeys) - console.log('pick(res.data, dataFormKeys) ===> ', __pick(res.data, dataFormKeys)) + // console.log('pick(res.data, dataFormKeys) ===> ', __pick(res.data, dataFormKeys)) // LABEL: FILE_RELATED /** 对文件下载进行分流 */ this.fileList = {} @@ -469,6 +471,9 @@ export default { this.dataForm[currentField.relatedField] = null } this.$emit('select-change', { name, id }) + + //按钮盒页面用 + this.idMark = id }, handleEditorReady(val) {}, @@ -510,9 +515,19 @@ export default { } this.$set(this.dataForm, 'fileIds', fileIds) } - - console.log('before send: ', this.dataForm) - + // console.log('this.$route',this.$route); + // console.log('before send: ', this.dataForm) + + //增加质量模块按钮盒多传参数的判断 + if(this.$route.name == 'monitoring-qualityInspectionBoxBtn'){ + // console.log('关键',this.configs.fields); + for(let i = 0;i { + if (val == 9) return i18n.t('unknown') if (val !== null && val !== undefined) return [i18n.t('normal'), i18n.t('planStop'), i18n.t('malfunction')][+val] } }, diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue index 6eb5022..cb67403 100644 --- a/src/views/modules/monitoring/productionLine.vue +++ b/src/views/modules/monitoring/productionLine.vue @@ -61,7 +61,7 @@ const tableConfigs = [ { prop: 'factoryName', name: i18n.t('factory.title') }, { prop: 'name', name: i18n.t('pl.name') }, { prop: 'code', name: i18n.t('pl.code') }, - { prop: 'status', name: i18n.t('pl.status'), filter: (val) => (val === 0 || val === 1 || val === 2) && ['停止', '运行', '未知'][val] }, + { prop: 'status', name: i18n.t('pl.status'), filter: (val) => (val === 0 || val === 1 || val === 2) && [i18n.t('stop'), i18n.t('run'), i18n.t('unknown')][val] }, { prop: 'description', name: i18n.t('desc') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } diff --git a/src/views/modules/monitoring/qualityInspectionBoxBtn.vue b/src/views/modules/monitoring/qualityInspectionBoxBtn.vue index fb446b6..bdc9b8a 100644 --- a/src/views/modules/monitoring/qualityInspectionBoxBtn.vue +++ b/src/views/modules/monitoring/qualityInspectionBoxBtn.vue @@ -75,7 +75,7 @@ const tableConfigs = [ }, { prop: 'inspectionDetContent', name: i18n.t('andeng.inspectContent') }, // name: '检测内容' }, { prop: 'keyValue', name: i18n.t('andeng.btnVal') }, // name: '按钮值' }, - { prop: 'model', name: i18n.t('andeng.btnBoxModel') }, // name: '按钮盒模式' }, + { prop: 'buttonId', name: i18n.t('buttonId') }, // name: '网关号' }, { prop: 'operations', @@ -145,7 +145,9 @@ const addOrUpdateConfigs = { required: true, type: 'select', options: [] - } + }, + { name: 'buttonId', label: i18n.t('buttonId') }, + { name: 'boxNo', label: i18n.t('boxNo') } ], operations: [ { name: 'cancel', showAlways: true }, @@ -334,14 +336,15 @@ export default { this.addOrUpdateConfigs.fields.forEach((item) => { // console.log('item',item) // console.log('res',res) - if (item.name === 'inspectionDetContent') item.options = res.data.list.map((item) => ({ label: item.content, value: item.content, inspectionDetId: item.code })) - // console.log('item',item) + if (item.name === 'inspectionDetContent') item.options = res.data.list.map((item) => ({ label: item.content, value: item.content, inspectionDetId: item.id })) + // console.log('this.addOrUpdateConfigs.fields[4].options', this.addOrUpdateConfigs.fields[4].options) }) } else { this.addOrUpdateConfigs.fields.forEach((item) => { if (item.name === 'inspectionDetContent') item.options.splice(0) }) } + // console.log('this.addOrUpdateConfigs.fields[4]检测内容',this.addOrUpdateConfigs) }) }, // 每页数 @@ -375,16 +378,20 @@ export default { } case 'inspectionDetContent': // this.dataForm.inspectionDetId = id - // console.log(id) + // console.log('name',name) + // console.log('id',id) // console.log(this.addOrUpdateConfigs.fields[4].options) for (var i = 0; i < this.addOrUpdateConfigs.fields[4].options.length; i++) { if (this.addOrUpdateConfigs.fields[4].options[i].label == id) { this.dataForm.inspectionDetId = this.addOrUpdateConfigs.fields[4].options[i].inspectionDetId this.addOrUpdateConfigs.fields.inspectionDetId = this.addOrUpdateConfigs.fields[4].options[i].inspectionDetId + // this.addOrUpdateConfigs.fields[6].inspectionDetId = this.addOrUpdateConfigs.fields[4].options[i].inspectionDetId + // console.log('this.addOrUpdateConfigs.fields.inspectionDetId', this.addOrUpdateConfigs.fields) + // this.addOrUpdateConfigs.fields.push({name:'inspectionDetId'}) } } - console.log('dataForm', this.dataForm) - console.log('addOrUpdateConfigs', this.addOrUpdateConfigs.fields) + // console.log('dataForm', this.dataForm) + // console.log('addOrUpdateConfigs', this.addOrUpdateConfigs.fields) } }, addSuccess() { diff --git a/src/views/modules/monitoring/qualityInspectionCurrent.vue b/src/views/modules/monitoring/qualityInspectionCurrent.vue index 0d7d9cf..2a502bf 100644 --- a/src/views/modules/monitoring/qualityInspectionCurrent.vue +++ b/src/views/modules/monitoring/qualityInspectionCurrent.vue @@ -176,7 +176,7 @@ const FakeChart = { }, defaultOpts: { handler: function (val) { - console.log('defaullt opts change: ', val) + // console.log('defaullt opts change: ', val) this.setOptions() }, immediate: true, @@ -277,12 +277,12 @@ export default { }) /** [2] 获取产线检测类型 */ this.fetchList('pl', startTime, endTime).then(({ data: res }) => { - console.log('res: ', res) + // console.log('res: ', res) /** TODO: 解析 nameData */ this.parseTableProps(res.data.nameData) this.dataListDynamic = this.parseDynamicData(res.data.data) || [] - console.log('this.dataListDynamic', this.dataListDynamic) + // console.log('this.dataListDynamic', this.dataListDynamic) this.buildGraphData() }) @@ -337,9 +337,9 @@ export default { this.echartCheckTypes.forEach((ect) => { result.push({ name: ect, type: 'bar', data: [] }) }) - console.log('result', result) - console.log('echartCheckTypes',this.echartCheckTypes); - console.log('this.echartCategories',this.echartCategories); + // console.log('result', result) + // console.log('echartCheckTypes',this.echartCheckTypes); + // console.log('this.echartCategories',this.echartCategories); this.dataListDynamic.forEach((inspection, index) => { // console.log('inspection: ', inspection) this.echartCategories.forEach((cate) => { @@ -357,7 +357,7 @@ export default { // { name: '222', type: 'bar', data: [1, 2, 3] } // ] - console.log('echarts data: ', this.echartsData) + // console.log('echarts data: ', this.echartsData) }, fetchList(type, startTime, endTime) { diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue index 68875a3..063590b 100644 --- a/src/views/modules/monitoring/qualityInspectionRecord.vue +++ b/src/views/modules/monitoring/qualityInspectionRecord.vue @@ -205,7 +205,7 @@ export default { limit: 9999999 }) }).then(({ data: res }) => { - console.log('insdet:', res) + // console.log('insdet:', res) const insDetOpt = this.addOrUpdateConfigs.fields.find((item) => item.name === 'inspectionDetId') if (insDetOpt) { insDetOpt.options = res.data.list.map((item) => ({ value: item.id, label: item.content })) || [] diff --git a/src/views/modules/monitoring/unloadDetail.vue b/src/views/modules/monitoring/unloadDetail.vue index 72541ea..ded36ba 100644 --- a/src/views/modules/monitoring/unloadDetail.vue +++ b/src/views/modules/monitoring/unloadDetail.vue @@ -110,7 +110,7 @@ export default { startTime: '', endTime: '', glassNumber: 95, - glassLength: 2272, + glassLength: 2261, glassWidth: 1128, glassThick: 3.2, glassOptions: [{ @@ -184,7 +184,7 @@ export default { for(let i =0;i