Commit Graph

265 Commits

Author SHA1 Message Date
1378012178@qq.com ec1ad10bf4 服务指令、长者标签增加默认图片 2025-09-02 11:15:23 +08:00
1378012178@qq.com d7c1212040 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-28 16:04:04 +08:00
1378012178@qq.com 4b3231c311 服务指令、长者标签禅道bug 2025-08-28 16:03:57 +08:00
yangjun 59bad499fa 修改物料分类树不好使的问题 2025-08-28 16:01:42 +08:00
1378012178@qq.com 2dbf9e1759 长者标签差异比对 2025-08-27 17:28:52 +08:00
1378012178@qq.com c5fec1250e Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-27 15:18:01 +08:00
1378012178@qq.com 34e99ca6a0 1、长者标签增加差异标签导出 2025-08-27 15:17:53 +08:00
yangjun a4c5ddc0c7 修改样式 2025-08-27 15:11:18 +08:00
yangjun d06145e113 修改边距 2025-08-27 13:56:19 +08:00
yangjun e55e6efab6 修改物料树的样式 2025-08-27 10:06:38 +08:00
1378012178@qq.com 7606dcc82d 1、服务指令只有主指令库能维护资源字段 非主指令库只能在新增时维护服务指令描述 2025-08-27 08:53:30 +08:00
1378012178@qq.com 80d706dc05 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-26 18:49:33 +08:00
1378012178@qq.com ef68213d91 1、长者标签增加标签管理、引用功能
2、增加同步逻辑
2025-08-26 18:49:22 +08:00
yangjun 041f90c71c 修改查询定位功能 2025-08-26 13:46:04 +08:00
1378012178@qq.com f43c01795f 错误解决 2025-08-26 10:38:29 +08:00
1378012178@qq.com 98bc724bda 服务指令调整 2025-08-26 09:39:47 +08:00
yangjun 70d5555465 添加MP3,MP4上传功能 2025-08-26 09:07:44 +08:00
yangjun 04fcc7e7db Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
# Conflicts:
#	src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
2025-08-25 15:01:52 +08:00
yangjun 32b73f6e9d 修改样式 2025-08-25 14:59:33 +08:00
1378012178@qq.com 3368d90522 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
# Conflicts:
#	src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
2025-08-25 14:57:15 +08:00
1378012178@qq.com 1ba9a2de66 服务指令功能调整 2025-08-25 14:56:19 +08:00
yangjun 00aeef66db 修改bug 2025-08-22 17:12:20 +08:00
yangjun 454428b68e 修改bug 2025-08-21 17:04:31 +08:00
yangjun d5afab9c4d 修改摄像头样式 2025-08-20 16:55:47 +08:00
曹磊 4b23a27797 温湿度卡片在线状态显示错误的问题。 2025-08-19 14:41:42 +08:00
yangjun 18c6048171 修改bug 2025-08-19 13:38:10 +08:00
yangjun c0e0e01f7e 修改bug 2025-08-18 17:00:45 +08:00
yangjun 0c31c8a181 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
# Conflicts:
#	src/components/Application/src/AppLogo.vue
#	src/layouts/default/header/index.vue
2025-08-15 16:36:19 +08:00
yangjun b4de48e8e7 修改bug 2025-08-15 16:34:48 +08:00
1378012178@qq.com 449f674f17 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-15 14:20:59 +08:00
1378012178@qq.com 00a9eca219 长者标签 2025-08-15 14:20:51 +08:00
曹磊 d67d7b955c 摄像头预览优化 2025-08-14 17:40:17 +08:00
yangjun 9c1076e64c 修改维修功能 2025-08-14 13:53:56 +08:00
yangjun c8144e10be 修改护理区域样式 2025-08-14 10:00:48 +08:00
1378012178@qq.com 1e5968ac7b 样式调整 2025-08-12 10:32:25 +08:00
1378012178@qq.com 7b31202b8c Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-11 17:04:10 +08:00
1378012178@qq.com c4c86718c7 服务指令编辑页样式调整(非最终) 2025-08-11 17:04:01 +08:00
yangjun d9f2afee27 修改bug 2025-08-08 16:58:40 +08:00
yangjun a4246c243a 修改树的高度 2025-08-08 15:42:06 +08:00
yangjun b71a08d036 添加查询条件 2025-08-08 15:26:21 +08:00
1378012178@qq.com fb82a56496 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-08 14:08:20 +08:00
1378012178@qq.com 48e681fd54 服务指令bug 2025-08-08 14:08:12 +08:00
yangjun 9c54123108 修改样式 2025-08-08 13:57:53 +08:00
yangjun 87a1f17897 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-08 10:09:37 +08:00
yangjun 30337d5c17 修改bug 2025-08-08 10:09:31 +08:00
1378012178@qq.com 6183597612 服务指令bug 2025-08-08 09:33:27 +08:00
1378012178@qq.com 777e838d04 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-07 16:24:18 +08:00
1378012178@qq.com 970d42f2ea 服务指令bug 2025-08-07 16:24:07 +08:00
yangjun 9ff475f524 修改物料启用停用可操作的逻辑 2025-08-07 15:42:59 +08:00
yangjun 978052864b 修改bug 2025-08-07 14:42:18 +08:00
yangjun c08464dafd 修改bug 2025-08-07 09:59:43 +08:00
1378012178@qq.com d473bd2220 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-06 16:01:57 +08:00
1378012178@qq.com fbfc1672e9 服务指令bug修复 2025-08-06 16:01:50 +08:00
yangjun d1c7735f7a 修改物料迁移功能 2025-08-06 15:58:08 +08:00
yangjun 47e4eeff30 添加样式 2025-08-05 17:33:33 +08:00
1378012178@qq.com 171e8f14e4 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-05 15:59:27 +08:00
1378012178@qq.com bac5f31b4f 服务指令镜像bug 2025-08-05 15:59:16 +08:00
yangjun 760e7f2b15 修改bug 2025-08-05 15:20:09 +08:00
yangjun ae04765fa1 修改抽屉样式 2025-08-05 14:00:29 +08:00
1378012178@qq.com 02935d4236 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-05 10:54:32 +08:00
yangjun 45200e2a75 修改抽屉插件 2025-08-05 10:54:03 +08:00
1378012178@qq.com 10e33b08bf 修改服务指令bug 2025-08-05 10:53:13 +08:00
yangjun 5e29db84a2 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-04 15:17:00 +08:00
yangjun 41edeab371 修改样式 2025-08-04 15:16:56 +08:00
1378012178@qq.com ef01bcb535 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-08-04 14:48:54 +08:00
1378012178@qq.com fd8b43a5a4 服务指令-指令库 2025-08-04 14:48:44 +08:00
yangjun a51b6ec316 修改bug 2025-08-04 08:36:44 +08:00
yangjun 7770ca2941 MP3及MP4预览页面,关闭后仍然播放的问题 2025-08-01 15:16:29 +08:00
yangjun 62a144269a 修改bug 2025-08-01 09:51:30 +08:00
1378012178@qq.com a6ac0475e0 解决服务指令-点击树任何节点会刷新树 2025-07-31 14:20:34 +08:00
1378012178@qq.com 13ae8ef89d 服务指令同步 2025-07-30 17:04:18 +08:00
yangjun e06ea16dcc 添加登录滑块功能及a-modal添加背景 2025-07-29 14:59:03 +08:00
1378012178@qq.com aa79f94ff9 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-28 10:25:54 +08:00
1378012178@qq.com fcb5541fec 服务指令同步 2025-07-28 10:25:47 +08:00
yangjun 6a34074404 护理区域生成二维码功能 2025-07-25 14:19:48 +08:00
yangjun 45a0a86b2f 修改物料信息功能 2025-07-24 11:17:40 +08:00
1378012178@qq.com b1d6bf3b7b Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-23 08:39:17 +08:00
1378012178@qq.com 49026c45b0 服务指令-树处理 2025-07-23 08:39:10 +08:00
yangjun 81d8f62a18 修改文字 2025-07-22 15:36:25 +08:00
yangjun 4117fee0f4 修改物料类别功能模块展示形式 2025-07-22 14:32:04 +08:00
yangjun 4d5e0470eb 修改字段名称 2025-07-22 09:47:36 +08:00
1378012178@qq.com 405fe93f30 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-22 09:46:20 +08:00
1378012178@qq.com d17b1d28a9 服务指令树 2025-07-22 09:46:13 +08:00
yangjun 0d0a85773c 修改护理单元改为区域信息,并修改展示形式 2025-07-21 15:20:01 +08:00
yangjun 07951274bf 更换按钮样式 2025-07-17 09:43:00 +08:00
yangjun ec97509b89 修改默认图标地址 2025-07-16 10:41:00 +08:00
yangjun 622480d260 修改指令包页面样式 2025-07-16 09:08:56 +08:00
1378012178@qq.com a6ac18c17f Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-16 08:34:16 +08:00
1378012178@qq.com 3e7639ad74 服务指令功能完善 2025-07-16 08:34:10 +08:00
yangjun fce25d0158 修改服务指令包页面样式 2025-07-15 16:30:33 +08:00
yangjun 122ef7b5a1 修改访问路径 2025-07-15 13:42:49 +08:00
yangjun bcfabb7667 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-15 08:41:18 +08:00
yangjun d8f2f5ab28 修改服务指令包样式 2025-07-15 08:41:14 +08:00
1378012178@qq.com 467cb0dc70 服务指令功能 2025-07-15 08:39:29 +08:00
1378012178@qq.com 8357729305 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-04 16:26:43 +08:00
1378012178@qq.com 4899a15327 配置信息调整 2025-07-04 16:26:35 +08:00
yangjun e22036eca7 修改摄像头管理的样式,及画面配置功能改成弹出层 2025-07-04 10:40:11 +08:00
1378012178@qq.com 41228a4606 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-07-03 14:12:19 +08:00
1378012178@qq.com cc5c28c699 调整接口名称 2025-07-03 14:12:11 +08:00
yangjun 5f98eb8229 修改接口访问路径(主要是物料及进销存的接口) 2025-07-03 08:55:08 +08:00
yangjun c865bb29ec 修改记住密码的登录样式及物料信息里logo大小 2025-07-02 14:15:50 +08:00
yangjun 22233f8b1a 修改logo图片 2025-07-02 11:21:26 +08:00
yangjun adeb3c2e54 修改登录样式 2025-07-01 13:34:55 +08:00
yangjun 8b0cef7582 修改样式 2025-07-01 10:20:38 +08:00
1378012178@qq.com fecbc8a3e8 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-06-30 17:47:19 +08:00
1378012178@qq.com 2400faed77 环境配置文件 2025-06-30 17:47:11 +08:00
yangjun 058158fa57 修改文件夹路径 2025-06-30 15:28:15 +08:00
yangjun 972a1b13a1 修改温湿度列表样式 2025-06-30 14:54:10 +08:00
曹磊 686fe4edca tplink摄像头变焦 2025-06-30 14:23:13 +08:00
yangjun a214cb5234 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
# Conflicts:
#	src/views/iot/yiweilian/index.vue
2025-06-30 10:15:01 +08:00
yangjun bb22c54eda 修改样式 2025-06-30 10:14:24 +08:00
曹磊 0f4b2eb217 温湿度路径修改 2025-06-30 10:13:45 +08:00
曹磊 18ea16555d 温湿度路径修改 2025-06-30 10:13:28 +08:00
曹磊 fd1cd471df TpLink路径修改 2025-06-30 09:47:35 +08:00
1378012178@qq.com be943c35c6 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-06-25 09:04:13 +08:00
1378012178@qq.com 9c84f57ad7 护理单元同步 2025-06-25 09:04:07 +08:00
yangjun 33b0d44dcd 添加温湿度及水表的页面展示 2025-06-23 08:57:05 +08:00
yangjun 8de7b54e47 添加温湿度选择护理单元功能 2025-06-20 10:22:54 +08:00
1378012178@qq.com 1035b210df 1、调整资源管理功能
2、解决服务指令文件资源回显问题
3、增加机构3配置文件
2025-06-19 15:09:53 +08:00
1378012178@qq.com b8efa56a30 部门管理增加省市区等 2025-05-30 16:50:40 +08:00
1378012178@qq.com 5399127ea9 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-05-27 14:14:14 +08:00
1378012178@qq.com 2ba5056fd9 1、服务指令媒体资源同步 2025-05-27 14:14:07 +08:00
yangjun 596b5e9363 修改样式 2025-05-26 14:31:41 +08:00
yangjun dae83f0919 修改上传不好使的问题 2025-05-15 16:48:57 +08:00
yangjun 9924005cdd 修改样式 2025-05-15 13:49:32 +08:00
yangjun f5e342b47f 修改样式 2025-05-14 10:41:21 +08:00
yangjun 8f58e60349 修改样式 2025-05-13 15:34:20 +08:00
曹磊 5f6db02737 Merge remote-tracking branch 'origin/master' 2025-05-13 09:09:55 +08:00
曹磊 f8d2ee1db3 TpLink摄像头录像计划 2025-05-13 08:55:24 +08:00
1378012178@qq.com 798305b103 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-05-12 14:50:16 +08:00
1378012178@qq.com 15d2d78625 1、修复指令数据同步bug
2、完成系统参数配置下发功能(全局参数下发)
2025-05-12 14:50:09 +08:00
yangjun b0d8aa086c 修改样式 2025-05-12 08:35:32 +08:00
1378012178@qq.com 00737978c8 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-05-08 16:23:33 +08:00
yangjun 45e9b655ba 修改背景图片 2025-05-08 13:31:28 +08:00
1378012178@qq.com 39f0e244b2 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-05-07 14:20:00 +08:00
1378012178@qq.com dbfbe2cf96 系统数据字典(临时提交) 2025-05-07 14:19:52 +08:00
yangjun e84ffc1fcc 修改样式 2025-05-07 14:04:02 +08:00
曹磊 4dd33cd28a 同步tplink代码与运维代码一致 2025-05-06 11:06:24 +08:00
yangjun cd8d501836 修改样式 2025-05-06 08:58:55 +08:00
1378012178@qq.com 054d3c587d 调整服务指令-分类标签显示顺序(各分类中排在第一位) 2025-04-30 10:49:49 +08:00
1378012178@qq.com 556cab7781 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-04-28 16:09:01 +08:00
1378012178@qq.com f4ec9bee8e 调整服务指令-去除指令标签,新增体型标签、情绪标签 2025-04-28 16:08:53 +08:00
yangjun 1009de2848 添加客户操作功能 2025-04-16 09:22:35 +08:00
yangjun 942efd62ce 添加h5入住护理单元功能 2025-04-15 11:15:19 +08:00
yangjun 87f3d9a51a 添加账号 2025-04-09 17:35:42 +08:00
yangjun 17d2fa5e33 添加后注册流程 2025-04-09 14:22:13 +08:00
1378012178@qq.com 906e4c7318 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue 2025-04-08 15:34:06 +08:00
1378012178@qq.com f6e2a5ad9b iot相关代码调整 2025-04-08 15:34:00 +08:00
yangjun 9f1729805b 添加注册页面 2025-04-07 16:23:05 +08:00
yangjun a42a3cbf72 添加可登录平台字段 2025-04-03 16:24:12 +08:00