Commit Graph

315 Commits

Author SHA1 Message Date
zh
36e22cfcdc Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-05 18:37:17 +08:00
zh
cec103b665 12-5 2025-12-05 18:21:33 +08:00
675e874e3d Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-05 14:04:25 +08:00
5c7ef80449 修改 2025-12-05 14:03:55 +08:00
zyl
3ed4e992db Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-04 09:31:33 +08:00
zyl
eced756cfe 增加态势部分多语言,完成点线面的属性编辑 2025-12-04 09:31:22 +08:00
c15e6d5cf7 修改 2025-12-03 17:11:01 +08:00
d769cd416c 修改 2025-12-03 14:50:10 +08:00
zh
95f0211b99 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-03 11:03:18 +08:00
zh
afbf761354 12-3 2025-12-03 11:03:14 +08:00
547d04470c Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-03 11:02:26 +08:00
2181ee5f4c 后端 2025-12-03 10:28:05 +08:00
8d2a2eef97 修改 2025-12-03 10:23:18 +08:00
60d57ade66 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-02 14:35:14 +08:00
33c583d3cd 12-2 2025-12-02 14:35:09 +08:00
zyl
7d7a3b412c Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-12-01 17:38:42 +08:00
zyl
c8e6fcf221 增加态势特效 2025-12-01 17:38:07 +08:00
928db10f68 .gitignore 2025-11-28 18:24:21 +08:00
d8da5d531c Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 18:13:42 +08:00
e52e85ce36 ts检测 2025-11-28 18:12:34 +08:00
0951e13eb2 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 18:01:19 +08:00
e6189816a9 修改 2025-11-28 17:59:16 +08:00
1c2ea89e5d 修改 2025-11-28 17:56:08 +08:00
zyl
54d3f2fba4 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 17:36:35 +08:00
zyl
dc5bb667f8 修改bug 2025-11-28 17:36:10 +08:00
10efc328aa Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 17:35:03 +08:00
83d6c872ab 11-28 2025-11-28 17:24:55 +08:00
2df8514867 修改 2025-11-28 15:50:56 +08:00
a9c3aeaa73 修改右击弹框定位问题 2025-11-28 15:33:01 +08:00
39b73bcad8 光照模块 2025-11-28 14:32:01 +08:00
5c1d299483 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 13:46:42 +08:00
0a0fc43c0c 修改 2025-11-28 13:46:37 +08:00
zyl
4958d6c218 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 10:35:11 +08:00
zyl
c704df3ead 修改bug 2025-11-28 10:35:06 +08:00
4bec06914f Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-28 09:57:25 +08:00
85cfb0ee31 后端 2025-11-28 09:57:20 +08:00
f199e0faca 修改 2025-11-28 09:53:54 +08:00
zyl
1b7cba4e87 修改bug 2025-11-27 14:27:40 +08:00
zyl
c5ad402267 修改bug 2025-11-27 14:20:54 +08:00
99f8e4f614 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-27 13:57:35 +08:00
c2f8ea765b 修改 2025-11-27 13:57:04 +08:00
zyl
426dc73432 uploadFiles.vue中的上传地址动态获取 2025-11-26 09:59:57 +08:00
zyl
383c301838 合并 2025-11-26 09:38:36 +08:00
zyl
57395a568c 修改bug 2025-11-26 09:29:02 +08:00
9394a3aef8 1 2025-11-25 17:07:59 +08:00
463dcc9118 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-25 17:06:04 +08:00
b5c10b9b84 修改 2025-11-25 17:06:01 +08:00
a3f4fd0c4c bug修改 2025-11-25 17:02:01 +08:00
zyl
df12272833 Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl 2025-11-24 16:41:00 +08:00
zyl
4411bda326 解决211-213 2025-11-24 16:40:53 +08:00