Commit Graph

577 Commits

Author SHA1 Message Date
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 789e80cffc 修改版本号 2023-02-20 19:00:56 +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