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 | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 48fc9e8..41e53d7 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -44,7 +44,7 @@
total: 0,
}
-function positionColor() {
+function positionColor () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -59,7 +59,7 @@
}
}
-function positionDisabled() {
+function positionDisabled () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -111,7 +111,7 @@
// 行点击
-function rowClick(row) {
+function rowClick (row) {
// if (state.layer) {
// window.$viewer.removeLayer(state.layer)
@@ -138,7 +138,7 @@
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -180,7 +180,8 @@
<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)">
@@ -190,9 +191,10 @@
{{ (pages.page - 1) * pages.pageSize + $index + 1 }}
</template>
</el-table-column>
- <el-table-column prop="name" label="名称" />
- <el-table-column prop="mainFuncName" label="作用" width="62" />
- <el-table-column width="62" label="操作" align="center">
+ <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)">
定位
@@ -220,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