From dff253874a770bba71b06f69ead395d825d58d0b Mon Sep 17 00:00:00 2001 From: yesg <2277317060@qq.com> Date: Sun, 25 Jan 2026 21:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + app.json | 8 +- custom-tab-bar/index.js | 4 +- image/downIcon.png | Bin 0 -> 4255 bytes image/right.png | Bin 0 -> 2492 bytes pages/my/my.js | 97 ++++++++++++ pages/my/my.json | 3 + pages/my/my.wxml | 16 ++ pages/my/my.wxss | 48 ++++++ pages/production/production.js | 258 +++++++++++++++++++++++++++---- pages/production/production.wxml | 146 ++++++++++++++++- pages/production/production.wxss | 124 +++++++++++++++ project.config.json | 2 +- project.private.config.json | 5 +- 14 files changed, 673 insertions(+), 46 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 image/downIcon.png create mode 100644 image/right.png create mode 100644 pages/my/my.js create mode 100644 pages/my/my.json create mode 100644 pages/my/my.wxml create mode 100644 pages/my/my.wxss diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/app.json b/app.json index 2a047d0..8c4f813 100644 --- a/app.json +++ b/app.json @@ -1,9 +1,10 @@ { "pages": [ - "pages/production/production", "pages/index/index", + "pages/production/production", "pages/energy/energy", - "pages/energyInfo/energyInfo" + "pages/energyInfo/energyInfo", + "pages/my/my" ], "tabBar": { "custom": true, @@ -19,6 +20,9 @@ }, { "pagePath": "pages/production/production" + }, + { + "pagePath": "pages/my/my" } ] }, diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 80bcb9d..4b636d5 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -18,9 +18,9 @@ Component({ pages:['pages/energy/energy','pages/energyInfo/energyInfo'] }, { - pagePath: '/pages/info/info', + pagePath: '/pages/my/my', text: '我的', - pages:[' x'] + pages:['/pages/my/my'] }, ] }, diff --git a/image/downIcon.png b/image/downIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..08951cc09465a6dae6fa97804b313173426b8f6c GIT binary patch literal 4255 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 { + app.globalData.token = e.data.access_token + }) + request({ + url: '/system/user/getInfo', + method: 'get', + }).then(e => { + console.log(e.data); + this.setData({ + info: e.data + }) + }) + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/my/my.json b/pages/my/my.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/my/my.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/my/my.wxml b/pages/my/my.wxml new file mode 100644 index 0000000..3c8bcb0 --- /dev/null +++ b/pages/my/my.wxml @@ -0,0 +1,16 @@ + + + + + + {{info.user.nickName}} + + + 修改密码 + + + + 退出登录 + + + \ No newline at end of file diff --git a/pages/my/my.wxss b/pages/my/my.wxss new file mode 100644 index 0000000..43676a0 --- /dev/null +++ b/pages/my/my.wxss @@ -0,0 +1,48 @@ +.avatar { + width: 30vw; + height: 30vw; + margin-top: 5vh; + border-radius: 50%; + margin-left: 35vw; + overflow: hidden; +} + +.name { + width: 100%; + margin-top: 1vh; + text-align: center; + font-size: 32rpx; + font-weight: 600; +} +.passwordUpdate{ + margin-top: 3vh; + width: calc(100% - 40rpx); + padding: 0 20rpx; + font-size: 26rpx; + height: 100rpx; + line-height: 100rpx; + background-color: #fff; + border-bottom: 1px solid #0003; + position: relative; +} +.exit{ + margin-top: 1vh; + width: calc(100% - 40rpx); + padding: 0 20rpx; + font-size: 26rpx; + height: 100rpx; + line-height: 100rpx; + background-color: #fff; + border-bottom: 1px solid #0003; + position: relative; +} +.icon{ +position: absolute; +top: 50%; +right: 20rpx; +font-size: 26rpx; +height: 30rpx; +z-index: 3; +width: 30rpx; +transform: translateY(-50%); +} \ No newline at end of file diff --git a/pages/production/production.js b/pages/production/production.js index 1423809..fc1dcf6 100644 --- a/pages/production/production.js +++ b/pages/production/production.js @@ -4,32 +4,165 @@ import { } from '../../utils/request' const app = getApp() Page({ - data: { - optionsRow: [], - options: [], - selectedIndex: 0 + options1Row: [], + options1: [], + selectedIndex1: 13, + options2Row: [], + options2: [], + selectedIndex2: null, + options3Row: [], + options3: [], + selectedIndex3: null, + options4Row: [], + options4: [], + selectedIndex4: null, + open: false, + selectForm: { + pageNum: 1, + pageSize: 10, + processId: 18 + }, + list: [], + total:0 }, - onChange(e) { + toggle() { this.setData({ - selectedIndex: e.detail.value - }) - let id = this.data.optionsRow.find(v => v.label === this.data.options[e.detail.value])?.value || '' - console.log(id); + open: !this.data.open + }) + }, + onSearch() { + let data = this.data.selectForm + Object.keys(data).forEach(key => { + if (!data[key]) delete data[key] + }) + data.pageNum = 1 + request({ + url: '/mes/prodReport/planCompletionRateReport', + method: 'get', + data: data + }).then(e => { + this.setData({ + list: e.rows.map(v => { + return { + ...v, + completionRate: parseFloat(v.completionRate) + } + }), + total:e.total + }) + }) + }, + onChange(e) { + this.setData({ + selectedIndex1: e.detail.value + }) + let id = this.data.options1Row.find(v => v.label === this.data.options1[e.detail.value])?.value || '' + this.setData({ + selectedIndex2: null, + 'selectForm.processId': id + }) + this.setData({ + 'selectForm.machineId': null + }) + request({ + url: '/mes/prodBaseMachineInfo/getProdBaseMachineInfoList', + method: 'get', + data: { + processId: id + } + }).then(e => { + this.setData({ + options2Row: JSON.parse(JSON.stringify(e.data)).map(v => { + return { + value: v.machineId, + label: v.machineName, + } + }), + options2: e.data.map(v => v.machineName), + }) + }) + }, + onChange1(e) { + this.setData({ + selectedIndex2: e.detail.value + }) + let id = this.data.options2Row.find(v => v.label === this.data.options2[e.detail.value])?.value || '' + this.setData({ + 'selectForm.machineId': id + }) + }, + onChange2(e) { + this.setData({ + selectedIndex3: e.detail.value + }) + let id = this.data.options3Row.find(v => v.label === this.data.options3[e.detail.value])?.value || '' + this.setData({ + 'selectForm.shiftId': id + }) + }, + onChange3(e) { + this.setData({ + selectedIndex4: e.detail.value + }) + let id = this.data.options4Row.find(v => v.label === this.data.options4[e.detail.value])?.value || '' + this.setData({ + 'selectForm.classTeamId': id + }) + }, + onChange4(e) { + this.setData({ + 'selectForm.planCode': e.detail.value + }) + }, + onChange5(e) { + this.setData({ + 'selectForm.materialName': e.detail.value + }) + }, + reset() { + this.setData({ + selectForm: { + pageNum: 1, + pageSize: 10, + processId: 18 + }, + selectedIndex1: 13, + selectedIndex2: null, + selectedIndex3: null, + selectedIndex4: null, + }) + request({ + url: '/mes/prodBaseMachineInfo/getProdBaseMachineInfoList', + method: 'get', + data: { + processId: 18 + } + }).then(e => { + this.setData({ + options2Row: JSON.parse(JSON.stringify(e.data)).map(v => { + return { + value: v.machineId, + label: v.machineName, + } + }), + options2: e.data.map(v => v.machineName), + }) + }) + }, + onStartChange(e) { + this.setData({ + 'selectForm.beginDate': e.detail.value + }) + }, + onEndChange(e) { + this.setData({ + 'selectForm.endDate': e.detail.value + }) }, - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, /** * 生命周期函数--监听页面显示 @@ -60,24 +193,93 @@ Page({ }).then(e => { app.globalData.token = e.data.access_token }) - await request({ + request({ url: '/mes/baseProcessInfo/getProcessInfoList', method: 'get', }).then(e => { this.setData({ - optionsRow: JSON.parse(JSON.stringify(e.data)).map(v => { + options1Row: JSON.parse(JSON.stringify(e.data)).map(v => { return { - value : v.processId, - label : v.processName, + value: v.processId, + label: v.processName, } }), - options: e.data.map(v => v.processName), + options1: e.data.map(v => v.processName), }) }) + request({ + url: '/mes/prodBaseMachineInfo/getProdBaseMachineInfoList', + method: 'get', + data: { + processId: 18 + } + }).then(e => { + this.setData({ + options2Row: JSON.parse(JSON.stringify(e.data)).map(v => { + return { + value: v.machineId, + label: v.machineName, + } + }), + options2: e.data.map(v => v.machineName), + }) + }) + + request({ + url: '/mes/baseShiftInfo/getBaseShiftInfoList', + method: 'get', + }).then(e => { + this.setData({ + options3Row: JSON.parse(JSON.stringify(e.data)).map(v => { + return { + value: v.shiftId, + label: v.shiftName, + } + }), + options3: e.data.map(v => v.shiftName), + }) + }) + + request({ + url: '/mes/baseClassTeamInfo/getBaseClassTeamInfoList', + method: 'get', + }).then(e => { + this.setData({ + options4Row: JSON.parse(JSON.stringify(e.data)).map(v => { + return { + value: v.classTeamId, + label: v.teamName, + } + }), + options4: e.data.map(v => v.teamName), + }) + }) }, - + onReachBottom() { + if(this.data.selectForm.pageNum * this.data.selectForm.pageSize < this.data.total){ + let data = this.data.selectForm + Object.keys(data).forEach(key => { + if (!data[key]) delete data[key] + }) + data.pageNum += 1 + request({ + url: '/mes/prodReport/planCompletionRateReport', + method: 'get', + data: data + }).then(e => { + this.setData({ + list: [...this.data.list, ...e.rows.map(v => { + return { + ...v, + completionRate: parseFloat(v.completionRate) + } + })] + }) + }) + } + }, /** * 生命周期函数--监听页面隐藏 */ @@ -99,12 +301,6 @@ Page({ }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, /** * 用户点击右上角分享 diff --git a/pages/production/production.wxml b/pages/production/production.wxml index 8df8ea5..ef7d6d5 100644 --- a/pages/production/production.wxml +++ b/pages/production/production.wxml @@ -1,11 +1,141 @@ - - - - - {{ options[selectedIndex] || '请选择工序名称' }} + + + + + + {{ options1[selectedIndex1] || '请选择工序名称' }} + + + 搜索 + + + + + 计划日期 + + + + {{selectForm.beginDate || '请选择'}} + + + + — + + + + {{selectForm.endDate || '请选择'}} + + - - - 搜索 + + + 工序名称 + + + + {{ options1[selectedIndex1] || '请选择工序名称' }} + + + + + + 机台名称 + + + + {{ options2[selectedIndex2] || '请选择机台名称' }} + + + + + + 班次名称 + + + + {{ options3[selectedIndex3] || '请选择班次名称' }} + + + + + + 班组名称 + + + + {{ options4[selectedIndex4] || '请选择班组名称' }} + + + + + + 计划编号 + + + + + + 物料名称 + + + + + 搜索 + 重置 + + + + + + + + + + + {{item.materialName || ' '}} + + + + + 计划数量： + + + {{item.planNumber}} + + + + + 完成数量： + + + {{item.actualNumber}} + + + + + 偏差数量： + + + {{item.deviationNumber}} + + + + + 完成率： + + + + + + + {{item.completionRate}}% + + + \ No newline at end of file diff --git a/pages/production/production.wxss b/pages/production/production.wxss index 6a0aac1..f2e9ae8 100644 --- a/pages/production/production.wxss +++ b/pages/production/production.wxss @@ -4,6 +4,8 @@ height: 80rpx; background-color: #fff; border-radius: 40rpx; + position: relative; + transition: height 0.3s ease; } .picker { @@ -30,4 +32,126 @@ background-color: #419EFF; color: #fff; border-radius: 40rpx; +} +.down{ + position: absolute; + top: 100%; + left: 50%; + width: 200rpx; + height: 50rpx; + border-bottom-left-radius: 50rpx; + border-bottom-right-radius: 50rpx; + background-color: #eaeaea; + transform: translateX(-50%); +} +.downIcon{ + position: absolute; + left: 50%; + top: 50%; + width: 30rpx; + height: 30rpx; + transform: translate(-50%,-50%); + z-index: 11; +} +.item{ + margin-top: 10rpx; +} +.label{ + margin-top: 15rpx; + width: 18vw; + padding-left: 2vw; + height: 50rpx; + line-height: 50rpx; + display: inline-block; + font-size: 4vw; + color: #000; + vertical-align: top; +} +.selectInput{ + width: 66vw; + height: 50rpx; + padding-left: 2vw; + line-height: 50rpx; + display: inline-block; + margin-top: 15rpx; + margin-left: 2vw; + border-radius: 25rpx; + background-color: #0001; + color: #666; +} +.datePicker{ + width: 29vw; + height: 50rpx; + padding-left: 2vw; + display: inline-block; + line-height: 50rpx; + background-color: #0001; + border-radius: 25rpx; + color: #666; +} +.split{ + width: 6vw; + height: 50rpx; + display: inline-block; + line-height: 50rpx; + text-align: center; + color: #666; +} +.search-btn1{ + vertical-align: top; + display: inline-block; + margin-top: 15rpx; + margin-left: 2vw; + text-align: center; + width: 15vw; + height: 50rpx; + line-height: 50rpx; + background-color: #419EFF; + color: #fff; + border-radius: 40rpx; +} +.list{ + margin-top: 80rpx; +} +.listItem{ + margin-top: 30rpx; +width: calc(94vw - 50rpx); +margin-left: 3vw; +padding: 30rpx; +border-radius: 30rpx; +background-color: #fff; +} +.head{ + font-size: 32rpx; + font-weight: 700; +} +.text{ + display: inline-block; + color: #000; + font-size: 28rpx; +} +.num{ + display: inline-block; + color: #666; + font-size: 28rpx; +} +.itemInfo{ + margin-top: 20rpx; +} +.p{ + display: inline-block; + width: calc(100% - 120rpx - 150rpx); + height: 28rpx; + background-color: #eee; + margin-right: 20rpx; + border-radius: 14rpx; + overflow: hidden; + position: relative; +} +.i{ + position: absolute; + height: 100%; + top: 0; + left: 0; + background-color: #409EFF; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 273d008..fecb1e4 100644 --- a/project.config.json +++ b/project.config.json @@ -1,7 +1,7 @@ { "appid": "wxe88cfe782a5ab21f", "compileType": "miniprogram", - "libVersion": "trial", + "libVersion": "3.13.2", "packOptions": { "ignore": [], "include": [] diff --git a/project.private.config.json b/project.private.config.json index 6f22715..fff9bc7 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,6 +1,6 @@ { "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "mom", + "projectname": "mom-wx", "setting": { "compileHotReLoad": true, "skylineRenderEnable": true, @@ -18,5 +18,6 @@ "checkInvalidKey": true, "ignoreDevUnusedFiles": true }, - "libVersion": "3.13.2" + "libVersion": "3.13.2", + "condition": {} } \ No newline at end of file