From 21e960b517de745e7efe40d280eceb62f8c69fd3 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 29 Oct 2021 18:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD=EF=BC=8Cbu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/home/index.vue          |  2 +-
 src/pages/info/list/index.vue       | 19 ++++++++++++++++---
 src/pages/match/list/index.vue      | 23 ++++++++++++++++-------
 src/pages/record/list/index.vue     | 12 ++++++------
 src/pages/station/preview/index.vue |  3 ++-
 5 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index 7d21a71..f2935ae 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -64,7 +64,7 @@ export default {
 
     .view {
         min-height: calc(100vh - 175px);
-        padding: 24px;
+        //padding: 24px;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/info/list/index.vue b/src/pages/info/list/index.vue
index a181a19..5ce86cc 100644
--- a/src/pages/info/list/index.vue
+++ b/src/pages/info/list/index.vue
@@ -1,5 +1,8 @@
 <template>
     <div>
+        <div class="banner-con">
+
+        </div>
         <div class="main">
             <div class="nav">
                 <div class="sub-title">最新资讯</div>
@@ -188,15 +191,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.banner-con{
+    width: 100vw;
+    height: 200px;
+    background-image: url('../../../assets/img/info-banner1.jpg');
+    background-size: 100vw 200px;
+    background-repeat: no-repeat;
+}
 .main{
     display: flex;
     justify-content: center;
     align-items:flex-start;
-    //padding: 265px 0 40px;
+
     .nav{
         width: 220px;
         border-radius: 8px;
         overflow: hidden;
+        margin-top: -44px;
+
         .sub-title{
             line-height: 88px;
             color: #fff;
@@ -207,7 +219,7 @@ export default {
 
         /deep/ .el-menu {
             border-right: 0;
-            .el-submenu__title,.el-menu-item{
+            .el-submenu__title{
                 font-size: 18px;
                 .el-submenu__icon-arrow{
                     font-size: 18px;
@@ -217,7 +229,8 @@ export default {
     }
     .list-wrap{
         width: 50%;
-        margin-left: 40px;
+        margin: 40px 0 0 40px;
+
         .list{
             padding: 32px;
             background-color: #fff;
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index ab22b81..9b1e626 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="box">
+        <div class="banner-con"></div>
         <div class="search">
             <input type="text" placeholder="请输入竞赛名称" v-model="keyword" />
             <button>搜索</button>
@@ -337,12 +338,20 @@ export default {
 
 <style lang="scss" scoped>
 .box {
-    padding: 20px;
-
+    position: relative;
+    .banner-con{
+        width: 100vw;
+        height: 400px;
+        background-image: url('../../../assets/img/info-banner.png');
+        background-size: 100vw 400px;
+        background-repeat: no-repeat;
+    }
     .search {
-        position: relative;
-        width: 30%;
-        margin: 50px auto;
+        width: 400px;
+        position: absolute;
+        top: 175px;
+        left: 50%;
+        margin-left: -200px;
         border-radius: 30px;
         border: 1px solid #9076FF;
         border-right: 0;
@@ -378,12 +387,12 @@ export default {
         justify-content: center;
         align-items: flex-start;
         padding-bottom: 40px;
-        margin-top: 20px;
 
         .nav {
             width: 220px;
             border-radius: 8px;
             overflow: hidden;
+            margin-top: -44px;
 
             .sub-title {
                 line-height: 88px;
@@ -417,7 +426,7 @@ export default {
         .list-wrap {
             width: 50%;
             min-width: 790px;
-            margin-left: 40px;
+            margin: 40px 0 0 40px;
 
             .list {
                 padding: 32px;
diff --git a/src/pages/record/list/index.vue b/src/pages/record/list/index.vue
index 168ee0b..b642715 100644
--- a/src/pages/record/list/index.vue
+++ b/src/pages/record/list/index.vue
@@ -1,7 +1,7 @@
 <template>
     <!--  实验记录  -->
-    <div>
-        <el-card shadow="hover" class="m-b-20">
+    <div style="padding: 0 24px">
+        <div class="m-b-20">
             <div class="overview">
                 <h6>实验概览</h6>
                 <div class="nums">
@@ -26,7 +26,7 @@
                     </div>
                 </div>
             </div>
-        </el-card>
+        </div>
 
         <div class="page">
             <div class="tabs">
@@ -34,9 +34,9 @@
                    @click="tabChange(index)">{{ item }}</a>
             </div>
 
-            <div class="tool" style="align-items: center">
-                <p style="font-size: 16px">实验记录明细</p>
-                <ul class="filter" style="flex: 0 1 auto;">
+            <div class="tool">
+                <ul class="filter" style="justify-content: space-between;">
+                    <div style="font-size: 16px">实验记录明细</div>
                     <li style="margin-right: 0">
                         <label>课程选择</label>
                         <el-select v-model="curriculumId">
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index aee5afa..0e5808e 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -309,7 +309,8 @@ export default {
             } else if (id == 11) {
                 // href = `${host}bank/#/`;
                 let token = util.local.get(Setting.tokenKey);
-                href = "http://192.168.31.254:8093/#/counter/list/?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId;
+                // href = "http://192.168.31.254:8093/#/counter/list/?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId;
+                href = "http://39.108.250.202/bank/#/counter/list/?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId;
             } else if (id == 21) {
                 window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`);
             } else if (id == 22) {