修改bug,宫格界面问哈，颜色区分目录公开，名字全称

src/views/department/MyFile.vue

@@ -45,8 +45,10 @@
                                     v-if="item.encryptLevel"
                                 > 
                                 <template #content> 安全级别: {{ item.encryptLevel == 'L1'?'敏感':(item.encryptLevel == 'L2'?'涉密':(item.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
-                                <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;"></el-tooltip>
-                                <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;" v-else>
+                                <img :src="item.dirType=='1'?ordinaryList:fileStyle" style="width: 72px;height: 72px;">
+                              </el-tooltip>
+
+                              <img :src="item.dirType=='1'?ordinaryList:fileStyle" style="width: 72px;height: 72px;" v-else>
                                 <el-tooltip
                                   class="box-item tool-tip"
                                   effect="dark"
@@ -97,7 +99,7 @@
                             </div>
                         </div>
                         <div v-if="(!thisFolder.dirType) || !isDept"
-                            style="display: flex;width: 82px;opacity:0.5;height: 32px;justify-content: flex-start;align-items: center;">
+                            style="display: flex;width: 102px;opacity:0.5;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
                                     style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
@@ -106,11 +108,11 @@
                                 </el-icon>
                             </div>
                             <div style="margin-left: 5px;">
-                                <span style="font-size: 14px;" class="shouzhi">新建</span>
+                                <span style="font-size: 14px;" class="shouzhi">新建目录</span>
                             </div>
                         </div>
                         <div v-else
-                            style="display: flex;width: 82px;height: 32px;justify-content: flex-start;align-items: center;">
+                            style="display: flex;width: 102px;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
                                     style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
@@ -119,7 +121,7 @@
                                 </el-icon>
                             </div>
                             <div style="margin-left: 5px;" @click="createNewMenu(0)">
-                                <span style="font-size: 14px;" class="shouzhi">新建</span>
+                                <span style="font-size: 14px;" class="shouzhi">新建目录</span>
                             </div>
                         </div>
                         <template v-for="(item, index) in useMenu" :key="index">
@@ -193,18 +195,8 @@
                                                 <Star />
                                             </el-icon>
                                             <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="" class="juli">
-                                            <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;"
+                                            <img :src="scope.row.dirType=='1'?ordinary:fileBox" style="width: 20px;height: 24px;"
                                                 alt="" class="juli">
-                                                <!-- <el-tooltip
-                                                    class="box-item"
-                                                    effect="dark"
-                                                    placement="top"
-                                                    :show-after="1000"
-                                                    v-if="scope.row.encryptLevel"
-                                                > 
-                                                <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
-                                                <span class="shouzhi"> {{ scope.row.dirName }}</span>
-                                                </el-tooltip> -->
                                                 <span class="shouzhi"> {{ scope.row.dirName }}</span>
                                         </span>
                                     </template>
@@ -447,6 +439,10 @@ import { canPreviewFile,rightMenuRole,publicRightMenuRole } from "@/utils/index.
 import fileSpace from '../../api/filespace/fileSpace';
 import { getLeveldetail } from '../../api/level/level';
 import { encrypt, decrypt } from "@/utils/jsencrypt";
+import ordinaryList from "@/assets/images/ordinaryList.png";
+import ordinary from "@/assets/images/ordinary.png";
+import fileStyle from "@/assets/images/fileStyle.png";fileBox
+import fileBox from "@/assets/images/fileBox.png";
 import Cookies from "js-cookie";
 import elTableInfiniteScroll from 'el-table-infinite-scroll'
 
