[SCREEN] order v1->v2 & Order table head

src/components/hk/hkv1.vue

@@ -87,7 +87,7 @@ export default {
       }, 100);
       window.addEventListener("resize", this.handleResize);
 
-      this.clickLogin();
+      // this.clickLogin();
     },
     clickLogin() {
       console.log("this.companyVideoData :>> ", this.companyVideoData);

src/views/historicTaskScreen.vue

@@ -741,7 +741,7 @@ export default {
       myChart8:'',
       myChart9:'',
       scrollTableConfig:{
-        header: ['指令名称', '指令内容', '指令时间','分类', '系统'],
+        header: ['课目名称', '指令内容', '指令时间','分类', '系统'],
         waitTime:1500,
         data: [],
         columnWidth: [80],
@@ -1326,7 +1326,7 @@ export default {
     // 获取任务的指令
     async getinstructList (taskId) {
       let params={}
-      const res = await request(`/dt_screen/rest/v1/order/list/${taskId}`, 'get', params, false)
+      const res = await request(`/dt_screen/rest/v2/order/list/${taskId}`, 'get', params, false)
       const { errorCode, errorMessage, success,data } = res.data;
       if (success) {
         console.log('获取任务的指令', data);

src/views/situationScreen.vue

@@ -747,7 +747,7 @@ export default {
       myChart8:'',
       myChart9:'',
       scrollTableConfig:{
-        header: ['指令名称', '指令内容', '指令时间','分类', '系统'],
+        header: ['课目名称', '指令内容', '指令时间','分类', '系统'],
         waitTime:1500,
         data: [],
         columnWidth: [80],
@@ -1336,7 +1336,7 @@ export default {
     // 获取任务的指令
     async getinstructList (taskId) {
       let params={}
-      const res = await request(`/dt_screen/rest/v1/order/list/${taskId}`, 'get', params, false)
+      const res = await request(`/dt_screen/rest/v2/order/list/${taskId}`, 'get', params, false)
       const { errorCode, errorMessage, success,data } = res.data;
       if (success) {
         console.log('获取任务的指令', data);

src/views/taskScreen.vue

@@ -357,7 +357,7 @@ export default {
       websocketBpmn: null, //建立的连接
       updatekey:'1',
       scrollTableConfig:{
-        header: ['指令名称', '指令内容', '指令时间','分类', '系统'],
+        header: ['课目名称', '指令内容', '指令时间','分类', '系统'],
         waitTime:1500,
         data: [],
         columnWidth: [80],
@@ -555,7 +555,7 @@ export default {
     // 获取任务的指令
     async getinstructList (taskId) {
       let params={}
-      const res = await request(`/dt_screen/rest/v1/order/list/${taskId}`, 'get', params, false)
+      const res = await request(`/dt_screen/rest/v2/order/list/${taskId}`, 'get', params, false)
       const { errorCode, errorMessage, success,data } = res.data;
       if (success) {
         console.log('获取任务的指令', data);
@@ -574,7 +574,10 @@ export default {
     // 切换单位再结合任务id 获取课目课目列表
     async getUnitSubjectList(taskId,unitId){
       let params={}
-      const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/unit/${unitId}`, 'get', params, false)
+      params["taskId"] = taskId
+      params["unitId"] = unitId
+      // const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/unit/${unitId}`, 'get', params, false)
+      const res = await request(`/dt_screen/rest/v2/subject/listByCondition`, 'post', params, false)
       const { errorCode, errorMessage, success,data } = res.data;
       if (success) {
         this.subjectDatas=data
@@ -585,7 +588,10 @@ export default {
     // 切换系统再结合任务id 获取课目课目列表
     async getSystemSubjectList(taskId,systemId){
       let params={}
-      const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/system/${systemId}`, 'get', params, false)
+      params["taskId"] = taskId
+      params["systemId"] = systemId
+      // const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/system/${systemId}`, 'get', params, false)
+      const res = await request(`/dt_screen/rest/v2/subject/listByCondition`, 'post', params, false)
       const { errorCode, errorMessage, success,data } = res.data;
       if (success) {
         this.subjectDatas=data