diff --git a/src/axios/cameraBase/cameraApi.ts b/src/axios/cameraBase/cameraApi.ts index 0d94fd8..273b4f3 100644 --- a/src/axios/cameraBase/cameraApi.ts +++ b/src/axios/cameraBase/cameraApi.ts @@ -6,10 +6,11 @@ enum Api { Add = '/cbCamera/add', Update = '/cbCamera/update', Delete = '/cbCamera/delete', + DeleteNode = '/cbCameraNode/delete', Get = '/cbCamera/get', GetList = '/cbCamera/getList', GetPageList = '/cbCamera/getPageList', - GetTreeList = '/cbCameraNode/getTree' + GetTreeList = '/cbCameraNode/getTree', } //相机参数服务 @@ -20,6 +21,7 @@ enum paramsApi{ Delete = '/cbCameraParams/delete', Get = '/cbCameraParams/get', GetPageList = '/cbCameraParams/getPageList', + } const CisApiUrl = apiUrl.CisApiUrl; @@ -30,6 +32,8 @@ export const Update = (params?: any) => axios.post(CisApiUrl + Api.Update, qs.st export const Delete = (params?: any) => axios.post(CisApiUrl + Api.Delete, qs.stringify(params)) +export const DeleteNode = (params?: any) => axios.post(CisApiUrl + Api.DeleteNode, qs.stringify(params)) + export const Get = (params?: any) => axios.get(CisApiUrl + Api.Get, { params: params }) export const GetList = (params?: any) => axios.get(CisApiUrl + Api.GetList, { params: params }) diff --git a/src/views/page/aside/cameraLeftMenu.vue b/src/views/page/aside/cameraLeftMenu.vue index 7e5f3cf..7c785d6 100644 --- a/src/views/page/aside/cameraLeftMenu.vue +++ b/src/views/page/aside/cameraLeftMenu.vue @@ -34,6 +34,7 @@ import { ref, onMounted, onUnmounted, watch } from "vue"; import { useStore } from '@/store/index'; import * as cameraApi from '@/axios/cameraBase/cameraApi'; +import Msg from "@/utils/message"; let piniaStore = useStore(); const NodeTreeItem = ref() let searchStr = ref(''); @@ -77,7 +78,7 @@ watch(searchStr, (newVal, oldVal) => { expandedKeys.value = expandedKeyArr }) //右键点击事件 -function onRightClick({ node }: any) { +function onRightClick({ node }: any) { NodeTreeItem.value = { cbCameraId: node.cbCameraId, isGroup: node.isGroup, @@ -87,21 +88,28 @@ function onRightClick({ node }: any) { }; } const onContextMenuClick = (treeKey: string, menuKey: string) => { - console.log(`treeKey: ${treeKey}, menuKey: ${menuKey},NodeTreeItem.value:`,NodeTreeItem.value); - //防止添加多个key值,再次点击不能关闭。数组去重 - if (menuKey == "open") { + // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey},NodeTreeItem.value:`,NodeTreeItem.value); + if (menuKey.includes("open")) { + //防止添加多个key值,再次点击不能关闭。数组去重 let arr = [...expandedKeys.value] arr.push(treeKey) arr = [...new Set(arr)] expandedKeys.value = arr piniaStore.updateCurSelectKey(NodeTreeItem.value.cbCameraId.toString()) - } else if (menuKey == "close") { + } else if (menuKey.includes("close")) { piniaStore.updateCloseVideoKey(NodeTreeItem.value.cbCameraId.toString()) expandedKeys.value = expandedKeys.value.filter((item: any) => { return item != treeKey }) - } else if (menuKey == "delete") { - + } else if (menuKey.includes("delete")) { + console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`); + cameraApi.DeleteNode({id:treeKey}).then((res:any)=>{ + if(res.data.data){ + console.log(res); + Msg.success("删除成功") + loadTreeData() + } + }) }