From 9b0f724da22bddfb3b547cb42608a499a8cb3aae Mon Sep 17 00:00:00 2001 From: g7hoo Date: Mon, 26 Sep 2022 14:19:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=8A=A5=E8=A1=A8=E5=87=A0?= =?UTF-8?q?=E5=A4=84=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en.js | 2 ++ src/i18n/zh-CN.js | 2 ++ src/views/modules/monitoring/reportDesign.vue | 3 ++- src/views/modules/monitoring/reportDetail.vue | 2 +- src/views/modules/monitoring/reportPreview.vue | 3 ++- src/views/modules/oss/oss-upload.vue | 3 ++- src/views/pages/login.vue | 3 ++- 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/i18n/en.js b/src/i18n/en.js index fdd4cb4..f52fe61 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -31,6 +31,8 @@ t.routes['质量检查实时数据'] = 'Realtime Quality Inspection Data' t.routes['报表总览'] = 'Report Overview' t.routes['报表分类'] = 'Report Types' t.routes['报表详情'] = 'Report Detail' +t.routes['报表设计'] = 'Report Design' +t.routes['报表预览'] = 'Report Preview' t.routes['质量检测基础数据'] = 'Quality Inspection Basic Data' t.routes['当前检测数据'] = 'Current Inspection Data' t.routes['质量检查信息记录'] = 'Quality Inspection Records' diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 9657383..4605c41 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -32,6 +32,8 @@ t.routes['质量检查实时数据'] = '质量检查实时数据' t.routes['报表总览'] = '报表总览' t.routes['报表分类'] = '报表分类' t.routes['报表详情'] = '报表详情' +t.routes['报表设计'] = '报表设计' +t.routes['报表预览'] = '报表预览' t.routes['质量检测基础数据'] = '质量检测基础数据' t.routes['当前检测数据'] = '当前检测数据' t.routes['质量检查信息记录'] = '质量检查信息记录' diff --git a/src/views/modules/monitoring/reportDesign.vue b/src/views/modules/monitoring/reportDesign.vue index 2dd7bc7..f433453 100644 --- a/src/views/modules/monitoring/reportDesign.vue +++ b/src/views/modules/monitoring/reportDesign.vue @@ -13,7 +13,8 @@ export default { // url: process.env.VUE_APP_REPORT_DESIGN_URL // url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer') // url: this.$http.adornUrl('/ureport/designer') - url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer' + // url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer' + url: '/api/ureport/designer' } }, mounted() { diff --git a/src/views/modules/monitoring/reportDetail.vue b/src/views/modules/monitoring/reportDetail.vue index 74cee5f..f29f5ab 100644 --- a/src/views/modules/monitoring/reportDetail.vue +++ b/src/views/modules/monitoring/reportDetail.vue @@ -125,7 +125,7 @@ export default { prop: 'operations', name: i18n.t('handle'), fixed: 'right', - width: 180, + // width: 180, subcomponent: TableOperateComponent, options: [{ name: 'preview', emitField: 'fileName' }, { name: 'design', emitField: 'name' }, 'edit', 'delete'] } diff --git a/src/views/modules/monitoring/reportPreview.vue b/src/views/modules/monitoring/reportPreview.vue index 33ad626..472f785 100644 --- a/src/views/modules/monitoring/reportPreview.vue +++ b/src/views/modules/monitoring/reportPreview.vue @@ -23,7 +23,8 @@ export default { loading: true, // url: process.env.VUE_APP_REPORT_VIEW_URL // url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/preview') - url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview' + // url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview' + url: '/api/ureport/preview' } }, mounted() { diff --git a/src/views/modules/oss/oss-upload.vue b/src/views/modules/oss/oss-upload.vue index 6b4bd0d..69cb0a4 100644 --- a/src/views/modules/oss/oss-upload.vue +++ b/src/views/modules/oss/oss-upload.vue @@ -23,7 +23,8 @@ export default { init() { this.visible = true // this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}` - this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}` + // this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}` + this.url = `/api/sys/oss/upload?token=${Cookies.get('token')}` this.num = 0 this.fileList = [] }, diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index f5c166a..e2f966f 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -103,7 +103,8 @@ export default { getCaptcha() { this.dataForm.uuid = getUUID() // this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}` - this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}` + // this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}` + this.captchaPath = `/api/captcha?uuid=${this.dataForm.uuid}` }, // 表单提交 dataFormSubmitHandle: debounce( From ea1c7de4ca4e61a35d7b0e51dd4ec04baf02e640 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Mon, 26 Sep 2022 16:10:44 +0800 Subject: [PATCH 2/3] update --- src/views/modules/monitoring/realtimeEquipment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/monitoring/realtimeEquipment.vue b/src/views/modules/monitoring/realtimeEquipment.vue index 5cee31d..d3b3d06 100644 --- a/src/views/modules/monitoring/realtimeEquipment.vue +++ b/src/views/modules/monitoring/realtimeEquipment.vue @@ -129,7 +129,7 @@ export default { { prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') }, { prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') }, { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.data') }, - { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') } + { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate'), filter: val => val !== '-' ? `${val.toFixed(2)}%` : '-' } ] }) } From 155456293343b4618eba21f3428bd08021945090 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Mon, 26 Sep 2022 17:01:15 +0800 Subject: [PATCH 3/3] update --- src/views/modules/monitoring/qualityInspectionRecord.vue | 6 ++++-- src/views/modules/monitoring/realtimeProductLine.vue | 6 +++--- src/views/modules/monitoring/realtimeQualityInspection.vue | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue index 32400f8..d0505eb 100644 --- a/src/views/modules/monitoring/qualityInspectionRecord.vue +++ b/src/views/modules/monitoring/qualityInspectionRecord.vue @@ -56,8 +56,10 @@ const tableConfigs = [ name: i18n.t('inspect.det') }, { prop: 'checkTime', name: i18n.t('inspect.time'), filter: timeFilter }, - { prop: 'productionId', name: i18n.t('pl.id') }, - { prop: 'sectionId', name: i18n.t('ws.id') }, + { prop: 'productionName', name: i18n.t('pl.title') }, + { prop: 'sectionName', name: i18n.t('ws.title') }, + // { prop: 'productionId', name: i18n.t('pl.id') }, + // { prop: 'sectionId', name: i18n.t('ws.id') }, { prop: 'checkPerson', name: i18n.t('inspect.people') }, { prop: 'source', name: i18n.t('source'), filter: val => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) }, { prop: 'explainText', name: i18n.t('desc') }, diff --git a/src/views/modules/monitoring/realtimeProductLine.vue b/src/views/modules/monitoring/realtimeProductLine.vue index d733e9b..7348835 100644 --- a/src/views/modules/monitoring/realtimeProductLine.vue +++ b/src/views/modules/monitoring/realtimeProductLine.vue @@ -113,9 +113,9 @@ export default { children: [ { prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') }, { prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') }, - { prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') }, - { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') }, - { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') } + // { prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') }, + // { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') }, + // { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') } ] }) } diff --git a/src/views/modules/monitoring/realtimeQualityInspection.vue b/src/views/modules/monitoring/realtimeQualityInspection.vue index ea7bfeb..ff28cce 100644 --- a/src/views/modules/monitoring/realtimeQualityInspection.vue +++ b/src/views/modules/monitoring/realtimeQualityInspection.vue @@ -131,7 +131,8 @@ export default { // 保存为 props for (const key of sortedTime) { - const prop = { label: key, children: [] } + // const prop = { label: key, children: [] } + const prop = { label: moment(key).format('YYYY-MM-DD HH:mm:ss'), children: [] } for (const subKey in timeMap[key]) { prop.children.push({ label: subKey, prop: key + subKey }) }