修改ui外观

src/main/index.js

@@ -55,11 +55,11 @@ let loadingWindow
 //设置访问路径
 //打包访问的路径
 
-let serveUrl = "./resources/exe"
-let serveUrlJar = '\\resources\\exe'
+// let serveUrl = "./resources/exe"
+// let serveUrlJar = '\\resources\\exe'
 //本地访问的路径
-// let serveUrl = "./exe"
-// let serveUrlJar = '\\exe'
+let serveUrl = "./exe"
+let serveUrlJar = '\\exe'
 /**
  * Set `__static` path to static files in production
  * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html
@@ -111,7 +111,7 @@ function createWindow() {
     height: 720,
     useContentSize: true,
     center: true,
-    width: 1080,
+    width: 1280,
     icon: require('path').join(__dirname, '/static/icon.ico'), // icon
     // webPreferences: {
     //   contextIsolation: false, // 设置此项为false后，才可在渲染进程中使用electron api
@@ -126,7 +126,7 @@ function createWindow() {
       webSecurity: false
     }
   })
-  mainWindow.setMinimumSize(1080, 720)
+  mainWindow.setMinimumSize(1280, 720)
   //mainWindow.loadURL(loadingURL)
   mainWindow.loadURL(winURL)
   mainWindow.setMenu(null)

src/renderer/components/LoginPage.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="x-scol login_back_group" style="overflow-x: hidden">
-    <!-- <button @click="logi">ceshi1</button> -->
     <TopPage></TopPage>
-    <el-row :gutter="24" class="x-scol all-height">
+    <el-row :gutter="24" class="x-scol all-height" v-show="registerFlag">
       <el-col :span="7">
         <div class>
           <div class>
@@ -27,24 +26,11 @@
                     border-radius: 12px;
                   "
                 >
-                  <el-row class="login_title_title_middle">
-                    <el-col :span="2" class="login_title_title_middle_i"
-                      ><img
-                        class="login_middle_title_img"
-                        src="../assets/newImage/logo_icon.png"
-                        alt=""
-                    /></el-col>
-                    <el-col :span="22" class="login_line_heigth">
-                      <span class="login_middle_title"
-                        >心理效能增强系统</span
-                      ></el-col
-                    >
-                  </el-row>
                 </el-col>
                 <el-col :span="24" style="margin-top: 30px">
                   <el-row :span="24">
-                    <el-col :span="2">&nbsp;</el-col>
-                    <el-col :span="20">
+                    <el-col :span="4">&nbsp;</el-col>
+                    <el-col :span="16">
                       <div
                         class="padding-logo center-logo"
                         style="margin-top: 30px"
@@ -61,60 +47,57 @@
                         </el-select>
                       </div>
                     </el-col>
-                    <el-col :span="2">&nbsp;</el-col>
+                    <el-col :span="4">&nbsp;</el-col>
                   </el-row>
                   <el-row :span="24" style="margin-top: 30px">
-                    <el-col :span="2">&nbsp;</el-col>
-                    <el-col :span="20">
+                    <el-col :span="4">&nbsp;</el-col>
+                    <el-col :span="16">
                       <div class="padding-logo center-logo">
                         <el-input
-                          prefix-icon="el-icon-s-custom"
                           placeholder="请输入编号"
                           v-model="account"
                           clearable
                         ></el-input>
                       </div>
                     </el-col>
-                    <el-col :span="2">&nbsp;</el-col>
+                    <el-col :span="4">&nbsp;</el-col>
                   </el-row>
                   <el-row :span="24" style="margin-top: 30px">
-                    <el-col :span="2">&nbsp;</el-col>
-                    <el-col :span="20">
+                    <el-col :span="4">&nbsp;</el-col>
+                    <el-col :span="16">
                       <div class="padding-logo center-logo">
                         <el-input
-                          prefix-icon="el-icon-unlock"
                           placeholder="请输入密码"
                           v-model="password"
                           show-password
                         ></el-input>
                       </div>
                     </el-col>
-                    <el-col :span="2">&nbsp;</el-col>
+                    <el-col :span="4">&nbsp;</el-col>
+                  </el-row>
+                  <el-row
+                    :span="24"
+                    style="margin-top: 5px; margin-bottom: 10px"
+                  >
+                    <el-col :span="4">&nbsp;</el-col>
+                    <el-col :span="16" v-show="userType === '1'">
+                      <div @click="registerFlag = false">
+                        <span class="registerButton">没有账号？点击注册</span>
+                      </div>
+                    </el-col>
+                    <el-col :span="4">&nbsp;</el-col>
                   </el-row>
                   <el-row :span="24" style="margin-top: 30px">
-                    <el-col :span="2">&nbsp;</el-col>
-                    <el-col :span="20">
+                    <el-col :span="4">&nbsp;</el-col>
+                    <el-col :span="16">
                       <div
                         class="padding-logo center-logo login_button"
                         @click="userLoginV2"
                       >
                         <span type="primary" class="loginBu">登录</span>
                       </div>
-                      <!-- <span style="color:#ffffff;position:absolute;float:right">点击登录可实现登陆操作</span> -->
                     </el-col>
-                    <el-col :span="2">&nbsp;</el-col>
-                  </el-row>
-                  <el-row
-                    :span="24"
-                    style="margin-top: 5px; margin-bottom: 40px"
-                  >
-                    <el-col :span="2">&nbsp;</el-col>
-                    <el-col :span="20" v-show="userType === '1'">
-                      <div @click="centerDialogVisible = true">
-                        <span class="registerButton">没有账号？点击注册</span>
-                      </div>
-                    </el-col>
-                    <el-col :span="2">&nbsp;</el-col>
+                    <el-col :span="4">&nbsp;</el-col>
                   </el-row>
                 </el-col>
               </el-col>
@@ -131,8 +114,144 @@
         </div>
       </el-col>
 
-      <!-- <el-footer class="buttLlo">Copyright© 北京决明科技有限公司</el-footer> -->
+      <el-footer class="buttLlo">Copyright© 北京决明科技有限公司</el-footer>
     </el-row>
+    <div class="registerTop" v-show="!registerFlag">
+      <div class="registerDes">
+        <div class="registerIcon"></div>
+
+        <div class="registerFont">&nbsp;&nbsp;注册账号</div>
+      </div>
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        :inline="true"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
+        <div class="registerContent">
+          <div class="registerVertical">
+            <div class="registerTitle">姓名</div>
+            <el-form-item label="" class="registerInput" prop="name">
+              <el-input
+                v-model="ruleForm.name"
+                placeholder="请输入姓名"
+              ></el-input>
+            </el-form-item>
+          </div>
+          <div class="registerVertical">
+            <div class="registerTitle">编号</div>
+            <el-form-item label="" class="registerInput" prop="num">
+              <el-input
+                v-model="ruleForm.num"
+                placeholder="请输入编号"
+              ></el-input>
+            </el-form-item>
+          </div>
+        </div>
+        <div class="registerContent">
+          <div class="registerVertical">
+            <div class="registerTitle">年龄</div>
+            <el-form-item label="" class="registerInput" prop="age">
+              <el-input
+                v-model="ruleForm.age"
+                placeholder="请输入年龄"
+              ></el-input>
+            </el-form-item>
+          </div>
+          <div class="registerVertical">
+            <div class="registerTitle">单位</div>
+            <el-form-item label="" class="registerInput" prop="unit">
+              <el-input
+                v-model="ruleForm.unit"
+                placeholder="请输入单位"
+              ></el-input>
+            </el-form-item>
+          </div>
+        </div>
+        <div class="registerContent">
+          <div class="registerVertical">
+            <div class="registerTitle">性别</div>
+            <el-form-item label="" class="registerInput" prop="sex">
+              <el-select
+                style="width: 100%"
+                v-model="ruleForm.sex"
+                placeholder="请选择"
+              >
+                <el-option label="女" value="0"></el-option>
+                <el-option label="男" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="" prop="sex">
+              <el-radio-group v-model="ruleForm.sex">
+                <el-radio label="男" value="1"></el-radio>
+                <el-radio label="女" value="0"></el-radio>
+              </el-radio-group>
+            </el-form-item> -->
+          </div>
+          <div class="registerVertical">
+            <div class="registerTitle">婚恋情况</div>
+            <el-form-item label="" prop="marriageSituation">
+              <el-select
+                style="width: 100%"
+                v-model="ruleForm.marriageSituation"
+                placeholder="请选择"
+              >
+                <el-option label="已婚" value="0"></el-option>
+                <el-option label="未婚" value="1"></el-option>
+                <el-option label="离异" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </div>
+        <div class="registerContent">
+          <div class="registerVertical">
+            <div class="registerTitle">密码</div>
+            <el-form-item label="" prop="userPassword">
+              <el-input
+                show-password
+                placeholder="请输入密码"
+                v-model="ruleForm.userPassword"
+                type="password"
+              ></el-input>
+            </el-form-item>
+          </div>
+          <div class="registerVertical">
+            <div class="registerTitle">确认密码</div>
+            <el-form-item label="" prop="userRePassword">
+              <el-input
+                show-password
+                placeholder="请输入确认密码"
+                v-model="ruleForm.userRePassword"
+                type="password"
+              ></el-input>
+            </el-form-item>
+          </div>
+        </div>
+        <div class="registerContent">
+          <div class="registerRow">
+            <el-button class="registerLoginCancle" @click="handleClose"
+              >取 消</el-button
+            >
+            <el-button
+              class="registerLoginCancle"
+              @click="resetForm('ruleForm')"
+              >重 置</el-button
+            >
+          </div>
+          <div class="registerRowLogin">
+            <el-button
+              type="primary"
+              class="registerRowLoginButton"
+              style="margin-right: 10px"
+              @click="submitFormV2('ruleForm')"
+              >登 录</el-button
+            >
+          </div>
+        </div>
+      </el-form>
+    </div>
     <el-dialog
       title="注册账号"
       :before-close="handleClose"
@@ -226,7 +345,7 @@ export default {
   data() {
     var checkUserRePassword = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error("不能为空"));
+        return callback(new Error("密码不能为空"));
       } else {
         if (value.length >= 6 && value.length <= 18) {
           if (value == this.ruleForm.userPassword) {
@@ -270,11 +389,12 @@ export default {
       }
     };
     var checkUserPassword = (rule, value, callback) => {
+      console.log(!value);
       if (!value) {
         return callback(new Error("密码不能为空"));
       } else {
         if (value.length >= 6 && value.length <= 18) {
-          callback();
+          return callback();
         } else {
           return callback(new Error("长度大于等于6且小于等于18"));
         }
@@ -284,6 +404,8 @@ export default {
       centerDialogVisible: false,
       src: require("../assets/bg.jpg"),
       srcLogo: require("../assets/logo1.png"),
+      //注册页面是否显示
+      registerFlag: true,
       userType: "1",
       password: "",
       account: "",
@@ -337,7 +459,7 @@ export default {
           {
             validator: checkUserPassword,
             required: true,
-            message: "请填写密码",
+
             trigger: "blur",
           },
         ],
@@ -345,7 +467,7 @@ export default {
           {
             validator: checkUserRePassword,
             required: true,
-            message: "请填写确认密码",
+
             trigger: "blur",
           },
         ],
@@ -384,6 +506,7 @@ export default {
   methods: {
     handleClose() {
       this.resetForm("ruleForm");
+      this.registerFlag = true;
       this.centerDialogVisible = false;
     },
     // 创建用户表
@@ -569,13 +692,19 @@ IF NOT EXISTS t_user_table (
             },
             (res) => {
               if (res.data.code == 200) {
-                that.resetForm("ruleForm");
                 that.centerDialogVisible = false;
                 that.$message({
                   message: "注册成功",
                   type: "success",
                   duration: 800,
                 });
+                that.userRegisterLoginV2(
+                  that.ruleForm.num,
+                  that.ruleForm.userPassword,
+                  that.userType 
+                );
+                //注册成功后需要调用登录接口
+                that.resetForm("ruleForm");
                 // this.$message.success("注册成功");
               } else {
                 this.$message.error("访问服务器失败！");
@@ -587,6 +716,46 @@ IF NOT EXISTS t_user_table (
         }
       });
     },
+    userRegisterLoginV2(account, password, userType) {
+      let that = this;
+      that.$http.post(
+        `v1/user/login`,
+        {
+          identifier: account,
+          password: that.$md5(password),
+          role: parseInt(userType) - 1,
+        },
+        (res) => {
+          if (res.data.code == 200) {
+            sessionStorage.setItem("token", res.data.data.token);
+            if (that.userType == "1") {
+              sessionStorage.setItem("num", account);
+              sessionStorage.setItem("pass", that.$md5(password));
+              sessionStorage.setItem("userType", "1");
+              sessionStorage.setItem(
+                "isMarried",
+                res.data.data.marriageSituation
+              );
+              that.$router.push({
+                path: "/mainTable",
+              });
+            }
+            //当type等于2时跳转到我的测试页面
+
+            if (that.userType == "2") {
+              // sessionStorage.setItem("num", that.account);
+              sessionStorage.setItem("num", that.account);
+              sessionStorage.setItem("pass", that.$md5(that.password));
+              sessionStorage.setItem("userType", "2");
+              that.$router.push({ path: "/mainTable" });
+            }
+          } else {
+            this.$message.error("访问服务器失败！");
+          }
+        }
+      );
+    },
+
     userLoginV2() {
       let that = this;
       if (that.account === "" || that.account === null) {
@@ -597,12 +766,6 @@ IF NOT EXISTS t_user_table (
         this.$message.error("密码不能为空");
         return;
       }
-      //临时代码------------
-      // sessionStorage.setItem("userType", "2");
-      // that.$router.push({
-      //   path: "/mainTable",
-      // });
-      //临时代码------------
       that.$http.post(
         `v1/user/login`,
         {
@@ -698,6 +861,14 @@ IF NOT EXISTS t_user_table (
 };
 </script>
 <style>
+.el-select-dropdown__item.selected {
+  color: #3f66dd !important;
+  font-weight: 500 !important;
+}
+.el-select-dropdown__item {
+  color: #3f66dd !important;
+}
+
 .el-divider--horizontal {
   display: block;
   height: 0.1px !important;
@@ -710,15 +881,14 @@ IF NOT EXISTS t_user_table (
 </style>
 <style scoped>
 .login_back_group >>> .el-select-dropdown {
-  background-color: #050505 !important;
+  background-color: #ffffff !important;
   border: 0px;
 }
 .login_back_group >>> .el-select-dropdown__item.hover {
-  background-color: #171818 !important;
-}
-.el-input__inner {
-  color: #ddd6d6 !important;
+  background-color: #ffffff !important;
+  /* color:#08c8cd !important; */
 }
