From af4c470e935458c8c91a8a4421e19b8811576846 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 11 Apr 2024 15:59:55 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/admin/module/business/oa/invoice/InvoiceController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
index 6b481897..8c216514 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
@@ -65,7 +65,7 @@ public class InvoiceController {
     }
 
     @Operation(summary = "删除发票信息 @author 善逸")
-    @GetMapping("/invoice/delete/{invoiceId}")
+    @GetMapping("/oa/invoice/delete/{invoiceId}")
     public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
         return invoiceService.deleteInvoice(invoiceId);
     }

From 2e0cb6a96d8044f412880794536862cfec9d826f Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 11 Apr 2024 16:40:38 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=9C=A8=E8=8E=B7=E5=8F=96=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E8=AF=A6=E6=83=85=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=88=86=E7=B1=BB=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/module/business/oa/notice/service/NoticeService.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
index 85d31eb4..446e1371 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
@@ -208,6 +208,8 @@ public class NoticeService {
         }
 
         NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class);
+        NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(noticeEntity.getNoticeTypeId());
+        updateFormVO.setNoticeTypeName(noticeType.getNoticeTypeName());
         if (!updateFormVO.getAllVisibleFlag()) {
             List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId);
             List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType()))

From 9100dc122520a3d362b4763184b196c29f7ec3e7 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 11 Apr 2024 20:24:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=8B=E8=BD=BD=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E4=BA=86=E4=B8=8B=E8=BD=BD=E6=97=B6=E6=95=B4=E4=B8=AA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=97=AA=E7=83=81=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=B8=E5=86=8C=E6=A0=B7=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/support/file-preview-modal/index.vue   |  3 +--
 .../src/components/support/file-preview/index.vue     | 11 ++++++-----
 .../src/views/support/feedback/feedback-list.vue      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
index 540faab3..d42d2efc 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
@@ -24,7 +24,6 @@
 
 <script setup>
   import { ref } from 'vue';
-  import { getDownload } from '/@/lib/axios';
   import { fileApi } from '/src/api/support/file-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
@@ -62,7 +61,7 @@
       setVisible(true);
       return;
     }
-    window.open(fileItem.fileUrl);
+    fileApi.downLoadFile(fileItem.fileKey);
   }
 
   // 判断图片类型
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue
index ae3eb60b..d5954551 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue
@@ -22,8 +22,9 @@
           v-for="(item, index) in fileList"
           :key="index"
           :src="item.fileUrl"
-          :style="{ display: type === 'text' ? 'none' : '' }"
+          :style="{ display: type === 'text' ? 'none' : '', padding: '2px', height: '100px' }"
           :width="width"
+          @click="preview(item, index)"
         />
       </a-image-preview-group>
     </a-space>
@@ -31,7 +32,7 @@
 </template>
 <script setup>
   import { ref } from 'vue';
