 xiayu3
|
5a85c7712a
Merge remote-tracking branch 'origin/dev-security' into dev-security
|
4 gadi atpakaļ |
|
xiayu3
|
26f78ba0b9
[FE]：视频监控界面流媒体完成
|
4 gadi atpakaļ |
 luoxu5
|
61868caf3c
[FE]修改设备编辑图片回显问题
|
4 gadi atpakaļ |
|
luoxu5
|
f279dedba8
[FE]修改考勤配置、考勤状态的回显问题
|
4 gadi atpakaļ |
|
luoxu5
|
3a19daa5a1
[FE]优化部门列表数据结构算法
|
4 gadi atpakaļ |
|
luoxu5
|
132d70affa
[FE]修改考勤规则部门列表渲染的数据结构
|
4 gadi atpakaļ |
|
xiayu3
|
01bf6c60e0
[FE]：合并冲突
|
4 gadi atpakaļ |
|
xiayu3
|
6ed3c853d8
[FE]：修改视频监控页面逻辑以及界面
|
4 gadi atpakaļ |
|
luoxu5
|
1d09305a0c
[FE]修改参数orgCode为orgId
|
4 gadi atpakaļ |
|
luoxu5
|
9407505d9d
[FE]联调视频回放接口，修改考勤管理、部门目录树显示逻辑
|
4 gadi atpakaļ |
 liuchang
|
3235aefce6
[FE]更新流媒体插件
|
4 gadi atpakaļ |
 chenxr3
|
0906c46018
[FE]首页修改
|
4 gadi atpakaļ |
|
liuchang
|
873249d3a3
Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security
|
4 gadi atpakaļ |
|
liuchang
|
cd3dbf7186
[FE]首页去掉Layout布局
|
4 gadi atpakaļ |
 liuwenxun
|
53df485a54
[FE]修改参数
|
4 gadi atpakaļ |
|
liuwenxun
|
f74026b8ed
Merge remote-tracking branch 'origin/dev-security' into dev-security
|
4 gadi atpakaļ |
|
liuwenxun
|
a889ee32f4
[FE]AI报警接口联调
|
4 gadi atpakaļ |
|
xiayu3
|
b6f500b56d
Merge remote-tracking branch 'origin/dev-security' into dev-security
|
4 gadi atpakaļ |
|
xiayu3
|
0011b3d9f8
feat:ai任务接口调整
|
4 gadi atpakaļ |
|
luoxu5
|
c8d7ca045b
[FE]初步联调视频回放接口
|
4 gadi atpakaļ |
|
liuchang
|
36af9d77e8
Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security
|
4 gadi atpakaļ |
|
liuchang
|
2aae5957f4
[FE] 更新系统配置-监控布局 后端对接
|
4 gadi atpakaļ |
|
chenxr3
|
ca6e3700fd
修改提交
|
4 gadi atpakaļ |
|
chenxr3
|
19638416af
系统首页
|
4 gadi atpakaļ |
 chenlp5
|
c302c0edf8
[FE]feat:增加视频回放组件
|
4 gadi atpakaļ |
|
liuchang
|
e0b96780f3
[FE]更新和后端联调改动
|
4 gadi atpakaļ |
|
liuchang
|
b01af74802
[FE]更新服务接口文件
|
4 gadi atpakaļ |
|
liuchang
|
38857426c4
[FE]提交监控终端api更新
|
4 gadi atpakaļ |
|
chenlp5
|
91638384f1
feat: DraggableGrid
|
4 gadi atpakaļ |
|
luoxu5
|
b84df77a3a
feat:修改新增假勤数据回显问题，设备管理接口联调
|
4 gadi atpakaļ |
|
xiayu3
|
a1a85805a0
Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security
|
4 gadi atpakaļ |
|
xiayu3
|
e732ae3768
feat:更新ai任务界面&视频监控界面
|
4 gadi atpakaļ |
|
luoxu5
|
bf512f67c3
feat:新增设备管理mock数据，修改假勤管理部分逻辑
|
4 gadi atpakaļ |
|
liuchang
|
095c160e93
修复文件格式，修复拖拽异常问题
|
4 gadi atpakaļ |
|
liuwenxun
|
729f257dae
[FE]增加了Ai报警和进出口记录界面
|
4 gadi atpakaļ |
|
luoxu5
|
4803da2fe4
feat:修改设备管理页面
|
4 gadi atpakaļ |
|
liuchang
|
9196fa66e5
增添测试提示
|
4 gadi atpakaļ |
|
liuchang
|
bfef089fbd
更新视频配置
|
4 gadi atpakaļ |
|
xiayu3
|
b4fce4e26f
feat:修改视频监控数据接口
|
4 gadi atpakaļ |
|
luoxu5
|
e1e6b4e721
feat:修改设备管理页面
|
4 gadi atpakaļ |
|
xiayu3
|
774138e475
feat:修改识别记录界面
|
4 gadi atpakaļ |
|
xiayu3
|
d3b072645a
feat:添加数据接口
|
4 gadi atpakaļ |
|
chenlp5
|
cc99a6b298
Merge remote-tracking branch 'origin/storedev' into dev-security
|
4 gadi atpakaļ |
|
chenlp5
|
41b0e3ffa1
[FE]考勤及安防前端部分
|
4 gadi atpakaļ |
 wangdong6
|
855dee76a3
Merge remote-tracking branch 'origin/master'
|
4 gadi atpakaļ |
|
wangdong6
|
ce6caf3e9e
新增安防场景与设备关联关系服务
|
4 gadi atpakaļ |
 konghl
|
e4a26fd473
新增安防场景接口
|
4 gadi atpakaļ |
|
konghl
|
3ace2b8fb2
新增minio配置
|
4 gadi atpakaļ |
|
konghl
|
95a5af6883
Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git
|
4 gadi atpakaļ |
|
konghl
|
b235b8cc7c
增加时间工具方法
|
4 gadi atpakaļ |
