From 2d0e4917af0b5153608760711b5addad994342fc Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 25 Jun 2024 17:53:17 +0800 Subject: [PATCH 01/17] =?UTF-8?q?change=20-=20=E7=94=B5=E6=B5=81=E7=94=B5?= =?UTF-8?q?=E5=8E=8B=E6=9B=B2=E7=BA=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/report/currentVoltageCurve/index.vue | 366 +++++++----------- 1 file changed, 140 insertions(+), 226 deletions(-) diff --git a/src/views/ems/report/currentVoltageCurve/index.vue b/src/views/ems/report/currentVoltageCurve/index.vue index e6e9f3b..2a4baa8 100644 --- a/src/views/ems/report/currentVoltageCurve/index.vue +++ b/src/views/ems/report/currentVoltageCurve/index.vue @@ -54,89 +54,27 @@ 重置 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/views/ems/report/peaksValleysConsumptionReport/index.vue b/src/views/ems/report/peaksValleysConsumptionReport/index.vue index 4f86ab7..7f01560 100644 --- a/src/views/ems/report/peaksValleysConsumptionReport/index.vue +++ b/src/views/ems/report/peaksValleysConsumptionReport/index.vue @@ -148,7 +148,6 @@ export default { label: "label" }, dateTypeList: [ - {dateTypeCode: 19, dateTypeName: '时'}, {dateTypeCode: 10, dateTypeName: '日'}, {dateTypeCode: 7, dateTypeName: '月'}, {dateTypeCode: 4, dateTypeName: '年'}, From 312fdff7ff4360db5e343729f7492705ef96ea21 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 28 Jun 2024 16:43:42 +0800 Subject: [PATCH 04/17] =?UTF-8?q?change=20-=20add=E8=83=BD=E6=BA=90?= =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- .../report/energyStatisticalReport/index.vue | 157 ++++++++++-------- 2 files changed, 90 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index f0a3beb..e979295 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "vue-meta": "2.4.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", - "vuex": "3.6.0" + "vuex": "3.6.0", + "xlsx": "^0.17.0" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", diff --git a/src/views/ems/report/energyStatisticalReport/index.vue b/src/views/ems/report/energyStatisticalReport/index.vue index cbc7a21..59db612 100644 --- a/src/views/ems/report/energyStatisticalReport/index.vue +++ b/src/views/ems/report/energyStatisticalReport/index.vue @@ -30,9 +30,21 @@ + label-width="100px" + > + + + + + - + - + 搜索 - 重置 + @@ -75,13 +87,13 @@ - - - - - - - + + + + + + + import { getWorkUnitTrees } from '@/api/ems/base/baseWorkUnit' -import Treeselect from "@riophae/vue-treeselect"; -import "@riophae/vue-treeselect/dist/vue-treeselect.css"; +import Treeselect from '@riophae/vue-treeselect' +import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { energyStatisticalReportList } from '@//api/ems/report/reportPort.js' import { parseTime } from '@//utils/ruoyi' export default { - name: "EnergyStatisticalReport", + name: 'EnergyStatisticalReport', components: { Treeselect }, data() { @@ -129,103 +141,110 @@ export default { monitorWorkUnitList: [], daterangeCollectTime: [], // 弹出层标题 - title: "", + title: '', // 是否显示弹出层 open: false, // 查询参数 queryParams: { pageNum: 1, pageSize: 10, + energyType: '2', monitorCode: null, workUnitCode: null, monitorStatus: null, monitorType: null, - dateType: 10, + dateType: 10 }, // 表单参数 form: {}, workUnitProps: { - children: "children", - label: "label" + children: 'children', + label: 'label' }, dateTypeList: [ - {dateTypeCode: 19, dateTypeName: '时'}, - {dateTypeCode: 10, dateTypeName: '日'}, - {dateTypeCode: 7, dateTypeName: '月'}, - {dateTypeCode: 4, dateTypeName: '年'}, + { dateTypeCode: 19, dateTypeName: '时' }, + { dateTypeCode: 10, dateTypeName: '日' }, + { dateTypeCode: 7, dateTypeName: '月' }, + { dateTypeCode: 4, dateTypeName: '年' } ], columns: [ - {key: 0, label: `主键标识`, visible: false}, - {key: 1, label: `统计单元编号`, visible: true}, - {key: 2, label: `统计单元名称`, visible: true}, - {key: 3, label: `耗量(kwh)`, visible: true}, - {key: 4, label: `开始日期`, visible: true}, - {key: 5, label: `结束日期`, visible: true}, - {key: 6, label: `仪表值(kwh)`, visible: true} + { key: 0, label: `主键标识`, visible: false }, + { key: 1, label: `统计单元编号`, visible: true }, + { key: 2, label: `统计单元名称`, visible: true }, + { key: 3, label: `耗量(kwh)`, visible: true }, + { key: 4, label: `开始时间`, visible: true }, + { key: 5, label: `结束时间`, visible: true }, + { key: 6, label: `仪表值(kwh)`, visible: true } + ], + // 能源类型选项 + energyTypeList: [ + { value: '2', label: '电' }, + // { value: '3', label: '水' }, + // { value: '4', label: '蒸汽' } ] - }; + } }, created() { const nowDate = parseTime(new Date(), '{y}-{m}-{d}') - this.daterangeCollectTime[0] = nowDate - this.daterangeCollectTime[1] = nowDate - this.getList(); - this.getWorkUnitTrees(); + this.daterangeCollectTime[0] = nowDate + ' 00:00:00' + this.daterangeCollectTime[1] = nowDate + ' 23:59:59' + this.getList() + this.getWorkUnitTrees() }, watch: { // 根据名称筛选部门树 workUnitName(val) { - this.$refs.tree.filter(val); + this.$refs.tree.filter(val) } }, methods: { /** 转换统计单元信息数据结构 */ workUnitOptionsNormalizer(node) { if (node.children && !node.children.length) { - delete node.children; + delete node.children } return { id2: node.workUnitCode, label2: node.workUnitName, children2: node.children - }; + } }, /** 查询计量设备下拉树结构 */ getWorkUnitTrees() { getWorkUnitTrees().then(response => { - this.workUnitOptions = []; - this.workUnitOptions = JSON.parse(JSON.stringify(response.data).replaceAll('id','id2').replaceAll('code','id')); - }); + this.workUnitOptions = [] + this.workUnitOptions = JSON.parse(JSON.stringify(response.data).replaceAll('id', 'id2').replaceAll('code', 'id')) + }) }, // 筛选节点 filterNode(value, data) { - if (!value) return true; - return data.label.indexOf(value) !== -1; + if (!value) return true + return data.label.indexOf(value) !== -1 }, // 节点单击事件 handleNodeClick(data) { - this.queryParams.workUnitCode = data.id; - this.handleQuery(); + this.queryParams.workUnitCode = data.id + this.handleQuery() }, /** 查询统计计量信息列表 */ getList() { - this.loading = true; - this.queryParams.beginCollectTime = null; - this.queryParams.endCollectTime = null; + this.loading = true + this.queryParams.beginCollectTime = null + this.queryParams.endCollectTime = null if (this.daterangeCollectTime != null && this.daterangeCollectTime !== '') { - this.queryParams.beginCollectTime = this.daterangeCollectTime[0]; - this.queryParams.endCollectTime = this.daterangeCollectTime[1]; + this.queryParams.beginCollectTime = this.daterangeCollectTime[0] + this.queryParams.endCollectTime = this.daterangeCollectTime[1] } energyStatisticalReportList(this.queryParams).then(response => { - this.monitorWorkUnitList = response.rows; - this.total = response.total; - this.loading = false; - }); + this.monitorWorkUnitList = response.rows + this.total = response.total + this.loading = false + }) }, // 取消按钮 cancel() { - this.open = false; - this.reset(); + this.open = false + this.reset() }, // 表单重置 reset() { @@ -236,20 +255,20 @@ export default { monitorCode: null, workUnitCode: null, monitorStatus: 0, - monitorType: 1, - }; - this.resetForm("form"); + monitorType: 1 + } + this.resetForm('form') }, /** 搜索按钮操作 */ handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); + this.queryParams.pageNum = 1 + this.getList() }, /** 重置按钮操作 */ resetQuery() { - this.resetForm("queryForm"); - this.queryParams.workUnitCode = null; - this.handleQuery(); + this.resetForm('queryForm') + this.queryParams.workUnitCode = null + this.handleQuery() }, // 多选框选中数据 handleSelectionChange(selection) { @@ -264,5 +283,5 @@ export default { }, `统计能耗报表_${new Date().getTime()}.xlsx`) } } -}; +} From 2d60281f132d6fbf321ad51a0cae60b21bf126fa Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 28 Jun 2024 17:27:29 +0800 Subject: [PATCH 05/17] =?UTF-8?q?change=20-=20=E5=91=98=E5=B7=A5=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=A4=9A=E7=8F=AD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/base/baseStaffInfo/index.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/mes/base/baseStaffInfo/index.vue b/src/views/mes/base/baseStaffInfo/index.vue index 49a1f9e..7f3ef8a 100644 --- a/src/views/mes/base/baseStaffInfo/index.vue +++ b/src/views/mes/base/baseStaffInfo/index.vue @@ -191,7 +191,7 @@ - + { + if (response.data.teamCode && typeof response.data.teamCode === 'string') { + response.data.teamCode = response.data.teamCode.split(','); + } this.form = response.data this.open = true this.title = '修改员工信息' @@ -413,6 +413,7 @@ export default { submitForm() { this.$refs['form'].validate(valid => { if (valid) { + this.form.teamCode = this.form.teamCode.toString(); if (this.form.objId != null) { updateBaseStaffInfo(this.form).then(response => { this.$modal.msgSuccess('修改成功') @@ -431,8 +432,9 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const objIds = row.objId || this.codes - this.$modal.confirm('是否确认删除员工编号为"' + objIds + '"的数据项？').then(function() { + const objNames = row.objId || this.codes + const objIds = row.objId || this.ids + this.$modal.confirm('是否确认删除员工编号为"' + objNames + '"的数据项？').then(function() { return delBaseStaffInfo(objIds) }).then(() => { this.getList() From 50b6559f4ca9fd621f30900ca93cdb05b26b2081 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 2 Jul 2024 15:49:21 +0800 Subject: [PATCH 06/17] =?UTF-8?q?change=20-=20=E4=B8=8A=E4=B8=8B=E7=8F=AD?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/base/processInfo.js | 9 + src/api/mes/record/recordStaffCommute.js | 44 ++ src/views/mes/base/baseTeamMembers/index.vue | 22 +- .../mes/record/recordStaffCommute/index.vue | 405 ++++++++++++++++++ .../mes/record/teamEmployeesWages/index.vue | 394 +++++++++++++++++ 5 files changed, 872 insertions(+), 2 deletions(-) create mode 100644 src/api/mes/record/recordStaffCommute.js create mode 100644 src/views/mes/record/recordStaffCommute/index.vue create mode 100644 src/views/mes/record/teamEmployeesWages/index.vue diff --git a/src/api/mes/base/processInfo.js b/src/api/mes/base/processInfo.js index b0b3d07..59f2ee5 100644 --- a/src/api/mes/base/processInfo.js +++ b/src/api/mes/base/processInfo.js @@ -42,3 +42,12 @@ export function delProcessInfo(objId) { method: 'delete' }) } + +// 查询工序信息列表 +export function getProcessInfoList(query) { + return request({ + url: '/mes/base/processInfo/processInfoList', + method: 'get', + params: query + }) +} diff --git a/src/api/mes/record/recordStaffCommute.js b/src/api/mes/record/recordStaffCommute.js new file mode 100644 index 0000000..8afb170 --- /dev/null +++ b/src/api/mes/record/recordStaffCommute.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询员工上下班记录列表 +export function listRecordStaffCommute(query) { + return request({ + url: '/mes/record/recordStaffCommute/list', + method: 'get', + params: query + }) +} + +// 查询员工上下班记录详细 +export function getRecordStaffCommute(objId) { + return request({ + url: '/mes/record/recordStaffCommute/' + objId, + method: 'get' + }) +} + +// 新增员工上下班记录 +export function addRecordStaffCommute(data) { + return request({ + url: '/mes/record/recordStaffCommute', + method: 'post', + data: data + }) +} + +// 修改员工上下班记录 +export function updateRecordStaffCommute(data) { + return request({ + url: '/mes/record/recordStaffCommute', + method: 'put', + data: data + }) +} + +// 删除员工上下班记录 +export function delRecordStaffCommute(objId) { + return request({ + url: '/mes/record/recordStaffCommute/' + objId, + method: 'delete' + }) +} diff --git a/src/views/mes/base/baseTeamMembers/index.vue b/src/views/mes/base/baseTeamMembers/index.vue index ec8c07e..ddbf84f 100644 --- a/src/views/mes/base/baseTeamMembers/index.vue +++ b/src/views/mes/base/baseTeamMembers/index.vue @@ -125,6 +125,7 @@ +