Commit Graph

2904 Commits

Author SHA1 Message Date
xhf
1047964d8e 修改实时地图 2025-02-21 11:02:24 +08:00
yyy
a23543522b Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-21 10:59:43 +08:00
yyy
934a41f7b5 地图编辑 2025-02-21 10:59:38 +08:00
xhf
2e229b1743 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-20 17:37:18 +08:00
xhf
5241be4949 修改实时地图 2025-02-20 17:37:09 +08:00
yyy
0eb3ff029d 物料区域管理、线库管理
地图设备不能有重复问题
2025-02-20 16:02:24 +08:00
yyy
830c158692 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-19 17:55:32 +08:00
yyy
3be0f22b79 地图编辑 2025-02-19 17:55:26 +08:00
xhf
0fb684c773 修改问题 2025-02-19 17:54:23 +08:00
xhf
fa937ea0f0 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-19 09:14:13 +08:00
xhf
cf567206c6 统计 2025-02-19 09:14:00 +08:00
yyy
8a7518777a 路径编辑 2025-02-18 17:32:30 +08:00
yyy
06ede04e13 编辑路线 2025-02-18 15:29:50 +08:00
yyy
899c04371c Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-18 11:36:07 +08:00
yyy
87bd656625 创建编辑删除仓库点位地图连线 2025-02-18 11:36:00 +08:00
xhf
b9e189bbc9 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-17 18:00:00 +08:00
xhf
1696320d5a 增加drag.js 2025-02-17 17:59:51 +08:00
yyy
cf90d2c457 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-17 17:59:33 +08:00
yyy
9824ec1486 绘制曲线 2025-02-17 17:59:27 +08:00
xhf
a526874ab7 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-17 16:46:55 +08:00
xhf
557f557857 封装v-drag 2025-02-17 16:46:50 +08:00
yyy
bc07a1db4f Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-17 16:07:23 +08:00
xhf
437738b211 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-17 16:07:11 +08:00
yyy
d5fe81953d 绘制路线 2025-02-17 16:07:07 +08:00
xhf
979be7aa8b 修改问题 2025-02-17 16:07:05 +08:00
yyy
c7939bd39a Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-17 10:39:17 +08:00
yyy
de5c8be7b9 坐标转换 2025-02-17 10:39:10 +08:00
xhf
3266d315c6 修改问题 2025-02-15 23:48:25 +08:00
xhf
1f77a0b5d2 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-15 23:46:54 +08:00
xhf
964bd1e663 修改冲突 2025-02-15 23:46:46 +08:00
yyy
06b52ad6ca 编辑地图 2025-02-15 17:34:34 +08:00
xhf
35d3cc3a98 修改问题 2025-02-15 17:33:26 +08:00
yyy
48d26d8479 地图编辑 2025-02-15 17:15:48 +08:00
yyy
b3bd0635fc 修复测距、框选 在定位元素内部的bug 2025-02-15 10:33:28 +08:00
yyy
a769b54e7a 测距功能开发 2025-02-14 17:48:28 +08:00
yyy
77d34e3971 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-14 14:35:31 +08:00
yyy
d9fe4febab 库位列表编辑 2025-02-14 14:35:27 +08:00
xhf
8b0a433969 修改 2025-02-14 11:50:38 +08:00
yyy
959cf702e0 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-14 11:46:35 +08:00
yyy
77b85bcf51 库位列表 2025-02-14 11:46:31 +08:00
xhf
b5a0f02d4e Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-14 11:45:02 +08:00
xhf
18d5b74d17 修改 2025-02-14 11:44:55 +08:00
yyy
130bc36460 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-14 09:46:23 +08:00
yyy
8078e1f041 编辑地图 2025-02-14 09:46:17 +08:00
xhf
168c463451 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-13 17:39:31 +08:00
xhf
442e8444e2 实时地图 2025-02-13 17:39:22 +08:00
yyy
2853959c19 地图编辑 2025-02-13 17:38:10 +08:00
yyy
c4a5ea4bb1 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-13 14:31:06 +08:00
yyy
2bbd29674e 地图编辑 2025-02-13 14:31:00 +08:00
xhf
8ef2938d10 解决冲突 2025-02-13 14:29:02 +08:00
xhf
1b188bdf26 设备 2025-02-13 14:16:37 +08:00
yyy
3680fcabb0 地图编辑 2025-02-12 17:56:48 +08:00
yyy
66150c708d 设备看板 2025-02-11 17:51:08 +08:00
yyy
44aae99612 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-11 17:04:39 +08:00
yyy
96121faf7e 地图编辑 2025-02-11 17:04:33 +08:00
xhf
d64e339249 设备看板 2025-02-11 17:03:11 +08:00
xhf
5736a5a82d Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-11 11:45:17 +08:00
xhf
ea465aac6e 增加参数设置 2025-02-11 11:45:12 +08:00
yyy
2f8d31b63c 地图编辑 2025-02-10 18:07:22 +08:00
yyy
ce81a142a7 保存json文件到本地 2025-02-10 09:21:56 +08:00
yyy
82eff5bf84 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-08 17:38:55 +08:00
yyy
325de2cc64 鼠标地图多选框选、地图工具复制、地图工具粘贴、地图工具删除、地图工具文字输入 2025-02-08 17:38:48 +08:00
xhf
a6dd271e21 增加异常列表 2025-02-08 17:37:18 +08:00
xhf
b327100805 车辆编辑 新增 2025-02-08 11:59:57 +08:00
xhf
9affc6045c Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-07 18:35:33 +08:00
xhf
e3ee9b3611 新增车辆信息看板 2025-02-07 18:35:23 +08:00
yyy
9d0cc0b096 地图编辑 2025-02-07 18:12:19 +08:00
yyy
21ef0251a6 任务 2025-02-07 14:06:43 +08:00
yyy
b08d79abe8 撤销重做 2025-02-07 09:24:39 +08:00
yyy
17f9c226d1 地图 2025-02-06 17:34:01 +08:00
yyy
e2e4c8c9b9 地图编辑 2025-02-05 18:09:39 +08:00
yyy
6da6a3fb3b 地图 2025-02-05 14:45:53 +08:00
yyy
a3a48799c3 任务 2025-01-22 17:44:16 +08:00
yyy
2474695f95 任务 2025-01-21 09:11:54 +08:00
yyy
8dfb5c8ed7 任务管理 2025-01-18 17:02:38 +08:00
yyy
7ac789c919 任务管理 2025-01-17 18:22:04 +08:00
yyy
47d7f40706 任务 2025-01-16 18:19:02 +08:00
xhf
50815e06f5 提交首页接口对接
1.地图接口下载
2025-01-14 14:52:53 +08:00
xhf
fe82ab49d4 增加插件 2025-01-10 17:32:31 +08:00
芋道源码
ecfe1b6145
!613 GoView域名外置配置文件
Merge pull request !613 from 杨宇庆/N/A
2024-12-19 12:49:29 +00:00
芋道源码
1df1850ef9
!615 解决商机、合同金额无法自动计算的问题
Merge pull request !615 from 杨宇庆/N/A
2024-12-19 12:48:17 +00:00
山野羡民
b5aa9d24ac
防御性编程,规避服务端children返回的不是数组时…… update src/utils/tree.ts.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
2024-12-18 03:02:00 +00:00
jason
9f0f5b0e6c 【代码优化】 发起流程页面时,加 Loading 遮罩 2024-12-13 22:37:42 +08:00
芋道源码
0ab7f2342c
!616 bpmn设计器优化(添加CallActivity配置支持)
Merge pull request !616 from Lesan/feature/bpm
2024-12-12 01:05:34 +00:00
Lesan
a389392c8e feat: bpmn设计器添加CallActivity支持 2024-12-12 08:33:46 +08:00
Lesan
5d31881f48 feat: 调用活动(子任务) 2024-12-11 13:56:01 +08:00
Lesan
3e826776f4 fix: 属性命名错误 2024-12-11 13:46:09 +08:00
杨宇庆
4c5c6ff5c3
fix: 解决商机、合同金额无法自动计算的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-12-11 05:25:43 +00:00
YunaiV
d76df547ae 【功能优化】Bpm:UserTask 选择表达式按钮 2024-12-11 12:51:43 +08:00
芋道源码
bfb9e2e77f
!614 bpm设计器优化
Merge pull request !614 from Lesan/feature/bpm
2024-12-11 04:40:11 +00:00
Lesan
fe2ac97f9d refactor: 使用Simple设计器的useFormFieldsPermission 2024-12-11 09:18:15 +08:00
Lesan
4bd020857f feat: 添加UserTask自定义配置,审批类型 2024-12-11 08:57:35 +08:00
Lesan
a9c924a421 feat: 同步bpm设计器审批人配置,表单内部门负责人 2024-12-11 08:48:49 +08:00
Lesan
b09ff417c3 feat: 同步bpm设计器审批人配置,发起人部门负责人,发起人连续多级部门的负责人 2024-12-10 16:42:17 +08:00
Lesan
6b397104fc feat: 同步bpm设计器审批人配置,连续多级部门的负责人 2024-12-10 16:07:10 +08:00
Lesan
9e2958f7d0 feat: 同步bpm设计器审批人配置,表单内用户字段 2024-12-10 14:37:17 +08:00
Lesan
dc8f5cf977 feat: 同步bpm设计器审批人配置 2024-12-10 13:46:17 +08:00
杨宇庆
8c52c6867f
GoView域名外置配置文件
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-12-09 00:55:53 +00:00
芋道源码
46985c6e1b
!612 bpm设计器优化
Merge pull request !612 from Lesan/feature/bpm
2024-12-08 23:56:03 +00:00
YunaiV
7697054918 【代码评审】Bpm:钉钉表单设计器 2024-12-09 07:52:52 +08:00