退出登录更改

src/views1/File/Part/PartView.vue

@@ -988,9 +988,9 @@ export default {
         margin-top: 20px;
       }
       .main-right-table {
-        width: calc(100vw * (1540 / 1920));
+        // width: calc(100vw * (1540 / 1920));
         height: calc(100vh * (600 / 1080));
-        margin-left: calc(100vw * (20 / 1920));
+        // margin-left: calc(100vw * (20 / 1920));
         background: transparent;
         color: #7ea4c8ff;
       }

src/views1/File/Publi/PublicView.vue

@@ -97,10 +97,6 @@
             <el-row
               :gutter="10"
               class="mb8"
-              style="
-                margin-left: calc(100vw * (20 / 1920));
-                padding-right: calc(100vw * (20 / 1920));
-              "
             >
               <el-col :span="1.5">
                 <el-button
@@ -887,14 +883,14 @@ export default {
         color: #ffffffff;
         font-size: 0.16rem;
         padding-left: calc(100vw * (15 / 1920));
-        padding-top: calc(100vh * (20 / 1080));
+        padding-top: calc(100vh * (23 / 1080));
         margin-bottom: calc(100vh * (20 / 1080));
       }
       .main-right-form {
         width: calc(100vw * (1540 / 1920));
         height: calc(100vh * (80 / 1080));
-        margin-top: calc(100vh * (20 / 1080));
-        margin-left: calc(100vw * (20 / 1920));
+        // margin-top: calc(100vh * (20 / 1080));
+        // margin-left: calc(100vw * (20 / 1920));
         .reset1 {
           color: #2e8aecff;
           background: transparent;
@@ -902,9 +898,9 @@ export default {
         }
       }
       .main-right-table {
-        width: calc(100vw * (1540 / 1920));
+        // width: calc(100vw * (1540 / 1920));
         height: calc(100vh * (650 / 1080));
-        margin-left: calc(100vw * (20 / 1920));
+        // margin-left: calc(100vw * (20 / 1920));
         background: transparent;
         color: #7ea4c8ff;
       }

src/views1/File/Storage/StoView.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,7 +11,7 @@
         <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">
         <div class="app-container">
           <el-row :gutter="20">
@@ -25,7 +25,7 @@
             </el-col>
             <!--用户数据-->
             <el-col :span="20" :xs="24" class="main-right"> 
-              <p>文档列表</p>
+              <p>子分组文档</p>
               <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
           label-width="68px" class="main-right-form">
           <el-form-item label="文件名称" prop="docName">
@@ -52,7 +52,7 @@
               </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="cz">重置</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="reset1">重置</el-button>
           </el-form-item>
         </el-form>
     
@@ -714,53 +714,54 @@ import { listTag } from "@/api/doc/tag.js";
     font-family: PingFang SC-Medium, PingFang SC;
     font-weight: 500;
     padding-left: calc(100vw * (20 / 1920));
-    .header {
-    //   width: calc(100vw * (300 / 1920));
-      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 {
+    // //   width: calc(100vw * (300 / 1920));
+    //   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 * (880 / 1080));
+      height: calc(100vh * (930 / 1080));
       .app-container {
         width: calc(100vw * (1876 / 1920));
-        height: calc(100vh * (880 / 1080));
+        height: calc(100vh * (930 / 1080));
         padding: 0;
       }
       .main-left {
         width: calc(100vw * (260 / 1920));
-        height: calc(100vh * (880 / 1080));
+        height: calc(100vh * (930 / 1080));
         margin-right: calc(100vw * (20 / 1920));
         margin-left: calc(100vw * (10 / 1920));
+        margin-top: calc(100vh * (35 / 1080));
         background: url(../../../assets/img/Group-609.png);
-        background-size: calc(100vw * (260 / 1920)) calc(100vh * (880 / 1080));
+        background-size: calc(100vw * (260 / 1920)) calc(100vh * (930 / 1080));
         .head-top {
           color: #ffffffff;
           font-size: 0.2rem;
           padding-left: calc(100vw * (15 / 1920));
-          padding-top: calc(100vh * (15 / 1080));
+          padding-top: calc(100vh * (20 / 1080));
         }
       }
       .el-breadcrumb{
@@ -777,9 +778,10 @@ import { listTag } from "@/api/doc/tag.js";
       }
       .main-right {
         width: calc(100vw * (1600 / 1920));
-        height: calc(100vh * (880 / 1080));
+        height: calc(100vh * (930 / 1080));
         background: url(../../../assets/img/Group-610.png);
-        background-size: calc(100vw * (1600 / 1920)) calc(100vh * (880 / 1080));
+        background-size: calc(100vw * (1600 / 1920)) calc(100vh * (930 / 1080));
+        margin-top: calc(100vh * (35 / 1080));
         p {
           color: #ffffffff;
           font-size: 0.16rem;
@@ -788,8 +790,10 @@ import { listTag } from "@/api/doc/tag.js";
           padding-bottom: calc(100vh * (20 / 1080));
         }
         //重置按钮
-        .cz{
-            color: #2e8aecff;
+        .reset1 {
+          color: #2e8aecff;
+          background: transparent;
+          border: 1px solid #2E8AECFF;
         }
         .main-right-form {
           width: calc(100vw * (1540 / 1920));
@@ -799,7 +803,7 @@ import { listTag } from "@/api/doc/tag.js";
         }
         .main-right-table {
           width: calc(100vw * (1540 / 1920));
-          height: calc(100vh * (580 / 1080));
+          height: calc(100vh * (630 / 1080));
           margin-left: calc(100vw * (20 / 1920));
           background: transparent;
         }

src/views1/Group/Groups/GroupsView.vue

@@ -44,7 +44,11 @@
               @click="handleQuery"
               >搜索</el-button
             >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="reset1"
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery"
+              class="reset1"
               >重置</el-button
             >
           </el-form-item>
@@ -94,6 +98,7 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['doc:group:export']"
+              class="reset2"
               >导出</el-button
             >
           </el-col>
@@ -115,16 +120,38 @@
             align="center"
             prop="groupManagerName"
           />
-          <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-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['doc:group:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['doc:group:remove']">删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-user" @click="handleGroupUser(scope.row)"
-            v-hasPermi="['doc:group:user']">分配成员</el-button>
-        </template>
-      </el-table-column>
+          <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-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['doc:group:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['doc:group:remove']"
+                >删除</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-user"
+                @click="handleGroupUser(scope.row)"
+                v-hasPermi="['doc:group:user']"
+                >分配成员</el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -151,7 +178,7 @@
                 v-model="form.groupManagerName"
                 placeholder="请输入分组管理员"
                 @click.native="select()"
-              />  
+              />
             </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -163,8 +190,11 @@
           </div>
         </el-dialog>
 
-        <select-user ref="select" :groupId="queryParams.groupId" @okk="handleTest"/>
-
+        <select-user
+          ref="select"
+          :groupId="queryParams.groupId"
+          @okk="handleTest"
+        />
       </div>
     </div>
   </div>
@@ -185,9 +215,9 @@ import {
 
 export default {
   name: "Group",
-   components: {
-      selectUser
-    },
+  components: {
+    selectUser,
+  },
   data() {
     return {
       // 遮罩层
@@ -227,7 +257,7 @@ export default {
   },
   methods: {
     // 分组管理员
-    select(){
+    select() {
       this.$refs.select.show();
     },
 
@@ -247,8 +277,8 @@ export default {
     },
     // 返回数据
     handleTest(a) {
-      this.form.groupManagerName=a.name;
-      this.form.groupManager=a.id;
+      this.form.groupManagerName = a.name;
+      this.form.groupManager = a.id;
     },
     // 表单重置
     reset() {
@@ -279,7 +309,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.groupId);
+      this.ids = selection.map((item) => item.groupId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -290,15 +320,15 @@ export default {
       this.title = "添加分组";
     },
     /** 分组成员按钮操作 */
-       handleGroupUser(row) {
-        const groupId = row.groupId;
-        this.$router.push("/home/group/subgroup/" + groupId);
+    handleGroupUser(row) {
+      const groupId = row.groupId;
+      this.$router.push("/home/group/subgroup/" + groupId);
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const groupId = row.groupId || this.ids;
-      getGroup(groupId).then(response => {
+      getGroup(groupId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改分组";
@@ -414,10 +444,15 @@ export default {
         overflow: auto;
       }
       .reset1 {
-          color: #2e8aecff;
-          background: transparent;
-          border: 1px solid #2E8AECFF;
-        }
+        color: #2e8aecff;
+        background: transparent;
+        border: 1px solid #2e8aecff;
+      }
+      .reset2 {
+        background-color: #002a5cff;
+        color: #1890ff;
+        border: none;
+      }
     }
   }
 }
@@ -469,8 +504,7 @@ export default {
   border: none;
 }
 ::v-deep .el-button--success.is-plain.is-disabled,
-.el-button--danger.is-plain.is-disabled,
-.el-button{
+.el-button--danger.is-plain.is-disabled {
   background-color: #002a5cff;
   color: #1890ff;
   border: none;
@@ -480,17 +514,16 @@ export default {
   text-align: center;
 }
 //搜索刷新按钮颜色
-::v-deep .el-button.is-circle{
-    background: #006C9AFF;
-    color: white;
+::v-deep .el-button.is-circle {
+  background: #006c9aff;
+  color: white;
 }
 
-
 //新增/修改弹窗样式
 ::v-deep .el-dialog__title {
-    color: white;
-} 
-::v-deep .el-dialog1{
+  color: white;
+}
+::v-deep .el-dialog1 {
   width: calc(100vw * (750 / 1920)) !important;
   height: calc(100vh * (650 / 1080)) !important;
   background: url(../../../assets/img/Group-585.png);

src/views1/HomeView.vue

@@ -80,10 +80,10 @@
                 >{{ item.meta.title }}
               </el-menu-item>
             </li>
-            <el-menu-item index="/home/personal/notice">通知管理</el-menu-item>
+            <!-- <el-menu-item index="/home/personal/notice">通知管理</el-menu-item>
             <el-menu-item index="/home/personal/messages"
               >消息管理</el-menu-item
-            >
+            > -->
             <!-- <el-menu-item index="/home/personal/Publispace">公共存储空间</el-menu-item>
             <el-menu-item index="/home/personal/Storagespace">分组存储空间</el-menu-item>
             <el-menu-item index="/home/personal/space">个人存储空间</el-menu-item>
@@ -154,7 +154,7 @@
       <div class="top">
         <p>提示</p>
       </div>
-      <div class="cen">是否退出登录</div>
+      <div class="cen">确定注销并退出系统吗？</div>
       <div class="bottom">
         <div class="bottom-right" @click="exit1">确定</div>
         <div class="bottom-left" @click="exits = false">取消</div>
@@ -166,6 +166,7 @@
 
 <script>
 import { constantRoutes } from "@/router";
+// import { logout } from "@/api/login1";
 
 export default {
   data() {
@@ -232,9 +233,13 @@ export default {
         this.srcIndex = currentSrcIndex;
       }
     },
+    //退出方法
     exit1() {
       this.exits = false;
-      this.$router.push("/login1");
+      // this.$router.push("/login1");
+      this.$store.dispatch('LogOut').then(() => {
+          location.href = '/login1';
+        })
     },
   },
   computed: {
@@ -399,9 +404,9 @@ export default {
   }
   .exits {
     width: calc(100vw * (600 / 1920));
-    height: calc(100vh * (400 / 1080));
+    height: calc(100vh * (300 / 1080));
     background: url("../assets/img/Group-564.png");
-    background-size: calc(100vw * (600 / 1920)) calc(100vh * (400 / 1080));
+    background-size: calc(100vw * (600 / 1920)) calc(100vh * (300 / 1080));
     position: absolute;
     top: 25%;
     left: 35%;
@@ -418,7 +423,7 @@ export default {
       width: calc(100vw * (430 / 1920));
       height: calc(100vh * (50 / 1080));
       border-bottom: 1px solid #02618DFF;
-      margin-top: calc(100vh * (50 / 1080));
+      margin-top: calc(100vh * (30 / 1080));
       margin-left: calc(100vw * (50 / 1920));
       p {
         width: calc(100vw * (80 / 1920));
@@ -429,9 +434,9 @@ export default {
     }
     .cen {
       width: calc(100vw * (430 / 1920));
-      height: calc(100vh * (100 / 1080));
+      height: calc(100vh * (70 / 1080));
       // background: salmon;
-      margin-top: calc(100vh * (60 / 1080));
+      margin-top: calc(100vh * (30 / 1080));
       margin-left: calc(100vw * (100 / 1920));
     }
     .bottom {

src/views1/Page/PageView.vue

@@ -366,7 +366,7 @@ export default {
 
     // 搜索跳转
     jumpSearch() {
-      this.$router.push("/home/retrieval");
+      this.$router.push({path:"/home/retrieval",query:{datas:this.input} });
       // sessionStorage.setItem("suju", this.input);
     },
     //底部表格更多跳转

src/views1/Personal/Modify/ModifyView.vue

@@ -1,13 +1,13 @@
 <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="" />
       <span class="top1">文档设置</span>
       <img src="../../../assets/img/chevron-up.png" alt="" class="top2" />
       <img src="../../../assets/img/slash.png" alt="" />
-    </div>
+    </div> -->
     <div class="title">登录密码修改</div>
     <div class="main">
       <el-form ref="form" :model="user" :rules="rules" label-width="80px" style="width: calc(100vw * (400 / 1920))">
@@ -130,7 +130,7 @@ export default {
   }
   .title {
     height: calc(100vh * (22 / 1080));
-    margin-top: calc(100vh * (20 / 1080));
+    margin-top: calc(100vh * (40 / 1080));
     margin-bottom: calc(100vh * (20 / 1080));
     color: #ffffffff;
     font-size: 0.16rem;
@@ -145,6 +145,14 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
+   ::v-deep .el-form-item__label{
+      color: #2E8AECFF;
+    }
+   ::v-deep .el-input--medium .el-input__inner{
+      background: transparent;
+      border: 1px solid #006C9AFF;
+      color: #7EA4C8FF;
+    }
   }
 }
 ::v-deep .el-button--mini {

src/views1/Retrieval/RetrievalView.vue

@@ -8,6 +8,7 @@
         type="text"
         placeholder="请输入文档信息"
         v-model="input"
+        @keyup.enter.native="searchs"
       ></el-input>
       <span class="cen—top-span" @click="searchs">快速搜索</span>
       <img
@@ -21,7 +22,7 @@
         :key="item.id"
         class="main-main"
       >
-        <div class="one" @click="docName(item.id, item.content.info.docName)">
+        <div class="one" @click="docName(item.id, item.content.info)">
           {{ item.content.info.docName }}
         </div>
         <div class="two">
@@ -79,7 +80,6 @@ export default {
       // console.log(scrollTop);
       // 是否达到页面底部
       if (scrollTop + clientHeight >= scrollHeight) {
-        // console.log('滚动到底部了！')
         this.page+=1
         // 执行加载
         this.searchs()
@@ -92,17 +92,17 @@ export default {
       // console.log('this.page=',this.page)
       // console.log('this.size=',this.size)
       ret({ content: this.input, page: this.page, size: this.size }).then((item) => {
-        // console.log('item=',item)        
+        console.log('item=',item)        
         if (item.length > 0) {
           this.count.push(...item)
         }
       })
     },
     //预览界面
-    docName(curentDocId, curentDocName) {
+    docName(curentDocId, value) {
       this.$tab.openPage(
-        window.open("/individual/Pre/user/" + curentDocId, "_blank"),
-        localStorage.setItem("docName", curentDocName)
+        // window.open("/individual/Pre/user/" + curentDocId, "_blank"),
+       window.open("/individual/Pre/user/" + curentDocId+ "?value=" + JSON.stringify(value), "_blank"),
       );
     },
   },