Browse Source

获取task 列表

57862207 1 year ago
parent
commit
4445af0bd5

+ 6 - 1
src/api/task.js

@@ -12,8 +12,13 @@ export const fetchBenchDetail = (benchId) => {
   });
 };
 
+//export const fetchTaskList = (data) => {
+//  return api("/mantis-test/v1.0.0/mantis/task/list", {
+//    method: "POST",
+//    data,
+//  });
 export const fetchTaskList = (data) => {
-  return api("/mantis-test/v1.0.0/mantis/task/list", {
+  return api("/tts-test/v1.0.0/tts/task/list", {
     method: "POST",
     data,
   });

+ 1 - 0
src/store/modules/plan/actions.js

@@ -4,6 +4,7 @@ export default {
   async fetchPlanList({ commit }, data) {
     try {
       const planList = await planApi.fetchPlanList(data)
+      console.log('planList',planList);
       commit("setPlanList", planList.data.data);
     } catch (err) {
       console.log("error", "服务异常", 1000);

+ 8 - 0
src/store/modules/plan/mutations.js

@@ -15,4 +15,12 @@ export default {
       }
     });
   },
+  setTaskList(state, taskList) {
+    taskList.forEach((task) => {
+      if(!state.taskList.some(p => p.id == task.id)) {
+        task.checked = false;
+        state.taskList.push(task)
+      }
+    });
+  },
 };

+ 4 - 3
src/store/modules/task/actions.js

@@ -20,10 +20,11 @@ export default {
   setBenchImgList({commit}, benchId, img) {
     commit(benchId, img)
   },
-  async fetchTaskList({ commit }) {
+  async fetchTaskList({ commit }, data) {
     try {
-      const taskList = await taskApi.fetchTaskList()
-      commit("setTaskList", taskList.data);
+      const taskList = await taskApi.fetchTaskList(data)
+      //console.log('taskList',taskList.data)
+      commit("setTaskList", taskList.data.data.task_list);
     } catch (err) {
       console.log("error", "服务异常", 1000);
     }

+ 1 - 0
src/store/modules/task/index.js

@@ -8,6 +8,7 @@ export default {
     return {
       myBillings: [],
       allBillings: [],
+      taskList: []
     };
   },
   actions,

+ 19 - 0
src/store/modules/task/mutations.js

@@ -11,4 +11,23 @@ export default {
   addToMyBillings(state, billings) {
     state.myBillings.push(...billings);
   },
+  setTaskList(state, taskList) {
+    console.log('setTaskList',taskList);
+    taskList.forEach((task) => {
+      if(!state.taskList.some(t => t.id == task.id)) {
+        task.checked = false;
+        task.itemtype = 2;
+        state.taskList.push(task)
+      }
+    });
+    console.log('taskList',state.taskList);
+
+    //taskList.forEach((task) => {
+    //  if (task.id) {
+    //    if (!state.taskList.some(b => b.id == task.id)) {
+    //      state.taskList.push(task)
+    //    }
+    //  }
+    //});
+  },
 };

+ 9 - 0
src/views/ordinaryPage/index.vue

@@ -346,6 +346,9 @@
             ...mapState({
               benchList: state => {
                   return state.benchList.benchList;
+              },
+              taskList: state => {
+                  return state.taskList.taskList;
               }
           })
         },
@@ -361,6 +364,10 @@
             window.bmMapItemUnSelect = this.bmMapItemUnSelect.bind(this);
             window.selectBench = this.selectBench.bind(this);
             that.$store.dispatch('benchList/fetchBenchList');
+            that.$store.dispatch('taskList/fetchTaskList',{
+                page_num: 1,
+                page_size: 1000
+            });
             //that.$store.dispatch('planList/fetchPlanList');
             //setInterval(() => {
             //  that.$store.dispatch('benchList/fetchBenchList');
@@ -375,6 +382,7 @@
             //this.getBenchList();
             console.log(this.benchList, 'benchList')
             this.tabs[0].list = this.benchList;
+            this.tabs[1].list = this.taskList;
             setTimeout(()=>
             {
               var readyCount = 0;
@@ -517,6 +525,7 @@
                 });
             },
             handleListDbClick(benchId,itemtype) {
+              console.log('itemtype',itemtype)
               if(itemtype == 2)
               {
                 window.location.href = '/task2?m=8b934420_ZJUb_b6f9';

+ 18 - 4
src/views/task2/list.vue

@@ -11,7 +11,7 @@
                 </el-table>
             </div>
         </div>
-        <div class="plan task-item">
+        <div class="plan task-item" v-if="false">
             <div style="margin-bottom: 1.85vh">< Case Name</div>
             <el-row :gutter="20">
                 <el-col :span=12>
@@ -132,10 +132,24 @@
             })
         },
         created() {
-            this.$store.dispatch('planList/fetchPlanList', {
+            setTimeout(() => {
+              let href = window.location.href;
+              if(href.indexOf('benchid=')!=-1)
+              {
+                let taskid = parseInt(href.substring(href.indexOf('taskid=')+7));
+                console.log('benchid',taskid);
+                this.$store.dispatch('planList/fetchPlanList', {
                 page_num: 1,
-                page_size: 100
-            })
+                page_size: 100,
+                task_id: taskid
+                })
+                this.$store.dispatch('planList/fetchAutoPlanList', {
+                    page_num: 1,
+                    page_size: 100,
+                    task_id: taskid
+                })
+              }
+            }, 200);
         },
         mounted() {
             console.log(this.planList, 'plan-list')

+ 5 - 0
vue.config.js

@@ -24,6 +24,11 @@ module.exports = defineConfig({
         changeOrigin: true, //需要代理跨域
         rewrite: (path) => path.replace(/^\/bmt-test/, ''), //路径重写,把'/api'替换为''
       },
+      '/tts-test': {
+        target: 'http://139.196.158.57:8080', //需要代理的域名,目标域名
+        changeOrigin: true, //需要代理跨域
+        rewrite: (path) => path.replace(/^\/tts-test/, ''), //路径重写,把'/api'替换为''
+      },
     },
   },
 });