liuQiang 1 year ago
parent
commit
5d784246cc

+ 21 - 13
src/components/PathLabel/index.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="box">
-    <div v-for="(item,index) in toRaw(pathLabelData)" :key="item.dirId">
+    <div v-for="(item, index) in toRaw(pathLabelData)" :key="item.dirId">
       <div class="item">
-      &nbsp;&nbsp; / &nbsp;&nbsp; <LabelItem
-        :name="item.name"
-        @click="clickItem(item.dirId,index)"
-        :dirId="item.dirId"
-        :class="{'lastOne':index == (pathLabelData.length -1)}"
-      ></LabelItem>
+        &nbsp;&nbsp; / &nbsp;&nbsp;
+        <LabelItem
+          :name="item.name"
+          @click="clickItem(item.dirId, index)"
+          :dirId="item.dirId"
+          :class="{ lastOne: index == pathLabelData.length - 1 }"
+        ></LabelItem>
       </div>
     </div>
   </div>
@@ -30,11 +31,11 @@ watch(
     // console.log(111, newValue);
   }
 );
-const clickItem = async (dirId,index) => {
+const clickItem = async (dirId, index) => {
   const res = await getDir(dirId);
-  const row = res.data
+  const row = res.data;
   // console.log("labelIndex", index);
-  emit("folderClick", row,null,null,index)
+  emit("folderClick", row, null, null, index);
 };
 </script>
 
@@ -42,13 +43,20 @@ const clickItem = async (dirId,index) => {
 .box {
   display: flex;
   font-size: 12px;
-  .item{
+  .item {
     display: flex;
     line-height: 20px;
     align-items: center;
+    max-width: 150px;
+    white-space: nowrap;
+    /* 禁止文本换行 */
+    overflow: hidden;
+    /* 隐藏溢出部分文本 */
+    text-overflow: ellipsis;
+    /* 显示省略号 */
   }
-  .lastOne{
-    color: #2E6BC8;
+  .lastOne {
+    color: #2e6bc8;
   }
   // line-height: 20px;
 }

+ 1 - 1
src/components/forwordTree/index.vue

@@ -14,7 +14,7 @@
             maxlength="32"
             class="bulid-input"
             clearable
-            placeholder="新建目录"
+            placeholder="请输入不多于32位字符"
             @change="sureDir"
           />
           <!-- <el-icon size="20" color="#327CEC" @click="sureDir"

+ 2 - 0
src/views/collect/index.vue

@@ -60,6 +60,7 @@
                 size="mini"
                 @blur="reTabName"
                 maxlength="32"
+                placeholder="请输入不多于32位字符"
                 :autofocus="true"
               ></el-input>
             </div>
@@ -80,6 +81,7 @@
             size="mini"
             @change="addCollectFn"
             maxlength="32"
+            placeholder="请输入不多于32位字符"
             :autofocus="true"
           ></el-input>
         </div>

+ 4 - 4
src/views/department/MyFile.vue

@@ -79,7 +79,7 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)"
+                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && pathLabelData.length"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">
@@ -215,7 +215,7 @@
                                 @selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
                                 @row-contextmenu="folderRClick" ref="taskTableRef">
                                 <el-table-column type="selection" width="55" />
-                                <el-table-column label="名称" :show-overflow-tooltip="true" width="280">
+                                <el-table-column label="名称" :show-overflow-tooltip="true" width="500">
                                     <template #default="scope">
                                         <span class="juzhong">
                                             <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,true)" class="juli">
@@ -281,7 +281,7 @@
                                     @row-contextmenu="handleRowClick" @selection-change="handleSelectionChange"
                                     @row-click="mouseClick" :default-sort="{ prop: 'createTime', order: 'descending' }">
                                     <el-table-column type="selection" width="55" />
-                                    <el-table-column label="名称" width="280">
+                                    <el-table-column label="名称" width="500">
                                         <template #default="scope">
                                             <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="juzhong">
                                             <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,false)">
@@ -389,7 +389,7 @@
                 <el-dialog v-model="fileNameChange" title="重命名" width="30%">
                     <el-form :model="nameForm" label-width="120px">
                         <el-form-item label="新名字">
-                            <el-input v-model="nameForm.name" maxlength="32"></el-input>
+                            <el-input v-model="nameForm.name" placeholder="请输入不多于32位字符" maxlength="32"></el-input>
                         </el-form-item>
                     </el-form>
                     <template #footer>

+ 6 - 0
src/views/department/components/createTasnsfer.vue

@@ -104,6 +104,12 @@ function antherClose(tag) {
   treeRef.value.setCheckedKeys(result);
 }
 function allTreeChange(e) {
+  // console.log('e',e);
+  if(e.children){
+    e.children.forEach(par=>{
+      allTreeChange(par)
+    })
+  }
   const id = e.id;
   const label = e.label;
   const disabled = e.disabled;

+ 2 - 2
src/views/login.vue

@@ -81,10 +81,10 @@
             <el-input type="password" v-model="formData.oldpss" />
           </el-form-item>
           <el-form-item label="新密码" prop="newpass">
-            <el-input type="password" v-model="formData.newpass" />
+            <el-input type="password" placeholder="密码长度最少为8位,包含大小写字母、数字、特殊字符" v-model="formData.newpass" />
           </el-form-item>
           <el-form-item label="确认密码" prop="rePass">
-            <el-input type="password" v-model="formData.rePass" />
+            <el-input type="password" placeholder="密码长度最少为8位,包含大小写字母、数字、特殊字符" v-model="formData.rePass" />
           </el-form-item>
           <el-form-item>
             <el-button @click="closeRepass"> 取消 </el-button>

+ 4 - 4
src/views/myfile/MyFile.vue

@@ -93,7 +93,7 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="thisFolder.dirType == '1'"
+                            <div v-if="thisFolder.dirType == '1' && pathLabelData.length"
                                 style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                                 <div style="margin-left: 5px;">
                                     <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">
@@ -242,7 +242,7 @@
                                     @selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
                                     @row-contextmenu="folderRClick" ref="taskTableRef">
                                     <el-table-column type="selection" width="55" />
-                                    <el-table-column label="名称" :show-overflow-tooltip="true" width="280">
+                                    <el-table-column label="名称" :show-overflow-tooltip="true" width="500">
                                         <template #default="scope">
                                             <span style="display: flex;align-items: center;">
                                                 <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,true)" style="margin-right: 7px;">
@@ -299,7 +299,7 @@
                                         @row-contextmenu="handleRowClick" @selection-change="handleSelectionChange"
                                         @row-click="mouseClick" :default-sort="{ prop: 'createTime', order: 'descending' }">
                                         <el-table-column type="selection" width="55" />
-                                        <el-table-column label="名称" width="280">
+                                        <el-table-column label="名称" width="500">
                                             <template #default="scope">
                                                 <span
                                                     style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;display: flex;align-items: center;">
@@ -406,7 +406,7 @@
                 <el-dialog v-model="fileNameChange" title="重命名" width="30%">
                     <el-form :model="nameForm" label-width="120px">
                         <el-form-item label="新名字">
-                            <el-input v-model="nameForm.name" maxlength="32"></el-input>
+                            <el-input v-model="nameForm.name" placeholder="请输入不多于32位字符" maxlength="32"></el-input>
                         </el-form-item>
                     </el-form>
                     <template #footer>

+ 1 - 1
src/views/myfile/modalComponebts/CreateFloder.vue

@@ -4,7 +4,7 @@
             <el-dialog v-model="addBoser" title="新建目录" width="30%" @close="diClose">
                 <el-form :model="boserForm" label-width="120px">
                     <el-form-item label="目录名称">
-                        <el-input v-model="boserForm.dirName" maxlength='32' />
+                        <el-input v-model="boserForm.dirName" placeholder="请输入不多于32位字符" maxlength='32' />
                     </el-form-item>
                     <!-- <el-form-item label="目录分类">
                         <el-radio-group v-model="boserForm.dirType">

+ 1 - 1
src/views/myfile/modalComponebts/FolderReName.vue

@@ -2,7 +2,7 @@
     <div>
         <div>
             <el-dialog v-model="folderName" title="重命名" width="30%">
-                <el-input v-model="newName" maxlength="32"></el-input>
+                <el-input v-model="newName" placeholder="请输入不多于32位字符" maxlength="32"></el-input>
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="backToFile">取消</el-button>

+ 1 - 1
src/views/myjoin/components/AddFile.vue

@@ -15,7 +15,7 @@
         <span>{{ clickFileData.dirName }}</span>
       </el-form-item>
       <el-form-item label="文件名">
-          <el-input v-model="createFile.name" maxlength="32" placeholder="请输入文件名" type="textarea" />
+          <el-input v-model="createFile.name" maxlength="32" placeholder="请输入不多于32位字符" type="textarea" />
       </el-form-item>
       <el-form-item
         label="文件类型"

+ 4 - 4
src/views/publicment/MyFile.vue

@@ -77,7 +77,7 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)"
+                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && pathLabelData.length"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">
@@ -213,7 +213,7 @@
                                 @selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
                                 @row-contextmenu="folderRClick" ref="taskTableRef">
                                 <el-table-column type="selection" width="55" />
