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

西海岸bug修复

This commit is contained in:
wuhongjian 2022-11-24 20:32:15 +08:00
parent 32573971ae
commit 0fa3708f20
10 changed files with 353 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-24 15:54:56
* @LastEditTime: 2022-11-24 19:38:36
* @Description: 系统静态参数配置
*/
var _global = {}
@ -63,14 +63,14 @@ var CONFIGITEM = {
},
// 获取摄像头的后端接口地址
camreaInfo: {
// cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
// cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
// cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
},
backUrl: 'http://10.134.135.9:9797',
apiURL: 'http://10.134.135.92:8888/renren-admin',
// apiURL: 'http://192.168.124.233:8888/ucs-admin',
previewUrl: 'http://10.134.135.9:9796/',
// 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', // 李志成-远雄

2
front/public/static/config/mapConfig.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-24 16:01:04
* @LastEditTime: 2022-11-24 17:33:36
* @Description: 地图静态参数配置
*/
var _mapConfig = {}

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

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-20 17:16:35
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-24 14:32:50
* @LastEditTime: 2022-11-24 17:13:34
* @Description: 告诉大家这是什么
*/
import request from '@/utils/request'
@ -117,7 +117,7 @@ export function getPlaceType() {
//西海岸 根据标签树查询视频列表
export function CameraConditionPlaceType(params) {
return axios.post(
`http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
`http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType`,
params,
config2
)

2
front/src/supermap/advance-init.js
View File

@ -74,7 +74,7 @@ export function MapFun(mapObj) {
* @param layerName {String} 图层名
*/
const _removeLayerByLayerName = function(layerName) {
const layer = layerGroup.get(layerName)
const layer = layerGroup.get(layerName) ||
// const feature = featureGroup;
// map.popupclose();
// debugger;

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

@ -84,19 +84,12 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
})
markerClusterLayer.on('clusterclick', function(a) {
let clusterList = [];
//console.log('cluster ' + a.layer.getAllChildMarkers());
if (a.layer.getAllChildMarkers().length < 50) {
if (mapObj.getZoom() == mapObj.getMaxZoom()) {
for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
//console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
//console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);
clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
}
//console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));
//console.log('zzzzzzzzz', mapObj.getZoom(), mapObj.getMaxZoom());
if (mapObj.getZoom() == mapObj.getMaxZoom()) {
mybus.emit('openOperationPopup', clusterList);
}
}
});
}
return markerClusterLayer
@ -194,13 +187,14 @@ function addPointOnMap({
.openOn(mapObj.map)
})
}
return isOpenPopup ?
marker
.addTo(mapObj.map)
.bindPopup(elementHtml, { className: popupClassName })
.openPopup() :
marker.addTo(mapObj.map)
const layer = marker.addTo(mapObj.map);
featureGroup.addLayer(layer)
layerGroup.set('potcon', layer)
// marker
// .addTo(mapObj.map)
// .bindPopup(elementHtml, { className: popupClassName })
// .openPopup() :
// marker.addTo(mapObj.map)
}
/**

9
front/src/views/home/DetailsPageconetent.vue
View File

@ -919,9 +919,14 @@
const setTitle = () => {
let title = titleNameArray
let whoShow1 = ref(whoShow)
if (whoShow1 && whoShow1.value.itShowXiHaiAn) {
title[0] = title.splice(2, 1, title[0])[0]
if (
whoShow1 &&
whoShow1.value.itShowXiHaiAn &&
title[0].name !== '基础设施'
) {
;[title[0], title[2]] = [title[2], title[0]]
}
debugger
titleName.value = title
}
// 查询

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

@ -8,6 +8,7 @@
const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
import { message } from 'ant-design-vue'
import mybus from '@/myplugins/mybus'
export default {
name: 'H5Player',
props: {
@ -61,6 +62,7 @@
created() {},
mounted() {
this.init()
mybus.emit('closeLoading', true)
this.createPlayer()
this.arrangeWindow()
//videoUrl this.realplay(this.videoUrl,0);//循环传过来的数组进行播放，index根据选中的个数
@ -113,6 +115,7 @@
//插件错误回调
console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
message.error('取流异常,请稍后尝试')
mybus.emit('closeLoading', false)
},
windowEventOver: function (iWndIndex) {
//鼠标移过回调
@ -140,6 +143,7 @@
)
// 首帧绘制完成后停止
that.pausePlay(iWndIndex)
mybus.emit('closeLoading', false)
},
performanceLack: function () {
//性能不足回调
@ -161,7 +165,8 @@
// 初始化结束
// 视频预览
realplay(playURL, index1) {
this.mode = 1 //解码方式：0普通模式 1高级模式
mybus.emit('closeLoading', true)
this.mode = 0 //解码方式：0普通模式 1高级模式
const { player, mode, urls } = this,
index = player.currentWindowIndex
// playURL = this.realplay
@ -196,7 +201,7 @@
() => {
this.playback.rate = 0
console.log('stopAllPlay success')
this.closeVideoTree()
// this.closeVideoTree()
},
(e) => {
console.error(e)

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

@ -118,7 +118,6 @@
{{ child.placeTypeName }}
</div>
</a-tooltip>
</div>
</div>
</div>
@ -163,9 +162,6 @@ export default defineComponent({
mybus.emit('clearLeftSelect')
}
}
}
//选择标签内容
const tabClick = (id) => {
@ -173,13 +169,11 @@ export default defineComponent({
chooseId.value = ''
mybus.emit('clearLeftSelect')
} else {
chooseId.value = id
let placeTypeCode = []
placeTypeCode.push(id)
mybus.emit('CameraConditionPlaceType', placeTypeCode)
}
}
// 初始化
const init = async () => {
@ -191,7 +185,6 @@ export default defineComponent({
select = ''
}
if (select == '基础设施') {
let res = {}
res = await getCameraInfoByAreaId({
@ -216,8 +209,7 @@ export default defineComponent({
chooseId.value = ''
})
const onSelect = async (item, val, child) => {
let res = {}  
let res = {}
res = await getCameraInfoByAreaId({ areaId: val.id })
treeData.value.map((treeDataItem, index) => {
if (item.id == treeDataItem.id) {
@ -236,15 +228,12 @@ export default defineComponent({
selectId.value = child.id
mybus.emit('getCameraByParentId', val.id)
}
}
}
watch(selectId, (newVal) => {
if (newVal == '') {
  mybus.emit('clearLeftSelect')
mybus.emit('clearLeftSelect')
}
})
@ -261,7 +250,6 @@ export default defineComponent({
})
}
const showDown = (item, val) => {
selectId.value = val.id
//mybus.emit('getCameraByParentId', val.id)
if (item.children) {

7
front/src/views/home/infrastructurePageXha.vue
View File

@ -648,10 +648,12 @@
{{ userInfo.realNameShow }}
</div>
<!--地图上点击之后弹出的操作弹窗-->
<a-spin size="large" :spinning="spinning">
<camera-popup-on-map
:camera-Data-List="cameraDataList"
:reset-flag="resetFlag"
></camera-popup-on-map>
</a-spin>
</div>
</div>
</a-modal>
@ -699,6 +701,7 @@
const current = ref(1)
const videoTotal = ref(0)
const router = useRouter()
const spinning = ref(true)
const whoShow1 = ref(whoShow)
const isXiHaiAn = whoShow1.value.itShowXiHaiAn
const options = reactive({
@ -956,6 +959,10 @@
mapSearchParam.value.parentId = parentId
getCamera()
})
mybus.off('closeLoading')
mybus.on('closeLoading', (val) => {
spinning.value = val
})
mybus.off('changeRoomInput')
mybus.on('changeRoomInput', (val) => {
console.log('更改=======》')

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

@ -237,8 +237,6 @@ import { ElMessage } from 'element-plus'
queryCameraConditionPlace(data) {
let params = {
placeTypeCode: data,
pageNum: "1",
pageSize: 40000,
}
CameraConditionPlaceType(params).then((res) => {
this.addResourceTomap('videoMap', res.data.data)
@ -294,7 +292,7 @@ import { ElMessage } from 'element-plus'
if(this.addressType=='2'){
mybus.emit('openOperationPopup', [item]);
}else{
// this.hiMapFun.removeLayerByLayerName('potcon');
this.hiMapFun.removeLayerByLayerName('potcon');
// this.hiMapFun.clearAllLayers();
// this.getCameraAllPage()
this.hiMapFun.addPointOnMap({feature:latLng,iconUrl:'poi-red.png',layerName:'potcon'})
@ -384,9 +382,11 @@ import { ElMessage } from 'element-plus'
if (!this.whoShow1.itShowXiHaiAn) {
getCameraByParentId(this.mapSearchParam).then((res) => {
console.log('根据parent查询摄像头', res.data.data)
this.addResourceTomap('videoMap', res.data.data)
})
} else {
this.hiMapFun.mapFlyTo({lat:'36.017043',lng: '119.922772'}, 9)
console.log('根据parent查询摄像头111111',this.mapSearchParam)
let params = {
regionId:
@ -537,9 +537,6 @@ import { ElMessage } from 'element-plus'
getCameraAllPage(page) {
let params = {
regionId: "70be8c5b664f4bcf869d82f2e8335051",
// pageNum: "1",
// pageSize: 1000,
// type: 1,
borderPolygonList: []
}
getCameraByCondition(params).then((res) => {