+
 /*
 /* 直接调用css，保证隐藏滚动条的同时还可以继续通过滚轮向下翻 */
 ::-webkit-scrollbar {
@@ -743,21 +913,22 @@ IF NOT EXISTS t_user_table (
   font-weight: 500;
 }
 .buttLlo {
-  color: #555;
+  color: #ffffff;
   text-align: center;
   left: 0px;
   right: 0px;
-
-  bottom: 10px;
+  font-size: 14px;
+  bottom: 0px;
   position: fixed;
 }
 .registerButton {
   padding-top: 1rem;
   cursor: pointer;
-  color: #08c8cd;
+  color: #ffffff;
   display: block;
-  text-align: left;
+  text-align: right;
   font-size: 10px;
+  border-radius: 0;
 }
 .login_back_group {
   width: 100vw;
@@ -768,7 +939,7 @@ IF NOT EXISTS t_user_table (
 }
 
 .login-middle-bg {
-  background: #2f406e;
+  /* background: #2f406e; */
   border-radius: 12px;
 }
 .login_middle_title {
@@ -790,15 +961,26 @@ IF NOT EXISTS t_user_table (
   text-align: right;
 }
 .login_back_group >>> .login_select {
-  background: #000000 !important;
+  background: #1d55ff !important;
+  /* color:#1D55FF ; */
+
   /* border-radius: 4px; */
 }
 .login_back_group >>> .el-input--suffix .el-input__inner {
   padding-right: 0px;
-  background: #000000;
+  background: #ffffff;
+  color: #1d55ff;
+  border-radius: 4px !important;
+}
+
+.login_back_group >>> .el-input__inner::placeholder {
+  padding-right: 0px;
+  background: #ffffff;
+  color: #1d55ff;
+  opacity: 0.5;
 }
 .login_back_group >>> .el-input__inner {
-  border: 1px solid #000000 !important;
+  border: 1px solid #ffffff !important;
   border-radius: 0px;
 }
 
@@ -808,9 +990,130 @@ IF NOT EXISTS t_user_table (
 }
 .login_button {
   cursor: pointer;
-  background: #08c8cd;
+  background: #1d55ff;
   line-height: 40px;
   text-align: center;
-  border-radius: 5px;
+  border-radius: 4px;
+}
+
+.registerTop {
+  width: 60%;
+  margin-left: 20%;
+  margin-top: 13%;
+}
+.registerIcon {
+  width: 6px;
+  height: 28px;
+  background: #ffffff;
+}
+.registerFont {
+  font-size: 28px;
+  color: #ffffff;
+}
+.registerDes {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.registerContent {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+.registerVertical {
+  display: flex;
+  flex-direction: column;
+  align-items: left;
+}
+.registerTitle {
+  margin-bottom: 6px;
+  font-size: 16px;
+  color: #ffffff;
+}
+.registerVertical >>> .el-input__inner {
+  width: 320px;
+  border-radius: 4px;
+}
+
+.registerRow {
+  width: 320px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.registerRowLogin {
+  width: 320px;
+  display: flex;
+  justify-content: flex-end;
+  flex-direction: row;
+}
+.registerRowLoginButton {
+  background-color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerRowLoginButton:hover {
+  background-color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerRowLoginButton:active {
+  background-color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerRowLoginButton:focus {
+  background-color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+
+.registerLoginCancle {
+  background-color: #ffffff;
+  color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerLoginCancle:hover {
+  background-color: #ffffff;
+  color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerLoginCancle:active {
+  background-color: #ffffff;
+  color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerLoginCancle:focus {
+  background-color: #ffffff;
+  color: #1d55ff;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+  width: 120px;
+  border: 0px;
+  border-radius: 4px;
+}
+.registerInput >>> .el-input__inner {
+  color: #1d55ff;
 }
 </style>

src/renderer/components/MainTable.vue

@@ -4,20 +4,31 @@
     style="overflow-y: hidden; overflow-x: hidden"
   >
     <TopPage></TopPage>
+    <div>
+      <img
+        width="100%"
+        style="margin-top: 10px"
+        src="../assets/newImage/main_top.png"
+      />
+    </div>
     <div
       class="login_back_group"
       style="overflow-y: hidden; overflow-x: hidden"
     >
       <el-row>
         <el-col :span="2"> &nbsp; </el-col>
-        <el-col :span="22" style="margin-top: 20px">
+        <el-col :span="22" style="margin-top: 10px">
           <div>
             <span class="main_top_wellcom"
-              >{{ name }},欢迎进入心理效能增强系统!</span
-            ><br /><br />
-            <span class="main_top_week">
-              今天是星期<span>{{ week }}</span></span
+              >你好,{{ name }}!
+              <span class="main_top_week">
+                今天星期<span>{{ week }}</span></span
+              ></span
+            ><br />
+            <span class="welcome"
+              >欢迎来到自助式心理健康评估与认知行为干预系统！</span
             >
+            <br />
           </div>
         </el-col>
       </el-row>
@@ -25,53 +36,128 @@
         <el-col :span="2">&nbsp;</el-col>
         <el-col :span="20">
           <el-row :span="24" v-show="userType === 2">
-             <div class="main-six-user">
+            <div class="main_picture">
+              <div>
+                <img
+                  height="300px"
+                  @click="goPage('/menu/manageUser', 'yhgl')"
+                  src="../assets/newImage/main_user.png"
+                />
+              </div>
+              <div>
+                <img
+                  height="300px"
+                  @click="goPage('/menu/manageUserScale', 'yhlt')"
+                  src="../assets/newImage/main_chart.png"
+                />
+              </div>
+              <div>
+                <img
+                  height="300px"
+                  @click="goPage('/menu/manageScaleUser', 'yhcp')"
+                  src="../assets/newImage/main_scale.png"
+                />
+              </div>
+              <div>
+                <img
+                  height="300px"
+                  @click="goPage('/menu/manageElectrical', 'yhfk')"
+                  src="../assets/newImage/main_game.png"
+                />
+              </div>
+              <div>
+                <img
+                  height="300px"
+                  @click="goPage('/menu/managePluse', 'yhgy')"
+                  src="../assets/newImage/main_ganyu.png"
+                />
+              </div>
+            </div>
+
+            <!-- <div class="main-six-user">
               <div class="main-six-user-zhixin-admin">
-                   <div
-                    class="main_middle_yhgl"
-                    @click="goPage('/menu/manageUser')"
+                <div
+                  class="main_middle_yhgl"
+                  @click="goPage('/menu/manageUser')"
+                >
+                  <span class="main_middle_zzdh_first"
+                    ><p class="main_middle_zzdh_first_font">用户管理</p></span
                   >
-                    <span class="main_middle_zzdh_first"
-                      ><p class="main_middle_zzdh_first_font">用户管理</p></span
-                    >
-                  </div>
-                     <div
-                    class="main_middle_lblb"
-                    @click="goPage('/menu/manageUserScale')"
+                </div>
+                <div
+                  class="main_middle_lblb"
+                  @click="goPage('/menu/manageUserScale')"
+                >
+                  <span class="main_middle_zzdh_first"
+                    ><p class="main_middle_zzdh_first_font">
+                      用户测试记录
+                    </p></span
                   >
-                    <span class="main_middle_zzdh_first"
-                      ><p class="main_middle_zzdh_first_font">
-                        用户测试记录
-                      </p></span
-                    >
-                  </div>
+                </div>
               </div>
-               <div class="main-six-user-zhixin-admin">
-                 <div
-                    class="main_middle_ndlb"
-                    @click="goPage('/menu/manageElectrical')"
+              <div class="main-six-user-zhixin-admin">
+                <div
+                  class="main_middle_ndlb"
+                  @click="goPage('/menu/manageElectrical')"
+                >
+                  <span class="main_middle_zzdh_first"
+                    ><p class="main_middle_zzdh_first_font">
+                      脑电测试记录
+                    </p></span
                   >
-                    <span class="main_middle_zzdh_first"
-                      ><p class="main_middle_zzdh_first_font">
-                        脑电测试记录
-                      </p></span
-                    >
-                  </div>
-                      <div
-                    class="main_middle_mblb"
-                    @click="goPage('/menu/managePluse')"
+                </div>
+                <div
+                  class="main_middle_mblb"
+                  @click="goPage('/menu/managePluse')"
+                >
+                  <span class="main_middle_zzdh_first"
+                    ><p class="main_middle_zzdh_first_font">
+                      脉搏测试记录
+                    </p></span
                   >
-                    <span class="main_middle_zzdh_first"
-                      ><p class="main_middle_zzdh_first_font">
-                        脉搏测试记录
-                      </p></span
-                    >
-                  </div>
-               </div>
-            </div>
-
+                </div>
+              </div>
+            </div> -->
           </el-row>
           <el-row :span="24" v-show="userType === 1">
+            <div class="main_picture">
+              <div>
+                <img
+                  @click="goPage('/menu/smart', 'rjdh')"
+                  height="300px"
+                  src="../assets/newImage/main_smart.png"
+                />
+              </div>
+              <div>
+                <img  
+                  @click="goPage('/menu/evaluation', 'xlcp')"
+                  height="300px"
+                  src="../assets/newImage/main_test.png"
+                />
+              </div>
+              <div>
+                <img  
+                  @click="goPage('/menu/relax', 'xlfs')"
+                  height="300px"
+                  src="../assets/newImage/main_relax.png"
+                />
+              </div>
+              <div>
+                <img
+                  @click="goPage('/menu/pulse', 'rzgy')"
+                  height="300px"
+                  src="../assets/newImage/main_ganyu.png"
+                />
+              </div>
+              <div>
+                <img
+                  @click="goPage('/menu/animation', 'swfk')"
+                  height="300px"
+                  src="../assets/newImage/main_fankui.png"
+                />
+              </div>
+            </div>
+            <!-- 
             <div class="main-six-user">
               <div class="main-six-user-zhixin">
                 <div
@@ -138,11 +224,12 @@
                   >
                 </div>
               </div>
-            </div>
+            </div> -->
           </el-row>
         </el-col>
         <el-col :span="2">&nbsp;</el-col>
       </el-row>
+      <el-footer class="buttLlo">Copyright© 北京决明科技有限公司</el-footer>
     </div>
   </div>
 </template>
@@ -194,9 +281,9 @@ export default {
       }
       return week;
     },
-    goPage(url) {
+    goPage(url, val) {
       sessionStorage.setItem("defaultUrl", url);
-      this.$router.push({ path: url });
+      this.$router.push({ path: url, query: { url: val } });
       //this.$router.push({ path: url });
     },
   },
@@ -224,27 +311,34 @@ export default {
 }
 .login_back_group {
   width: 100vw;
-  height: 95vh;
+  /* height: 95vh; */
   /* padding-top: 20px; */
 
   /* background: url(../assets/newImage/login_bg.png) no-repeat;
   background-size: cover; */
 }
 .login_back_group_all {
+  height: 100vh;
   /* width: 100vw;
   height: 95vh; */
   /* padding-top: 20px; */
 
-  background: url(../assets/newImage/login_bg.png) no-repeat;
+  background: url(../assets/newImage/login_bg1.png) no-repeat;
   background-size: cover;
 }
 .main_top_wellcom {
-  color: #ffffff;
   font-size: 30px;
+  font-family: Source Han Sans CN-Light, Source Han Sans CN;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 0px;
+  margin-left: 100px;
 }
 .main_top_week {
-  color: #c7cfe2;
-  font-size: 18px;
+  font-size: 16px;
+  font-family: Source Han Sans CN-ExtraLight, Source Han Sans CN;
+  font-weight: 200;
+  color: #ffffff;
 }
 .main_middle {
   margin-top: 80px;
@@ -384,4 +478,29 @@ export default {
   width: 440px;
   display: inline-block;
 }
+.welcome {
+  font-family: Source Han Sans CN-ExtraLight, Source Han Sans CN;
+  font-weight: 200;
+  color: #ffffff;
+  line-height: 0px;
+  letter-spacing: 2px;
+  margin-left: 100px;
+  display: flex;
+  margin-top: 30px;
+}
+.main_picture {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+}
+.buttLlo {
+  color: #ffffff;
+  text-align: center;
+  left: 0px;
+  right: 0px;
+  font-size: 14px;
+
+  bottom: 0px;
+  position: fixed;
+}
 </style>

src/renderer/components/Menu.vue

@@ -3,6 +3,30 @@
     <TopPage></TopPage>
     <el-row class="main_right_height">
       <el-col :span="4" class="menu_style" style="position: relative">
+        <div class="menu_title_top">
+          <span class="menu_title_top_des">心理与认知干预系统</span>
+        </div>
+        <div class="menu_feature">
+          <div style="margin-left: 10%">
+            <img
+              width="60px"
+              height="60px"
+              src="../assets/newImage/people.png"
+            />
+          </div>
+          <div class="update_pass">
+            <div style="color: #ffffff; margin-bottom: 10px">
+              {{ acount }}
+            </div>
+            <div>
+              <span
+                @click="updatePass()"
+                style="cursor: pointer; color: #ffffff; font-size: 12px"
+                >修改密码</span
+              >
+            </div>
+          </div>
+        </div>
         <el-menu
           :default-active="defaultUrl"
           class="el-menu-vertical-demo"
@@ -14,7 +38,7 @@
           :popper-append-to-body="false"
           :router="true"
         >
-          <p align="center">
+          <!-- <p align="center">
             <img
               width="60px"
               height="60px"
@@ -22,7 +46,6 @@
               style="border-radius: 50%"
             />
           </p>
-
           <p align="center" style="color: #ffffff">
             <i
               title="修改密码"
@@ -37,106 +60,212 @@
               style="cursor: pointer"
               class="el-icon-s-home"
             ></i>
-          </p>
-          <el-menu-item index="/menu/smart" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">智能对话</span>
+          </p> -->
+          <el-menu-item index="" @click="goMain" v-show="true">
+            <!-- <i class="el-icon-menu"></i> -->
+            <img class="menu_icon_cla" src="../assets/menuIcon/main.png" />
+            <span slot="title" class="menu_text_cla">主页</span>
           </el-menu-item>
-          <el-menu-item index="/menu/evaluation" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">心理测评</span>
-          </el-menu-item>
-          <el-menu-item index="/menu/relax" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">心理放松</span>
+          <el-menu-item
+            index="/menu/smart"
+            v-show="userType === 1"
+            @click="menuClick('rjdh')"
+          >
+            <!-- @mouseover="menuClick('rjdh')" -->
+            <!-- @click="menuClick('rjdh')" -->
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + rjdhUrl)"
+            />
+            <span
+              slot="title"
+              class="menu_text_span"
+              :style="{ color: rjdh ? '#ffffff' : '#0FB577' }"
+              >智能对话</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/electrical" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">脑电采集</span>
+          <el-menu-item
+            index="/menu/evaluation"
+            v-show="userType === 1"
+            @click="menuClick('xlcp')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + xlcpUrl)"
+            />
+            <span
+              slot="title"
+              class=""
+              :style="{ color: xlcp ? '#ffffff' : '#0FB577' }"
+              >心理测评</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/pulse" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">脉搏采集</span>
+          <el-menu-item
+            index="/menu/relax"
+            v-show="userType === 1"
+            @click="menuClick('xlfs')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + xlfsUrl)"
+            />
+            <span
+              slot="title"
+              :style="{ color: xlfs ? '#ffffff' : '#0FB577' }"
+              class="menu_text_cla"
+              >心理放松</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/animation" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">生物反馈训练</span>
+          <el-menu-item
+            index="/menu/pulse"
+            v-show="userType === 1"
+            @click="menuClick('rzgy')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + rzgyUrl)"
+            />
+            <span
+              slot="title"
+              :style="{ color: rzgy ? '#ffffff' : '#0FB577' }"
+              class="menu_text_cla"
+              >认知行为干预</span
+            >
           </el-menu-item>
-
-          <!-- <el-menu-item index="/menu/controlPanel" v-show="userType === 1">
+          <!-- <el-menu-item index="/menu/pulse" v-show="userType === 1">
             <i class="el-icon-menu"></i>
-            <span slot="title">控制面板</span>
+            <span slot="title">脉搏采集</span>
           </el-menu-item> -->
-
-          <el-menu-item index="/menu/manageUser" v-show="userType === 2">
-            <i class="el-icon-menu"></i>
-            <span slot="title">用户管理</span>
+          <el-menu-item
+            index="/menu/animation"
+            v-show="userType === 1"
+            @click="menuClick('swfk')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + swfkUrl)"
+            />
+            <span slot="title" :style="{ color: swfk ? '#ffffff' : '#0FB577' }"
+              >生物反馈训练</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/manageUserScale" v-show="userType === 2">
-            <i class="el-icon-menu"></i>
-            <span slot="title">用户测试记录</span>
+
+          <el-menu-item
+            index="/menu/manageUser"
+            v-show="userType === 2"
+            @click="menuManageClick('yhgl')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + yhglUrl)"
+            />
+            <span
+              slot="title"
+              class="menu_text_cla"
+              :style="{ color: yhgl ? '#ffffff' : '#0FB577' }"
+              >用户管理</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/manageScaleUser" v-show="userType === 2">
-            <i class="el-icon-menu"></i>
-            <span slot="title">量表测试记录</span>
+          <el-menu-item
+            index="/menu/manageUserScale"
+            v-show="userType === 2"
+            @click="menuManageClick('yhlt')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + yhltUrl)"
+            />
+            <span
+              slot="title"
+              class="menu_text_cla"
+              :style="{ color: yhlt ? '#ffffff' : '#0FB577' }"
+              >用户聊天记录</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/manageElectrical" v-show="userType === 2">
-            <i class="el-icon-menu"></i>
-            <span slot="title">脑电测试记录</span>
+          <el-menu-item
+            index="/menu/manageScaleUser"
+            v-show="userType === 2"
+            @click="menuManageClick('yhcp')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + yhcpUrl)"
+            />
+            <span
+              slot="title"
+              class="menu_text_cla"
+              :style="{ color: yhcp ? '#ffffff' : '#0FB577' }"
+              >量表测评记录</span
+            >
           </el-menu-item>
-          <el-menu-item index="/menu/managePluse" v-show="userType === 2">
-            <i class="el-icon-menu"></i>
-            <span slot="title">脉搏测试记录</span>
+          <el-menu-item
+            index="/menu/manageElectrical"
+            v-show="userType === 2"
+            @click="menuManageClick('yhfk')"
+          >
+            <img
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + yhfkUrl)"
+            />
+            <span
+              slot="title"
+              class="menu_text_cla"
+              :style="{ color: yhfk ? '#ffffff' : '#0FB577' }"
+              >生物反馈记录</span
+            >
           </el-menu-item>
-        </el-menu>
-        <!-- <el-row :style="{ 'margin-top': userType == '2' ? '35vh' : '28vh' }">
-          <el-col :span="8">
+          <el-menu-item
+            index="/menu/managePluse"
+            v-show="userType === 2"
+            @click="menuManageClick('yhgy')"
+          >
             <img
-              @click="userExit"
-              class="imgStyle"
-              align="right"
-              src="../assets/newImage/exit.png"
+              class="menu_icon_cla"
+              :src="require('@/assets/menuIcon/' + yhgyUrl)"
             />
-          </el-col>
-          <el-col :span="16"
-            ><span class="exitLogin" @click="userExit">退出登录</span>
-          </el-col>
-        </el-row> -->
+            <span
+              slot="title"
+              class="menu_text_cla"
+              :style="{ color: yhgy ? '#ffffff' : '#0FB577' }"
+              >认知行为干预记录</span
+            >
+          </el-menu-item>
+        </el-menu>
         <div class="foot_main_exit">
-          <div style="display: flex; justify-content: center">
+          <div class="menu_main_exit">
             <img
               @click="userExit"
               class="imgStyle"
               align="center"
-              src="../assets/newImage/exit.png"
+              src="../assets/newImage/exit1.png"
             />
-            <span class="exitLogin" @click="userExit">退出登录</span>
+            <span class="exitLogin" @click="userExit" style="font-size: 10px"
+              >退出登录</span
+            >
           </div>
         </div>
-        <!-- <el-row :style="{ 'margin-top': userType == '2' ? '35vh' : '28vh' }">
-          <el-col :span="8">
-            <img
-              @click="userExit"
-              class="imgStyle"
-              align="right"
-              src="../assets/newImage/exit.png"
-            />
-          </el-col>
-          <el-col :span="16"
-            ><span class="exitLogin" @click="userExit">退出登录</span>
-          </el-col>
-        </el-row> -->
-        <div class="foot_main_menu">&nbsp;</div>
+        <!-- <div class="foot_main_menu">&nbsp;</div> -->
       </el-col>
       <el-col
-        style="height: 95vh; overflow-y: no; overflow-x: no; position: relative"
+        style="
+          height: 100vh;
+          overflow-y: no;
+          overflow-x: no;
+          position: relative;
+        "
         :span="20"
       >
-        <router-view v-if="!$route.meta.keepAlive"></router-view>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" />
-        </keep-alive>
-        <div class="foot_main">Copyright© 北京决明科技有限公司</div>
+        <div class="menu_left_new">
+          <router-view
+            v-if="!$route.meta.keepAlive"
+            class="menu_left_keep"
+          ></router-view>
+          <keep-alive>
+            <router-view v-if="$route.meta.keepAlive" class="menu_left_keep" />
+          </keep-alive>
+        </div>
+
+        <!-- <div class="foot_main">Copyright© 北京决明科技有限公司</div> -->
       </el-col>
     </el-row>
 
@@ -219,6 +348,37 @@ export default {
       }
     };
     return {
+      //人机对话
+      rjdhUrl: "rjdh1.png",
+      rjdh: true,
+      //心理测评
+      xlcpUrl: "rjdh.png",
+      xlcp: true,
+      xlfsUrl: "xlfs.png",
+      xlfs: true,
+      //认知干预
+      rzgyUrl: "rzgy.png",
+      rzgy: true,
+      //生物反馈
+      swfkUrl: "swfk.png",
+      swfk: true,
+
+      //管理页面
+      //用户管理
+      yhglUrl: "main.png",
+      yhgl: true,
+      //用户聊天记录
+      yhltUrl: "main.png",
+      yhlt: true,
+      //用户测评
+      yhcpUrl: "main.png",
+      yhcp: true,
+      //用户反馈
+      yhfkUrl: "main.png",
+      yhfk: true,
+      //用户干预
+      yhgyUrl: "main.png",
+      yhgy: true,
       userType: 0,
       defaultUrl: "",
       acount: "",
@@ -240,12 +400,158 @@ export default {
     this.defaultUrl = sessionStorage.getItem("defaultUrl");
     //sessionStorage
 
+    
+    let queryUrl =this.$route.query.url
+    this.menuClick(queryUrl)
+    this.menuManageClick(queryUrl)
     this.userType = sessionStorage.getItem("userType");
     this.userType = parseInt(this.userType);
 
     this.$root.topPageFlag = true;
   },
   methods: {
+    menuManageClick(val) {
+      if (val == "yhgl") {
+        this.yhglUrl = "main.png";
+        this.yhgl = false;
+
+        this.yhltUrl = "main.png";
+        this.yhlt = true;
+
+        this.yhcpUrl = "main.png";
+        this.yhcp = true;
+
+        this.yhfkUrl = "main.png";
+        this.yhfk = true;
+
+        this.yhgyUrl = "main.png";
+        this.yhgy = true;
+      }
+      if (val == "yhlt") {
+        this.yhglUrl = "main.png";
+        this.yhgl = true;
+        this.yhltUrl = "main.png";
+        this.yhlt = false;
+
+        this.yhcpUrl = "main.png";
+        this.yhcp = true;
+
+        this.yhfkUrl = "main.png";
+        this.yhfk = true;
+
+        this.yhgyUrl = "main.png";
+        this.yhgy = true;
+      }
+      if (val == "yhcp") {
+        this.yhglUrl = "main.png";
+        this.yhgl = true;
+
+        this.yhltUrl = "main.png";
+        this.yhlt = true;
+
+        this.yhcpUrl = "main.png";
+        this.yhcp = false;
+
+        this.yhfkUrl = "main.png";
+        this.yhfk = true;
+
+        this.yhgyUrl = "main.png";
+        this.yhgy = true;
+      }
+      if (val == "yhfk") {
+        this.yhglUrl = "main.png";
+        this.yhgl = true;
+
+        this.yhltUrl = "main.png";
+        this.yhlt = true;
+
+        this.yhcpUrl = "main.png";
+        this.yhcp = true;
+        this.yhfkUrl = "main.png";
+        this.yhfk = false;
+        this.yhgyUrl = "main.png";
+        this.yhgy = true;
+      }
+      if (val == "yhgy") {
+        this.yhglUrl = "main.png";
+        this.yhgl = true;
+
+        this.yhltUrl = "main.png";
+        this.yhlt = true;
+
+        this.yhcpUrl = "main.png";
+        this.yhcp = true;
+        this.yhfkUrl = "main.png";
+        this.yhfk = true;
+        this.yhgyUrl = "main.png";
+        this.yhgy = false;
+      }
+    },
+    menuClick(val) {
+      console.log(val);
+      if (val == "rjdh") {
+        this.rjdhUrl = "rjdh1.png";
+        this.rjdh = false;
+        this.xlcpUrl = "xlcp.png";
+        this.xlcp = true;
+        this.xlfsUrl = "xlfs.png";
+        this.xlfs = true;
+        this.rzgyUrl = "rzgy.png";
+        this.rzgy = true;
+        this.swfkUrl = "swfk.png";
+        this.swfk = true;
+      }
+      if (val == "xlcp") {
+        this.xlcpUrl = "xlcp1.png";
+        this.xlcp = false;
+        this.rjdhUrl = "rjdh.png";
+        this.rjdh = true;
+        this.xlfsUrl = "xlfs.png";
+        this.xlfs = true;
+        this.rzgyUrl = "rzgy.png";
+        this.rzgy = true;
+        this.swfkUrl = "swfk.png";
+        this.swfk = true;
+      }
+      if (val == "xlfs") {
+        this.xlfsUrl = "xlfs1.png";
+        this.xlfs = false;
+
+        this.xlcpUrl = "xlcp.png";
+        this.xlcp = true;
+        this.rjdhUrl = "rjdh.png";
+        this.rjdh = true;
+
+        this.rzgyUrl = "rzgy.png";
+        this.rzgy = true;
+        this.swfkUrl = "swfk.png";
+        this.swfk = true;
+      }
+      if (val == "rzgy") {
+        this.rzgyUrl = "rzgy1.png";
+        this.rzgy = false;
+        this.xlfsUrl = "xlfs.png";
+        this.xlfs = true;
+        this.xlcpUrl = "xlcp.png";
+        this.xlcp = true;
+        this.rjdhUrl = "rjdh.png";
+        this.rjdh = true;
+        this.swfkUrl = "swfk.png";
+        this.swfk = true;
+      }
+      if (val == "swfk") {
+        this.swfkUrl = "swfk1.png";
+        this.swfk = false;
+        this.rzgyUrl = "rzgy.png";
+        this.rzgy = true;
+        this.xlfsUrl = "xlfs.png";
+        this.xlfs = true;
+        this.xlcpUrl = "xlcp.png";
+        this.xlcp = true;
+        this.rjdhUrl = "rjdh.png";
+        this.rjdh = true;
+      }
+    },
     submitForm(formName) {
       let that = this;
       let num = sessionStorage.getItem("num");
@@ -286,7 +592,7 @@ export default {
       this.$router.push("/mainTable");
       ipcRenderer.removeAllListeners();
       Utils.$off();
-      this. desTimer() 
+      this.desTimer();
     },
     handleOpen(key, keyPath) {},
     handleClose(key, keyPath) {},
@@ -294,15 +600,15 @@ export default {
       this.$router.push("/");
       ipcRenderer.removeAllListeners();
       Utils.$off();
-       this. desTimer() 
+      this.desTimer();
     },
   },
 };
 </script>
 <style scoped>
 .imgStyle {
-  width: 20px;
-  height: 20px;
+  width: 10px;
+  height: 10px;
   cursor: pointer;
 }
 .exitLogin {
@@ -310,20 +616,52 @@ export default {
   color: #ffffff;
   cursor: pointer;
   display: block;
-  padding-bottom: 5px;
 }
-.el-menu-item.is-active {
-  background-color: rgba(17, 17, 18, 0.2) !important;
+.el-menu-item {
+  margin-left: 10px !important;
 }
+
 .el-menu-item:hover {
   color: #ffffff !important;
+  background-color: transparent !important;
+}
 
-  background-color: rgba(17, 17, 18, 0.2) !important;
+.el-menu-item:focus {
+  color: #ffffff !important;
+  background-color: #ffffff !important;
+  color: #04d1a7 !important;
+  border-radius: 20px;
+  margin-left: 10px;
+  width: 180px;
+}
+.el-menu-item.is-active {
+  background-color: #ffffff !important;
+  color: #04d1a7 !important;
+  border-radius: 20px;
+  margin-left: 10px;
+  width: 180px;
 }
 .el-menu-item:active {
   color: #ffffff !important;
-  background-color: rgba(17, 17, 18, 0.2) !important;
+  background-color: #ffffff !important;
+  color: #04d1a7 !important;
+  border-radius: 20px;
+  margin-left: 10px;
+  width: 180px;
+}
+.el-menu-item {
+  /* color: #ffffff !important;
+  background-color: #ffffff !important;
+  color: #04d1a7 !important;
+  border-radius: 20px;
+  margin-left: 10px; */
+  border-radius: 20px;
+  width: 180px;
 }
+/* .el-menu-item:active {
+  color: #ffffff !important;
+  background-color: #ffffff !important;
+} */
 
 li.hover {
 }
@@ -336,8 +674,8 @@ ul {
   /* background-color: linear-gradient(0deg, #4ab3c6 0%, #001e78 100%) !important; */
 }
 .menu_style {
-  background: linear-gradient(0deg, #4ab3c6 0%, #001e78 100%) !important;
-  height: 95vh;
+  background: linear-gradient(0deg, #09b3ff 0%, #04d1a7 100%) !important;
+  height: 100vh;
 }
 .foot_main {
   width: 100%;
@@ -372,15 +710,67 @@ ul {
   width: 100%;
   position: absolute;
   bottom: 40px;
+  left: -40px;
   line-height: 20px;
   display: block;
   font-size: 10px;
   /* background-color: rgb(94, 125, 221); */
-  text-align: center;
+  /* text-align: center; */
 }
 /* .main_right_height {
   height: 95vh !important;
   display: block !important;
   overflow-y: auto !important;
 } */
+.menu_left_new {
+  background: linear-gradient(0deg, #09b3ff 0%, #04d1a7 100%) !important;
+  height: 100vh;
+  /* background: linear-gradient(0deg,#09B3FF 0%, #04D1A7 100%) !important; */
+}
+.menu_left_keep {
+  border-top-left-radius: 36px;
+  border-bottom-left-radius: 36px;
+  /* background: #09b3ff; */
+
+  height: 100vh;
+
+  /* background: linear-gradient(0deg,#09B3FF 0%, #04D1A7 100%) !important; */
+}
+.menu_title_top {
+  display: flex;
+  justify-content: center;
+  color: #ffffff;
+  margin-top: 40px;
+}
+.menu_title_top_des {
+  border-bottom: 1px solid #ffffff;
+  padding-bottom: 10px;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+.menu_feature {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-bottom: 20px;
+}
+.update_pass {
+  margin-left: 5px;
+  display: flex;
+  flex-direction: column;
+}
+.menu_main_exit {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+.menu_icon_cla {
+  height: 14px;
+  margin-right: 4px;
+}
+.menu_text_cla {
+  color: #ffffff;
+}
 </style>

src/renderer/components/TopPage.vue

@@ -1,34 +1,18 @@
 <template>
-  <div>
+  <div class='top_top'>
     <el-row class="top_page_css ttop_height">
       <el-col :span="12" style="padding-left: 10px; padding-top: 10px;">
-        <div style="display: flex">
+        <div>&nbsp;</div>
+        <!-- <div style="display: flex">
           <img width="23px" height="20px" src="../assets/logo_icon.png" />
           <span
             class="top-font"
             :class="$root.topPageFlag ? 'top-font_black' : 'top-font'"
-            >&nbsp;&nbsp;心理效能增强系统</span
+            >&nbsp;&nbsp;自助式心理健康评估与认知行为干预系统</span
           >
-        </div>
+        </div> -->
       </el-col>
       <el-col :span="12" style="text-align: right; margin-top: 10px">
-        <!-- <el-popover
-         
-          placement="bottom"
-          title="标题"
-          width="200"
-          trigger="click"
-          content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。"
-        >
-        <el-button  class="dragNo" slot="reference">click 激活</el-button>
-          <img
-            slot="reference"
-            class="top-menu"
-            width="15px"
-            height="15px"
-            src="../assets/help.png"
-          />
-        </el-popover> -->
         <img
           class="top-menu dragNo"
           width="15px"
@@ -109,10 +93,10 @@
       <el-row>
         <el-col :span="6" style="text-align: center">
           <img width="23px" height="20px" src="../assets/logo_icon.png" />
-          <p>心理效能增强系统</p>
+          <p>自助式心理健康评估与认知行为干预系统</p>
         </el-col>
         <el-col :span="18">
-          <h4>关于心理效能增强系统</h4>
+          <h4>关于自助式心理健康评估与认知行为干预系统</h4>
           <p>版权所有©{{ year }}北京决明科技有限公司</p>
           <p>
             本软件产品仅限于个人用户基于个人目的使用，禁止将本软件用于生产、经营等商业用途或者其它用途。
@@ -265,4 +249,10 @@ export default {
 .ttop_height {
   height: 5vh;
 }
+.top_top{
+  position: absolute;
+  width:100%;
+  margin-left:auto;
+  z-index: 3000;
+}
 </style>