-                                <el-table-column label="名称" :show-overflow-tooltip="true" width="280">
+                                <el-table-column label="名称" :show-overflow-tooltip="true" width="500">
                                     <template #default="scope">
                                         <span class="juzhong">
                                             <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,true)" class="juli">
@@ -279,7 +279,7 @@
                                     @row-contextmenu="handleRowClick" @selection-change="handleSelectionChange"
                                     @row-click="mouseClick" :default-sort="{ prop: 'createTime', order: 'descending' }">
                                     <el-table-column type="selection" width="55" />
-                                    <el-table-column label="名称" width="280">
+                                    <el-table-column label="名称" width="500">
                                         <template #default="scope">
                                             <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="juzhong">
                                             <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,false)" class="juli">
@@ -385,7 +385,7 @@
                 <el-dialog v-model="fileNameChange" title="重命名" width="30%">
                     <el-form :model="nameForm" label-width="120px">
                         <el-form-item label="新名字">
-                            <el-input v-model="nameForm.name" maxlength="32"></el-input>
+                            <el-input v-model="nameForm.name" placeholder="请输入不多于32位字符" maxlength="32"></el-input>
                         </el-form-item>
                     </el-form>
                     <template #footer>

+ 5 - 0
src/views/publicment/components/createTasnsfer.vue

