From 45589016a0d82f85070bf509ef85c6d98cdd6e47 Mon Sep 17 00:00:00 2001 From: wangyilin <1454641981@qq.com> Date: Thu, 22 May 2025 10:14:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bottomLeft/chart/draw.vue | 6 +-- .../components/bottomLeft/chart/index.vue | 2 +- .../components/bottomRight/chart/draw.vue | 6 +-- .../components/center/index.vue | 52 +++++++++---------- .../components/centerLeft2/index.vue | 1 + .../components/centerRight1/chart/index.vue | 12 ++--- .../components/centerRight1/index.vue | 10 ++-- .../components/centerRight2/index.vue | 24 ++++----- 8 files changed, 57 insertions(+), 56 deletions(-) diff --git a/src/views/overviewLargeScreen/components/bottomLeft/chart/draw.vue b/src/views/overviewLargeScreen/components/bottomLeft/chart/draw.vue index ee89930..9cfb712 100644 --- a/src/views/overviewLargeScreen/components/bottomLeft/chart/draw.vue +++ b/src/views/overviewLargeScreen/components/bottomLeft/chart/draw.vue @@ -67,7 +67,7 @@ ], series: [ { - name: "贯通率", + name: "中学", type: "line", smooth: true, showAllSymbol: true, @@ -83,7 +83,7 @@ data: val.rateData, }, { - name: "已贯通", + name: "小学", type: "bar", barWidth: 10, itemStyle: { @@ -98,7 +98,7 @@ data: val.barData, }, { - name: "计划贯通", + name: "幼儿园", type: "bar", barGap: "-100%", barWidth: 10, diff --git a/src/views/overviewLargeScreen/components/bottomLeft/chart/index.vue b/src/views/overviewLargeScreen/components/bottomLeft/chart/index.vue index d095639..7561e93 100644 --- a/src/views/overviewLargeScreen/components/bottomLeft/chart/index.vue +++ b/src/views/overviewLargeScreen/components/bottomLeft/chart/index.vue @@ -40,7 +40,7 @@ 18092, 20728, 24045, 28348, 32808, 36097, 39867, 44715, 48444, 50415, 56061, 62677, 59521, 67560, 18092, 20728, 24045, 28348, 32808, 36097, 39867, 44715, 48444, 50415, 36097, 39867, 44715, 48444, 50415, 50061, - 32677, 49521, 32808, + 32677, 49521, 808, ], barData: [ 4600, 5000, 5500, 6500, 7500, 8500, 9900, 12500, 14000, 21500, 23200, diff --git a/src/views/overviewLargeScreen/components/bottomRight/chart/draw.vue b/src/views/overviewLargeScreen/components/bottomRight/chart/draw.vue index 9ab4dcd..80b9543 100644 --- a/src/views/overviewLargeScreen/components/bottomRight/chart/draw.vue +++ b/src/views/overviewLargeScreen/components/bottomRight/chart/draw.vue @@ -164,15 +164,15 @@ max: val.maxData }, { - name: "产品质量", + name: "菜品质量", max: 10 }, { - name: "任务效率", + name: "用户数量", max: 12 }, { - name: "售后保障", + name: "卫生保障", max: 3.5 } ] diff --git a/src/views/overviewLargeScreen/components/center/index.vue b/src/views/overviewLargeScreen/components/center/index.vue index 7d71452..1ee78fc 100644 --- a/src/views/overviewLargeScreen/components/center/index.vue +++ b/src/views/overviewLargeScreen/components/center/index.vue @@ -20,7 +20,7 @@ - 年度负责人组件达标榜 + 年度负责人 diff --git a/src/views/overviewLargeScreen/components/centerRight2/index.vue b/src/views/overviewLargeScreen/components/centerRight2/index.vue index 42b50ca..2bc65e1 100644 --- a/src/views/overviewLargeScreen/components/centerRight2/index.vue +++ b/src/views/overviewLargeScreen/components/centerRight2/index.vue @@ -6,7 +6,7 @@
- 任务完成排行榜 + 排行榜综合TOP10
@@ -23,18 +23,18 @@ import { reactive } from "vue"; const config = reactive({ - header: ["组件", "分支", "覆盖率"], + header: ["学校", "厨师名", "点赞数"], data: [ - ["组件1", "dev-1", "↑75%"], - ["组件2", "dev-2", "↓33%"], - ["组件3", "dev-3", "↑100%"], - ["组件4", "rea-1", "↑94%"], - ["组件5", "rea-2", "↑95%"], - ["组件6", "fix-2", "↑63%"], - ["组件7", "fix-4", "↑84%"], - ["组件8", "fix-7", "↓46%"], - ["组件9", "dev-2", "↓13%"], - ["组件10", "dev-9", "↑76%"], + ["中学", "李1", "↑750"], + ["小学", "李2", "↓73"], + ["幼儿园", "李3", "↑190"], + ["小学", "张1", "↑940"], + ["幼儿园", "张2", "↑195"], + ["中学", "刘2", "↑163"], + ["小学", "刘4", "↑184"], + ["小学", "刘7", "↓146"], + ["中学", "曹2", "↓130"], + ["中学", "曹9", "↑176"], ], rowNum: 7, // 表格行数 headerHeight: 35, From 5fb3fafad51da52b44afc71ddfcf6c867c55758f Mon Sep 17 00:00:00 2001 From: wangyilin <1454641981@qq.com> Date: Fri, 23 May 2025 16:40:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smartRecipes/dailyRecipes/index.vue | 153 ++-------- .../smartRecipes/menuManagement/index.vue | 282 +++++++++++++++++- 2 files changed, 300 insertions(+), 135 deletions(-) diff --git a/src/views/smartRecipes/dailyRecipes/index.vue b/src/views/smartRecipes/dailyRecipes/index.vue index f977414..9031cd3 100644 --- a/src/views/smartRecipes/dailyRecipes/index.vue +++ b/src/views/smartRecipes/dailyRecipes/index.vue @@ -50,14 +50,7 @@ createTime: "2025-04-30", endTime: "2025-05-18", id: "1917456673534976001", - Monday: - "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", - Tuesday: - "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", - Wednesday: - "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", - Thursday: "", - Friday: + today: "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", Saturday: "", Sunday: "", @@ -66,17 +59,11 @@ { companyName: "南头央厨", deptName: "南头升辉小学", - type: "午餐", + type: "晚餐", createTime: "2025-04-30", endTime: "2025-05-18", id: "1917456673534976001", - Monday: - "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", - Tuesday: - "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", - Wednesday: "", - Thursday: "", - Friday: + today: "紫苏洋葱炒鸡/冬瓜炒肉片/红腰豆焖鸭/酸甜锅包肉/肉沫粉丝蒸水蛋/例汤", Saturday: "", Sunday: "", @@ -95,6 +82,24 @@ type: "input", label: "商品名称", }, + type:{ + type:'select', + label: '餐次', + options:[ + { + value:'早餐', + label:'早餐' + }, + { + value:'中餐', + label:'中餐' + }, + { + value:'晚餐', + label:'晚餐' + } + ] + } }); const columns = ref([ @@ -130,121 +135,13 @@ title: "结束日期", }, { - key: "Monday", - title: "星期一", + key: "today", + title: "当天", width: 100, - render: ({ Monday }) => { + render: ({ today }) => { return (
- {Monday.split("/").map( - (item: any, index: PropertyKey | undefined) => ( - - {item} - - ) - )} -
- ); - }, - }, - { - key: "Tuesday", - title: "星期二", - width: 100, - render: ({ Tuesday }) => { - return ( -
- {Tuesday.split("/").map( - (item: any, index: PropertyKey | undefined) => ( - - {item} - - ) - )} -
- ); - }, - }, - { - key: "Wednesday", - title: "星期三", - width: 100, - render: ({ Wednesday }) => { - return ( -
- {Wednesday.split("/").map( - (item: any, index: PropertyKey | undefined) => ( - - {item} - - ) - )} -
- ); - }, - }, - { - key: "Thursday", - title: "星期四", - width: 100, - render: ({ Thursday }) => { - return ( -
- {Thursday.split("/").map( - (item: any, index: PropertyKey | undefined) => ( - - {item} - - ) - )} -
- ); - }, - }, - { - key: "Friday", - title: "星期五", - width: 100, - render: ({ Friday }) => { - return ( -
- {Friday.split("/").map( - (item: any, index: PropertyKey | undefined) => ( - - {item} - - ) - )} -
- ); - }, - }, - { - key: "Saturday", - title: "星期六", - width: 100, - render: ({ Saturday }) => { - return ( -
- {Saturday.split("/").map( - (item: any, index: PropertyKey | undefined) => ( - - {item} - - ) - )} -
- ); - }, - }, - { - key: "Sunday", - title: "星期日", - width: 100, - render: ({ Sunday }) => { - return ( -
- {Sunday.split("/").map( + {today.split("/").map( (item: any, index: PropertyKey | undefined) => ( {item} diff --git a/src/views/smartRecipes/menuManagement/index.vue b/src/views/smartRecipes/menuManagement/index.vue index 641bc84..8c1d1b9 100644 --- a/src/views/smartRecipes/menuManagement/index.vue +++ b/src/views/smartRecipes/menuManagement/index.vue @@ -1,11 +1,279 @@ - - + + +