From f353388f494f4ffa7a366ceeddd23e5d35b20820 Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Wed, 3 Jul 2024 13:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/oss/index.ts                   | 16 ++++++++
 src/components/FileMd5Upload/index.vue        |  8 +++-
 .../resourceMgt/catalogResourceMgt/index.vue  | 41 ++++++++++---------
 .../resourceMgt/catalogTextbookMgt/index.vue  | 23 ++++++++++-
 src/views/system/tenant/index.vue             |  4 +-
 src/views/system/user/index.vue               |  4 +-
 6 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/src/api/system/oss/index.ts b/src/api/system/oss/index.ts
index 7346b24..ceb6693 100644
--- a/src/api/system/oss/index.ts
+++ b/src/api/system/oss/index.ts
@@ -145,6 +145,14 @@ export function pageResource(query: any): AxiosPromise<any[]> {
   });
 }
 
+export function awaitResourceCount(query: any): AxiosPromise<number> {
+  return request({
+    url: '/file/resource/await/count',
+    method: 'get',
+    params: query
+  });
+}
+
 export function pagePerson(query: any): AxiosPromise<any[]> {
   return request({
     url: '/oss/person/pageList',
@@ -153,6 +161,14 @@ export function pagePerson(query: any): AxiosPromise<any[]> {
   });
 }
 
+export function awaitTextbookCount(query: any): AxiosPromise<number> {
+  return request({
+    url: '/file/textbook/await/count',
+    method: 'get',
+    params: query
+  });
+}
+
 export function awaitTexbookList(query: any): AxiosPromise<any[]> {
   return request({
     url: '/file/textbook/await/pageList',
diff --git a/src/components/FileMd5Upload/index.vue b/src/components/FileMd5Upload/index.vue
index 1bced9e..42340a8 100644
--- a/src/components/FileMd5Upload/index.vue
+++ b/src/components/FileMd5Upload/index.vue
@@ -17,6 +17,12 @@
         <b style="color: #f56c6c">{{ fileType.join('、') }}</b>
       </template>
       格式文件
+      <p>
+        文件大小限制
+        <template v-if="fileSize">
+          <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        </template>
+      </p>
     </div>
     <!-- 文件列表 -->
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
@@ -48,7 +54,7 @@ const props = defineProps({
   // 大小限制(MB)
   fileSize: propTypes.number.def(1024),
   // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt', 'jpg', 'png', 'jpeg', 'gif', 'bmp', 'mp4', 'mov', 'wmv', 'flv', 'avi', 'mkv', 'mp3', 'wma']),
+  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt', 'jpg', 'png', 'jpeg', 'gif', 'bmp', 'mp4', 'mov', 'wmv', 'flv', 'avi', 'mkv', 'mp3', 'wma', 'zip', 'rar']),
   // 是否显示提示
   isShowTip: propTypes.bool.def(true)
 });
diff --git a/src/views/resourceMgt/catalogResourceMgt/index.vue b/src/views/resourceMgt/catalogResourceMgt/index.vue
index 45847f2..d0bbc0f 100644
--- a/src/views/resourceMgt/catalogResourceMgt/index.vue
+++ b/src/views/resourceMgt/catalogResourceMgt/index.vue
@@ -5,8 +5,14 @@
         <div class="top">
           <el-button type="" text="plain">全部专题资源</el-button>
           <br>
-          <el-button v-hasPermi="['file:textbook:awaitList']" :class="['btn-audit', isAudit && 'active']" type=""
+
+          <el-badge v-if="auditNum > 0" :value="auditNum" style="margin-left:10px;margin-top: 10px;">
+            <el-button v-hasPermi="['file:resource:awaitList']" :class="['btn-audit', isAudit && 'active']" type=""
+              text="plain" @click="handleAudit">待审核</el-button>
+          </el-badge>
+          <el-button v-else v-hasPermi="['file:resource:awaitList']" :class="['btn-audit', isAudit && 'active']" type=""
             text="plain" @click="handleAudit">待审核</el-button>
+
           <div class="tree-container-scroll">
             <el-scrollbar>
               <el-tree ref="treeRef" v-loading="treeLoading" :data="treeData" :props="defaultProps" default-expand-all
@@ -175,7 +181,7 @@
 </template>
 
 <script setup name="Oss" lang="ts">
-import { pageResource, awaitResourceList, previewResource, previewResourceTxt, delResource, addResource, reviewResource, copyResource, moveResource } from '@/api/system/oss';
+import { pageResource, awaitResourceList, awaitResourceCount, previewResource, delResource, addResource, reviewResource, copyResource, moveResource } from '@/api/system/oss';
 import FileMd5Upload from '@/components/FileMd5Upload/index.vue';
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types';
 import { listCatalogResource } from "@/api/resource/catalogResource";
@@ -327,6 +333,7 @@ function reset() {
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
+  awaitResourceCountData()
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -344,24 +351,7 @@ function handleSelectionChange(selection: OssVO[]) {
 const handleHeaderClass = ({ column }: any): any => {
   column.order = column.multiOrder;
 };
-/** 点击表头进行排序 */
-const handleHeaderCLick = (column: any) => {
-  if (column.sortable !== 'custom') {
-    return;
-  }
-  switch (column.multiOrder) {
-    case 'descending':
-      column.multiOrder = 'ascending';
-      break;
-    case 'ascending':
-      column.multiOrder = '';
-      break;
-    default:
-      column.multiOrder = 'descending';
-      break;
-  }
-  handleOrderChange(column.property, column.multiOrder);
-};
+
 const handleOrderChange = (prop: string, order: string) => {
   let orderByArr = queryParams.value.orderByColumn ? queryParams.value.orderByColumn.split(',') : [];
   let isAscArr = queryParams.value.isAsc ? queryParams.value.isAsc.split(',') : [];
@@ -384,6 +374,7 @@ const handleOrderChange = (prop: string, order: string) => {
   queryParams.value.orderByColumn = orderByArr.join(',');
   queryParams.value.isAsc = isAscArr.join(',');
   getList();
+  awaitResourceCountData()
 };
 
 /** 文件按钮操作 */
@@ -406,6 +397,7 @@ const submitForm = async () => {
   await addResource({ ossId, catalogId, fileName: fileName.value })
   dialog.visible = false;
   getList();
+  awaitResourceCountData()
 };
 
 const submitMoveForm = () => {
@@ -487,6 +479,7 @@ const handleAudit = () => {
   isTree.value = false
 
   getList()
+  awaitResourceCountData()
 }
 
 const handleNode = (node: any) => {
@@ -498,6 +491,7 @@ const handleNode = (node: any) => {
 
   queryParams.value.catalogId = node.catalogId
   getList()
+  awaitResourceCountData()
 }
 
 const preViewUrl = import.meta.env.VITE_APP_PREVIEW
@@ -518,9 +512,16 @@ const getlistCatalogResource = async () => {
   }
 }
 
+const auditNum = ref(0)
+const awaitResourceCountData = async () => {
+  const res = await awaitResourceCount(queryParams.value)
+  auditNum.value = res.data
+}
+
 onMounted(() => {
   getlistCatalogResource()
   getList();
+  awaitResourceCountData()
 });
 </script>
 
diff --git a/src/views/resourceMgt/catalogTextbookMgt/index.vue b/src/views/resourceMgt/catalogTextbookMgt/index.vue
index d8415cc..8da2b82 100644
--- a/src/views/resourceMgt/catalogTextbookMgt/index.vue
+++ b/src/views/resourceMgt/catalogTextbookMgt/index.vue
@@ -12,8 +12,15 @@
           <div class="line"></div>
           <el-button type="" text="plain">全部文件</el-button>
           <br>
-          <el-button v-hasPermi="['file:textbook:awaitList']" :class="['btn-audit', isAudit && 'active']" type=""
+
+
+          <el-badge v-if="auditNum > 0" :value="auditNum" style="margin-left:10px;margin-top: 10px;">
+            <el-button v-hasPermi="['file:textbook:awaitList']" :class="['btn-audit', isAudit && 'active']" type=""
+              text="plain" @click="handleAudit">待审核</el-button>
+          </el-badge>
+          <el-button v-else v-hasPermi="['file:textbook:awaitList']" :class="['btn-audit', isAudit && 'active']" type=""
             text="plain" @click="handleAudit">待审核</el-button>
+
           <div class="tree-container-scroll">
             <el-scrollbar>
               <el-tree ref="treeRef" v-loading="treeLoading" :data="treeData" :props="defaultProps" default-expand-all
@@ -182,7 +189,7 @@
 </template>
 
 <script setup name="Oss" lang="ts">
-import { pageTextbook, awaitTexbookList, previewTextbook, previewTextbookTxt, delTextbook, addTextbook, reviewTextbook, copyTextbook, moveTextbook } from '@/api/system/oss';
+import { pageTextbook, awaitTexbookList, previewTextbook, awaitTextbookCount, delTextbook, addTextbook, reviewTextbook, copyTextbook, moveTextbook } from '@/api/system/oss';
 import FileMd5Upload from '@/components/FileMd5Upload/index.vue';
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types';
 import { listCatalogTextbook } from "@/api/resource/catalogTextbook";
@@ -308,6 +315,7 @@ const { queryParams, form, rules } = toRefs(data);
 
 const handleTypeChange = () => {
   getList()
+  awaitTextbookCountData()
 }
 
 /** 查询OSS对象存储列表 */
@@ -339,6 +347,7 @@ function reset() {
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
+  awaitTextbookCountData()
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -384,6 +393,7 @@ const submitForm = async () => {
   await addTextbook({ ossId, catalogId, fileName: fileName.value, type: queryParams.value.type })
   dialog.visible = false;
   getList();
+  awaitTextbookCountData()
 };
 
 const submitMoveForm = () => {
@@ -465,6 +475,7 @@ const handleAudit = () => {
   isTree.value = false
 
   getList()
+  awaitTextbookCountData()
 }
 
 const handleNode = (node: any) => {
@@ -476,6 +487,7 @@ const handleNode = (node: any) => {
 
   queryParams.value.catalogId = node.catalogId
   getList()
+  awaitTextbookCountData()
 }
 
 const preViewUrl = import.meta.env.VITE_APP_PREVIEW
@@ -496,9 +508,16 @@ const getListCatalogTextbook = async () => {
   }
 }
 
+const auditNum = ref(0)
+const awaitTextbookCountData = async () => {
+  const res = await awaitTextbookCount(queryParams.value)
+  auditNum.value = res.data
+}
+
 onMounted(() => {
   getListCatalogTextbook()
   getList();
+  awaitTextbookCountData()
 });
 </script>
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 8be63df..5e7cc1f 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -106,7 +106,9 @@
           <el-input v-model="form.username" placeholder="请输入系统用户名" maxlength="30" />
         </el-form-item>
         <el-form-item v-if="!form.id" label="用户密码" prop="password">
-          <el-input v-model="form.password" type="password" placeholder="请输入系统用户密码" maxlength="20" />
+          <el-tooltip effect="dark" content="包含至少8个字符，包括大写字母、小写字母、数字和特殊字符" placement="top">
+            <el-input v-model="form.password" type="password" placeholder="请输入系统用户密码" maxlength="20" />
+          </el-tooltip>
         </el-form-item>
         <el-form-item label="租户套餐" prop="packageId">
           <el-select v-model="form.packageId" :disabled="!!form.tenantId" placeholder="请选择租户套餐" clearable
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index babee48..43c36c3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -162,7 +162,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入密码" type="password" maxlength="20" show-password />
+              <el-tooltip effect="dark" content="包含至少8个字符，包括大写字母、小写字母、数字和特殊字符" placement="top">
+                <el-input v-model="form.password" placeholder="请输入密码" type="password" maxlength="20" show-password />
+              </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>