Browse Source

修改bug

yangdr 1 month ago
parent
commit
4a3d5448e7

+ 2 - 5
src/App.vue

@@ -15,11 +15,8 @@ import zhCn from 'element-plus/es/locale/lang/zh-cn'
   width: 100vw;
   height: 100vh;
   overflow: auto;
-
-  // padding: 0px 10px;
-  // ::--webkit--scrollbar {
-  //   display: none
-  // }
+  // margin-right: 20px;
+  // box-sizing: margin-box;
 }
 
 body,

+ 7 - 1
src/assets/css/common.less

@@ -2,7 +2,6 @@
 @import './reset.css';
 
 .hide-scrollbar {
-  overflow: hidden !important;
 
   &::--webkit--scrollbar {
     display: none
@@ -192,4 +191,11 @@
   background-image: url(../images/rocket-icon.svg);
   width: 128px;
   height: 128px;
+}
+
+.back-icon {
+  .icon-common();
+  background-image: url(../images/back.png);
+  width: 32px;
+  height: 32px;
 }

BIN
src/assets/images/back.png


+ 1 - 0
src/components/EditKBFileDialog.vue

@@ -7,6 +7,7 @@
           <div class="file-table">
             <el-table :data="formData.fileTableData" border table-layout="fixed" height="400"
               style="max-width: 100%;box-sizing: border-box;min-width: 0px;">
+              <el-table-column type="index" label="#" width="50" />
               <el-table-column label="导入文件标题" prop="file_name">
                 <template #default="{ row, $index }">
                   <p :contenteditable="true" class="input-box" @blur="updateInputBox($event, $index, 'file_name')">{{

+ 1 - 1
src/components/EditPasswordDialog.vue

@@ -76,7 +76,7 @@ const rules = {
   oldPassword: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
   newPassword: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
   reNewPassword: [{ required: true, message: "必填", trigger: ["change", "blur"] },
-  { validator: validatePass, trigger: 'change' }
+  { validator: validatePass, trigger: ["blur", "change"] }
   ],
 };
 watch(() => props.show, (newVal) => {

+ 29 - 7
src/components/FileViewer/FileViewer.vue

@@ -2,7 +2,7 @@
   <div class="document-viewer">
     <div class="mask"></div>
     <div ref="containerRef" class="container" :style="{ width: props.width + 'px' }">
-      <div class="top">
+      <div class="top" ref="topRef">
         <span v-show="props.fileName">{{ props.fileName }}</span>
         <span class="close">
           <el-icon @click="emit('closeViewer')">
@@ -43,6 +43,7 @@ import TextViewer from './TextViewer.vue'
 import PdfViewer from './PdfViewer.vue'
 const props = defineProps({ fileType: String, fileUrl: String, fileName: String, width: { type: Number, default: 1000 } })
 const emit = defineEmits(['closeViewer'])
+const topRef = ref()
 const containerRef = ref() //.containerd的ref
 let containerSize = ref({
   width: 0,
@@ -74,19 +75,39 @@ function errorHandler() {
 const handleResize = () => {
   containerSize.value = {
     width: containerRef.value.offsetWidth,
-    height: containerRef.value.offsetHeight
+    height: containerRef.value.offsetHeight - topRef.value.offsetHeight
   }
-  console.log(containerSize.value)
 }
+
+const handleKeydown = (event) => {
+  switch (event.key) {
+    case 'Enter':
+
+      break
+    case 'Escape':
+      emit('closeViewer')
+      break
+    case 'ArrowUp':
+
+      break
+    case ' ':
+      break
+    default:
+
+  }
+}
+
 onMounted(() => {
   containerSize.value = {
     width: containerRef.value.offsetWidth,
-    height: containerRef.value.offsetHeight
+    height: containerRef.value.offsetHeight - topRef.value.offsetHeight
   }
   // window.addEventListener('resize', handleResize)
+  window.addEventListener('keydown', handleKeydown)
 })
 onBeforeUnmount(() => {
   // window.removeEventListener('resize', handleResize)
+  window.removeEventListener('keydown', handleKeydown)
 })
 </script>
 
@@ -109,7 +130,7 @@ onBeforeUnmount(() => {
     left: 0;
     bottom: 0;
     right: 0;
-    // z-index: 50;
+    z-index: 50;
     // display: flex;
     // flex-direction: column;
     background-color: rgb(128, 128, 128, 0.8);
@@ -123,12 +144,12 @@ onBeforeUnmount(() => {
 
   // opacity: 0.5;
   .top {
-    flex: 0 0 100%;
+    // flex: 0 0 auto;
     background-color: white;
     clear: both;
     padding: 5px 10px;
     position: sticky;
-    z-index: 110;
+    z-index: 60;
     top: 0;
     display: flex;
     justify-content: end;
@@ -156,6 +177,7 @@ onBeforeUnmount(() => {
     box-sizing: border-box;
     background-color: white;
     position: relative;
+    z-index: 60;
 
     // overflow: auto;
     &::v-deep .vue-office-pptx {

+ 3 - 2
src/views/KMPlatform/KnowledgeBase/KBM/KnowledgeBaseManagement.vue

@@ -628,8 +628,9 @@ onMounted(() => {
             margin-left: 10px;
             flex: 1 1 auto;
             min-width: 0px;
-
-
+            display: flex;
+            flex-direction: column;
+            align-items: center;
 
             .name {
               width: 100%;

+ 10 - 5
src/views/KMPlatform/KnowledgeBase/KM/KnowledgeManagement.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="knowledge-management">
     <header>
+      <i class="back-icon" @click="goKBM"></i>
       <i class="folder-icon" style="height: 32px;width:32px;cursor: pointer;" @click="goKBM"></i>
     </header>
     <main>
@@ -24,8 +25,8 @@
               style="margin: 0px;">批量修改文件</i></span>
         </div>
         <div class="management-content-middle">
-          <el-table :data="filesList" ref="fileTableRef" size="large">
-            <el-table-column type="selection" width="30" />
+          <el-table :data="filesList" ref="fileTableRef" size="large" style="width: 99% ;">
+            <el-table-column type="selection" width="35" />
             <el-table-column label="#" prop="index" width="60" />
             <el-table-column prop="file_name" min-width="150" label="标题">
               <template #default="{ row }">
@@ -42,7 +43,7 @@
             <el-table-column prop="knowledge_type" label="知识类型" />
             <el-table-column prop="version" label="版本" />
             <el-table-column prop="author" label="作者(主编)" />
-            <el-table-column prop="year" label="年份" width="70" />
+            <el-table-column prop="year" label="年份" min-width="70" />
             <el-table-column prop="creator" label="上传人" />
             <el-table-column prop="created_at" label="上传时间" width="170" />
             <el-table-column prop="" label="状态" width="90">
@@ -106,7 +107,7 @@
 <script setup>
 import { saveAs } from 'file-saver'
 import { ElMessage } from 'element-plus'
-import { ref, getCurrentInstance, computed, watch, toRaw } from 'vue'
+import { ref, getCurrentInstance, computed, watch, toRaw, onMounted } from 'vue'
 import { Download, Search } from '@element-plus/icons-vue'
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
@@ -179,7 +180,7 @@ const handleViewFile = (url, type) => {
   viewFileData.value.show = true;
   viewFileData.value.url = url;
   viewFileData.value.type = type
-  console.log(viewFileData.value)
+  // console.log(viewFileData.value)
 }
 function handleDownloadFile(file_url, file_name, status = true) {
   if (status) {
@@ -259,6 +260,10 @@ watch(() => paginationData.value.currentPageSize, () => {
   getFilesList()
 })
 getKnowledgeBaseById()
+
+onMounted(() => {
+  // const fileTableRef = proxy.$refs['fileTableRef']
+})
 </script>
 
 <style lang="less" scoped>