From 2676f45f33b9dedb80d0417e5af603df41216f0b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Nov 2024 18:31:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/views/space/components/box/dataContent.vue | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 8f5a2c3..3f74573 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-15 14:58:23
+ * @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,7 +111,7 @@
// 行点击
-function rowClick(row) {
+function rowClick (row) {
// if (state.layer) {
// window.$viewer.removeLayer(state.layer)
@@ -139,7 +138,7 @@
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -154,7 +153,7 @@
// 重置分页数据
const resetPage = () => {
pages.page = 1
- pages.pageSize = 10
+ pages.pageSize = 20
pages.total = 0
}
@@ -181,14 +180,20 @@
<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 border :data="tableData" :height="curTableHeight" style="width: 100%" v-loading="loading">
+ <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 prop="name" label="名称" />
- <el-table-column prop="emergencySpaceType" label="类型" width="130" />
- <el-table-column prop="mainFuncName" label="作用" width="70" />
- <el-table-column width="70" label="操作" align="center">
+ <el-table-column prop="mainFuncName" label="作用" width="62" />
+ <el-table-column width="62" label="操作" align="center">
<template #default="scope">
<el-button link type="primary" size="small" :disabled="scope.row.lng == ''" @click="rowClick(scope.row)">
定位
--
Gitblit v1.9.3