280 Revīzijas 6f2114a6ab ... b30890588a

Autors SHA1 Ziņojums Datums
  xiayu3 b30890588a [FE]合并 4 gadi atpakaļ
  xiayu3 a82f4bde26 [FE]修改界面布局 4 gadi atpakaļ
  luoxu5 396712858c [FE]修改细节样式 4 gadi atpakaļ
  konghl a2b10cfb75 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl 3f6f63813e 删除无效的引用 4 gadi atpakaļ
  konghl cf698f8ce5 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl 13c48ad47c 修改AI识别的具体实现方法 4 gadi atpakaļ
  konghl f5ea8487d0 修改Ai返回参数 4 gadi atpakaļ
  wangchao 32bcf4ba07 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao fde3a8e5b3 镜屏推送ai识别返回结果坐标box 4 gadi atpakaļ
  wangchao fc1350beaa Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao 735032346f 镜屏任务 4 gadi atpakaļ
  wangchao 987433680a 引进镜屏 4 gadi atpakaļ
  wangchao 2e3dc1f1fb uspa登录菜單根code修改 4 gadi atpakaļ
  chenxr3 8edfdbbf81 [FE] 海上定位导航权限 4 gadi atpakaļ
  konghl e6c82e9a25 修改监控图片文件夹的问题 4 gadi atpakaļ
  konghl 07fdaa85c2 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl bc7899c071 删除无效的引用 4 gadi atpakaļ
  konghl f1d39525fc 修改人脸识别AI调用服务 4 gadi atpakaļ
  chenxr3 4032a6b4e8 [FE] logo修改提交 4 gadi atpakaļ
  chenxr3 554e3bdeaa [FE]修改提交 4 gadi atpakaļ
  chenxr3 aae1b31f8e [FE] 安防页面调整 4 gadi atpakaļ
  konghl 7aac87a1a0 修改静态数据 4 gadi atpakaļ
  chenxr3 ab79ee5372 海上定位首页悬浮窗默认关闭 4 gadi atpakaļ
  konghl 365604be9b 修改打包方式 4 gadi atpakaļ
  wangchao abf4590cff 考勤月报详情 考勤日报显示问题 加班补卡审核问题修改 4 gadi atpakaļ
  luoxu5 e5e3be8442 [FE]修改考勤报表页面和和设备管理页面初始化查询数据问题 4 gadi atpakaļ
  xiayu3 3b46b5a167 [FE]修改进出记录界面 4 gadi atpakaļ
  wangchao d814fe945a Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao a27835f9fe 海上定位uspa的修改 4 gadi atpakaļ
  wangxu16 e9e8b5d94e AI识别仪表 4 gadi atpakaļ
  wangxu16 8de8913432 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangxu16 15d06498c2 吸烟识别,工作服识别,仪表识别 4 gadi atpakaļ
  konghl 6acd088047 修改场景关联设备 4 gadi atpakaļ
  konghl 895d34bec7 修改AI模型常量 4 gadi atpakaļ
  konghl 74cb14124e 修改视频回放 4 gadi atpakaļ
  chenxr3 762a15dae8 [FE] 视频监控布局问题、切换场景没有切换布局修复 识别记录下面图片跑马灯 4 gadi atpakaļ
  luoxu5 4f4027659a [FE]新增用户管理页面默认查询条件和设备对话框视频地址字段值 4 gadi atpakaļ
  liuwenxun 7e018c0902 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  liuwenxun 6b8b5abe55 [FE]AI报警角标调整 4 gadi atpakaļ
  liuwenxun 7ae4a35d9d [FE]处理公司名字 4 gadi atpakaļ
  liuwenxun 761ca52702 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  liuwenxun 232317f8d4 [FE]进出记录详情页面添加识别方框 4 gadi atpakaļ
  liuwenxun ac5103adfb Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  liuwenxun 32785134b2 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 gadi atpakaļ
  liuwenxun d911a3fea6 [FE]进出详情修改 4 gadi atpakaļ
  liuwenxun 286f4e7586 [FE]进出详情里截图完成 4 gadi atpakaļ
  liuwenxun 0ef80dba26 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 gadi atpakaļ
  liuwenxun d73f053c1c [FE]进出记录联调 4 gadi atpakaļ
  liuwenxun 10ffaddfc7 [FE]AI报警详情高保真解决 4 gadi atpakaļ
  chenxr3 a4fcb0e1ae [FE] 首页直播组件更换 4 gadi atpakaļ
  chenxr3 362dd05c40 [FE]视频监控分页 4 gadi atpakaļ
  xiayu3 264c3ba3d5 Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security 4 gadi atpakaļ
  xiayu3 5cb880c67a [FE]更改视频监控组件以及用户管理界面新增用户弹出框 4 gadi atpakaļ
  liuwenxun 9886a6c12e [FE]整合人脸审核页面到用户管理 4 gadi atpakaļ
  liuwenxun 6b710a982f Merge remote-tracking branch 'origin/dev-security' into dev-security 4 gadi atpakaļ
  liuwenxun b9c49e6225 [FE]统计AI报警未处理的数据 4 gadi atpakaļ
  liuwenxun b700661ec4 [FE]AI报警表格调整 4 gadi atpakaļ
  liuwenxun c70214f3d4 [FE]AI报警徽标调整 4 gadi atpakaļ
  liuwenxun f85324acbe Merge remote-tracking branch 'origin/dev-security' into dev-security 4 gadi atpakaļ
  liuwenxun 6571f93fd9 [FE]AI报警处理,AI报警角标,进出记录查询修改 4 gadi atpakaļ
  liuwenxun 8f4b50aca9 [FE]处理AL报警详情无法点开的问题 4 gadi atpakaļ
  liuwenxun 5b51d9d4bd [FE]处理videoInfo为空时,详情页面无法点击的问题 4 gadi atpakaļ
  xiayu3 b53ad37d3c [FE]:修改目录 4 gadi atpakaļ
  xiayu3 cb769b3992 Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security 4 gadi atpakaļ
  xiayu3 2233772536 [FE]:修改视频监控样式 4 gadi atpakaļ
  xiayu3 3cbe6f2c39 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  xiayu3 67f5214a9a Merge branch 'dev-security' 4 gadi atpakaļ
  wangchao 12572cf5a1 考勤详情显示格式修改bug 4 gadi atpakaļ
  chenxr3 d78b7bdffa 删除debugger 4 gadi atpakaļ
  konghl 9f50c9fa97 修改问题 4 gadi atpakaļ
  wangdong6 0c298d1922 修改AI识别处理服务 4 gadi atpakaļ
  konghl 475afbbf9c 修改问题 4 gadi atpakaļ
  konghl e31740f33e 新增报警详情的接口 4 gadi atpakaļ
  wangdong6 e477401879 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangdong6 dc68bfa2ea 修改AI识别处理服务 4 gadi atpakaļ
  wangdong6 29063f2405 增加场景设备分页查询服务 4 gadi atpakaļ
  wangchao 6a9e5a5391 修改进出记录bug 4 gadi atpakaļ
  konghl b853fa9490 修改考勤类型必填的问题 4 gadi atpakaļ
  konghl 902b99be6a 修改问题 4 gadi atpakaļ
  konghl eed12970cd 新增AI报警kafka消费 4 gadi atpakaļ
  wangdong6 83a580112c 修改AI处理结果 4 gadi atpakaļ
  wangdong6 296d4992b4 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangdong6 526e01161f 增加考勤打卡服务 4 gadi atpakaļ
  wangdong6 2274a0b5a3 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangdong6 366cc07942 修改AI识别功能 4 gadi atpakaļ
  wangdong6 f437841399 修改AI识别功能 4 gadi atpakaļ
  wangchao 1a8e2463b5 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 6fb2eb5da1 AI报警接口增加处理人返回值与报警类型name返回值 4 gadi atpakaļ
  wangchao 173425e9aa Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao cc86f342c0 进出记录返回参数查询修改 4 gadi atpakaļ
  wangchao 392d7269c4 进出记录、详情 查询修改 4 gadi atpakaļ
  wangchao 9720d09362 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 19896d67fd 进出记录、详情 查询 4 gadi atpakaļ
  wangchao 3c8ced1379 进出记录、详情 查询 4 gadi atpakaļ
  konghl 0f7ad3266b 新增批量获取文件的路径 4 gadi atpakaļ
  wangchao b57d80b691 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 83af37e1b4 考勤管理 4 gadi atpakaļ
  wangchao c1a17c529b Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 9025dc6284 修改日报bug 4 gadi atpakaļ
  wangchao 0bf75d3a8d Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao cf7b6cdfa4 AI接口提交 4 gadi atpakaļ
  wangchao cf93c13cfe Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao c539efc81a 导出excel 4 gadi atpakaļ
  chenxr3 c5de3eedce 月考勤数据查询接口修改bug 4 gadi atpakaļ
  konghl d1691caa94 工单申请修改用户和部门 4 gadi atpakaļ
  wangchao 1690e0e21b 修改考勤查询日报bug 4 gadi atpakaļ
  wangdong6 0584159bd1 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangdong6 f02a5c9889 修改考勤规则查询接口 4 gadi atpakaļ
  wangdong6 013e377cef 修改考勤规则查询接口 4 gadi atpakaļ
  konghl 2ac7393605 重构人员轨迹查询 4 gadi atpakaļ
  konghl 190e8a2ec0 新增工单申请及审批接口 4 gadi atpakaļ
  wangdong6 a0a75ce1c6 修改考勤规则保存接口 4 gadi atpakaļ
  wangchao 208cc9c6ed Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao eb0f593fc9 查询报表修改参数 4 gadi atpakaļ
  wangchao 78caba4d27 考勤详情修改 4 gadi atpakaļ
  wangchao 69f40fa73d Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 6ff5fe626a 考勤报告接收前台参数方式修改 4 gadi atpakaļ
  wangdong6 5151d2fea9 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangdong6 9a5dcf3200 封装考勤规则管理接口 4 gadi atpakaļ
  zhaolx5 84e32ed3ca 解决打包失败的问题 4 gadi atpakaļ
  zhaolx5 ac019a0444 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  zhaolx5 d80c144412 变更ipu-cache的版本号 4 gadi atpakaļ
  konghl 5c299da82a 问题修改 4 gadi atpakaļ
  chenxr3 c65072f9be 定位提交 4 gadi atpakaļ
  konghl 9d8fd7b88a 增加设备和围栏的判断字段 4 gadi atpakaļ
  wangchao 9773787bd2 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 0c3414ba5f 配置文件增加注释 4 gadi atpakaļ
  wangchao 62a630e635 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 59071e3124 增加空格 4 gadi atpakaļ
  konghl 4b9cfc964f 新增mock工程 4 gadi atpakaļ
  konghl 8ff2333bdb 修改配置文件,用于上传服务器 4 gadi atpakaļ
  konghl 35e8568374 修改项目名称,用于上传服务器 4 gadi atpakaļ
  konghl 296cdba193 重构后台系统,仅用于上传服务器 4 gadi atpakaļ
  konghl 0122efbabc 重构后台系统,仅用于上传服务器 4 gadi atpakaļ
  konghl 9a39799cc0 部署服务器,修改配置文件 4 gadi atpakaļ
  konghl ddf35fd300 暂时不启用非实体对象的判断 4 gadi atpakaļ
  chenxr3 7939fc8ace 首页修改提交 4 gadi atpakaļ
  konghl db678770b9 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl bebb2b89fe 人员定位问题修改 4 gadi atpakaļ
  konghl 04ada0e6f8 实时救援问题修改 4 gadi atpakaļ
  wangkang3 33bb67ddb7 提交 4 gadi atpakaļ
  chenxr3 b15b5e27ad 首页修改提交 4 gadi atpakaļ
  konghl 8b281e8053 修改pom,排除登录验证 4 gadi atpakaļ
  konghl cb0c0e8182 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl 53804e97f6 修改镜屏推送信息 4 gadi atpakaļ
  konghl 6809ddead2 重构实时报警和历史报警 4 gadi atpakaļ
  konghl 2363abc631 修改镜屏topic 4 gadi atpakaļ
  konghl 6c328c4398 轨迹查询重构 4 gadi atpakaļ
  konghl b0ee3a41b4 历史轨迹回放重构,增加定时任务判断设备离线 4 gadi atpakaļ
  chenxr3 622b446cee 首页修改提交 4 gadi atpakaļ
  chenxr3 4756df9027 修改提交 4 gadi atpakaļ
  konghl 67e75e92ff 删除枚举等,重构人员定位 4 gadi atpakaļ
  chenxr3 563af28335 修改提交 4 gadi atpakaļ
  konghl 08a6631852 修改设备类型 4 gadi atpakaļ
  konghl c183618ccb Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl 2387b3f8e5 修改设备 4 gadi atpakaļ
  konghl 7712978aac 修改地图标记类型和设备类型 4 gadi atpakaļ
  konghl 97a96a8da4 中台服务的版本从2.1升级为2.1.5 4 gadi atpakaļ
  chenxr3 626a7699ce 修改提交 4 gadi atpakaļ
  konghl cbbdfa675d 修改北向接口缓存方式 4 gadi atpakaļ
  konghl 387e92633d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 gadi atpakaļ
  konghl 9ec6ffcd72 统一设备管理返回格式 4 gadi atpakaļ
  konghl 46d45bf56c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 gadi atpakaļ
  konghl b61fa21c4f 修改kafka配置文件 4 gadi atpakaļ
  konghl 24f03b82fc 统一设备管理的返回格式 4 gadi atpakaļ
  konghl 8c1bd0a40d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl d6c9ee7ac9 统一用户管理返回值 4 gadi atpakaļ
  konghl 2667543ebe 修改人员信息返回值 4 gadi atpakaļ
  konghl 33f605d78d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 gadi atpakaļ
  konghl 8c6e6b34db 统一地图标记和终端管理的返回格式 4 gadi atpakaļ
  konghl 6f5679bb9b 修改pom 4 gadi atpakaļ
  konghl f8ec732c5e 配置kafka 4 gadi atpakaļ
  wangchao 91cb23750d Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 7a19aa2489 加入uspa拦截器token验证 4 gadi atpakaļ
  wangchao 605bfe142d Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 0307a3595b 用户管理删除和新增 4 gadi atpakaļ
  wangchao 42c9ce12f2 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 2f12fb16fb 终端绑定 4 gadi atpakaļ
  wangchao a4780fea36 后台项目初始化 4 gadi atpakaļ
  wangchao 1d225203e0 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 7b5bd7fc8f 解绑查询关联关系 4 gadi atpakaļ
  wangchao 5b7ada9d09 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 3abd9ac159 测试 4 gadi atpakaļ
  wangchao 5c2edbe8f2 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 701921f2c7 设备管理分页查询的修改 4 gadi atpakaļ
  wangchao d1e6198a6c 设备管理报错修改 4 gadi atpakaļ
  wangchao cd2a9a0807 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 42136256e1 设备管理模块后台修改 4 gadi atpakaļ
  konghl e5ac90e3cc 修改git忽略文件配置 4 gadi atpakaļ
  konghl 173629f8c7 修改用户管理 4 gadi atpakaļ
  konghl 8b50ef3257 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl 15425d68aa 用户管理功能修改 4 gadi atpakaļ
  wangchao f4c0dc51b9 后台项目安防一体化系统初始化 4 gadi atpakaļ
  konghl e9eb1c63df 修改工程,无错误 4 gadi atpakaļ
  zhaolx5 12e2261ca9 初始化工程 4 gadi atpakaļ
  wangchao 21a1d106ba Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao d53bf64414 修改项目结构 4 gadi atpakaļ
  wangchao 10d36573b9 修改项目结构 4 gadi atpakaļ
  wangkang3 657320fadd 提交 4 gadi atpakaļ
  wangchao 993f22008d Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 1e6aae2459 修改设备添加数据库时间 4 gadi atpakaļ
  konghl aa3a0f690d 实际报警初始化查询 4 gadi atpakaļ
  konghl 3640ccd134 拆分properties配置文件 4 gadi atpakaļ
  konghl 9afed3d1cd 修改镜屏名称、新增查询历史报警救援等 4 gadi atpakaļ
  konghl 52a85f945f 修改日期工具类 4 gadi atpakaļ
  wanyao ee205bc24c 回退 4 gadi atpakaļ
  wanyao 16d1d23fee 主机启动慢的原因测试1 4 gadi atpakaļ
  wangkang3 d34871ad0c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangkang3 57e2b527f0 修改镜屏uuid 4 gadi atpakaļ
  wangkang3 a4f2b748b2 提交 4 gadi atpakaļ
  wangkang3 07f3e9bb23 修改提交 4 gadi atpakaļ
  konghl 499e7a7d94 合并海图参数 4 gadi atpakaļ
  konghl fe61027787 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 gadi atpakaļ
  konghl 70691e3608 增加海图配置参数、重构数据推送、新增轨迹回放接口 4 gadi atpakaļ
  konghl 510c6be0e7 修改人员定位功能数据订阅的解析 4 gadi atpakaļ
  chenxr3 186e9e66f4 轨迹分析页面 4 gadi atpakaļ
  wangchao 71ba3d6e50 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao eb6f6af53e 修改时间工具类与轨迹分析 4 gadi atpakaļ
  wangchao dc4c59924a Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 1c6dc5d9cd 轨迹分析信息查询 4 gadi atpakaļ
  chenxr3 69f534d648 地图标记绘制多边形颜色优化 4 gadi atpakaļ
  konghl ea8cc62767 修改配置文件 4 gadi atpakaļ
  wangchao ffb3b16b49 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 4f36bbe4f2 考勤方法的修改 4 gadi atpakaļ
  wangchao 4ea204d4e4 考勤查询功能详情信息 4 gadi atpakaļ
  wangchao 76ba12e88b Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 8088a9af4d 考勤查询功能 4 gadi atpakaļ
  konghl 0824340e9c 修改人员定位功能 4 gadi atpakaļ
  wangchao ceb2e684c3 测试批量插入 4 gadi atpakaļ
  wangchao a19b9e2346 合并代码 4 gadi atpakaļ
  wangchao d0cdba1219 Merge remote-tracking branch 'origin/master' 4 gadi atpakaļ
  wangchao 14d32a62c0 删除终端时删除终端绑定关系 4 gadi atpakaļ
  wangchao 1d834a772a 删除终端时删除终端绑定关系 4 gadi atpakaļ
  chenxr3 8e19767361 设备类型标识格式更改 4 gadi atpakaļ
  konghl b8a06cf6e6 添加人员的枚举值 4 gadi atpakaļ
  konghl ec04cf2f49 删除.project文件 4 gadi atpakaļ
  konghl 2e3c3b67ca 修改枚举位置 4 gadi atpakaļ
  konghl 004b6f9498 新增定位推送,修改枚举类的位置 4 gadi atpakaļ
  wangkang3 76ef98bf1e 代码提交 4 gadi atpakaļ
  wangchao 63feb0d24b 终端管理页面加ui替换 4 gadi atpakaļ
  wangchao e0572c53e1 关联终端,解绑终端修改,考勤管理架子编写 4 gadi atpakaļ
  wangchao 9ff2237cbf 关联终端,解绑终端修改 4 gadi atpakaļ
  wangchao 7acc72f757 关联终端,解绑终端修改 4 gadi atpakaļ
  wangchao 332e05b5f4 关联终端,解绑终端修改 4 gadi atpakaļ
  wangchao b7fe4ca37c 后台daoimpl的修改 4 gadi atpakaļ
  konghl a3c4950238 修改字段 4 gadi atpakaļ
  konghl 48cb0bbdfa 增加返回参数 4 gadi atpakaļ
  konghl 429b4dbfa9 修改北向接口 4 gadi atpakaļ
  konghl 2e0b6dcd44 增加业务常量 4 gadi atpakaļ
  konghl 12d7573f2e 新增功能:地图标记增删改查 4 gadi atpakaļ
  wangkang3 8f7b30e3be 地图标记模块接口接入 4 gadi atpakaļ
  chenxr3 1013865ef3 设备管理页面 4 gadi atpakaļ
  wangchao 97dca84162 修改设备验证 4 gadi atpakaļ
  wangchao 0c9930d3e3 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao 8bd1ff2323 终端关联,终端解绑等接口 4 gadi atpakaļ
  wangchao d01adabd91 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao d40c613702 修改gis接口等 4 gadi atpakaļ
  wangchao 35550a3e47 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao bd86ba7a47 设备增删改查以及关联与解绑终端 4 gadi atpakaļ
  wangchao a8c7c1cf4d 项目配置修改以及剔除uspa 4 gadi atpakaļ
  wangchao c251472c3d gis获取token接口 4 gadi atpakaļ
  wangchao fba9354c6a Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao 5ff38a7f9b 解决跨域问题 4 gadi atpakaļ
  wangchao 74f666ab34 添加注释,增加轨迹文件等 4 gadi atpakaļ
  wangchao 5f13388aac 修改地图管理文件 4 gadi atpakaļ
  wangchao 41aea6126c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao 24f1743496 按评审要求修改文件 4 gadi atpakaļ
  wangchao 666c0f81c2 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 gadi atpakaļ
  wangchao 779c6e3826 修改日志文件 4 gadi atpakaļ
  wangchao 0e5599165c 修改日志文件 4 gadi atpakaļ
  wangchao c217a49b3a 更新项目 4 gadi atpakaļ
  wangchao 408a2042a9 后台项目初始化 4 gadi atpakaļ
  wangkang3 7bbf8eb6a8 页面初始化提交 4 gadi atpakaļ
  liuchang 000ebd90c9 更新文件 4 gadi atpakaļ
  liuchang 46a262ab4b 删除 4 gadi atpakaļ
  liuchang d1d76df146 更新提交 4 gadi atpakaļ
  wanyao 1d2d95bc39 删除 4 gadi atpakaļ
  wanyao f74da4a0dd 删除 4 gadi atpakaļ
  wanyao b667fddfbc 初始化 4 gadi atpakaļ

