修改了导航栏图标显示

src/api/login1.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function login(username, password, code, uuid) {
+  return request({
+    url: '/auth/login',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: { username, password, code, uuid }
+  })
+}
+
+// 注册方法
+export function register(data) {
+  return request({
+    url: '/auth/register',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 刷新方法
+export function refreshToken() {
+  return request({
+    url: '/auth/refresh',
+    method: 'post'
+  })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return request({
+    url: '/system/user/getInfo',
+    method: 'get'
+  })
+}
+
+// 退出方法
+export function logout() {
+  return request({
+    url: '/auth/logout',
+    method: 'delete'
+  })
+}
+
+// 获取验证码
+export function getCodeImg() {
+  return request({
+    url: '/code',
+    headers: {
+      isToken: false
+    },
+    method: 'get',
+    timeout: 20000
+  })
+}

src/router/index.js

@@ -146,22 +146,48 @@ export const constantRoutes = [
         component: () => import('@/views1/System/SystemView.vue')
       },
       {
-        path: "/home/system/organization",
-        component: () => import('@/views1/System/Organization/OrganizationView.vue')
-      },
-      {
         path: "/home/system/user",
         component: () => import('@/views1/System/User/UserView.vue')
       },
       {
-        path: "/home/system/authority",
-        component: () => import('@/views1/System/Authority/AuthorityView.vue')
-      },{
-        path: "/home/system/notes",
-        component: () => import('@/views1/System/Notes/NotesView.vue')
-      },{
-        path: "/home/system/space",
-        component: () => import('@/views1/System/Space/SpaceView.vue')
+        path: "/home/system/role",
+        component: () => import('@/views1/System/Role/RoleView.vue')
+      },
+      {
+        path: "/home/system/menu",
+        component: () => import('@/views1/System/Menu/MenuView.vue')
+      },
+      {
+        path: "/home/system/department",
+        component: () => import('@/views1/System/Department/DepartmentView.vue')
+      },
+      {
+        path: "/home/system/post",
+        component: () => import('@/views1/System/Post/PostView.vue')
+      },
+      {
+        path: "/home/system/dictionary",
+        component: () => import('@/views1/System/Dictionary/DictionaryView.vue')
+      },
+      {
+        path: "/home/system/parameter",
+        component: () => import('@/views1/System/Parameter/ParameterView.vue')
+      },
+      {
+        path: "/home/system/notice",
+        component: () => import('@/views1/System/Notice/NoticeView.vue')
+      },
+      {
+        path: "/home/system/journal",
+        component: () => import('@/views1/System/Journal/JournalView.vue')
+      },
+      {
+        path: "/home/system/journal/operation",
+        component: () => import('@/views1/System/Journal/Operation/OperationView.vue')
+      },
+      {
+        path: "/home/system/journal/register",
+        component: () => import('@/views1/System/Journal/Register/RegisterView.vue')
       }
     ],
   },

src/views1/File/Individual/IndividualView.vue

@@ -504,7 +504,7 @@
         <div class="footer">
           部门存储空间：<el-progress
             :percentage="60"
-            stroke-width="15"
+             :stroke-width=15
             :show-text="false"
           ></el-progress>
           60G可用（共100G）
@@ -1049,7 +1049,7 @@ export default {
   color: #006c9aff;
 }
 ::v-deep .el-input__inner {
-  color: black;
+  color: #01d1ffff;
 }
 </style>
     

src/views1/File/Part/PartView.vue

@@ -384,7 +384,7 @@
     <div class="footer">
       部门存储空间：<el-progress
         :percentage="60"
-        stroke-width="15"
+        :stroke-width=15
         :show-text="false"
       ></el-progress>
       60G可用（共100G）

src/views1/HomeView.vue

@@ -10,58 +10,118 @@
             <img src="../assets/img/luzhougongan.png" alt="" />
           </span>
         </div>
-          <el-menu
-            :default-active="activeIndex"
-            class="el-menu-demo"
-            mode="horizontal"
-            @select="handleSelect"
-            text-color="#006C9AFF"
-            active-text-color="#51CFFEFF"
-            background-color="transparent"
-          >
-            <el-menu-item index="0">
-                <span class="nav1"><img src="../assets/img/nav-home.png"></span>首页
-            </el-menu-item>
-            <el-menu-item index="1">
-                <span class="nav1"><img src="../assets/img/nav-search.png"></span>快速检索
-            </el-menu-item>
-            <el-submenu index="2">
-              <template slot="title">
-                <span class="nav1"><img src="../assets/img/nav-doc.png"></span>文档管理
+        <el-menu
+          :default-active="activeIndex"
+          class="el-menu-demo"
+          mode="horizontal"
+          @select="handleSelect"
+          text-color="#006C9AFF"
+          active-text-color="#51CFFEFF"
+          background-color="transparent"
+          router
+          :stroke-width=15
+        >
+          <el-menu-item index="/home/page">
+            <span class="nav1">
+              <img
+                :src="
+                  srcIndex == '/home/page'
+                    ? icoUrl[0]['home1']
+                    : icoUrl[0]['home2']
+                "
+              /> </span
+            >首页
+          </el-menu-item>
+          <el-menu-item index="/home/retrieval">
+            <span class="nav1">
+              <img :src="
+              srcIndex == '/home/retrieval'
+              ?icoUrl[1]['search1']
+              :icoUrl[1]['search2']
+              " />
+              </span
+            >快速检索
+          </el-menu-item>
+          <el-submenu index="2">
+            <template slot="title">
+              <span class="nav1">
+                <img :src="
+                  srcIndex=='2'
+                  ?icoUrl[2]['doc1']
+                  :icoUrl[2]['doc2']
+                  " />
+                 </span
+              >文档管理
             </template>
-              <el-menu-item index="2-1">部门文档</el-menu-item>
-              <el-menu-item index="2-2">公共文档</el-menu-item>
-              <el-menu-item index="2-3">个人文档</el-menu-item>
-              <el-menu-item index="2-3">文档设置</el-menu-item>
-            </el-submenu>
-            <el-submenu index="3">
-              <template slot="title">
-                <span class="nav1"><img src="../assets/img/nav-person.png"></span>个人设置
+            <el-menu-item index="/home/file/part" >部门文档</el-menu-item>
+            <el-menu-item index="/home/file/publi" >公共文档</el-menu-item>
+            <el-menu-item index="/home/file/individual" >个人文档</el-menu-item>
+            <el-menu-item index="/home/file/set" >文档设置</el-menu-item>
+          </el-submenu>
+          <el-submenu index="3">
+            <template slot="title">
+              <span class="nav1">
+                <img :src="
+                srcIndex=='3'
+                ?icoUrl[3]['person1']
+                :icoUrl[3]['person2']
+                " />
+                <!-- <img src="../assets/img/nav-person1.png"> --> </span
+              >个人设置
             </template>
-              <el-menu-item index="3-1">个人文档分类</el-menu-item>
-              <el-menu-item index="3-2">个人存储空间</el-menu-item>
-              <el-menu-item index="3-3">登录密码修改</el-menu-item>
-            </el-submenu>
-            <el-submenu index="4">
-              <template slot="title">
-                <span class="nav1"><img src="../assets/img/nav-setting.png"></span>系统管理
+            <el-menu-item index="/home/personal/classify"
+              >个人文档分类</el-menu-item
+            >
+            <el-menu-item index="/home/personal/space"
+              >个人存储空间</el-menu-item
+            >
+            <el-menu-item index="/home/personal/modify"
+              >登录密码修改</el-menu-item
+            >
+          </el-submenu>
+          <el-submenu index="4">
+            <template slot="title">
+              <span class="nav1">
+                <img :src="
+                srcIndex=='4'
+                ?icoUrl[4]['search1']
+                :icoUrl[4]['search2']
+                " />
+               </span
+              >系统管理
             </template>
-              <el-menu-item index="4-1">组织管理</el-menu-item>
-              <el-menu-item index="4-2">用户管理</el-menu-item>
-              <el-menu-item index="4-3">权限管理</el-menu-item>
-              <el-menu-item index="4-4">系统日志管理</el-menu-item>
-              <el-menu-item index="4-5">存储空间管理</el-menu-item>
+            <el-menu-item index="/home/system/user">用户管理</el-menu-item>
+            <el-menu-item index="/home/system/role">角色管理</el-menu-item>
+            <el-menu-item index="/home/system/menu">菜单管理</el-menu-item>
+            <el-menu-item index="/home/system/department"
+              >部门管理</el-menu-item
+            >
+            <el-menu-item index="/home/system/post">岗位管理</el-menu-item>
+            <el-menu-item index="/home/system/dictionary"
+              >字典管理</el-menu-item
+            >
+            <el-menu-item index="/home/system/parameter">参数管理</el-menu-item>
+            <el-menu-item index="/home/system/notice">通知公告</el-menu-item>
+            <el-submenu index="2-4">
+              <template slot="title">日志管理</template>
+              <el-menu-item index="/home/system/journal/operation"
+                >操作日志</el-menu-item
+              >
+              <el-menu-item index="/home/system/journal/register"
+                >登录日志</el-menu-item
+              >
             </el-submenu>
-          </el-menu>
+          </el-submenu>
+        </el-menu>
         <div class="right">
-           <span class="right_1">
-            <img src="../assets/img/2.jpg"> 
-           </span>
+          <span class="right_1">
+            <img src="../assets/img/2.jpg" />
+          </span>
           <span class="right_2">孙芳</span>
           <div class="right_3"></div>
-           <span class="right_4">
-            <img src="../assets/img/exit.png">
-           </span>
+          <span class="right_4">
+            <img src="../assets/img/exit.png" @click="exit()"/>
+          </span>
         </div>
       </div>
       <div class="bottom"></div>
@@ -73,36 +133,68 @@
 </template>
 
 <script>
-import page from "./Page/PageView";
-import retrieval from "./Retrieval/RetrievalView";
-import file from "./File/FileView";
-import personal from "./Personal/PersonalView";
-import system from "./System/SystemView";
+// import page from "./Page/PageView";
+// import retrieval from "./Retrieval/RetrievalView";
+// import file from "./File/FileView";
+// import personal from "./Personal/PersonalView";
+// import system from "./System/SystemView";
 
 export default {
   data() {
     return {
-      activeIndex: "1",
+      activeIndex: "/home/page",
+      srcIndex: '/home/page',
+      // 图片数组
+      icoUrl: 
+        [
+        {
+          home1: require("../assets/img/nav-home1.png"),
+          home2: require("../assets/img/nav-home.png"),
+        },
+        {
+          search1: require('../assets/img/nav-search1.png'),
+          search2: require('../assets/img/nav-search.png'),
+        },
+        {
+          doc1: require('../assets/img/nav-doc1.png'),
+          doc2: require('../assets/img/nav-doc.png'),
+        },
+        {
+          person1: require('../assets/img/nav-person1.png'),
+          person2: require('../assets/img/nav-person.png'),
+        },
+        {
+          search1: require('../assets/img/nav-setting1.png'),
+          search2: require('../assets/img/nav-setting.png'),
+        }
+      ],
+      
     };
   },
-  components: {
-    page,
-    retrieval,
-    file,
-    personal,
-    system
-  },
+  // components: {
+  //   page,
+  //   retrieval,
+  //   file,
+  //   personal,
+  //   system
+  // },
   methods: {
     handleSelect(key, keyPath) {
-      console.log(key, keyPath);
+      this.srcIndex = keyPath[0];
+      // console.log(this.srcIndex,keyPath);
+      // console.log(key);
     },
+    exit(){
+      alert('你确定要注销界面吗？')
+      this.$router.push('/login1')
+    }
   },
 };
 </script>
 
 <style scoped lang='scss'>
 .container {
-  background: #0C0827FF;
+  background: #0c0827ff;
   background-size: 100% 100%;
   width: 100%;
   height: 100%;
@@ -115,7 +207,7 @@ export default {
       height: calc(100vh * (40 / 1080));
       width: 100%;
       padding-right: calc(100vh * (17 / 1920));
-      padding-left: calc(100vh * (35 / 1920));
+      padding-left: calc(100vh * (55 / 1920));
       display: flex;
       //顶部左边板块
       .left {
@@ -149,66 +241,79 @@ export default {
         padding-bottom: calc(100vh * (8 / 1080));
         border: none;
         display: flex;
-        li{
-            height: calc(100vh * (40 / 1080));  
-            line-height: calc(100vh * (40 / 1080));
-            margin-right: calc(100vw * (60 / 1920));   
+       
+        li {
+          height: calc(100vh * (40 / 1080));
+          line-height: calc(100vh * (40 / 1080));
+          margin-right: calc(100vw * (60 / 1920));
+          :hover{
+            background: #1E497CFF !important;
+          }
         }
-        .nav1>img{
-        width: calc(100vw * (24 / 1920));
-        height: calc(100vh * (24 / 1080));
-        margin-bottom: calc(100vw * (5 / 1920));
-        margin-right: calc(100vh * (5 / 1080));   
+        .nav1 > img {
+          width: calc(100vw * (24 / 1920));
+          height: calc(100vh * (24 / 1080));
+          margin-bottom: calc(100vw * (5 / 1920));
+          margin-right: calc(100vh * (5 / 1080));
         }
       }
       // 顶部右边板块
       .right {
         width: calc(100vw * (100 / 1920));
         height: calc(100vh * (40 / 1080));
-        margin-left: calc(100vw * (150 / 1920));
+        margin-left: calc(100vw * (140 / 1920));
         display: flex;
         justify-content: space-between;
         align-items: center;
-        .right_1>img{
-        width: calc(100vw * (20 / 1920));
-        height: calc(100vh * (20 / 1080));
-      }
-      .right_2 {
-       font-size: 12px;
-       color: white;
-      }
-      .right_3 {
-        width: 1px;
-        height: 13px;
-        background: #02AAC0;
-        border-radius: 0px 0px 0px 0px;
-        opacity: 1;
-      }
-      .right_4>img {
-        width: calc(100vw * (26 / 1920));
-        height: calc(100vh * (26 / 1080));
-      }
+        .right_1 > img {
+          width: calc(100vw * (20 / 1920));
+          height: calc(100vh * (20 / 1080));
+          margin-right: calc(100vw * (5 / 1920));
+        }
+        .right_2 {
+          font-size: 12px;
+          color: white;
+        }
+        .right_3 {
+          width: 1px;
+          height: 13px;
+          background: #02aac0;
+          border-radius: 0px 0px 0px 0px;
+          opacity: 1;
+        }
+        .right_4 > img {
+          width: calc(100vw * (26 / 1920));
+          height: calc(100vh * (26 / 1080));
+        }
       }
     }
     //顶部下边图片板块
     .bottom {
       height: calc(100vh * (20 / 1080));
       width: 100%;
-      background: url("../assets/img/nav-decorate.png") center/cover;
+      background: url("../assets/img/nav-decorate.png");
+      background-size: 100% calc(100vh * (20 / 1080));
     }
   }
 }
-::v-deep .el-menu-item{
-    padding: 0;
-    padding-bottom: (100vh * (50 / 1080));
+::v-deep .el-menu-item {
+  padding: 0;
+  padding-bottom: (100vh * (50 / 1080));
+}
+::v-deep .el-submenu__title {
+  padding: 0;
+  padding-bottom: (100vh * (50 / 1080));
 }
-::v-deep .el-submenu__title{
-    padding: 0;
-    padding-bottom: (100vh * (50 / 1080));
+::v-deep .el-menu--horizontal > .el-submenu .el-submenu__title {
+  height: calc(100vh * (40 / 1080));
+  line-height: calc(100vh * (40 / 1080));
 }
-::v-deep .el-menu--horizontal > .el-submenu .el-submenu__title{
-    height: calc(100vh * (40 / 1080));  
-    line-height: calc(100vh * (40 / 1080));
+::v-deep li:hover{
+    background: #1E497CFF !important;
 }
+::v-deep .el-menu--horizontal .el-menu-item:not(.isdisabled):hover{
+    background: #1E497CFF !important;
+}
+
 
 </style>

src/views1/LoginView.vue

@@ -8,51 +8,82 @@
       <!-- 分为上下两部分，上面是标题，使用背景图片 -->
       <div class="right_top"></div>
       <!-- 登录界面 -->
-      <div class="right_bottom">
-        <!-- 登录标题 -->
-        <h3 class="right_bottom_dl">登&nbsp;录</h3>
+      <div class="login">
         <el-form
           ref="loginForm"
           :model="loginForm"
-          :rules="LoginRules"
-          class="demo-ruleForm"
-          style="width: 70%"
-          hide-required-asterisk="false"
+          :rules="loginRules"
+          class="login-form"
         >
-          <!-- 账号密码登录 -->
-          <el-form-item prop="username" label="账号">
+          <h3 class="title">登&nbsp;录</h3>
+          <el-form-item prop="username">
             <el-input
               v-model="loginForm.username"
               type="text"
+              auto-complete="off"
               placeholder="请输入手机号/邮箱"
             >
+              <svg-icon
+                slot="prefix"
+                icon-class="user"
+                class="el-input__icon input-icon"
+              />
             </el-input>
           </el-form-item>
-          <el-form-item prop="password" label="密码">
+          <el-form-item prop="password">
             <el-input
               v-model="loginForm.password"
               type="password"
+              auto-complete="off"
               placeholder="请输入密码"
-             @keyup.enter.native="getCode"
+              @keyup.enter.native="handleLogin"
             >
+              <svg-icon
+                slot="prefix"
+                icon-class="password"
+                class="el-input__icon input-icon"
+              />
             </el-input>
           </el-form-item>
-          <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0"
+          <el-form-item prop="code" v-if="captchaEnabled">
+            <el-input
+              v-model="loginForm.code"
+              auto-complete="off"
+              placeholder="验证码"
+              style="width: 63%"
+              @keyup.enter.native="handleLogin"
+            >
+              <svg-icon
+                slot="prefix"
+                icon-class="validCode"
+                class="el-input__icon input-icon"
+              />
+            </el-input>
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
+            </div>
+          </el-form-item>
+          <el-checkbox
+            v-model="loginForm.rememberMe"
+            style="margin: 0px 0px 25px 50px"
             >记住密码</el-checkbox
           >
-          <!-- 下方的登录按钮 -->
           <el-form-item style="width: 100%">
             <el-button
               :loading="loading"
               size="medium"
               type="primary"
               style="width: 100%"
-              @click.native.prevent="getCode"
-              class="custom-style"
+              @click.native.prevent="handleLogin"
             >
               <span v-if="!loading">登 录</span>
               <span v-else>登 录 中...</span>
             </el-button>
+            <div style="float: right" v-if="register">
+              <router-link class="link-type" :to="'/register'"
+                >立即注册</router-link
+              >
+            </div>
           </el-form-item>
         </el-form>
       </div>
@@ -61,25 +92,105 @@
 </template>
 
 <script>
+import { getCodeImg } from "@/api/login1";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
+
 export default {
+  name: "Login",
   data() {
     return {
+      codeUrl: "",
       loginForm: {
         username: "admin",
         password: "admin123",
-        rememberMe: true,
-        tenantName: "泸州公安局文库系统",
+        rememberMe: false,
+        code: "",
+        uuid: "",
       },
-      LoginRules: {
+      loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "账号错误" }
+          { required: true, trigger: "blur", message: "请输入您的账号" },
         ],
         password: [
-          { required: true, trigger: "blur", message: "密码错误" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
+      loading: false,
+      // 验证码开关
+      captchaEnabled: false,
+      // 注册开关
+      register: false,
+      redirect: undefined,
     };
   },
+  watch: {
+    $route: {
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true,
+    },
+  },
+  created() {
+    this.getCode();
+    this.getCookie();
+  },
+  methods: {
+    getCode() {
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
+        if (this.captchaEnabled) {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        }
+      });
+    },
+    getCookie() {
+      const username = Cookies.get("username");
+      const password = Cookies.get("password");
+      const rememberMe = Cookies.get("rememberMe");
+      this.loginForm = {
+        username: username === undefined ? this.loginForm.username : username,
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+      };
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          if (this.loginForm.rememberMe) {
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
+          } else {
+            Cookies.remove("username");
+            Cookies.remove("password");
+            Cookies.remove("rememberMe");
+          }
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/home/page" }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
+        }
+      });
+    },
+  },
 };
 </script>
 
@@ -91,7 +202,8 @@ export default {
   width: 100%;
   display: flex;
   .left {
-    background: url(../assets/img/dl_logo.png) no-repeat center/contain;
+    background: url(../assets/img/dl_logo.png);
+    background-size: calc(100vw * (820 / 1920)) calc(100vh * (894 / 1080));
     height: calc(100vh * (894 / 1080));
     width: calc(100vw * (820 / 1920));
     margin-top: 93px;
@@ -100,24 +212,25 @@ export default {
   .right {
     height: calc(100vh * (780 / 1080));
     width: calc(100vw * (516 / 1920));
-    // background: red;
     margin-top: 140px;
     margin-left: 193px;
     .right_top {
-      background: url(../assets/img/dl_title.png) no-repeat center/contain;
+      background: url(../assets/img/dl_title.png);
+      background-size: calc(100vw * (497 / 1920)) calc(100vh * (70 / 1080));
       height: calc(100vh * (70 / 1080));
       width: calc(100vw * (497 / 1920));
       font-family: YouSheBiaoTiHei-Regular;
     }
-    .right_bottom {
-      background: url(../assets/img/dl_login.png) no-repeat center/contain;
+    .login {
+      background: url(../assets/img/dl_login.png);
+      background-size: calc(100vw * (482 / 1920)) calc(100vh * (630 / 1080));
       height: calc(100vh * (630 / 1080));
       width: calc(100vw * (482 / 1920));
       box-sizing: border-box;
       border: 1px solid rgba(0, 116, 223, 0.2);
       margin-top: 30px;
 
-      .right_bottom_dl {
+      .title {
         width: 60px;
         height: 42px;
         font-size: 25px;
@@ -128,16 +241,15 @@ export default {
         margin-left: 45%;
         margin-top: 15%;
       }
-      .demo-ruleForm {
-        margin-left: 60px;
-        margin-top: -30px;
-      }
     }
   }
     ::v-deep .el-input--medium .el-input__inner {
-      background:#03486F;
+      background:transparent;
       border: 1px solid #03486F;
   }
+  ::v-deep .el-form-item__content {
+    margin-left: 50px !important;
+    width: calc(100vw * (360 / 1920));
+  }
 }
-
 </style>

src/views1/Page/PageView.vue

@@ -12,7 +12,10 @@
               <div class="two">截止时间：2022-07-17</div>
               <div class="three">通知类型：文档搜集</div>
               <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
+                <p class="four1">通知内容:</p>
+                <p>
+                  文档搜集文档搜集文档搜集文档搜集文档搜集...
+                </p>
               </div>
               <div class="five">
                 <span>查看详细</span>
@@ -26,7 +29,10 @@
               <div class="two">截止时间：2022-07-17</div>
               <div class="three">通知类型：文档搜集</div>
               <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
+                <p class="four1">通知内容:</p>
+                <p>
+                  文档搜集文档搜集文档搜集文档搜集文档搜集...
+                </p>
               </div>
               <div class="five">
                 <span>查看详细</span>
@@ -40,35 +46,10 @@
               <div class="two">截止时间：2022-07-17</div>
               <div class="three">通知类型：文档搜集</div>
               <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
-              </div>
-              <div class="five">
-                <span>查看详细</span>
-                <span>上传文件</span>
-              </div>
-            </li>
-          </ul>
-          <ul class="left-main">
-            <li>
-              <div class="one">通知标题：7月报表收集</div>
-              <div class="two">截止时间：2022-07-17</div>
-              <div class="three">通知类型：文档搜集</div>
-              <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
-              </div>
-              <div class="five">
-                <span>查看详细</span>
-                <span>上传文件</span>
-              </div>
-            </li>
-          </ul>
-          <ul class="left-main">
-            <li>
-              <div class="one">通知标题：7月报表收集</div>
-              <div class="two">截止时间：2022-07-17</div>
-              <div class="three">通知类型：文档搜集</div>
-              <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
+                <p class="four1">通知内容:</p>
+                <p>
+                  文档搜集文档搜集文档搜集文档搜集文档搜集...
+                </p>
               </div>
               <div class="five">
                 <span>查看详细</span>
@@ -76,6 +57,7 @@
               </div>
             </li>
           </ul>
+         
         </div>
       </div>
       <div class="cen">
@@ -131,31 +113,10 @@
               <div class="two">截止时间：2022-07-17</div>
               <div class="three">通知类型：文档搜集</div>
               <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
-              </div>
-              <div class="five">
-                <span>查看详细</span>
-                <span>上传文件</span>
-              </div>
-            </li>
-            <li>
-              <div class="one">通知标题：7月报表收集</div>
-              <div class="two">截止时间：2022-07-17</div>
-              <div class="three">通知类型：文档搜集</div>
-              <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
-              </div>
-              <div class="five">
-                <span>查看详细</span>
-                <span>上传文件</span>
-              </div>
-            </li>
-            <li>
-              <div class="one">通知标题：7月报表收集</div>
-              <div class="two">截止时间：2022-07-17</div>
-              <div class="three">通知类型：文档搜集</div>
-              <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
+                <p class="four1">通知内容:</p>
+                <p>
+                  文档搜集文档搜集文档搜集文档搜集文档搜集...
+                </p>
               </div>
               <div class="five">
                 <span>查看详细</span>
@@ -169,7 +130,10 @@
               <div class="two">截止时间：2022-07-17</div>
               <div class="three">通知类型：文档搜集</div>
               <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
+                <p class="four1">通知内容:</p>
+                <p>
+                  文档搜集文档搜集文档搜集文档搜集文档搜集...
+                </p>
               </div>
               <div class="five">
                 <span>查看详细</span>
@@ -183,7 +147,10 @@
               <div class="two">截止时间：2022-07-17</div>
               <div class="three">通知类型：文档搜集</div>
               <div class="four">
-                通知内容：文档搜集文档搜集文档搜集文档搜集文档搜集...
+                <p class="four1">通知内容:</p>
+                <p>
+                  文档搜集文档搜集文档搜集文档搜集文档搜集...
+                </p>
               </div>
               <div class="five">
                 <span>查看详细</span>
@@ -318,16 +285,22 @@ export default {
           margin-top: 5px;
           background: url(../../assets/img/main_left_decorate.png);
           background-size: calc(100vw * (365 / 1920)) calc(100vh * (40 / 1080));
+          position: sticky;
+          left: 0;
+          top: 0;
           h3 {
-            padding-top: 3px;
+            padding-top: 6px;
             padding-left: 10px;
             margin: 0;
+            font-size: 0.2rem;
+            font-weight: 400;
           }
         }
       }
       .left-main {
         list-style: none;
         padding: 0;
+        margin-top: 10px;
         li {
           width: calc(100vw * (365 / 1920));
           height: calc(100vh * (230 / 1080));
@@ -335,13 +308,24 @@ export default {
           border-radius: 2px 2px 2px 2px;
           opacity: 1;
           div {
-            padding: 3px 5px;
+            padding-top: 8px;
+            padding-left: 20px;
+            padding-right: 5px;
+          }
+          .one{
+            padding-top: 12px;
           }
           .five {
             display: flex;
             justify-content: space-evenly;
-            color: #016c9aff;
-            padding-top: 5px;
+            color: #2E8AECFF;
+            padding-top: 8px;
+          }
+          .four{
+            display: flex;
+            .four1{
+              width: calc(100vw * (90 / 1920));
+            }
           }
         }
       }
@@ -364,12 +348,10 @@ export default {
         border: 1px solid #00000040;
         border-radius: 2px 2px 2px 2px;
         // display: none;
-        li {
-          padding: calc(100vh * (6 / 1080)) calc(100vw * (10 / 1920));
-          &:hover {
-            background: #01d1ff3b;
-          }
-        }
+        // li {
+        // padding: calc(100vh * (6 / 1080)) calc(100vw * (10 / 1920));
+        // background: red;
+        // }
       }
       .cen—top {
         width: calc(100vw * (623 / 1920));

src/views1/Personal/Space/SpaceView.vue

@@ -384,7 +384,7 @@
       <div class="footer">
         部门存储空间：<el-progress
           :percentage="60"
-          stroke-width="15"
+          :stroke-width=15
           :show-text="false"
         ></el-progress>
         60G可用（共100G）

src/views1/Retrieval/RetrievalView.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="search">
       <input type="text" placeholder="请输入文档信息" class="cen—top-input" />
-      <span class="cen—top-span">快速搜索</span>
+      <span class="cen—top-span" @click="fast()">快速搜索</span>
       <img
         src="../../assets/img/ri：search-2-line@2x.png"
         class="cen—top-img"
@@ -55,6 +55,11 @@
         checkList: [],
         value1: ''
       };
+    },
+    methods:{
+      fast(){
+      this.$router.push("/home/retrieval/list");
+    }
     }
   };
 

src/views1/System/Authority/AuthorityView.vue

@@ -4,11 +4,11 @@
         <span>系统管理</span>
         <img src="../../../assets/img/chevron-down.png" alt="" />
         <img src="../../../assets/img/slash.png" alt="" />
-        <span class="top1">权限管理</span>
+        <span class="top1">部门管理</span>
         <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">

src/views1/System/Dictionary/DictionaryView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>字典管理</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Journal/JournalView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>日志管理</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Journal/Operation/OperationView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>操作日志</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Journal/Register/RegisterView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>登录日志</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Space/SpaceView.vue → src/views1/System/Menu/MenuView.vue

@@ -4,7 +4,7 @@
         <span>系统管理</span>
         <img src="../../../assets/img/chevron-down.png" alt="" />
         <img src="../../../assets/img/slash.png" alt="" />
-        <span class="top1">权限管理</span>
+        <span class="top1">菜单管理</span>
         <img src="../../../assets/img/chevron-up.png" alt="" class="top2" />
         <img src="../../../assets/img/slash.png" alt="" />
       </div>
@@ -922,7 +922,7 @@
     color: #006C9AFF;
   }
   ::v-deep .el-input__inner {
-    color: black;
-  }
+    color: #006C9AFF;
+}
   </style>
     

src/views1/System/Notice/NoticeView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>通知公告</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Parameter/ParameterView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>参数设置</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Post/PostView.vue

@@ -0,0 +1,11 @@
+<template>
+<h1>岗位管理</h1>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>

src/views1/System/Organization/OrganizationView.vue → src/views1/System/Role/RoleView.vue

@@ -4,11 +4,11 @@
         <span>系统管理</span>
         <img src="../../../assets/img/chevron-down.png" alt="" />
         <img src="../../../assets/img/slash.png" alt="" />
-        <span class="top1">组织管理</span>
+        <span class="top1">角色管理</span>
         <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">