Commit Graph

3030 Commits

Author SHA1 Message Date
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
yyy
6db5611af3 地图编辑 2025-02-26 09:47:50 +08:00
yyy
4ff0e865a9 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-25 15:04:03 +08:00
yyy
6cb1983be0 操作日志 车辆日志 任务日志 2025-02-25 15:03:58 +08:00
xhf
0bff1c27aa Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-25 14:42:55 +08:00
xhf
9690a8a347 修改实时地图小手
增加整体看板
2025-02-25 14:42:44 +08:00
yyy
faa5c97def 登录页面样式修改 2025-02-25 11:40:52 +08:00
yyy
956e25ef01 图层显示 2025-02-25 09:23:04 +08:00
yyy
9cc9c1f7d1 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-24 17:48:27 +08:00
yyy
f84aa678a6 地图编辑 2025-02-24 17:48:22 +08:00
xhf
4b54062344 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-24 17:37:35 +08:00
xhf
1d16e375b0 修改首页和增加部分整体看板 2025-02-24 17:37:25 +08:00
yyy
270274b1b6 刻度尺 2025-02-24 17:17:32 +08:00
yyy
17dd7260fc 粘贴不显示问题 2025-02-24 10:27:20 +08:00
yyy
982584acc7 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-22 17:41:53 +08:00
yyy
1c8ea3b7e4 ctrl+c ctrl+v等键盘操作 2025-02-22 17:41:46 +08:00
xhf
486027891b 修改 2025-02-22 17:10:17 +08:00
xhf
6f0db9c934 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-22 17:06:20 +08:00
xhf
0d9006b96a 修改车辆看班 2025-02-22 17:06:16 +08:00
yyy
59a7eea5fe 地图路线拖动绘制 2025-02-22 15:25:51 +08:00
yyy
64d93c27df 解决冲突 2025-02-21 17:37:12 +08:00
yyy
ad59ca88b6 编辑地图 2025-02-21 17:36:25 +08:00
xhf
c9b0b4c02e 修改问题 2025-02-21 17:33:39 +08:00
xhf
2ea880b281 修改实时地图 2025-02-21 11:30:40 +08:00
xhf
f8f59ee161 1 2025-02-21 11:07:17 +08:00
xhf
da058ac873 Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf 2025-02-21 11:02:47 +08:00
xhf
56b9a76ac2 1 2025-02-21 11:02:38 +08:00
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