From 5a31d4e9e41159c01127f798d2931b49af4e8167 Mon Sep 17 00:00:00 2001
From: jacky <phpcrazy@163.com>
Date: Mon, 29 Apr 2024 23:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |  2 +-
 src/style/main.scss                         |  3 +++
 src/view/ad/content.vue                     |  4 ----
 src/view/ad/position.vue                    |  6 -----
 src/view/content/academician/index.vue      | 18 ++++++--------
 src/view/content/activity/index.vue         |  2 --
 src/view/content/article/index.vue          | 14 ++++-------
 src/view/content/category/index.vue         |  1 -
 src/view/content/components/articleEdit.vue | 12 ----------
 src/view/content/entrepreneur/index.vue     | 18 ++++++--------
 src/view/content/fetcher/article.vue        | 24 +++++++++----------
 src/view/content/live/index.vue             | 26 ++++++---------------
 12 files changed, 41 insertions(+), 89 deletions(-)

diff --git a/.env.development b/.env.development
index d21c7d5..58df3b9 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 ENV = 'development'
-VITE_CLI_PORT = 8080
+VITE_CLI_PORT = 8088
 VITE_SERVER_PORT = 8888
 VITE_BASE_API = /api
 VITE_FILE_API = /api
diff --git a/src/style/main.scss b/src/style/main.scss
index a5ad070..4cec4bf 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -584,6 +584,9 @@ li {
             @apply px-0 py-2;
             .cell {
                 @apply leading-[40px] text-gray-600;
+                p {
+                    line-height: 2rem;
+                }
             }
         }
         .is-leaf {
diff --git a/src/view/ad/content.vue b/src/view/ad/content.vue
index db7b39d..3deb129 100644
--- a/src/view/ad/content.vue
+++ b/src/view/ad/content.vue
@@ -449,8 +449,4 @@ const uploadFailure = () => {
   display: block;
   width: 100%;
 }
-
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
 </style>
diff --git a/src/view/ad/position.vue b/src/view/ad/position.vue
index 63b4556..1580376 100644
--- a/src/view/ad/position.vue
+++ b/src/view/ad/position.vue
@@ -254,9 +254,3 @@ const uploadFailure = () => {
 }
 
 </script>
-
-<style scoped>
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-</style>
diff --git a/src/view/content/academician/index.vue b/src/view/content/academician/index.vue
index 35adeea..7f96a8e 100644
--- a/src/view/content/academician/index.vue
+++ b/src/view/content/academician/index.vue
@@ -39,15 +39,17 @@
         </el-table-column>
         <el-table-column align="left" label="姓名/职称" min-width="120" prop="name">
           <template #default="scope">
-            <el-link type="primary" :href="getAcademicianPreviewPath(scope.row.ID)" target="_blank">
-              <el-text size="large" tag="b">{{ scope.row.name }}</el-text>
-            </el-link>
-            <div>{{ scope.row.title }}</div>
+            <p>
+              <el-link type="primary" :href="getAcademicianPreviewPath(scope.row.ID)" target="_blank">
+                <el-text size="large" tag="b">{{ scope.row.name }}</el-text>
+              </el-link>
+            </p>
+            <p>{{ scope.row.title }}</p>
           </template>
         </el-table-column>
         <el-table-column align="left" label="简介" min-width="300" prop="brief" class-name="text-truncate">
           <template #default="scope">
-            <el-text :line-clamp="3">{{ scope.row.brief }}</el-text>
+            <p><el-text :line-clamp="3">{{ scope.row.brief }}</el-text></p>
           </template>
         </el-table-column>
         <el-table-column align="left" fixed="right" label="操作" width="200">
@@ -243,9 +245,3 @@ const handleSelectArticle = async (params, rows) => {
   }
 }
 </script>
-
-<style type="scss">
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-</style>
diff --git a/src/view/content/activity/index.vue b/src/view/content/activity/index.vue
index 0b0b1f2..1144a73 100755
--- a/src/view/content/activity/index.vue
+++ b/src/view/content/activity/index.vue
@@ -97,8 +97,6 @@
         <el-table-column align="left" label="标题" prop="title" width="120" />
         <el-table-column align="left" label="主办单位" prop="organizer" width="120" />
         <el-table-column align="left" label="活动地址" prop="activeAddr" width="120" />
-        <el-table-column align="left" label="报名链接地址" prop="signUrl" width="120" />
-        <el-table-column align="left" label="直播链接地址" prop="liveUrl" width="120" />
         <el-table-column align="left" label="开始时间" width="180">
           <template #default="scope">{{ formatDate(scope.row.startTime) }}</template>
         </el-table-column>
