From 4309bca264a677573db97aef5b85882f0f3067ab Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Mon, 13 May 2024 15:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes-ui/uni-app/.hbuilderx/launch.json | 16 +++--- mes-ui/uni-app/src/manifest.json | 46 ++++++++--------- .../pages/assembleReport/assembleReport.vue | 8 +-- .../uni-app/src/pages/assembleReport/list.vue | 3 +- .../pages/index/components/CategoryPanel.vue | 14 ++--- .../pages/index/components/PageSkeleton.vue | 48 ++++++++++++------ .../productionReport-detail.vue | 8 +-- .../components/detailPanel.vue | 10 ++-- .../unqualifiedNotification.vue | 2 +- .../src/static/images/approveOrder.png | Bin 28817 -> 0 bytes mes-ui/uni-app/src/static/images/logo-app.png | Bin 20963 -> 36189 bytes .../uni-app/unpackage/res/icons/1024x1024.png | Bin 116085 -> 128011 bytes .../uni-app/unpackage/res/icons/120x120.png | Bin 5662 -> 8365 bytes .../uni-app/unpackage/res/icons/144x144.png | Bin 7224 -> 10166 bytes .../uni-app/unpackage/res/icons/152x152.png | Bin 7802 -> 10932 bytes .../uni-app/unpackage/res/icons/167x167.png | Bin 8896 -> 11911 bytes .../uni-app/unpackage/res/icons/180x180.png | Bin 9656 -> 11454 bytes .../uni-app/unpackage/res/icons/192x192.png | Bin 10805 -> 14105 bytes mes-ui/uni-app/unpackage/res/icons/20x20.png | Bin 638 -> 1032 bytes mes-ui/uni-app/unpackage/res/icons/29x29.png | Bin 992 -> 1689 bytes mes-ui/uni-app/unpackage/res/icons/40x40.png | Bin 1431 -> 2548 bytes mes-ui/uni-app/unpackage/res/icons/58x58.png | Bin 2227 -> 3848 bytes mes-ui/uni-app/unpackage/res/icons/60x60.png | Bin 2306 -> 3953 bytes mes-ui/uni-app/unpackage/res/icons/72x72.png | Bin 2880 -> 4974 bytes mes-ui/uni-app/unpackage/res/icons/76x76.png | Bin 3096 -> 5285 bytes mes-ui/uni-app/unpackage/res/icons/80x80.png | Bin 3267 -> 5599 bytes mes-ui/uni-app/unpackage/res/icons/87x87.png | Bin 3656 -> 6107 bytes mes-ui/uni-app/unpackage/res/icons/96x96.png | Bin 4198 -> 6721 bytes 28 files changed, 87 insertions(+), 68 deletions(-) delete mode 100644 mes-ui/uni-app/src/static/images/approveOrder.png diff --git a/mes-ui/uni-app/.hbuilderx/launch.json b/mes-ui/uni-app/.hbuilderx/launch.json index 5e2090f2..f2d09b03 100644 --- a/mes-ui/uni-app/.hbuilderx/launch.json +++ b/mes-ui/uni-app/.hbuilderx/launch.json @@ -5,12 +5,14 @@ "playground" : "standard", "type" : "uni-app:app-android" }, - { - "app-plus" : - { - "launchtype" : "local" - }, - "type" : "uniCloud" - } + { + "app-plus" : { + "launchtype" : "local" + }, + "mp-weixin" : { + "launchtype" : "local" + }, + "type" : "uniCloud" + } ] } diff --git a/mes-ui/uni-app/src/manifest.json b/mes-ui/uni-app/src/manifest.json index 25998a22..15cc35d7 100644 --- a/mes-ui/uni-app/src/manifest.json +++ b/mes-ui/uni-app/src/manifest.json @@ -1,7 +1,7 @@ { "name" : "高效生产", "appid" : "__UNI__1AFEDCC", - "description" : "", + "description" : "美乐嘉", "versionName" : "1", "versionCode" : 1, "transformPx" : false, @@ -54,33 +54,33 @@ }, "icons" : { "android" : { - "hdpi" : "", - "xhdpi" : "", - "xxhdpi" : "", - "xxxhdpi" : "" + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" }, "ios" : { - "appstore" : "", + "appstore" : "unpackage/res/icons/1024x1024.png", "ipad" : { - "app" : "", - "app@2x" : "", - "notification" : "", - "notification@2x" : "", - "proapp@2x" : "", - "settings" : "", - "settings@2x" : "", - "spotlight" : "", - "spotlight@2x" : "" + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" }, "iphone" : { - "app@2x" : "", - "app@3x" : "", - "notification@2x" : "", - "notification@3x" : "", - "settings@2x" : "", - "settings@3x" : "", - "spotlight@2x" : "", - "spotlight@3x" : "" + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" } } }, diff --git a/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue b/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue index 66e66ed1..b80952bf 100644 --- a/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue +++ b/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue @@ -12,8 +12,9 @@ const onSubmit = async () => { try { // 校验通过后再发送请求 const params = { - list: listReport.value, + taskReportAssembleVOList: listReport.value, } + console.log(params) const res = await postSubmitAssembleReportApi(params) isLoading.value = false @@ -48,9 +49,8 @@ const onScan = async () => { const params = { assembleCode } - const res = await getAssembleReportByCodeApi(params) - console.log('data' + res.data); - listReport.value.push(res.data) + const data = await getAssembleReportByCodeApi(params) + listReport.value.push(data) } } }); diff --git a/mes-ui/uni-app/src/pages/assembleReport/list.vue b/mes-ui/uni-app/src/pages/assembleReport/list.vue index 46af81f4..167e40ef 100644 --- a/mes-ui/uni-app/src/pages/assembleReport/list.vue +++ b/mes-ui/uni-app/src/pages/assembleReport/list.vue @@ -59,9 +59,8 @@ const onRefresherrefresh = async () => { @refresherrefresh="onRefresherrefresh" @scrolltolower="getListData"> - {{ index + 1 }} + {{ dataList.length - index }} 包装条形码：{{ item.assembleCode}} - 产品编码: {{ item.projectSubCode }} 产品名称: {{ item.projectSubName }} diff --git a/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue b/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue index d46793d0..62ee80e4 100644 --- a/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue +++ b/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue @@ -2,7 +2,7 @@ * @Author: 王文杰 * @Date: 2024-03-04 14:13:16 * @LastEditors: jevononlie 728254585@qq.com - * @LastEditTime: 2024-05-10 14:47:12 + * @LastEditTime: 2024-05-13 15:24:50 * @FilePath: /app-nx-personal/src/pages/index/components/CategoryPanel.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -36,18 +36,18 @@ const handleToBooking = (item: Object) => {