a0049873
|
f4cb66a062
|
视频预览弹窗
|
2022-11-22 14:51:18 +08:00 |
 gongjiale
|
b48a1b5862
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 14:40:24 +08:00 |
|
gongjiale
|
0328893a11
|
西海岸能力集市左侧联调地图
|
2022-11-22 14:37:20 +08:00 |
|
a0049873
|
f85c4b1ccb
|
条数修改
|
2022-11-22 12:00:05 +08:00 |
|
a0049873
|
85b0ecc3dd
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
# front/src/views/home/infrastructureApplication.vue
|
2022-11-22 11:58:14 +08:00 |
|
a0049873
|
20f5dd7999
|
西海岸需求开发
|
2022-11-22 11:51:58 +08:00 |
|
chenchenzai
|
381eb8ac1e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 11:25:07 +08:00 |
|
chenchenzai
|
57b89687d1
|
全部摄像头上图修改
|
2022-11-22 11:24:47 +08:00 |
|
gongjiale
|
c3c3fe9199
|
UI样式调整
|
2022-11-22 11:22:00 +08:00 |
|
a0049873
|
21e602bb9e
|
西海岸需求开发
|
2022-11-22 10:58:19 +08:00 |
|
a0049873
|
8ad683813c
|
西海岸需求开发
|
2022-11-22 10:57:30 +08:00 |
|
gongjiale
|
beb51f9b51
|
提交西海岸左側
|
2022-11-22 10:00:29 +08:00 |
|
chenchenzai
|
4259e48c70
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 20:32:54 +08:00 |
|
chenchenzai
|
c619d24cf9
|
h5player播放接口添加
|
2022-11-21 20:32:28 +08:00 |
|
gongjiale
|
91d034c35d
|
bus事件
|
2022-11-21 19:17:16 +08:00 |
|
gongjiale
|
d70ca58781
|
bus事件
|
2022-11-21 19:16:13 +08:00 |
|
chenchenzai
|
ffbf434cd7
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 19:12:05 +08:00 |
|
chenchenzai
|
2ee35c6814
|
西海岸视频地图修改1121
|
2022-11-21 19:10:39 +08:00 |
|
a0049873
|
bd88609e0b
|
西海岸需求开发
|
2022-11-21 18:49:01 +08:00 |
|
a0049873
|
828a011669
|
西海岸版本开发
|
2022-11-21 18:46:38 +08:00 |
|
gongjiale
|
879b43cea5
|
添加按鈕取消事件；修改UI
|
2022-11-21 18:22:58 +08:00 |
|
gongjiale
|
f795484416
|
西海岸左侧样式修改
|
2022-11-21 14:19:16 +08:00 |
|
a0049873
|
3b4a6278cb
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
# front/src/views/home/videoSurveillance/index.vue
|
2022-11-21 13:52:50 +08:00 |
|
a0049873
|
1d02b59509
|
查询修改
|
2022-11-21 13:48:57 +08:00 |
|
gongjiale
|
e1905140f4
|
暂存 staged
|
2022-11-21 12:26:18 +08:00 |
|
gongjiale
|
3e225ddce2
|
标签视频添加
|
2022-11-21 12:21:21 +08:00 |
|
chenchenzai
|
cde4f5d82e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 11:16:51 +08:00 |
|
chenchenzai
|
d055a89f09
|
西海岸视频监控
|
2022-11-21 11:15:40 +08:00 |
|
a0049873
|
dce08fa047
|
政务云找回
|
2022-11-21 10:54:48 +08:00 |
|
a0049873
|
de09c71c8b
|
被覆盖
|
2022-11-21 10:51:54 +08:00 |
|
unknown
|
fc1e1714a9
|
地图点击视频监控出现弹窗
|
2022-11-20 17:55:55 +08:00 |
|
unknown
|
c6798ff28e
|
西海岸基础设施视频监控页面地图修改1
|
2022-11-20 14:08:35 +08:00 |
|
a0049873
|
5767fa4c49
|
西海岸 待申请列表相关开发
|
2022-11-19 17:16:19 +08:00 |
|
a0049873
|
9fe01b9d10
|
政务云资源模糊查
|
2022-11-19 16:05:31 +08:00 |
|
a0049873
|
778122d249
|
西海岸 基础设施开发
|
2022-11-18 18:33:04 +08:00 |
|
a0049873
|
97ddab81b8
|
BUG修改
|
2022-11-18 17:05:26 +08:00 |
|
gongjiale
|
1ae34481d7
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-18 16:38:51 +08:00 |
|
gongjiale
|
e48f8cc6ce
|
能力上架修改
|
2022-11-18 16:38:42 +08:00 |
|
a0049873
|
bc73b269a6
|
政务云修改
|
2022-11-18 15:54:43 +08:00 |
|
a0049873
|
84ea475d64
|
西海岸版本 基础设施开发
|
2022-11-18 15:38:56 +08:00 |
|
a0049873
|
8a02cc43b4
|
政务云资源对接
|
2022-11-18 15:37:00 +08:00 |
|
unknown
|
938ad4cd9b
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-18 11:19:23 +08:00 |
|
unknown
|
74925cc9e0
|
西海岸基础设施修改
|
2022-11-18 11:18:56 +08:00 |
|
gongjiale
|
8f04b9403e
|
修改
|
2022-11-18 10:56:19 +08:00 |
|
a0049873
|
cf1e1452c3
|
分离西海岸基础设施
|
2022-11-18 10:30:24 +08:00 |
|
unknown
|
2c69d3829b
|
头部菜单修改
|
2022-11-16 16:20:41 +08:00 |
|
unknown
|
6d806547ef
|
模糊搜索ui修改
|
2022-11-15 18:23:26 +08:00 |
|
a0049873
|
cccea9db0b
|
BUG修改
|
2022-11-14 17:48:35 +08:00 |
|
a0049873
|
cb60a8736d
|
首页通过资源申请跳转 默认进入政务云资源tab
|
2022-11-14 09:51:46 +08:00 |
|
a0049873
|
11a959022c
|
BUG修改
|
2022-11-14 09:40:54 +08:00 |
|
unknown
|
79357c6e9a
|
会议室全部修改为会客厅
|
2022-11-11 10:33:16 +08:00 |
|
a0049873
|
62b2091fd6
|
全局搜索调整
|
2022-11-10 15:18:29 +08:00 |
|
a0049873
|
6abc05dcf6
|
全局搜索添加排序
|
2022-11-10 15:12:33 +08:00 |
|
unknown
|
a5be25cec4
|
还原
|
2022-11-08 16:44:11 +08:00 |
|
unknown
|
d89ae93ae2
|
视频播放
|
2022-11-08 15:08:07 +08:00 |
|
a0049873
|
383289ea94
|
门户如果未选中类型进行全局搜索
|
2022-11-07 14:43:28 +08:00 |
 guoyue
