From 740778c1ce1933152a41a3285cce1cf05a9ce191 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 22 Aug 2022 18:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=8F=B0=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/navbar/index.vue        |  8 +++++++-
 src/pages/course/details/index.vue  | 21 +++++++++++----------
 src/pages/station/list/index.vue    |  1 +
 src/pages/station/preview/index.vue |  8 ++++----
 src/setting.js                      |  3 ++-
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 471f227..55cdf1a 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -3,7 +3,7 @@
         <ul class="nav">
           <li v-for="(item, i) in menus" :key="i" :class="{active: active == item.index}" @click="jump(item)">
             {{item.title}}
-            <ul :class="['children', {show: $route.path !== '/info/details' && active === '/info/list'}]" v-if="item.index === '/info/list'">
+            <ul :class="['children']" v-if="item.index === '/info/list'">
               <li v-for="(column, i) in columns" :key="i" :class="{active: columnActive === column.id}" @click="toInfo($event, column)">{{ column.name }}</li>
             </ul>
           </li>
@@ -119,6 +119,7 @@ export default {
         toInfo(e, column) {
           e.stopPropagation()
           const { id } = column
+          this.active = '/info/list'
           this.columnActive = id
           this.$router.push(`/info?parentId=${id}&name=${column.name}`)
         }
@@ -147,6 +148,11 @@ export default {
         color: $main-color;
         border-bottom-color: $main-color;
     }
+    &:hover {
+      .children {
+        display: flex;
+      }
+    }
   }
   .children {
     position: absolute;
diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue
index 1678b25..c423b46 100644
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@@ -43,8 +43,8 @@
                     <div class="desc-wrap">
                         <div class="desc" :class="{active: desShrink}" v-html="description"></div>
                         <i class="arrow" :class="{active: desShrink}" v-if="description && description.length > 40">
-                            <span>...</span>
-                            <img src="@/assets/img/arrow-down.png" alt="" @click="desShrink = !desShrink">
+                            <!-- <span>...</span> -->
+                            <i class="el-icon-arrow-down" @click="desShrink = !desShrink"></i>
                         </i>
                     </div>
                     <div class="chapters">
@@ -313,6 +313,7 @@ $height: 700px;
     }
     .desc-wrap{
         position: relative;
+        width: 250px;
         .desc{
             font-size: 14px;
             color: #fff;
@@ -326,24 +327,24 @@ $height: 700px;
         .arrow{
             position: absolute;
             bottom: 2px;
-            right: 0;
+            right: -30px;
             display: flex;
             justify-content: space-between;
-            width: 46px;
-            background-color: #fff;
+            width: 30px;
+            background-color: #252528;
             span{
                 font-size: 14px;
-                color: rgba(0, 0, 0, 0.65);
+                color: #fff;
             }
-            img{
-                width: 16px;
-                cursor: pointer;
+            i{
+              color: #fff;
+              cursor: pointer;
             }
             &.active{
                 span{
                     opacity: 0;
                 }
-                img{
+                i{
                     transform: rotate(180deg);
                 }
             }
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 36bb54b..b3943f1 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import axios from 'axios'
 export default {
     data() {
         return {
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index f737ac2..3a93b0c 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -85,7 +85,7 @@
         </div>
 
         
-        <el-dialog title="请选择项目" :visible.sync="projectVisible" width="828px" custom-class="project-dia" :close-on-click-modal="false">
+        <el-dialog title="请选择项目" v-loading="loading" :visible.sync="projectVisible" width="828px" custom-class="project-dia" :close-on-click-modal="false">
           <ul class="projects">
             <li v-for="(item, i) in projects" :key="i" :class="{active: curProject == item.projectId}" @click="selectProject(item)">
               <img src="@/assets/img/project.png" alt="">
@@ -356,11 +356,12 @@ export default {
           util.cookies.set('courseId', this.courseId)
           util.cookies.set('curriculumName', escape(this.curriculumName))
           util.cookies.set('systemId', id)
+          util.cookies.set('fromManager', '', -1)
           // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
           location.href = process.env.NODE_ENV === 'development' ?
             `http://${location.hostname}:8085/#/` :
             Setting.isPro ?
-              'https://www.occupationlab.com/pyTrials' :
+              `https://${location.hostname}/pyTrials` :
               `${location.origin}/pyTrials`
         },
         // 进入子系统
@@ -632,10 +633,9 @@ $height: 700px;
   overflow: auto;
   li {
     display: inline-flex;
-    justify-content: center;
     align-items: center;
     width: 238px;
-    padding: 16px 0;
+    padding: 16px;
     margin: 0 20px 20px 0;
     background-color: #F6F8FA;
     border-radius: 16px;
diff --git a/src/setting.js b/src/setting.js
index 5bb24d2..bcdd32a 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -20,7 +20,8 @@ if (isPro) {
 } else if (isDev) {
     // 本地
     systemPath = `http://${location.hostname}:8093`
-    host = "http://121.37.12.51/"; // 中台测试服
+    host = "http://121.37.12.51/"; // 测试服
+    // host = 'https://www.occupationlab.com/' // 正式服
     // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.137:9000/"; // 赓
 }