소스 검색

首页查看文字功能更改,更改部分界面不需要隐藏/搜索按钮

yxc 2 년 전
부모
커밋
f6516080f8

+ 4 - 3
src/styles1/element-ui1.scss

@@ -74,7 +74,7 @@
   height: calc(100vh * (650 / 1080)) !important;
   background: url(../assets/img/Group-585.png);
   background-size: calc(100vw * (700 / 1920)) calc(100vh * (650 / 1080));
-  padding-top: calc(100vh * (30 / 1080));
+  padding-top: calc(100vh * (40 / 1080));
   padding-right: calc(100vw * (80 / 1920));    
   padding-left: calc(100vw * (80 / 1920));    
   .el-dialog__body{
@@ -116,9 +116,10 @@
 }
 //右上角关闭按钮
 .el-dialog__headerbtn .el-dialog__close {
+  font-size: 25px;
   color: #02C2E3FF;
-  margin-top: 40px;
-  margin-right: 30px;
+  margin-top: calc(100vw * (60 / 1920));
+  margin-right: calc(100vw * (40 / 1920));
   border: 1px solid #02C2E3FF;
   border-radius: 50%;
 }

+ 6 - 5
src/views1/File/Individual/IndividualView.vue

@@ -5,7 +5,7 @@
         <el-row :gutter="20">
           <!--目录数据-->
           <el-col :span="4" :xs="24" class="main-left">
-            <div class="head-top">个人文档</div>
+            <div class="head-top">个人文档目录</div>
             <div class="head-container">
               <el-tree :data="dirList" :props="defaultProps" :expand-on-click-node="false" ref="tree" node-key="id"
                 default-expand-all highlight-current @node-click="handleNodeClick" />
@@ -44,7 +44,8 @@
 
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">上传</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                  v-hasPermi="['doc:info:add']">上传</el-button>
               </el-col>
               <!-- <el-col :span="1.5">
                 <el-button
@@ -87,7 +88,7 @@
             <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"
               class="main-right-table" height="calc(100vh * (630 / 1080))" align="left"
               :header-cell-style="{ 'text-align': 'center' }">
-              <el-table-column type="selection" width="55" align="center" />
+              <!-- <el-table-column type="selection" width="55" align="center" /> -->
               <el-table-column label="文件名称" align="left" prop="docName" />
               <el-table-column label="文件大小" align="center" prop="docSize" :formatter="fileSizeData" width="100" />
               <el-table-column label="修改时间" align="center" prop="updateTime" />
@@ -672,8 +673,7 @@
           this.open = true;
           this.title = "修改文件基本信息";
           this.dynamicTags = this.form.tagList.map(item => item.tagName);
-          // console.log(this.dynamicTags);
-          // console.log(this.form);
+          this.form.dirId=this.dirList[0].dirId;
         });
       },
       /** 提交按钮 */
@@ -1030,6 +1030,7 @@
   //弹窗底部按钮的位置
   ::v-deep .el-dialog__footer {
     padding: 0;
+    
   }
 
   //弹窗关闭按钮

+ 14 - 10
src/views1/File/Level/LevelView.vue

@@ -29,7 +29,7 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
               v-hasPermi="['doc:level:export']">导出</el-button>
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
         </el-row>
 
         <el-table v-loading="loading" :data="levelList" @selection-change="handleSelectionChange">
