 gongjiale
|
5b8d002d5d
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 17:32:41 +08:00 |
|
gongjiale
|
6b0807da4e
|
资金报表页面
|
2022-11-22 17:31:58 +08:00 |
chenchenzai
|
21191413d2
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 17:30:57 +08:00 |
|
chenchenzai
|
c05ed0616c
|
地图弹窗包含视频数据数组清空
|
2022-11-22 17:30:39 +08:00 |
 wuhongjian
|
6d83cd76e0
|
西海岸视频播放
|
2022-11-22 17:22:43 +08:00 |
|
chenchenzai
|
d01ba547e2
|
多余标志位删除
|
2022-11-22 16:39:21 +08:00 |
|
chenchenzai
|
3c21b119b4
|
已申请列表预览视频
|
2022-11-22 16:31:39 +08:00 |
|
chenchenzai
|
adb32a06c2
|
已申请列表预览视频
|
2022-11-22 16:22:56 +08:00 |
|
chenchenzai
|
40b050d75c
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 15:39:34 +08:00 |
|
chenchenzai
|
74818f5abc
|
视频播放修改
|
2022-11-22 15:34:26 +08:00 |
|
wuhongjian
|
a24391ff1e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 15:04:51 +08:00 |
|
wuhongjian
|
851eb37c35
|
西海岸添加关闭所有视频
|
2022-11-22 15:04:49 +08:00 |
|
a0049873
|
deb9842c07
|
附件上传
|
2022-11-22 14:58:04 +08:00 |
|
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
|
e818e901ac
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 11:23:35 +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
|
730eb1e634
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 10:05:49 +08:00 |
|
gongjiale
|
beb51f9b51
|
提交西海岸左側
|
2022-11-22 10:00:29 +08:00 |
|
a0049873
|
962f1ad766
|
点位查全部
|
2022-11-22 09:49:43 +08:00 |
|
a0049873
|
56e11a088e
|
西海岸需求开发
|
2022-11-22 09:47:10 +08:00 |
|
wuhongjian
|
089716c2a8
|
配置文件更新
|
2022-11-21 20:42:03 +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 |
|
wuhongjian
|
1e3aa7db5a
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 19:21:47 +08:00 |
|
gongjiale
|
91d034c35d
|
bus事件
|
2022-11-21 19:17:16 +08:00 |
|
gongjiale
|
d70ca58781
|
bus事件
|
2022-11-21 19:16:13 +08:00 |
|
wuhongjian
|
df8aa20b3f
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 19:12:16 +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 |
|
wuhongjian
|
3076ab83c2
|
配置文件更新
|
2022-11-21 19:11:44 +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 |
|
gongjiale
|
88d86a6749
|
Revert "西海岸左侧样式修改"
This reverts commit f39257bdb0.
|
2022-11-21 14:16:21 +08:00 |
|
gongjiale
|
f39257bdb0
|
西海岸左侧样式修改
|
2022-11-21 14:14:45 +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 |