+ 13 - 13
security-protection-platform/.aid/aid.js

56
  //imagePrefix: url => `${subappURL}/asset/image/${url}`, // 作为子应用必须启用
56
  //imagePrefix: url => `${subappURL}/asset/image/${url}`, // 作为子应用必须启用
57
  //fontPrefix: url => `${subappURL}/asset/font/${url}`, // 作为子应用必须启用
57
  //fontPrefix: url => `${subappURL}/asset/font/${url}`, // 作为子应用必须启用
58
  outputPrefix: '/'// 构建后index.html中资源路径的前缀
58
  outputPrefix: '/'// 构建后index.html中资源路径的前缀
59
  // ,
60
  // proxy: [
61
  //   {
62
  //     url: '/sp',
63
  //     options: {
64
  //       target: 'http://10.19.90.34:8018',
65
  //       changeOrigin: true,
66
  //       pathRewrite: {
67
  //         '^/sp': '/'
68
  //       }
69
  //     }
70
  //   },
71
  // ]
59
  ,
60
  proxy: [
61
    {
62
      url: '/sp',
63
      options: {
64
        target: 'http://10.19.90.34:8018',
65
        changeOrigin: true,
66
        pathRewrite: {
67
          '^/sp': '/'
68
        }
69
      }
70
    },
71
  ]