@@ -221,7 +221,7 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
       /** 删除按钮操作 */
       handleDelete(row) {
         const levelIds = row.levelId || this.ids;
-        this.$modal.confirm('你确定要删除该文件吗?').then(function() {
+        this.$modal.confirm('是否确认删除级别名称为"' + row.levelName + '"的数据项?').then(function() {
           return delLevel(levelIds);
         }).then(() => {
           this.getList();
@@ -257,7 +257,7 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
     h3 {
       font-size: 0.2rem;
       color: #ffffffff;
-      padding-top: calc(100vh * (25 / 1080));
+      padding-top: calc(100vh * (30 / 1080));
       padding-bottom: calc(100vh * (10 / 1080));
       padding-left: calc(100vw * (30 / 1920));
     }
@@ -386,6 +386,10 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
       color: #FF0000FF;
       border: 1px solid #FF0000FF;
       border-radius: 50%;
+      font-size: 25px;
+    }
+    .el-message-box__headerbtn{
+      border: none;
     }
 
     .el-message-box__title {
@@ -395,7 +399,7 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
     .el-message-box__btns {
       padding-right: 20px;
     }
-
+    
     .el-message-box__content {
       padding-top: calc(100vh * (50 / 1080));
       padding-bottom: calc(100vh * (50 / 1080));
@@ -407,19 +411,19 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
     }
 
     .el-button--small {
-      background: transparent;
-      color: #ffffffff;
-      border: 1px solid #FF0000FF;
       margin-left: -50px;
+      background: transparent !important;
+      border: 1px solid #FF0000FF !important;
     }
 
     .el-button--primary {
-      background: #951E1EFF;
-
+      background: #951E1EFF !important;
     }
 
     .el-message-box__btns {
-      padding-left: 60px;
+      // padding-left: 60px;
+      margin-top: calc(100vh * (50 / 1080));
+      margin-left: calc(100vw * (300 / 1920));
     }
   }
 </style>

+ 6 - 2
src/views1/File/Part/PartView.vue

@@ -5,7 +5,7 @@
         <el-row :gutter="20">
           <!--目录数据-->
           <el-col :span="4" :xs="24" class="main-left">
-            <div class="head-top">部门结构</div>
+            <div class="head-top">部门文档目录</div>
             <div class="head-container">
               <el-tree
                 :data="dirList"
@@ -148,7 +148,7 @@
               align="left"
               :header-cell-style="{'text-align':'center'}"
             >
-            <el-table-column type="selection" width="55" align="center" />
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
               <el-table-column label="文件名称" align="left" prop="docName" />
               <el-table-column label="文件大小" align="center" prop="docSize" :formatter="fileSizeData" width="100" />
               <el-table-column label="修改时间" align="center" prop="updateTime" />
@@ -839,6 +839,7 @@ export default {
         this.open = true;
         this.title = "修改文件基本信息";
         this.dynamicTags = this.form.tagList.map(item=>item.tagName);
+        this.form.dirId=this.dirList[0].dirId;
       });
     },
     /** 提交按钮 */
@@ -1085,6 +1086,9 @@ export default {
   height: 0;
 }
 //table样式
+::v-deep .el-table{
+  overflow: auto;
+}
 ::v-deep .el-table th {
   background: #016c9aa6;
   color: #2e8aec;

+ 224 - 224
src/views1/File/Publi/PublicView.vue

@@ -5,7 +5,7 @@
         <el-row :gutter="20">
           <!--部门数据-->
           <el-col :span="4" :xs="24" class="main-left">
-            <div class="head-top">部门结构</div>
+            <div class="head-top">公共文档目录</div>
             <div class="head-container">
               <el-tree
                 :data="dirList"
@@ -94,10 +94,7 @@
               </el-form-item>
             </el-form>
 
-            <el-row
-              :gutter="10"
-              class="mb8"
-            >
+            <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button
                   type="primary"
@@ -121,7 +118,7 @@
               @selection-change="handleSelectionChange"
               class="main-right-table"
             >
-              <el-table-column type="selection" width="55" align="center" />
+              <!-- <el-table-column type="selection" width="55" align="center" /> -->
               <el-table-column label="文件名称" align="center" prop="docName" />
               <el-table-column
                 label="文件大小"
@@ -160,50 +157,25 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="操作"
-                align="center"
-                class-name="small-padding fixed-width"
-              >
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    @click="handlePreview(scope.row)"
-                    >预览</el-button
-                  >
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-download"
-                    @click="handleDownload(scope.row)"
-                    >下载</el-button
-                  >
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    @click="handleEdit(scope.row)"
-                    v-hasRole="['public.manager']"
-                    >在线编辑</el-button
-                  >
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-edit"
-                    @click="handleUpdate(scope.row)"
-                    v-hasRole="['public.manager']"
-                    >修改</el-button
-                  >
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.row)"
-                    v-hasRole="['public.manager']"
-                    >删除</el-button
-                  >
+                  <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreview(scope.row)"
+                    v-if="checkLevel(scope.row, 'view')">预览</el-button>
+                  <el-dropdown size="mini">
+                    <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item icon="el-icon-view" @click.native="handleShare(scope.row)"
+                        v-if="checkLevel(scope.row, 'share')">分享</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-view" @click.native="handleDownload(scope.row)"
+                        v-if="checkLevel(scope.row, 'download')">下载</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-view" @click.native="handleEdit(scope.row)"
+                        v-if="checkLevel(scope.row, 'edit')">在线编辑</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-edit" @click.native="handleUpdate(scope.row)"
+                        v-hasPermi="['doc:info:edit']" v-if="checkLevel(scope.row, 'modify')">修改</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-delete" @click.native="handleDelete(scope.row)"
+                        v-hasPermi="['doc:info:remove']" v-if="checkLevel(scope.row, 'del')">删除</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
                 </template>
               </el-table-column>
             </el-table>
@@ -306,31 +278,52 @@
           </div>
         </el-dialog>
 
-                <!-- 预览对话框 -->
-      <div class="dhk" v-if="preview">
-       <video :src="vid" controls v-if="vid1"></video>
-       <audio :src="aud" controls v-if="aud1"></audio>
+        <!-- 预览对话框 -->
+        <div class="dhk" v-if="preview">
+          <video :src="vid" controls v-if="vid1"></video>
+          <audio :src="aud" controls v-if="aud1"></audio>
 
-       <div class="image-container" v-if="img1">
-        <el-image :src="imgg" ref="imageRef" style="max-width: 100%" @mousewheel.prevent="gunlun" />
-        <el-button-group>
-          <el-button icon="el-icon-refresh-left" @click="rotate(-90)" title="向左旋转"></el-button>
-              <el-button icon="el-icon-refresh-right" @click="rotate(90)" title="向右旋转"></el-button>
-              <el-button icon="el-icon-zoom-in" @click="scale(0.1)" title="放大"></el-button>
-              <el-button icon="el-icon-zoom-out" @click="scale(-0.1)" title="缩小"></el-button>
-    </el-button-group>
-  </div>
-        <el-button class="gb" icon="el-icon-close" circle @click="gb" />
-      </div>
+          <div class="image-container" v-if="img1">
+            <el-image
+              :src="imgg"
+              ref="imageRef"
+              style="max-width: 100%"
+              @mousewheel.prevent="gunlun"
+            />
+            <el-button-group>
+              <el-button
+                icon="el-icon-refresh-left"
+                @click="rotate(-90)"
+                title="向左旋转"
+              ></el-button>
+              <el-button
+                icon="el-icon-refresh-right"
+                @click="rotate(90)"
+                title="向右旋转"
+              ></el-button>
+              <el-button
+                icon="el-icon-zoom-in"
+                @click="scale(0.1)"
+                title="放大"
+              ></el-button>
+              <el-button
+                icon="el-icon-zoom-out"
+                @click="scale(-0.1)"
+                title="缩小"
+              ></el-button>
+            </el-button-group>
+          </div>
+          <el-button class="gb" icon="el-icon-close" circle @click="gb" />
+        </div>
       </div>
     </div>
   </div>
 </template>
   
   <script>
-  import "@/styles1/element-ui1.scss";
+import "@/styles1/element-ui1.scss";
 
-  import { listTag } from "@/api/doc/tag.js";
+import { listTag } from "@/api/doc/tag.js";
 
 import {
   listInfo,
@@ -355,28 +348,27 @@ export default {
       //预览图片的旋转缩放
       scalePercentage: 1,
       rotationAngle: 0,
-    
-    // 预览界面
-    preview:false,
-    
-    //视频路径和显示
-    vid:"",
-    vid1:false,
-    //音频路径和显示
-    aud:"",
-    aud1:false,
-    //图片路径和显示
-    imgg:"",
-    img1:false,
-       //标签列表
-       tags: [],
+
+      // 预览界面
+      preview: false,
+
+      //视频路径和显示
+      vid: "",
+      vid1: false,
+      //音频路径和显示
+      aud: "",
+      aud1: false,
+      //图片路径和显示
+      imgg: "",
+      img1: false,
+      //标签列表
+      tags: [],
 
       //选择标签
       dynamicTags: [],
       inputVisible: false,
       inputValue: "",
 
-
       // 遮罩层
       loading: true,
       // 选中数组
@@ -459,8 +451,8 @@ export default {
   methods: {
     // 滚轮滑动放大缩小
     gunlun(e) {
-        const image = this.$refs.imageRef.$el.querySelector("img");   
-        if (e.deltaY > 0) {
+      const image = this.$refs.imageRef.$el.querySelector("img");
+      if (e.deltaY > 0) {
         // console.log("鼠标向下滚动,图片缩小");
         this.scalePercentage -= 0.1;
         image.style.transform = `scale(${this.scalePercentage})`;
@@ -469,8 +461,7 @@ export default {
         this.scalePercentage += 0.1;
         image.style.transform = `scale(${this.scalePercentage})`;
       }
-      },
-
+    },
 
     //预览图片的缩放
     rotate(angle) {
@@ -478,7 +469,7 @@ export default {
       const image = this.$refs.imageRef.$el.querySelector("img");
       image.style.transform = `rotate(${this.rotationAngle}deg)`;
     },
-      //预览图片的旋转
+    //预览图片的旋转
     scale(delta) {
       this.scalePercentage += delta;
       const image = this.$refs.imageRef.$el.querySelector("img");
@@ -486,8 +477,8 @@ export default {
     },
 
     // 预览关闭
-    gb(){
-    this.preview=false;
+    gb() {
+      this.preview = false;
     },
 
     //选择标签关闭
@@ -501,55 +492,42 @@ export default {
     },
 
     showInput() {
-      if(this.dynamicTags.length>=5){
+      if (this.dynamicTags.length >= 5) {
         this.inputVisible = false;
-        alert("标签数不允许超过五个")
-      }else{
+        alert("标签数不允许超过五个");
+      } else {
         this.inputVisible = true;
         this.$nextTick((_) => {
-        this.$refs.saveTagInput.$refs.input.focus();
-      });
+          this.$refs.saveTagInput.$refs.input.focus();
+        });
       }
-
     },
     //固定的标签
     handleInputConfirm1(tag) {
-      if(this.dynamicTags.indexOf(tag.tagName)==-1){
-        this.dynamicTags.push(
-        tag.tagName
-      );
-      this.form.tagList.push({
-        tagId: tag.tagId,
-        tagName: tag.tagName,
-      });
+      if (this.dynamicTags.indexOf(tag.tagName) == -1) {
+        this.dynamicTags.push(tag.tagName);
+        this.form.tagList.push({
+          tagId: tag.tagId,
+          tagName: tag.tagName,
+        });
       }
 
-      if(this.dynamicTags.length>5){
-        alert("标签数不允许超过五个")
-        this.dynamicTags.pop()
-      };
-    
+      if (this.dynamicTags.length > 5) {
+        alert("标签数不允许超过五个");
+        this.dynamicTags.pop();
+      }
     },
     //自定义标签
     handleInputConfirm() {
       let inputValue = this.inputValue;
-      // if (inputValue) {
-      //   this.dynamicTags.push(inputValue);
-      // }
-      // this.inputVisible = false;
-      // this.inputValue = "";
-      // this.form.tagList.push({
-      //   tagName:inputValue,
-      // });
-
       //查询输入的标签在固定标签里是否存在
       var Newtags = this.tags.find((value) => value.tagName == inputValue);
       // console.log(a);
       //删除标签
-    if(this.dynamicTags.indexOf(inputValue)!=-1){
-      this.dynamicTags.pop()
-      this.form.tagList.pop()
-    }
+      if (this.dynamicTags.indexOf(inputValue) != -1) {
+        this.dynamicTags.pop();
+        this.form.tagList.pop();
+      }
       if (inputValue) {
         this.dynamicTags.push(inputValue);
       }
@@ -567,13 +545,12 @@ export default {
         });
       }
       // console.log(this.form);
-      if(this.dynamicTags.length>5){
-        alert("标签数不允许超过五个")
-        this.dynamicTags.pop()
-      };
+      if (this.dynamicTags.length > 5) {
+        alert("标签数不允许超过五个");
+        this.dynamicTags.pop();
+      }
     },
 
-
     /** 转换目录信息数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
@@ -594,66 +571,94 @@ export default {
     },
     //分享
     handleShare(row) {
-        this.$router.push("/home/file/individual/share/user/" + row.docId);
-      },
+      this.$router.push("/home/file/individual/share/user/" + row.docId);
+    },
     /**下载按钮操作*/
     handleDownload(row) {
       location.href = row.docPath;
     },
     //预览
     handlePreview(row) {
-        // console.log( this.$route.meta.title);
-        // row.isEdit = false;
-        // this.$tab.openPage(
-        //   // "文件[" + row.docName + "]预览",
-        // document.title = row.docName,
-        //   // window.open("/individual/Pre/user/" + row.docId, '_blank'),
-        //   // row
-        // );
+      // console.log( this.$route.meta.title);
+      // row.isEdit = false;
+      // this.$tab.openPage(
+      //   // "文件[" + row.docName + "]预览",
+      // document.title = row.docName,
+      //   // window.open("/individual/Pre/user/" + row.docId, '_blank'),
+      //   // row
+      // );
 
-        //图片后缀名
-        var pictures = ['jpeg', 'tiff', 'raw', 'bmp', 'gif', 'png', 'jpg'];
-        //音频后缀名
-        var audios = ['mid', 'mp3', 'wav', 'wma', 'ra', 'ogg', 'flac', 'aac', 'ape'];
-        //视频后缀名
-        var videos = ['asf', 'avi', 'mp4', 'ogm', 'ifo', 'mpg', 'mov', 'mpeg', 'mpg', 'vob', 'wmv', 'rm', 'rmvb'];
+      //图片后缀名
+      var pictures = ["jpeg", "tiff", "raw", "bmp", "gif", "png", "jpg"];
+      //音频后缀名
+      var audios = [
+        "mid",
+        "mp3",
+        "wav",
+        "wma",
+        "ra",
+        "ogg",
+        "flac",
+        "aac",
+        "ape",
+      ];
+      //视频后缀名
+      var videos = [
+        "asf",
+        "avi",
+        "mp4",
+        "ogm",
+        "ifo",
+        "mpg",
+        "mov",
+        "mpeg",
+        "mpg",
+        "vob",
+        "wmv",
+        "rm",
+        "rmvb",
+      ];
 
-        //判断后缀名
-        if (videos.some(item => item == row.docType)) {
-          this.preview = true;
-          this.vid1 = true;
-          this.aud1 = false;
-          this.img1 = false;
-          this.vid = row.docPath;
-        } else if (audios.some(item => item == row.docType)) {
-          this.preview = true;
-          this.aud1 = true;
-          this.vid1 = false;
-          this.img1 = false;
-          this.aud = row.docPath;
-        } else if (pictures.some(item => item == row.docType)) {
-          this.preview = true;
-          this.aud1 = false;
-          this.vid1 = false;
-          this.img1 = true;
-          this.imgg = row.docPath;
-        } else {
-          row.isEdit = false;
-          this.$tab.openPage(
-            window.open('/individual/Pre/user/' + row.docId + "?row=" + JSON.stringify(row),
-              '_blank'),
-          );
-        }
-      },
-
-      //在线编辑
-      handleEdit(row) {
-        row.isEdit = true;
+      //判断后缀名
+      if (videos.some((item) => item == row.docType)) {
+        this.preview = true;
+        this.vid1 = true;
+        this.aud1 = false;
+        this.img1 = false;
+        this.vid = row.docPath;
+      } else if (audios.some((item) => item == row.docType)) {
+        this.preview = true;
+        this.aud1 = true;
+        this.vid1 = false;
+        this.img1 = false;
+        this.aud = row.docPath;
+      } else if (pictures.some((item) => item == row.docType)) {
+        this.preview = true;
+        this.aud1 = false;
+        this.vid1 = false;
+        this.img1 = true;
+        this.imgg = row.docPath;
+      } else {
+        row.isEdit = false;
         this.$tab.openPage(
-          window.open('/individual/Pre/user/' + row.docId + "?row=" + JSON.stringify(row),
-            '_blank')
+          window.open(
+            "/individual/Pre/user/" + row.docId + "?row=" + JSON.stringify(row),
+            "_blank"
+          )
         );
-      },
+      }
+    },
+
+    //在线编辑
+    handleEdit(row) {
+      row.isEdit = true;
+      this.$tab.openPage(
+        window.open(
+          "/individual/Pre/user/" + row.docId + "?row=" + JSON.stringify(row),
+          "_blank"
+        )
+      );
+    },
     //先获取左边目录树,拿到目录ID和spaceId才能查询
     dirTree() {
       this.loading = true;
@@ -670,8 +675,8 @@ export default {
           this.levelOptions = response.rows;
         });
         this.loading = false;
-          //标签数据
-          listTag().then((res) => {
+        //标签数据
+        listTag().then((res) => {
           this.tags = res.rows;
         });
       });
@@ -713,15 +718,13 @@ export default {
         remark: null,
         isDel: null,
         searchValue: this.spaceId,
+        tagList: [],
       };
       this.resetForm("form");
+      this.dynamicTags = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      // const para = {
-      //   tagId: 123
-      // }
-      // this.queryParams.params = para;
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -730,6 +733,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.dirId = this.dirId;
       this.queryParams.searchValue = this.spaceId;
+      this.queryParams.params.tagId = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -752,19 +756,14 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改文件基本信息";
+        this.dynamicTags = this.form.tagList.map((item) => item.tagName);
+        this.form.dirId=this.dirList[0].dirId;
       });
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          //这句是要删掉的
-          this.form.tagList = [
-            {
-              tagId: 1,
-              tagName: "十四大",
-            },
-          ];
           if (this.form.docId != null) {
             updateInfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -894,7 +893,7 @@ export default {
         .reset1 {
           color: #2e8aecff;
           background: transparent;
-          border: 1px solid #2E8AECFF;
+          border: 1px solid #2e8aecff;
         }
       }
       .main-right-table {
@@ -903,6 +902,7 @@ export default {
         // margin-left: calc(100vw * (20 / 1920));
         background: transparent;
         color: #7ea4c8ff;
+        overflow: auto;
       }
       //表格底部数据
       .pagination-container {
@@ -917,46 +917,46 @@ export default {
   }
   //弹窗界面
   .dhk {
-      width: calc(100vw * (1500 / 1920));
-      height: calc(100vh * (850 / 1080));
-      // background: salmon;
-      background: #0F1540FF;
-      position: absolute;
-      top: 10%;
-      left: 10%;
-      z-index: 99;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+    width: calc(100vw * (1500 / 1920));
+    height: calc(100vh * (850 / 1080));
+    // background: salmon;
+    background: #0f1540ff;
+    position: absolute;
+    top: 10%;
+    left: 10%;
+    z-index: 99;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 
-      .gb {
-        position: absolute;
-        top: 0;
-        right: 0;
-      }
+    .gb {
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
 
-      video {
-        width: calc(100vw * (1440 / 1920));
-        height: calc(100vh * (810 / 1080));
-      }
+    video {
+      width: calc(100vw * (1440 / 1920));
+      height: calc(100vh * (810 / 1080));
+    }
 
-      .el-image {
-        width: calc(100vw * (960 / 1920));
-        height: calc(100vh * (720 / 1080));
-      }
+    .el-image {
+      width: calc(100vw * (960 / 1920));
+      height: calc(100vh * (720 / 1080));
+    }
 
-      .el-button-group {
-        position: absolute;
-        bottom: 0;
-        left: 35%;
-      }
+    .el-button-group {
+      position: absolute;
+      bottom: 0;
+      left: 35%;
     }
+  }
 }
 //标签按钮
 ::v-deep .el-tag {
-  color: #DF9439FF;
-  border: 1px solid #FF9839FF;
-  background: #BBA99240;
+  color: #df9439ff;
+  border: 1px solid #ff9839ff;
+  background: #bba99240;
   margin-left: 3px;
   margin-bottom: 3px;
   height: calc(100vh * (35 / 1080));
@@ -991,7 +991,7 @@ export default {
 }
 //右边顶部标签搜索
 ::v-deep .el-select > .el-input {
-    width: calc(100vw * (180 / 1920));
+  width: calc(100vw * (180 / 1920));
 }
 //右边表格线条隐藏
 ::v-deep .el-table::before {
@@ -1054,7 +1054,7 @@ export default {
   margin-top: 1vh !important;
 }
 ::v-deep .el-form {
- height: calc(100vh * (800 / 1080));
+  height: calc(100vh * (800 / 1080));
 }
 //弹窗底部按钮的位置
 ::v-deep .el-dialog__footer {

+ 3 - 6
src/views1/File/Storage/StoView.vue

@@ -17,7 +17,7 @@
           <el-row :gutter="20">
             <!--部门数据-->
             <el-col :span="4" :xs="24" class="main-left">
-              <div class="head-top">部门结构</div>
+              <div class="head-top">子分组文档目录</div>
               <div class="head-container">
           <el-tree :data="dirList" :props="defaultProps" :expand-on-click-node="false" ref="tree" node-key="id"
             default-expand-all highlight-current @node-click="handleNodeClick" />
@@ -152,9 +152,6 @@
         <el-form-item label="文件名称" prop="docName">
           <el-input v-model="form.docName" placeholder="请输入文件名称" />
         </el-form-item>
-        <el-form-item label="文件描述">
-          <el-input v-model="form.docDesc" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
         <el-form-item label="选择标签(最多5个)" prop="tagName" color="red">
               <el-tag
                 :key="tag"
@@ -761,7 +758,7 @@ import { listTag } from "@/api/doc/tag.js";
           color: #ffffffff;
           font-size: 0.2rem;
           padding-left: calc(100vw * (15 / 1920));
-          padding-top: calc(100vh * (20 / 1080));
+          padding-top: calc(100vh * (25 / 1080));
         }
       }
       .el-breadcrumb{
@@ -786,7 +783,7 @@ import { listTag } from "@/api/doc/tag.js";
           color: #ffffffff;
           font-size: 0.16rem;
           padding-left: calc(100vw * (15 / 1920));
-          padding-top: calc(100vh * (20 / 1080));
+          padding-top: calc(100vh * (25 / 1080));
           padding-bottom: calc(100vh * (20 / 1080));
         }
         //重置按钮

+ 1 - 1
src/views1/File/Storage/StorageView.vue

@@ -199,7 +199,7 @@
       h3 {
         font-size: 0.2rem;
         color: #ffffffff;
-        padding-top: calc(100vh * (25 / 1080));
+        padding-top: calc(100vh * (28 / 1080));
         padding-bottom: calc(100vh * (10 / 1080));
         padding-left: calc(100vw * (30 / 1920));
       }

+ 4 - 2
src/views1/Page/PageView.vue

@@ -87,7 +87,7 @@
                 <p class="four2" v-html="item.msgContent"></p>
               </div>
               <div class="five">
-                <span @click="looks">查看详细</span>
+                <span @click="looks(item.msgContent)">查看详细</span>
               </div>
             </li>
           </ul>
@@ -441,10 +441,12 @@ export default {
 
     // 是否机密
     isSecretRole(row) {
+      this.currentRow = row;
       // console.log(`row=${row}`);
       if (row.isSecret == "是") {
         this.check = true;
-        this.currentRow = row;
+      }else{
+        this.handlePreview(row)
       }
     },
 

+ 1 - 1
src/views1/Personal/Partspace/PartspaceView.vue

@@ -21,7 +21,7 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-if="refreshTable" v-loading="loading" :data="dirList" row-key="dirId" :default-expand-all="isExpandAll"

+ 1 - 1
src/views1/Personal/Publispace/PublispaceView.vue

@@ -21,7 +21,7 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-if="refreshTable" v-loading="loading" :data="dirList" row-key="dirId" :default-expand-all="isExpandAll"

+ 2 - 2
src/views1/Personal/Space/SpaceView.vue

@@ -35,10 +35,10 @@
                 >展开/折叠</el-button
               >
             </el-col>
-            <right-toolbar
+            <!-- <right-toolbar
               :showSearch.sync="showSearch"
               @queryTable="getList"
-            ></right-toolbar>
+            ></right-toolbar> -->
           </el-row>
 
           <el-table

+ 37 - 36
src/views1/Personal/Storagespace/Groupspace.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="containe">
-    <div class="header">
+    <!-- <div class="header">
       <span>个人设置</span>
       <img src="../../../assets/img/chevron-down.png" alt="" />
       <img src="../../../assets/img/slash.png" alt="" />
@@ -11,9 +11,9 @@
       <img src="../../../assets/img/chevron-up.png" alt="" class="top2" />
       <img src="../../../assets/img/slash.png" alt="" />
     </div>
-    <div class="title">分组空间</div>
+    <div class="title">分组空间</div> -->
     <div class="main">
-      <h3>目录列表</h3>
+      <h3>分组空间</h3>
       <div class="main-main">
         <div class="app-container">
           <el-row :gutter="10" class="mb8">
@@ -492,58 +492,59 @@ export default {
   font-weight: 500;
   padding-left: calc(100vw * (20 / 1920));
   //顶部信息
-  .header {
-    height: calc(100vh * (22 / 1080));
-    margin-top: calc(100vh * (20 / 1080));
-    margin-bottom: calc(100vh * (20 / 1080));
-    display: flex;
-    align-items: center;
-    img {
-      width: calc(100vw * (16 / 1920));
-      height: calc(100vh * (16 / 1080));
-      border: 1px dashed grey;
-      margin-left: 3px;
-      margin-right: 3px;
-    }
-    .top1 {
-      color: #2e8aecff;
-    }
-  }
-  //中间目录列表
-  .title {
-    height: calc(100vh * (22 / 1080));
-    margin-top: calc(100vh * (20 / 1080));
-    margin-bottom: calc(100vh * (20 / 1080));
-    color: #ffffffff;
-    font-size: 0.16rem;
-    font-weight: bold;
-    line-height: calc(100vh * (22 / 1080));
-  }
+  // .header {
+  //   height: calc(100vh * (22 / 1080));
+  //   margin-top: calc(100vh * (20 / 1080));
+  //   margin-bottom: calc(100vh * (20 / 1080));
+  //   display: flex;
+  //   align-items: center;
+  //   img {
+  //     width: calc(100vw * (16 / 1920));
+  //     height: calc(100vh * (16 / 1080));
+  //     border: 1px dashed grey;
+  //     margin-left: 3px;
+  //     margin-right: 3px;
+  //   }
+  //   .top1 {
+  //     color: #2e8aecff;
+  //   }
+  // }
+  // //中间目录列表
+  // .title {
+  //   height: calc(100vh * (22 / 1080));
+  //   margin-top: calc(100vh * (20 / 1080));
+  //   margin-bottom: calc(100vh * (20 / 1080));
+  //   color: #ffffffff;
+  //   font-size: 0.16rem;
+  //   font-weight: bold;
+  //   line-height: calc(100vh * (22 / 1080));
+  // }
   .main {
     width: calc(100vw * (1876 / 1920));
-    height: calc(100vh * (774 / 1080));
+    height: calc(100vh * (824 / 1080));
     background: url(../../../assets/img/Group-610.png);
-    background-size: calc(100vw * (1876 / 1920)) calc(100vh * (774 / 1080));
+    background-size: calc(100vw * (1876 / 1920)) calc(100vh * (824 / 1080));
+    margin-top: calc(100vh * (35 / 1080));
     h3 {
       font-size: 0.2rem;
       color: #ffffffff;
-      padding-top: calc(100vh * (21 / 1080));
+      padding-top: calc(100vh * (28 / 1080));
       padding-left: calc(100vw * (30 / 1920));
     }
     .main-main {
       width: calc(100vw * (1845 / 1920));
-      height: calc(100vh * (700 / 1080));
+      height: calc(100vh * (750 / 1080));
       margin-left: calc(100vw * (16 / 1920));
       margin-top: calc(100vh * (20 / 1080));
       // background: seagreen;
       .app-container {
         width: calc(100vw * (1845 / 1920));
-        height: calc(100vh * (700 / 1080));
+        height: calc(100vh * (750 / 1080));
         padding: 0;
       }
       .el-table {
         width: calc(100vw * (1830 / 1920));
-        height: calc(100vh * (646 / 1080));
+        height: calc(100vh * (696 / 1080));
         margin-left: calc(100vw * (8 / 1920));
         border: 1px solid #006c9aff;
         overflow: auto;

+ 1 - 1
src/views1/Personal/Storagespace/StoragespaceView.vue

@@ -194,7 +194,7 @@
       h3 {
       font-size: 0.2rem;
       color: #ffffffff;
-      padding-top: calc(100vh * (25 / 1080));
+      padding-top: calc(100vh * (28 / 1080));
       padding-left: calc(100vw * (30 / 1920));
     }
       .app-container {