liuQiang 1 jaar geleden
bovenliggende
commit
7a3179397c

+ 23 - 2
src/components/ListShow/ListShow.vue

@@ -333,21 +333,42 @@ const setIcon = (fileType) => {
     case ".docx":
       return file_DOC;
       break;
+    case ".doc":
+      return file_DOC;
+      break;
     case ".pdf":
       return file_pdf;
       break;
     case ".ppt":
       return file_PPT;
       break;
+    case ".pptx":
+        return file_PPT;
+        break;
     case ".txt":
       return file_TXT;
       break;
     case ".xlsx":
       return file_XLSX;
       break;
-    case ".csv":
+    case ".xps":
       return file_XLSX;
       break;
+    case ".csv":
+        return file_XLSX;
+        break;
+    case ".png":
+      return file_pic;
+      break;
+    case ".jpg":
+      return file_pic;
+      break;
+    case ".JPG":
+      return file_pic;
+      break;
+    case ".jpeg":
+      return file_pic;
+      break;
     case ".png":
       return file_pic;
       break;
@@ -361,7 +382,7 @@ const setIcon = (fileType) => {
       return file_zip;
       break;
     default:
-      return file_DOC;
+      return file_noOne;
       break;
   }
 };

+ 1 - 1
src/layout/components/DefaultPage/DefaultPage.vue

@@ -38,7 +38,7 @@
           v-model="searchText"
           placeholder="请输入关键字"
         />
-        <div class="searchBtn" @click="searchBtn">
+        <div class="searchBtn" @click="searchBtn" @keyup.enter="searchBtn">
           <img src="@/assets/images/newIndex/search.png" alt="" />
           <span>全域瞬搜</span>
         </div>

+ 1 - 1
src/layout/components/TopMenu/TopMenu.vue

@@ -27,7 +27,7 @@
       <img src="@/assets/images/newIndex/clock.png" @click="openTab('会话消息','/chat')" alt="" />
       <img v-if="hasRole" src="@/assets/images/newIndex/setting.png" @click="openTab('系统管理',systemPath.path)" alt="" />
       <div class="userInfo" @click="changeShowMenu">
-        <span>admin</span>
+        <span>{{userStore.name}}</span>
         <img v-if="!showMenu" src="@/assets/images/newIndex/arrow.png" alt="" />
         <img v-else class="upArrow" src="@/assets/images/newIndex/arrow.png" alt="" />
       </div>

+ 12 - 2
src/views/myjoin/MyJoin.vue

@@ -140,7 +140,12 @@ export default {
             thisLClickRow.value = row
             clickRowId.value = row.docId
             copyRow.value = toRaw(row)
-            addFileTab(copyRow.value,1);
+            const itemData = {
+                name: copyRow.value.fileName,
+                path: `${window.location.origin}/fileEdit?clickRowId=${copyRow.value.docId}&canEdit=1&canCopy=1&history=0&fileId=0`
+            }
+            sessionStorage.setItem('newTab',JSON.stringify(itemData))
+            // addFileTab(copyRow.value,1);
             // showEdit.value = true
         }
         const rowJoinClickFN = (row,col,e)=>{
@@ -154,7 +159,12 @@ export default {
                     thisLClickRow.value = row
                     clickRowId.value = row.docId
                     copyRow.value = toRaw(row)
-                    addFileTab(copyRow.value,1);
+                    const itemData = {
+                        name: copyRow.value.fileName,
+                        path: `${window.location.origin}/fileEdit?clickRowId=${copyRow.value.docId}&canEdit=1&canCopy=1&history=0&fileId=0`
+                    }
+                    sessionStorage.setItem('newTab',JSON.stringify(itemData))
+                    // addFileTab(copyRow.value,1);
                 })
             
         }

+ 4 - 4
src/views/publicment/components/createTasnsfer.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="transBox" v-if="open">
     <div class="allBag">
-      <el-input style="width: 220px; margin-left: 18px; margin-top: 5px" v-model="allBag" placeholder="搜索"></el-input>
+      <el-input style="width: calc(100% - 30px); margin-left: 18px; margin-top: 5px" v-model="allBag" placeholder="搜索"></el-input>
       <div class="allLog">
         <el-tree ref="treeRef" :filter-node-method="filterNode" :data="allTreeData" :props="allTreeProps" show-checkbox
           node-key="id" :default-expanded-keys="openTree" @check="allTreeChange" :default-checked-keys="backScreen"
@@ -260,7 +260,7 @@ onMounted(async () => {
   justify-content: space-between;
   align-items: center;
   text-align: start;
-  width: 230px;
+  width: calc(100% - 20px);
   margin: 0 auto;
 }
 
@@ -274,7 +274,7 @@ onMounted(async () => {
   width: 50%;
   height: 380px;
   border: 1px solid green;
-  // overflow-y: auto;
+  overflow-y: auto;
 }
 .custom-tree-node{
   display: flex;
@@ -285,7 +285,7 @@ onMounted(async () => {
   }
 }
 .allLog {
-  width: 245px;
+  width: calc(100% - 50px);
   height: 330px;
   margin: 5px auto;
   /* border: 1px solid red; */