diff --git a/src/view/content/article/index.vue b/src/view/content/article/index.vue
index d735e66..a6a895a 100644
--- a/src/view/content/article/index.vue
+++ b/src/view/content/article/index.vue
@@ -50,13 +50,13 @@
         <el-table-column align="left" label="ID" min-width="60" prop="ID" />
         <el-table-column align="left" label="标题/副标题" min-width="400" prop="title">
           <template #default="scope">
-            <div>
+            <p>
               <el-link type="primary" :href="getArticlePreviewPath(scope.row.ID)" target="_blank"
                 rel="noopener noreferrer">
                 <el-text :line-clamp="2"> {{ scope.row.title }}</el-text>
               </el-link>
-            </div>
-            <el-text :line-clamp="2" size="small">{{ scope.row.subtitle }}</el-text>
+            </p>
+            <p><el-text :line-clamp="2" size="small">{{ scope.row.subtitle }}</el-text></p>
           </template>
         </el-table-column>
         <el-table-column align="left" label="摘要" min-width="400" prop="desc" class-name="text-truncate">
@@ -74,8 +74,8 @@
         </el-table-column>
         <el-table-column align="left" label="时间" width="280">
           <template #default="scope">
-            <div><b>发布时间：</b>{{ formatDate(scope.row.publishDate) }}</div>
-            <div><b>最后更新：</b>{{ formatDate(scope.row.UpdatedAt) }}</div>
+            <p><b>发布时间：</b>{{ formatDate(scope.row.publishDate) }}</p>
+            <p><b>最后更新：</b>{{ formatDate(scope.row.UpdatedAt) }}</p>
           </template>
         </el-table-column>
         <el-table-column align="left" label="所属栏目" prop="categories" width="180">
@@ -517,10 +517,6 @@ getTableData()
 </script>
 
 <style type="scss">
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-
 .cell button {
   line-height: 22px;
 }
diff --git a/src/view/content/category/index.vue b/src/view/content/category/index.vue
index 1c6b929..091db49 100644
--- a/src/view/content/category/index.vue
+++ b/src/view/content/category/index.vue
@@ -226,4 +226,3 @@ const clickEdit = async (ID) => {
 }
 
 </script>