72
}
72
}

+ 2 - 2
security-protection-platform/src/conf/axios.config.js

39
  },
39
  },
40
  root: {
40
  root: {
41
    default: {
41
    default: {
42
      baseURL: 'http://10.19.90.34:8018'
42
      // baseURL: 'http://10.19.90.34:8018'
43
        // baseURL: 'http://localhost:8018'
43
        // baseURL: 'http://localhost:8018'
44
        // baseURL: '/sp'
44
        baseURL: '/sp'
45
    },
45
    },
46
    picurl: {
46
    picurl: {
47
      baseURL: 'http://10.19.90.34:19000/tool-image/'
47
      baseURL: 'http://10.19.90.34:19000/tool-image/'

+ 4 - 6
security-protection-platform/src/modules/access/component/instrumentRecord/index.vue

54
                </div>
54
                </div>
55
              </div>
55
              </div>
56
            </t-dropdown>
56
            </t-dropdown>
57
            <t-button color="secondary" icon="loading" class="reset-btn" @click="reset"></t-button>
58
          </div>
57
          </div>
59
        </div>
58
        </div>
60
        <div class="animate-demo-wrapper">
59
        <div class="animate-demo-wrapper">
62
            <div v-show="slideVisible" class="transition-box allCondition">
61
            <div v-show="slideVisible" class="transition-box allCondition">
63
              <div class="input-rule">
62
              <div class="input-rule">
64
                <span>开始时间:</span>
63
                <span>开始时间:</span>
65
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:200px;height:32px"></t-date-picker>
64
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:320px;height:32px"></t-date-picker>
66
              </div>
65
              </div>
67
              <div class="input-rule">
66
              <div class="input-rule">
68
                <span>结束时间:</span>
67
                <span>结束时间:</span>
69
                <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
68
                <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
70
              </div>
69
              </div>
70
              <a style="float:right;color:#0089d4;" @click="reset" href="javascript:;">重置</a>
71
            </div>
71
            </div>
72
          </transition>
72
          </transition>
73
        </div>
73
        </div>
590
      justify-content: space-between;
590
      justify-content: space-between;
591
      border: 1px solid rgba(0, 0, 0, 0.09);
591
      border: 1px solid rgba(0, 0, 0, 0.09);
592
      background-color: #f8f9fa;
592
      background-color: #f8f9fa;
593
      flex-wrap: wrap;
593
      flex-wrap: nowrap;
594
      padding: 20px;
594
      padding: 20px;
595
      margin: 5px auto;
595
      margin: 5px auto;
596
      align-items: center;
596
      .input-rule {
597
      .input-rule {
597
        flex: 1;
598
        flex: 1;
598
        width: 50%;
599
        min-width: 50%;
600
        max-width: 50%;
601
        padding: 10px 0 10px 20px;
599
        padding: 10px 0 10px 20px;
602
      }
600
      }
603
    }
601
    }

+ 4 - 6
security-protection-platform/src/modules/access/component/io-record/index.vue

55
                </div>
55
                </div>
56
              </div>
56
              </div>
57
            </t-dropdown>
57
            </t-dropdown>
58
            <t-button color="secondary" icon="loading" class="reset-btn" @click="reset"></t-button>
59
          </div>
58
          </div>
60
        </div>
59
        </div>
61
        <div class="animate-demo-wrapper">
60
        <div class="animate-demo-wrapper">
63
            <div v-show="slideVisible" class="transition-box allCondition">
62
            <div v-show="slideVisible" class="transition-box allCondition">
64
              <div class="input-rule">
63
              <div class="input-rule">
65
                <span>开始时间:</span>
64
                <span>开始时间:</span>
66
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:200px;height:32px"></t-date-picker>
65
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:320px;height:32px"></t-date-picker>
67
              </div>
66
              </div>
68
              <div class="input-rule">
67
              <div class="input-rule">
69
                <span>结束时间:</span>
68
                <span>结束时间:</span>
70
                <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
69
                <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
71
              </div>
70
              </div>
71
              <a style="float:right;color:#0089d4;" @click="reset" href="javascript:;">重置</a>
72
            </div>
72
            </div>
73
          </transition>
73
          </transition>
74
        </div>
74
        </div>
635
      justify-content: space-between;
635
      justify-content: space-between;
636
      border: 1px solid rgba(0, 0, 0, 0.09);
636
      border: 1px solid rgba(0, 0, 0, 0.09);
637
      background-color: #f8f9fa;
637
      background-color: #f8f9fa;
638
      flex-wrap: wrap;
638
      flex-wrap: nowrap;
639
      align-items: center;
639
      padding: 20px;
640
      padding: 20px;
640
      margin: 5px auto;
641
      margin: 5px auto;
641
      .input-rule {
642
      .input-rule {
642
        flex: 1;
643
        flex: 1;
643
        width: 50%;
644
        min-width: 50%;
645
        max-width: 50%;
646
        padding: 10px 0 10px 20px;
644
        padding: 10px 0 10px 20px;
647
      }
645
      }
648
    }
646
    }

