Explorar o código

ADD:通过测试类型跳转到对应的测试任务

wjj %!s(int64=4) %!d(string=hai) anos
pai
achega
0d33a02ac2

+ 7 - 5
src/pages/DetailPage/TestTypeDetail.vue

@@ -2,9 +2,10 @@
   <div class="home-wrapper">
     <div class="container" style="margin: 20px auto;">
       <div class="create-body" v-for="item in fields">
-        <div class="title h2">{{item.name}}<button onclick="goToTask(item.type)">相关任务</button></div>
+        <div class="title h2">
+          <span style="display: inline-block;margin-right: 20px">{{item.name}}</span>
+          <el-button @click="goToTask(item.code)" type="primary" size="mini">相关任务</el-button></div>
         <div class="h3">{{item.introduction}}</div>
-
       </div>
     </div>
   </div>
@@ -25,11 +26,12 @@
             setFields(){
                 getAllServiceTypes().then((res) => {
                     this.fields = res
-                    console.log(res);
                 })
             },
-            goToTask(){
-
+            goToTask(testType){
+              console.log(testType)
+              //type=1 表示是从测试类型跳转过去的
+                this.$router.push({path:'/square',query:{type:testType}})
             }
         },
         mounted() {

+ 0 - 2
src/pages/Homepage/Homepage.vue

@@ -48,7 +48,6 @@
           <LoginCard v-if="HOME_DISPLAY.login_card"/>
           <PopularTask :hotCrowdTaskVOs="homeData.taskList" v-if="HOME_DISPLAY.hot_task"/>
           <HotCrowd :applicationTypeRank="homeDataNoCache.applicationTypeRank" v-if="HOME_DISPLAY.hot_crowd"/>
-          <PopularTask></PopularTask>
           <HotAgency :agencyRank="homeDataNoCache.agencyRank" v-if="HOME_DISPLAY.hot_agency"/>
           <HotUser :userRank="homeDataNoCache.userRank" v-if="HOME_DISPLAY.hot_user"/>
           <HotContest :competitionList="homeData.competitionList" v-if="HOME_DISPLAY.hot_contest"/>
@@ -84,7 +83,6 @@ import RankingCard from './RankingCard'
 import HotContest from './HotContest'
 import PopularTask from '../Square/PopularTask'
 import PopularProject from '../Square/PopularProject'
-import PopularTask from '../Square/PopularTask'
 import Http from '@/js/http.js'
 import {mapGetters} from 'vuex'
 import Waterfall from 'vue-waterfall/lib/waterfall'

+ 1 - 2
src/pages/Square/PopularTask.vue

@@ -5,7 +5,7 @@
       <span class="popular-header-title">热门任务</span>
       <el-button style="float: right; padding: 3px 0" type="text" class="pull-right"  @click="goToMore()">more>></el-button>
     </div>
-    <div v-if="!hotCrowdTaskVOs.length" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
+    <div v-if="!hotCrowdTaskVOs" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
     <div class="popular-list" v-else>
       <el-row class="popular-list-item" v-for="item in hotCrowdTaskVOs" :key="item.id">
         <el-col :span="19">
@@ -42,7 +42,6 @@
     },
       methods:{
           goToMore(){
-              console.log("goToMoreTask");
               this.$router.push({
                   name: 'PopularProjectAndTaskList',
                   params: {type: "task"}

+ 15 - 1
src/pages/Square/Square2.0.vue

@@ -182,6 +182,14 @@
           })
       },
 
+      getTestTask(type) {
+        Http.get(`/api/square/task/${type}`).then((res)=>{
+          this.projectAndTaskArr = res.data.crowdTestTaskVOS;
+          this.hotCrowdTestProjectVOs = res.data.hotCrowdTestProjectVOs;
+          this.hotCrowdTaskVOs = res.data.hotCrowdTaskVOs;
+        })
+      },
+
       getHotData(){
           Http.get('/api/square/list').then((res)=>{
               this.hotCrowdTestProjectVOs = res.data.hotCrowdTestProjectVOs;
@@ -230,8 +238,14 @@
       }
     },
     mounted() {
+      const {type} = this.$route.query;
+      if(type){
+        this.$nextTick(()=>this.currTab = 'task')
+        this.getTestTask(type);
+      }else{
+        this.loadData();
+      }
       this.setUserInfo();
-      this.loadData();
     }
   }
 </script>