Commit Graph

292 Commits

Author SHA1 Message Date
ec3d708e1c 光照分析 2025-11-07 11:19:34 +08:00
zh
8731259fa1 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-07 10:21:12 +08:00
zh
e4bce33b89 路由;授权页增加端口设置 2025-11-07 10:21:07 +08:00
zh
9609a1e3d2 延长启动页显示时间 2025-11-07 10:18:55 +08:00
zh
e3d93797a0 延长启动页显示时间 2025-11-07 10:18:47 +08:00
4f0a18b29a Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-06 17:22:04 +08:00
979b851da3 光照分析联动 2025-11-06 17:22:00 +08:00
zh
3c122da3ba Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-06 16:11:01 +08:00
zh
909dd090e6 提交 2025-11-06 16:10:33 +08:00
zyl
51a4f5246d Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-06 16:03:29 +08:00
zyl
53ecc88abb 事件的删除,修改 2025-11-06 16:03:12 +08:00
c9cffad398 地点搜索框位置 2025-11-06 14:43:42 +08:00
e41f94697d 登录授权 2025-11-06 10:49:21 +08:00
zh
b582f4a366 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-06 10:05:15 +08:00
zh
e47eb61f6b 提交 2025-11-06 10:05:05 +08:00
zyl
2c81265312 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-06 09:41:53 +08:00
zyl
945607d4bb 时间属性编辑面板 2025-11-06 09:36:58 +08:00
zh
790bead687 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-05 18:24:48 +08:00
zh
d6fb3b57e2 提交 2025-11-05 18:24:35 +08:00
zyl
d0762712dc Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-05 16:27:12 +08:00
zyl
59bad224b8 态势模块添加gis模型,事件列表获取 2025-11-05 16:27:06 +08:00
4a9344eaaa 光照 输入框 2025-11-05 15:15:54 +08:00
6e37629a10 后台管理 2025-11-05 13:51:55 +08:00
zyl
4a441f3e04 基础标绘 2025-11-04 20:11:04 +08:00
zyl
9cbcbed6f5 点标注整个流程 2025-11-04 17:07:54 +08:00
zyl
9c63a6d7e8 "点标注创建,渲染,添加接口,上树" 2025-11-04 16:52:04 +08:00
zh
318b0fc8ce Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-04 13:43:32 +08:00
zh
a37b19aa06 增加扇形 2025-11-04 13:41:19 +08:00
zyl
f20bfb1797 "修改弹框问题及其样式" 2025-11-03 17:34:29 +08:00
zyl
e3edd0b361 "态势接口部分" 2025-11-03 16:45:18 +08:00
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