+ 3 - 5
security-protection-platform/src/modules/aialarm/index.vue

57
                </div>
57
                </div>
58
              </div>
58
              </div>
59
            </t-dropdown>
59
            </t-dropdown>
60
            <t-button color="secondary" icon="loading" class="reset-btn" @click="reset"></t-button>
61
          </div>
60
          </div>
62
        </div>
61
        </div>
63
        <div class="animate-demo-wrapper">
62
        <div class="animate-demo-wrapper">
71
                <span>结束时间:</span>
70
                <span>结束时间:</span>
72
                <t-date-picker :confirm="false" v-model="searchdata.endTime" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
71
                <t-date-picker :confirm="false" v-model="searchdata.endTime" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
73
              </div>
72
              </div>
73
              <a style="float:right;color:#0089d4;" @click="reset" href="javascript:;">重置</a>
74
            </div>
74
            </div>
75
          </transition>
75
          </transition>
76
        </div>
76
        </div>
585
      justify-content: space-between;
585
      justify-content: space-between;
586
      border: 1px solid rgba(0, 0, 0, 0.09);
586
      border: 1px solid rgba(0, 0, 0, 0.09);
587
      background-color: #f8f9fa;
587
      background-color: #f8f9fa;
588
      flex-wrap: wrap;
588
      flex-wrap: nowrap;
