wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

bug修复

This commit is contained in:
wuhongjian 2022-08-09 17:09:58 +08:00
parent b1c6383f31
commit 5a32f96150
10 changed files with 195 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
front/public/index.html
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-06 10:42:44 * @LastEditTime: 2022-08-09 11:47:38
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -48,17 +48,18 @@
// window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
// window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 西海岸版本 // 西海岸版本
window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '10.134.135.9:8888/renren-admin';
// window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
// 开发 // 开发
// window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
// window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
// window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
// window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
// window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin'; window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
// window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本 // 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';

6
front/public/static/config/location.js
View File

@ -2,12 +2,12 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-06 10:43:53 * @LastEditTime: 2022-08-09 11:46:27
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
const newLocation = 'xihaian' const newLocation = 'qingdao'
// const newLocation = 'baotou' // const newLocation = 'baotou'
// const newLocation = 'xihaian' //const newLocation = 'xihaian'
// 数据资源数据 // 数据资源数据
const whoShow = {} const whoShow = {}

BIN
front/src/assets/home/video-background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
front/src/assets/newHome/ucs-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
front/src/assets/newHome/ucs-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 62 KiB

69
front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-08 11:56:28 * @Date: 2022-06-08 11:56:28
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-19 15:04:02 * @LastEditTime: 2022-08-09 11:54:40
* @Description: 算法详情页头部 * @Description: 算法详情页头部
--> -->
<template> <template>
@ -54,7 +54,15 @@
<template #icon><form-outlined /></template> <template #icon><form-outlined /></template>
申请使用 申请使用
</a-button> </a-button>
<a-button type="primary" @click="addShoppingCart()"> <a-button
type="primary"
@click="addShoppingCart()"
v-show="
props.dataList.infoList.filter(
(val) => val.attrType == '外部服务地址'
).length === 0
"
>
<template #icon><shopping-cart-outlined /></template> <template #icon><shopping-cart-outlined /></template>
加入申购车 加入申购车
</a-button> </a-button>
@ -105,30 +113,37 @@
// 立即申请 // 立即申请
function toView() { function toView() {
// window.open(newpage.href, '_blank') // window.open(newpage.href, '_blank')
console.log('一键申请===================>', props.dataList) const webUrl = props.dataList.infoList.filter(
localStorage.setItem( (val) => val.attrType == '外部服务地址'
'applyList', )[0]?.attrValue
JSON.stringify([ if (webUrl) {
{ window.open(webUrl)
arr: [ } else {
{ console.log('一键申请===================>', props.dataList)
delFlag: props.dataList.delFlag, localStorage.setItem(
description: props.dataList.description, 'applyList',
resourceId: props.dataList.id, JSON.stringify([
resourceName: props.dataList.name, {
time: props.dataList.createDate, arr: [
type: props.dataList.type, {
componentType: '图层服务', delFlag: props.dataList.delFlag,
}, description: props.dataList.description,
], resourceId: props.dataList.id,
deptId: props.dataList.deptId, resourceName: props.dataList.name,
deptName: props.dataList.deptName, time: props.dataList.createDate,
}, type: props.dataList.type,
]) componentType: '图层服务',
) },
router.push({ ],
path: '/apply', deptId: props.dataList.deptId,
}) deptName: props.dataList.deptName,
},
])
)
router.push({
path: '/apply',
})
}
} }
// 收藏 // 收藏
const scFlag2 = ref(true) const scFlag2 = ref(true)

27
front/src/views/home/components/header.vue
View File

