Commit Graph

127 Commits

Author SHA1 Message Date
unknown d89ae93ae2 视频播放 2022-11-08 15:08:07 +08:00
unknown 92c6bf687b 会议室预约时间选择器限制 2022-11-03 10:02:39 +08:00
gongjiale 65026d0e65 修改样式 2022-11-02 14:35:57 +08:00
a0049873 72229ea4fb 修改城市云脑顺序 2022-11-01 15:35:30 +08:00
a0049873 ad6a1c14de BUg修改 2022-10-31 20:23:26 +08:00
a0049873 493151d9f0 BUG修改 2022-10-31 19:45:21 +08:00
gongjiale 6967b3f1da 1.完成能力集市:基础设施-会客厅,字数太多时,展示不美观的问题;
2.完成融合服务:打包模式,点击发布时间,只能按照正序排,不能按照倒序排列的问题;
3完成.融合服务:打包模式,点击收藏量,只能按照正序排,不能按照倒序排列的问题
2022-10-28 16:37:48 +08:00
wuhongjian 9a2c2c07d1 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-27 15:48:26 +08:00
wuhongjian 09d56091fa 测试问题修复 2022-10-27 15:48:24 +08:00
guoyue c1da555ceb 西海岸:摄像头提示文字预览视频更改为观看视频 2022-10-27 15:04:49 +08:00
a0049873 d8a08c6470 基础设施 去表格 2022-10-26 09:56:05 +08:00
wuhongjian 00e4e9671b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-26 09:38:13 +08:00
wuhongjian c634d85688 去掉视频资源列表 2022-10-26 09:38:11 +08:00
a0049873 1f727a6cbd 修改会议室默认图片 2022-10-26 09:37:47 +08:00
a0049873 983b2c0534 更改头部样式 2022-10-25 15:11:47 +08:00
a0049873 5cbeba19b8 会议室列表 2022-10-25 10:58:25 +08:00
wuhongjian 11b42afde3 一键组会内容添加 2022-10-25 09:21:38 +08:00
a0049873 0726f4a927 添加角色控制 2022-10-24 15:20:58 +08:00
a0049873 8a31a4e285 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-24 14:54:14 +08:00
a0049873 314b68b3a3 静态数据 2022-10-24 14:54:03 +08:00
wuhongjian 84f1b03c42 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-24 14:26:25 +08:00
wuhongjian aaa16a1105 bug修复 2022-10-24 14:26:22 +08:00
a0049873 e1a805d4bd 客户端下载 2022-10-24 14:12:35 +08:00
a0049873 52be0acd83 一键组会 2022-10-24 11:28:37 +08:00
a0049873 30328e575d 视频会议 2022-10-22 11:08:52 +08:00
guoyue 4e271b6aa7 合并冲突 2022-10-19 13:55:49 +08:00
gongjiale 7a0d2ba101 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-19 10:45:54 +08:00
gongjiale 55398620f0 首页跳转问题修改 2022-10-19 10:45:15 +08:00
guoyue 2af92a6f8f 西海岸-基础设施:在线视频预览,弹出视频窗口,改成鼠标放上后给出tips“请申请后再预览”,弹框标题增加提示信息 2022-10-19 10:20:09 +08:00
guoyue 42af2e980b 西海岸:基础设施-视频离线-预览按钮禁用 2022-10-18 14:11:52 +08:00
guoyue 0d402302f7 西海岸-基础设施:无人机、单兵申请成功后,页面应该返回无人机页面 2022-10-14 17:34:35 +08:00
a0049873 cfe88605cc Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/infrastructurePage.vue
2022-10-13 17:09:20 +08:00
a0049873 78aabf704b 修改基础设施BUG 以及 能力统计金字塔图 2022-10-13 17:07:51 +08:00
wuhongjian 7abf71a6fb bug修复 2022-10-13 16:31:42 +08:00
guoyue 56696c6266 西海岸:基础设施添加到申购车,api更改 2022-10-12 17:41:21 +08:00
guoyue 140ff7f92c 西海岸--基础设施-摄像头获取:增加loading 2022-10-12 11:51:22 +08:00
guoyue e4ad24ba8c 西海岸:修复视频预览提示错误问题 2022-10-11 15:07:55 +08:00
guoyue 37347b3de2 市局:增加消息通知会议室跳转 2022-10-10 15:45:33 +08:00
guoyue af1c03d3ed 西海岸相关功能 合并代码 2022-10-09 14:29:51 +08:00
guoyue c4ae6d603a 西海岸购物车等功能 2022-10-09 13:52:28 +08:00
guoyue c71784567c 西海岸-购物车收藏功能 2022-10-08 16:00:26 +08:00
guoyue 251c3d33d6 市局:城市云脑会客厅--去掉电话必填 2022-10-03 17:23:12 +08:00
guoyue c183ee883d 代码找回 (详情按钮,西海岸智能算法支持,融合服务详情,西海岸登录默认基础设施) 【2022-09-30:修改文件 】 2022-09-30 16:07:15 +08:00
851673013@qq.com cba2a5c089 bug修改 2022-09-30 10:31:14 +08:00
于秀圆 3dcb9b8778 接口传参方式修改 2022-09-29 18:27:32 +08:00
于秀圆 bcbafaf9f0 不规则框选 2022-09-29 18:19:24 +08:00
guoyue 98f0c360d4 西海岸:基础设施--一键申请增加数量限制 2022-09-29 17:26:08 +08:00
guoyue 48bfe71c6f 西海岸:基础设施--一键申请增加最大数量限制 2022-09-29 17:21:02 +08:00
guoyue a7da8b013e Merge branches 'hi-ucs-dev' and 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-28 17:33:59 +08:00
guoyue f86d40feda 西海岸:基础设施-视频预览,增加在线离线状态显示,点击预览,提示离线 2022-09-28 17:31:57 +08:00