589
      align-items: center;
589
      padding: 20px;
590
      padding: 20px;
590
      margin: 5px auto;
591
      margin: 5px auto;
591
      .input-rule {
592
      .input-rule {
592
        flex: 1;
593
        flex: 1;
593
        width: 50%;
594
        min-width: 50%;
595
        max-width: 50%;
596
        padding: 10px 0 10px 20px;
594
        padding: 10px 0 10px 20px;
597
      }
595
      }
598
    }
596
    }

+ 3 - 5
security-protection-platform/src/modules/attendance/abnormal/index.vue

34
                  </div>
34
                  </div>
35
                </div>
35
                </div>
36
              </t-dropdown>
36
              </t-dropdown>
37
              <t-button color="secondary" icon="loading" class="reset-btn" @click="resetData"></t-button>
38
            </div>
37
            </div>
39
          </div>
38
          </div>
40
          <div class="animate-demo-wrapper">
39
          <div class="animate-demo-wrapper">
44
                  <span>部门/员工:</span>
43
                  <span>部门/员工:</span>
45
                  <dept-staff-cascader v-model="form" @inited="handleInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
44
                  <dept-staff-cascader v-model="form" @inited="handleInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
46
                </div>
45
                </div>
46
                <a style="float:right;color:#0089d4;" @click="resetData" href="javascript:;">重置</a>
