实验台

src/api/index.js

@@ -22,6 +22,8 @@ export default {
     getProjectBySystemId: 'occupationlab/occupationlab/projectManage/getProjectBySystemId',
     getTheMostRecentlyRunProject: 'python/python/getTheMostRecentlyRunProject',
     whetherToRenewTheFee: 'nakadai/nakadai/curriculum/whetherToRenewTheFee',
+    recentUse: `nakadai/nakadai/curriculum/recentUse`,
+    recordRecentUsage: `nakadai/nakadai/curriculum/recordRecentUsage`,
 
     // 权限管理
     getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`,

src/pages/assessment/list/index.vue

@@ -115,14 +115,6 @@
         <div class="pagination">
             <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="pageNum"></el-pagination>
         </div>
-
-        <!-- 购买弹框 -->
-        <el-dialog title="温馨提示" :visible.sync="buyVisible" width="420px" center :close-on-click-modal="false">
-          <div class="buy">
-            <p class="tips">该课程订阅期限已到期，请联系院校管理员续费</p>
-            <img src="@/assets/img/wechat-code.jpeg" alt="">
-          </div>
-        </el-dialog>
     </div>
 </template>
 
@@ -195,7 +187,6 @@ export default {
             multipleSelection: [], // 多选
             listLoading:false,// 列表加载
             ticker: null, // 倒计时定时器
-            buyVisible: false
         };
     },
     computed: {
@@ -329,32 +320,22 @@ export default {
                 console.log(err);
             });
         },
-        // 查询是否过期
-        async getStatus(cid) {
-          const res = await this.$get(this.api.whetherToRenewTheFee, {
-            cid
-          })
-          this.buyVisible = !res.isRenew
-          // 1正常显示资源，0显示续费
-          return res.isRenew
-        },
         add() {
             this.$router.push("add");
         },
         edit(row) {
-          this.getStatus(row.curriculumId) && this.$router.push(`add?id=${row.id}`);
+            this.$router.push(`add?id=${row.id}`);
         },
         show(row) {
             this.$router.push(`/achievement/teach?id=${row.id}&projectName=${row.projectName}&permissions=1`)
         },
         start(row) {
-          this.getStatus(row.curriculumId) &&
             this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(res => {
                 util.successMsg("启动成功！");
                 this.getData(1);
             }).catch(err => {
                 console.log(err);
-            })
+            });
         },
         finish(row) {
             this.$confirm("确定要提前结束吗？", "提示", {
@@ -434,14 +415,4 @@ export default {
 .el-radio.is-bordered + .el-radio.is-bordered {
     margin-left: 0;
 }
-.buy {
-  text-align: center;
-  .tips {
-    margin-bottom: 10px;
-    font-size: 14px;
-  }
-  img {
-    width: 85%;
-  }
-}
 </style>

src/pages/station/list/index.vue

@@ -10,6 +10,10 @@
         </div>
         <div class="station">
           <div class="inner">
+            <div class="tab">
+              <a class="item" v-for="(item, i) in tabs" :key="i" :class="{active: item.id == active}" @click="tabChange(item)">{{ item.name }}</a>
+            </div>
+            <div class="curs">
               <template v-if="curriculumList.length">
                 <template v-for="(item,index) in curriculumList">
                     <div class="item" :title="item.curriculumName" @click="goPreview(item)" :key="index" v-if="!keyword || item.curriculumName.includes(keyword)">
@@ -30,6 +34,7 @@
             </div>
           </div>
         </div>
+    </div>
 </template>
 
 <script>
@@ -38,6 +43,17 @@ export default {
     data() {
         return {
             keyword: "",
+            active: 0,
+            tabs: [
+              {
+                id: 0,
+                name: '实验课程'
+              },
+              {
+                id: 1,
+                name: '最近使用'
+              }
+            ],
             curriculumList: []
         }
     },
@@ -46,6 +62,13 @@ export default {
     },
     methods: {
         getschoolCourse() { // 获取课程列表
+          this.active ?
+            this.$post(this.api.recentUse, {
+              pageNum: 1,
+              pageSize: 100
+            }).then(({ page }) => {
+                this.curriculumList = page.records
+            }).catch(err => {}) :
             this.$get(this.api.schoolCourse).then(res => {
                 this.curriculumList = res.data;
             }).catch(err => {
@@ -55,6 +78,11 @@ export default {
         goPreview(item) {
             this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.curriculumName}`);
         },
+        // tab切换
+        tabChange(item) {
+          this.active = item.id
+          this.getschoolCourse()
+        },
     }
 };
 </script>
@@ -96,17 +124,39 @@ export default {
     }
 }
 
+.tab {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .item {
+        padding: 0 20px;
+        margin-right: 16px;
+        font-size: 17px;
+        text-align: center;
+        color: #333;
+        line-height: 50px;
+        border-bottom: 3px solid transparent;
+        cursor: pointer;
+        &.active {
+            color: #007EFF;
+            border-color: #007EFF;
+        }
+    }
+}
 .station {
     min-height: calc(100vh - 520px);
     background: url(../../../assets/img/station1.png) (top left)/auto no-repeat,
                 url(../../../assets/img/station2.png) bottom right/auto no-repeat;
     .inner {
+      width: 1072px;
+      margin: 0 auto;
+    }
+    .curs {
         display: flex;
         flex-wrap: wrap;
         width: 1072px;
         padding-top: 60px;
         margin: 0 auto;
-    }
         .item {
             position: relative;
             padding: 0 10px;
@@ -153,6 +203,7 @@ export default {
             }
         }
     }
+}
 .empty{
   display: flex;
   justify-content: center;

src/pages/station/preview/index.vue

@@ -166,6 +166,7 @@ export default {
         this.insertScript();
         this.getData();
         this.getStatus()
+        this.addRecord()
     },
     methods: {
         goBack() {
@@ -180,6 +181,10 @@ export default {
             this.assessmentList = data.assessmentConfig;
             this.systemIds = data.systemIds
         },
+        // 记录最近使用
+        addRecord() {
+          this.$post(`${this.api.recordRecentUsage}?cid=${this.courseId}`).then(res => {}).catch(res => {})
+        },
         // 查询是否过期
         getStatus() {
           this.$get(this.api.whetherToRenewTheFee, {

src/setting.js

@@ -26,7 +26,7 @@ if (isPro) {
     uploadURL = `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.151:9000/"; // 榕
     // host = 'http://192.168.31.116:9000/'; // 赓
 }