From 8e72ebbb44dba3ec5cf6dd3cd2613e6e9aed31ef Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 22 Nov 2024 15:37:33 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/space/components/box/dataContent.vue | 165 ++++++++++++++++++++++---------------------------------
1 files changed, 66 insertions(+), 99 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 33fc026..41e53d7 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-19 17:41:11
* @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
- * @Description:
- *
- * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ * @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({
@@ -26,29 +28,19 @@
exportBtn: false,
columns: [
{
- label: "名称",
type: 'input',
props: 'name',
placeholder: '请输入名称',
changeSearch: true,
flex: 1,
- },
- {
- label: "类型",
- type: "select",
- props: "type",
- data: [],
- changeSearch: true,
- clearable: true,
- flex: 1,
- },
+ }
]
})
const tableData = ref([])
const pages = {
page: 1,
- pageSize: 10,
+ pageSize: 20,
total: 0,
}
@@ -86,37 +78,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 +89,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
@@ -137,47 +105,37 @@
})
}
+let state = reactive({
+ layer: {}
+})
+
+
// 行点击
function rowClick (row) {
- // 读取定位飞
- window.$viewer.zoomToPosition(new DC.Position(
- Number(row.lng),
- Number(row.lat),
- 800,
- 0,
- -80,
- 0
- ), () => {
- })
- // let layer = new DC.VectorLayer('layer')
+ // if (state.layer) {
+ // window.$viewer.removeLayer(state.layer)
+ // }
+ // let layer = new DC.HtmlLayer(`${row.id}`)
+ // state.layer = layer
// window.$viewer.addLayer(layer)
- // let positions = generatePosition(row.lng, row.lat)
- // let material = new DC.PolylineDashMaterialProperty({
- // color: DC.Color.ORANGE
- // })
- // positions.forEach(item => {
- // let label = new DC.CustomLabel(
- // item,
- // row.name
- // )
- // label.setStyle({
- // fillColor: DC.Color.YELLOW,
- // font: '12px',
- // pixelOffset: { x: 0, y: -10 }
- // })
- // label.setVLine({
- // width: 2,
- // material
- // })
- // layer.addOverlay(label)
- // })
+ // 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))
+
}
-function generatePosition (lng, lat) {
- let list = []
- list.push(new DC.Position(lng, lat, 100))
- return list
-}
+
// 查看详情
function goDetail (row) { }
@@ -195,7 +153,7 @@
// 重置分页数据
const resetPage = () => {
pages.page = 1
- pages.pageSize = 10
+ pages.pageSize = 20
pages.total = 0
}
@@ -205,7 +163,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>
@@ -213,12 +183,18 @@
<global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn"
ref="SeachBarCondition"></global-search>
- <div class="h0 flex-1 table-content" ref="TableContent">
- <el-table :data="tableData" :height="curTableHeight" style="width: 100%" v-loading="loading">
- <el-table-column prop="name" label="名称" />
- <el-table-column prop="emergencySpaceType" label="类型" width="70" />
- <el-table-column prop="mainFuncName" label="作用" width="60" />
- <el-table-column width="60" label="操作" align="center">
+ <div class="h0 flex-1 table-content" ref="TableContent" v-loading="loading"
+ element-loading-background="rgba(46, 81, 136, 0.9)">
+ <el-table border :data="tableData" :height="curTableHeight" style="width: 100%">
+ <el-table-column align="center" label="序号" width="62" prop="rank">
+ <template #default="{ $index, row }">
+ {{ (pages.page - 1) * pages.pageSize + $index + 1 }}
+ </template>
+ </el-table-column>
+ <el-table-column align="center" show-overflow-tooltip prop="firmName" label="企业名称" />
+ <el-table-column align="center" show-overflow-tooltip prop="name" label="名称" />
+ <el-table-column align="center" prop="mainFuncName" label="作用" width="62" />
+ <el-table-column align="center" width="62" label="操作">
<template #default="scope">
<el-button link type="primary" size="small" :disabled="scope.row.lng == ''" @click="rowClick(scope.row)">
定位
@@ -246,14 +222,5 @@
.table-content {
flex-basis: auto;
height: calc(100% - 40px);
-}
-
-.el-page {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 100%;
- height: 40px;
- line-height: 40px;
}
</style>
--
Gitblit v1.9.3