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 | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 0b98fea..41e53d7 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -191,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)">
定位
--
Gitblit v1.9.3