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

暂存 staged

This commit is contained in:
gongjiale 2022-11-21 12:26:18 +08:00
parent 3e225ddce2 cde4f5d82e
commit e1905140f4
13 changed files with 343 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
back/public/config/basicConfig.js
View File

@ -7,45 +7,45 @@
*/
var _global = {}
var CONFIGITEM = {
// version: 'qingdao', // 青岛
// version: 'xihaian', // 西海岸
version: 'dev', // 测试
// version: 'frp', // 内网穿透
// version: 'xihaian', // 开发
vNum: 'v0.8.7.2',
configData: {
// 青岛市大数据局
qingdao: {
previewUrl: 'http://15.72.183.90:7008/',
apiURL: 'http://15.72.183.90:8000/ucs-admin',
websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
},
// 西海岸大数据局
xihaian: {
previewUrl: 'http://10.134.135.9:9796/',
// apiURL: 'http://10.134.135.9:8888/ucs-admin',
// apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
apiURL: 'http://192.168.124.236:8888/ucs-admin',
// apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
},
// 测试
test: {
previewUrl: 'http://192.168.124.243:9796/',
apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
},
// 内网穿透
frp: {
previewUrl: 'http://124.222.94.39:9796/',
apiURL: 'http://124.222.94.39:8888/ucs-admin',
websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
},
dev: {
previewUrl: 'http://localhost:8080/',
apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
// version: 'qingdao', // 青岛
// version: 'xihaian', // 西海岸
version: 'dev', // 测试
// version: 'frp', // 内网穿透
// version: 'xihaian', // 开发
vNum: 'v0.8.7.2',
configData: {
// 青岛市大数据局
qingdao: {
previewUrl: 'http://15.72.183.90:7008/',
apiURL: 'http://15.72.183.90:8000/ucs-admin',
websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
},
// 西海岸大数据局
xihaian: {
previewUrl: 'http://10.134.135.9:9796/',
// apiURL: 'http://10.134.135.9:8888/ucs-admin',
// apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
apiURL: 'http://192.168.124.236:8888/ucs-admin',
// apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
},
// 测试
test: {
previewUrl: 'http://192.168.124.243:9796/',
apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
},
// 内网穿透
frp: {
previewUrl: 'http://124.222.94.39:9796/',
apiURL: 'http://124.222.94.39:8888/ucs-admin',
websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
},
dev: {
previewUrl: 'http://localhost:8080/',
apiURL: 'http://192.168.124.233:8888/ucs-admin',
websocketURL: 'ws://192.168.124.233:8888/ucs-admin/websocket'
}
}
}
}
_global.config = CONFIGITEM.configData[CONFIGITEM.version]
_global.config = CONFIGITEM.configData[CONFIGITEM.version]

229
front/public/static/config/basicConfig.js
View File

@ -7,122 +7,117 @@
*/
var _global = {}
var CONFIGITEM = {
// version: 'qingdao', //青岛
// version: 'xihaian', // 西海岸
version: 'dev', // 开发
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
// version: 'qingdao', // 测试
//version: 'frp', // 内网穿透
vNum: 'v0.8.15.2',
configData: {
// 青岛市大数据局
qingdao: {
loginInfo: {
// 视频平台登陆信息
loginIp: '10.132.191.3',
loginPort: '8320',
userName: 'ynszdz',
userPwd: 'Admin@123',
},
backUrl: 'http://15.72.183.90:8001',
previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
apiURL: 'http://15.72.183.90:8000/ucs-admin',
websocketURL: '15.72.183.90:8000/ucs-admin',
// websocketURL: '192.168.124.233:8888/ucs-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
// version: 'qingdao', //青岛
version: 'xihaian', // 西海岸
//version: 'dev', // 开发
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
// version: 'qingdao', // 测试
//version: 'frp', // 内网穿透
vNum: 'v0.8.15.2',
configData: {
// 青岛市大数据局
qingdao: {
loginInfo: {
// 视频平台登陆信息
loginIp: '10.132.191.3',
loginPort: '8320',
userName: 'ynszdz',
userPwd: 'Admin@123',
},
backUrl: 'http://15.72.183.90:8001',
previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
apiURL: 'http://15.72.183.90:8000/ucs-admin',
websocketURL: '15.72.183.90:8000/ucs-admin',
// websocketURL: '192.168.124.233:8888/ucs-admin',
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 研发展厅
zhanTingDev: {
loginInfo: {
// 视频平台登陆信息
loginIp: '10.132.191.3',
loginPort: '8320',
userName: 'ynszdz',
userPwd: 'Admin@123',
},
backUrl: 'http://15.72.183.90:8001',
previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
//apiURL: 'http://15.72.183.90:8000/ucs-admin',
// websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
websocketURL: '10.18.1.99:8889/ucs-admin',
// websocketURL: '10.16.5.35:8888/ucs-admin',
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 西海岸大数据局
xihaian: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
// 获取摄像头的后端接口地址
camreaInfo: {
// cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
// cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
},
backUrl: 'http://10.134.135.9:9797',
previewUrl: 'http://10.134.135.9:9796/',
apiURL: 'http://10.134.135.92:8888/renren-admin',
// websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
//websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
// websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 开发
dev: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.243:9796/',
apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: '192.168.124.243:8888/ucs-admin',
// websocketURL: '10.18.1.99:8889/ucs-admin',
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 测试
test: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
backUrl: 'http://192.168.124.243:9797',
previewUrl: 'http://192.168.124.243:9796/',
websocketURL: '192.168.124.243:8888/ucs-admin',
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 内网穿透
frp: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
backUrl: 'http://124.222.94.39:9797',
previewUrl: 'http://124.222.94.39:9796/',
websocketURL: '124.222.94.39:8888/ucs-admin',
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
},
// 研发展厅
zhanTingDev: {
loginInfo: {
// 视频平台登陆信息
loginIp: '10.132.191.3',
loginPort: '8320',
userName: 'ynszdz',
userPwd: 'Admin@123',
},
backUrl: 'http://15.72.183.90:8001',
previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
//apiURL: 'http://15.72.183.90:8000/ucs-admin',
// websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
websocketURL: '10.18.1.99:8889/ucs-admin',
// websocketURL: '10.16.5.35:8888/ucs-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 西海岸大数据局
xihaian: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
// 获取摄像头的后端接口地址
camreaInfo: {
// cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
// cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
},
backUrl: 'http://10.134.135.9:9797',
previewUrl: 'http://10.134.135.9:9796/',
// websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
// websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
// websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 开发
dev: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.243:9796/',
apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: '192.168.124.243:8888/ucs-admin',
// websocketURL: '10.18.1.99:8889/ucs-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 测试
test: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
backUrl: 'http://192.168.124.243:9797',
previewUrl: 'http://192.168.124.243:9796/',
websocketURL: '192.168.124.243:8888/ucs-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 内网穿透
frp: {
loginInfo: {
// 视频平台登陆信息
loginIp: '',
loginPort: '',
userName: '',
userPwd: '',
},
backUrl: 'http://124.222.94.39:9797',
previewUrl: 'http://124.222.94.39:9796/',
websocketURL: '124.222.94.39:8888/ucs-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
},
}
_global.config = CONFIGITEM.configData[CONFIGITEM.version]
_global.config = CONFIGITEM.configData[CONFIGITEM.version]

188
front/src/api/file.js
View File

@ -10,108 +10,108 @@ import axios from 'axios'
import store from '@/store'
const config = {
headers: {
token: store.getters['user/accessToken'],
'Content-Type': 'multipart/form-data',
},
headers: {
token: store.getters['user/accessToken'],
'Content-Type': 'multipart/form-data',
},
}
const config2 = {
headers: {
'Content-Type': 'application/json; charset-utf-8',
},
headers: {
'Content-Type': 'application/json; charset-utf-8',
},
}
export function getDevelopmentFile(params) {
return request({
url: '/developmentGuide/getDevelopmentFile',
method: 'get',
params,
})
return request({
url: '/developmentGuide/getDevelopmentFile',
method: 'get',
params,
})
}
export function updateDevelopmentFile(params) {
return axios.post(
window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
params,
config
)
return axios.post(
window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
params,
config
)
}
export function test() {
return axios.post(
'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
config2
)
return axios.post(
'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
config2
)
}
export function correct(params) {
return axios.post('http://15.72.183.90:7008/correct', params, config2)
return axios.post('http://15.72.183.90:7008/correct', params, config2)
}
export function paddleocr(params) {
return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
}
// 算法总接口
export function algo(params) {
return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
}
// 能力云图-数据资源
export function count() {
return axios.post(
'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
config2
)
return axios.post(
'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
config2
)
}
export function getVideoList(params) {
return axios.get(
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
params.name +
'&pageNo=' +
params.pageNo +
'&pageSize=' +
params.pageSize,
config2
)
return axios.get(
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
params.name +
'&pageNo=' +
params.pageNo +
'&pageSize=' +
params.pageSize,
config2
)
}
// 能力云图-数据资源-总数据数
export function getRecord(params) {
return axios.get(
'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
params.serviceName +
'&orderField=' +
params.orderField +
'&orderType=' +
params.orderType +
'&pageNum=' +
params.pageNum +
'&pageSize=' +
params.pageSize +
'&serviceType=' +
params.serviceType,
config2
)
return axios.get(
'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
params.serviceName +
'&orderField=' +
params.orderField +
'&orderType=' +
params.orderType +
'&pageNum=' +
params.pageNum +
'&pageSize=' +
params.pageSize +
'&serviceType=' +
params.serviceType,
config2
)
}
export function getHls(params) {
return axios.get(
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
params.cameraId +
'&protocol=' +
params.protocol,
config2
)
return axios.get(
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
params.cameraId +
'&protocol=' +
params.protocol,
config2
)
}
// 西海岸 POI搜索
export function getListForPOI(params) {
return axios.get(
'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
params.keywords,
config2
)
return axios.get(
'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
params.keywords,
config2
)
}
//西海岸 获取左侧标签树
export function getPlaceType() {
return axios.get(
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType',
config2
)
return axios.get(
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType',
config2
)
}
//西海岸 根据标签树查询视频列表
@ -124,36 +124,36 @@ export function CameraConditionPlaceType(params) {
}
// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
let _cameraUrl =
(_global &&
_global.config &&
_global.config.camreaInfo &&
_global.config.camreaInfo.cameraUrl) ||
'10.134.135.92:9537'
//能力集市基础设施-左侧列表
(_global &&
_global.config &&
_global.config.camreaInfo &&
_global.config.camreaInfo.cameraUrl) ||
'10.134.135.92:9537'
//能力集市基础设施-左侧列表
export function getCameraInfoByAreaId(params) {
return axios.get(
`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
config2
)
return axios.get(
`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
config2
)
}
//能力集市基础设施-摄像头
export function getCameraByCondition(params) {
return axios.post(
`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
params,
config2
)
return axios.post(
`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
params,
config2
)
}
export function initiateMeet(data) {
// return request({
// url: '/enke/initiateMeet',
// method: 'post',
// data: data,
// })
return axios.post(
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
data,
config2
)
}
// return request({
// url: '/enke/initiateMeet',
// method: 'post',
// data: data,
// })
return axios.post(
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
data,
config2
)
}

2
front/src/supermap/map-showResource.js
View File

@ -42,6 +42,8 @@ function updateProgressBar(processed, total, elapsed, layersArray) {
function createMarkerClusterLayer(layerClassName) {
let array = [];
let markerClusterLayer = null
//let currentZoom = this.map._zoom
//console.log('zzzzzz', currentZoom);
if (layerClassName) {
// 如果存在类名，表示需要自定义图标
markerClusterLayer = L.markerClusterGroup({

2
front/src/views/capacityOnTheShelf/Algorithm.vue
View File

@ -230,7 +230,7 @@
>
<button class="buzhou">提交</button>
</a-popconfirm>
<button class="buzhou" v-else-if="服务商联系电话 === '部署与使用'" @click="submit()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
提交
</button>
<button class="quxiao" @click="close()">取消</button>

2
front/src/views/home/components/H5Player.vue
View File

@ -2,7 +2,7 @@
海康H5Player
-->
<template>
<div id='player' style="width:950px;height:600px"></div>
<div id='player' style="width:800px;height:600px;z-index:9999"></div>
</template>
<script>
const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备

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

@ -19,7 +19,7 @@
:key="item.key"
@click="jumpPage(item,'headerClick')"
class="nav"
:class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey == 'algorithmCompare'&& props.targetFlag)}]"
:class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey && props.targetFlag)}]"
>
{{ item.name }}
</div>
@ -171,6 +171,7 @@
}
}
}
console.log('3333333------------>', props)
// 返回首页
const goToHome = () => {
// 西海岸
@ -290,7 +291,7 @@
break
case '能力集市':
router.push({
path: '/algorithmCompare',
path: targetRouter.value.path,
query: {
id: targetRouter.value.id,
},
@ -301,41 +302,11 @@
path: '/capabilityCloud',
})
break
// case '技术文档':
// router.push({
// path: '/developmentGuide',
// })
// break
case '新手指南':
router.push({
path: '/instructionManual',
})
break
case '需求中心':
router.push({
path: '/demandCenter',
})
break
case '区市站点':
router.push({
path: '/mapTest',
})
break
case '后台管理':
Cookies.remove('JSESSIONID')
window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
// window.reload('http://15.2.21.238:9797')
break
case '赋能案例':
router.push({
path: '/assignCase',
})
break
case '典型赋能案例':
router.push({
path: '/assignCase',
})
break
case '融合服务':
router.push({
path: '/integrationServices',
@ -431,8 +402,9 @@
})
mybus.on('changeMenuStyle', (data) => {
debugger
targetRouter.value = data;
if(data.path=='/algorithmCompare'){
targetRouter.value = data;
jumpPage({
"name": "能力集市",
"key": "DetailsPageconetent",
@ -440,6 +412,12 @@
},'innerClick');
} else if(data.path =='/DetailsPageconetent'){
jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
} else if(data.path =='/details'){
jumpPage({
"name": "能力集市",
"key": "DetailsPageconetent",
"innerKey":"details"
},'innerClick');
}
})

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

@ -609,12 +609,18 @@
}
} else {
context.emit('saveSearchCodition')
router.push({
path: '/details',
query: {
id: item.id,
},
})
// router.push({
// path: '/details',
// query: {
// id: item.id,
// },
// });
//修改顶部菜单的样式
let pathData = {
path: '/details',
id: item.id,
};
mybus.emit('changeMenuStyle',pathData);
}
}
}

