 shefengchun
|
f8dd60edbd
|
删除无效代码
|
2023-02-24 17:37:34 +08:00 |
|
shefengchun
|
d59a111b0d
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-24 17:36:17 +08:00 |
|
shefengchun
|
48466524bb
|
修复首页数据 不同步
|
2023-02-24 17:36:13 +08:00 |
miao
|
46dee256f3
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-24 16:56:42 +08:00 |
|
miao
|
84ae856c71
|
魔墙修复多次点击恢复异常
|
2023-02-24 16:56:31 +08:00 |
|
shefengchun
|
55b518facc
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-24 16:47:50 +08:00 |
|
shefengchun
|
4738681294
|
优化提示 修改ui大小
|
2023-02-24 16:47:46 +08:00 |
|
miao
|
da7a4bdd05
|
修复魔墙层级问题以及恢复问题
|
2023-02-24 16:38:42 +08:00 |
|
shefengchun
|
5998be5c1c
|
修复 投影机下发错误
|
2023-02-24 16:04:13 +08:00 |
|
shefengchun
|
5ce15fcb80
|
修复切换投影机布局的错误
|
2023-02-24 15:33:14 +08:00 |
|
shefengchun
|
efb6f0437a
|
修复界面数据错误
|
2023-02-24 15:06:37 +08:00 |
|
shefengchun
|
d71124dfc4
|
修复 切换显示排列错误
|
2023-02-24 14:33:10 +08:00 |
|
shefengchun
|
2f645fa71c
|
修复 四点校正 限制问题
|
2023-02-24 14:08:42 +08:00 |
|
shefengchun
|
5027ba5233
|
加入限制
|
2023-02-24 14:00:14 +08:00 |
|
shefengchun
|
aa0e83045b
|
修复曲面校正不发送当前点数
|
2023-02-24 09:42:13 +08:00 |
|
shefengchun
|
77e270c6b2
|
增加 动态添加值细节
|
2023-02-23 19:47:16 +08:00 |
|
shefengchun
|
d29ca4c6dd
|
修复融合参数界面同步错误问题
|
2023-02-23 19:32:51 +08:00 |
|
shefengchun
|
361bcb7719
|
修复 是否同步操作不保存状态
|
2023-02-23 17:31:41 +08:00 |
|
shefengchun
|
ae87589a45
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-23 17:11:08 +08:00 |
|
shefengchun
|
800dfec98d
|
修复动态添加时重置全部方案数据错误 优化细节
|
2023-02-23 17:10:51 +08:00 |
fangxiang
|
3bc125cff0
|
注册协议增加attribute字段
|
2023-02-23 16:46:50 +08:00 |
|
shefengchun
|
5c7ac2a7d0
|
修复重置时不保存数据
|
2023-02-23 14:35:52 +08:00 |
|
miao
|
1b93f2f92a
|
魔墙状态主页面右键开窗适应大小
|
2023-02-23 11:13:01 +08:00 |
|
shefengchun
|
3b84db438f
|
更改ui 修复摄影机数量显示错误问题
|
2023-02-23 09:35:28 +08:00 |
|
shefengchun
|
1d7e4de1d1
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-22 17:44:49 +08:00 |
|
shefengchun
|
740ff764e5
|
加入 投影机最大数量限制
|
2023-02-22 17:44:43 +08:00 |
|
miao
|
9c7d961e67
|
添加魔墙状态主页面的轮询开窗
|
2023-02-22 17:00:36 +08:00 |
|
shefengchun
|
966fe44583
|
删除不必要的代码
|
2023-02-22 15:09:35 +08:00 |
|
shefengchun
|
899fdc5e66
|
修复获取不到数据的错误
|
2023-02-22 15:01:19 +08:00 |
ljqing
|
98975d4cd5
|
修改字符串
|
2023-02-22 14:55:48 +08:00 |
|
miao
|
f0f340e9a9
|
修复主页面显示魔墙时开机异常
|
2023-02-22 14:51:38 +08:00 |
|
shefengchun
|
09c37b7e82
|
Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
|
2023-02-22 14:33:52 +08:00 |
|
shefengchun
|
52c375fc7d
|
加入鼠标滚轮交互
|
2023-02-22 14:33:47 +08:00 |
|
miao
|
a380a132b7
|
修复主页面因关开机导致的窗口变化问题
|
2023-02-22 14:08:12 +08:00 |
|
fangxiang
|
ba2594addf
|
解决合并错误
|
2023-02-21 20:05:31 +08:00 |
|
fangxiang
|
53ca6af019
|
注册细分产品
|
2023-02-21 19:59:37 +08:00 |
|
shefengchun
|
6c304fdfe6
|
加入投影机布局选择
|
2023-02-21 17:10:54 +08:00 |
|
shefengchun
|
fdeb182c75
|
完成动态曲面添加
|
2023-02-21 14:10:48 +08:00 |
|
ljqing
|
e4003940da
|
非空判断
|
2023-02-20 19:49:58 +08:00 |
|
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 |
|
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 |