Commit Graph

162 Commits

Author SHA1 Message Date
3195e3ccc7 圆形统计、多边形统计 2025-11-03 13:58:04 +08:00
zyl
3e5f5fbd65 "态势接口部分" 2025-11-03 12:39:21 +08:00
zyl
cb9d604abd "" 2025-11-03 11:59:09 +08:00
zyl
07ef99d3cf z 2025-11-03 11:56:47 +08:00
zyl
66ea43db94 revert 8d72428896
revert 天气
2025-11-03 03:52:57 +00:00
zyl
cdf50016a0 revert 8d72428896
revert 天气,回滚代码,重新提交态势接口分支
2025-11-03 03:50:00 +00:00
zyl
867851901e "回滚代码" 2025-11-03 11:40:59 +08:00
zyl
46812d439d "" 2025-11-03 10:48:38 +08:00
zyl
509dd825b4 对接方案列表界面的接口 2025-11-03 10:31:11 +08:00
8d72428896 天气 2025-11-03 09:50:44 +08:00
4250e9a1df Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-03 09:49:12 +08:00
4b379d03c9 天气 2025-11-03 09:47:57 +08:00
zyl
9bf4cd0adf Merge remote-tracking branch 'origin/zyl' into zyl
# Conflicts:
#	package-lock.json
#	resources/java/app/license/yjearth.lic
#	resources/java/app/yjearth.jar
#	src/renderer/components.d.ts
#	src/renderer/src/views/TS/edit.vue
#	src/renderer/src/views/TS/element.vue
#	src/renderer/src/views/TS/list.vue
#	src/renderer/src/views/components/tree/hooks/treeNode.ts
#	yarn.lock
2025-10-31 11:21:23 +08:00
zyl
efac56ad2e 态势增加 2025-10-31 11:01:59 +08:00
zh
5b5fe469fc 点标注物资设置 2025-10-31 10:35:20 +08:00
zh
4dc50b0345 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-31 10:10:38 +08:00
zh
1164f2c5f3 build配置 2025-10-31 10:10:33 +08:00
677590fd4d 工程合并导入和物资管理 2025-10-31 10:08:36 +08:00
zh
69196a1b3e Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-29 16:41:32 +08:00
zh
1266217e05 打包 2025-10-29 16:40:58 +08:00
422986070c 修改树 2025-10-29 15:31:42 +08:00
ea8252e8d0 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-29 15:20:30 +08:00
09117a3127 poi上传搜索 2025-10-29 15:10:51 +08:00
zh
a4098d7036 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-28 16:37:45 +08:00
zh
5cecee9e02 提交 2025-10-28 16:34:54 +08:00
zh
12b08cf243 提交 2025-10-28 16:33:08 +08:00
661df4c995 修改弹框样式 2025-10-27 14:24:45 +08:00
75c8deac30 后台管理 2025-10-24 19:27:25 +08:00
8fa6b6155f 后台 2025-10-23 18:31:58 +08:00
adb247c9df 后台管理部分代码 2025-10-23 18:30:21 +08:00
zh
63aba2cf40 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-23 18:20:20 +08:00
zh
8040ae535e 提交 2025-10-23 18:02:29 +08:00
50e6cb1909 poi搜索 2025-10-23 17:14:59 +08:00
4f5c0b5095 工程导入 2025-10-21 17:59:47 +08:00
zh
558ddff6b0 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-20 17:05:18 +08:00
zh
b5d5aa3455 提交 2025-10-20 17:05:14 +08:00
zh
69d7846a98 提交 2025-10-20 17:04:56 +08:00
zh
a79911b3d9 提交 2025-10-20 17:01:17 +08:00
a2f81dbe29 工程导入 2025-10-20 17:00:58 +08:00
2a7eda5ee3 在线搜索问题修改 2025-10-20 13:56:35 +08:00
30531019dd 修改样式 2025-10-20 10:53:27 +08:00
b12175ea8b Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-17 16:51:53 +08:00
0ef9069cc5 设备管理 2025-10-17 16:48:37 +08:00
zh
d18a1abf5e Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-17 15:20:49 +08:00
zh
73be5de5b4 提交 2025-10-17 15:19:26 +08:00
zh
9a8a89b15f 提交 2025-10-17 15:19:14 +08:00
de9815e154 设备管理 2025-10-17 15:17:55 +08:00
b41443c978 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-10-17 15:15:39 +08:00
0f8ad993c8 修改 2025-10-17 15:15:34 +08:00
ac0693df9c 修改 2025-10-17 15:13:56 +08:00