首页日志等完善

src/layouts/navbar/index.vue

@@ -65,7 +65,7 @@ export default {
                 },
                 {
                     index: "/log/list",
-                    title: "有什么新功能"
+                    title: "最近更新"
                 }
             ],
             menus: []

src/pages/index/list/index.vue

@@ -157,7 +157,6 @@
                         <img src="@/assets/img/index/pro-bg3-5.png" alt="" class="bg2 wow fadeInDown" data-wow-delay="0.7s">
                         <img src="@/assets/img/index/pro-bg4-1.png" alt="" class="bg3 wow fadeInDown" data-wow-delay="0.2s">
                         <img src="@/assets/img/index/pro-bg4-2.png" alt="" class="bg4 wow fadeInDown" data-wow-delay="0.2s">
-                        <img src="@/assets/img/index/pro-bg4-3.png" alt="" class="bg5 wow fadeInDown" data-wow-delay="0.6s">
                     </div>
                     <div class="text">
                         <img src="@/assets/img/index/index21.png" alt="" class="icon wow fadeInLeft" data-wow-delay="0.5s">
@@ -594,22 +593,15 @@ export default {
             .bg4 {
                 top: 140px;
                 left: -20px;
-                width: 140px;
+                width: 120px;
-            }
+                height: 100px;
-            .bg5 {
-                bottom: 0px;
-                left: 50px;
-                width: 130px;
             }
             &:hover {
                 .bg3 {
                     transform: scale(1.1);
                 }
                 .bg4 {
-                    transform: translate(40px, -70px);
+                    transform: translate(135px, 70px);
-                }
-                .bg5 {
-                    transform: translate(20px, -60px) scale(1.2);
                 }
             }
         }
@@ -638,14 +630,14 @@ export default {
             .bg4 {
                 top: 150px;
                 right: 40px;
-                width: 300px;
+                width: 295px;
             }
             &:hover {
                 .bg3 {
                     transform: scale(1.1);
                 }
                 .bg4 {
-                    transform: translate(-75px, 20px) scale(1.1);
+                    transform: translate(-80px, 25px) scale(1.1);
                 }
             }
         }

src/pages/log/list/index.vue

@@ -73,10 +73,17 @@ export default {
 <style lang="scss" scoped>
 .wrap {
     padding: 50px 0 20px;
-    background-color: #fff;
+    background-color: #000;
     .top {
         margin-bottom: 50px;
         text-align: center;
+        h1 {
+          font-size: 28px;
+          color: #fff;
+        }
+        p {
+          color: #e9e9e9;
+        }
     }
     .timeline {
         display: flex;
@@ -90,18 +97,20 @@ export default {
         margin-bottom: 30px;
     }
     .date {
-        width: 400px;
+        width: 300px;
-        margin-right: 70px;
+        margin-right: 100px;
         text-align: right;
-        color: $main-color;
+        color: #cbcbcb;
         font-size: 14px;
     }
     .right {
         flex: 1;
+        color: #fff;
     }
     h6 {
-        margin: 0 0 15px 0;
+        margin-bottom: 15px;
         font-size: 18px;
+        line-height: 1;
     }
     .cover {
         max-width: 400px;
@@ -116,9 +125,9 @@ export default {
             align-items: center;
             margin-bottom: 5px;
             font-size: 14px;
-            color: $main-color;
+            color: #fff;
             img {
-                width: 30px;
+                width: 20px;
                 margin-right: 8px;
             }
         }
@@ -128,6 +137,7 @@ export default {
             white-space: pre-wrap;
             p {
               position: relative;
+              color: #a3a3a3;
               &:before {
                 content: '';
                 display: inline-block;

src/pages/record/list/ass.vue

@@ -49,10 +49,8 @@ export default {
         }
     },
     mounted() {
-        if (this.curriculumId) {
+      this.page = 1
-            this.page = 1;
+      this.getData()
-            this.getData();
-        }
     },
     methods: {
         ...mapActions({

src/pages/record/list/index.vue

@@ -76,7 +76,12 @@ export default {
     data() {
         return {
             curriculumId: "",
-            curriculumList: [],
+            curriculumList: [
+              {
+                cid: '',
+                curriculumName: '不限'
+              }
+            ],
             overview: {},
             active: "practice",
             tabList: {
@@ -105,8 +110,9 @@ export default {
         getschoolCourse() { // 获取课程下拉框数据
             this.$get(this.api.schoolCourseByAchievement).then(res => {
                 if (res.data && res.data.length) {
-                    this.curriculumList = res.data;
+                    this.curriculumList = [...this.curriculumList, ...res.data]
                     this.curriculumId = this.currId || this.curriculumList[0].cid
+                    console.log(22, this.curriculumId)
                 }
             }).catch(err => {
                 console.log(err);
@@ -115,8 +121,7 @@ export default {
         getData() { // 获取实验概览数据
           this.$get(this.api.experimentOverview).then(res => {
               this.overview = res.data;
-            }).catch(err => {
+          }).catch(err => {})
-            });
         },
         exportData() { // 导出
             if (this.active == "practice") {

src/pages/record/list/practice.vue

@@ -38,10 +38,8 @@ export default {
         }
     },
     mounted() {
-        if (this.curriculumId) {
+      this.page = 1
-            this.page = 1;
+      this.getData()
-            this.getData();
-        }
     },
     methods: {
         ...mapActions({

src/pages/station/preview/index.vue

@@ -291,7 +291,7 @@ export default {
                 window.open(`https://danbao.czcyedu.com/#/loginFromYyyf?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=eb7d8355119d449184c548b07dc01ed9&caseId=1198241070647873538&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=faaedd82adb9444285a5785e4a3dd4f9`);
             } else {
                 if(process.env.NODE_ENV === 'development') {
-                    href = 'http://192.168.1.103:8080/#/'
+                    href = 'http://192.168.1.125:8080/#/'
                 } else {
                     href = `${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
                 }

src/setting.js

@@ -38,10 +38,10 @@ if (isHh) {
 } else if (isDev) {
     // 本地
     // host = "http://www.occupationlab.com:9000/";//线上
-    host = "http://39.108.250.202:9000/"; // 中台测试服
+    // host = "http://39.108.250.202:9000/"; // 中台测试服
     systemPath = `http://192.168.31.125:8093`
     // host = "http://192.168.31.137:9000"; // 赓
-    // host = "http://192.168.31.151:9000/"; // 榕
+    host = "http://192.168.31.151:9000/"; // 榕
     title = "职站";
 } else {
     console.log("其它版本");