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 | 89 +++++++++++++++++++++-----------------------
1 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 0841ee2..41e53d7 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -2,11 +2,11 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-13 14:54:26
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-12 18:31:08
+ * @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'
@@ -28,7 +28,6 @@
exportBtn: false,
columns: [
{
- label: "名称",
type: 'input',
props: 'name',
placeholder: '请输入名称',
@@ -41,11 +40,11 @@
const tableData = ref([])
const pages = {
page: 1,
- pageSize: 10,
+ pageSize: 20,
total: 0,
}
-function positionColor() {
+function positionColor () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -60,7 +59,7 @@
}
}
-function positionDisabled() {
+function positionDisabled () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -112,28 +111,26 @@
// 行点击
-function rowClick(row) {
+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))
@@ -141,7 +138,7 @@
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -156,7 +153,7 @@
// 重置分页数据
const resetPage = () => {
pages.page = 1
- pages.pageSize = 10
+ pages.pageSize = 20
pages.total = 0
}
@@ -183,14 +180,21 @@
<template>
<div class="w100 h0 flex-1 flex f-d-c">
- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
+ <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)">
定位
@@ -218,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