From 3ec6ee836a8c557ca1822bb43e964633eb0cae57 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 25 Jun 2025 09:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/kitchen/staff.js | 2 +-
.../canteen/order/offlineManagement/index.vue | 8 ++++-
.../canteen/order/reserveManagement/index.vue | 8 ++++-
src/views/kitchen/index.vue | 32 +++++++++++++++++--
src/views/kitchen/staffManage/staff/index.vue | 6 ++--
5 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/src/api/kitchen/staff.js b/src/api/kitchen/staff.js
index 490e9fde..e17bcb3b 100644
--- a/src/api/kitchen/staff.js
+++ b/src/api/kitchen/staff.js
@@ -58,7 +58,7 @@ export function delStaffApi(staffId) {
//更新员工人脸
export function editStaffFaceStateApi(data) {
return request({
- url: '/kitchen_staff_info/edit/face-state',
+ url: '/smart-canteen/kitchen_staff_info/edit/face-state',
method: 'post',
data: data
})
diff --git a/src/views/canteen/order/offlineManagement/index.vue b/src/views/canteen/order/offlineManagement/index.vue
index 9bcddc36..096de922 100644
--- a/src/views/canteen/order/offlineManagement/index.vue
+++ b/src/views/canteen/order/offlineManagement/index.vue
@@ -179,7 +179,13 @@
-
+
+ 已下单
+ 已完成
+ 已退单
+ 已取消
+ 待下单
+ 部分退单
diff --git a/src/views/canteen/order/reserveManagement/index.vue b/src/views/canteen/order/reserveManagement/index.vue
index d95a05df..7c8350a8 100644
--- a/src/views/canteen/order/reserveManagement/index.vue
+++ b/src/views/canteen/order/reserveManagement/index.vue
@@ -183,7 +183,13 @@
-
+
+ 已下单
+ 已完成
+ 已退单
+ 已取消
+ 待下单
+ 部分退单
diff --git a/src/views/kitchen/index.vue b/src/views/kitchen/index.vue
index 10b5d75d..1094019e 100644
--- a/src/views/kitchen/index.vue
+++ b/src/views/kitchen/index.vue
@@ -295,7 +295,21 @@ export default {
color: "#8C8C8C",
},
height: 50,
- width:300
+ width:300,
+ formatter: function (name) {
+ let data = option.series[0].data;
+ let total = 0;
+ let tarValue;
+ for (let i = 0; i < data.length; i++) {
+ total += data[i].value;
+ if (data[i].name == name) {
+ tarValue = data[i].value;
+ }
+ }
+ let v = tarValue;
+ let p = Math.round((tarValue / total) * 100); //占比
+ return `${name} (${p}%)`;
+ }
},
series: [
{
@@ -437,7 +451,21 @@ export default {
color: "#8C8C8C",
},
height: 50,
- width:300
+ width:300,
+ formatter: function (name) {
+ let data = option.series[0].data;
+ let total = 0;
+ let tarValue;
+ for (let i = 0; i < data.length; i++) {
+ total += data[i].value;
+ if (data[i].name == name) {
+ tarValue = data[i].value;
+ }
+ }
+ let v = tarValue;
+ let p = Math.round((tarValue / total) * 100); //占比
+ return `${name} (${p}%)`;
+ }
},
series: [
{
diff --git a/src/views/kitchen/staffManage/staff/index.vue b/src/views/kitchen/staffManage/staff/index.vue
index 065b6851..93f6e025 100644
--- a/src/views/kitchen/staffManage/staff/index.vue
+++ b/src/views/kitchen/staffManage/staff/index.vue
@@ -600,8 +600,10 @@ export default {
reset() {
this.getCanteenList();
this.getKitchenDeviceSelect();
- this.fileList = []//图片
- this.checkUrlList = []//图片
+ this.fileList0 = []//图片
+ this.checkUrlList0 = []//图片
+ this.fileList1 = []//图片
+ this.checkUrlList1 = []//图片
this.fileList2 = []//图片
this.checkUrlList2 = []//图片
this.accessAuthorityList = [{