From ca16ebcf4972e068c414f98b7952756407891391 Mon Sep 17 00:00:00 2001
From: jacky <phpcrazy@163.com>
Date: Wed, 24 Apr 2024 22:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E6=96=87=E7=AB=A0=E9=BB=98=E8=AE=A4=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=B6=E9=97=B4=E4=B8=BA=E7=8E=B0=E5=9C=A8=20?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=E4=B8=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/chooseImg/index.vue          |  2 +-
 src/style/main.scss                         |  8 ++++++++
 src/view/ad/content.vue                     |  8 ++++----
 src/view/ad/position.vue                    |  2 +-
 src/view/content/academician/index.vue      |  4 ++--
 src/view/content/article/index.vue          |  3 +--
 src/view/content/components/articleEdit.vue | 14 +++++++++-----
 src/view/content/entrepreneur/index.vue     |  2 +-
 src/view/content/live/index.vue             |  6 +++---
 src/view/mediaFile/index.vue                |  5 +++--
 10 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/components/chooseImg/index.vue b/src/components/chooseImg/index.vue
index 5a14795..ed3ebc3 100644
--- a/src/components/chooseImg/index.vue
+++ b/src/components/chooseImg/index.vue
@@ -21,7 +21,7 @@
     <div class="media">
       <div v-for="(item, key) in picList" :key="key" class="media-box">
         <div class="img-box-list">
-          <el-image :key="key" fit="cover" :src="getUrl(item.url)" style="width: 138px; height: 138px;"
+          <el-image :key="key" fit="contain" :src="getUrl(item.url)" style="width: 138px; height: 138px;"
             @click="chooseImg(item)">
             <template #error>
               <div class="img-box-list">
diff --git a/src/style/main.scss b/src/style/main.scss
index 2e2606a..18a30eb 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -705,3 +705,11 @@ li {
   line-height: 1.2;
   margin-bottom: 15px;
 }
+
+.gva-image {
+  width: 120px;
+  height: 80px;
+  background: #F5F7FA;
+  padding: 6px;
+  border-radius: 5px;
+}
diff --git a/src/view/ad/content.vue b/src/view/ad/content.vue
index b1aa9e3..e96f80f 100644
--- a/src/view/ad/content.vue
+++ b/src/view/ad/content.vue
@@ -11,9 +11,9 @@
         <el-table-column align="left" label="ID" min-width="60" prop="ID" />
         <el-table-column align="left" label="媒体文件" min-width="160" prop="mediaUrl">
           <template #default="scope">
-            <el-image v-if="scope.row.adType === 1 || scope.row.adType === 3" :src="scope.row.mediaUrl" class="file"
-              fit="cover" :preview-src-list="[scope.row.mediaUrl]" preview-teleported hide-on-click-modal
-              close-on-press-escape style="width: 120px; height: 80px" />
+            <el-image v-if="scope.row.adType === 1 || scope.row.adType === 3" :src="scope.row.mediaUrl"
+              class="gva-image" fit="contain" :preview-src-list="[scope.row.mediaUrl]" preview-teleported
+              hide-on-click-modal close-on-press-escape />
             <div v-else-if="scope.row.adType === 2">
               <video :src="scope.row.mediaUrl" controls="controls" style="width: 120px; height: 80px" />
             </div>
@@ -459,7 +459,7 @@ const uploadFailure = () => {
 }
 </style>
 
