213 Commits f83da7e637 ... 1ce75b1ef8

Autore SHA1 Messaggio Data
  xiayu3 1ce75b1ef8 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 anni fa
  xiayu3 c7d3dfb76c [FE]:修改AI报警接口数据 4 anni fa
  xiayu3 22e1d89af6 Merge remote-tracking branch 'origin/dev-security' into dev-security 4 anni fa
  xiayu3 f1d0510a0a [FE]:修改视频监控页面逻辑 4 anni fa
  xiayu3 5a85c7712a Merge remote-tracking branch 'origin/dev-security' into dev-security 4 anni fa
  xiayu3 26f78ba0b9 [FE]:视频监控界面流媒体完成 4 anni fa
  xiayu3 01bf6c60e0 [FE]:合并冲突 4 anni fa
  xiayu3 6ed3c853d8 [FE]:修改视频监控页面逻辑以及界面 4 anni fa
  xiayu3 b6f500b56d Merge remote-tracking branch 'origin/dev-security' into dev-security 4 anni fa
  xiayu3 0011b3d9f8 feat:ai任务接口调整 4 anni fa
  liuchang e0b96780f3 [FE]更新和后端联调改动 4 anni fa
  liuchang b01af74802 [FE]更新服务接口文件 4 anni fa
  liuchang 38857426c4 [FE]提交监控终端api更新 4 anni fa
  chenlp5 91638384f1 feat: DraggableGrid 4 anni fa
  luoxu5 b84df77a3a feat:修改新增假勤数据回显问题,设备管理接口联调 4 anni fa
  xiayu3 a1a85805a0 Merge branch 'dev-security' of http://10.1.235.20:3000/asiainfo/ebc into dev-security 4 anni fa
  xiayu3 e732ae3768 feat:更新ai任务界面&视频监控界面 4 anni fa
  liuchang 095c160e93 修复文件格式,修复拖拽异常问题 4 anni fa
  liuwenxun 729f257dae [FE]增加了Ai报警和进出口记录界面 4 anni fa
  luoxu5 4803da2fe4 feat:修改设备管理页面 4 anni fa
  liuchang 9196fa66e5 增添测试提示 4 anni fa
  liuchang bfef089fbd 更新视频配置 4 anni fa
  xiayu3 b4fce4e26f feat:修改视频监控数据接口 4 anni fa
  luoxu5 e1e6b4e721 feat:修改设备管理页面 4 anni fa
  xiayu3 774138e475 feat:修改识别记录界面 4 anni fa
  xiayu3 d3b072645a feat:添加数据接口 4 anni fa
  chenlp5 cc99a6b298 Merge remote-tracking branch 'origin/storedev' into dev-security 4 anni fa
  chenlp5 41b0e3ffa1 [FE]考勤及安防前端部分 4 anni fa
  wangdong6 855dee76a3 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangdong6 ce6caf3e9e 新增安防场景与设备关联关系服务 4 anni fa
  konghl 3ace2b8fb2 新增minio配置 4 anni fa
  konghl 95a5af6883 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl b235b8cc7c 增加时间工具方法 4 anni fa
  konghl 0f893e9871 轨迹回放时间轴显示船舶 4 anni fa
  konghl 5b25048c26 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl 569b70605d 修改单人轨迹时间抽 4 anni fa
  konghl f3b7a571da 重构人员定位轨迹回放 4 anni fa
  chenxr3 c5de3eedce 月考勤数据查询接口修改bug 4 anni fa
  konghl d1691caa94 工单申请修改用户和部门 4 anni fa
  wangchao 1690e0e21b 修改考勤查询日报bug 4 anni fa
  wangdong6 0584159bd1 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangdong6 f02a5c9889 修改考勤规则查询接口 4 anni fa
  wangdong6 013e377cef 修改考勤规则查询接口 4 anni fa
  konghl 2ac7393605 重构人员轨迹查询 4 anni fa
  konghl 190e8a2ec0 新增工单申请及审批接口 4 anni fa
  wangdong6 a0a75ce1c6 修改考勤规则保存接口 4 anni fa
  wangchao 208cc9c6ed Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao eb0f593fc9 查询报表修改参数 4 anni fa
  wangchao 78caba4d27 考勤详情修改 4 anni fa
  wangchao 69f40fa73d Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 6ff5fe626a 考勤报告接收前台参数方式修改 4 anni fa
  wangdong6 5151d2fea9 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangdong6 9a5dcf3200 封装考勤规则管理接口 4 anni fa
  zhaolx5 84e32ed3ca 解决打包失败的问题 4 anni fa
  zhaolx5 ac019a0444 Merge remote-tracking branch 'origin/master' 4 anni fa
  zhaolx5 d80c144412 变更ipu-cache的版本号 4 anni fa
  konghl 5c299da82a 问题修改 4 anni fa
  chenxr3 c65072f9be 定位提交 4 anni fa
  konghl 9d8fd7b88a 增加设备和围栏的判断字段 4 anni fa
  wangchao 9773787bd2 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 0c3414ba5f 配置文件增加注释 4 anni fa
  wangchao 62a630e635 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 59071e3124 增加空格 4 anni fa
  konghl 4b9cfc964f 新增mock工程 4 anni fa
  konghl 8ff2333bdb 修改配置文件,用于上传服务器 4 anni fa
  konghl 35e8568374 修改项目名称,用于上传服务器 4 anni fa
  konghl 296cdba193 重构后台系统,仅用于上传服务器 4 anni fa
  konghl 0122efbabc 重构后台系统,仅用于上传服务器 4 anni fa
  konghl 9a39799cc0 部署服务器,修改配置文件 4 anni fa
  konghl ddf35fd300 暂时不启用非实体对象的判断 4 anni fa
  chenxr3 7939fc8ace 首页修改提交 4 anni fa
  konghl db678770b9 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl bebb2b89fe 人员定位问题修改 4 anni fa
  konghl 04ada0e6f8 实时救援问题修改 4 anni fa
  wangkang3 33bb67ddb7 提交 4 anni fa
  chenxr3 b15b5e27ad 首页修改提交 4 anni fa
  konghl 8b281e8053 修改pom,排除登录验证 4 anni fa
  konghl cb0c0e8182 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl 53804e97f6 修改镜屏推送信息 4 anni fa
  konghl 6809ddead2 重构实时报警和历史报警 4 anni fa
  konghl 2363abc631 修改镜屏topic 4 anni fa
  konghl 6c328c4398 轨迹查询重构 4 anni fa
  konghl b0ee3a41b4 历史轨迹回放重构,增加定时任务判断设备离线 4 anni fa
  chenxr3 622b446cee 首页修改提交 4 anni fa
  chenxr3 4756df9027 修改提交 4 anni fa
  konghl 67e75e92ff 删除枚举等,重构人员定位 4 anni fa
  chenxr3 563af28335 修改提交 4 anni fa
  konghl 08a6631852 修改设备类型 4 anni fa
  konghl c183618ccb Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl 2387b3f8e5 修改设备 4 anni fa
  konghl 7712978aac 修改地图标记类型和设备类型 4 anni fa
  konghl 97a96a8da4 中台服务的版本从2.1升级为2.1.5 4 anni fa
  chenxr3 626a7699ce 修改提交 4 anni fa
  konghl cbbdfa675d 修改北向接口缓存方式 4 anni fa
  konghl 387e92633d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 anni fa
  konghl 9ec6ffcd72 统一设备管理返回格式 4 anni fa
  konghl 46d45bf56c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 anni fa
  konghl b61fa21c4f 修改kafka配置文件 4 anni fa
  konghl 24f03b82fc 统一设备管理的返回格式 4 anni fa
  konghl 8c1bd0a40d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl d6c9ee7ac9 统一用户管理返回值 4 anni fa
  konghl 2667543ebe 修改人员信息返回值 4 anni fa
  konghl 33f605d78d Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master 4 anni fa
  konghl 8c6e6b34db 统一地图标记和终端管理的返回格式 4 anni fa
  konghl 6f5679bb9b 修改pom 4 anni fa
  konghl f8ec732c5e 配置kafka 4 anni fa
  wangchao 91cb23750d Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 7a19aa2489 加入uspa拦截器token验证 4 anni fa
  wangchao 605bfe142d Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 0307a3595b 用户管理删除和新增 4 anni fa
  wangchao 42c9ce12f2 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 2f12fb16fb 终端绑定 4 anni fa
  wangchao a4780fea36 后台项目初始化 4 anni fa
  wangchao 1d225203e0 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 7b5bd7fc8f 解绑查询关联关系 4 anni fa
  wangchao 5b7ada9d09 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 3abd9ac159 测试 4 anni fa
  wangchao 5c2edbe8f2 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 701921f2c7 设备管理分页查询的修改 4 anni fa
  wangchao d1e6198a6c 设备管理报错修改 4 anni fa
  wangchao cd2a9a0807 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 42136256e1 设备管理模块后台修改 4 anni fa
  konghl e5ac90e3cc 修改git忽略文件配置 4 anni fa
  konghl 173629f8c7 修改用户管理 4 anni fa
  konghl 8b50ef3257 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl 15425d68aa 用户管理功能修改 4 anni fa
  wangchao f4c0dc51b9 后台项目安防一体化系统初始化 4 anni fa
  konghl e9eb1c63df 修改工程,无错误 4 anni fa
  zhaolx5 12e2261ca9 初始化工程 4 anni fa
  wangchao 21a1d106ba Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao d53bf64414 修改项目结构 4 anni fa
  wangchao 10d36573b9 修改项目结构 4 anni fa
  wangkang3 657320fadd 提交 4 anni fa
  wangchao 993f22008d Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 1e6aae2459 修改设备添加数据库时间 4 anni fa
  konghl aa3a0f690d 实际报警初始化查询 4 anni fa
  konghl 3640ccd134 拆分properties配置文件 4 anni fa
  konghl 9afed3d1cd 修改镜屏名称、新增查询历史报警救援等 4 anni fa
  konghl 52a85f945f 修改日期工具类 4 anni fa
  wanyao ee205bc24c 回退 4 anni fa
  wanyao 16d1d23fee 主机启动慢的原因测试1 4 anni fa
  wangkang3 d34871ad0c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangkang3 57e2b527f0 修改镜屏uuid 4 anni fa
  wangkang3 a4f2b748b2 提交 4 anni fa
  wangkang3 07f3e9bb23 修改提交 4 anni fa
  konghl 499e7a7d94 合并海图参数 4 anni fa
  konghl fe61027787 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git 4 anni fa
  konghl 70691e3608 增加海图配置参数、重构数据推送、新增轨迹回放接口 4 anni fa
  konghl 510c6be0e7 修改人员定位功能数据订阅的解析 4 anni fa
  chenxr3 186e9e66f4 轨迹分析页面 4 anni fa
  wangchao 71ba3d6e50 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao eb6f6af53e 修改时间工具类与轨迹分析 4 anni fa
  wangchao dc4c59924a Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 1c6dc5d9cd 轨迹分析信息查询 4 anni fa
  chenxr3 69f534d648 地图标记绘制多边形颜色优化 4 anni fa
  konghl ea8cc62767 修改配置文件 4 anni fa
  wangchao ffb3b16b49 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 4f36bbe4f2 考勤方法的修改 4 anni fa
  wangchao 4ea204d4e4 考勤查询功能详情信息 4 anni fa
  wangchao 76ba12e88b Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 8088a9af4d 考勤查询功能 4 anni fa
  konghl 0824340e9c 修改人员定位功能 4 anni fa
  wangchao ceb2e684c3 测试批量插入 4 anni fa
  wangchao a19b9e2346 合并代码 4 anni fa
  wangchao d0cdba1219 Merge remote-tracking branch 'origin/master' 4 anni fa
  wangchao 14d32a62c0 删除终端时删除终端绑定关系 4 anni fa
  wangchao 1d834a772a 删除终端时删除终端绑定关系 4 anni fa
  chenxr3 8e19767361 设备类型标识格式更改 4 anni fa
  konghl b8a06cf6e6 添加人员的枚举值 4 anni fa
  konghl ec04cf2f49 删除.project文件 4 anni fa
  konghl 2e3c3b67ca 修改枚举位置 4 anni fa
  konghl 004b6f9498 新增定位推送,修改枚举类的位置 4 anni fa
  wangkang3 76ef98bf1e 代码提交 4 anni fa
  wangchao 63feb0d24b 终端管理页面加ui替换 4 anni fa
  wangchao e0572c53e1 关联终端,解绑终端修改,考勤管理架子编写 4 anni fa
  wangchao 9ff2237cbf 关联终端,解绑终端修改 4 anni fa
  wangchao 7acc72f757 关联终端,解绑终端修改 4 anni fa
  wangchao 332e05b5f4 关联终端,解绑终端修改 4 anni fa
  wangchao b7fe4ca37c 后台daoimpl的修改 4 anni fa
  konghl a3c4950238 修改字段 4 anni fa
  konghl 48cb0bbdfa 增加返回参数 4 anni fa
  konghl 429b4dbfa9 修改北向接口 4 anni fa
  konghl 2e0b6dcd44 增加业务常量 4 anni fa
  konghl 12d7573f2e 新增功能:地图标记增删改查 4 anni fa
  wangkang3 8f7b30e3be 地图标记模块接口接入 4 anni fa
  chenxr3 1013865ef3 设备管理页面 4 anni fa
  wangchao 97dca84162 修改设备验证 4 anni fa
  wangchao 0c9930d3e3 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangchao 8bd1ff2323 终端关联,终端解绑等接口 4 anni fa
  wangchao d01adabd91 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangchao d40c613702 修改gis接口等 4 anni fa
  wangchao 35550a3e47 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangchao bd86ba7a47 设备增删改查以及关联与解绑终端 4 anni fa
  wangchao a8c7c1cf4d 项目配置修改以及剔除uspa 4 anni fa
  wangchao c251472c3d gis获取token接口 4 anni fa
  wangchao fba9354c6a Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangchao 5ff38a7f9b 解决跨域问题 4 anni fa
  wangchao 74f666ab34 添加注释,增加轨迹文件等 4 anni fa
  wangchao 5f13388aac 修改地图管理文件 4 anni fa
  wangchao 41aea6126c Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangchao 24f1743496 按评审要求修改文件 4 anni fa
  wangchao 666c0f81c2 Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc 4 anni fa
  wangchao 779c6e3826 修改日志文件 4 anni fa
  wangchao 0e5599165c 修改日志文件 4 anni fa
  wangchao c217a49b3a 更新项目 4 anni fa
  wangchao 408a2042a9 后台项目初始化 4 anni fa
  wangkang3 7bbf8eb6a8 页面初始化提交 4 anni fa
  liuchang 000ebd90c9 更新文件 4 anni fa
  liuchang 46a262ab4b 删除 4 anni fa
  liuchang d1d76df146 更新提交 4 anni fa
  wanyao 1d2d95bc39 删除 4 anni fa
  wanyao f74da4a0dd 删除 4 anni fa
  wanyao b667fddfbc 初始化 4 anni fa

