plg 2 hete
szülő
commit
5184a88ad8
56 módosított fájl, 136 hozzáadás és 122 törlés
  1. BIN
      src/assets/img/home/bg_p.png
  2. BIN
      src/assets/img/home/bg_p1.png
  3. BIN
      src/assets/img/home/detail.png
  4. BIN
      src/assets/img/home/detail1.png
  5. BIN
      src/assets/img/login/kuai.png
  6. BIN
      src/assets/img/login/kuai1.png
  7. BIN
      src/assets/img/login/login-left-top.png
  8. BIN
      src/assets/img/login/login-left-top1.png
  9. BIN
      src/assets/img/login/login_bg.png
  10. BIN
      src/assets/img/login/login_bg1.png
  11. BIN
      src/assets/img/login/形状 955.png
  12. BIN
      src/assets/img/table/delete.png
  13. BIN
      src/assets/img/table/delete1.png
  14. BIN
      src/assets/img/table/edit.png
  15. BIN
      src/assets/img/table/edit1.png
  16. BIN
      src/assets/img/table/pro.png
  17. BIN
      src/assets/img/table/pro2.png
  18. BIN
      src/assets/img/table/reset.png
  19. BIN
      src/assets/img/table/reset1.png
  20. BIN
      src/assets/img/table/search.png
  21. BIN
      src/assets/img/table/search1.png
  22. BIN
      src/assets/img/table/xiafa.png
  23. BIN
      src/assets/img/table/xiafa1.png
  24. BIN
      src/assets/menu/1.png
  25. BIN
      src/assets/menu/asy.png
  26. BIN
      src/assets/menu/guanli.png
  27. BIN
      src/assets/menu/name.png
  28. BIN
      src/assets/menu/plan.png
  29. BIN
      src/assets/menu/user.png
  30. BIN
      src/assets/menu/userAdmin.png
  31. BIN
      src/assets/menu/userAdmin1.png
  32. BIN
      src/assets/menu/zu.png
  33. BIN
      src/assets/report/lv.png
  34. BIN
      src/assets/report/lv1.png
  35. BIN
      src/assets/report/white.png
  36. BIN
      src/assets/report/white1.png
  37. 3 3
      src/components/PlanReport.vue
  38. 1 1
      src/components/PlanUser.vue
  39. 6 6
      src/components/PlanUserStatus.vue
  40. 1 1
      src/components/Report.vue
  41. 1 1
      src/components/Report1.vue
  42. 11 11
      src/styles/public.css
  43. 18 12
      src/views/loginNew.vue
  44. 4 2
      src/views/manage/channelInfo/channelInfo.vue
  45. 1 1
      src/views/manage/channelInfo/channelUserManage.vue
  46. 19 19
      src/views/manage/channelInfo/invite.vue
  47. 10 10
      src/views/manage/channelManagement/channelManagement.vue
  48. 14 12
      src/views/manage/channelManagement/contract.vue
  49. 19 17
      src/views/manage/generalSituation.vue
  50. 2 2
      src/views/manage/individualTendency.vue
  51. 1 1
      src/views/manage/instructorManage.vue
  52. 1 1
      src/views/manage/leaveManage.vue
  53. 18 17
      src/views/manage/manageMain.vue
  54. 1 1
      src/views/manage/teacherManage.vue
  55. 4 3
      src/views/manage/tendency.vue
  56. 1 1
      src/views/manage/userManage.vue

BIN
src/assets/img/home/bg_p.png


BIN
src/assets/img/home/bg_p1.png


BIN
src/assets/img/home/detail.png


BIN
src/assets/img/home/detail1.png


BIN
src/assets/img/login/kuai.png


BIN
src/assets/img/login/kuai1.png


BIN
src/assets/img/login/login-left-top.png


BIN
src/assets/img/login/login-left-top1.png


BIN
src/assets/img/login/login_bg.png


BIN
src/assets/img/login/login_bg1.png


BIN
src/assets/img/login/形状 955.png


BIN
src/assets/img/table/delete.png


BIN
src/assets/img/table/delete1.png


BIN
src/assets/img/table/edit.png


BIN
src/assets/img/table/edit1.png


