Merge branch 'liuqiang' into v3

src/layout/indexCommon.vue

@@ -108,7 +108,7 @@
           </div>
           <div v-show="isAlive">
             <router-view v-slot="{ Component }" :key="$router.currentRoute.value.fullPath">
-              <KeepAlive :include="['identifyFont']" :exclude="[ 'allback', 'search']">
+              <KeepAlive :exclude="[ 'allback', 'search']">
                 <component :is="Component" />
               </KeepAlive>
             </router-view>
@@ -543,6 +543,7 @@ const clickPath = (index, items) => {
 const clickTab = (item) => {
   let url = toRaw(item)
   setTimeout(() => {
+    console.log('toFileData',toFileData.value);
     if (toFileData.value) {
       localStorage.setItem("inChat", 0)
       // 去全文搜索单独判断
@@ -595,6 +596,7 @@ const clickTab = (item) => {
           });
         return
       }
+      console.log('noONe');
       editableTabsValue.value = toFileData.value.path
       router.push({
         path: toFileData.value.path,

src/views/collect/index.vue

@@ -350,7 +350,7 @@ const isAddCollect = ref(false); //是否在添加标签
 const tabName = ref(""); //新增的标签名
 const changeTabName = ref(""); //修改的标签名
 const tabList = ref([]);
-const isAsc = ref("asc");
+const isAsc = ref("desc");
 const tableData = [];
 const visible = ref(false); //显示右键菜单
 const top = ref(0);
@@ -740,8 +740,8 @@ const tabchange = async (labelId) => {
   }
 
   // console.log("----res", res);
-  folderArr.value = res.filter((item) => item.isFolder === "Y");
-  fileArr.value = res.filter((item) => item.isFolder === "N");
+  folderArr.value = res.rows.filter((item) => item.isFolder === "Y");
+  fileArr.value = res.rows.filter((item) => item.isFolder === "N");
   //把路径清楚
   pathLabelData.value = [];
   console.log("folderArr", folderArr.value);
@@ -760,6 +760,11 @@ const changeShow = () => {
 };
 const changeSort = async () => {
   isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
+  const query = {
+    labelId,
+    isAsc: isAsc.value,
+    orderByColumn: "createTime",
+  };
   // console.log("res", res);
 };
 

src/views/department/MyFile.vue

@@ -137,7 +137,7 @@
                                 </div>
                             </div>
                         </template>
-                          <div v-if="thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)"
+                          <div v-if="(isDept && thisFolder.dirId)"
                                 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/scanFile.png" style="width: 24px;height: 24px;" alt="">
@@ -245,7 +245,7 @@
 
                                 </el-table>
                                 <PlaceGridFolder v-else @folderClick="folderClick" :folderList="folderList" :restName="restName"
-                                    :collectFolder="collectFolder" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack"  :thisFolder="thisFolder" :impDirId="impDirId">
+                                    :collectFolder="collectFolder" @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack"  :thisFolder="thisFolder" :impDirId="impDirId">
                                 </PlaceGridFolder>
                             </el-collapse-item>
                         </el-collapse>
@@ -313,7 +313,7 @@
                                     </el-table-column>
                                 </el-table>
                                 <PalaceGridFile v-else :fileHeight="fileHeight" @showFile="showFile" :getAllTop="getAllTop" @navBack="navBack"
-                                    @lastBB="lastBB" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack"  :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
+                                    @lastBB="lastBB"  @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack"  :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
                             </el-collapse-item>
                         </el-collapse>
                         <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">
@@ -785,8 +785,8 @@ export default {
                     pageSize: 10
                 }
                 documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId, pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -817,8 +817,8 @@ export default {
                     pageSize: 10
                 }
             documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
         }
         function fileBlur() {
@@ -863,9 +863,9 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 },2).then(res => {
-                folderList.value = res.data
+                folderList.value = res.rows
                 // if (res.code === 200) {
-                if (res.data.length === 0) {
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value)
                         .then(res => {
                             if (res.code === 200) {
@@ -1171,7 +1171,7 @@ export default {
             }
         }
         function onSuccess(files, val) {
-            fileBig.value = files.file.size
+            fileBig.value = files.file.size + fileBig.value
             fileArr.value.push(files.file)
         }
         //关闭文件上传
@@ -1352,8 +1352,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },2).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                    myfile.getById(query).then(res => {
                         if (res.code === 200) {
                             tableTotal.value =res.total
@@ -1574,8 +1574,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },2).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value).then(res => {
                         if (res.code === 200) {
                             fileList.value = res.rows
@@ -1885,7 +1885,7 @@ export default {
             }else{
                 isDept.value = false
             }
-            console.log('isDept',isDept.value);
+            // console.log('isDept',isDept.value);
         }
         //修改文件夹权限
         const upFirstFoler =async (item)=>{

src/views/department/components/PalaceGridFile.vue

@@ -19,6 +19,12 @@
                             :content="item.fileName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
+                    <div class="stars">
+                            <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                            <Star />
+                        </el-icon>
+                        <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                    </div>
                 </div>
             </template>
             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: (yz - 330) + 'px' }">
@@ -426,6 +432,12 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,false)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,false)
+        }
         // 归档
         function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
@@ -495,7 +507,9 @@ export default {
             fileNameChange,
             editOnline,
             goLock,
-            setImg
+            setImg,
+            starFolder,
+            delStarFolder
         }
     },
     components: {
@@ -529,6 +543,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/department/components/PlaceGridFolder.vue

@@ -21,6 +21,12 @@
                             :content="item.dirName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
+                        <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                        </div>
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -195,6 +201,12 @@ export default {
             emit("folderClick", item)
            console.log('item', item)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,true)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,true)
+        }
         onMounted(() => {
             // getAllTop()
             window.addEventListener("click", mouseClick, true);
@@ -232,7 +244,9 @@ export default {
             copyFir,
             ordinaryList,
             fileBox,
-            folderList
+            folderList,
+            starFolder,
+            delStarFolder
         }
     },
     components:{
@@ -264,6 +278,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/myfile/MyFile.vue

@@ -208,7 +208,18 @@
                         </div>
                         <!-- 右侧 -->
                         <div>
-                            <img :src="sort" alt="">
+                             <img
+                                src="@/assets/images/sort.png"
+                                @click="changeSort"
+                                v-if="isAsc == 'asc'"
+                                alt=""
+                            />
+                            <img
+                                src="@/assets/images/Frame_188.png"
+                                @click="changeSort"
+                                v-else
+                                alt=""
+                            />
                             <!-- //控制宫格展示 -->
                             <img
                               v-if="fileGrid"
@@ -264,7 +275,7 @@
                                         </el-table-column>
                                     </el-table>
                                     <PlaceGridFolder v-else @folderClick="folderClick" :folderList="folderList" :restName="restName"
-                                        :collectFolder="collectFolder" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
+                                        :collectFolder="collectFolder" @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
                                     </PlaceGridFolder>
                                 </el-collapse-item>
                             </el-collapse>
@@ -331,7 +342,7 @@
                                         </el-table-column>
                                     </el-table>
                                     <PalaceGridFile v-else :fileHeight="fileHeight" :getAllTop="getAllTop" @navBack="navBack"
-                                        @lastBB="lastBB" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
+                                        @lastBB="lastBB"  @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
                                 </el-collapse-item>
                             </el-collapse>
                             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: yz - 260 + 'px' }">
@@ -745,13 +756,28 @@ export default {
         const delMoreFolder = ref([])
         const inputTitle = ref()//验证框标题
         const isCode = ref(false)// 验证的类型
+        const isAsc = ref("desc");
+        const changeSort = async () => {
+            isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
+            refreshFile()
+            let obj = {
+                    pageNum: 1,
+                    pageSize: 10,
+                     isAsc: isAsc.value,
+                    orderByColumn: "createTime"
+                }
+            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },3).then(res => {
+                    fileMenu.value = res.rows
+                    // folderList.value = res.rows
+                })
+            };
         const changeShow =async (fileGrids) => {
             filePageNum.value = 1
         if(fileGrid.value == 1){
             fileGrid.value = 0 // 变宫格
             pageSize.value = 30+pageSize.value
             if(!thisFolder.value.dirId)return
-            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             const res = await myfile.getById(query)
               console.log('filessetScrollres',res);
             if (res.code === 200) {
@@ -790,11 +816,13 @@ export default {
                 spaceName.value = userMe[0].dirPath
                 let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 10,
+                    isAsc: isAsc.value,
+                    orderByColumn: "createTime",
                 }
-                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId, pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                     console.log('folderList.value',folderList.value);
                 })
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
@@ -824,11 +852,13 @@ export default {
         const getFirstFolder = ()=>{
             let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 10,
+                     isAsc: isAsc.value,
+                    orderByColumn: "createTime"
                 }
-            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },3).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },3).then(res => {
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
         }
         function getSpaceList() {
@@ -860,10 +890,10 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 }, 3).then(res => {
-                folderList.value = res.data
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0,isAsc: isAsc.value,orderByColumn: "createTime" }, 3).then(res => {
+                folderList.value = res.rows
                 // if (res.code === 200) {
-                if (res.data.length === 0) {
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value)
                         .then(res => {
                             if (res.code === 200) {
@@ -915,7 +945,7 @@ export default {
                 }
                 documents.getALLdocumentByType({ parentId: row.dirIds - 0, spaceId: row.spaceIds - 0, pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
                     // fileMenu.value = res.data
-                    folderList.value = res.data
+                    folderList.value = res.rows
                 })
                 myfile.getById(row.dirIds - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -1191,7 +1221,9 @@ export default {
             console.log('cli', clickFileData.value)
             let obj = {
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                isAsc: isAsc.value,
+                orderByColumn: "createTime",
             }
             myfile.getById(clickFileData.value.dirId, obj).then(res => {
                 if (res.code === 200) {
@@ -1277,7 +1309,7 @@ export default {
 
         }
         function onSuccess(files, val) {
-            fileBig.value = files.file.size
+            fileBig.value = files.file.size + fileBig.value
             fileArr.value.push(files.file)
         }
         //关闭文件上传
@@ -1473,13 +1505,15 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             clickFileData.value = row
-            const query = `${newDirId.value}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             documents.getALLdocumentByType({
                 parentId: newDirId.value - 0,
-                spaceId: newSpaceId.value - 0
+                spaceId: newSpaceId.value - 0,
+                isAsc: isAsc.value,
+                orderByColumn: "createTime"
             }, 3).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(query).then(res => {
                         // console.log('res = ',res);
                         if (res.code === 200) {
@@ -1696,8 +1730,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             }, 3).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value).then(res => {
                         if (res.code === 200) {
                             fileList.value = res.rows
@@ -1760,7 +1794,7 @@ export default {
 
         //点击收藏后刷新文件
         const refreshFile = (left,edit) => {
-            console.log(333);
+            // console.log(333);
             if(edit){
                 getFirstFolder()
             }
@@ -2402,7 +2436,9 @@ export default {
             inputTitle,
             isCode,
             sureCode,
-            upFileData
+            upFileData,
+            isAsc,
+            changeSort
         }
     },
     watch: {

src/views/myfile/components/PalaceGridFile.vue

@@ -19,6 +19,12 @@
                             :content="item.fileName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
+                    <div class="stars">
+                            <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                            <Star />
+                        </el-icon>
+                        <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                    </div>
                 </div>
             </template>
             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: (yz - 330) + 'px' }">
@@ -436,6 +442,12 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,false)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,false)
+        }
         // 归档
         function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
@@ -506,7 +518,9 @@ export default {
             editOnline,
             goLock,
             setImg,
-            setScrollFn
+            setScrollFn,
+            starFolder,
+            delStarFolder
         }
     },
     components: {
@@ -542,6 +556,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/myfile/components/PlaceGridFolder.vue

@@ -20,6 +20,12 @@
                             :content="item.dirName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
+                        <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                        </div>
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -172,6 +178,12 @@ export default {
            console.log('item', item)
             emit("folderClick", item)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,true)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,true)
+        }
         const setScrollFn = ()=>{
             // emit('setScroll')
         }
@@ -212,7 +224,9 @@ export default {
             copyFir,
             folderClickGrid,
             folderList,
-            setScrollFn
+            setScrollFn,
+            starFolder,
+            delStarFolder
         }
     },
     components:{
@@ -245,6 +259,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/publicment/MyFile.vue

@@ -135,7 +135,7 @@
                                 </div>
                             </div>
                         </template>
-                          <div v-if="thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)"
+                          <div v-if="(isDept && thisFolder.dirId)"
                                 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/scanFile.png" style="width: 24px;height: 24px;" alt="">
@@ -243,7 +243,7 @@
 
                                 </el-table>
                                 <PlaceGridFolder v-else  @folderClick="folderClick" :folderList="folderList" :restName="restName"
-                                    :collectFolder="collectFolder"  @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
+                                    :collectFolder="collectFolder" @collectByStar="collectByStar" @delCollect="delCollect"  @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
                                 </PlaceGridFolder>
                             </el-collapse-item>
                     </el-collapse>
@@ -311,7 +311,7 @@
                                     </el-table-column>
                                 </el-table>
                                 <PalaceGridFile v-else :fileHeight="fileHeight" @showFile="showFile" :getAllTop="getAllTop" @navBack="navBack"
-                                    @lastBB="lastBB" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
+                                    @lastBB="lastBB" @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
                             </el-collapse-item>
                         </el-collapse>
                         <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">
@@ -792,8 +792,8 @@ export default {
                     pageSize: 10
                 }
                 documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId, pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 },1)
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -824,8 +824,8 @@ export default {
                     pageSize: 10
                 }
             documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
         }
         function getSpaceList() {
@@ -870,9 +870,9 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 },1).then(res => {
-                folderList.value = res.data
+                folderList.value = res.rows
                 // if (res.code === 200) {
-                if (res.data.length === 0) {
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value)
                         .then(res => {
                             if (res.code === 200) {
@@ -1344,8 +1344,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },1).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                      myfile.getById(query).then(res => {
                         if (res.code === 200) {
                             tableTotal.value =res.total
@@ -1570,8 +1570,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },1).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value).then(res => {
                         if (res.code === 200) {
                             fileList.value = res.rows

src/views/publicment/components/PalaceGridFile.vue

@@ -19,6 +19,12 @@
                             :content="item.fileName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
+                    <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                    </div>
                 </div>
             </template>
             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: (yz - 330) + 'px' }">
@@ -425,6 +431,12 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,false)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,false)
+        }
         // 归档
         function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
@@ -494,7 +506,9 @@ export default {
             fileNameChange,
             editOnline,
             goLock,
-            setImg
+            setImg,
+            starFolder,
+            delStarFolder
         }
     },
     components: {
@@ -529,6 +543,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/publicment/components/PlaceGridFolder.vue

@@ -21,6 +21,12 @@
                             :content="item.dirName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
+                        <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                        </div>
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -194,6 +200,12 @@ export default {
             emit("folderClick", item)
            console.log('item', item)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,true)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,true)
+        }
         onMounted(() => {
             // getAllTop()
             window.addEventListener("click", mouseClick, true);
@@ -231,7 +243,9 @@ export default {
             copyFir,
             ordinaryList,
             fileBox,
-            folderList
+            folderList,
+            starFolder,
+            delStarFolder
         }
     },
     components:{
@@ -262,6 +276,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/system/alarm/index.vue

@@ -165,30 +165,30 @@
 	  <br/>
 	  <br/>
       短信接收号码：
-      <el-input v-model="cf.phone" style="width: 150px" />
+      <el-input v-model="cf.phone" @input="phoneNumFn" style="width: 150px" />
       <br />
       <br />
       当日同一IP非法访问超过
-      <el-input v-model="cf.ip_times" style="width: 50px" />
+      <el-input v-model="cf.ip_times" type="number" style="width: 50px" />
       次,则发送短信告警。
       <br />
       <br />
       硬盘使用空间超过
-      <el-input v-model="cf.hdd_used" style="width: 50px" />
+      <el-input v-model="cf.hdd_used" type="number" :max="100" :min="0" style="width: 50px" />
       %，发送短信告警。
       <br />
       <br />
       当日连续
-      <el-input v-model="cf.cpu_times" style="width: 50px" />
+      <el-input v-model="cf.cpu_times" type="number" style="width: 50px" />
       个周期,CPU超过
-      <el-input v-model="cf.cpu_used" style="width: 50px" />
+      <el-input v-model="cf.cpu_used" type="number" style="width: 50px" />
       %，发送短信告警。
       <br />
       <br />
       当日连续
-      <el-input v-model="cf.mem_times" style="width: 50px" />
+      <el-input v-model="cf.mem_times" type="number" style="width: 50px" />
       个周期,内存超过
-      <el-input v-model="cf.mem_used" style="width: 50px" />
+      <el-input v-model="cf.mem_used" type="number" style="width: 50px" />
       %，发送短信告警。
     </el-form>
     <template #footer>
@@ -317,7 +317,10 @@ function handleUpdate(row) {
     title.value = '查看系统告警'
   })
 }
-
+const phoneNumFn = (data)=>{
+  const rge = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/
+  console.log('data',data);
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['alarmRef'].validate((valid) => {

src/views/system/user/index.vue

@@ -430,6 +430,7 @@
 				trigger: ["blur", "change"]
 			}],
 			phonenumber: [{
+				required: true,
 				pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
 				message: "请输入正确的手机号码",
 				trigger: "blur"
@@ -584,11 +585,19 @@
 	/** 解密手机号码 */
 	const smPhone = (num)=>{
 		// console.log('num',num);
+		// return num
+		if(!num){
+			// console.log(3);
+			return null
+		}
 		const tonum = num - 0
 		if(typeof tonum === 'number' && !isNaN(tonum)){
+			// console.log(1);
 			return num
 		}
+		// return num
 		if(num){
+			// console.log(2);
 			return decode(num)
 		}
 	}
@@ -658,7 +667,7 @@
 			open.value = true;
 			title.value = "修改用户";
 			form.value.password = "";
-			form.value.phonenumber = smPhone(response.data.phonenumber);
+			form.value.phonenumber = smPhone(response.data.phonenumber)+'';
 		});
 	};