From 980f3468b7ac8ad00cdab3f415ea7a32dbdfc347 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 22 Sep 2023 16:29:31 +0800 Subject: [PATCH 1/5] update homepage --- .env.dev | 2 +- .env.front | 2 +- .env.prod | 2 +- .env.stage | 2 +- .env.static | 2 +- public/favicon.ico | Bin 5663 -> 2013 bytes src/layout/components/Navbar.vue | 2 +- src/router/index.js | 155 ++++++++++--------- src/views/base/equipmentPlcConnect/index.vue | 14 +- vue.config.js | 2 +- 10 files changed, 93 insertions(+), 90 deletions(-) diff --git a/.env.dev b/.env.dev index d6048b91..574a759f 100644 --- a/.env.dev +++ b/.env.dev @@ -9,7 +9,7 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 产线监控系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.1.49:48080' diff --git a/.env.front b/.env.front index 9e2d4d2b..34f878c2 100644 --- a/.env.front +++ b/.env.front @@ -2,7 +2,7 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 产线监控系统 # 芋道管理系统/本地环境 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' diff --git a/.env.prod b/.env.prod index 4c6133c8..7ac2b7f1 100644 --- a/.env.prod +++ b/.env.prod @@ -2,7 +2,7 @@ ENV = 'production' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 产线监控系统 # 芋道管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/.env.stage b/.env.stage index 5942b3c6..3602a9b9 100644 --- a/.env.stage +++ b/.env.stage @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 产线监控系统 # 测试环境配置 ENV = 'staging' diff --git a/.env.static b/.env.static index 13901cd3..35e7a28e 100644 --- a/.env.static +++ b/.env.static @@ -4,7 +4,7 @@ NODE_ENV = development ENV = 'staging' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 产线监控系统 # 芋道管理系统/测试环境 VUE_APP_BASE_API = 'http://127.0.0.1:48080' diff --git a/public/favicon.ico b/public/favicon.ico index e26376026420542212ed58d90d0ed34f554fa4ae..e3bdd359d3d432444a0a3c56dddebdc33f22b890 100644 GIT binary patch literal 2013 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 { this.$store.dispatch('LogOut').then(() => { - location.href = getPath('/index'); + location.href = getPath('/'); }) }).catch(() => {}); } diff --git a/src/router/index.js b/src/router/index.js index ca26742b..f8430b94 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -65,16 +65,17 @@ export const constantRoutes = [ hidden: true }, { - path: '', + path: '/', component: Layout, - redirect: 'index', - children: [{ - path: 'index', - component: (resolve) => require(['@/views/index'], resolve), - name: '首页', - meta: {title: '首页', icon: 'dashboard', affix: true} - } - ] + redirect: 'core/base/factory', + // children: [{ + // path: 'index', + // redirect: 'core/base/factory', + // component: (resolve) => require(['@/views/index'], resolve), + // name: '首页', + // meta: { title: '首页', icon: 'dashboard', affix: true } + // } + // ] }, { path: '/user', @@ -82,15 +83,15 @@ export const constantRoutes = [ hidden: true, redirect: 'noredirect', children: [{ - path: 'profile', - component: (resolve) => require(['@/views/system/user/profile/index'], resolve), - name: 'Profile', - meta: {title: '个人中心', icon: 'user'} - }, { - path: 'notify-message', - component: (resolve) => require(['@/views/system/notify/my/index'], resolve), - name: 'MyNotifyMessage', - meta: { title: '我的站内信', icon: 'message' }, + path: 'profile', + component: (resolve) => require(['@/views/system/user/profile/index'], resolve), + name: 'Profile', + meta: { title: '个人中心', icon: 'user' } + }, { + path: 'notify-message', + component: (resolve) => require(['@/views/system/notify/my/index'], resolve), + name: 'MyNotifyMessage', + meta: { title: '我的站内信', icon: 'message' }, }] }, { @@ -98,11 +99,11 @@ export const constantRoutes = [ component: Layout, hidden: true, children: [{ - path: 'type/data/:dictId(\\d+)', - component: (resolve) => require(['@/views/system/dict/data'], resolve), - name: 'SystemDictData', - meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'} - } + path: 'type/data/:dictId(\\d+)', + component: (resolve) => require(['@/views/system/dict/data'], resolve), + name: 'SystemDictData', + meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' } + } ] }, { @@ -110,22 +111,22 @@ export const constantRoutes = [ component: Layout, hidden: true, children: [{ - path: 'log', - component: (resolve) => require(['@/views/infra/job/log'], resolve), - name: 'InfraJobLog', - meta: {title: '调度日志', activeMenu: '/infra/job'} - } + path: 'log', + component: (resolve) => require(['@/views/infra/job/log'], resolve), + name: 'InfraJobLog', + meta: { title: '调度日志', activeMenu: '/infra/job' } + } ] }, { path: '/codegen', component: Layout, hidden: true, children: [{ - path: 'edit/:tableId(\\d+)', - component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve), - name: 'InfraCodegenEditTable', - meta: {title: '修改生成配置', activeMenu: '/infra/codegen'} - } + path: 'edit/:tableId(\\d+)', + component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve), + name: 'InfraCodegenEditTable', + meta: { title: '修改生成配置', activeMenu: '/infra/codegen' } + } ] }, { @@ -134,16 +135,16 @@ export const constantRoutes = [ hidden: true, redirect: 'noredirect', children: [{ - path: 'oa/leave/create', - component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve), - name: 'BpmOALeaveCreate', - meta: {title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave'} - }, { - path: 'oa/leave/detail', - component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve), - name: 'BpmOALeaveDetail', - meta: {title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave'} - } + path: 'oa/leave/create', + component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve), + name: 'BpmOALeaveCreate', + meta: { title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave' } + }, { + path: 'oa/leave/detail', + component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve), + name: 'BpmOALeaveDetail', + meta: { title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave' } + } ] }, { @@ -151,31 +152,31 @@ export const constantRoutes = [ component: Layout, hidden: true, children: [{ - path: 'manager/form/edit', - component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve), - name: 'BpmFormEditor', - meta: {title: '流程表单-编辑', activeMenu: '/bpm/manager/form'} - }, { - path: 'manager/definition', - component: (resolve) => require(['@/views/bpm/definition/index'], resolve), - name: 'BpmProcessDefinition', - meta: {title: '流程定义', activeMenu: '/bpm/manager/model'} - }, { - path: 'manager/model/design', - component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve), - name: 'BpmModelEditor', - meta: {title: '设计流程', activeMenu: '/bpm/manager/model'} - }, { - path: 'process-instance/create', - component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve), - name: 'BpmProcessInstanceCreate', - meta: {title: '发起流程', activeMenu: '/bpm/task/my'} - }, { - path: 'process-instance/detail', - component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve), - name: 'BpmProcessInstanceDetail', - meta: {title: '流程详情', activeMenu: '/bpm/task/my'} - } + path: 'manager/form/edit', + component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve), + name: 'BpmFormEditor', + meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' } + }, { + path: 'manager/definition', + component: (resolve) => require(['@/views/bpm/definition/index'], resolve), + name: 'BpmProcessDefinition', + meta: { title: '流程定义', activeMenu: '/bpm/manager/model' } + }, { + path: 'manager/model/design', + component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve), + name: 'BpmModelEditor', + meta: { title: '设计流程', activeMenu: '/bpm/manager/model' } + }, { + path: 'process-instance/create', + component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve), + name: 'BpmProcessInstanceCreate', + meta: { title: '发起流程', activeMenu: '/bpm/task/my' } + }, { + path: 'process-instance/detail', + component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve), + name: 'BpmProcessInstanceDetail', + meta: { title: '流程详情', activeMenu: '/bpm/task/my' } + } ] }, { @@ -186,7 +187,7 @@ export const constantRoutes = [ path: 'value/:propertyId(\\d+)', component: (resolve) => require(['@/views/mall/product/property/value'], resolve), name: 'ProductPropertyValue', - meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'} + meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' } } ] }, @@ -198,14 +199,14 @@ export const constantRoutes = [ path: 'edit/:spuId(\\d+)', component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), name: 'ProductSpuUpdate', - meta: {title: '修改商品', activeMenu: '/product/spu'} + meta: { title: '修改商品', activeMenu: '/product/spu' } }, - { - path: 'add', - component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), - name: 'ProductSpuCreate', - meta: {title: '添加商品', activeMenu: '/product/spu'} - } + { + path: 'add', + component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), + name: 'ProductSpuCreate', + meta: { title: '添加商品', activeMenu: '/product/spu' } + } ] }, { @@ -248,6 +249,6 @@ Router.prototype.push = function push(location) { export default new Router({ base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/", mode: 'hash', // 去掉url中的# - scrollBehavior: () => ({y: 0}), + scrollBehavior: () => ({ y: 0 }), routes: constantRoutes }) diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue index e6022379..5d7e72d9 100644 --- a/src/views/base/equipmentPlcConnect/index.vue +++ b/src/views/base/equipmentPlcConnect/index.vue @@ -144,7 +144,7 @@ export default { }, { type: 'select', - label: 'PLC编码', + label: '编码', placeholder: '请选择编码', param: 'plcId', selectOptions: [], @@ -184,6 +184,9 @@ export default { labelKey: `plcTableName`, url: '/base/equipment-plc/listAll', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { + filterable: true + } }, ], [ @@ -193,6 +196,9 @@ export default { prop: 'equipmentId', url: '/base/equipment/page?pageNo=1&pageSize=99', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { + filterable: true + } }, ], ], @@ -351,11 +357,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm( - '是否确认删除设备与实时采集关系表（一对多）编号为"' + - id + - '"的数据项?' - ) + .confirm('是否删除该配置?') .then(function () { return deleteEquipmentPlcConnect(id); }) diff --git a/vue.config.js b/vue.config.js index 62d82b48..89fa889a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,7 +8,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '中建材智能自动化研究院有限公司' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 From bbbfa9644d4d77bee3196026b366091d4734e19c Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 25 Sep 2023 15:47:39 +0800 Subject: [PATCH 2/5] bugfix --- src/views/base/equipmentPlc/index.vue | 1 + src/views/base/equipmentPlcParam/index.vue | 2 +- .../equipment/analysis/efficiency/index.vue | 33 ++- .../analysis/quality/components/lineChart.vue | 23 +- .../equipment/timing-diagram/status/index.vue | 229 +++++++++++++++++- .../monitoring/equipmentAlarmLog/index.vue | 7 +- .../equipmentProcessAmount/graph.vue | 21 +- .../equipmentProcessAmount/index.vue | 8 +- .../monitoring/equipmentRecentHours/index.vue | 11 +- .../equipmentStatusAndParams/index.vue | 4 +- 10 files changed, 296 insertions(+), 43 deletions(-) diff --git a/src/views/base/equipmentPlc/index.vue b/src/views/base/equipmentPlc/index.vue index 59c6fa71..09a47404 100644 --- a/src/views/base/equipmentPlc/index.vue +++ b/src/views/base/equipmentPlc/index.vue @@ -211,6 +211,7 @@ export default { switch: true, label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集 prop: 'collection', + value: 1, bind: { 'active-value': 1, 'inactive-value': 0, diff --git a/src/views/base/equipmentPlcParam/index.vue b/src/views/base/equipmentPlcParam/index.vue index 6d932706..e2454c75 100644 --- a/src/views/base/equipmentPlcParam/index.vue +++ b/src/views/base/equipmentPlcParam/index.vue @@ -419,7 +419,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?') + .confirm('是否确认删除"' + row.name + '"的参数绑定?') .then(function () { return deleteEquipmentPlcParam(id); }) diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index 3f2e2853..87695fb6 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -55,7 +55,10 @@
-
+
@@ -253,7 +256,7 @@ export default { rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', - param: 'recordTime', + param: 'timerange', }, { parent: 'dateFilterType', @@ -264,7 +267,7 @@ export default { placeholder: '选择日期', format: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd', - param: 'recordTime', + param: 'timeday', }, ], }, @@ -383,22 +386,18 @@ export default { if (btnName == 'search') { this.queryParams.factoryId = payload.factoryId || null; this.queryParams.lineId = payload.lineId || null; - if (payload.recordTime != null) { - if (typeof payload.recordTime == 'string') { - if (payload.recordTime.trim() !== '') { - this.queryParams.recordTime = [ - `${payload.recordTime} 00:00:00`, - `${payload.recordTime} 23:59:59`, - ]; - } - } else { - this.queryParams.recordTime = payload.recordTime; - } - } else { - this.queryParams.recordTime = null; + if (0 == payload.dateFilterType) { + this.queryParams.recordTime = payload.timerange; + } else if (1 == payload.dateFilterType) { + this.queryParams.recordTime = [ + `${payload.timeday} 00:00:00`, + `${payload.timeday} 23:59:59`, + ]; } - this.getList(); + } else { + this.queryParams.recordTime = null; } + this.getList(); }, cancel() { diff --git a/src/views/equipment/analysis/quality/components/lineChart.vue b/src/views/equipment/analysis/quality/components/lineChart.vue index b91b93f1..025af935 100644 --- a/src/views/equipment/analysis/quality/components/lineChart.vue +++ b/src/views/equipment/analysis/quality/components/lineChart.vue @@ -37,8 +37,14 @@ export default { option() { const opt = []; this.list.map((eq) => { - /** [设备名, ok数量, 不ok数量] */ - opt.push([eq.equipmentName, eq.okQuantity, eq.nokQuantity]); + /** [设备名, ok数量, 不ok数量, 加工数量, 合格率] */ + opt.push([ + eq.equipmentName, + eq.okQuantity, + eq.nokQuantity, + eq.totalQuantity, + eq.passRate.toFixed(2), + ]); }); return { color: ['#288AFF', '#8EF0AB'], @@ -51,7 +57,7 @@ export default { legend: { itemWidth: 12, itemHeight: 12, - right: 0 + right: 0, }, grid: { left: '1%', @@ -104,6 +110,17 @@ export default { stack: 's', data: opt.map((item) => item[2]), }, + { + name: '加工数量', + type: 'bar', + barWidth: 20, + data: opt.map((item) => item[3]), + }, + { + name: '合格率', + type: 'line', + data: opt.map((item) => item[4]), + }, ], }; }, diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue index ac4769a9..5e80e852 100644 --- a/src/views/equipment/timing-diagram/status/index.vue +++ b/src/views/equipment/timing-diagram/status/index.vue @@ -6,7 +6,9 @@ -->