diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue index 423c358..a589ff0 100644 --- a/src/components/tree/govern/deviceTree.vue +++ b/src/components/tree/govern/deviceTree.vue @@ -27,7 +27,7 @@ const props = withDefaults( defaultCheckedKeys: [] } ) -const emit = defineEmits(['init', 'checkChange','deviceTypeChange']) +const emit = defineEmits(['init', 'checkChange', 'deviceTypeChange']) const config = useConfig() const tree = ref() const treRef = ref() @@ -36,6 +36,7 @@ const changeDeviceType = (val: any, obj: any) => { } getDeviceTree().then(res => { let arr: any[] = [] + let arr2: any[] = [] //治理设备 res.data.map((item: any) => { if (item.name == '治理设备') { @@ -56,14 +57,20 @@ getDeviceTree().then(res => { }) }) } else if (item.name == '便携式设备') { + console.log(11111) item.children.forEach((item: any) => { item.icon = 'el-icon-Platform' item.color = config.getColorVal('elementUiPrimary') item.color = '#e26257 !important' item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' + + if (item.type == 'device') { + arr2.push(item) + } item.children.forEach((item2: any) => { item2.icon = 'el-icon-Platform' item2.color = item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' + // item2.children.forEach((item3: any) => { // item3.icon = 'el-icon-Platform' // item3.color = config.getColorVal('elementUiPrimary') @@ -85,8 +92,19 @@ getDeviceTree().then(res => { level: 2, ...arr[0] }) + return + } + if (arr2.length) { + treRef.value.treeRef2.setCurrentKey(arr2[0].id) + // 注册父组件事件 + emit('init', { + level: 2, + ...arr2[0] + }) + return } else { emit('init') + return } }) }) diff --git a/src/views/govern/device/fileService/index.vue b/src/views/govern/device/fileService/index.vue index c9ee2f6..b212e09 100644 --- a/src/views/govern/device/fileService/index.vue +++ b/src/views/govern/device/fileService/index.vue @@ -229,7 +229,7 @@ defineOptions({ name: 'govern/device/fileService' }) const pageHeight = mainHeight(20) -const tableHeight = mainHeight(100) +const tableHeight = mainHeight(130) const loading = ref(false) //nDid @@ -243,7 +243,8 @@ const isRoot = ref(true) //储存所有点击过的目录 const activePathList: any = ref([]) const nodeClick = (e: any) => { - if (e.level == 2) { + console.log(e,"------"); + if (e && (e.level == 2 || e.type == 'device')) { loading.value = true nDid.value = e.ndid dirList.value = [] diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index a2906f9..46eb089 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -319,7 +319,6 @@ const nodeClick = async (e: anyObj) => { await getTestRecordInfo(id) .then(async res => { deviceData.value = res.data - console.log(deviceData.value, '.......') if (res.data.records.length == 1) { activeName.value = res.data.records[0].id } else { @@ -334,7 +333,6 @@ const nodeClick = async (e: anyObj) => { } }) } - console.log(activeName.value, '7777777777777') searchForm.value.index = [indexOptions.value[0].id] schemeTreeRef.value.getPlanData(deviceData.value) @@ -588,7 +586,6 @@ const init = (flag: boolean) => { echartsData.value.yAxis[index].max = max }) } - // console.log("🚀 ~ .1111 ~ echartsData.value :", echartsData.value) loading.value = false } @@ -690,12 +687,10 @@ const handleExport = async () => { } let itemList: any = list[index].data[indexs] if (itemList && itemList.length != 0) { - console.log(itemList, 'hhhhh') itemList[1] = itemList[1] ? itemList[1] : '/' index == list.length - 1 ? (strs += itemList[1]) : (strs += itemList[1] + ',') } else { index == list.length - 1 ? (strs += '/') : (strs += '/,') - console.log(index, 'my') } }) if (count == 0 && xAxis[indexs]) {