-<style>
+<style scope>
 .avatar-uploader .el-upload {
   border: 1px solid var(--el-border-color);
   border-radius: 6px;
diff --git a/src/view/ad/position.vue b/src/view/ad/position.vue
index 813bee9..544eb67 100644
--- a/src/view/ad/position.vue
+++ b/src/view/ad/position.vue
@@ -8,7 +8,7 @@
         <el-table-column align="left" label="ID" min-width="50" prop="ID" />
         <el-table-column align="left" label="示例图片" min-width="100" prop="position">
           <template #default="scope">
-            <el-image :src="scope.row.imgUrl" class="file" fit="cover" :preview-src-list="[scope.row.imgUrl]"
+            <el-image :src="scope.row.imgUrl" class="gva-image" fit="contain" :preview-src-list="[scope.row.imgUrl]"
               preview-teleported hide-on-click-modal close-on-press-escape style="width: 100px; height: 100px" />
           </template>
         </el-table-column>
diff --git a/src/view/content/academician/index.vue b/src/view/content/academician/index.vue
index 2d75de3..35adeea 100644
--- a/src/view/content/academician/index.vue
+++ b/src/view/content/academician/index.vue
@@ -32,9 +32,9 @@
         </el-table-column>
         <el-table-column align="left" label="头像" min-width="120" prop="avatar">
           <template #default="scope">
-            <el-image v-if="scope.row.avatar" :src="scope.row.avatar" class="file" fit="cover"
+            <el-image v-if="scope.row.avatar" :src="scope.row.avatar" class="gva-image" fit="contain"
               :preview-src-list="[scope.row.avatar]" preview-teleported hide-on-click-modal close-on-press-escape
-              style="max-width: 70px; max-height: 90px" />
+              style="max-width: 80px; max-height: 100px" />
           </template>
         </el-table-column>
         <el-table-column align="left" label="姓名/职称" min-width="120" prop="name">
diff --git a/src/view/content/article/index.vue b/src/view/content/article/index.vue
index ea6e964..4a45a3e 100644
--- a/src/view/content/article/index.vue
+++ b/src/view/content/article/index.vue
@@ -44,7 +44,6 @@
         <el-button v-auth="btnAuth.delete" icon="delete" style="margin-left: 10px;"
           :disabled="!multipleSelection.length" @click="handleMultiDelete">删除</el-button>
       </div>
-
       <!-- 由于此处菜单跟左侧列表一一对应所以不需要分页 pageSize默认999 -->
       <el-table ref="multipleTable" :data="tableData" row-key="ID" @selection-change="handleSelectionChange">
         <el-table-column fixed type="selection" width="40" align="center" />
@@ -103,7 +102,7 @@
         <el-table-column align="left" label="状态" width="80">
           <template #default="scope">{{ formatStatus(scope.row.status) }}</template>
         </el-table-column>
-        <el-table-column align="left" fixed="right" label="操作" width="140" class="dispose-cell">
+        <el-table-column align="left" fixed="right" label="操作" width="80" class="dispose-cell">
           <template #default="scope">
             <div class="flex md-2">
               <el-button v-if="scope.row.status === 1" v-auth="btnAuth.submit" type="success" link icon="check"
diff --git a/src/view/content/components/articleEdit.vue b/src/view/content/components/articleEdit.vue
index cc68739..28bb1bd 100644
--- a/src/view/content/components/articleEdit.vue
+++ b/src/view/content/components/articleEdit.vue
@@ -65,6 +65,9 @@
               <el-divider direction="vertical" style="height: 100%" />
             </el-col>
             <el-col :span="6">
+              <el-form-item label="发布时间" prop="publishDate">
+                <el-date-picker v-model="editForm.publishDate" type="datetime" placeholder="请选择" style="width:100%" />
+              </el-form-item>
               <el-form-item label="摘要" prop="desc">
                 <el-input v-model="editForm.desc" type="textarea" rows="7" :show-word-limit="true" maxlength="100"
                   autocomplete="off" resize="none" />
@@ -80,9 +83,6 @@
               <el-form-item label="跳转链接" prop="url">
                 <el-input v-model="editForm.url" autocomplete="off" placeholder="https://" clearable />
               </el-form-item>
-              <el-form-item label="发布时间">
-                <el-date-picker v-model="editForm.publishDate" type="datetime" placeholder="请选择" style="width:100%" />
-              </el-form-item>
               <el-form-item label="文章标签" prop="tags">
                 <div class="flex flex-wrap gap-2">
                   <el-tag v-for="(item, index) in tagList" :key="index" type="info" closable size="large"
@@ -157,6 +157,7 @@ import {
 import { importFetcherArticleById } from '@/api/fetcher'
 import { isUrl } from '@/utils/validator'
 import { articleTypeOptions } from '@/utils/options'
+import { formatDate } from '@/utils/format'
 
 // 组件定义
 defineOptions({
@@ -203,6 +204,9 @@ const formRules = reactive({
   content: [
     { required: true, message: '请输入文章内容', trigger: 'blur' }
   ],
+  publishDate: [
+    { required: true, message: '请选择发布时间', trigger: 'blur' }
+  ],
   url: [
     { validator: isUrl, message: '请输入正确的跳转地址', trigger: 'blur' }
   ]
@@ -292,11 +296,12 @@ const emptyForm = () => {
     desc: '',
     source: '',
     url: '',
-    publishDate: '',
+    publishDate: formatDate(new Date()),
     articleTime: '',
     tags: '',
     imgs: '',
   }
+  console.log(editForm.value)
 }
 
 // 初始化方法
@@ -360,7 +365,6 @@ const initFormByFetcher = async (id) => {
     editForm.value.author = author
     editForm.value.source = source
     editForm.value.content = content
-    editForm.value.publishDate = publicTime
     editForm.value.articleTime = publicTime
     editForm.value.articleType = 1
   } else {
diff --git a/src/view/content/entrepreneur/index.vue b/src/view/content/entrepreneur/index.vue
index e02afdd..9681ad3 100644
--- a/src/view/content/entrepreneur/index.vue
+++ b/src/view/content/entrepreneur/index.vue
@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column align="left" label="头像" min-width="120" prop="avatar">
           <template #default="scope">
-            <el-image v-if="scope.row.avatar" :src="scope.row.avatar" class="file" fit="cover"
+            <el-image v-if="scope.row.avatar" :src="scope.row.avatar" class="gva-image" fit="contain"
               :preview-src-list="[scope.row.avatar]" preview-teleported hide-on-click-modal close-on-press-escape
               style="max-width: 70px; max-height: 90px" />
           </template>
diff --git a/src/view/content/live/index.vue b/src/view/content/live/index.vue
index 2fb1398..b5052bb 100644
--- a/src/view/content/live/index.vue
+++ b/src/view/content/live/index.vue
@@ -54,10 +54,10 @@
           </template>
         </el-table-column>
         <el-table-column align="left" label="ID" min-width="50" prop="ID" />
-        <el-table-column align="left" label="封面" min-width="120" prop="cover">
+        <el-table-column align="left" label="封面" min-width="140" prop="cover">
           <template #default="scope">
-            <el-image :src="scope.row.cover" class="file" fit="cover" :preview-src-list="[scope.row.cover]"
-              preview-teleported hide-on-click-modal close-on-press-escape style="width: 100px; height: 100px" />
+            <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" />
diff --git a/src/view/mediaFile/index.vue b/src/view/mediaFile/index.vue
index 86e84f4..f12e8f2 100644
--- a/src/view/mediaFile/index.vue
+++ b/src/view/mediaFile/index.vue
@@ -14,8 +14,9 @@
       <el-table :data="tableData">
         <el-table-column align="left" label="预览" width="110">
           <template #default="scope">
-            <el-image :src="getUrl(scope.row.url)" class="file" fit="cover" :preview-src-list="[getUrl(scope.row.url)]"
-              :preview-teleported="true" style="width: 80px; height: 80px" />
+            <el-image :src="getUrl(scope.row.url)" class="gva-image" fit="contain"
+              :preview-src-list="[getUrl(scope.row.url)]" :preview-teleported="true"
+              style="width: 100px; height: 100px;" />
           </template>
         </el-table-column>
         <el-table-column align="left" label="日期" prop="UpdatedAt" width="180">