@@ -102,6 +102,11 @@ function antherClose(tag) {
   treeRef.value.setCheckedKeys(result);
 }
 function allTreeChange(e) {
+  if(e.children){
+    e.children.forEach(par=>{
+      allTreeChange(par)
+    })
+  }
   const id = e.id;
   const label = e.label;
   const disabled = e.disabled;

+ 1 - 1
src/views/publicment/modalComponebts/CreateFloder.vue

@@ -4,7 +4,7 @@
             <el-dialog v-model="addBoser" :title="upFolderData?'修改':'新建文件夹'" width="30%" @close="diClose">
                 <el-form :model="boserForm" label-width="120px">
                     <el-form-item label="目录名称">
-                        <el-input v-model="boserForm.dirName" maxlength='32' />
+                        <el-input v-model="boserForm.dirName" placeholder="请输入不多于32位字符" maxlength='32' />
                     </el-form-item>
                     <el-form-item label="目录分类" v-if="free || (!free && thisType.dirType != '2' )">
                         <el-radio-group :disabled="upFolderData" v-model="boserForm.dirType">

+ 1 - 1
src/views/publicment/modalComponebts/FolderReName.vue

@@ -2,7 +2,7 @@
     <div>
         <div>
             <el-dialog v-model="folderName" title="重命名" width="30%">
-                <el-input v-model="newName" maxlength="32"></el-input>
+                <el-input v-model="newName" placeholder="请输入不多于32位字符" maxlength="32"></el-input>
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="backToFile">取消</el-button>

+ 17 - 4
src/views/system/user/profile/index.vue

@@ -21,7 +21,8 @@
                      </li> -->
                      <li class="list-group-item">
                         <svg-icon icon-class="phone" class="tubiao"/>手机号码
-                        <div class="pull-right">{{ state.user.phonenumber }}</div>
+                        <!-- <div class="pull-right">{{ state.user.phonenumber }}</div> -->
+                        <div class="pull-right">{{ phoneNumber(state.user.phonenumber) }}</div>
                      </li>
                      <!-- <li class="list-group-item">
                         <svg-icon icon-class="email" />用户邮箱
@@ -52,7 +53,7 @@
                </template>
                <el-tabs v-model="activeTab">
                   <el-tab-pane label="基本资料" name="userinfo">
-                     <userInfo :user="state.user" />
+                     <userInfo @chengeUser="chengeUser" :user="state.user" />
                   </el-tab-pane>
                   <el-tab-pane label="修改密码" name="resetPwd">
                      <resetPwd />
@@ -69,7 +70,7 @@ import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import { getUserProfile } from "@/api/system/user";
-import { onMounted } from "vue";
+import { onMounted,toRaw } from "vue";
 let height = ref(document.documentElement.clientHeight - 16 + "px;");
 const activeTab = ref("userinfo");
 const state = reactive({
@@ -85,7 +86,19 @@ function getUser() {
     state.postGroup = response.postGroup;
   });
 };
-
+const phoneNumber = (num)=>{
+   if(num){
+      // console.log('num',num);
+      const str1 = num.substr(0,3)
+      const str2 = num.substr(3,4)
+      const str3 = num.substr(7,4)
+      // console.log(str1,str2,str3);
+      return str1+'****'+str3
+   }
+}
+const chengeUser = (number)=>{
+   state.user.phonenumber = number
+}
 getUser();
 onMounted(() => {
    height.value = document.documentElement.clientHeight - document.getElementsByClassName("tab_box")[0].offsetHeight-8-document.getElementsByClassName("nav")[0].offsetHeight -26 + "px";

+ 58 - 3
src/views/system/user/profile/userInfo.vue

@@ -10,7 +10,8 @@
          <el-input v-model="user.nickName" maxlength="30" />
       </el-form-item>
       <el-form-item label="手机号码" prop="phonenumber">
-         <el-input v-model="user.phonenumber" maxlength="11" />
+         <!-- <el-input v-model="user.phonenumber" @input="phoneNumChange" maxlength="11" /> -->
+         <el-input v-model="showPhone" @input="phoneNumChange" maxlength="11" />
       </el-form-item>
       <el-form-item label="邮箱" prop="email">
          <el-input v-model="user.email" maxlength="50" />
@@ -24,7 +25,19 @@
 </template>
 
 <script setup>
-import { updateUserProfile } from "@/api/system/user";
+import {
+  ref,
+  computed,
+  reactive,
+  defineComponent,
+  watch,
+  toRaw,
+  onMounted,
+  onBeforeMount,
+  defineExpose,
+  onDeactivated,
+} from "vue";
+import { updateUserProfile,getUserProfile } from "@/api/system/user";
 
 const props = defineProps({
   user: {
@@ -39,7 +52,14 @@ const rules = ref({
   email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
   phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
 });
-
+const showPhone = ref()
+function getUser() {
+  getUserProfile().then(response => {
+   showPhone.value = response.data.phonenumber;
+   showPhone.value = phoneNumber(showPhone.value)
+  });
+};
+const emit = defineEmits(["chengeUser"]);
 /** 提交按钮 */
 function submit() {
   proxy.$refs.userRef.validate(valid => {
@@ -54,6 +74,41 @@ function submit() {
 function close() {
   proxy.$tab.closePage();
 };
+const phoneNumChange = (num)=>{
+  
+      const str1 = num.substr(0,3)
+      const str2 = num.substr(3,4)
+      const str3 = num.substr(7,4)
+      if(num.length<4){
+        showPhone.value = str1
+      }else if(num.length == 4){
+      showPhone.value = str1+'*'
+      }else if(num.length == 5){
+      showPhone.value = str1+'**'
+      }else if(num.length == 6){
+      showPhone.value = str1+'***'
+      }else if(num.length == 7){
+      showPhone.value = str1+'****'
+      }else{
+        showPhone.value = str1+'****'+str3
+      }
+      emit('chengeUser',num)
+  // console.log('num',num);
+}
+const phoneNumber = (num)=>{
+   if(num){
+      // console.log('num',num);
+      const str1 = num.substr(0,3)
+      const str2 = num.substr(3,4)
+      const str3 = num.substr(7,4)
+      // console.log(str1,str2,str3);
+      return str1+'****'+str3
+   }
+}
+getUser();
+onMounted(()=>{
+  console.log('showPhone',showPhone);
+})
 </script>
 <style lang="scss" scoped>
 :deep(.el-form-item--default .el-form-item__label){