BIN
src/assets/img/table/pro.png


BIN
src/assets/img/table/pro2.png


BIN
src/assets/img/table/reset.png


BIN
src/assets/img/table/reset1.png


BIN
src/assets/img/table/search.png


BIN
src/assets/img/table/search1.png


BIN
src/assets/img/table/xiafa.png


BIN
src/assets/img/table/xiafa1.png


BIN
src/assets/menu/1.png


BIN
src/assets/menu/asy.png


BIN
src/assets/menu/guanli.png


BIN
src/assets/menu/name.png


BIN
src/assets/menu/plan.png


BIN
src/assets/menu/user.png


BIN
src/assets/menu/userAdmin.png


BIN
src/assets/menu/userAdmin1.png


BIN
src/assets/menu/zu.png


BIN
src/assets/report/lv.png


BIN
src/assets/report/lv1.png


BIN
src/assets/report/white.png


BIN
src/assets/report/white1.png


+ 3 - 3
src/components/PlanReport.vue

@@ -1534,7 +1534,7 @@ export default {
 }
 .radio_group_style >>> .el-radio-button__orig-radio:checked + .el-radio-button__inner {
   color: #ffffff;
-  background-color: #00bf78;
+  background-color: #4D6AD5;
 }
 .radio_group_style >>> .el-radio-button__inner {
   background-color: #f5f7fa;
@@ -1607,7 +1607,7 @@ export default {
   .blue_t {
     display: flex;
     width: 14px;
-    background-color: #00bf78;
+    background-color: #4D6AD5;
     height: 30px;
     border-radius: 20px;
     margin-right: 5px;
@@ -1675,7 +1675,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/components/PlanUser.vue

@@ -447,7 +447,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 6 - 6
src/components/PlanUserStatus.vue

@@ -69,12 +69,12 @@
                       style="display: flex; justify-content: center; align-items: center"
                       v-if="scope.row.isComplete == '1'"
                     >
-                      <img
+                      <!-- <img
                         style="width: 16px"
                         src="../assets/img/home/isCom.png"
                         alt=""
-                      />&nbsp;&nbsp;
-                      <div style="color: #00955e">已完成</div>
+                      />&nbsp;&nbsp; -->
+                      <div style="color: #333333">已完成</div>
                     </div>
                     <!-- <div
                 style="display: flex; justify-content: center; align-items: center"
@@ -91,11 +91,11 @@
                       style="display: flex; justify-content: center; align-items: center"
                       v-if="scope.row.isComplete == '0'"
                     >
-                      <img
+                      <!-- <img
                         style="width: 16px"
                         src="../assets/img/home/isNo.png"
                         alt=""
-                      />&nbsp;&nbsp;
+                      />&nbsp;&nbsp; -->
                       <div style="color: #d52121">未完成</div>
                     </div>
                   </template>
@@ -539,7 +539,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/components/Report.vue

@@ -1276,7 +1276,7 @@ input[aria-hidden="true"] {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/components/Report1.vue

@@ -1206,7 +1206,7 @@ input[aria-hidden="true"] {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 11 - 11
src/styles/public.css

@@ -202,17 +202,17 @@
 /*新增按钮颜色*/
 
 .el-button--success{
-  border-color:#00BF78;
-  background-color: #00BF78;
+  border-color:#4D6AD5;
+  background-color: #4D6AD5;
   color:white;
   /* background-color: transparent; */
   
 }
 
 .el-button--success:focus, .el-button--success:hover{
-  border-color: #00BF78;
+  border-color: #4D6AD5;
   color:white;
-  background-color: #00BF78;
+  background-color: #4D6AD5;
   
 }
 
@@ -233,14 +233,14 @@
 /* 清空按钮颜色  */
 
 .el-button--info{
-  border-color: #00BF78;
-  color:#00BF78;
+  border-color: #4D6AD5;;
+  color:#333333;
   background-color: transparent;
 }
 
 .el-button--info:focus, .el-button--info:hover{
-  border-color: #00BF78;
-  color:#00BF78;
+  border-color: #4D6AD5;
+  color:#333333;
   background-color: transparent;
   
 }
@@ -413,8 +413,8 @@
 
 /* 单选框样式 */
 .el-radio__input.is-checked .el-radio__inner {
-  border-color: #00BF78;
-  background: #00BF78;
+  border-color: #4D6AD5;
+  background: #4D6AD5;
 }
 
 .el-radio__input.is-checked+.el-radio__label {
@@ -423,7 +423,7 @@
 
 /* 分页样式 */
 .el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #00BF78;
+  background-color:#4D6AD5 ;
   color: #FFF;
 }
 

+ 18 - 12
src/views/loginNew.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="login-wrapper-new">
     <div class="login-left-new">
-      <div class="cpdm_left">
-        <!-- <p class="aab">学生心理健康测评系统</p> -->
+      <!-- <div class="cpdm_left">
+      
         <p class="aab">高知人员心理压力测评系统</p>
        
-        <!-- <img class="logo" src="../assets/img/login/login_logo.png" /> -->
+    
         <img class="ye1" src="../assets/img/login/ye1.png" />
         <img class="ye2" src="../assets/img/login/ye2.png" />
-      </div>
+      </div> -->
       <div class="cpdm_right">
         <el-form
           class="login-left-middle-new"
@@ -38,7 +38,7 @@
                 <div class="account-inner">
                   <img
                     style="height: 20px; margin-left: 10px"
-                    src="../assets/img/login/persion1.png"
+                    src="../assets/img/login/persion.png"
                   />
                   <div class="account-inner-line"></div>
                 </div>
@@ -60,7 +60,7 @@
                 <div class="account-inner">
                   <img
                     style="height: 20px; margin-left: 10px"
-                    src="../assets/img/login/password1.png"
+                    src="../assets/img/login/password.png"
                   />
                   <div class="account-inner-line"></div>
                 </div>
@@ -447,8 +447,8 @@ export default {
     left: 0;
     right: 0;
     margin: auto;
-    width: 1080px;
-    height: 600px;
+    width: 750px;
+    height: 550px;
     box-sizing: border-box;
     border-radius: 40px;
 
@@ -483,12 +483,17 @@ export default {
     }
 
     .cpdm_right {
-      background-color: #fff;
-      width: 50%;
+      // background-color: #fff;
+      background: url(../assets/img/login/kuai.png) repeat;
+      // background-size: 100% 100%;
+      // filter: blur(5px);
+      width: 100%;
       height: 100%;
       // border-radius: 40px;
       border-top-right-radius: 40px;
       border-bottom-right-radius: 40px;
+      border-top-left-radius: 40px;
+      border-bottom-left-radius: 40px;
     }
 
     .login-left-top-new {
@@ -515,6 +520,7 @@ export default {
           font-size: 30px;
           font-weight: 700;
           margin-left: 10px;
+          color: #ffffff;
         }
 
         .cpdm_right_top_img {
@@ -622,9 +628,9 @@ export default {
   .button-new {
     text-align: center;
     border-radius: 50px;
-    border: 3px solid #48d68e;
+    border: 3px solid #4D6AD5;
     color: #ffffff;
-    background-color: #000000;
+    background-color: #4D6AD5;
     // margin-right: 20px;
     padding: 10px 90px;
     cursor: pointer;

+ 4 - 2
src/views/manage/channelInfo/channelInfo.vue

@@ -685,11 +685,13 @@ export default {
     cursor: pointer;
     letter-spacing: 2px;
     img {
-      width: 15px;
+      // width: 15px;
+      width: auto;
+      height: 18px;
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/views/manage/channelInfo/channelUserManage.vue

@@ -535,7 +535,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 19 - 19
src/views/manage/channelInfo/invite.vue

@@ -119,34 +119,34 @@
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '3'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isCom.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #00955e">已完成</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #333333;font-weight: 700;">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '2'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isRun.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #f6cb00">进行中</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #2342FF;font-weight:700">进行中</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '1'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isNo.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #d52121">未开始</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #FF7800;font-weight: 700;">未开始</div>
               </div>
             </template>
           </el-table-column>
@@ -276,34 +276,34 @@
                 style="display: flex; justify-content: start; align-items: center"
                 v-if="view.status == '已完成'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isCom.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #00955e">已完成</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #333333;font-weight: 700;">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: start; align-items: center"
                 v-if="view.status == '进行中'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isRun.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #f6cb00">进行中</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #2342FF;font-weight: 700;">进行中</div>
               </div>
               <div
                 style="display: flex; justify-content: start; align-items: center"
                 v-if="view.status == '未开始'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isNo.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #d52121">未开始</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #FF7800;font-weight: 700;">未开始</div>
               </div>
             </div>
           </div>
@@ -856,7 +856,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 10 - 10
src/views/manage/channelManagement/channelManagement.vue

@@ -119,34 +119,34 @@
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '3'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isCom.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #00955e">已完成</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #333333;font-weight: 700;">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '2'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isRun.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #f6cb00">进行中</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #2342FF;font-weight: 700;">进行中</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '1'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isNo.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #d52121">未开始</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #FF7800;font-weight: 700;">未开始</div>
               </div>
             </template>
           </el-table-column>
@@ -1286,7 +1286,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 14 - 12
src/views/manage/channelManagement/contract.vue

@@ -3,12 +3,14 @@
     <div class="record-main">
       <div class="compare_out">
         <div class="user" @click="isClikcObj(true)">
-          <img style="width: 100px" :src="userImg" /><span style="position: absolute"
+          <img style="width: 100px" :src="userImg" /><span  :style="{color:isUser?'#ffffff':'#222222',position: 'absolute'}"
             >用户对比</span
           >
         </div>
         <div class="user" @click="isClikcObj(false)">
-          <img style="width: 100px" :src="planImg" /><span style="position: absolute"
+          <img style="width: 100px" :src="planImg" /><span 
+          
+          :style="{color:isUser?'#222222':'#ffffff',position: 'absolute'}"
             >计划对比</span
           >
         </div>
@@ -228,34 +230,34 @@
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '3'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isCom.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #00955e">已完成</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #333333;font-weight: 700;">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '2'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isRun.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #f6cb00">进行中</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #2342FF;font-weight: 700;">进行中</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
                 v-if="scope.row.planStatus == '1'"
               >
-                <img
+                <!-- <img
                   style="width: 16px"
                   src="../../../assets/img/home/isNo.png"
                   alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #d52121">未开始</div>
+                />&nbsp;&nbsp; -->
+                <div style="color: #FF7800;font-weight: 700;">未开始</div>
               </div>
             </template>
           </el-table-column>
@@ -954,7 +956,7 @@ export default {
     }
 
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 19 - 17
src/views/manage/generalSituation.vue

@@ -22,7 +22,7 @@
           src="../../assets/img/home/bg_p.png"
           alt=""
         />
-        <div class="number_people_top">组织名称:</div>
+        <div class="number_people_top">单位名称:</div>
         <div class="number_people_yuan">
           <div class="out">
             <span :title="userInfo.orgName" class="yuan_name">{{
@@ -38,7 +38,7 @@
             </div> -->
 
             <span class="yuan_people">
-              <span class="people_t">小计:</span>
+              <span class="people_t">人数:</span>
               <span class="people_n">{{ peopleData["总人数"] }}</span
               ><span class="people_r">人</span></span
             >
@@ -79,34 +79,34 @@
                     style="display: flex; justify-content: center; align-items: center"
                     v-if="item.planStatus == '3'"
                   >
-                    <img
+                    <!-- <img
                       style="width: 16px"
                       src="../../assets/img/home/isCom.png"
                       alt=""
-                    />&nbsp;&nbsp;
-                    <div style="color: #00955e">已完成</div>
+                    />&nbsp;&nbsp; -->
+                    <div style="color: #333333;font-weight: 700;">已完成</div>
                   </div>
                   <div
                     style="display: flex; justify-content: center; align-items: center"
                     v-if="item.planStatus == '2'"
                   >
-                    <img
+                    <!-- <img
                       style="width: 16px"
                       src="../../assets/img/home/isRun.png"
                       alt=""
-                    />&nbsp;&nbsp;
-                    <div style="color: #f6cb00">进行中</div>
+                    />&nbsp;&nbsp; -->
+                    <div style="color: #2342FF;font-weight: 700;">进行中</div>
                   </div>
                   <div
                     style="display: flex; justify-content: center; align-items: center"
                     v-if="item.planStatus == '1'"
                   >
-                    <img
+                    <!-- <img
                       style="width: 16px"
                       src="../../assets/img/home/isNo.png"
                       alt=""
-                    />&nbsp;&nbsp;
-                    <div style="color: #d52121">未开始</div>
+                    />&nbsp;&nbsp; -->
+                    <div style="color: #FF7800;font-weight: 700;">未开始</div>
                   </div>
                 </div>
                 <div class="detail">
@@ -961,8 +961,9 @@ export default {
     min-width: 980px;
     .number_people {
       position: relative;
-      background: url(../../assets/img/home/bg.png) no-repeat;
-      background-size: cover;
+      // background: url(../../assets/img/home/bg.png) no-repeat;
+      background-color: #4D6AD5;
+      // background-size: cover;
       border-radius: 20px;
       flex: 5;
       overflow: hidden;
@@ -999,7 +1000,7 @@ export default {
             // background-color: #0d3bb1;
             // margin-left: 20px;
             margin-top: 10px;
-            color: #113a27;
+            color: #ffffff;
             letter-spacing: 3px;
             font-size: 34px;
             font-family: Electronic;
@@ -1039,10 +1040,11 @@ export default {
               letter-spacing: 3px;
             }
             .people_n {
-              background-image: linear-gradient(0deg, #0d3bb1 0%, #00c0ff 100%);
+              // background-image: linear-gradient(0deg, #0d3bb1 0%, #00c0ff 100%);
+              color: #ffffff;
               background-clip: text;
               -webkit-background-clip: text;
-              -webkit-text-fill-color: transparent;
+              // -webkit-text-fill-color: transparent;
               color: #ffffff;
               font-size: 36px;
               letter-spacing: 3px;
@@ -1100,7 +1102,7 @@ export default {
         .table_header {
           display: flex;
           // justify-content: space-around;
-          background-color: #00bf78;
+          background-color: #4D6AD5;
           border-radius: 20px;
           line-height: 40px;
           font-weight: 700;

+ 2 - 2
src/views/manage/individualTendency.vue

@@ -21,7 +21,7 @@
               </el-option>
             </el-select>
 
-            <el-button v-show="isJump" @click="backParent" style="border-radius: 20px;margin-left:20px"> 返回</el-button>
+            <el-button type="info" v-show="isJump" @click="backParent" style="border-radius: 20px;margin-left:20px"> 返回</el-button>
           </div>
         </el-col>
       </el-row>
@@ -909,7 +909,7 @@ export default {
     }
 
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/views/manage/instructorManage.vue

@@ -672,7 +672,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/views/manage/leaveManage.vue

@@ -978,7 +978,7 @@ export default {
     }
 
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 18 - 17
src/views/manage/manageMain.vue

@@ -37,8 +37,9 @@
             align-items: center;
           "
         >
-          <div>高知人员</div>
-          <div>心理压力测评</div>
+        <img style="width:160px;" src="../../assets/menu/name.png" alt="">
+          <!-- <div>消防救援官兵</div>
+          <div>心理健康测评系统</div> -->
         </div>
         <!-- <p class="aab"></p> -->
         <!-- <img
@@ -78,7 +79,7 @@
                   <span class="menu_name">{{ item.name }}</span>
                 </div>
               </template>
-              <el-menu-item-group style="background-color: #000000">
+              <el-menu-item-group style="background-color: #1F2761">
                 <el-menu-item v-for="el in item.child" :key="el.id" :index="el.path">
                   <span class="menu_sub_tt"
                     ><span class="menu_sub_t1">&nbsp;</span>{{ el.name }}</span
@@ -306,14 +307,14 @@ export default {
         {
           id: "0",
           name: "用户管理",
-          icon: require("../../assets/menu/user.png"),
+          icon: require("../../assets/menu/guanli.png"),
           showItem: true,
           path: "/manage/userManage",
         },
         {
           id: "1",
           name: "管理员管理",
-          icon: require("../../assets/menu/yuan.png"),
+          icon: require("../../assets/menu/guanli.png"),
           showItem: true,
           path: "/manage/principal",
         },
@@ -413,7 +414,7 @@ export default {
           {
             id: "1",
             name: "管理员管理",
-            icon: require("../../assets/menu/yuan.png"),
+            icon: require("../../assets/menu/guanli.png"),
             showItem: true,
             path: "/manage/principal",
           },
@@ -853,7 +854,7 @@ export default {
   /* min-width:100px */
 }
 .el-submenu__title:hover {
-  background: #00bf78 !important;
+  background: #4D6AD5 !important;
   margin-left: 20px;
   margin-right: 20px;
   border-radius: 40px;
@@ -872,14 +873,14 @@ export default {
   border-radius: 40px;
 }
 .el-menu {
-  background-color: #070707;
+  background-color: #1F2761;
   border-right: 0px;
 }
 .el-menu-item-group .el-menu-item.is-active {
-  background-color: #00bf78 !important;
+  background-color: #4D6AD5 !important;
 }
 .el-menu-item-group .el-menu-item:hover {
-  background-color: #00bf78 !important;
+  background-color: #4D6AD5 !important;
   padding-left: 0px !important;
 }
 .el-menu-item-group__title {
@@ -892,13 +893,13 @@ export default {
 .el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
 .el-menu--horizontal > .el-submenu .el-submenu__title:hover {
   /* background-color: transparent !important; */
-  background-color: #00bf78 !important;
+  background-color: #4D6AD5 !important;
   padding-left: 0px !important;
 }
 .el-menu-item:focus,
 .el-menu-item:hover {
   outline: 0;
-  background-color: #00bf78 !important;
+  background-color: #4D6AD5 !important;
 }
 </style>
 
@@ -960,7 +961,7 @@ export default {
 }
 
 .aside-menu {
-  background-color: #000000;
+  background-color:#1F2761;
   /*height: 98vh;*/
   height: 100vh;
   text-align: left;
@@ -972,7 +973,7 @@ export default {
 }
 
 .aside-menu .el-menu-item.is-active {
-  background: #00bf78 !important;
+  background: #4D6AD5 !important;
   margin-left: 20px;
   margin-right: 20px;
   border-radius: 40px;
@@ -992,7 +993,7 @@ export default {
 }
 
 .el-menu-item-group .el-menu-item.is-active {
-  background: #00bf78 !important;
+  background: #4D6AD5 !important;
   margin-left: 20px;
   margin-right: 20px;
   padding-left: 0px !important;
@@ -1175,7 +1176,7 @@ export default {
   flex-direction: column;
   // border-top-left-radius: 40px;
   // border-bottom-left-radius: 40px;
-  background-color: #000000;
+  background-color: #1F2761;
   // background: url('../../assets/img/side/side_bg.png') no-repeat;
   // background-size: 100% 100vh;
 }
@@ -1187,7 +1188,7 @@ export default {
   margin-top: 20px;
   margin-left: 20px;
   .blue {
-    background-color: #00bf78;
+    background-color: #4D6AD5;
     width: 10px;
     margin-right: 30px;
     height: 20px;

+ 1 - 1
src/views/manage/teacherManage.vue

@@ -733,7 +733,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 4 - 3
src/views/manage/tendency.vue

@@ -4,13 +4,14 @@
       <div class="compare_out">
         <div class="user" @click="isClikcObj(true)">
           <img style="width: 120px; height: 24px" :src="userImg" /><span
-            style="position: absolute"
+       
+             :style="{color:isUser?'#ffffff':'#222222',position: 'absolute'}"
             >个人趋势统计</span
           >
         </div>
         <div class="user" @click="isClikcObj(false)">
           <img style="width: 120px; height: 24px" :src="planImg" /><span
-            style="position: absolute"
+             :style="{color:isUser?'#222222':'#ffffff',position: 'absolute'}"
             >组织趋势统计</span
           >
         </div>
@@ -1298,7 +1299,7 @@ export default {
     }
 
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }

+ 1 - 1
src/views/manage/userManage.vue

@@ -925,7 +925,7 @@ export default {
       margin-right: 5px;
     }
     span {
-      color: #00bf78;
+      color: #4D6AD5;
       // font-weight: 600;
     }
   }