gaibug

src/api/biz/favorite.js

@@ -9,11 +9,11 @@ export function listFavorite(query) {
   })
 }
 // 根据标签收藏列表
-export function listFavoriteById(query) {
+export function listFavoriteById(query,par) {
   return request({
     url: '/biz/favorite/list/'+query,
     method: 'get',
-    params: query
+    params: par
   })
 }
 

src/layout/indexCommon.vue

@@ -883,7 +883,7 @@ const iframeSize = (par,history) => {
   if(inIframe==null){
     setTimeout(() => {
       iframeSize(id)
-    }, 500);
+    }, 1000);
     return
   }
   console.log('outIframe', outIframe.parentElement);

src/views/collect/index.vue

@@ -2,12 +2,12 @@
   <div class="container">
     <div class="topPath">
       <!-- <el-icon><ArrowDown /></el-icon> -->
-      <span @click="backTopPath">{{ topPath }}</span>
+      <!-- <span @click="backTopPath">{{ topPath }}</span>
       <PathLabel
         v-if="!loadingPreview"
         @folderClick="folderClick"
         :pathLabelData="pathLabelData"
-      ></PathLabel>
+      ></PathLabel> -->
       <!-- <BreadMenu></BreadMenu> -->
     </div>
     <!-- 标签 -->
@@ -161,7 +161,9 @@
             <el-table-column prop="docInfo.fileType" label="类型" width="180" />
             <el-table-column prop="docInfo.fileSize" label="大小" width="160">
               <template #default="scope">
-                <div>{{ scope.row.docInfo.fileSize }} KB</div>
+                 <span>
+                    {{ formatFileSize(scope.row.docInfo.fileSize) }}
+                </span>
               </template>
             </el-table-column>
           </el-table>
@@ -234,7 +236,6 @@
     </el-collapse>
   </div>
   <!-- 右键唤出的菜单 -->
-  <!-- TODO 默认就是不搜索标签 -->
   <div
     class="right_menu shouzhi"
     v-if="visible"
@@ -490,12 +491,12 @@ const tabchange = async (labelId) => {
   };
   let res;
   if (labelId === "second") {
-    res = await listFavoriteById(-1);
+    res = await listFavoriteById(-1,query);
     console.log("res", res);
     // return;
   } else {
     // 获取当前标签下的数据
-    res = await listFavoriteById(labelId);
+    res = await listFavoriteById(labelId,query);
   }
 
   // console.log("----res", res);
@@ -537,7 +538,22 @@ const sortArr = (field) => {
     return a[field] - b[field];
   };
 };