32
front/src/views/home/detailBack.vue
View File

@ -1,5 +1,11 @@
<template>
<div class="detail-back" @click="previousPage" :style="{ color: textColor }">
<div>
<div class="nav-box">
<a-breadcrumb>
<a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
<a-breadcrumb-item>{{detailName}}</a-breadcrumb-item>
</a-breadcrumb>
</div>
</div>
</template>
@ -24,20 +30,40 @@ const previousPage = () => {
}
const detailName = ref("应用资源")
</script>
<style scoped lang="less">
.detail-back {
position: absolute;
top: 0.85rem;
top: 0.6rem;
left: 100px;
font-size: 0.18rem;
color: #fff;
cursor: pointer;
width: 50px;
height: 50px;
background-image: url('~@/assets/detailsAll/back.png');
//background-image: url('~@/assets/detailsAll/back.png');
background-size: 100% 100%;
}
.nav-box {
position: absolute;
top: 0.6rem;
//left: 100px;
font-size: 0.18rem;
color: #fff;
height: 30px;
line-height:30px;
width: 100%;
font-size: 14px;
display: flex;
align-items: center;
background: rgba(244, 245, 248, 0.8);
padding-left: 145px;
padding-top: 5px;
.bread-crumb-span{
cursor: pointer;
}
}
</style>

