diff --git a/front/public/index.html b/front/public/index.html
index f76fb049..184e2fb1 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -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: 告诉大家这是什么
-->
@@ -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';
diff --git a/front/src/api/home.js b/front/src/api/home.js
index fbc1578f..2f536134 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -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',
+ })
+}
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 15f9cf34..8f791563 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -34,7 +34,7 @@
{{ pagination.total }}
个
-
+
已选
{{ selectedRowKeys.length }}
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index dfa3d105..bc685583 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -48,7 +48,8 @@
{{ item.name }}
- 名称：{{ item.name }}
+
名称：{{ item.name }}
+
名称：{{ item.name }}
- 申请结果：{{ item.comment || '暂无' }}
+ 申请结果：{{ '列表地址：' + backUrl + 'resource/getApplyCameraList/' + item.processInstanceId+';'+ '视频流地址：'+backUrl + '/resource/hls/getHls/?channelId='}}
+ 申请结果：{{ item.comment || '暂无' }}
+
+
+
+
+
+
+
@@ -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')