+ 7 - 4
security-protection-platform/src/api/aialarm/index.js

@ -3,15 +3,18 @@ const { $default, $http } = http
3 3

4 4
const api = {
5 5
  // 获取报警记录列表
6
  getaialarmlist (params) {
6
  getAiAlarmList (params) {
7 7
    return $default.get('/sp/aiAlarmManage/queryPageAiAlarm', params)
8 8
  },
9

9
  // 获取报警列表详情信息
10
  getAlarmDetail(id) {
11
    return $default.get('/sp/aiAlarmManage/queryOneAiAlarmInfo', id).catch((err) => { return err })
12
  },
10 13
  // 获取报警类型查询下拉框
11
  getaialarmtype () {
14
  getAiAlarmType () {
12 15
    return $default.get('/sp/charSpec/getCharSpecList?charSpecCode=AI_ALARM_TYPE')
13 16
  },
14
  getaialarmhandler () {
17
  getAiAlarmHandler () {
15 18
    return $http.get('/aialarm/getaialarmhandler')
16 19
  },
17 20
  dispose (params) {

+ 34 - 29
security-protection-platform/src/modules/aialarm/index.vue

@ -92,62 +92,62 @@
92 92
          <div class="detail">
93 93
            <label class="detail_title">状态:</label>
94 94
            <div class="detail_content">
95
              <t-tag v-if="currentdata.data.status==='INI'" state="warning">未确认</t-tag>
96
              <t-tag v-if="currentdata.data.status==='END'" state="success">已处理</t-tag>
97
              <t-tag v-if="currentdata.data.status==='RUN'" state="info">处理中</t-tag>
98
              <t-tag v-if="currentdata.data.status==='FAL'" state="danger">误报</t-tag>
95
              <t-tag v-if="alarmDetailData.status==='未确认'" state="warning">未确认</t-tag>
96
              <t-tag v-if="alarmDetailData.status==='已处理'" state="success">已处理</t-tag>
97
              <t-tag v-if="alarmDetailData.status==='处理中'" state="info">处理中</t-tag>
98
              <t-tag v-if="alarmDetailData.status==='误报'" state="danger">误报</t-tag>
99 99
            </div>
100 100

101 101
          </div>
102 102
          <div class="detail">
103 103
            <label class="detail_title">报警类型:</label>
104
            <div class="detail_content">{{ currentdata.data.alarmTypeName }}</div>
104
            <div class="detail_content">{{ alarmDetailData.alarmTypeCode || '' }}</div>
105 105
          </div>
106 106
          <div class="detail">
107 107
            <label class="detail_title">报警描述:</label>
108
            <div class="detail_content">{{ currentdata.data.alarmMemo }}</div>
108
            <div class="detail_content">{{ alarmDetailData.alarmMemo }}</div>
109 109
          </div>
110 110
          <div class="detail">
111 111
            <label class="detail_title">报警时间:</label>
112
            <div class="detail_content">{{ currentdata.data.aiIdenTime }}</div>
112
            <div class="detail_content">{{ alarmDetailData.aiIdenTime }}</div>
113 113
          </div>
114 114

115 115
          <div class="detail">
116 116
            <label class="detail_title">设备编号:</label>
117
            <div class="detail_content">{{ currentdata.data.resourceToolCode }}</div>
117
            <div class="detail_content">{{ alarmDetailData.resourceToolCode }}</div>
118 118
          </div>
119 119
          <div class="detail">
120 120
            <label class="detail_title">设备位置:</label>
121
            <div class="detail_content">{{ currentdata.data.monitorSceneName }}</div>
121
            <div class="detail_content">{{ alarmDetailData.monitorSceneName }}</div>
122 122
          </div>
123 123

124
          <div class="detail">
124
          <div v-if="alarmDetailData.workEmployeeRoleId!==null" class="detail">
125 125
            <label class="detail_title">处理人:</label>
126
            <div class="detail_content">{{ currentdata.data.workEmployeeRoleName }}</div>
126
            <div class="detail_content">{{ alarmDetailData.workEmployeeRoleName }}</div>
127 127
          </div>
128 128

129
          <div class="detail">
129
          <div v-if="alarmDetailData.workEmployeeRoleId!==null" class="detail">
130 130
            <label class="detail_title">处理时间:</label>
131
            <div>{{ currentdata.data.processTime }}</div>
131
            <div>{{ alarmDetailData.doneDate }}</div>
132 132
          </div>
133 133
        </div>
134 134

135 135
        <div class="details_item2">
136 136
          <div>
137 137
            <div>识别图片</div>
138
            <div><img :src="currentdata.data.idenPictureUrl" alt="" srcset="" style="width:100%;height:100%"></div>
138
            <div><img :src="pictureDetailData.fileUrl" alt="" srcset="" style="width:100%;height:100%"></div>
139 139
          </div>
140 140
          <div>
141 141
            <div>识别视频</div>
142 142
            <div>
143
              <video :src="currentdata.data.idenVideoUrl" class="video" controls></video>
143
              <video :src="videoDetailData.videoFileUrl" class="video" controls></video>
144 144
            </div>
145 145
          </div>
146 146
        </div>
147 147
        <div v-if="clickdetail==1">
148
          <div v-if="currentdata.data.status!='END'" class="radio">
148
          <div v-if="alarmDetailData.status!='END'" class="radio">
149 149
            <div>报警处理 : </div>
150
            <div v-if="currentdata.data.status=='INI'">
150
            <div v-if="alarmDetailData.status=='INI'">
151 151
              <t-radio-group v-model="status">
152 152
                <t-radio label="RUN">
153 153

@ -161,7 +161,7 @@
161 161
              </t-radio-group>
162 162
            </div>
163 163

164
            <div v-if="currentdata.data.status=='RUN'||currentdata.data.status=='FAL'">
164
            <div v-if="alarmDetailData.status=='RUN'||alarmDetailData.status=='FAL'">
165 165
              <t-radio-group v-model="status">
166 166
                <t-radio label="END">关闭</t-radio>
167 167
              </t-radio-group>
@ -214,6 +214,12 @@ export default {
214 214
        index: '',
215 215
        data: {}
216 216
      },
217
      // 报警详情数据
218
      alarmDetailData: {},
219
      // 图片详情数据
220
      pictureDetailData: {},
221
      // 视频详情数据
222
      videoDetailData: {},
217 223
      // 选择的数据
218 224
      selectdata: [],
219 225
      // 判断是详情还是处理
@ -255,18 +261,20 @@ export default {
255 261
      // console.log(val)
256 262
      this.selectdata = val
257 263
    },
258

259 264
    // 点击详情
260
    handleClick (scope, val) {
265
    async handleClick (scope, val) {
261 266
      this.clickdetail = val
262 267
      // 去除模态框中的单选项
263

268
      let res = await aialarmapi.getAlarmDetail({params: {'workTaskId': scope.row.workTaskId}})
269
      if (res.status === 200) {
270
        this.alarmDetailData = res.data.data.alarmInfo
271
        this.pictureDetailData = res.data.data.pictureInfo
272
        this.videoDetailData = res.data.data.videoInfo
273
      } else { this.$Message.danger('处理失败') }
264 274
      this.status = ''
265

266 275
      this.details_modal = true // 打开模态框
267
      this.currentdata.data = scope.row // 获取当前行的数据
276
      // this.currentdata.data = scope.row // 获取当前行的数据
268 277
      this.currentdata.index = scope.$index // 获取当前行的索引
269
      // console.log(this.currentdata.data)
270 278
    },
271 279

272 280
    // 未确认状态的模态框的确认按钮 || 处理中状态的模态框的确认按钮
@ -278,7 +286,6 @@ export default {
278 286
        // 向后端发送数据
279 287
        this.alarmdispose(this.currentdata.data.workTaskId, this.status)
280 288
        // console.log(this.status)
281
        // console.log(this.currentdata.data.workTaskId)
282 289
        // 关闭模态框
283 290
        this.details_modal = false
284 291
      } else {
@ -293,7 +300,6 @@ export default {
293 300
      // console.log(res)
294 301
      if (res.status === 200) {
295 302
        this.$Message.success('操作成功')
296
        // console.log(res.data.data)
297 303
        this.data[this.currentdata.index].status = res.data.data.status
298 304
        this.data[this.currentdata.index].processTime = res.data.data.doneDate
299 305
      } else {
@ -318,7 +324,7 @@ export default {
318 324

319 325
    // 获取报警类型
320 326
    async gettype () {
321
      var res = await aialarmapi.getaialarmtype()
327
      var res = await aialarmapi.getAiAlarmType()
322 328
      // console.log(res)
323 329
      if (res.status === 200) {
324 330
        // this.alarmtypelist = res.data.data
@ -338,14 +344,13 @@ export default {
338 344
        params.pageNumber = this.page
339 345
        params.pageSize = this.limit
340 346

341
        var res = await aialarmapi.getaialarmlist({
347
        var res = await aialarmapi.getAiAlarmList({
342 348
          params: params
343 349
        })
344 350

345 351
        // console.log(res)
346 352
        if (res.status === 200) {
347 353
          this.data = res.data.data.data
348
          // console.log('数据是:', this.data)
349 354
          this.data = this.data.map((item) => { item.aiIdenTime = formatDateTime(item.aiIdenTime); return item })
350 355
          // console.log(this.data)
351 356


+ 1 - 1
security-protection-platform/src/modules/videoSurveillance/components/ReplayDialog/index.vue

@ -1,5 +1,5 @@
1 1
<template>
2
  <t-modal :visibled.sync="visible" :header-visibled="false" :footer-visibled="false" :no-padding="true" width="100%">
2
  <t-modal :visibled.sync="visible" :header-visibled="false" :footer-visibled="false" :no-padding="true" width="90%">
3 3
    <div class="replayer">
4 4
      <div class="replayer-list">
5 5
        <div class="date-select-box row-12">