|
99f962c74f
|
修复应用领域不能选中bug
|
2022-11-04 17:00:45 +08:00 |
|
gongjiale
|
0f479dfec4
|
问题修改
|
2022-11-04 13:59:28 +08:00 |
|
gongjiale
|
d88430ec93
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-04 09:05:11 +08:00 |
|
unknown
|
4c77bb2405
|
申购车中展开收起修改
|
2022-11-03 17:59:48 +08:00 |
|
gongjiale
|
7b334a0224
|
修改
|
2022-11-03 17:43:41 +08:00 |
|
gongjiale
|
14f82809f6
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-03 14:34:02 +08:00 |
|
gongjiale
|
7da4dc814a
|
修改部分
|
2022-11-03 14:33:53 +08:00 |
|
unknown
|
92c6bf687b
|
会议室预约时间选择器限制
|
2022-11-03 10:02:39 +08:00 |
|
guoyue
|
4f41648fa4
|
修复应用资源详情返回未选中bug
|
2022-11-03 09:22:18 +08:00 |
|
gongjiale
|
65026d0e65
|
修改样式
|
2022-11-02 14:35:57 +08:00 |
|
a0049873
|
72229ea4fb
|
修改城市云脑顺序
|
2022-11-01 15:35:30 +08:00 |
|
a0049873
|
3950122864
|
全局搜索功能优化
|
2022-11-01 14:41:17 +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
|
d130bcf1aa
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-31 17:47:56 +08:00 |
|
gongjiale
|
2156e70433
|
左侧树修改
|
2022-10-31 17:47:38 +08:00 |
|
unknown
|
1ad52d954c
|
bug修改，我的申请
|
2022-10-31 16:29:19 +08:00 |
|
a0049873
|
15426bccdc
|
能力申请 应用系统对接
|
2022-10-31 16:03:12 +08:00 |
|
gongjiale
|
511f4690c1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-31 14:50:38 +08:00 |
|
guoyue
|
5f155dc69a
|
更改图片字段
|
2022-10-31 14:07:39 +08:00 |
|
gongjiale
|
90237e4f6d
|
Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-28 16:40:35 +08:00 |
|
gongjiale
|
6967b3f1da
|
1.完成能力集市：基础设施-会客厅，字数太多时，展示不美观的问题；
2.完成融合服务：打包模式，点击发布时间，只能按照正序排，不能按照倒序排列的问题；
3完成.融合服务：打包模式，点击收藏量，只能按照正序排，不能按照倒序排列的问题
|
2022-10-28 16:37:48 +08:00 |
 wuhongjian
|
ed6a7e85b2
|
bug修复
|
2022-10-28 13:59:44 +08:00 |
|
wuhongjian
|
04fcdfde08
|
bug修复
|
2022-10-28 13:58:53 +08:00 |
|
a0049873
|
fbcd40f2a6
|
BUG修改
|
2022-10-27 18:05:28 +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
|
330f8de5e4
|
全局搜索 搜索逻辑修改
|
2022-10-26 10:39:32 +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
|
b600caa357
|
添加admin权限
|
2022-10-26 09:19:01 +08:00 |
|
guoyue
|
5fea910701
|
合并
|
2022-10-25 18:00:40 +08:00 |
|
guoyue
|
05899ab616
|
能力分类进入能力集市，应用领域有选中时，展开
|
2022-10-25 17:53:17 +08:00 |
|
a0049873
|
983b2c0534
|
更改头部样式
|
2022-10-25 15:11:47 +08:00 |
|
wuhongjian
|
8f33c9f375
|
bug修复
|
2022-10-25 11:30:05 +08:00 |
|
a0049873
|
5cbeba19b8
|
会议室列表
|
2022-10-25 10:58:25 +08:00 |
|
a0049873
|
b30a72555f
|
判断用户后台权限
|
2022-10-25 09:48:40 +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 |