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/rs/components/box/dataContent.vue | 48 +++++++++---------------------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index d74ffc1..4baed8a 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-13 14:54:26
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-19 17:57:39
+ * @LastEditTime: 2024-11-20 18:50:27
* @FilePath: \bigScreen\src\views\rs\components\box\dataContent.vue
* @Description:
*
@@ -42,7 +42,7 @@
total: 0,
}
-function positionColor () {
+function positionColor() {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -57,7 +57,7 @@
}
}
-function positionDisabled () {
+function positionDisabled() {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -108,34 +108,13 @@
})
// 行点击
-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>`
- // )
- // let incident = () => { }
- // divIcon.on(DC.MouseEventType.CLICK, incident)
- // layer.addOverlay(divIcon)
-
+function rowClick(row) {
window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
-
}
// 查看详情
-function goDetail (row) { }
+function goDetail(row) { }
const searchBtn = (params) => {
resetPage()
@@ -177,10 +156,10 @@
<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" v-loading="loading" element-loading-background="rgba(46, 81, 136, 0.9)">
+ <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 }">
@@ -188,7 +167,7 @@
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="name" label="名称" />
- <el-table-column align="center" show-overflow-tooltip prop="category" label="类别" width="96" />
+ <el-table-column align="center" show-overflow-tooltip prop="category" label="类别" width="92" />
<el-table-column align="center" show-overflow-tooltip prop="mainProduct" label="主要产品" width="112" />
<el-table-column align="center" width="62" label="操作">
<template #default="scope">
@@ -218,14 +197,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