Commit Graph

3030 Commits

Author SHA1 Message Date
xhf
00cfeae17a Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-20 16:49:33 +08:00
xhf
7343d1fc38 修改全平的bug 2025-03-20 16:49:16 +08:00
yyy
b4f59e79b1 bug修改 2025-03-20 16:07:49 +08:00
yyy
bbdb7c1e43 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-20 15:55:02 +08:00
yyy
9fd422c4f2 bug修改 2025-03-20 15:54:56 +08:00
xhf
2288db60b2 增加实时地图拷贝文件 2025-03-20 10:15:39 +08:00
xhf
9fafc3e0b8 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-20 09:38:48 +08:00
xhf
e6a5f3f38c 修改实时地图 2025-03-20 09:38:30 +08:00
yyy
e742405735 bug修改 2025-03-20 08:59:13 +08:00
yyy
0896a1bda3 鼠标样式 2025-03-19 10:27:48 +08:00
yyy
dbc960d4a1 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-19 10:03:28 +08:00
yyy
d3499c3794 复制节点清空排序 让用户自己输入排序 2025-03-19 10:03:23 +08:00
yyy
3399d9d3bb 标记 2025-03-19 09:36:08 +08:00
xhf
031e3cccb5 修改设备看板页面启用禁止设备状态 2025-03-19 09:20:36 +08:00
xhf
12b13dfee9 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-18 17:24:55 +08:00
xhf
8d53277bc5 修改设备看板增加启用禁用 2025-03-18 17:24:43 +08:00
yyy
085b6cf130 设备bug修改 2025-03-18 17:15:19 +08:00
yyy
50d0e654fb 字体改为可移动 2025-03-18 16:50:58 +08:00
yyy
0725c4c44e Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-18 16:42:56 +08:00
yyy
12739441d6 设备添加bug修改 2025-03-18 16:42:50 +08:00
yyy
6ea7dfb634 拖拽宽高问题 2025-03-18 14:56:12 +08:00
xhf
5610200133 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-18 14:44:55 +08:00
xhf
4cdd3e0855 库位列表增加库位号 2025-03-18 14:44:45 +08:00
yyy
10d711d844 1 2025-03-18 10:01:33 +08:00
yyy
0e0de02af8 测试版打包 2025-03-17 16:45:01 +08:00
xhf
7890ad5f9e Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-17 16:42:40 +08:00
xhf
6d9e694c3c 修改全部已读 未读 2025-03-17 16:42:30 +08:00
yyy
b6a3ec9a51 增加贝塞尔曲线的实际长度 2025-03-17 16:09:54 +08:00
yyy
4f2f9256a2 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-17 16:02:26 +08:00
yyy
5584a56b3d 路线方向改变车投朝向选项改变 2025-03-17 16:02:21 +08:00
xhf
458564ba1a Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-17 11:09:36 +08:00
xhf
8856fd518a 修改库位的启用和禁用 2025-03-17 11:09:29 +08:00
yyy
9cb8b56e0b 生成直线改为按照sortNum最大最小值 2025-03-14 10:18:46 +08:00
yyy
de933d7203 点位最大值限制 2025-03-14 09:53:33 +08:00
xhf
e286d8091d 修改车辆那边的接口 2025-03-13 15:54:29 +08:00
yyy
361b28e8a9 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-12 09:07:26 +08:00
yyy
920ae0fbf3 添加弧度 2025-03-12 09:07:18 +08:00
xhf
edd39660db Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-08 14:07:20 +08:00
xhf
fb57459a6f 修改配置 2025-03-08 14:07:11 +08:00
yyy
74701d7fb7 实时地图 2025-03-08 12:15:21 +08:00
yyy
b2a46e7132 合并 2025-03-08 10:07:18 +08:00
yyy
a82253089c 1 2025-03-08 10:06:20 +08:00
xhf
3bd363e8ac 整体看板引用组件 2025-03-08 09:53:25 +08:00
xhf
b909e61b0a Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-08 09:41:31 +08:00
xhf
f703ebd908 修改问题 2025-03-08 09:41:22 +08:00
yyy
0494d9477e 新建任务时 选择车辆 提示机器人错误信息 2025-03-07 16:07:01 +08:00
yyy
5d682da707 地图编辑图片大小 2025-03-07 15:32:26 +08:00
yyy
b00c8884b6 合并 2025-03-06 16:18:16 +08:00
yyy
e2546d9e8f 框选将点映射成直线
鼠标滚轮放大缩小
2025-03-06 16:17:03 +08:00
xhf
2a807200d9 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-06 11:42:50 +08:00
xhf
1392ed2044 重新修改到原来的样式 2025-03-06 11:42:24 +08:00
yyy
8ff18a44cf Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-06 10:43:17 +08:00
yyy
55dd0b609b 地图编辑 2025-03-06 10:43:11 +08:00
xhf
d5df1639ab Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf
# Conflicts:
#	src/views/mapPage/realTimeMap/editMap.vue
修改问题
2025-03-06 10:42:40 +08:00
xhf
446b359632 修改editMap 返回 emit 2025-03-06 10:07:11 +08:00
yyy
85aa1503c1 标记 2025-03-06 09:31:18 +08:00
yyy
e338647105 地图编辑 2025-03-06 09:00:23 +08:00
yyy
cdc4ec025e Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-05 19:07:40 +08:00
yyy
e162b8189a 标记 2025-03-05 19:07:35 +08:00
xhf
8b9dc456a0 修改问题 2025-03-05 18:38:39 +08:00
xhf
a5476540ae 修改大小 2025-03-05 18:15:30 +08:00
xhf
24d854e0ee 修改小车运动时间 2025-03-05 17:30:29 +08:00
xhf
9421ed8a1a 修改小车尺寸 2025-03-05 17:15:28 +08:00
xhf
e871f8f9e6 修改小车 2025-03-05 17:12:25 +08:00
xhf
b057e19c20 修改高度 2025-03-05 15:04:39 +08:00
xhf
377eee0940 修改冲突和首页异常信息 2025-03-05 14:56:33 +08:00
xhf
1f84b4ad92 修改实时地图警告信息 2025-03-05 14:54:22 +08:00
yyy
bfa15c63af 暗黑模式开关 2025-03-05 14:50:45 +08:00
yyy
c4d9ddee35 图片偏移 2025-03-05 10:32:14 +08:00
yyy
930f5665e3 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-05 10:05:38 +08:00
yyy
b37d7e7505 地图编辑 2025-03-05 10:05:32 +08:00
xhf
5047b212b7 修改首页 2025-03-05 10:02:47 +08:00
yyy
b816c868f7 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-05 09:34:00 +08:00
yyy
548a64caae 地图编辑 2025-03-05 09:33:53 +08:00
xhf
7714526705 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-03-04 17:53:04 +08:00
xhf
b226f189c3 修改实时地图 2025-03-04 17:52:55 +08:00
yyy
fc34adcde6 删除节点同时删除所有路线 2025-03-04 15:04:19 +08:00
yyy
fc21b89982 取消任务接口改变 2025-03-03 14:55:27 +08:00
yyy
3cb31edb2e 取货位置和放货位置增加地图点击选择 2025-03-03 14:53:06 +08:00
yyy
631ced8dcb 任务发起 取货位置放货位置 在地图上选择 2025-03-01 17:32:12 +08:00
yyy
171af919b4 任务中选择库位 2025-02-28 18:17:01 +08:00
yyy
a3630f3c5a 传参给实时地图 2025-02-28 11:29:46 +08:00
yyy
30ce5ae75b 传递参数给实时地图 2025-02-28 11:25:01 +08:00
yyy
9e50046f72 测回重做bug 2025-02-28 10:19:15 +08:00
yyy
9af2e7382c 地图编辑移动最大最小值校验 2025-02-28 09:13:50 +08:00
yyy
7e035512fe 车辆日志 任务日志 2025-02-27 18:07:28 +08:00
yyy
8093e70d6e 合并 2025-02-27 18:03:13 +08:00
yyy
4b0dcbd41f 车辆日志 任务日志 页面开发和接口对接 2025-02-27 18:01:57 +08:00
xhf
8ce825094c 修改文字 2025-02-27 17:33:23 +08:00
xhf
8e35679b2c 修改问题 2025-02-27 17:31:43 +08:00
xhf
378fdecb89 修改实时地图的标记线和箭头 2025-02-27 17:27:25 +08:00
xhf
e04977d893 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-27 15:16:51 +08:00
xhf
670c889563 修改双向箭头 2025-02-27 15:16:43 +08:00
yyy
297b9cb378 选中路线展示 2025-02-27 14:42:21 +08:00
xhf
3e7e77de34 1 2025-02-27 14:39:31 +08:00
yyy
27a68e5833 箭头 2025-02-27 14:32:54 +08:00
yyy
e2acd514b9 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-27 11:35:02 +08:00
yyy
f79d9b6427 增加箭头 2025-02-27 11:34:57 +08:00
xhf
8640a7f8ed 修改整体看板和异常列表 2025-02-27 09:10:22 +08:00
yyy
d74f617af9 地图编辑 2025-02-26 17:41:03 +08:00