qichengbin/erqi-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
zhangmj
2025-12-26 00:36:13 +08:00
parent 0447e8691f ebb9ac4ac0
commit 90187fcccf
4 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/identification.js
View File

@@ -10,7 +10,7 @@ export const videoIdentificationPage = (data) => {
return request({
url: '/videoIdentification/findByPage',
method: 'post',
data: data
params: data
})
}
/**

4
src/views/business/alarm/list.vue
View File

@@ -39,7 +39,7 @@
import SubtitleComponent from '@/components/SubtItle/index.vue'
import { reactive, ref } from 'vue'
import useMapStore from '@/store/modules/map'
import { videoIdentificationFindByPage } from '@/api/alarm'
import { videoIdentificationPage } from '@/api/identification.js'
const mapStore = useMapStore()
const tabs = [
@@ -76,7 +76,7 @@ const initData = () => {
pageNo: 1,
pageSize: 20
}
videoIdentificationFindByPage(params).then(res => {
videoIdentificationPage(params).then(res => {
if(res.success) {
data.value = res.result.records
}else {

10
src/views/business/identification/alarm/detail.vue
View File

@@ -33,7 +33,7 @@
<script setup>
import { ref, reactive } from 'vue'
import { ElMessage } from 'element-plus'
// import { updateVideoIdentification } from '@/api/identification.js'
import { updateVideoIdentification } from '@/api/identification.js'
const emit = defineEmits([ 'close' ])
const props = defineProps({
@@ -227,10 +227,10 @@ const submit = () => {
...model,
illegalType: model.illegalType.join(',')
}
// updateVideoIdentification(params).then(res => {
// ElMessage.success(res.msg)
// emit('close', true)
// })
updateVideoIdentification(params).then(res => {
ElMessage.success(res.msg)
emit('close', true)
})
}

168
src/views/business/identification/alarm/index.vue
View File

@@ -91,6 +91,7 @@ import { nextTick, onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from
import TableComponent from '@/components/Table/index2.vue'
import TitleComponent from '@/components/Title/index.vue'
import { videoIdentificationPage, removeVideoIdentification } from '@/api/identification.js'
import HikPlayerBackCom from '@/components/Player/HikPlayer-back.vue'
import { dayjs, ElMessage, ElMessageBox } from 'element-plus'
import { useRoute } from 'vue-router'
@@ -337,99 +338,100 @@ const edit = reactive({
const initData = () => {
loading.value = true
// const params = new FormData()
// const obj = {
// ...model,
// // illegalType: illegalType.value.join(','),
// illegalType: illegalType.value,
// beginTime: model.time && model.time[0] ? model.time[0] : '',
// endTime: model.time && model.time[1] ? model.time[1] : '',
// pageNo: pagination.current,
// pageSize: pagination.size
// }
// delete obj.time
const params = new FormData()
const obj = {
...model,
// illegalType: illegalType.value.join(','),
illegalType: illegalType.value,
beginTime: model.time && model.time[0] ? model.time[0] : '',
endTime: model.time && model.time[1] ? model.time[1] : '',
pageNo: pagination.current,
pageSize: pagination.size
}
delete obj.time
// Object.keys(obj).forEach((key) => {
// params.append(key, obj[key])
// })
// videoIdentificationPage(params).then(res => {
// if (res.success) {
// tableData.value = res.result.records.map(i => {
// return {
// ...i,
// illegalType: i.illegalType.split(',').map(j => {
// return {
// value: illegalTypes.find(type => type.value === j)?.prop,
// label: j
// }
// })
// }
// })
// pagination.total = res.result.total
// // 有识别记录数据，默认查看第一条详情
// handle('check', res.result.total > 0 ? tableData.value[0] : {})
// } else {
// ElMessage.error(res.msg || '查询失败！')
// }
// }).finally(() => {
loading.value = false
// })
tableData.value = [
{
'aisStatus': '未开启',
'belongPort': '',
'boatCodePath': '',
'boatName': '浙周田货0998',
'boatNameEn': 'WUCHUANHAO',
'cog': '0',
'createAt': '2025-12-01 11:04:44',
'createBy': '',
'crossLineTime': null,
'delFlag': 0,
'distance': null,
'draftMarks': null,
'entryOut': '',
'height': 0.00000000,
'heightRange': '',
'hkResult': '',
'id': 76168,
'identificationType': '',
'illegalType': '未穿救生衣预警,未封舱预警,未悬挂国旗',
'isCloseDoor': '否',
'isHasAis': '否',
'jacketStatus': '',
'latitude': null,
'length': 0.00000000,
'longitude': null,
'mmsi': '413823183',
'shipType': '集装箱船',
'sourcePicPath': 'http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_1_20251201_110559_644.jpg',
'speed': null,
'streetName': '',
'sysShipName': '',
'sysUpdateName': '',
'systemResult': '',
'takeTime': '2025-12-23 11:06:08',
'takeType': '卡口',
'trackerPicPath': 'http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_1_20251201_110559_644.jpg,http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_2_20251201_110603_161.jpg,http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_3_20251201_110605_535.jpg,http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_4_20251201_110608_298.jpg',
'updateAt': '2025-12-01 11:04:44',
'updateBy': '',
'videoCode': 'fd3b45e1429a4e47bba873af602a9bed',
'videoName': '卧旗--雷云一体机',
'videoUrl': '',
'width': 0.00000000
}, {}
].map(i => {
return {
...i,
illegalType: i.illegalType?.split(',').map(j => {
videoIdentificationPage(obj).then(res => {
if (res.success) {
tableData.value = res.result.records.map(i => {
return {
...i,
illegalType: i.illegalType.split(',').map(j => {
return {
value: illegalTypes.find(type => type.value === j)?.prop,
label: j
}
})
}
})
pagination.total = res.result.total
// 有识别记录数据，默认查看第一条详情
handle('check', res.result.total > 0 ? tableData.value[0] : {})
} else {
ElMessage.error(res.msg || '查询失败！')
}
}).finally(() => {
loading.value = false
})
handle('check', tableData.value.length > 0 ? tableData.value[0] : {})
// tableData.value = [
// {
// 'aisStatus': '未开启',
// 'belongPort': '',
// 'boatCodePath': '',
// 'boatName': '浙周田货0998',
// 'boatNameEn': 'WUCHUANHAO',
// 'cog': '0',
// 'createAt': '2025-12-01 11:04:44',
// 'createBy': '',
// 'crossLineTime': null,
// 'delFlag': 0,
// 'distance': null,
// 'draftMarks': null,
// 'entryOut': '',
// 'height': 0.00000000,
// 'heightRange': '',
// 'hkResult': '',
// 'id': 76168,
// 'identificationType': '',
// 'illegalType': '未穿救生衣预警,未封舱预警,未悬挂国旗',
// 'isCloseDoor': '否',
// 'isHasAis': '否',
// 'jacketStatus': '',
// 'latitude': null,
// 'length': 0.00000000,
// 'longitude': null,
// 'mmsi': '413823183',
// 'shipType': '集装箱船',
// 'sourcePicPath': 'http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_1_20251201_110559_644.jpg',
// 'speed': null,
// 'streetName': '',
// 'sysShipName': '',
// 'sysUpdateName': '',
// 'systemResult': '',
// 'takeTime': '2025-12-23 11:06:08',
// 'takeType': '卡口',
// 'trackerPicPath': 'http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_1_20251201_110559_644.jpg,http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_2_20251201_110603_161.jpg,http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_3_20251201_110605_535.jpg,http://198.16.74.209:6060/pic/2025-12-01/198.16.74.187/20251201_110559/ship_4_20251201_110608_298.jpg',
// 'updateAt': '2025-12-01 11:04:44',
// 'updateBy': '',
// 'videoCode': 'fd3b45e1429a4e47bba873af602a9bed',
// 'videoName': '卧旗--雷云一体机',
// 'videoUrl': '',
// 'width': 0.00000000
// }, {}
// ].map(i => {
// return {
// ...i,
// illegalType: i.illegalType?.split(',').map(j => {
// return {
// value: illegalTypes.find(type => type.value === j)?.prop,
// label: j
// }
// })
// }
// })
// handle('check', tableData.value.length > 0 ? tableData.value[0] : {})
}
const changeRadio = () => {
nextTick(() => {