fangxiang
|
ee37d680b2
|
增加GetHttpInterfaceVersion来校验兼容性
|
2023-02-20 18:58:34 +08:00 |
|
fangxiang
|
00c4056b5d
|
增加http接口兼容判断
|
2023-02-20 15:17:20 +08:00 |
miao
|
a4c3a24dda
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-20 15:05:29 +08:00 |
|
miao
|
e9cbd79d3b
|
修复无界状态的显示墙靠下
|
2023-02-20 15:05:01 +08:00 |
ljqing
|
4a8aacd710
|
Merge branch 'blending' into master_v2
|
2023-02-20 09:14:19 +08:00 |
 shefengchun
|
740f175b69
|
修复参数不带分辨率选择时卡死
|
2023-02-17 17:30:23 +08:00 |
|
miao
|
1ce66817d4
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-17 14:29:46 +08:00 |
|
miao
|
a45c188c1e
|
判断是否为无界，显示隐藏底图升级数据恢复等操作
|
2023-02-17 14:28:03 +08:00 |
|
ljqing
|
a254c7d118
|
修改融合界面
|
2023-02-17 14:20:00 +08:00 |
|
ljqing
|
dea3713269
|
修改字符串
|
2023-02-17 14:00:04 +08:00 |
|
ljqing
|
652f6bfd2e
|
Merge branch 'blending' into master_v2
|
2023-02-17 09:38:52 +08:00 |
|
shefengchun
|
ff00c6e652
|
更改ui
|
2023-02-17 09:37:37 +08:00 |
|
shefengchun
|
b4338153f9
|
增加交互增加设置分辨率
|
2023-02-16 16:31:29 +08:00 |
|
ljqing
|
3fcd25ec96
|
增加设置投影机布局接口
|
2023-02-16 15:44:52 +08:00 |
|
shefengchun
|
7f833fd6f2
|
加入选择分辨率
|
2023-02-16 15:40:48 +08:00 |
|
shefengchun
|
06dfea0815
|
修复动态添加的bug
|
2023-02-16 14:53:36 +08:00 |
|
ljqing
|
8a197be56a
|
增加设置投影机分辨率
|
2023-02-16 14:44:43 +08:00 |
|
miao
|
601a95a33e
|
修复文件上传中列表滚动
|
2023-02-16 11:34:55 +08:00 |
|
miao
|
27f914c995
|
升级对话框显示服务器版本
|
2023-02-16 11:10:49 +08:00 |
|
ljqing
|
1bfb5af0a5
|
Merge branch 'blending' into master_v2
|
2023-02-15 19:42:09 +08:00 |
|
ljqing
|
5f3f9fd074
|
重置所有只发一条指令
|
2023-02-15 19:37:17 +08:00 |
|
ljqing
|
3afdf5c3bc
|
非空判断
|
2023-02-15 19:22:18 +08:00 |
|
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
|
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 |
|
miao
|
c6c4522be7
|
完善无界模式显示全屏效果
|
2023-02-09 20:06:55 +08:00 |