From 8c5302ffa364fe4346a5e2dfa7aeda89ec231a0a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Nov 2024 15:37:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/styles/base/dc-base.scss | 2 +-
src/router/index.js | 7 ++++++-
src/views/space/components/box/dataContent.vue | 7 ++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 30329ec..1782af6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 16:35:31
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-11 18:38:01
+ * @LastEditTime: 2024-11-21 15:35:48
* @FilePath: \bigScreen\src\router\index.js
* @Description:
*
@@ -15,6 +15,11 @@
const companyInfo = () => import('@/views/companyInfo/index.vue')
const routes = [
{
+ path: '/:catchAll(.*)',
+ name: 'not-found',
+ redirect: '/layout',
+ },
+ {
path: '',
redirect: '/layout',
},
diff --git a/src/styles/base/dc-base.scss b/src/styles/base/dc-base.scss
index 34cefc7..f34a835 100644
--- a/src/styles/base/dc-base.scss
+++ b/src/styles/base/dc-base.scss
@@ -157,7 +157,7 @@
}
.map-name {
- color: rgb(66, 165, 252);
+ color: #FFEB3B;
}
.map-icon {
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