修改bug

src/api/workOrderList/index.js

@@ -186,7 +186,6 @@ export async function batchRecordPage(body) {
 }
 
 // 任务列表 班组任务
-
 export async function pageByCurrentCurrentUserTeam(data) {
   const res = await request.get('/aps/assign/pageByCurrentUserTeam', {
     params: data
@@ -196,3 +195,14 @@ export async function pageByCurrentCurrentUserTeam(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+//NC任务列表
+export async function getNCtaskListData(data) {
+  const res = await request.get('/aps/assign/eventPage', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/taskList/index.vue

@@ -16,6 +16,12 @@
           v-if="$hasPermission('mes:taskreport:teamorder')"
         ></el-tab-pane>
 
+        <el-tab-pane
+          label="NC任务"
+          name="4"
+          v-if="$hasPermission('mes:taskreport:teamorder')"
+        ></el-tab-pane>
+
         <!-- <el-tab-pane label="我的任务" name="1"></el-tab-pane>
         <el-tab-pane label="全部任务" name="2"></el-tab-pane> -->
       </el-tabs>
@@ -166,7 +172,8 @@
     listUpdateRealTimeRecord,
     taskManagement,
     transferTasks,
-    pageByCurrentCurrentUserTeam
+    pageByCurrentCurrentUserTeam,
+    getNCtaskListData
   } from '@/api/workOrderList';
   import { revokeWork } from '@/api/manufacture/spreadWorkOrder';
 
@@ -479,7 +486,9 @@
               ? pageByCurrentUser
               : this.tabValue == '2'
               ? pageByCurrentUserLeader
-              : pageByCurrentCurrentUserTeam;
+              : this.tabValue == '3'
+              ? pageByCurrentCurrentUserTeam
+              : getNCtaskListData;
 
           let params = {
             ...where,

vue.config.js

@@ -32,8 +32,8 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.125:18086',
-        target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086', // 赵沙金