@ -9,7 +9,10 @@
<div class="name"> <div class="name">
<div class="name-bg" v-if="!whoShow1.itShowXiHaiAn"></div> <div class="name-bg" v-if="!whoShow1.itShowXiHaiAn"></div>
<div class="name-bg-xihaian" v-else></div> <div class="name-bg-xihaian" v-else></div>
城市云脑通用能力服务平台 <div class="name-content">
<p>城市云脑通用能力服务平台</p>
<p>(United Capacity System)</p>
</div>
</div> </div>
<div <div
v-for="item in navList" v-for="item in navList"
@ -360,7 +363,7 @@
.name-bg { .name-bg {
height: 0.6rem; height: 0.6rem;
width: 0.6rem; width: 0.6rem;
background: url('~@/assets/newHome/newHome-title-bg.png') no-repeat; background: url('~@/assets/newHome/ucs-2.png') no-repeat;
background-size: 100%; background-size: 100%;
margin-right: 0.15rem; margin-right: 0.15rem;
} }
@ -372,6 +375,16 @@
background-size: 100%; background-size: 100%;
margin-right: 0.15rem; margin-right: 0.15rem;
} }
.name-content {
padding-top: 0.14rem;
p {
font-size: 0.2rem;
margin-bottom: 0;
&:nth-of-type(2) {
font-size: 0.12rem;
}
}
}
} }
.nav { .nav {
width: 1.2rem; width: 1.2rem;
@ -432,6 +445,16 @@
box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1); box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
.name { .name {
color: #0058e1; color: #0058e1;
.name-bg {
height: 0.6rem;
width: 0.6rem;
background: url('~@/assets/newHome/ucs-1.png') no-repeat;
background-size: 100%;
margin-right: 0.15rem;
}
p {
color: #0058e1;
}
} }
.icon { .icon {
cursor: pointer; cursor: pointer;

75
front/src/views/home/components/searchResultList.vue
View File

@ -321,10 +321,14 @@
</div> --> </div> -->
</div> </div>
<div class="right" v-if="selectCardsname !== '基础设施'"> <div class="right" v-if="selectCardsname !== '基础设施'">
<!-- 申购车 -->
<div class="shopping" :key="shoppingKey"> <div class="shopping" :key="shoppingKey">
<template <template
v-if=" v-if="
selectCardsname == '组件服务' || (selectCardsname == '组件服务' &&
item.infoList.filter(
(val) => val.attrType == '外部服务地址'
).length === 0) ||
(selectCardsname == '应用资源' && whoShow1.itShowQingDao) (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
" "
> >
@ -649,37 +653,46 @@
}) })
} else { } else {
if (type === 'apply') { if (type === 'apply') {
console.log('一键申请===================>', item) // 外部服务地址跳转到外部
localStorage.setItem( const webUrl = item.infoList.filter(
'applyList', (val) => val.attrType == '外部服务地址'
JSON.stringify([ )[0]?.attrValue
{ if (webUrl) {
arr: [ window.open(webUrl)
{ } else {
delFlag: item.delFlag, // 内部跳转申请页面
description: item.description, console.log('一键申请===================>', item)
resourceId: item.id, localStorage.setItem(
resourceName: item.name, 'applyList',
time: item.createDate, JSON.stringify([
type: item.type, {
componentType: arr: [
(item.infoList.filter( {
(val) => val.attrType == '组件类型' delFlag: item.delFlag,
)[0] && description: item.description,
item.infoList.filter( resourceId: item.id,
resourceName: item.name,
time: item.createDate,
type: item.type,
componentType:
(item.infoList.filter(
(val) => val.attrType == '组件类型' (val) => val.attrType == '组件类型'
)[0].attrValue) || )[0] &&
'', item.infoList.filter(
}, (val) => val.attrType == '组件类型'
], )[0].attrValue) ||
deptId: item.deptId, '',
deptName: item.deptName, },
}, ],
]) deptId: item.deptId,
) deptName: item.deptName,
router.push({ },
path: '/apply', ])
}) )
router.push({
path: '/apply',
})
}
} else { } else {
console.log( console.log(
'111111111111111111===========>', '111111111111111111===========>',

77
front/src/views/home/infrastructurePage.vue
View File

@ -149,9 +149,10 @@
</div> </div>
<!-- 单个预览弹窗 --> <!-- 单个预览弹窗 -->
<a-modal <a-modal
wrapClassName="single-preview-modal"
v-model:visible="visible" v-model:visible="visible"
title="视频预览" title="视频预览"
:width="950" :width="960"
destroyOnClose destroyOnClose
> >
<template #footer></template> <template #footer></template>
@ -166,7 +167,7 @@
wrapClassName="batch-preview-modal" wrapClassName="batch-preview-modal"
v-model:visible="batchVisible" v-model:visible="batchVisible"
title="视频批量预览" title="视频批量预览"
:width="1250" :width="1060"
destroyOnClose destroyOnClose
@cancel="videoClean" @cancel="videoClean"
> >
@ -177,9 +178,18 @@
:key="item.id" :key="item.id"
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
> >
<p></p>
<vue3VideoPlay v-bind="item.options" /> <vue3VideoPlay v-bind="item.options" />
</div> </div>
</div> </div>
<a-pagination
v-model:current="current"
:total="videoTotal"
defaultPageSize="4"
:showSizeChanger="false"
@change="batchPreview"
show-less-items
/>
</a-modal> </a-modal>
<a-modal <a-modal
wrapClassName="wrj" wrapClassName="wrj"
@ -255,11 +265,13 @@
import { getCameraByCondition } from '@/api/file' import { getCameraByCondition } from '@/api/file'
import { sgcInsert } from '@/api/home' import { sgcInsert } from '@/api/home'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const current = ref(1)
const videoTotal = ref(0)
const router = useRouter() const router = useRouter()
const whoShow1 = ref(whoShow) const whoShow1 = ref(whoShow)
const options = reactive({ const options = reactive({
width: '900px', //播放器宽度 width: '912px', //播放器宽度
height: '400px', //播放器高度 height: '513px', //播放器高度
color: '#409eff', //主题色 color: '#409eff', //主题色
title: '', //视频名称 title: '', //视频名称
src: '', //视频源 src: '', //视频源
@ -579,9 +591,16 @@
} }
} }
} }
const batchPreview = async function () { const batchPreview = async function (page) {
if (page.layerX) {
page = 1
}
if (selectedList.value.length > 0) { if (selectedList.value.length > 0) {
const list = selectedList.value.splice(0, 4) videoTotal.value = selectedList.value.length
const arr = JSON.parse(JSON.stringify(selectedList.value))
let start = (page - 1) * 4
let list = []
list = arr.splice(start, 4)
const length = list.length const length = list.length
videoList.value = [] videoList.value = []
for (let index = 0; index < length; index++) { for (let index = 0; index < length; index++) {
@ -590,8 +609,8 @@
} }
let ob = { let ob = {
options: { options: {
width: '600px', //播放器宽度 width: '512px', //播放器宽度
height: '350px', //播放器高度 height: '288px', //播放器高度
color: '#409eff', //主题色 color: '#409eff', //主题色
title: '', //视频名称 title: '', //视频名称
src: '', //视频源 src: '', //视频源
@ -651,7 +670,10 @@
selectedList.value = [] selectedList.value = []
selectedRowKeys.value = [] selectedRowKeys.value = []
videoList.value = [] videoList.value = []
current.value = 1
} }
// 改变批量预览的分页
const changePage = (page) => {}
// 一键申请 // 一键申请
const dept = reactive({}) const dept = reactive({})
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
@ -712,6 +734,14 @@
longitude: mapSearchParam.value.gpsX || '', longitude: mapSearchParam.value.gpsX || '',
latitude: mapSearchParam.value.gpsY || '', latitude: mapSearchParam.value.gpsY || '',
radius: mapSearchParam.value.radius || '', radius: mapSearchParam.value.radius || '',
status: 1,
}
if (
params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
!params.name &&
!params.longitude
) {
params.status = ''
} }
let paramsFather = '' let paramsFather = ''
let i = 1 let i = 1
@ -1000,6 +1030,20 @@
overflow-y: scroll !important; overflow-y: scroll !important;
} }
} }
.single-preview-modal {
.ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat;
background-size: cover;
}
.ant-modal-title {
font-size: 0.16rem;
font-weight: 500;
color: #ffffff;
}
.anticon {
color: #ffffff;
}
}
.batch-preview-modal { .batch-preview-modal {
.batch-video { .batch-video {
width: 100%; width: 100%;
@ -1007,8 +1051,23 @@
grid-template-columns: 50% 50%; grid-template-columns: 50% 50%;
grid-template-rows: 50% 50%; grid-template-rows: 50% 50%;
justify-content: center; justify-content: center;
grid-row-gap: 14px; // grid-row-gap: 14px;
grid-column-gap: 20px; grid-column-gap: 20px;
} }
.ant-pagination-item-link {
background-color: #5580f7;
}
.ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat;
background-size: cover;
}
.ant-modal-title {
font-size: 0.16rem;
font-weight: 500;
color: #ffffff;
}
.anticon {
color: #ffffff;
}
} }
</style> </style>

1
front/src/views/home/videoSurveillance/index.vue
View File

@ -226,6 +226,7 @@
longitude: this.mapSearchParam.gpsX || '', longitude: this.mapSearchParam.gpsX || '',
latitude: this.mapSearchParam.gpsY || '', latitude: this.mapSearchParam.gpsY || '',
radius: this.mapSearchParam.radius || '', radius: this.mapSearchParam.radius || '',
status: 1,
} }
let paramsFather = '' let paramsFather = ''
let i = 1 let i = 1