-
+// 文件大小格式化
+function formatFileSize(fileSize) {
+    if (fileSize >= 1024 * 1024 * 1024) {
+        // 大于等于1GB，显示GB
+        return (fileSize / (1024 * 1024 * 1024)).toFixed(2) + 'GB';
+    } else if (fileSize >= 1024 * 1024) {
+        // 大于等于1MB，显示MB
+        return (fileSize / (1024 * 1024)).toFixed(2) + 'MB';
+    } else if (fileSize >= 1024) {
+        // 大于等于1KB，显示KB
+        return (fileSize / 1024).toFixed(2) + 'KB';
+    } else {
+        // 小于1KB，显示字节
+        return fileSize + 'B';
+    }
+}
 const setIcon = (fileType) => {
   switch (fileType) {
     case ".docx":

src/views/department/modalComponebts/Transfer.vue

@@ -12,7 +12,15 @@
                         <div class="allLog">
                             <el-tree :filter-node-method="filterNode" v-if="have" ref="treeRef" :data="allTreeData"
                                 :props="allTreeProps" show-checkbox node-key="id" :default-expanded-keys="openTree"
-                                @check-change="allTreeChange" :default-checked-keys="backScreen" :check-strictly="false" />
+                                @check-change="allTreeChange" :default-checked-keys="backScreen" :check-strictly="false">
+                                <template #default="{ node, data }">
+                                    <span class="custom-tree-node">
+                                        <img v-if="data.disabled" src="@/assets/images/Users.png" alt="" />
+                                        <img v-else src="@/assets/images/oneUser.png" alt="" />
+                                        <span>{{ node.label }}</span>
+                                    </span>
+                                </template>
+                                </el-tree>
                             <span v-else>暂无数据</span>
                         </div>
                     </div>
@@ -301,7 +309,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .transBox {
     width: 550px;
     height: 400px;
@@ -343,7 +351,14 @@ export default {
     overflow-y: auto;
     text-align: center;
 }
-
+.custom-tree-node{
+  display: flex;
+  align-items: center;
+  img{
+    width: 22px;
+    height: 22px;
+  }
+}
 .needBag_top {
     padding: 0 10px;
     height: 30px;

src/views/login.vue

@@ -78,7 +78,7 @@
           :rules="rePassRules"
         >
           <el-form-item label="旧密码" prop="oldpss">
-            <el-input type="password" v-model="formData.oldpss" />
+            <el-input type="password" placeholder="请输入旧密码" v-model="formData.oldpss" />
           </el-form-item>
           <el-form-item label="新密码" prop="newpass">
             <el-input type="password" placeholder="密码长度最少为8位，包含大小写字母、数字、特殊字符" v-model="formData.newpass" />
@@ -153,8 +153,8 @@ const loginRules = {
 
 const rePassRules = {
   oldpss: [{ required: true, trigger: "blur", message: "请输入旧密码" }],
-  newpass: [{ required: true, validator: newPassRule, trigger: "blur" }],
-  rePass: [{ required: true, validator: repassRule, trigger: "blur" }],
+  newpass: [{ required: true, validator: newPassRule, trigger: "change" }],
+  rePass: [{ required: true, validator: repassRule, trigger: "change" }],
 };
 
 const codeUrl = ref("");

src/views/myfile/modalComponebts/FileCollect.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div>
-            <el-dialog v-model="fileCollect" title="收藏" width="30%">
+            <el-dialog :close-on-click-modal="false" @close="backColl" :close-on-press-escape="false" v-model="fileCollect" title="收藏" width="30%">
                 <el-form :model="collectForm" label-width="120px">
                     <el-form-item label="名称">
                         <el-input v-model="collectForm.name" />
@@ -80,7 +80,7 @@ export default {
         }
         function tagBlur() {
             if(!newTag.value){
-                ElMessage({ message: '标签名不能为空', type: 'error' })
+                // ElMessage({ message: '标签名不能为空', type: 'error' })
                 return
             }
             collect.addNewTag({ labelName: newTag.value, orderNum: sortNum.value + 1 }).then(res => {

src/views/myfile/modalComponebts/Transfer.vue

@@ -12,7 +12,15 @@
                         <div class="allLog">
                             <el-tree :filter-node-method="filterNode" v-if="have" ref="treeRef" :data="allTreeData"
                                 :props="allTreeProps" show-checkbox node-key="id" :default-expanded-keys="openTree"
-                                @check-change="allTreeChange" :default-checked-keys="backScreen" :check-strictly="false" />
+                                @check-change="allTreeChange" :default-checked-keys="backScreen" :check-strictly="false">
+                                <template #default="{ node, data }">
+                                    <span class="custom-tree-node">
+                                        <img v-if="data.disabled" src="@/assets/images/Users.png" alt="" />
+                                        <img v-else src="@/assets/images/oneUser.png" alt="" />
+                                        <span>{{ node.label }}</span>
+                                    </span>
+                                </template>
+                                </el-tree>
                             <span v-else>暂无数据</span>
                         </div>
                     </div>
@@ -299,7 +307,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .transBox {
     width: 550px;
     height: 400px;
@@ -349,7 +357,14 @@ export default {
     align-items: center;
     justify-content: space-between;
 }
-
+.custom-tree-node{
+  display: flex;
+  align-items: center;
+  img{
+    width: 22px;
+    height: 22px;
+  }
+}
 .needLog {
     height: 100%;
     overflow-y: auto;

src/views/publicment/modalComponebts/Transfer.vue

@@ -12,7 +12,15 @@
                         <div class="allLog">
                             <el-tree :filter-node-method="filterNode" v-if="have" ref="treeRef" :data="allTreeData"
                                 :props="allTreeProps" show-checkbox node-key="id" :default-expanded-keys="openTree"
-                                @check-change="allTreeChange" :default-checked-keys="backScreen" :check-strictly="false" />
+                                @check-change="allTreeChange" :default-checked-keys="backScreen" :check-strictly="false">
+                                <template #default="{ node, data }">
+                                    <span class="custom-tree-node">
+                                        <img v-if="data.disabled" src="@/assets/images/Users.png" alt="" />
+                                        <img v-else src="@/assets/images/oneUser.png" alt="" />
+                                        <span>{{ node.label }}</span>
+                                    </span>
+                                </template>
+                                </el-tree>
                             <span v-else>暂无数据</span>
                         </div>
                     </div>
@@ -299,7 +307,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .transBox {
     width: 550px;
     height: 400px;
@@ -349,7 +357,14 @@ export default {
     align-items: center;
     justify-content: space-between;
 }
-
+.custom-tree-node{
+  display: flex;
+  align-items: center;
+  img{
+    width: 22px;
+    height: 22px;
+  }
+}
 .needLog {
     height: 100%;
     overflow-y: auto;

src/views/search/index.vue

@@ -172,6 +172,7 @@ const changeSearchFor = async(name) => {
     let res = await flieSearch({
       keyword:searchText.value,
       type:fileTypes.value,
+      isAsc: isAsc.value,
       pageSize: 20,
       pageNum: 1,
     })
@@ -182,6 +183,7 @@ const changeSearchFor = async(name) => {
     let res = await flieSearch({
       keyword:searchText.value,
       type:fileTypes.value,
+      isAsc: isAsc.value,
       pageSize: 80,
       pageNum: numG,
     })
@@ -211,16 +213,33 @@ const changeShow = () => {
   isList.value = !isList.value;
 };
 const changeSort = async () => {
+  numnum = 1
+  numG = 1
   isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
-  const query = {
-    keyword: searchText.value,
-    isAsc: isAsc.value,
-    orderByColumn: "createTime",
-  };
+  let query ={}
+   if(isList.value){
+      query = {
+        keyword: searchText.value,
+        isAsc: isAsc.value,
+        type:fileTypes.value,
+        orderByColumn: "createTime",
+        pageSize: 20,
+        pageNum: 1,
+      };
+   }else{
+    query = {
+        keyword: searchText.value,
+        isAsc: isAsc.value,
+        type:fileTypes.value,
+        orderByColumn: "createTime",
+        pageSize: 80,
+        pageNum: 1,
+      };
+   }
   const res = await flieSearch(query);
   baseData.value = res.rows;
   tableData.value = res.rows;
-  changeSearchFor('');
+  // changeSearchFor('');
   // console.log("res", res);
   console.log(searchFor.value,'search');
 };
@@ -370,7 +389,7 @@ async function handleScroll(e) {
     const query = {
       keyword: searchText.value,
       type:fileTypes.value,
-      isAsc: "asc",
+      isAsc: isAsc.value,
       orderByColumn: "createTime",
       pageSize: 20,
       pageNum: numnum,
@@ -391,7 +410,7 @@ async function handleScrollG(e) {
     const query = {
       keyword: searchText.value,
       type:fileTypes.value,
-      isAsc: "asc",
+      isAsc: isAsc.value,
       orderByColumn: "createTime",
       pageSize: 90,
       pageNum: numG,
@@ -407,7 +426,7 @@ watch(() => isList.value, (newValue, oldValue) => {
     console.log('切换到宫格了');
     const query = {
       keyword: searchText.value,
-      isAsc: "asc",
+      isAsc: isAsc.value,
       orderByColumn: "createTime",
       pageSize: 90,
       pageNum: numG,

src/views/system/user/index.vue

@@ -75,7 +75,11 @@
 					<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName"
 						v-if="columns[3].visible" :show-overflow-tooltip="true" />
 					<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
-						v-if="columns[4].visible" width="120" />
+						v-if="columns[4].visible" width="120" >
+						<template #default="scope">
+							{{smPhone(scope.row.phonenumber)}}
+						</template>
+						</el-table-column>
 					<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
 						<template #default="scope">
 							<el-switch  v-if="scope.row.userId !== 1 && scope.row.userId !== -1" v-model="scope.row.status" active-value="0" inactive-value="1"
@@ -279,7 +283,7 @@
 		updateUserExpand 
 	} from "@/api/system/user";
 	import { sm3 } from "sm-crypto";
-
+	import { encode, decode } from '@/utils/sm2util'
 	const router = useRouter();
 	const {
 		proxy
@@ -577,6 +581,17 @@
 	function submitFileForm() {
 		proxy.$refs["uploadRef"].submit();
 	};
+	/** 解密手机号码 */
+	const smPhone = (num)=>{
+		console.log('num',num);
+		const tonum = num - 0
+		if(typeof tonum === 'number' && !isNaN(tonum)){
+			return num
+		}
+		if(num){
+			return decode(num)
+		}
+	}
 	/** 重置操作表单 */
 	function reset() {
 		form.value = {