-@/api/category
\ No newline at end of file
diff --git a/src/view/content/components/articleEdit.vue b/src/view/content/components/articleEdit.vue
index b1fcf27..c5715e5 100644
--- a/src/view/content/components/articleEdit.vue
+++ b/src/view/content/components/articleEdit.vue
@@ -486,18 +486,6 @@ defineExpose({ openPage })
 </script>
 
 <style type="scss">
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-
-.text-truncate .cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 4;
-  -webkit-box-orient: vertical;
-}
-
 .img-item {
   width: 90px;
   height: 90px;
diff --git a/src/view/content/entrepreneur/index.vue b/src/view/content/entrepreneur/index.vue
index 9681ad3..8979e4a 100644
--- a/src/view/content/entrepreneur/index.vue
+++ b/src/view/content/entrepreneur/index.vue
@@ -39,15 +39,17 @@
         </el-table-column>
         <el-table-column align="left" label="姓名/企业" min-width="120" prop="name">
           <template #default="scope">
-            <el-link type="primary" :href="getEntrepreneurPreviewPath(scope.row.ID)" target="_blank">
-              <el-text size="large" tag="b">{{ scope.row.name }}</el-text>
-            </el-link>
-            <div>{{ scope.row.enterprise }}</div>
+            <p>
+              <el-link type="primary" :href="getEntrepreneurPreviewPath(scope.row.ID)" target="_blank">
+                <el-text size="large" tag="b">{{ scope.row.name }}</el-text>
+              </el-link>
+            </p>
+            <p>{{ scope.row.enterprise }}</p>
           </template>
         </el-table-column>
         <el-table-column align="left" label="介绍" min-width="300" prop="brief" class-name="text-truncate">
           <template #default="scope">
-            <el-text :line-clamp="3">{{ scope.row.brief }}</el-text>
+            <p><el-text :line-clamp="3">{{ scope.row.brief }}</el-text></p>
           </template>
         </el-table-column>
         <el-table-column align="left" fixed="right" label="操作" width="160">
@@ -200,9 +202,3 @@ const handlerFormSave = () => {
   getTableData()
 }
 </script>
-
-<style type="scss">
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-</style>
diff --git a/src/view/content/fetcher/article.vue b/src/view/content/fetcher/article.vue
index 486376a..edc6de9 100644
--- a/src/view/content/fetcher/article.vue
+++ b/src/view/content/fetcher/article.vue
@@ -47,18 +47,20 @@
         <el-table-column align="left" label="ID" min-width="60" prop="ID" />
         <el-table-column align="left" label="标题" min-width="300" prop="title">
           <template #default="scope">
-            <el-text tag="b">{{ scope.row.title }}</el-text>
-            <el-link v-if="scope.row.sourceUrl != ''" type="primary" :href="scope.row.sourceUrl" target="_blank">
-              <el-icon>
-                <Link />
-              </el-icon>
-              查看原文
-            </el-link>
+            <p>
+              <el-text tag="b">{{ scope.row.title }}</el-text>
+              <el-link v-if="scope.row.sourceUrl != ''" type="primary" :href="scope.row.sourceUrl" target="_blank">
+                <el-icon>
+                  <Link />
+                </el-icon>
+                查看原文
+              </el-link>
+            </p>
           </template>
         </el-table-column>
         <el-table-column align="left" label="来源" min-width="240" prop="source" />
         <el-table-column align="left" label="作者" min-width="100" prop="author" />
-        <el-table-column align="left" label="采集时间" min-width="120" prop="createtime">
+        <el-table-column align="left" label="采集时间" min-width="160" prop="createtime">
           <template #default="scope">
             {{ formatDate(scope.row.createTime) }}
           </template>
@@ -68,7 +70,7 @@
             {{ formatStatus(scope.row.state) }}
           </template>
         </el-table-column>
-        <el-table-column align="left" label="发布时间" min-width="120" prop="createtime">
+        <el-table-column align="left" label="发布时间" min-width="160" prop="createtime">
           <template #default="scope">
             {{ formatDate(scope.row.publicTime) }}
           </template>
@@ -185,10 +187,6 @@ const handlerSaveArticle = () => {
 </script>
 
 <style type="scss">
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-
 .text-truncate .cell {
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/src/view/content/live/index.vue b/src/view/content/live/index.vue
index 030c929..8ceb9e4 100644
--- a/src/view/content/live/index.vue
+++ b/src/view/content/live/index.vue
@@ -54,31 +54,23 @@
           </template>
         </el-table-column>
         <el-table-column align="left" label="ID" min-width="50" prop="ID" />
-        <el-table-column align="left" label="封面" min-width="140" prop="cover">
+        <el-table-column align="left" label="封面" min-width="160" prop="cover">
           <template #default="scope">
             <el-image :src="scope.row.cover" class="gva-image" fit="contain" :preview-src-list="[scope.row.cover]"
               preview-teleported hide-on-click-modal close-on-press-escape />
           </template>
         </el-table-column>
         <el-table-column align="left" label="标题" min-width="220" prop="title" />
-        <el-table-column align="left" label="直播/回放地址" min-width="350" prop="liveUrl">
+        <el-table-column align="left" label="直播/回放地址" min-width="450" prop="liveUrl">
           <template #default="scope">
-            <div>
-              直播：<el-text>{{ scope.row.liveUrl }}</el-text>
-            </div>
-            <div>
-              回放：<el-text>{{ scope.row.replayUrl }}</el-text>
-            </div>
+            <p>直播：<el-text>{{ scope.row.liveUrl }}</el-text></p>
+            <p>回放：<el-text>{{ scope.row.replayUrl }}</el-text></p>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="直播时间" min-width="180" prop="liveTime">
+        <el-table-column align="left" label="直播时间" min-width="220" prop="liveTime">
           <template #default="scope">
-            <div>
-              开始：<el-text>{{ formatDate(scope.row.startTime) }}</el-text>
-            </div>
-            <div>
-              结束：<el-text>{{ formatDate(scope.row.endTime) }}</el-text>
-            </div>
+            <p>开始：<el-text>{{ formatDate(scope.row.startTime) }}</el-text></p>
+            <p>结束：<el-text>{{ formatDate(scope.row.endTime) }}</el-text></p>
           </template>
         </el-table-column>
         <el-table-column align="left" fixed="right" label="操作" width="160">
@@ -440,10 +432,6 @@ const uploadFailure = () => {
 </script>
 
 <style scoped>
-.admin-box .el-table td .cell {
-  line-height: 28px;
-}
-
 .gva-multi-input {
   margin-bottom: 15px;
 }