fangxiang
|
80c44141e0
|
Merge commit 'a5df1e0635866baf7b8c1bc91c4a2334572c9298' into master_v2
|
2023-02-15 19:08:58 +08:00 |
|
fangxiang
|
f9207cd6eb
|
Merge branch 'FileManager' into master_v2
|
2023-02-15 19:08:18 +08:00 |
miao
|
b2bd16128a
|
修改文件上传之后的提示
|
2023-02-15 18:10:38 +08:00 |
|
miao
|
fc6b23432c
|
新增文件夹时添加限制
|
2023-02-15 18:10:38 +08:00 |
|
miao
|
e68eb4c8d6
|
将数据恢复，底图上传，查看底图，升级的http转化
|
2023-02-15 18:10:37 +08:00 |
|
fangxiang
|
71abf1bba2
|
修改为最新的数据库备份协议
|
2023-02-15 18:10:20 +08:00 |
|
fangxiang
|
a2102bdb5e
|
适配最新的文件上传接口
|
2023-02-15 18:10:20 +08:00 |
|
miao
|
5a1dba7a8f
|
检查索引的http请求改为websocket
|
2023-02-15 18:10:19 +08:00 |
|
miao
|
e4827b4fe6
|
修改文件上传为多个
|
2023-02-15 18:10:18 +08:00 |
|
fangxiang
|
3e2a941f80
|
Merge remote-tracking branch 'remotes/origin/blending' into merge_fm_fusion
# Conflicts:
# src/common/ClientConnection.ts
# src/components/FileManageDialog.vue
# src/entities/WSProtocol.ts
# src/i18n/en-US/index.ts
# src/i18n/zh-CN/index.ts
# src/pages/TopToolBar.vue
# src/store/index.ts
|
2023-02-15 18:03:06 +08:00 |
|
fangxiang
|
a5df1e0635
|
WIP on merge_fm: d16df7a 合并FileManager
|
2023-02-15 16:36:57 +08:00 |
|
fangxiang
|
1273319fb6
|
index on merge_fm: d16df7a 合并FileManager
|
2023-02-15 16:36:57 +08:00 |
|
fangxiang
|
d16df7ada8
|
合并FileManager
|
2023-02-15 16:36:51 +08:00 |
 shefengchun
|
12a940a55f
|
修复动态添加的一些错误
|
2023-02-15 15:08:47 +08:00 |
|
shefengchun
|
dbecb1ff15
|
增加动态添加点
|
2023-02-15 09:34:42 +08:00 |
|
miao
|
c35ff719c6
|
判断是否为无界，显示文件对话框的上传文件
|
2023-02-14 10:18:13 +08:00 |
|
miao
|
febcf00d94
|
升级对话框显示服务器版本
|
2023-02-14 09:45:09 +08:00 |
|
miao
|
8b6949f087
|
勾选融合，输出设置固定
|
2023-02-14 09:23:45 +08:00 |
|
miao
|
aee328fb82
|
将文件管理的http请求改为websocket
|
2023-02-12 15:58:54 +08:00 |
|
fangxiang
|
2a6e8e78c0
|
修复网络高级设置访问未定义变量的错误
|
2023-02-10 17:09:38 +08:00 |
|
fangxiang
|
f4b2e6cd15
|
修改在线注册的IP校验
|
2023-02-10 16:31:39 +08:00 |
|
fangxiang
|
2930add85f
|
修改IP、子网掩码的校验逻辑
|
2023-02-10 16:29:47 +08:00 |
|
fangxiang
|
225fbd4faf
|
网络设置调换子网掩码和默认网关的位置，保持和Windows网络设置的顺序一致
|
2023-02-10 16:29:46 +08:00 |
ljqing
|
da82416bd1
|
添加删除控制点数量
|
2023-02-10 14:07:33 +08:00 |
|
miao
|
b0751a1b18
|
添加融合选项在高级调试和在线注册
|
2023-02-10 11:03:11 +08:00 |
|
shefengchun
|
c88033899b
|
删除调试信息
|
2023-02-10 09:56:24 +08:00 |
|
shefengchun
|
b3cc026b41
|
修复键盘监听导致的输入问题
|
2023-02-10 09:55:11 +08:00 |
|
shefengchun
|
e37999a924
|
增加辅助线和服务端数据同步
|
2023-02-10 09:38:20 +08:00 |
|
fangxiang
|
114dd2794e
|
升级Quasar
|
2023-02-09 20:06:55 +08:00 |
|
miao
|
c6c4522be7
|
完善无界模式显示全屏效果
|
2023-02-09 20:06:55 +08:00 |
|
miao
|
33413fbb27
|
增加全屏
|
2023-02-09 20:06:54 +08:00 |
|
fangxiang
|
b2aff3720c
|
开放云服务设置,增加加载完后通知主应用功能
|
2023-02-09 20:06:54 +08:00 |
|
shefengchun
|
15088f9d5e
|
增加疏密界面选择点时发送当前点
|
2023-02-09 16:57:08 +08:00 |
|
shefengchun
|
c35349b6e4
|
修复疏密校正索引错误
|
2023-02-09 15:05:10 +08:00 |
|
shefengchun
|
112ea9195b
|
更改ui
|
2023-02-09 14:28:33 +08:00 |
|
miao
|
9ad2665b0d
|
魔墙：修复滑动条及输入控件随键盘而改变；加中心坐标变为3840*2160；修改主界面的魔墙颜色；
|
2023-02-09 14:10:01 +08:00 |
|
shefengchun
|
e095bcb9fb
|
修改ui
|
2023-02-09 11:12:11 +08:00 |
|
shefengchun
|
73b1a2bc05
|
修复错误 完成合并
|
2023-02-09 10:26:14 +08:00 |
|
shefengchun
|
34aba5bcf4
|
修复四点校正重置错误的问题
|
2023-02-09 10:17:41 +08:00 |
|
ljqing
|
fa0194d4b9
|
修改id
|
2023-02-09 09:50:54 +08:00 |
|
ljqing
|
0e413d7aee
|
融合代码调整
|
2023-02-09 09:28:10 +08:00 |
|
shefengchun
|
b00fb02efb
|
修复切换投影仪时发送数据
|
2023-02-08 17:51:10 +08:00 |
|
shefengchun
|
063d9d8652
|
修复4点校正先拖动在使用键盘移动时位置不对
|
2023-02-08 15:33:12 +08:00 |
|
shefengchun
|
c7eb71ee72
|
加入对4点校正的键盘支持
|
2023-02-08 15:20:20 +08:00 |
|
miao
|
71bb5d58e7
|
魔墙：添加更新通知
|
2023-02-08 09:08:01 +08:00 |
|
shefengchun
|
f6dd438627
|
使用其他插件重写疏密校正
|
2023-02-07 16:59:58 +08:00 |
|
miao
|
b58ad2a4fd
|
魔墙：添加更新通知
|
2023-02-07 14:59:33 +08:00 |
|
shefengchun
|
5addd49c3a
|
修复界面切换不保存bug
|
2023-02-07 09:31:58 +08:00 |
|
shefengchun
|
263c2acbc1
|
修复切换界面时发送选中点
|
2023-02-06 15:07:31 +08:00 |
|
shefengchun
|
7141313c8c
|
优化ui界面
|
2023-02-06 10:49:55 +08:00 |