Commit Graph

635 Commits

Author SHA1 Message Date
zzyuan 4b1eb9b927 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-20 10:33:21 +08:00
zzyuan a9de1683ab 问题修改,厨房数据总览草图 2025-06-20 10:33:10 +08:00
sxu d6dfbb33cf 厨房设置改表和接口 2025-06-20 09:27:43 +08:00
zzyuan cc708e02ed Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-19 17:53:45 +08:00
zzyuan 04be56dbdf 智慧后厨接口对接问题修改 2025-06-19 17:53:35 +08:00
sxu c8fac9a6ac 更换超市单位路径 2025-06-19 17:31:54 +08:00
zzyuan 3bd3157795 员工管理接口对接2 2025-06-19 16:52:42 +08:00
zzyuan 06379db48f 员工管理新增编辑权限 2025-06-19 16:30:34 +08:00
zzyuan fabe70289b 员工管理,设备管理 2025-06-19 16:09:31 +08:00
zzyuan 6885c5ccbb 厨房设备管理接口对接 2025-06-19 13:21:27 +08:00
zzyuan a86e9823ca 超市订单 2025-06-19 11:20:53 +08:00
zzyuan 332e497188 基础设置,员工管理 2025-06-19 10:40:59 +08:00
zzyuan c3f15d763a 员工管理 2025-06-18 11:01:40 +08:00
zzyuan 701530911f 智慧厨房页面代码2 2025-06-17 18:03:21 +08:00
zzyuan db92c1fa31 部分退款页面修改 2025-06-17 17:57:19 +08:00
zzyuan aee6131b3d 卡务管理参数带serialNum 2025-06-17 17:54:30 +08:00
zzyuan f5003f9d60 智慧厨房页面代码 2025-06-17 17:49:22 +08:00
zzyuan 8c3809f927 测试问题修改2 2025-06-17 14:44:44 +08:00
zzyuan 40f52e4278 测试问题修改 2025-06-17 14:03:06 +08:00
skjia 98b0650962 jsk bug修改 2025-06-16 18:52:43 +08:00
zzyuan c2026418a9 厨房设置 2025-06-16 18:16:22 +08:00
zzyuan 1e3ae9ed5e 换卡操作 2025-06-16 17:47:36 +08:00
zzyuan 4ac1ac9647 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-16 15:58:12 +08:00
zzyuan ee52b30506 智慧厨房页面草图 2025-06-16 15:57:53 +08:00
skjia 11a6912a38 jsk 2025-06-16 12:44:34 +08:00
skjia b241358bec jsk 健康科普-富文本修改 2025-06-16 11:25:53 +08:00
zzyuan 4b4c6bb49b 目录修改 2025-06-16 10:25:32 +08:00
zzyuan 0fe2e26c57 目录修改2 2025-06-16 10:22:45 +08:00
zzyuan 8528900b17 菜单路径修改 2025-06-16 09:18:40 +08:00
skjia c62b9894c0 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-16 09:02:03 +08:00
skjia 8aefe7371b jsk 2025-06-16 09:01:36 +08:00
zzyuan 0e91e89fef Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-13 16:53:52 +08:00
zzyuan 3063600f22 菜品导入修改 2025-06-13 16:53:42 +08:00
skjia a978642ef3 jsk 超市管理 商品添加超市ID限定 2025-06-13 13:44:33 +08:00
skjia bc572b5b4b jsk 健康bug修正 2025-06-13 11:27:48 +08:00
zzyuan 7a4eb580a9 数据总览页面修改 2025-06-12 16:07:56 +08:00
zzyuan 01b3ea14cf 问题修改3 2025-06-12 15:38:40 +08:00
zzyuan 894ee06e8e 订单部分退款 2025-06-12 14:29:55 +08:00
zzyuan d0a08f85db 测试问题修改06-12 2025-06-12 10:59:23 +08:00
zzyuan 132a6f6d30 路由修改2 2025-06-12 10:00:47 +08:00
zzyuan 0f449ae06f 测试问题修改 2025-06-11 16:22:31 +08:00
zzyuan 04d5cb11ef 框架样式修改 2025-06-11 10:07:25 +08:00
zzyuan c85262f492 测试问题修改 2025-06-11 09:58:37 +08:00
zzyuan 3cfc4a4585 测试问题修改 2025-06-10 18:31:24 +08:00
zzyuan 09f37553cb 样式修改 2025-06-10 13:06:40 +08:00
zzyuan b1713714ad 账户退款明细 2025-06-10 13:06:26 +08:00
zzyuan 5e10fcecf0 框架样式顶部固定 2025-06-10 09:49:36 +08:00
zzyuan 5f48ceb3c3 营养信息接口 2025-06-09 16:18:24 +08:00
skjia 009d1f44d8 jsk 2025-06-09 15:56:13 +08:00
zzyuan 1e68aaf87e Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-09 13:40:28 +08:00
zzyuan 261b667016 框架样式修改 2025-06-09 13:40:24 +08:00
skjia bbcf477b5f jsk 2025-06-09 13:40:09 +08:00
skjia a1bdb8bbde jsk 2025-06-09 13:28:41 +08:00
zzyuan 475eea21b9 超市订单详情 2025-06-09 11:06:05 +08:00
zzyuan f843c28b73 代码提交 2025-06-09 10:47:50 +08:00
zzyuan d2fde335e9 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-09 09:51:07 +08:00
zzyuan 6606d57550 交易流水 2025-06-09 09:50:55 +08:00
skjia d2a3148552 jsk 商超 2025-06-09 09:42:39 +08:00
skjia 9349d1db4e jsk 2025-06-09 09:05:40 +08:00
skjia d33855f05b jsk 商超 2025-06-09 08:52:52 +08:00
zzyuan 7e81bee3ba 数据总览修改 2025-06-06 17:01:19 +08:00
zzyuan d7a6a23345 echarts自动响应大小 2025-06-06 16:38:22 +08:00
skjia 8510627ac0 jsk 2025-06-06 15:51:58 +08:00
skjia c77f7cfb44 jsk 交易流水 2025-06-06 15:40:44 +08:00
zzyuan 95e7c17864 数据总览页面问题修改 2025-06-06 11:21:21 +08:00
zzyuan 7ee6799e56 样式修改 2025-06-06 11:19:14 +08:00
zzyuan 2a66ac9271 路由修改 2025-06-06 10:58:04 +08:00
zzyuan c195592f48 路由修改 2025-06-06 10:56:58 +08:00
zzyuan 1cf4cc9a50 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-06 10:35:31 +08:00
zzyuan 20d62438af 参数修改样式修改 2025-06-06 10:35:20 +08:00
skjia 41c03f6344 jsk 体检 2025-06-06 09:53:38 +08:00
zzyuan f8591f3f8e Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-06 09:04:34 +08:00
zzyuan de346f3dcf 框架样式更改 2025-06-06 09:04:22 +08:00
skjia c68884cf0e jsk 体检 2025-06-06 08:56:11 +08:00
zzyuan 339d418b63 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-05 18:09:58 +08:00
zzyuan 65d540d99a 框架样式 2025-06-05 18:09:47 +08:00
skjia 911cd40fb7 jsk 健康 2025-06-05 13:59:07 +08:00
skjia 63c1f98de0 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-05 13:46:06 +08:00
skjia 03fb7e0fe5 jsk 健康 2025-06-05 13:45:53 +08:00
zzyuan ee270bd8c7 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-05 13:41:10 +08:00
zzyuan 8365f33412 用户管理 2025-06-05 13:40:58 +08:00
skjia 938b9f994b jsk 健康 2025-06-05 13:06:59 +08:00
skjia 9a02865f4e jsk 健康 2025-06-05 11:30:00 +08:00
zzyuan 38a835fd34 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-05 11:14:02 +08:00
zzyuan 8ab7377f07 前端页面修改 2025-06-05 11:13:52 +08:00
sxu 8a4d868c5d 导入菜谱 2025-06-05 11:07:05 +08:00
zzyuan 83a8b29bd5 用户管理 2025-06-05 10:50:24 +08:00
zzyuan dba754b1a9 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-05 09:45:24 +08:00
zzyuan 3501de1621 临时用户 2025-06-05 09:45:14 +08:00
skjia 2e21a3d0c8 jsk 健康 2025-06-05 08:58:06 +08:00
zzyuan 96cd6b48ba 前端修改 2025-06-04 17:59:09 +08:00
zzyuan 741ad1a41f Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-03 10:25:30 +08:00
zzyuan ae7650e20a 新增菜品添加必填 2025-06-03 10:25:26 +08:00
skjia 3ae92d2829 jsk 健康 2025-06-03 10:13:53 +08:00
skjia 145203c688 jsk 健康 2025-06-03 10:05:32 +08:00
zzyuan afb9a203f3 菜谱管理列表问题修改 2025-06-03 09:51:14 +08:00
zzyuan f14407686e Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-06-03 09:24:31 +08:00
zzyuan 6704b76c38 菜谱管理样式修改 2025-06-03 09:24:27 +08:00
skjia 67a7cd02fb jsk 健康 2025-06-03 09:17:05 +08:00
zzyuan 9af5ed4e41 食堂超市设备deviceType 2025-06-03 09:13:30 +08:00
zzyuan a780d041ff 菜谱编辑 2025-05-30 18:04:16 +08:00
zzyuan 6495ac6626 接口更改 2025-05-30 10:51:49 +08:00
zzyuan b69fd56ced 菜谱管理 2025-05-29 17:54:17 +08:00
zzyuan 5fd26b998b 菜谱管理 2025-05-29 17:41:42 +08:00
zzyuan cb27e520a2 菜谱接口 2025-05-29 16:46:05 +08:00
zzyuan 2fe410f818 菜谱绑定接口 2025-05-29 14:44:07 +08:00
zzyuan c4c987a8b9 菜谱管理 2025-05-29 14:17:16 +08:00
zzyuan ef744252b9 问题修改 2025-05-29 13:12:05 +08:00
zzyuan 1761aaa0d0 设备管理 2025-05-28 17:34:55 +08:00
zzyuan 11ddf2a511 接口对接 2025-05-28 16:55:54 +08:00
zzyuan ade27e8adf 菜谱管理接口替换 2025-05-28 16:41:08 +08:00
zzyuan 86a9767b60 菜品管理,客户反馈 2025-05-28 15:48:48 +08:00
zzyuan bf5467765a 代码bug修改 2025-05-28 10:39:42 +08:00
zzyuan 0dad103565 原料管理接口对接 2025-05-28 10:28:52 +08:00
zzyuan e098b0c988 营养信息接口对接 2025-05-27 17:53:00 +08:00
zzyuan 4b2ea761fc 账户中心页面修改 2025-05-27 16:39:53 +08:00
zzyuan f12e6e1569 商品管理 2025-05-27 13:03:27 +08:00
zzyuan e95562aa37 前端问题修改 2025-05-26 18:09:28 +08:00
zzyuan 2cf7b0836f 账号管理 2025-05-26 17:16:11 +08:00
zzyuan ea56ac8592 商超管理 2025-05-26 17:15:58 +08:00
zzyuan ff33eff54b 基础设置 2025-05-26 17:15:39 +08:00
zzyuan 5129129558 菜品复制bug修改 2025-05-26 10:00:08 +08:00
skjia d412d3a997 jsk 仓库管理 2025-05-26 08:45:20 +08:00
zzyuan 323702ae7d 系统名称:智慧食堂,主题颜色修改绿色 2025-05-19 17:39:15 +08:00
zzyuan 291d082e16 投诉建议接口替换 2025-05-19 15:31:18 +08:00
zzyuan 15606013a9 左侧导航背景色修改绿色 2025-05-19 14:07:22 +08:00
zzyuan 84ced2e300 首页数据看板接口对接 2025-05-19 13:01:04 +08:00
zzyuan 98b6b5e9ff 测试问题修改 2025-05-19 09:00:22 +08:00
zzyuan 64b41c7f15 大屏页面2 2025-05-16 10:54:15 +08:00
zzyuan cf134263a1 数据大屏页面绘制 2025-05-16 10:40:21 +08:00
zzyuan d967a8b610 库存管理采购管理页面 2025-05-15 17:26:48 +08:00
zzyuan b5c6a43a58 商超接口修改 2025-05-15 17:26:22 +08:00
zzyuan 8b3f480836 菜品原料ui设计修改 2025-05-15 15:00:09 +08:00
zzyuan 96f40250f6 菜品原料克数限制 2025-05-14 18:20:43 +08:00
zzyuan b18c592947 原料bug修改 2025-05-14 17:42:57 +08:00
zzyuan a3a956657f 供应商管理页面绘制 2025-05-14 17:04:25 +08:00
zzyuan 4c8f1b4ae9 bug修改 2025-05-14 13:02:52 +08:00
zzyuan 0f339c2a04 菜谱问题修改 2025-05-14 11:30:13 +08:00
zzyuan a92fdd735b 健康管理,轮播图 2025-05-14 11:17:24 +08:00
zzyuan 820493ff7e 菜品问题修改 2025-05-13 13:09:10 +08:00
zzyuan 0e96ed0db2 菜品营养问题修改 2025-05-13 10:48:45 +08:00
zzyuan d62b8344b5 商超管理接口对接,轮播图管理,app更新 2025-05-12 18:09:20 +08:00
zzyuan 63d955e57c 菜谱复制操作问题修改 2025-05-09 16:54:11 +08:00
zzyuan 01f619fab1 商超设备列表,商超订单列表 2025-05-09 16:09:50 +08:00
zzyuan 7ca851d726 问题修改 2025-05-09 15:54:43 +08:00
zzyuan 240c71b511 测试问题修改 2025-05-09 15:53:57 +08:00
zzyuan c660e84b8a 菜品菜谱导入 2025-05-07 17:37:22 +08:00
zzyuan 1a32000211 菜品简介 2025-05-07 13:53:53 +08:00
zzyuan 172a0caee0 接口对接 2025-05-07 13:42:50 +08:00
zzyuan b521df1e70 账户问题修改 2025-04-30 15:17:38 +08:00
zzyuan 51080aaf9a bug修改 2025-04-30 15:07:25 +08:00
zzyuan 72542afbdd 菜谱编辑 2025-04-30 11:30:27 +08:00
zzyuan 4a1877eeaa 测试问题修改 2025-04-29 14:40:26 +08:00
zzyuan 7e31add571 测试问题修改 2025-04-29 13:58:42 +08:00
zzyuan 307a83703e 重复请求时间 2025-04-29 09:23:30 +08:00
zzyuan 5e81c494dc 接口参数修改 2025-04-29 09:16:37 +08:00
zzyuan 34bd00bd47 菜谱菜谱展示 2025-04-27 18:11:38 +08:00
zzyuan 53465a79af 退款记录页面 2025-04-27 15:29:19 +08:00
zzyuan 6b61e22889 左侧菜单宽度修改 2025-04-25 09:19:23 +08:00
zzyuan cd0feb6e68 报表中心 2025-04-25 09:10:44 +08:00
zzyuan 8f0b1348ef 菜谱编辑新增复制操作 2025-04-23 18:02:45 +08:00
zzyuan 1c96873686 取款,取款记录 2025-04-22 16:09:22 +08:00
zzyuan e51f9bde6f 人脸 2025-04-21 13:17:12 +08:00
zzyuan d4431a98ca 人脸,菜品修改 2025-04-21 11:12:25 +08:00
zzyuan b4ec2b3f84 自测问题修改 2025-04-18 18:34:14 +08:00
zzyuan 2afc1e9de9 自测问题修改 2025-04-18 10:57:17 +08:00
zzyuan 6494270c0a 档口添加餐次时间 2025-04-16 18:56:56 +08:00
zzyuan 98ddc2f374 菜品菜谱对接 2025-04-16 18:29:28 +08:00
zzyuan 175d90cb0d 接口对接 2025-04-16 13:52:33 +08:00
zzyuan cbf468d0cb 接口对接(营养-原料) 2025-04-16 13:25:19 +08:00
zzyuan 690a8c6be4 原料菜品 2025-04-14 19:01:51 +08:00
zzyuan e0c4750259 个人钱包 2025-04-14 15:42:16 +08:00
zzyuan 448e998e62 账户管理,补贴管理 2025-04-14 15:01:32 +08:00
zzyuan 9b2c61477b 营养信息删除 2025-04-14 09:07:27 +08:00
zzyuan fc49b717c8 接口对接 2025-04-11 15:04:25 +08:00
zzyuan c43a8cfcc3 问题修改 2025-04-11 09:04:54 +08:00
zzyuan b74ec8b1a9 营养信息类别 2025-04-10 13:36:23 +08:00
zzyuan 0fee0f0979 链接跳转携带参数 2025-04-09 11:21:35 +08:00
zzyuan a36712fb37 vuex储存phonenumber 2025-04-09 11:20:11 +08:00
zzyuan 79aba88041 接口对接 2025-04-09 10:52:27 +08:00
zzyuan e337b10466 双屏机设备管理 2025-04-09 10:02:02 +08:00
zzyuan e804ff9812 区域食堂档口联级查询 2025-04-09 09:07:42 +08:00
zzyuan d282f90aba 区域食堂档口模块对接 2025-04-08 14:31:46 +08:00
zzyuan 6bdc71dbc2 区域食堂档口接口对接 2025-04-08 14:06:40 +08:00
zzyuan 54e9fdef21 问题修改 2025-04-03 16:13:08 +08:00
zzyuan 600db88b97 测试问题修改,页面逻辑梳理 2025-04-03 11:02:27 +08:00
zzyuan dfd11a9a39 测试修改 2025-04-02 15:12:24 +08:00
zzyuan 3416dbf8c2 账户冻结,商超商品销售明细,当前账户状态 2025-04-02 11:15:13 +08:00
zzyuan f62b8df356 基础管理-移动端 2025-03-31 16:37:46 +08:00
zzyuan 7babf5804a 菜谱操作问题提交 2025-03-31 14:11:52 +08:00
zzyuan 6ff0718f63 核销 2025-03-31 09:17:39 +08:00
zzyuan 1ac6af3299 测试问题修改8 2025-03-28 17:38:00 +08:00
zzyuan cf18870ae5 测试问题修改7 2025-03-28 17:33:06 +08:00
zzyuan 3ef015d70c 测试问题修改6 2025-03-28 13:23:54 +08:00
zzyuan 7428bbe72a 测试问题修改5 2025-03-28 13:02:07 +08:00
zzyuan d22e69bd5f 测试问题修改样式修改 2025-03-27 17:15:13 +08:00
zzyuan 82d938e60b 测试问题修改 2025-03-27 16:31:51 +08:00
zzyuan 194e4a3b02 菜谱编辑新增时价格修改 2025-03-27 11:26:59 +08:00
zzyuan 5cdf323d5c 测试问题修改3 2025-03-26 17:14:15 +08:00
zzyuan af2325b817 测试问题修改2 2025-03-26 15:47:02 +08:00
zzyuan 984f04e471 数字输入计算函数 2025-03-25 15:53:44 +08:00
zzyuan c8122c9978 测试问题修改1 2025-03-25 15:48:23 +08:00
zzyuan ab5a2ae10a 角色新增编辑区域食堂权限问题修改 2025-03-24 14:46:24 +08:00
zzyuan 5ee014148b 测试问题修改(基础设置) 2025-03-24 14:29:01 +08:00
zzyuan ea7e07350a 账户管理:补贴页面对接,相关自测问题修改 2025-03-24 14:28:39 +08:00
zzyuan e1e701430d 组件问题修改 2025-03-21 17:59:18 +08:00
zzyuan f58abc9f0b 账户管理对接 2025-03-20 19:28:36 +08:00
zzyuan 5c13b2161e 订单组织树 2025-03-19 18:46:40 +08:00
zzyuan f569800226 商超管理 2025-03-19 18:36:55 +08:00
zzyuan f7fcdb6453 订单消费记录线上线下 2025-03-18 16:12:25 +08:00
zzyuan c76fb1a5ce 路由配置 2025-03-18 16:11:40 +08:00
zzyuan 412e7319d5 修改角色权限 2025-03-18 16:10:36 +08:00
zzyuan 179c073a77 订单管理,超市管理 2025-03-18 10:51:38 +08:00
zzyuan 6f1c2db60a 菜谱新增修改 2025-03-14 18:20:29 +08:00
zzyuan ea20f7636b 菜谱新增 2025-03-14 18:06:16 +08:00
zzyuan 73032dfe70 菜谱管理2 2025-03-12 17:23:48 +08:00
zzyuan 5ea50df7da 菜谱管理 2025-03-12 16:50:08 +08:00
zzyuan 7429558ca0 菜谱管理 2025-03-12 16:29:16 +08:00
zzyuan b6ecd2233f 菜谱管理 2025-03-12 15:47:11 +08:00
zzyuan f03b5a026e 菜谱管理页面代码1 2025-03-12 15:28:36 +08:00
zzyuan 7998c86aa1 菜品类型对接 2025-03-11 18:32:30 +08:00
zzyuan 2cdc19093d 原料,营养信息对接 2025-03-11 18:32:06 +08:00
zzyuan 5afb4de81a 页面优化绘制(基础设置,设备管理) 2025-03-11 18:31:37 +08:00
zzyuan c0dad068ad 样式修改 2025-03-07 17:24:51 +08:00
zzyuan 0601e94429 用户管理角色下拉问题修改 2025-03-07 17:24:30 +08:00
zzyuan 5302ef1e08 双屏消费机 2025-03-07 11:20:46 +08:00
zzyuan 68614ae0d6 登录权限判断 2025-03-07 11:20:25 +08:00
zzyuan 28019a4f7b Merge branch 'bonus-houqin' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-houqin 2025-03-06 18:47:33 +08:00
zzyuan 6a3a39c6d7 设备管理接口对接 2025-03-06 18:47:29 +08:00
zzyuan f914a79ba5 食堂档口管理接口对接 2025-03-06 18:47:13 +08:00
lSun 78db95b0fe 菜品菜谱-营养信息 2025-03-06 13:08:28 +08:00
lSun 02109c8d45 Merge remote-tracking branch 'origin/bonus-houqin' into bonus-houqin 2025-03-06 09:27:25 +08:00
zzyuan 93e1e34977 食堂3 2025-03-05 16:18:39 +08:00
zzyuan db41f94803 食堂管理2 2025-03-05 15:21:18 +08:00
zzyuan f993306c3a 食堂管理 2025-03-05 14:52:18 +08:00
lSun dcec89674b 菜品菜谱-营养信息 2025-03-05 09:46:58 +08:00
zzyuan a9c0c1316c 区域管理页面 2025-03-04 18:41:42 +08:00
zzyuan fe9338fda3 新增文件 2025-03-03 17:43:57 +08:00
BianLzhaoMin cfba3e278d 禅道bug修复 2025-01-16 16:50:34 +08:00
BianLzhaoMin e07c237201 代码优化 2025-01-09 17:28:20 +08:00
BianLzhaoMin 1346c150fe 优化 2025-01-09 15:11:12 +08:00
BianLzhaoMin 5f0f633adb 代码优化 2025-01-09 15:10:55 +08:00
BianLzhaoMin 8852031f72 代码修复 2025-01-09 15:08:16 +08:00
BianLzhaoMin bd1b55d4db 问题清单修复 2025-01-08 17:11:53 +08:00
BianLzhaoMin 9b37f1a3fd 权限模板功能调试 2025-01-08 14:51:27 +08:00
BianLzhaoMin 9704d0d055 公司管理功能完善 2025-01-08 13:15:29 +08:00
BianLzhaoMin 75787c5aac 冲突合并 2025-01-08 09:26:32 +08:00
sxu 571c4fead2 公司管理 2025-01-06 14:36:27 +08:00
weiweiw 7d78be85eb 根据机具项目的要求回滚"增加顶级部门",因为新增了多公司管理 2025-01-06 11:17:08 +08:00
BianLzhaoMin fb239b925f 代码优化 2025-01-03 17:56:43 +08:00
BianLzhaoMin 08f18189fc 代码优化 2025-01-03 17:24:15 +08:00
BianLzhaoMin 60facdcc5c 优化 2025-01-03 15:26:27 +08:00
BianLzhaoMin 5dd0386da4 优化 2025-01-03 15:17:33 +08:00
BianLzhaoMin 2bce41582e 公司管理模块完善 2025-01-03 15:03:10 +08:00
BianLzhaoMin 81753f5a0c 代码还原 2025-01-03 09:43:29 +08:00
BianLzhaoMin 8252f4b63b 公司管理页面晚上 2024-12-31 17:49:45 +08:00
BianLzhaoMin 5b64a7f3e9 页面完善 2024-12-30 18:14:06 +08:00
BianLzhaoMin 72cddc1d17 公司注册功页面提交 2024-12-30 18:07:53 +08:00
jiang 85477dbeb9 用户登录问题修改 2024-12-15 16:44:52 +08:00
jiang cb7c8ca427 用户登录问题修改 2024-12-08 17:35:17 +08:00
weiweiw 9e48b04404 具有审计管理和系统管理角色的用户应不允许被修改和删除 2024-11-20 11:35:35 +08:00
weiweiw 666cbbdde9 用户和角色list 对id 为1 或内置的 不能删除或修改 2024-11-18 09:49:49 +08:00
weiweiw e2e439ba30 用户和角色list 对id 为1 或内置的 不能删除或修改 2024-11-15 11:24:37 +08:00
weiweiw 5691d366f9 手机号脱敏显示 2024-11-12 14:56:22 +08:00
weiweiw 2ee58cefb0 tokentime的输入大小进行限制 2024-11-12 10:53:58 +08:00
jiang ae4a120987 用户登录问题修改 2024-11-11 13:42:53 +08:00
weiweiw 56d8178d32 角色和用户对内置属性进行开发 2024-11-11 11:55:02 +08:00
weiweiw 2d898be6c4 告警功能增加 2024-11-11 09:49:34 +08:00
weiweiw daff010eb7 告警功能增加 2024-11-10 08:55:36 +08:00
jiang 68f09fcb7d 提交代码 2024-11-08 15:01:17 +08:00
jiang 328e28d7ee Merge remote-tracking branch 'origin/main' 2024-11-08 10:51:35 +08:00
jiang b6fd43084e 用户登录问题修改 2024-11-08 10:51:14 +08:00
weiweiw 295174579e 修复页面报错 2024-11-08 10:35:39 +08:00
weiweiw cf48732c87 Merge remote-tracking branch 'origin/main' 2024-11-08 10:28:22 +08:00
weiweiw 0fce987c48 修复页面报错 2024-11-08 10:27:51 +08:00
jiang 1d31b2fe3c 用户登录问题修改 2024-11-07 16:50:42 +08:00
jiang d14ab8e5f6 Merge remote-tracking branch 'origin/main' 2024-11-07 15:02:58 +08:00
jiang 828794effa 用户登录问题修改 2024-11-07 15:02:38 +08:00
weiweiw 1d84c5db55 增加日志备份功能和完善日志 操作 2024-11-07 15:01:48 +08:00
weiweiw 58c745980c Merge branch 'refs/heads/dev' 2024-11-07 09:24:49 +08:00
jiang 5ac47fa006 用户登录问题修改 2024-11-06 20:53:49 +08:00
weiweiw 865423d802 修改所有PUT 方法为post 2024-11-06 13:46:29 +08:00
weiweiw 1ba873093c 修改所有delete 方法为post 2024-11-06 12:01:58 +08:00
jiang 22d2c5dba1 用户登录问题修改 2024-11-06 10:05:50 +08:00
jiang 33cab82ec6 用户登录问题修改 2024-11-05 14:43:17 +08:00
jiang 580626e5fd 用户登录问题修改 2024-11-01 10:19:37 +08:00
jiang df9a8e0253 用户登录问题修改 2024-10-29 15:48:18 +08:00
jiang 7e6ecd0dba 用户登录问题修改 2024-10-29 15:20:59 +08:00
jiang 7ffda168f5 用户登录问题修改 2024-10-29 14:19:41 +08:00
weiweiw 444a3bf9b9 给菜单增加系统类型,并根据后台系统调用menu/getRouters/0接口 2024-10-16 08:10:36 +08:00
jiang 116cd0bad8 用户登录问题修改 2024-09-19 09:39:23 +08:00
jiang 4a84ccb7db 用户登录问题修改 2024-09-18 15:51:58 +08:00
jiang 305a665da2 用户登录问题修改 2024-09-14 17:34:19 +08:00
jiang 3370b734a2 用户登录问题修改 2024-09-13 16:36:46 +08:00
jiang e94ea40959 Merge remote-tracking branch 'origin/main' 2024-09-13 16:07:06 +08:00
jiang d0b5d6c704 用户登录问题修改 2024-09-13 16:06:50 +08:00
weiweiw 86c164db35 增加支持顶级部门功能 2024-09-12 18:02:17 +08:00
jiang be94bc276f 用户登录问题修改 2024-09-10 18:01:39 +08:00
jiang 8bb10191ea 用户登录问题修改 2024-09-10 10:04:32 +08:00
jiang eb9e9db8b1 用户登录问题修改 2024-09-08 20:13:32 +08:00
weiweiw 312c9ebaec update naming style 2024-08-26 13:05:39 +08:00
jiang 20797914db 数据加密和完整性校验 2024-08-16 15:50:37 +08:00
jiang dd0e2f4721 数据加密和完整性校验 2024-08-09 13:25:47 +08:00
weiweiw 410a89c695 update naming style 2024-08-08 17:00:40 +08:00
jiang b130e05078 数据加密和完整性校验 2024-08-08 15:31:39 +08:00
jiang 02e82010ef 数据加密和完整性校验 2024-08-08 15:11:05 +08:00
jiang 700a9c6ac7 数据加密和完整性校验 2024-08-07 11:27:37 +08:00
jiang 877ae77cb3 数据加密和完整性校验 2024-08-06 15:47:19 +08:00
weiweiw 6f26e09f66 rollback request.js 2024-07-31 18:28:32 +08:00
jiang 5cfdb4870c bug修改 2024-07-31 16:19:37 +08:00
jiang 41579ccd28 bug修改 2024-07-31 15:06:58 +08:00
jiang bc13169c25 bug修改 2024-07-29 19:48:02 +08:00
jiang fab7226afb bug修改 2024-07-29 19:23:39 +08:00
lizhenhua bc2c980153 审计日志功能上传 2024-07-28 13:19:11 +08:00
weiweiw f89d4023ca update naming style 2024-07-26 14:59:03 +08:00
lizhenhua 7a2e6cb04b 审计日志功能上传 2024-07-25 14:33:05 +08:00
lizhenhua 5f43e35b90 Merge remote-tracking branch 'origin/main' into main 2024-07-24 19:27:08 +08:00
lizhenhua 2494e804cc 审计日志功能上传 2024-07-24 19:27:02 +08:00
jiang ae2c7d5302 web登录 2024-07-24 18:07:42 +08:00
jiang 5889169554 web登录 2024-07-24 10:51:57 +08:00
jiang da9ffd1b80 web登录 2024-07-22 15:32:27 +08:00
lizhenhua 783af74cd1 Merge remote-tracking branch 'origin/main' into main 2024-07-22 14:08:04 +08:00
lizhenhua d37b8dc13b 审计日志功能上传 2024-07-22 14:07:50 +08:00
weiweiw 2fd185f1f7 remove unused configuration 2024-07-21 08:53:09 +08:00
lizhenhua 149dc3cbeb Merge remote-tracking branch 'origin/main' into main 2024-07-18 20:44:14 +08:00
lizhenhua dbd1ac89a4 审计日志功能上传 2024-07-18 20:42:38 +08:00
paulch cd2eebd69e update version 2024-07-18 17:34:49 +08:00
paulch 4812ef2516 remove pay image 2024-07-18 17:04:48 +08:00
paulch b93da82f30 Merge remote-tracking branch 'origin/main' 2024-07-18 17:03:16 +08:00
paulch 6cd9fa76cd update the default profile image 2024-07-18 17:03:01 +08:00
tjxt 468126a928 新增日志管理页面 2024-07-17 14:35:04 +08:00
weiweiw aa9691b85b update naming style 2024-07-08 09:55:01 +08:00
weiweiw 69bc37df4b merge code for encryption 2024-07-04 10:35:24 +08:00
paulch 2cf17addf2 add missing files 2024-06-26 16:02:38 +08:00
paulch 74257bf36c move from Bonus-Cloud 2024-06-26 15:11:05 +08:00