13
front/src/views/home/details.vue
View File

@ -8,11 +8,12 @@
<template>
<div>
<div id="apply-container">
<home-header :showView="showView"></home-header>
<home-header :showView="showView" :target-flag = "targetFlag"></home-header>
<detail-back></detail-back>
<details-view v-if="showView === 'details-view'"></details-view>
<div class="detail-content">
<details-view v-if="showView === 'details-view'"></details-view>
<algorithm-details
v-else-if="showView === 'algorithm-details'"
v-if="showView === 'algorithm-details'"
></algorithm-details>
<application-details
v-else-if="showView === 'application-details'"
@ -24,6 +25,7 @@
v-else-if="showView === 'business-details'"
></business-details>
<layer-service v-else-if="showView === 'layer-service'"></layer-service>
</div>
<home-footer></home-footer>
</div>
</div>
@ -95,6 +97,7 @@
const id = router.currentRoute.value.query.id
const obj = JSON.parse(window.sessionStorage.getItem('preview'))
let showView = ref('')
const targetFlag= ref(true)
const init = () => {
if (id) {
selectOne(id).then((res) => {
@ -171,6 +174,7 @@
formState,
options,
showView,
targetFlag,
init,
router,
id,
@ -191,4 +195,7 @@
flex-direction: column;
justify-content: space-between;
}
.detail-content{
margin-top:90px;
}
</style>

1
front/src/views/home/detailsPageInfrastructureTreeXha.vue
View File

@ -193,7 +193,6 @@ export default defineComponent({
})
const onSelect = async (item, val, child) => {
let res = {}
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
res = await getCameraAllOrgan({ parentId: val.id })

39
front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
View File

@ -20,13 +20,15 @@
:key="url"
:src="url"
>
<!-- <div class="video-content" style=" z-index: 1">
<h5-player :video-url = "videoUrl"></h5-player>
</div> -->
<div style="color:#000000">
<h5-player :video-url = "videoUrl"></h5-player>
<div class="video-content">
<h5-player></h5-player>
</div>
<div>
<!-- <div style="color:#000000">
<div class="video-content" style=" z-index: 1">
<h5-player :video-url="videoUrl"></h5-player>
</div>
</div> -->
<div class="footer-button">
<a-button type="primary" @click="applyNow(url)">立即申请</a-button>
<a-button type="primary" style="margin-left:20px" @click="addIntoCart(url)">加入申购车</a-button>
</div>
@ -164,6 +166,18 @@
width: 960px;
//height: 700px;
margin-left: 8px;
.video-content{
width: 950px;
height:600px;
text-align: left;
padding: 5px;
}
.footer-button{
width: 950px;
//height:50px;
text-align: center;
padding-top:20px;
}
}
.ant-carousel :deep(.slick-slide) {
text-align: center;
@ -199,18 +213,7 @@
.ant-carousel :deep(.slick-dots) {
display: none !important;
}
.video-content{
width: 950px;
height:600px;
text-align: left;
padding: 5px;
}
.footer-button{
width: 950px;
height:50px;
text-align: center;
padding-top:20px;
}
}
// .current-video {
// width: 320px;

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

@ -153,7 +153,7 @@ import { ElMessage } from 'element-plus'
},
components: {
TiledMap,
VideoPlay,
VideoPlay
},
created() {},
watch: {
@ -199,7 +199,7 @@ import { ElMessage } from 'element-plus'
//this.addResourceTomap('videoMap', this.pointAllData);
})
//摄像头数据上图
//所有摄像头数据上图
mybus.off('cameraDataOnMap')
mybus.on('cameraDataOnMap', (data) => {
this.addResourceTomap('videoMap', data)
@ -738,6 +738,14 @@ import { ElMessage } from 'element-plus'
z-index: 988;
cursor: pointer;
}
.input-with-select{
width: 2.4rem;
svg{
position: relative;
bottom: 0;
right: 0;
}
}
.icon-poylon {
width: 0.46rem;
bottom: 0.6rem;