47
              </div>
47
              </div>
48
            </transition>
48
            </transition>
49
          </div>
49
          </div>
317
      justify-content: space-between;
317
      justify-content: space-between;
318
      border: 1px solid rgba(0, 0, 0, 0.09);
318
      border: 1px solid rgba(0, 0, 0, 0.09);
319
      background-color: #f8f9fa;
319
      background-color: #f8f9fa;
320
      flex-wrap: wrap;
320
      flex-wrap: nowrap;
321
      align-items: center;
321
      padding: 20px;
322
      padding: 20px;
322
      margin: 5px auto;
323
      margin: 5px auto;
323
      .input-rule {
324
      .input-rule {
324
        display: flex;
325
        display: flex;
325
        flex: 1;
326
        flex: 1;
326
        width: 80%;
327
        min-width: 80%;
328
        max-width: 80%;
329
        padding: 10px 0 10px 20px;
327
        padding: 10px 0 10px 20px;
330
        > span {
328
        > span {
331
          line-height: 32px;
329
          line-height: 32px;

+ 3 - 9
security-protection-platform/src/modules/attendance/report/index.vue

37
                      </div>
37
                      </div>
38
                    </div>
38
                    </div>
39
                  </t-dropdown>
39
                  </t-dropdown>
40
                  <t-button color="secondary" icon="loading" class="reset-btn" @click="resetDailyData"></t-button>
41
                </div>
40
                </div>
42
              </div>
41
              </div>
43
              <div class="animate-demo-wrapper">
42
              <div class="animate-demo-wrapper">
47
                      <span>部门/员工:</span>
46
                      <span>部门/员工:</span>
48
                      <dept-staff-cascader v-model="dailyForm" @inited="handleDailyInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
47
                      <dept-staff-cascader v-model="dailyForm" @inited="handleDailyInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
49
                    </div>
48
                    </div>
50
49
                    <a style="float:right;color:#0089d4;" @click="resetDailyData" href="javascript:;">重置</a>
51
                  </div>
50
                  </div>
52
                </transition>
51
                </transition>
53
              </div>
52
              </div>
102
                      </div>
101
                      </div>
103
                    </div>
102
                    </div>
104
                  </t-dropdown>
103
                  </t-dropdown>
105
                  <t-button color="secondary" icon="loading" class="reset-btn" @click="resetMonthData"></t-button>
106
                </div>
104
                </div>
107
              </div>
105
              </div>
108
              <div class="animate-demo-wrapper">
106
              <div class="animate-demo-wrapper">
111
                    <div class="input-rule">
109
                    <div class="input-rule">
112
                      <span>部门/员工:</span>
110
                      <span>部门/员工:</span>
113
                      <dept-staff-cascader v-model="monthlyForm" @getOrgId="getMonthOrgId" @getDepId="getMonthDepId" @getStaffId="getMonthStaffId" />
111
                      <dept-staff-cascader v-model="monthlyForm" @getOrgId="getMonthOrgId" @getDepId="getMonthDepId" @getStaffId="getMonthStaffId" />
114
                      <div class="search-btn">
115
                      </div>
116
117
                    </div>
112
                    </div>
113
                    <a style="float:right;color:#0089d4;" @click="resetMonthData" href="javascript:;">重置</a>
118
                  </div>
114
                  </div>
119
                </transition>
115
                </transition>
120
              </div>
116
              </div>
601
      border: 1px solid rgba(0, 0, 0, 0.09);
597
      border: 1px solid rgba(0, 0, 0, 0.09);
602
      background-color: #f8f9fa;
598
      background-color: #f8f9fa;
603
      flex-wrap: wrap;
599
      flex-wrap: wrap;
600
      align-items: center;
604
      padding: 20px;
601
      padding: 20px;
605
      margin: 5px auto;
602
      margin: 5px auto;
606
      .input-rule {
603
      .input-rule {
607
        display: flex;
604
        display: flex;
608
        flex: 1;
605
        flex: 1;
609
        width: 80%;
610
        min-width: 80%;
611
        max-width: 80%;
612
        padding: 10px 0 10px 20px;
606
        padding: 10px 0 10px 20px;
613
        > span {
607
        > span {
614
          line-height: 32px;
608
          line-height: 32px;

+ 2 - 4
security-protection-platform/src/modules/system/assignment/index.vue

39
                  </div>
39
                  </div>
40
                </div>
40
                </div>
41
              </t-dropdown>
41
              </t-dropdown>
42
              <t-button color="secondary" icon="loading" class="reset-btn" @click="resetData"></t-button>
43
            </div>
42
            </div>
44
          </div>
43
          </div>
45
          <div class="animate-demo-wrapper">
44
          <div class="animate-demo-wrapper">
59
                    <t-option v-for="item in taskStatusList" :key="item.id" :value="item.id">{{ item.description }}</t-option>
58
                    <t-option v-for="item in taskStatusList" :key="item.id" :value="item.id">{{ item.description }}</t-option>
60
                  </t-select>
59
                  </t-select>
61
                </div>
60
                </div>
61
                <a style="float:right;color:#0089d4;" @click="resetData" href="javascript:;">重置</a>
62
              </div>
62
              </div>
63
            </transition>
63
            </transition>
64
          </div>
64
          </div>
683
      border: 1px solid rgba(0, 0, 0, 0.09);
683
      border: 1px solid rgba(0, 0, 0, 0.09);
684
      background-color: #f8f9fa;
684
      background-color: #f8f9fa;
685
      flex-wrap: wrap;
685
      flex-wrap: wrap;
686
      align-items: center;
686
      padding: 20px;
687
      padding: 20px;
687
      margin: 5px auto;
688
      margin: 5px auto;
688
      .input-rule {
689
      .input-rule {
689
        flex: 1;
690
        flex: 1;
690
        width: 50%;
691
        min-width: 50%;
692
        max-width: 50%;
693
        padding: 10px 0 10px 20px;
691
        padding: 10px 0 10px 20px;
694
      }
692
      }
695
    }
693
    }

+ 2 - 4
security-protection-platform/src/modules/system/devicemana/index.vue

38
                  </div>
38
                  </div>
39
                </div>
39
                </div>
40
              </t-dropdown>
40
              </t-dropdown>
41
              <t-button color="secondary" icon="loading" class="reset-btn" @click="resetData"></t-button>
42
            </div>
41
            </div>
43
          </div>
42
          </div>
44
          <div class="animate-demo-wrapper">
43
          <div class="animate-demo-wrapper">
54
                  <span>设备编号:</span>
53
                  <span>设备编号:</span>
55
                  <t-input v-model="deviceId" style="width:320px" placeholder="请输入设备编号"></t-input>
54
                  <t-input v-model="deviceId" style="width:320px" placeholder="请输入设备编号"></t-input>
56
                </div>
55
                </div>
56
                <a style="float:right;color:#0089d4;" @click="resetData" href="javascript:;">重置</a>
57
              </div>
57
              </div>
58
            </transition>
58
            </transition>
59
          </div>
59
          </div>
343
      border: 1px solid rgba(0, 0, 0, 0.09);
343
      border: 1px solid rgba(0, 0, 0, 0.09);
344
      background-color: #f8f9fa;
344
      background-color: #f8f9fa;
345
      flex-wrap: wrap;
345
      flex-wrap: wrap;
346
      align-items: center;
346
      padding: 20px;
347
      padding: 20px;
347
      margin: 5px auto;
348
      margin: 5px auto;
348
      .input-rule {
349
      .input-rule {
349
        flex: 1;
350
        flex: 1;
350
        width: 50%;
351
        min-width: 50%;
352
        max-width: 50%;
353
        padding: 10px 0 10px 20px;
351
        padding: 10px 0 10px 20px;
354
      }
352
      }
355
    }
353
    }

+ 2 - 4
security-protection-platform/src/modules/usermana/index.vue

39
                  </div>
39
                  </div>
40
                </div>
40
                </div>
41
              </t-dropdown>
41
              </t-dropdown>
42
              <t-button color="secondary" icon="loading" class="reset-btn" @click="resetData"></t-button>
43
            </div>
42
            </div>
44
          </div>
43
          </div>
45
          <div class="animate-demo-wrapper">
44
          <div class="animate-demo-wrapper">
57
                    <t-select-tree v-model="departmentTypeId" :node-data="departmentTypesList" width="320px" node-key="id"></t-select-tree>
56
                    <t-select-tree v-model="departmentTypeId" :node-data="departmentTypesList" width="320px" node-key="id"></t-select-tree>
58
                  </template>
57
                  </template>
59
                </div>
58
                </div>
59
                <a style="float:right;color:#0089d4;" @click="resetData" href="javascript:;">重置</a>
60
              </div>
60
              </div>
61
            </transition>
61
            </transition>
62
          </div>
62
          </div>
476
      border: 1px solid rgba(0, 0, 0, 0.09);
476
      border: 1px solid rgba(0, 0, 0, 0.09);
477
      background-color: #f8f9fa;
477
      background-color: #f8f9fa;
478
      flex-wrap: wrap;
478
      flex-wrap: wrap;
479
      align-items: center;
479
      padding: 20px;
480
      padding: 20px;
480
      margin: 5px auto;
481
      margin: 5px auto;
481
      .input-rule {
482
      .input-rule {
482
        flex: 1;
483
        flex: 1;
483
        width: 50%;
484
        min-width: 50%;
485
        max-width: 50%;
486
        padding: 10px 0 10px 20px;
484
        padding: 10px 0 10px 20px;
487
      }
485
      }
488
    }
486
    }

+ 3 - 5
security-protection-platform/src/modules/workorder/index.vue

105
                  </div>
105
                  </div>
106
                </div>
106
                </div>
107
              </t-dropdown>
107
              </t-dropdown>
108
              <t-button color="secondary" icon="loading" class="reset-btn" @click="resetData"></t-button>
109
            </div>
108
            </div>
110
          </div>
109
          </div>
111
          <div class="animate-demo-wrapper">
110
          <div class="animate-demo-wrapper">
119
                  <span>结束时间:</span>
118
                  <span>结束时间:</span>
120
                  <t-date-picker v-model="endDate" style="width:320px" placeholder="请选择结束时间" @date-change="endPickerDateChange"></t-date-picker>
119
                  <t-date-picker v-model="endDate" style="width:320px" placeholder="请选择结束时间" @date-change="endPickerDateChange"></t-date-picker>
121
                </div>
120
                </div>
121
                <a style="float:right;color:#0089d4;" @click="resetData" href="javascript:;">重置</a>
122
              </div>
122
              </div>
123
            </transition>
123
            </transition>
124
          </div>
124
          </div>
477
      justify-content: space-between;
477
      justify-content: space-between;
478
      border: 1px solid rgba(0, 0, 0, 0.09);
478
      border: 1px solid rgba(0, 0, 0, 0.09);
479
      background-color: #f8f9fa;
479
      background-color: #f8f9fa;
480
      flex-wrap: wrap;
480
      flex-wrap: nowrap;
481
      align-items: center;
481
      padding: 20px;
482
      padding: 20px;
482
      margin: 5px auto;
483
      margin: 5px auto;
483
      .input-rule {
484
      .input-rule {
484
        flex: 1;
485
        flex: 1;
485
        width: 50%;
486
        min-width: 50%;
487
        max-width: 50%;
488
        padding: 10px 0 10px 20px;
486
        padding: 10px 0 10px 20px;
489
      }
487
      }
490
    }
488
    }

+ 8 - 1
security-protection-platform/src/styles/index.scss

197
197
198
// 解决筛选按钮的错位问题
198
// 解决筛选按钮的错位问题
199
.trigger-button {
199
.trigger-button {
200
  transform: translateY(1.5px);
200
  // transform: translateY(1.5px);
201
  height: 100%;
202
}
203
.track-container .search-container .search-ctn .btns{
204
  display: flex !important;
201
}
205
}
206
.dropdown{
207
  height: 32px;
208
}