Compare commits

..

No commits in common. "ba597c1da41aef2169b62c16c6ec94bd03d573a8" and "8f6ef3d8f9b491f990e132a914a8728ab0482a1d" have entirely different histories.

1 changed files with 470 additions and 233 deletions

View File

@ -2,7 +2,14 @@
<div class="wrapper"> <div class="wrapper">
<div class="wrapper-title-left-tree" :key="showKey"> <div class="wrapper-title-left-tree" :key="showKey">
<div v-for="item in treeData" :key="item.id" class="primaryNode"> <div v-for="item in treeData" :key="item.id" class="primaryNode">
<div class="top" @click="showBottom(item)" :class="item.show ? 'topSelect' : ''"> <!-- <div v-if="!item.children || item.children.length == 0">
{{ item.title }}
</div> -->
<div
class="top"
@click="showBottom(item)"
:class="item.show ? 'topSelect' : ''"
>
{{ item.name }} {{ item.name }}
({{ item.channelCount }}) ({{ item.channelCount }})
<DownOutlined v-show="!item.show" /> <DownOutlined v-show="!item.show" />
@ -10,13 +17,28 @@
</div> </div>
<div class="bottom" v-show="item.show"> <div class="bottom" v-show="item.show">
<div v-for="val in item.children" :key="val.id" class="item"> <div v-for="val in item.children" :key="val.id" class="item">
<div class="up" :class="selectId == val.id ? 'select' : ''" <div
@click="showDown(item, val), onSelect(item, val)"> class="up"
:class="selectId == val.id ? 'select' : ''"
@click="showDown(item, val), onSelect(item, val)"
>
<div> <div>
<svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1" <svg
xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem" t="1654068878091"
v-show="selectId == val.id"> class="icon"
<path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path> viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="2156"
width="0.25rem"
height="0.25rem"
v-show="selectId == val.id"
>
<path
d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
p-id="2157"
fill="#0058e1"
></path>
</svg> </svg>
<span class="name">{{ val.name }}({{ val.channelCount }})</span> <span class="name">{{ val.name }}({{ val.channelCount }})</span>
</div> </div>
@ -27,13 +49,30 @@
</span> </span>
</div> </div>
<div class="down" v-show="val.show"> <div class="down" v-show="val.show">
<div v-for="child in val.children" :key="child.id" class="child" <div
:class="selectId == child.id ? 'select2' : ''" @click="onSelect(item, child, child)"> v-for="child in val.children"
:key="child.id"
class="child"
:class="selectId == child.id ? 'select2' : ''"
@click="onSelect(item, child, child)"
>
<div> <div>
<svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1" <svg
xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem" t="1654068878091"
v-show="selectId == child.id"> class="icon"
<path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path> viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="2156"
width="0.25rem"
height="0.25rem"
v-show="selectId == child.id"
>
<path
d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
p-id="2157"
fill="#0058e1"
></path>
</svg> </svg>
<span class="name"> <span class="name">
{{ child.name }} {{ child.name }}
@ -45,28 +84,37 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <a-directory-tree
class="draggable-tree"
block-node
:tree-data="treeData"
@select="onSelect"
></a-directory-tree> -->
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { defineComponent, ref, watch } from 'vue' import { defineComponent, ref, watch } from 'vue'
import { getCameraAllOrgan } from '@/api/videoSurveillance' import { getCameraAllOrgan } from '@/api/videoSurveillance'
import { getCameraInfoByAreaId } from '@/api/file' import { getCameraInfoByAreaId } from '@/api/file'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { UpOutlined, DownOutlined } from '@ant-design/icons-vue' import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js' import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
export default defineComponent({ export default defineComponent({
setup() { setup() {
const selectedKeys = ref([])
const checkedKeys = ref([])
const router = useRouter() const router = useRouter()
const fieldNames = {
children: 'children',
title: 'name',
}
const whoShow1 = ref(whoShow) const whoShow1 = ref(whoShow)
const showKey = ref(0) const showKey = ref(0)
const treeData = ref([]) const treeData = ref([])
const selectId = ref('') const init = () => {
//
const init = async () => {
treeData.value = [] treeData.value = []
console.log( console.log(
'router.currentRoute.value.query.select', 'router.currentRoute.value.query.select',
@ -81,35 +129,133 @@ export default defineComponent({
router.currentRoute.value.query.select router.currentRoute.value.query.select
) )
if (select == '基础设施') { if (select == '基础设施') {
let res = {};
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) { if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' }) getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' }).then(
(res) => {
treeData.value = res.data.data
}
)
} else { } else {
// 西 getCameraInfoByAreaId({
res = await getCameraInfoByAreaId({
areaId: '70be8c5b664f4bcf869d82f2e8335051', areaId: '70be8c5b664f4bcf869d82f2e8335051',
}).then((res) => {
treeData.value = res.data.data
}) })
} }
treeData.value = res.data && res.data.data || [] // selectDeptList({ type: select }).then((res) => {
// // console.log('=========================>', res.data.data)
// res.data.data.forEach((val) => {
// if (val.type !== '') {
// let obj = {
// title: val.type,
// total: val.total,
// show: val.type === '' ? true : false,
// select: false,
// key: val.type,
// children: [],
// }
// switch (val.type) {
// case '':
// case '':
// generateChildren(val, obj)
// break
// case '':
// generateChildren2(val, obj)
// break
// }
// treeData.value.push(obj)
// }
// })
// //
// const sortArr = ['', '', '', '', '']
// treeData.value.sort((a, b) => {
// return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
// })
// console.log('======================>', treeData.value)
// showKey.value++
// })
} }
} }
mybus.on('getDeptList', () => { mybus.on('getDeptList', () => {
init() init()
}) })
// children
const onSelect = async (item, val, child) => { const generateChildren = (val, obj) => {
console.log('item--------onSelect---->', item); if (val.dataList.length > 0) {
console.log('val------onSelect------>', val); val.dataList.forEach((child) => {
console.log('child-----onSelect------->', child); let children = {
title: child.deptName,
show: false,
select: false,
total: child.deptCount,
key: child.deptId,
}
obj.children.push(children)
})
}
}
//
const generateChildren2 = (val, obj) => {
if (val.dataList.length > 0) {
val.dataList.forEach((dis) => {
let children = {
title: dis.type,
total: dis.total,
show: false,
select: false,
key: dis.dataList[0].districtId,
children: [],
}
if (dis.dataList.length > 0) {
dis.dataList.forEach((child) => {
let children2 = {
title: child.deptName,
total: child.deptCount,
show: false,
select: false,
key: child.deptId,
}
children.children.push(children2)
})
}
obj.children.push(children)
})
}
}
// const onSelect = (event, node, dragNode, dragNodesKeys) => {
// console.log(event[0], node.node.children, dragNode, dragNodesKeys)
// if (!node.node.children) {
// mybus.emit('paramsGetResources', [event[0]])
// } else {
// let arr = []
// switch (event[0]) {
// case '':
// mybus.emit('paramsGetResources', [])
// break
// case '':
// node.node.children.forEach((dis) => {
// dis.children.forEach((val) => {
// arr.push(val.key)
// })
// })
// mybus.emit('paramsGetResources', arr)
// break
// default:
// node.node.children.forEach((val) => {
// arr.push(val.key)
// })
// mybus.emit('paramsGetResources', arr)
// break
// }
// }
// }
const selectId = ref('')
const onSelect = (item, val, child) => {
console.log('item, val, child', child)
mybus.emit('getCameraByParentId', val.id) mybus.emit('getCameraByParentId', val.id)
mybus.emit('getListByParentId', val.id) mybus.emit('getListByParentId', val.id)
let res = {}
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) { if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
res = await getCameraAllOrgan({ parentId: val.id }) getCameraAllOrgan({ parentId: val.id }).then((res) => {
} else {
// 西
res = await getCameraInfoByAreaId({ areaId: val.id })
}
treeData.value.map((treeDataItem, index) => { treeData.value.map((treeDataItem, index) => {
if (item.id == treeDataItem.id) { if (item.id == treeDataItem.id) {
treeData.value[index].children.map((childItem, childIndex) => { treeData.value[index].children.map((childItem, childIndex) => {
@ -118,51 +264,113 @@ export default defineComponent({
res.data.data res.data.data
} }
}) })
console.log('treeData.value.[index]', treeData.value[index])
} }
}) })
})
} else {
getCameraInfoByAreaId({
areaId: val.id,
}).then((res) => {
treeData.value.map((treeDataItem, index) => {
if (item.id == treeDataItem.id) {
treeData.value[index].children.map((childItem, childIndex) => {
if (childItem.id == val.id) {
treeData.value[index].children[childIndex].children =
res.data.data
}
})
console.log('treeData.value.[index]', treeData.value[index])
}
})
})
}
if (child) { if (child) {
selectId.value = child.id selectId.value = child.id
} }
} }
watch(selectedKeys, () => {
watch(selectId, (newVal) => { console.log('selectedKeys', selectedKeys)
if (newVal == '') {
mybus.emit('getCameraByParentId', '')
mybus.emit('getListByParentId', '')
}
}) })
watch(checkedKeys, (val) => {
const showBottom = async (item) => { if (val.checked.length > 1) {
item.show = !item.show; val.checked.halfChecked = val.checked.shift()
let res = {};
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
res = await getCameraAllOrgan({ parentId: item.id })
} else {
// 西
res = await getCameraInfoByAreaId({ areaId: item.id })
} }
console.log('onCheck', val)
})
const value = ref('')
const onSearch = (searchValue) => {
console.log('use value', searchValue)
console.log('or use this.value', value.value.child)
}
// checkedKeys, checkedNodes, node, event
function xuanzeshijian(checkedKeys) {
checkedKeys.value.checked = []
checkedKeys.value.checked[0] =
checkedKeys.checked[checkedKeys.checked.length - 1]
// console.log('checkedKeys1', checkedNodes)
console.log('checkedKeys', checkedKeys)
}
let quxiaoshijian = ''
function dianjisousuo(selectedKeys, selectedNodes, node, event) {
if (quxiaoshijian == selectedNodes.node.id) {
quxiaoshijian = ''
mybus.emit('paramsGetResources', quxiaoshijian)
} else {
quxiaoshijian = selectedNodes.node.id
mybus.emit('paramsGetResources', selectedNodes.node.id.trim())
}
console.log(
'dianjisousuo',
selectedKeys,
'dianjisousuo',
selectedNodes,
'dianjisousuo',
node,
'dianjisousuo',
event
)
}
const showBottom = (item) => {
item.show = !item.show
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
getCameraAllOrgan({ parentId: item.id }).then((res) => {
treeData.value.map((treeDataItem, index) => { treeData.value.map((treeDataItem, index) => {
if (item.id == treeDataItem.id) { if (item.id == treeDataItem.id) {
treeData.value[index].children = res.data && res.data.data || [] treeData.value[index].children = res.data.data
console.log('treeData.value.[index]', treeData.value[index]) console.log('treeData.value.[index]', treeData.value[index])
} }
}) })
})
} else {
getCameraInfoByAreaId({
areaId: item.id,
}).then((res) => {
treeData.value.map((treeDataItem, index) => {
if (item.id == treeDataItem.id) {
treeData.value[index].children = res.data.data
console.log('treeData.value.[index]', treeData.value[index])
}
})
})
}
} }
const showDown = (item, val) => { const showDown = (item, val) => {
selectId.value = val.id console.log('showDown', val)
console.log('item---showDown--------->', item);
console.log('val----showDown-------->', val);
if (item.children) { if (item.children) {
val.show = !val.show; val.show = !val.show
//
if (!val.show) {
selectId.value = ''
}
} }
} }
return { return {
value,
onSearch,
selectedKeys,
checkedKeys,
fieldNames,
treeData, treeData,
dianjisousuo,
quxiaoshijian,
xuanzeshijian,
showKey, showKey,
onSelect, onSelect,
showBottom, showBottom,
@ -178,10 +386,62 @@ export default defineComponent({
UpOutlined, UpOutlined,
DownOutlined, DownOutlined,
}, },
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.primaryNode { // .wrapper {
// height: 100%;
// width: 100%;
// padding: .2rem;
// .wrapper-title {
// height: .28rem;
// width: 100%;
// margin-bottom: .25rem;
// .wrapper-title-name {
// width: 100%;
// height: .17rem;
// font-size: .18rem;
// font-family: 'AlibabaPuHuiTiR';
// font-weight: 400;
// color: #0058e1;
// line-height: .34rem;
// }
// .wrapper-title-yangshi {
// width: .4rem;
// height: .03rem;
// background: #0058e1;
// border-radius: .02rem;
// margin-top: .2rem;
// margin-left: .15rem;
// }
// }
// .wrapper-title-left-tree {
// overflow-y: auto;
// height: 80%;
// width: 2.1rem;
// }
// .wrapper-title-left-tree::-webkit-scrollbar {
// width: .05rem;
// height: .05rem;
// }
// .wrapper-title-left-tree::-webkit-scrollbar-thumb {
// border-radius: .05rem;
// background-color: #0058e1;
// }
// .wrapper-title-left-tree::-webkit-scrollbar-track {
// background-color: transparent;
// }
// :deep(.ant-tree-treenode) {
// margin-top: .1rem;
// height: .23rem;
// overflow: hidden;
// text-overflow: ellipsis;
// display: -webkit-box;
// -webkit-line-clamp: 1;
// -webkit-box-orient: vertical;
// }
// }
.primaryNode {
.top { .top {
width: 100%; width: 100%;
height: 0.4rem; height: 0.4rem;
@ -192,32 +452,26 @@ export default defineComponent({
padding: 0 0.1rem; padding: 0 0.1rem;
margin-top: 0.08rem; margin-top: 0.08rem;
} }
.top:hover { .top:hover {
cursor: pointer; cursor: pointer;
// 0058e1 0.5 // 0058e1 0.5
background: rgba(0, 88, 225, 0.8); background: rgba(0, 88, 225, 0.8);
color: white; color: white;
:deep(.anticon) { :deep(.anticon) {
color: white; color: white;
} }
} }
.topSelect { .topSelect {
background: #0058e1; background: #0058e1;
color: white; color: white;
:deep(.anticon) { :deep(.anticon) {
color: white; color: white;
} }
} }
.bottom { .bottom {
width: 100%; width: 100%;
background: rgba(244, 245, 248, 0.8); background: rgba(244, 245, 248, 0.8);
padding: 0 0.1rem; padding: 0 0.1rem;
// margin-bottom: .08rem; // margin-bottom: .08rem;
.up { .up {
cursor: pointer; cursor: pointer;
@ -227,12 +481,10 @@ export default defineComponent({
align-items: center; align-items: center;
border-top: 0.01rem solid #ccc; border-top: 0.01rem solid #ccc;
padding: 0 0.1rem; padding: 0 0.1rem;
& > div {
&>div {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
} }
.name { .name {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -242,41 +494,33 @@ export default defineComponent({
word-break: break-all; word-break: break-all;
} }
} }
.up:hover { .up:hover {
.name { .name {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
span { span {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
} }
.select { .select {
padding: 0 0.1rem 0 0; padding: 0 0.1rem 0 0;
.name { .name {
width: 1.7rem; width: 1.7rem;
color: #0058e1 !important; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
span { span {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
} }
.item:nth-of-type(1) .up { .item:nth-of-type(1) .up {
border-top: none; border-top: none;
} }
.down { .down {
width: 100%; width: 100%;
.child { .child {
cursor: pointer; cursor: pointer;
height: 0.4rem; height: 0.4rem;
@ -284,12 +528,10 @@ export default defineComponent({
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 0 0.1rem; padding: 0 0.1rem;
& > div {
&>div {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
} }
.name { .name {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -299,34 +541,29 @@ export default defineComponent({
word-break: break-all; word-break: break-all;
} }
} }
.child:hover { .child:hover {
.name { .name {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
span { span {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
} }
.select2 { .select2 {
.name { .name {
width: 1.7rem; width: 1.7rem;
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
span { span {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
} }
padding: 0 0.1rem 0 0; padding: 0 0.1rem 0 0;
} }
} }
} }
} }
</style> </style>