deepsea 1 year ago
parent
commit
79a4e17c0a
2 changed files with 45 additions and 3 deletions
  1. 33 1
      src/components/TabList/index.vue
  2. 12 2
      src/views/ordinaryPage/index.vue

+ 33 - 1
src/components/TabList/index.vue

@@ -150,7 +150,10 @@
             <el-button class="done-button">Done</el-button>
         </div>
         <div class="case task-item" v-if="isShowCaseDetail && isShowTaskList===false">
-            <div>{{caseName}}</div>
+          <div class="go-back">
+              <div class="el-icon-arrow-left" @click="clickBackToPlan"></div>
+              <div>{{ caseName }}</div>
+            </div>
             <div class="task-title">Precondition</div>
             <!--<div class="task-content">{{caseActive}}</div>
             <div class="task-title">{{caseFunction}}</div>-->
@@ -251,6 +254,7 @@ export default {
     selectRowPlan: Function,
     selectRowCase: Function,
     isShowIssueList: Boolean,
+    clickBackToPlan: Function
 
   },
   data() {
@@ -277,6 +281,10 @@ export default {
 </script>
 
 <style scoped lang="less">
+
+.case.task-item {
+  color: #fff;
+}
 .go-back {
   color: #fff;
   display: flex;
@@ -619,5 +627,29 @@ export default {
   background-repeat: no-repeat;
 }
 
+.task-title {
+  color: #72C5FF;
+  font-size: 24px;
+}
+
+.task-content {
+  margin-top: 10px;
+  margin-bottom: 20px;
+}
+
+.done-button {
+  width: 11.6vw;
+  height: 4.25vh;
+  line-height: 4.25vh;
+  background: linear-gradient(180deg, #83cbfb 0%, #2e74b2 100%);
+  border-radius: 67px 67px 67px 67px;
+  opacity: 1;
+  border: 1px solid rgba(255, 255, 255, 0.4);
+  color: #fff;
+  padding: 0;
+  position: absolute;
+  bottom: 1.75vh;
+  right: 15px;
+}
 
 </style>

+ 12 - 2
src/views/ordinaryPage/index.vue

@@ -225,7 +225,7 @@
             :clickBackToPlanList="clickBackToPlanList" :selectRowPlan="selectRowPlan" :caseProject="caseProject" 
             :caseActive="caseActive" :caseFunction="caseFunction" caseContent="caseContent" 
             :caseSubFunction="caseSubFunction" :caseMarket="caseMarket" :caseLanguage="caseLanguage" v-if="renderBenchList" 
-            :selectRowCase="selectRowCase" :clickBackToAutoPlanList="clickBackToAutoPlanList" :tabClass="tabClass" :planBack="planBack"></TabList>
+            :selectRowCase="selectRowCase" :clickBackToAutoPlanList="clickBackToAutoPlanList" :tabClass="tabClass" :planBack="planBack" :clickBackToPlan="clickBackToPlan"></TabList>
         </div>
 
         <bench-detail :is-detail-visible="isDetailVisible" :is-remote-btn-visible="isRemoteBtnVisible" :closeDetail="closeDetail" ref="benchdetail" :bench="currentBench"/>
@@ -481,6 +481,14 @@
             this.isShowTaskList = true;
             // this.planList = [];
           },
+          clickBackToPlan() {
+            this.isShowCaseDetail = false;
+            if (sessionStorage.getItem('autoCase') == 0) {
+              this.isShowCaseList = true;
+            } else {
+              this.isShowAutoCaseList = true;
+            }
+          },
           selectRowPlan(id, auto, name){
             console.log(id, 'selectrowdata')
             if (!auto || auto == 'undefined' || auto == 'false') {
@@ -490,12 +498,14 @@
                   page_size: 100
               })
               this.isShowCaseList = true;
+              sessionStorage.setItem('autoCase', 0)
             } else {
               if (id == 109) id = 222; 
               this.$store.dispatch('caseList/fetchAutoCaseList', {
                 planId: id
               })
               this.isShowAutoCaseList = true;
+              sessionStorage.setItem('autoCase', 1)
             }
             
             this.isShowPlanList = false;
@@ -507,7 +517,7 @@
             this.isShowCaseList = false;
             this.isShowCaseDetail = true;
             
-            this.caseName = '< ' + row.m_id;
+            this.caseName = row.m_id;
             this.caseProject = row.precondition
             //this.caseActive =,
             this.caseFunction = row.action;