diff --git a/public/index.html b/public/index.html index aeb0349..756510d 100644 --- a/public/index.html +++ b/public/index.html @@ -3,8 +3,8 @@ * @version: * @Author: fzq * @Date: 2022-11-25 09:51:46 - * @LastEditors: fzq - * @LastEditTime: 2023-02-09 14:40:52 + * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git + * @LastEditTime: 2023-09-20 11:15:04 --> @@ -40,25 +40,29 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> <% } %> diff --git a/src/i18n/en.js b/src/i18n/en.js index 536fbca..69bf3f0 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -27,6 +27,7 @@ t.routes['字典管理'] = 'Dict Management' t.routes['PLC信息'] = 'PLC' // Relations between t.routes['设备与PLC关联配置'] = 'PLC & Equipments' +t.routes['下片监测'] = 'Unload Log' t.routes['近24小时设备生产数据'] = 'Equipment Data' t.routes['近24小时产线生产数据'] = 'Productline Data' t.routes['近24小时质量检查数据'] = 'Quality Inspection Data' @@ -67,6 +68,7 @@ t.routes['设备信息'] = 'Equipment Details' t.routes['设备参数状态监控'] = 'Current Equipment State' t.routes['设备分组报警信息'] = 'Equipment Group Alarm' t.routes['设备历史参数'] = 'Equipment Historical Parameters' +t.routes['下片详情'] = 'Unload Detail' t.routes['质量检测类型'] = 'Quality Inpection Types' t.routes['质量检测信息'] = 'Quality Inpection Details' t.routes['安灯检测盒'] = 'Andeng inspection box' @@ -422,6 +424,13 @@ t.pl.choose = 'Please select equipment' t.pl.confirm = 'Confirm' t.pl.cancel = 'Cancel' t.pl.success = 'The new device data is obtained successfully' +t.pl.paperLaying = 'Paper Laying Machine Number' +t.pl.robotNo = 'Robot Number' +t.pl.glassNumber = 'Pallet Glass Number' +t.pl.glassLength = 'Glass Length' +t.pl.glassWidth = 'Glass Width' +t.pl.thick = 'Glass Thcikness' +t.pl.quantity = 'Pallet Quantity' t.prompt = {} diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 941d7e0..aac79be 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -27,6 +27,7 @@ t.routes['设备'] = '设备' t.routes['字典管理'] = '字典管理' t.routes['PLC信息'] = 'PLC信息' t.routes['设备与PLC关联配置'] = '设备与PLC关联配置' // ? +t.routes['下片监测'] = '下片监测' t.routes['近24小时设备生产数据'] = '近24小时设备生产数据' t.routes['近24小时产线生产数据'] = '近24小时产线生产数据' t.routes['近24小时质量检查数据'] = '近24小时质量检查数据' @@ -67,6 +68,7 @@ t.routes['设备信息'] = '设备信息' t.routes['设备参数状态监控'] = '设备参数状态监控' t.routes['设备分组报警信息'] = '设备分组报警信息' t.routes['设备历史参数'] = '设备历史参数' +t.routes['下片详情'] = '下片详情' t.routes['质量检测类型'] = '质量检测类型' t.routes['质量检测信息'] = '质量检测信息' t.routes['安灯检测盒'] = '安灯检测盒' @@ -423,6 +425,14 @@ t.pl.success = '新设备数据获取成功' t.pl.choose = '请选择设备' t.pl.confirm = '确定' t.pl.cancel = '取消' +t.pl.paperLaying = '铺纸机名称' +t.pl.robotNo = '下片机名称' +t.pl.glassNumber = '木托玻璃数' +t.pl.glassLength = '玻璃长度' +t.pl.glassWidth = '玻璃宽度' +t.pl.thick = '玻璃厚度' +t.pl.quantity = '木托数量' + t.prompt = {} diff --git a/src/utils/request.js b/src/utils/request.js index 18b20d4..31e1f0b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,8 +8,8 @@ import merge from 'lodash/merge' const http = axios.create({ // baseURL: window.SITE_CONFIG['apiURL'], - baseURL: '/api', - // baseURL: '/yd-monitor', + // baseURL: '/api', + baseURL: '/yd-monitor', // baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor', timeout: 1000 * 180, withCredentials: true diff --git a/src/views/modules/monitoring/downloadLog.vue b/src/views/modules/monitoring/downloadLog.vue new file mode 100644 index 0000000..71ea4d1 --- /dev/null +++ b/src/views/modules/monitoring/downloadLog.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/src/views/modules/monitoring/equipmentCurrentState.vue b/src/views/modules/monitoring/equipmentCurrentState.vue index 110cec6..6c1e56b 100644 --- a/src/views/modules/monitoring/equipmentCurrentState.vue +++ b/src/views/modules/monitoring/equipmentCurrentState.vue @@ -5,7 +5,7 @@ {{ $t('pl.name') }} - + @@ -150,8 +150,9 @@ export default { BaseTable }, activated() { - this.getEqList() + // this.getEqList() this.getLineList() + this.getEqList() this.getDataList() }, methods: { @@ -178,6 +179,28 @@ export default { } }) }, + // 产线对应设备 + getLineEqList(event) { + console.log(event) + this.$http({ + url: this.$http.adornUrl('/monitoring/equipment/page'), + method: 'get', + params: this.$http.adornParams({ + limit: 99999, + page: 1, + lineId: event + }) + }).then(({ data }) => { + if (data && data.code === 0) { + let fileterEqList = data.data.list.filter((t) => { + return t.lineId == event + }) + this.eqList = fileterEqList + } else { + this.eqList = [] + } + }) + }, // 产线 getLineList() { this.$http({ diff --git a/src/views/modules/monitoring/reportDesign.vue b/src/views/modules/monitoring/reportDesign.vue index f433453..8cafe43 100644 --- a/src/views/modules/monitoring/reportDesign.vue +++ b/src/views/modules/monitoring/reportDesign.vue @@ -14,7 +14,8 @@ export default { // 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: '/api/ureport/designer' + // url: '/api/ureport/designer' + url: '/yd-monitor/ureport/designer' } }, mounted() { diff --git a/src/views/modules/monitoring/reportPreview.vue b/src/views/modules/monitoring/reportPreview.vue index 472f785..107c249 100644 --- a/src/views/modules/monitoring/reportPreview.vue +++ b/src/views/modules/monitoring/reportPreview.vue @@ -1,8 +1,8 @@