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

bug修复

This commit is contained in:
wuhongjian 2022-07-26 16:33:10 +08:00
parent 5dbaa26848
commit efa51429f9
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
front/src/supermap/createMarkerPopup.js
View File

@ -1,3 +1,10 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2022-06-14 09:43:31
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-26 15:19:38
* @Description: 告诉大家这是什么
*/
/** /**
* @Author: tiansiyuan * @Author: tiansiyuan
* @Date: 2021/2/20 13:12:56 * @Date: 2021/2/20 13:12:56
@ -18,23 +25,23 @@ import { selectByChannelCode } from '@/api/videoSurveillance'
*/ */
function createCameraDetailsPop(feature) { function createCameraDetailsPop(feature) {
// if(feature.type !== 'cameraTree'){ // if(feature.type !== 'cameraTree'){
selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => { // selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => {
feature.data = res.data.data[0] // feature.data = res.data.data[0]
}) // })
// } // // }
const popupDom = new Dom({ // const popupDom = new Dom({
template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>', // template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
data() { // data() {
return { // return {
feature: feature, // feature: feature,
} // }
}, // },
created() {}, // created() {},
components: { // components: {
CameraDetailsPop, // CameraDetailsPop,
}, // },
}) // })
return popupDom.initDom() // return popupDom.initDom()
} }
function createSearchAddressTitlePop(feature) { function createSearchAddressTitlePop(feature) {
const popupDom = new Dom({ const popupDom = new Dom({

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

@ -5,7 +5,13 @@
<div class="infrastructrue-tab"> <div class="infrastructrue-tab">
<div v-for="(item, index) in tabList" :key="index" class="tabBox"> <div v-for="(item, index) in tabList" :key="index" class="tabBox">
<b class="leftType">{{ item.title }}</b> <b class="leftType">{{ item.title }}</b>
<button @click="nullClick" v-if="item.title == '视频标签'">清空</button> <el-button
@click="nullClick"
v-if="item.title == '视频标签'"
type="small"
>
清空
</el-button>
<span <span
v-for="itemContent in item.content" v-for="itemContent in item.content"
:key="itemContent" :key="itemContent"
@ -95,7 +101,11 @@
<template v-if="column.dataIndex === 'operation'"> <template v-if="column.dataIndex === 'operation'">
<a <a
@click=" @click="
openVideo(record.channelCode ||record.channelId || record.channelCode.channelId) openVideo(
record.channelCode ||
record.channelId ||
record.channelCode.channelId
)
" "
> >
预览 预览
@ -588,7 +598,8 @@
padding: 0 0.08rem; padding: 0 0.08rem;
} }
.leftType { .leftType {
margin: 0.1rem 0; margin: 0.2rem 0;
margin-right: 0.06rem;
} }
.down { .down {
background: #0087ff; background: #0087ff;