bug修复
This commit is contained in:
parent
f47d964105
commit
c8e1881fae
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-03-29 16:45:25
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-06-30 19:06:47
|
||||
* @LastEditTime: 2022-06-30 21:21:10
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 穿透版本
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-04-01 19:19:40
|
||||
* @LastEditors: hisense.liangjunhua
|
||||
* @LastEditTime: 2022-06-30 18:03:17
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-06-30 19:36:48
|
||||
* @Description: 告诉大家这是什么
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
|
|
@ -322,3 +322,10 @@ export function selectInfrastructureList(params) {
|
|||
params,
|
||||
})
|
||||
}
|
||||
// 根据instanceId获取摄像头列表
|
||||
export function getApplyCameraList(id) {
|
||||
return request({
|
||||
url: '/resource/getApplyCameraList/' + id,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
<span>{{ pagination.total }}</span>
|
||||
个
|
||||
</p>
|
||||
<i class="boundary"></i>
|
||||
<!-- <i class="boundary"></i> -->
|
||||
<p>
|
||||
已选
|
||||
<span>{{ selectedRowKeys.length }}</span>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@
|
|||
<a-tooltip>
|
||||
<template #title>{{ item.name }}</template>
|
||||
<div class="content-body-title">
|
||||
名称：{{ item.name }}
|
||||
<span v-if="item.name ==='申请摄像头列表'" @click="showVideoList(item)"> 名称：{{ item.name }} </span>
|
||||
<span v-else> 名称：{{ item.name }} </span>
|
||||
<div></div>
|
||||
</div>
|
||||
</a-tooltip>
|
||||
|
|
@ -71,7 +72,8 @@
|
|||
</div>
|
||||
<div v-else>
|
||||
<p class="content-body-content-son">
|
||||
申请结果：{{ item.comment || '暂无' }}
|
||||
<span v-if="item.name ==='申请摄像头列表'">申请结果：{{ '列表地址：' + backUrl + 'resource/getApplyCameraList/' + item.processInstanceId+';'+ '视频流地址：'+backUrl + '/resource/hls/getHls/?channelId='}}</span>
|
||||
<span v-else>申请结果：{{ item.comment || '暂无' }}</span>
|
||||
<a-button
|
||||
type="primary"
|
||||
size="small"
|
||||
|
|
@ -220,6 +222,19 @@
|
|||
>
|
||||
<a-input v-model:value="reason" placeholder="请输入下架原因" />
|
||||
</a-modal>
|
||||
<a-modal
|
||||
v-model:visible="videoVisible"
|
||||
title="已申请摄像头列表"
|
||||
@ok="videoVisible=false"
|
||||
>
|
||||
<a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{defaultPageSize: 6}">
|
||||
<template #bodyCell="{ column, text }">
|
||||
<!-- <template>
|
||||
<a>{{ text }}</a>
|
||||
</template> -->
|
||||
</template>
|
||||
</a-table>
|
||||
</a-modal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -231,7 +246,7 @@
|
|||
getTaskHandleDetailInfo,
|
||||
// getProcDefBizRoute,
|
||||
} from '@/api/personalCenter'
|
||||
import { updateRes, relaunch, selectOne } from '@/api/home'
|
||||
import { updateRes, relaunch, selectOne,getApplyCameraList } from '@/api/home'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { message } from 'ant-design-vue'
|
||||
import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
|
||||
|
|
@ -241,6 +256,40 @@
|
|||
// const contentListClone = reactive({ data: [] })
|
||||
// let contentListLength = contentList.length
|
||||
let tabIndex = ref(0)
|
||||
const videoVisible = ref(false)
|
||||
const columns = ref([{
|
||||
title: '摄像头名称',
|
||||
dataIndex: 'name'
|
||||
}])
|
||||
const xVideoList = ref([{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},{
|
||||
name: '111'
|
||||
}, {
|
||||
name: '222'
|
||||
},])
|
||||
function tabqiehuan(item, index) {
|
||||
// debugger
|
||||
tabIndex.value = index
|
||||
|
|
@ -272,6 +321,7 @@
|
|||
const visible = ref(false)
|
||||
const delObj = ref({})
|
||||
const taskId = ref('')
|
||||
const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
|
||||
const showDetail = (item) => {
|
||||
console.log('showDetail', item)
|
||||
// getProcDefBizRoute(item.processDefinitionId)
|
||||
|
|
@ -281,6 +331,12 @@
|
|||
processInstanceId.value = item.processInstanceId
|
||||
resourceId.value = item.resourceId
|
||||
}
|
||||
const showVideoList = (item) => {
|
||||
// getApplyCameraList(item.processInstanceId).then(res=>{
|
||||
// console.log('res', res)
|
||||
// })
|
||||
videoVisible.value = true
|
||||
}
|
||||
const copyComment = (data) => {
|
||||
let url = data
|
||||
let oInput = document.createElement('input')
|
||||
|
|
|
|||
Loading…
Reference in New Issue