diff --git a/public/favicon.ico b/public/favicon.ico index 2bd581c..37a3d39 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png new file mode 100644 index 0000000..37a3d39 Binary files /dev/null and b/src/assets/img/logo.png differ diff --git a/src/assets/img/logo@2x.png b/src/assets/img/logo@2x.png new file mode 100644 index 0000000..1ce238f Binary files /dev/null and b/src/assets/img/logo@2x.png differ diff --git a/src/assets/img/logo@4x.png b/src/assets/img/logo@4x.png new file mode 100644 index 0000000..36641d4 Binary files /dev/null and b/src/assets/img/logo@4x.png differ diff --git a/src/components/base-table/components/operationComponent.js b/src/components/base-table/components/operationComponent.js index bad72e8..a0b5427 100644 --- a/src/components/base-table/components/operationComponent.js +++ b/src/components/base-table/components/operationComponent.js @@ -19,7 +19,8 @@ export default { colors: { delete: '#FF5454', preview: '#f09843', - design: '#99089f' + design: '#99089f', + // 'view-trend': 'red' // add more... }, text: { @@ -30,6 +31,7 @@ export default { viewAttr: i18n.t('viewattr'), preview: i18n.t('preview'), design: i18n.t('design'), + 'view-trend': '查看趋势' // add more... } } diff --git a/src/i18n/en.js b/src/i18n/en.js index 5be8b88..fdd4cb4 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -17,6 +17,7 @@ t.routes['质量管理'] = 'Quality Management' t.routes['权限管理'] = 'Permission Management' t.routes['系统设置'] = 'System Settings' t.routes['日志管理'] = 'Log Management' +t.routes['数据分析'] = 'Data Analysis' // 二级 t.routes['厂务'] = 'Factory Affair' @@ -42,6 +43,9 @@ t.routes['定时任务'] = 'Timed Tasks' t.routes['文件上传'] = 'File Upload' t.routes['登录日志'] = 'Login Records' t.routes['操作日志'] = 'Oprations Records' +t.routes['设备效率分析'] = 'Equipment Efficiency Analysis' +t.routes['设备异常分析'] = 'Equipment Exceptions Analysis' +t.routes['设备状态时序图'] = 'Equipment Status Timesequence' // 三级 t.routes['工厂'] = 'Factory' diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 6acd25b..9657383 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -18,6 +18,7 @@ t.routes['质量管理'] = '质量管理' t.routes['权限管理'] = '权限管理' t.routes['系统设置'] = '系统设置' t.routes['日志管理'] = '日志管理' +t.routes['数据分析'] = '数据分析' // 二级 t.routes['厂务'] = '厂务' @@ -43,6 +44,9 @@ t.routes['定时任务'] = '定时任务' t.routes['文件上传'] = '文件上传' t.routes['登录日志'] = '登录日志' t.routes['操作日志'] = '操作日志' +t.routes['设备效率分析'] = '设备效率分析' +t.routes['设备异常分析'] = '设备异常分析' +t.routes['设备状态时序图'] = '设备状态时序图' // 三级 t.routes['工厂'] = '工厂' diff --git a/src/utils/request.js b/src/utils/request.js index 134bf99..d06a328 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: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor', + baseURL: '/api', + // baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor', timeout: 1000 * 180, withCredentials: true }) diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue new file mode 100644 index 0000000..a843ce6 --- /dev/null +++ b/src/views/modules/monitoring/equipmentEfficiency.vue @@ -0,0 +1,362 @@ + + + + + diff --git a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue new file mode 100644 index 0000000..cb2b236 --- /dev/null +++ b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue @@ -0,0 +1,321 @@ + + + + + + diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue new file mode 100644 index 0000000..e765f89 --- /dev/null +++ b/src/views/modules/monitoring/equipmentException.vue @@ -0,0 +1,203 @@ + + + diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue new file mode 100644 index 0000000..7afe0d9 --- /dev/null +++ b/src/views/modules/monitoring/equipmentTimesequence.vue @@ -0,0 +1,550 @@ + + + + +