Browse Source

修改新版本

plg 3 months ago
parent
commit
179e274fc0

BIN
src/assets/home/group_six1.png


BIN
src/assets/zs/community.png


BIN
src/assets/zs/result.png


BIN
src/assets/zs/testPlan.png


+ 40 - 8
src/components/CpmdFooter.vue

@@ -21,7 +21,7 @@ onMounted(() => {
 <template>
     <!-- 此处最大宽度是1200px -->
     <div class="home_footer_inner" :style="{ scrollSnapAlign: 'start' }">
-        <img src="../assets/home/group_five.png" width="100%" alt="">
+        <!-- <img src="../assets/home/group_five.png" width="100%" alt=""> -->
         <!-- <div class="home_footer_icon">
             <div class="home_footer_company">
                 <img width="200px" src="../assets/home/ding_xiang.png" />
@@ -54,7 +54,14 @@ onMounted(() => {
             <div class="home_footer_fo_des">游戏内容</div>
             <div class="home_footer_fo_des">联系我们</div>
         </div> -->
-        <!-- <div class="icon_list">
+        <div class="friend">
+            <div class="left">测评系统合作伙伴</div>
+            <div>
+                <div class="right_one">与国内顶尖科研单位的合作不仅仅是技术支持的传递,更是创新思维的碰撞和价值共创的过程 </div>
+                <div class="right_one">我们期待与合作伙伴共同探索新技术、新应用,共同开启技术合作的新篇章</div>
+            </div>
+        </div>
+        <div class="icon_list">
             <div class="icon_inner">
                 <img class="img_icon" src="../assets/footer/5.png" alt="">
                 <span class="icon_font">首都医科大学</span>
@@ -82,7 +89,7 @@ onMounted(() => {
 
 
         </div>
-        <div style="width:1200px;height:10px;background-color: #ffffff;">
+        <!-- <div style="width:1200px;height:10px;background-color: #ffffff;">
         </div>
         <div class="home_footer_fo">
             <div class="home_footer_fo_des">隐私</div>
@@ -99,7 +106,7 @@ onMounted(() => {
     // left: 0;
     // right: 0;
     margin: auto;
-    // width: 1200px;
+    width: 1200px;
 
     .home_footer_icon {
         display: flex;
@@ -141,11 +148,30 @@ onMounted(() => {
         }
     }
 
-    .icon_list {
+    .friend {
         display: flex;
-        justify-content: space-around;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        color: #ffffff;
+        margin-bottom: 10px;
+        margin-top: 40px;
 
-        margin-bottom: 20px;
+        .left {
+            font-size: 20px;
+        }
+
+        .right_one {
+            text-align: right;
+            font-size: 12px;
+            line-height: 20px;
+        }
+    }
+
+    .icon_list {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 40px;
 
         .icon_inner {
             display: flex;
@@ -153,6 +179,10 @@ onMounted(() => {
             align-items: center;
             flex-direction: column;
             width: 200px;
+            background-color: #ffffff;
+            box-sizing: border-box;
+            padding: 40px 10px;
+            border-radius: 20px;
 
             .img_icon {
                 width: 70px;
@@ -160,7 +190,9 @@ onMounted(() => {
             }
 
             .icon_font {
-                color: #ffffff;
+                font-weight: 700;
+                font-size: 14px;
+                color: #353535;
                 text-align: center;
             }
         }

+ 14 - 6
src/components/CpmdHeader.vue

@@ -102,7 +102,13 @@ const leaveFun = () => {
                 <!-- <div>学生心理健康测评系统</div> -->
                 <div style="display: flex;align-items: center;">
                     <span class="home_line_1"></span>
-                    <img style="width: 20vw;" src="../assets/home/group_title.png" alt="">
+                    <!-- <img style="width: 20vw;" src="../assets/home/group_title.png" alt=""> -->
+                    <div style="display: flex;flex-direction: column;margin-left:6px">
+                        <span style="color: #ffffff;font-size: 26px;font-weight: 100;">高知人员心理压力测评系统</span>
+                        <span style="color: #ffffff;font-weight: 100;font-size: 14px;">Knowledgeable personnel
+                            psychological assessment
+                            system</span>
+                    </div>
                 </div>
             </div>
             <el-menu :default-active="activeIndex" class="el-menu-demo" style="display: flex;" mode="horizontal"
@@ -179,15 +185,16 @@ const leaveFun = () => {
 <style scoped>
 .home_line_1 {
     display: flex;
-    width: 2px;
-    height: 36px;
+    width: 1px;
+    height: 50px;
     background-color: #ffffff;
 }
 
 .home_line {
     width: 1px;
     height: 50%;
-    background-color: #ffffff;
+    border-left: 1px solid #ffffff;
+    /* background-color: #ffffff; */
 }
 
 .underlined-text {
@@ -255,7 +262,7 @@ const leaveFun = () => {
 .badge_custom {
     position: absolute;
     background-color: #48D68E;
-    left: 90px;
+    right: -20px;
     top: 0px;
 
     line-height: 18px;
@@ -287,7 +294,8 @@ const leaveFun = () => {
     color: #ffffff;
     display: inline-flex;
     // height: 100%;
-    justify-content: center;
+    justify-content: flex-end;
+    padding: 0px;
     align-items: center;
     border-radius: 12px;
     margin: 0;

+ 40 - 2
src/views/Community.vue

@@ -371,12 +371,19 @@ onUnmounted(() => {
                 <!-- <img class="xlts_img" style="margin-top:40px" src="../assets/home/other_text.png" /> -->
             </div>
         </div>
+        <div class="leave_message">
+            <!-- <img class="img" src="../assets/zs/community.png" alt=""> -->
+            <div class="font_blue"> 留言社区 </div>
+        </div>
         <div class="kply">
+
             <div class="kply_inner">
+
                 <div style="padding :20px 40px">
                     <!-- <div style="padding:10% 20% ;" v-show="true">
                         <img width="100%" src="../assets/planNo.png">
                     </div> -->
+
                     <div class="kepu_title">
                         <div class="kepu_title_des">
                             留言社区
@@ -429,7 +436,7 @@ onUnmounted(() => {
 
     </div>
 
-    <el-dialog v-model="pub_visible" :show-close="true" width="60%" style="border-radius: 40px;  ">
+    <el-dialog v-model="pub_visible" :show-close="true" width="60%" style="border-radius: 5px;  ">
         <template #header="{ close, titleId, titleClass }">
             <div class="my-header">
                 <div class="msg_dig">
@@ -658,9 +665,40 @@ label {
         }
     }
 
+    .leave_message {
+
+        left: 0;
+        right: 0;
+        margin: auto;
+        width: 1200px;
+        margin-bottom: 20px;
+        margin-top: 20px;
+
+        .font_blue {
+            position: relative;
+            color: #00DE7E;
+            font-weight: 700;
+            font-size: 22px;
+            font-family: 'Rammetto One-Regular';
+            padding-top: 30px;
+            z-index: 10;
+            background: url(../assets/zs/community.png) no-repeat;
+            background-size: auto 50px;
+
+            // img {
+            //     position: absolute;
+            //     height: 50px;
+            //     left: 0;
+            //     top: 10px;
+            // }
+        }
+
+
+    }
+
     .kply {
         width: 100%;
-        margin-top: 40px;
+        // margin-top: 40px;
         // background-color: #FAFAFA;
 
         .kply_inner {

+ 1 - 1
src/views/Home.vue

@@ -53,7 +53,7 @@ onUnmounted(() => {
 
     .home_footer_out {
         width: 100%;
-        background-color: #000000;
+        background-color: #3B3B3B;
     }
 }
 </style>

+ 1 - 1
src/views/HomeView.vue

@@ -190,7 +190,7 @@ const brightStatusLevel = () => {
       <div style="text-align: center;"><img src="../assets/home/group_two.png" style="width: 30vw;margin-bottom: 55px;"
           alt=""></div>
       <div style="display: flex; justify-content: space-around;">
-        <img src="../assets/home/group_six.png" style="width: 500px;" alt="">
+        <img src="../assets/home/group_six1.png" style="width: 500px;" alt="">
         <img src="../assets/home/group_senven.png" alt="" style="width: 500px;">
       </div>
     </div>

+ 30 - 5
src/views/Plan.vue

@@ -258,10 +258,14 @@ onUnmounted(() => {
                 <!-- <img class="xlts_img" style="margin-top:40px" src="../assets/home/other_text.png" /> -->
             </div>
         </div>
-        <div class="kply">
+        <div class="leave_message">
+            <!-- <img class="img" src="../assets/zs/community.png" alt=""> -->
+            <div class="font_blue"> 测试计划 </div>
+        </div>
 
+        <div class="kply">
             <div class="kply_inner">
-                <div style="padding: 20px 40px;">
+                <div>
                     <div style="box-shadow: 0px 4px 32px 0px rgba(0,0,0,0.17);"
                         v-show="planList.length == 0 && isFinshed">
                         <div style="padding:10% 20% ;" v-show="planList.length == 0 && isFinshed">
@@ -385,10 +389,30 @@ onUnmounted(() => {
         }
     }
 
+    .leave_message {
+
+        left: 0;
+        right: 0;
+        margin: auto;
+        width: 1200px;
+        margin-bottom: 20px;
+        margin-top: 20px;
+
+        .font_blue {
+            position: relative;
+            color: #00DE7E;
+            font-weight: 700;
+            font-size: 22px;
+            font-family: 'Rammetto One-Regular';
+            padding-top: 30px;
+            z-index: 10;
+            background: url(../assets/zs/testPlan.png) no-repeat;
+            background-size: auto 50px;
+        }
+    }
+
     .kply {
         width: 100%;
-        margin-top: 40px;
-        // background-color: #FAFAFA;
 
         .kply_inner {
             // padding: 20px 20px;
@@ -592,11 +616,12 @@ onUnmounted(() => {
             .test_record_out {
                 // box-shadow: 5px 5px 5px 5px rgb(190, 189, 189);
                 box-shadow: 0px 4px 32px 0px rgba(0, 0, 0, 0.17);
-                margin-top: 40px;
+                // margin-top: 40px;
                 // padding: 20px 40px;
                 background-color: #ffffff;
                 border-radius: 5px;
                 position: relative;
+                padding: 20px 40px;
 
 
                 .record_tip {

+ 28 - 2
src/views/Report.vue

@@ -249,9 +249,15 @@ onUnmounted(() => {
                 <img class="xlts_img" src="../assets/report/report_top.png" />
             </div> -->
         </div>
+        <div class="leave_message">
+            <!-- <img class="img" src="../assets/zs/community.png" alt=""> -->
+            <div class="font_blue"> 测试结果 </div>
+        </div>
+
+
         <div class="kply">
             <div class="kply_inner">
-                <div style="padding: 20px 40px;">
+                <div>
                     <div>
                         <div class="report_result_top">
                             <div style="font-size: 20px;font-weight: 700;margin-bottom: 4px;"> {{ planName }}-测评结果</div>
@@ -378,9 +384,29 @@ onUnmounted(() => {
         }
     }
 
+    .leave_message {
+        left: 0;
+        right: 0;
+        margin: auto;
+        width: 860px;
+        margin-bottom: 20px;
+        margin-top: 20px;
+
+        .font_blue {
+            position: relative;
+            color: #00DE7E;
+            font-weight: 700;
+            font-size: 22px;
+            font-family: 'Rammetto One-Regular';
+            padding-top: 30px;
+            z-index: 10;
+            background: url(../assets/zs/result.png) no-repeat;
+            background-size: auto 50px;
+        }
+    }
+
     .kply {
         width: 100%;
-        margin-top: 40px;
         // background-color: #FAFAFA;
         flex: 1;