deepsea 1 year ago
parent
commit
033de659da

+ 2 - 1
src/store/modules/task/mutations.js

@@ -13,10 +13,11 @@ export default {
   },
   setTaskList(state, taskList) {
     console.log('setTaskList',taskList);
-    taskList.forEach((task) => {
+    taskList.forEach((task, i) => {
       if(!state.taskList.some(t => t.id == task.id)) {
         task.checked = false;
         task.itemtype = 2;
+        i % 2 == 0 ? (task.auto = true) : (task.auto = false)
         state.taskList.push(task)
       }
     });

+ 15 - 0
src/views/ordinaryPage/index.less

@@ -209,6 +209,10 @@
       font-weight: 400;
       color: #fbfbfb;
       line-height: 4.17vh;
+      width: 150px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
     .item-description {
       margin-top: 0.37vh;
@@ -356,4 +360,15 @@
 }
 .panel-bottom {
 
+}
+
+.task-auto {
+  width: 50px;
+  height: 26px;
+  background: #F96262;
+  border-radius: 44px 44px 44px 44px;
+  opacity: 1;
+  color: #fff;
+  text-align: center;
+  margin-left: 10px;
 }

+ 26 - 7
src/views/ordinaryPage/index.vue

@@ -221,7 +221,7 @@
 
         <div class="ordinary-list">
             <TabList :tabs="tabs" :itemRender="itemRender" :taskRender="taskRender" :issueRender="issueRender" :planList="planList" :caseList="caseList" :planName="planName" :taskName="taskName" :caseName="caseName"
-            :is-show-plan-list="isShowPlanList" :is-show-task-list="isShowTaskList" :is-show-case-list="isShowCaseList" :is-show-case-detail="isShowCaseDetail" :clickBackToTaskList="clickBackToTaskList" 
+            :is-show-plan-list="isShowPlanList" :is-show-task-list="isShowTaskList" :is-show-case-commit="isShowCaseCommit" :is-show-case-list="isShowCaseList" :is-show-case-detail="isShowCaseDetail" :clickBackToTaskList="clickBackToTaskList" 
             :clickBackToPlanList="clickBackToPlanList" :selectRowPlan="selectRowPlan" :caseProject="caseProject" 
             :caseActive="caseActive" :caseFunction="caseFunction" caseContent="caseContent" 
             :caseSubFunction="caseSubFunction" :caseMarket="caseMarket" :caseLanguage="caseLanguage" v-if="renderBenchList" 
@@ -248,6 +248,7 @@
     import webSocket from "../../service/ws";
 
     const ws = new webSocket();
+    let that = null;
     export default {
         components: {StatusBar, TabList, SearchBar, Dropdown,TableComponent,BenchDetail},
         data() {
@@ -259,6 +260,7 @@
                 isShowPlanList: false,
                 isShowCaseList: false,
                 isShowCaseDetail: false,
+                isShowCaseCommit: false,
                 taskName: '',
                 planName: '',
                 caseName: '',
@@ -425,6 +427,7 @@
             //}, 1500)
         },
         async mounted() {
+            that = this;
             let mapDom = document.getElementsByClassName('ordinary-map')[0]
             let style = getComputedStyle(mapDom);
             let width = parseFloat(style.width);
@@ -571,12 +574,25 @@
                 }
                 this.isOpen = false;
             },
-            handleClickTask(taskId) {
-              this.$store.dispatch('planList/fetchPlanList', {
+            handleClickTask(taskId, auto) {
+              that.$store.dispatch('planList/fetchPlanList', {
                 page_num: 1,
                 page_size: 100,
-                task_id: taskId
+                task_id: ""
               })
+              if (auto) {
+                that.isShowCaseCommit = true;
+                that.isShowPlanList = false;
+              } else {
+                that.$store.dispatch('caseList/fetchCaseList',{
+                    uuid: taskId,
+                    page_num: 1,
+                    page_size: 100
+                })
+                that.isShowPlanList = false;
+                that.isShowCaseList = true;
+                that.planName = '< ' + "";
+              }
               console.log(taskId, '任务id');
             },
             handleClickIssue(issueId) {
@@ -690,15 +706,18 @@
               
             },
             taskRender(item) {
-              return `<div class="item-box" style="display:flex;align-items: top; justify-content: space-between;" onClick="handleClickTask('${item.uuid || item.id}')">
+              return `<div class="item-box" style="display:flex;align-items: top; justify-content: space-between;">
                     <div class="left">
-                        <div class="item-title">${item.name}</div>
+                        <div style="display:flex;align-items: center;">
+                          <div class="item-title">${item.name}</div>
+                          <div class="task-auto" style="display:${item.auto ? 'block': 'none'}">Auto</div>
+                        </div>
                         <div class="item-tag">
                             <div class="tag">3b</div>
                             <div class="tag">MHIS_AS_AU_E4235</div>
                         </div>
                     </div>
-                    <div class="taskBtn">To Do</div>
+                    <div class="taskBtn" onClick="handleClickTask('${item.uuid || item.id}', '${item.auto}')">To Do</div>
                 </div>`
             },
             issueRender(item) {