@@ -1657,6 +1653,10 @@ export default {
             useMenu,
             arrorMenu,
             blueLeft,//返回
+            ordinaryList,
+            ordinary,
+            fileStyle,
+            fileBox,
             grayRight,//前进
             squre,//视图切换
             sort,//排序

src/views/department/components/PalaceGridFile.vue

@@ -11,7 +11,13 @@
                     </div>
                     <!-- 名称 -->
                     <div class="nameBox">
-                        <p class="nameName">{{ item.fileName }}</p>
+                            <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            placement="top"
+                            :show-after="1000"
+                            :content="item.fileName"
+                        ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
                 </div>
             </template>

src/views/department/components/PlaceGridFolder.vue

@@ -8,11 +8,18 @@
                     <div class="flexBox" @contextmenu="rightClick(item, index, $event)" @click="folderClickGrid(item)">
                         <!-- 图片 -->
                         <div class="imgBox">
-                            <img src="../../../assets/images/folderBig.png" alt="" style="vertical-align: middle;">
+                            <img :src="item.dirType=='1'?ordinaryList:fileBox"
+                              alt="" style="vertical-align: middle;">
                         </div>
                         <!-- 名称 -->
                         <div class="nameBox">
-                            <p class="nameName">{{ item.dirName }}</p>
+                            <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            placement="top"
+                            :show-after="1000"
+                            :content="item.dirName"
+                        ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
                     </div>
                 </template>
@@ -45,6 +52,8 @@ import myfile from "../../../api/myfile/myfile";
 import documents from "../../../api/document/document";
 import ImgFile from "../jsComponents/ImgFile";
 import PalaceGridFile from "./PalaceGridFile.vue";
+import ordinaryList from "@/assets/images/ordinaryList.png";
+import fileBox from "@/assets/images/folderBig.png";
 export default {
     props: {
         folderClick: {
@@ -205,6 +214,8 @@ export default {
             copySpa,
             copyNma,
             copyFir,
+            ordinaryList,
+            fileBox
         }
     },
     components:{

src/views/department/jsComponents/ImgFile.js

@@ -38,7 +38,7 @@ import bigpptx from '../../../assets/images/pptxBig.png'
 import audio from '../../../assets/images/audio.png'
 import video from '../../../assets/images/video.png'
 import pic from '../../../assets/images/pic.png'
-import elseFile from '../../../assets/images/elseFile.png'
+import elseFile from '../../../assets/images/unkownFile.png'
 export default {
     copy,
     clipboard,

src/views/liveChat/index.vue

@@ -225,7 +225,7 @@ const changeMsg = async (val,isnew) => {
   resInfo.fromId = val.id
   resInfo.content = val.content
   resInfo.file = val.file
-  resInfo.toAvatar = resInfo.fromAvatar = resInfo.avatar
+  // resInfo.toAvatar = resInfo.fromAvatar = resInfo.avatar
   if (searchData.value.length > 0) {
     //判断是否有相同的聊天人
     const filerData = searchData.value.filter(
@@ -514,7 +514,7 @@ const formatText = (text) => {
   };
 const headError=(ind,item)=>{
   console.log("头像加载失败:",ind)
-  item.fromAvatar=item.toAvatar=item.avatar=null;
+  // item.fromAvatar=item.toAvatar=item.avatar=null;
 };
 // 滚动翻页========
 onMounted(() => {
@@ -700,7 +700,7 @@ onMounted(() => {
                     </div>
                   </div>
                   <div>
-                    <!-- 左侧聊天 -->
+                    <!-- 右侧聊天头像 -->
                     <img
                       :src="wangzhi + record.fromAvatar"
                       class="head-sculpture"    
@@ -741,6 +741,8 @@ onMounted(() => {
                   style="display: flex"
                 >
                   <div>
+                    <!-- 左侧侧聊天头像 -->
+                    <!-- {{ record }}{{ useUserStore().uid  }} -->
                     <img
                       :src="wangzhi + record.fromAvatar"
                       class="head-sculpture"

src/views/myfile/MyFile.vue

@@ -113,7 +113,7 @@
                             </div>
                         </div>
                         <div v-if="thisFolder.dirType" class="shouzhi"
-                            style="display: flex;width: 82px;height: 32px;justify-content: flex-start;align-items: center;">
+                            style="display: flex;width: 102px;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
                                     style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
@@ -122,11 +122,11 @@
                                 </el-icon>
                             </div>
                             <div style="margin-left: 5px;" @click="createNewMenu(0)">
-                                <span style="font-size: 14px;" class="shouzhi">新建</span>
+                                <span style="font-size: 14px;" class="shouzhi">新建目录</span>
                             </div>
                         </div>
                         <div v-else class="shouzhi"
-                            style="display: flex;opacity:0.5;width: 82px;height: 32px;justify-content: flex-start;align-items: center;">
+                            style="display: flex;opacity:0.5;width: 102px;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
                                     style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;">
@@ -134,7 +134,7 @@
                                 </el-icon>
                             </div>
                             <div style="margin-left: 5px;">
-                                <span style="font-size: 14px;" class="shouzhi">新建</span>
+                                <span style="font-size: 14px;" class="shouzhi">新建目录</span>
                             </div>
                         </div>
                         <div style="display: flex;width: 102px;height: 32px;justify-content: flex-start;align-items: center;"

src/views/myfile/components/PalaceGridFile.vue

@@ -11,7 +11,13 @@
                     </div>
                     <!-- 名称 -->
                     <div class="nameBox">
-                        <p class="nameName">{{ item.fileName }}</p>
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            placement="top"
+                            :show-after="1000"
+                            :content="item.fileName"
+                        ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
                 </div>
             </template>

src/views/myfile/components/PlaceGridFolder.vue

@@ -12,7 +12,13 @@
                         </div>
                         <!-- 名称 -->
                         <div class="nameBox">
-                            <p class="nameName">{{ item.dirName }}</p>
+                            <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            placement="top"
+                            :show-after="1000"
+                            :content="item.dirName"
+                        ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
                     </div>
                 </template>

src/views/myfile/jsComponents/ImgFile.js

@@ -38,7 +38,7 @@ import bigpptx from '../../../assets/images/pptxBig.png'
 import audio from '../../../assets/images/audio.png'
 import video from '../../../assets/images/video.png'
 import pic from '../../../assets/images/pic.png'
-import elseFile from '../../../assets/images/elseFile.png'
+import elseFile from '../../../assets/images/unkownFile.png'
 export default {
     copy,
     clipboard,

src/views/myjoin/components/AddFile.vue

@@ -14,9 +14,9 @@
         <!-- <p>{{ nowFolder }}</p> -->
         <span>{{ clickFileData.dirName }}</span>
       </el-form-item>
-      <!-- <el-form-item label="文件名">
-                <el-input v-model="createFile.name" maxlength="150" placeholder="请输入文件名" type="textarea" />
-            </el-form-item> -->
+      <el-form-item label="文件名">
+          <el-input v-model="createFile.name" maxlength="150" placeholder="请输入文件名" type="textarea" />
+      </el-form-item>
       <el-form-item
         label="文件类型"
         prop="fileType"

src/views/publicment/MyFile.vue

@@ -45,8 +45,8 @@
                                     v-if="item.encryptLevel"
                                 > 
                                 <template #content> 安全级别: {{ item.encryptLevel == 'L1'?'敏感':(item.encryptLevel == 'L2'?'涉密':(item.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
-                                <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;"></el-tooltip>
-                                <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;" v-else>
+                                <img :src="item.dirType=='1'?ordinaryList:fileStyle" style="width: 72px;height: 72px;"></el-tooltip>
+                                <img :src="item.dirType=='1'?ordinaryList:fileStyle" style="width: 72px;height: 72px;" v-else>
                                 <el-tooltip
                                   class="box-item tool-tip"
                                   effect="dark"
@@ -97,7 +97,7 @@
                             </div>
                         </div>
                         <div v-if="thisFolder.dirType && isDept"
-                            style="display: flex;width: 82px;height: 32px;justify-content: flex-start;align-items: center;">
+                            style="display: flex;width: 102px;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
                                     style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
@@ -106,11 +106,11 @@
                                 </el-icon>
                             </div>
                             <div style="margin-left: 5px;" @click="createNewMenu(0)">
-                                <span style="font-size: 14px;" class="shouzhi">新建</span>
+                                <span style="font-size: 14px;" class="shouzhi">新建目录</span>
                             </div>
                         </div>
                         <div v-else
-                            style="display: flex;opacity:0.5;width: 82px;height: 32px;justify-content: flex-start;align-items: center;">
+                            style="display: flex;opacity:0.5;width: 102px;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
                                     style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
@@ -119,7 +119,7 @@
                                 </el-icon>
                             </div>
                             <div style="margin-left: 5px;">
-                                <span style="font-size: 14px;" class="shouzhi">新建</span>
+                                <span style="font-size: 14px;" class="shouzhi">新建目录</span>
                             </div>
                         </div>
                         <template v-for="(item, index) in useMenu" :key="index">
@@ -193,7 +193,7 @@
                                                 <Star />
                                             </el-icon>
                                             <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="" class="juli">
-                                            <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;"
+                                            <img :src="scope.row.dirType=='1'?ordinary:fileBox" style="width: 20px;height: 24px;"
                                                 alt="" class="juli">
                                                 <span class="shouzhi">{{ scope.row.dirName }}</span>
                                         </span>
@@ -436,6 +436,10 @@ import { canPreviewFile,rightMenuRole,publicRightMenuRole } from "@/utils/index.
 import fileSpace from '../../api/filespace/fileSpace';
 import { getLeveldetail } from '../../api/level/level';
 import { encrypt, decrypt } from "@/utils/jsencrypt";
+import ordinaryList from "@/assets/images/ordinaryList.png";
+import ordinary from "@/assets/images/ordinary.png";
+import fileStyle from "@/assets/images/fileStyle.png";
+import fileBox from "@/assets/images/fileBox.png";
 import Cookies from "js-cookie";
 import elTableInfiniteScroll from 'el-table-infinite-scroll'
 
@@ -1727,6 +1731,7 @@ export default {
             editOnline,//在线编辑
             copyParentId,
             copyRow,
+            fileBox,
             getAllTop,
             newDirId,
             newSpaceId,
@@ -1784,6 +1789,9 @@ export default {
             formatFileSize,
             isFolder,
             clickRow,
+            ordinaryList,
+            ordinary,
+            fileStyle,
             rename,
             getRename,//文件夹重命名子传父
             copyFolderName,

src/views/publicment/components/PalaceGridFile.vue

@@ -11,7 +11,13 @@
                     </div>
                     <!-- 名称 -->
                     <div class="nameBox">
-                        <p class="nameName">{{ item.fileName }}</p>
+                            <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            placement="top"
+                            :show-after="1000"
+                            :content="item.fileName"
+                        ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
                 </div>
             </template>

src/views/publicment/components/PlaceGridFolder.vue

@@ -8,11 +8,18 @@
                     <div class="flexBox" @contextmenu="rightClick(item, index, $event)" @click="folderClickGrid(item)">
                         <!-- 图片 -->
                         <div class="imgBox">
-                            <img src="../../../assets/images/folderBig.png" alt="" style="vertical-align: middle;">
+                            <img :src="item.dirType=='1'?ordinaryList:fileBox"
+                              alt="" style="vertical-align: middle;">
                         </div>
                         <!-- 名称 -->
                         <div class="nameBox">
-                            <p class="nameName">{{ item.dirName }}</p>
+                            <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            placement="top"
+                            :show-after="1000"
+                            :content="item.dirName"
+                        ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
                     </div>
                 </template>
@@ -45,6 +52,8 @@ import myfile from "../../../api/myfile/myfile";
 import documents from "../../../api/document/document";
 import ImgFile from "../jsComponents/ImgFile";
 import PalaceGridFile from "./PalaceGridFile.vue";
+import fileBox from "@/assets/images/fileBox.png";
+import ordinaryList from "@/assets/images/ordinaryList.png";
 export default {
     props: {
         folderClick: {
@@ -204,6 +213,8 @@ export default {
             copySpa,
             copyNma,
             copyFir,
+            ordinaryList,
+            fileBox
         }
     },
     components:{

src/views/publicment/jsComponents/ImgFile.js

@@ -38,7 +38,7 @@ import bigpptx from '../../../assets/images/pptxBig.png'
 import audio from '../../../assets/images/audio.png'
 import video from '../../../assets/images/video.png'
 import pic from '../../../assets/images/pic.png'
-import elseFile from '../../../assets/images/elseFile.png'
+import elseFile from '../../../assets/images/unkownFile.png'
 export default {
     copy,
     clipboard,