From b8440d9a6b1671cdf0c8f06cdaba2f80a8dac1e6 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 13 Nov 2024 14:17:15 +0800
Subject: [PATCH] 退出图标按钮修复
---
src/views/space/components/box/dataContent.vue | 103 ++++++++++++++++++++-------------------------------
1 files changed, 41 insertions(+), 62 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 79f9527..b40461b 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -2,21 +2,23 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-13 14:54:26
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-08 20:17:16
+ * @LastEditTime: 2024-11-12 18:31:08
* @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
* @Description:
*
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
-->
<script setup>
+import EventBus from 'utils/bus'
+
import publicContent from "./publicContent.vue"
import { getList } from "@/api/space/space"
-import { getDictionary } from "@/api/dict/dict"
-import { nextTick, reactive } from "vue"
+import { nextTick, onUnmounted, reactive } from "vue"
const SeachBarCondition = ref(null)
const loading = ref(false)
const TableContent = ref(null)
const curTableHeight = ref(0)
+const curSelectTabType = ref('')
// 搜索项配置
const options = reactive({
@@ -32,16 +34,7 @@
placeholder: '请输入名称',
changeSearch: true,
flex: 1,
- },
- {
- label: "类型",
- type: "select",
- props: "type",
- data: [],
- changeSearch: true,
- clearable: true,
- flex: 1,
- },
+ }
]
})
@@ -86,37 +79,10 @@
curTableHeight.value = TableContent.value.offsetHeight
})
-watch(
- () => TableContent,
- (newData) => {
- console.log(newData.value?.clientHeight, 456465456)
- },
- {
- immediate: true,
- deep: true
- })
-
// 分页改变
const handleCurrentChange = (val) => {
pages.page = val
getLists(SeachBarCondition.value.getSeachCondition())
-}
-
-// 获取下拉字典
-const getDictData = (code) => {
- const param = {
- code: code,
- }
- getDictionary(param).then((res) => {
- options.columns[1].data = res.data.data.map(item => {
- return {
- label: item.dictValue,
- value: item.dictKey
- }
- })
-
- searchBtn(SeachBarCondition.value.getSeachCondition())
- })
}
// 查询分页数据
@@ -124,7 +90,10 @@
param.current = pages.page
param.size = pages.pageSize
loading.value = true
- getList(param)
+ getList({
+ ...param,
+ type: curSelectTabType.value
+ })
.then((res) => {
const data = res.data.data
tableData.value = data.records
@@ -145,26 +114,24 @@
// 行点击
function rowClick(row) {
- if (state.layer) {
- window.$viewer.removeLayer(state.layer)
- }
- let layer = new DC.HtmlLayer(`${row.id}`)
- state.layer = layer
- window.$viewer.addLayer(layer)
- let iconEl = `<div class="marsBlueGradientPnl">
- <div>${row.name}</div>
- </div>`
- let divIcon = new DC.DivIcon(
- new DC.Position(row.lng, row.lat, 0),
- `<div class="public-map-popup">
- ${iconEl}
- </div>`
- )
- // divIcon.attrParams = row
- let incident = () => { }
- // if (item.incident) incident = item.incident
- divIcon.on(DC.MouseEventType.CLICK, incident)
- layer.addOverlay(divIcon)
+ // if (state.layer) {
+ // window.$viewer.removeLayer(state.layer)
+ // }
+ // let layer = new DC.HtmlLayer(`${row.id}`)
+ // state.layer = layer
+ // window.$viewer.addLayer(layer)
+ // let iconEl = `<div class="marsBlueGradientPnl">
+ // <div>${row.name}</div>
+ // </div>`
+ // let divIcon = new DC.DivIcon(
+ // new DC.Position(row.lng, row.lat, 0),
+ // `<div class="public-map-popup">
+ // ${iconEl}
+ // </div>`
+ // )
+ // let incident = () => { }
+ // divIcon.on(DC.MouseEventType.CLICK, incident)
+ // layer.addOverlay(divIcon)
window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
@@ -197,7 +164,19 @@
getLists(SeachBarCondition.value.getSeachCondition())
}
-getDictData("emergency_space_type")
+const spaceTabChange = (type) => {
+ curSelectTabType.value = type
+
+ nextTick(() => {
+ searchBtn(SeachBarCondition.value.getSeachCondition())
+ })
+}
+
+EventBus.on('spaceTabChange', spaceTabChange)
+
+onUnmounted(() => {
+ EventBus.off('spaceTabChange', spaceTabChange)
+})
</script>
<template>
--
Gitblit v1.9.3