-  import { getDownload } from '/@/lib/axios';
+  import { fileApi } from '/src/api/support/file-api';
 
   let props = defineProps({
     fileList: {
@@ -45,10 +46,10 @@
       type: String,
       default: 'text',
     },
-    // image宽度
+    // image 宽度
     width: {
       type: Number,
-      default: 150,
+      default: 100,
     },
     // 分隔符 可设置html标签 例如：<br/>
     separator: {
@@ -64,7 +65,7 @@
       previewCurrent.value = index;
       visible.value = true;
     } else {
-      window.open(file.fileUrl);
+      fileApi.downLoadFile(file.fileKey);
     }
   }
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue
index 5d9c1d09..5884cffb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue
@@ -45,7 +45,7 @@
     <a-table rowKey="feedbackId" :dataSource="tableData" :columns="tableColumns" :pagination="false" :loading="tableLoading" size="small" bordered>
       <template #bodyCell="{ text, column }">
         <template v-if="column.dataIndex === 'feedbackAttachment'">
-          <FilePreview :fileList="text" />
+          <FilePreview :fileList="text" type="picture" />
         </template>
         <template v-if="column.dataIndex === 'userType'">
           <span>{{ $smartEnumPlugin.getDescByValue('USER_TYPE_ENUM', text) }}</span>

From a90b8d114a6499ef5fc2a72852f1b5f72317ba74 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 11 Apr 2024 20:26:00 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E4=B8=8E=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/enterprise/enterprise-detail.vue       |   2 +-
 .../business/oa/notice/notice-detail.vue      | 138 ++++++-------
 .../oa/notice/notice-employee-detail.vue      | 192 +++++++++---------
 3 files changed, 162 insertions(+), 170 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
index 66a657cf..4ce4aa17 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
@@ -24,7 +24,7 @@
           <a-descriptions-item label="创建时间">{{ detail.createTime }}</a-descriptions-item>
           <a-descriptions-item label="创建人">{{ detail.createUserName }}</a-descriptions-item>
           <a-descriptions-item label="营业执照">
-            <FilePreview :default-file-list="detail.businessLicense" />
+            <FilePreview :file-list="detail.businessLicense" />
           </a-descriptions-item>
         </a-descriptions>
       </div>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
index 20255eb6..a3deb61f 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
@@ -9,7 +9,7 @@
 -->
 <template>
   <a-card style="margin-bottom: 15px" size="small">
-    <a-descriptions :title="noticeDetail.title" :columns="4" size="small">
+    <a-descriptions :title="noticeDetail.title" :column="4" size="small">
       <template #extra>
         <a-button v-if="!noticeDetail.publishFlag" type="primary" size="small" @click="onEdit">编辑</a-button>
       </template>
@@ -28,7 +28,7 @@
           <a class="file-item" v-for="item in noticeDetail.attachment" :key="item.fileId" @click="onPrevFile(item)">{{ item.fileName }}</a>
         </div>
       </a-descriptions-item>
-      <a-descriptions-item label="可见范围" :span="2">
+      <a-descriptions-item label="可见范围">
         <template v-if="noticeDetail.allVisibleFlag">全部可见</template>
         <div class="visible-list">
           <div class="visible-item" v-for="item in noticeDetail.visibleRangeList" :key="item.dataId">
@@ -59,86 +59,86 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import NoticeFormDrawer from './components/notice-form-drawer.vue';
-import NoticeViewRecordList from './components/notice-view-record-list.vue';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import NoticeFormDrawer from './components/notice-form-drawer.vue';
+  import NoticeViewRecordList from './components/notice-view-record-list.vue';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
-const route = useRoute();
+  const route = useRoute();
 
-const props = defineProps({
-  newsType: {
-    type: Number,
-  },
-});
+  const props = defineProps({
+    newsType: {
+      type: Number,
+    },
+  });
 
-const activeKey = ref(1);
+  const activeKey = ref(1);
 
-const noticeDetail = ref({});
-const noticeViewRecordList = ref();
+  const noticeDetail = ref({});
+  const noticeViewRecordList = ref();
 
-onMounted(() => {
-  if (route.query.noticeId) {
-    queryNoticeDetail();
-    noticeViewRecordList.value.onSearch();
+  onMounted(() => {
+    if (route.query.noticeId) {
+      queryNoticeDetail();
+      noticeViewRecordList.value.onSearch();
+    }
+  });
+
+  // 查询详情
+  async function queryNoticeDetail() {
+    try {
+      SmartLoading.show();
+      const result = await noticeApi.getUpdateNoticeInfo(route.query.noticeId);
+      noticeDetail.value = result.data;
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
   }
-});
 
-// 查询详情
-async function queryNoticeDetail() {
-  try {
-    SmartLoading.show();
-    const result = await noticeApi.getUpdateNoticeInfo(route.query.noticeId);
-    noticeDetail.value = result.data;
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
+  // 点击编辑
+  const noticeFormDrawerRef = ref();
+  function onEdit() {
+    noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
   }
-}
 
-// 点击编辑
-const noticeFormDrawerRef = ref();
-function onEdit() {
-  noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
-}
-
-// 预览附件
-const filePreviewRef = ref();
-function onPrevFile(fileItem) {
-  filePreviewRef.value.showPreview(fileItem);
-}
+  // 预览附件
+  const filePreviewRef = ref();
+  function onPrevFile(fileItem) {
+    filePreviewRef.value.showPreview(fileItem);
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-descriptions-item-content) {
-  flex: 1;
-  overflow: hidden;
-}
-.file-list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  .file-item {
-    display: block;
-    margin-right: 10px;
+  :deep(.ant-descriptions-item-content) {
+    flex: 1;
+    overflow: hidden;
   }
-}
-.visible-list {
-  display: flex;
-  flex-wrap: wrap;
-  .visible-item {
-    margin-right: 10px;
-    color: #666;
+  .file-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    .file-item {
+      display: block;
+      margin-right: 10px;
+    }
   }
-}
-.content-html {
-  img {
-    max-width: 100%;
+  .visible-list {
+    display: flex;
+    flex-wrap: wrap;
+    .visible-item {
+      margin-right: 10px;
+      color: #666;
+    }
+  }
+  .content-html {
+    img {
+      max-width: 100%;
+    }
   }
-}
 </style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
index 5fea6abf..cf65f437 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
@@ -27,127 +27,119 @@
       <!--endprint-->
     </div>
     <a-divider />
-    <div>附件：<file-preview :fileList="noticeDetail.attachment" /></div>
+    <div>
+      附件：
+      <file-preview v-if="!$lodash.isEmpty(noticeDetail.attachment)" :fileList="noticeDetail.attachment" />
+      <span v-else>无</span>
+    </div>
   </a-card>
 
   <a-card title="记录" size="small" class="smart-margin-top10">
     <NoticeViewRecordList ref="noticeViewRecordList" :noticeId="route.query.noticeId" />
   </a-card>
-
-  <!-- 预览附件 -->
-  <FilePreviewModal ref="filePreviewRef" />
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import NoticeViewRecordList from './components/notice-view-record-list.vue';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import FilePreview from '/@/components/support/file-preview/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import NoticeViewRecordList from './components/notice-view-record-list.vue';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import FilePreview from '/@/components/support/file-preview/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
-const route = useRoute();
+  const route = useRoute();
 
-const activeKey = ref(1);
+  const noticeDetail = ref({});
 
-const noticeDetail = ref({});
+  onMounted(() => {
+    if (route.query.noticeId) {
+      queryNoticeDetail();
+    }
+  });
 
-onMounted(() => {
-  if (route.query.noticeId) {
-    queryNoticeDetail();
+  const noticeViewRecordList = ref();
+
+  // 查询详情
+  async function queryNoticeDetail() {
+    try {
+      SmartLoading.show();
+      const result = await noticeApi.view(route.query.noticeId);
+      noticeDetail.value = result.data;
+
+      noticeViewRecordList.value.onSearch();
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
   }
-});
 
-const noticeViewRecordList = ref();
-
-// 查询详情
-async function queryNoticeDetail() {
-  try {
-    SmartLoading.show();
-    const result = await noticeApi.view(route.query.noticeId);
-    noticeDetail.value = result.data;
-
-    noticeViewRecordList.value.onSearch();
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
+  // 点击编辑
+  const noticeFormDrawerRef = ref();
+  function onEdit() {
+    noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
   }
-}
 
-// 点击编辑
-const noticeFormDrawerRef = ref();
-function onEdit() {
-  noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
-}
-
-// 预览附件
-const filePreviewRef = ref();
-function onPrevFile(fileItem) {
-  filePreviewRef.value.showPreview(fileItem);
-}
-
-// 打印
-function print() {
-  let bdhtml = window.document.body.innerHTML;
-  let sprnstr = '<!--startprint-->'; //必须在页面添加<!--startprint-->和<!--endprint-->而且需要打印的内容必须在它们之间
-  let eprnstr = '<!--endprint-->';
-  let prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
-  prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
-  let newWin = window.open(''); //新打开一个空窗口
-  newWin.document.body.innerHTML = prnhtml;
-  newWin.document.close(); //在IE浏览器中使用必须添加这一句
-  newWin.focus(); //在IE浏览器中使用必须添加这一句
-  newWin.print(); //打印
-  newWin.close(); //关闭窗口
-}
+  // 打印
+  function print() {
+    let bdhtml = window.document.body.innerHTML;
+    let sprnstr = '<!--startprint-->'; //必须在页面添加<!--startprint-->和<!--endprint-->而且需要打印的内容必须在它们之间
+    let eprnstr = '<!--endprint-->';
+    let prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
+    prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
+    let newWin = window.open(''); //新打开一个空窗口
+    newWin.document.body.innerHTML = prnhtml;
+    newWin.document.close(); //在IE浏览器中使用必须添加这一句
+    newWin.focus(); //在IE浏览器中使用必须添加这一句
+    newWin.print(); //打印
+    newWin.close(); //关闭窗口
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-descriptions-item-content) {
-  flex: 1;
-  overflow: hidden;
-}
-.file-list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  .file-item {
-    display: block;
-    margin-right: 10px;
+  :deep(.ant-descriptions-item-content) {
+    flex: 1;
+    overflow: hidden;
   }
-}
-.visible-list {
-  display: flex;
-  flex-wrap: wrap;
-  .visible-item {
-    margin-right: 10px;
-    color: #666;
-  }
-}
-.content-header {
-  .content-header-title {
-    margin: 10px 0px;
-    font-size: 18px;
-    font-weight: bold;
-    text-align: center;
-  }
-  .content-header-info {
-    margin: 10px 0px;
-    font-size: 14px;
-    color: #888;
-    text-align: center;
-    span {
-      margin: 0 10px;
-      cursor: pointer;
+  .file-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    .file-item {
+      display: block;
+      margin-right: 10px;
     }
   }
-}
-.content-html {
-  img {
-    max-width: 100%;
+  .visible-list {
+    display: flex;
+    flex-wrap: wrap;
+    .visible-item {
+      margin-right: 10px;
+      color: #666;
+    }
+  }
+  .content-header {
+    .content-header-title {
+      margin: 10px 0px;
+      font-size: 18px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .content-header-info {
+      margin: 10px 0px;
+      font-size: 14px;
+      color: #888;
+      text-align: center;
+      span {
+        margin: 0 10px;
+        cursor: pointer;
+      }
+    }
+  }
+  .content-html {
+    img {
+      max-width: 100%;
+    }
   }
-}
 </style>

From 52a7a5f839c5ad747fe80395069f72084e224964 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 11 Apr 2024 20:32:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=99=BB=E5=BD=95=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8E=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/login/login.vue          | 22 ++++++++++-------
 .../src/views/system/login2/login.vue         | 21 ++++++++++------
 .../src/views/system/login3/login.vue         | 24 ++++++++++++-------
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue
index 8db3613f..276a1756 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue
@@ -86,13 +86,13 @@
           <p class="line"></p>
         </div>
         <div class="login-type">
-          <img src="/@/assets/images/login/wechat-icon.png" />
-          <img src="/@/assets/images/login/ali-icon.png" />
-          <img src="/@/assets/images/login/douyin-icon.png" />
-          <img src="/@/assets/images/login/qq-icon.png" />
-          <img src="/@/assets/images/login/weibo-icon.png" />
-          <img src="/@/assets/images/login/feishu-icon.png" />
-          <img src="/@/assets/images/login/google-icon.png" />
+          <img :src="wechatIcon" />
+          <img :src="aliIcon" />
+          <img :src="douyinIcon" />
+          <img :src="qqIcon" />
+          <img :src="weiboIcon" />
+          <img :src="feishuIcon" />
+          <img :src="googleIcon" />
         </div>
       </div>
     </div>
@@ -106,10 +106,16 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
   import { useUserStore } from '/@/store/modules/system/user';
-  import gongzhonghao from '/@/assets/images/1024lab/1024lab-gzh.jpg';
   import zhuoda from '/@/assets/images/1024lab/zhuoda-wechat.jpg';
   import loginQR from '/@/assets/images/login/login-qr.png';
   import gzh from '/@/assets/images/1024lab/gzh.jpg';
+  import wechatIcon from '/@/assets/images/login/wechat-icon.png';
+  import aliIcon from '/@/assets/images/login/ali-icon.png';
+  import douyinIcon from '/@/assets/images/login/douyin-icon.png';
+  import qqIcon from '/@/assets/images/login/qq-icon.png';
+  import weiboIcon from '/@/assets/images/login/weibo-icon.png';
+  import feishuIcon from '/@/assets/images/login/feishu-icon.png';
+  import googleIcon from '/@/assets/images/login/google-icon.png';
 
   import { buildRoutes } from '/@/router/index';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.vue
index 67f34275..4a5577b6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.vue
@@ -50,13 +50,13 @@
           <p class="line"></p>
         </div>
         <div class="login-type">
-          <img src="/@/assets/images/login/wechat-icon.png" />
-          <img src="/@/assets/images/login/ali-icon.png" />
-          <img src="/@/assets/images/login/douyin-icon.png" />
-          <img src="/@/assets/images/login/qq-icon.png" />
-          <img src="/@/assets/images/login/weibo-icon.png" />
-          <img src="/@/assets/images/login/feishu-icon.png" />
-          <img src="/@/assets/images/login/google-icon.png" />
+          <img :src="wechatIcon" />
+          <img :src="aliIcon" />
+          <img :src="douyinIcon" />
+          <img :src="qqIcon" />
+          <img :src="weiboIcon" />
+          <img :src="feishuIcon" />
+          <img :src="googleIcon" />
         </div>
       </div>
     </div>
@@ -71,6 +71,13 @@
   import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
   import { useUserStore } from '/@/store/modules/system/user';
   import loginQR from '/@/assets/images/login/login-qr.png';
+  import wechatIcon from '/@/assets/images/login/wechat-icon.png';
+  import aliIcon from '/@/assets/images/login/ali-icon.png';
+  import douyinIcon from '/@/assets/images/login/douyin-icon.png';
+  import qqIcon from '/@/assets/images/login/qq-icon.png';
+  import weiboIcon from '/@/assets/images/login/weibo-icon.png';
+  import feishuIcon from '/@/assets/images/login/feishu-icon.png';
+  import googleIcon from '/@/assets/images/login/google-icon.png';
 
   import { buildRoutes } from '/@/router/index';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.vue
index 90c501dc..0df80a13 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.vue
@@ -15,7 +15,7 @@
         <p>欢迎登录 SmartAdmin V3</p>
         <p class="sub-welcome">高质量代码的快速开发平台</p>
       </div>
-      <img class="welcome-img" src="/@/assets/images/login/left-bg2.png" />
+      <img class="welcome-img" :src="leftBg2" />
     </div>
     <div class="box-item login">
       <img class="login-qr" :src="loginQR" />
@@ -51,13 +51,13 @@
           <p class="line"></p>
         </div>
         <div class="login-type">
-          <img src="/@/assets/images/login/wechat-icon.png" />
-          <img src="/@/assets/images/login/ali-icon.png" />
-          <img src="/@/assets/images/login/douyin-icon.png" />
-          <img src="/@/assets/images/login/qq-icon.png" />
-          <img src="/@/assets/images/login/weibo-icon.png" />
-          <img src="/@/assets/images/login/feishu-icon.png" />
-          <img src="/@/assets/images/login/google-icon.png" />
+          <img :src="wechatIcon" />
+          <img :src="aliIcon" />
+          <img :src="douyinIcon" />
+          <img :src="qqIcon" />
+          <img :src="weiboIcon" />
+          <img :src="feishuIcon" />
+          <img :src="googleIcon" />
         </div>
       </div>
     </div>
@@ -72,6 +72,14 @@
   import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
   import { useUserStore } from '/@/store/modules/system/user';
   import loginQR from '/@/assets/images/login/login-qr.png';
+  import leftBg2 from '/@/assets/images/login/left-bg2.png';
+  import wechatIcon from '/@/assets/images/login/wechat-icon.png';
+  import aliIcon from '/@/assets/images/login/ali-icon.png';
+  import douyinIcon from '/@/assets/images/login/douyin-icon.png';
+  import qqIcon from '/@/assets/images/login/qq-icon.png';
+  import weiboIcon from '/@/assets/images/login/weibo-icon.png';
+  import feishuIcon from '/@/assets/images/login/feishu-icon.png';
+  import googleIcon from '/@/assets/images/login/google-icon.png';
 
   import { buildRoutes } from '/@/router/index';
   import { smartSentry } from '/@/lib/smart-sentry';