From 3a4ad2e7af75843d0488e5b1312359259fcc50af Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sat, 17 Dec 2022 21:20:36 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AssessmentList.vue | 1 +
 src/views/learningpath/LevelAddDetail.vue | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue
index 8ae37354..7763bea9 100644
--- a/src/components/drawers/AssessmentList.vue
+++ b/src/components/drawers/AssessmentList.vue
@@ -216,6 +216,7 @@ export default {
           assessmentName: state.inputV1,
           pageNo: state.currentPage,
           pageSize: state.pageSize,
+          searchEndTime:"",
         })
         .then((res) => {
           let arr = res.data.data.rows;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index b2f66dc3..ea31729e 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -500,7 +500,7 @@
             </div>
             <div class="lin"></div>
           </div>
-        -->
+      
           <div class="item" @click="showDrawerAddProj">
             <div class="itcon">
               <div class="img">
@@ -523,6 +523,7 @@
               </div>
             </div>
           </div>
+          -->
         </div>
         <div class="boom">
           <div class="boomcen">
@@ -1059,7 +1060,7 @@ import AddInvist from "../../components/drawers/AddInvist.vue";
 //import AddVote from "../../components/vote/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
-import AddProject from "../../components/drawers/AddProject.vue";
+//import AddProject from "../../components/drawers/AddProject.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
 import * as api from "../../api/indexLevel";
 import { GetRouterDetail } from "../../api/indexTask";
@@ -1091,7 +1092,7 @@ export default {
     draggable,
     // UnlockMode,
     AddFaceteach,
-    AddProject,
+    //AddProject,
   },
   setup() {
     const router = useRouter();

From e840fa2cc1c6921b47fffcf3573d4a32943d8f63 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sat, 17 Dec 2022 21:27:31 +0800
Subject: [PATCH 2/7] merge

---
 src/components/student/TableStudent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 9e5e6572..8e32e182 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -62,7 +62,7 @@
   </div>
 </template>
 <script setup>
-import {computed, defineProps, onMounted, ref, watch} from "vue";
+import {computed, defineProps, onMounted, ref} from "vue";
 import {delStudentList, getStuPage} from "@/api/index1";
 import CommonStudent from '@/components/student/CommonStudent'
 

From 034a75424aa8d1af8ef7e874586b4374ca2d7a02 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 18 Dec 2022 13:49:23 +0800
Subject: [PATCH 3/7] =?UTF-8?q?--=20=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            |  1 +
 src/api/request.js                      | 57 +++++++++++++------------
 src/components/student/TableStudent.vue |  2 +-
 src/views/report/ReportCenter.vue       |  0
 src/views/teacher/TeacherManage.vue     |  0
 5 files changed, 32 insertions(+), 28 deletions(-)
 delete mode 100644 src/views/report/ReportCenter.vue
 delete mode 100644 src/views/teacher/TeacherManage.vue

diff --git a/package.json b/package.json
index f694a453..91c565dd 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "element-resize-detector": "^1.2.4",
     "html2canvas": "^1.4.1",
     "jquery": "^3.6.1",
+    "json-bigint": "^1.0.0",
     "mitt": "^3.0.0",
     "moment": "^2.29.4",
     "qrcode.vue": "^3.3.3",
diff --git a/src/api/request.js b/src/api/request.js
index cc035bf9..63628a19 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,8 +1,8 @@
 import {reactive, ref, toRefs, watch} from "vue";
-import axios from 'axios';
 import {getCookie} from "@/api/method";
+import JSONBigInt from 'json-bigint';
 
-
+const JSONBigIntStr = JSONBigInt({ storeAsString: true });
 export function useBoeApiPage(_url, params = {}, config = {
     init: true,
     result: res => res.result,
@@ -23,6 +23,8 @@ export function useBoeApiPage(_url, params = {}, config = {
         console.log('params', params)
         state.loading = true
         return request(_url, params).then(r => {
+            console.log(2222222222222)
+            console.log(r)
             state.data = config.result(r)
             state.totalPage = config.totalPage(r)
             state.total = config.total(r)
@@ -136,34 +138,35 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    console.log('token', getCookie('token'))
-    return axios({
-        url,
+    return fetch(url,{
         method,
-        headers: {
+        headers:{
             token: getCookie('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '',
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
-    }).then(resp => resp.data).then(response => {
-        console.log(response)
-        // if (response.status !== 200 && response.code !== 0) {
-        //     if (response.code === 3 || response.code === 4 || response.code === 100) {
-//                router.push({path: '/login'})
-//                 return
-//             } else {
-//                response.showMsg &&  notification.open({
-//                    message: response.showMsg,
-//                    duration: 2,
-//                });
-//                 return
-//             }
-//         }
-        return response
-    }).catch(e => {
-        console.log(2222)
-        console.log(e)
-        // router.push({path: '/login'})
+        ...method !== 'get' ? {body: JSON.stringify(body)} : {}
+    }).then(res=>{
+        return res.text()
+    }).then(res=>{
+        return JSONBigIntStr.parse(res)
     })
+    // return axios({
+    //     url,
+    //     method,
+    //     headers: {
+    //         token: getCookie('token'),
+    //         ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+    //     },
+    //     baseURL: '',
+    //     ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+    // }).then(resp => {
+    //     return resp.data
+    // }).then(response => {
+    //     console.log(response)
+    //     return response
+    // }).catch(e => {
+    //     console.log(2222)
+    //     console.log(e)
+    //     // router.push({path: '/login'})
+    // })
 }
\ No newline at end of file
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 9e5e6572..8e32e182 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -62,7 +62,7 @@
   </div>
 </template>
 <script setup>
-import {computed, defineProps, onMounted, ref, watch} from "vue";
+import {computed, defineProps, onMounted, ref} from "vue";
 import {delStudentList, getStuPage} from "@/api/index1";
 import CommonStudent from '@/components/student/CommonStudent'
 
diff --git a/src/views/report/ReportCenter.vue b/src/views/report/ReportCenter.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/teacher/TeacherManage.vue b/src/views/teacher/TeacherManage.vue
deleted file mode 100644
index e69de29b..00000000

From a19b1afe6960cb55d876ad6fdf16dac63811b6dd Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 18 Dec 2022 16:31:19 +0800
Subject: [PATCH 4/7] -- bug

---
 src/views/learningpath/LevelAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 7342bdd8..f14801b9 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -505,7 +505,7 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="3" tab="学员管理" force-render>
-          <TableStudent :type="3" :id="routerId"></TableStudent>
+          <TableStudent :type="2" :id="routerId"></TableStudent>
         </a-tab-pane>
             <!--1211注释 待开放  
         <a-tab-pane key="4" tab="设置">

From bf1d3a70e3cf2f45492b6789ca3b3f557a9a1baa Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 18 Dec 2022 17:00:06 +0800
Subject: [PATCH 5/7] -- bug

---
 src/views/learningpath/LevelAdd.vue  | 28 +++++++++++++++-------------
 src/views/projectcenter/TaskPage.vue |  2 --
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f14801b9..adb871c6 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -15,10 +15,10 @@
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
-        /> 
+        />
         <div v-if="action == 1 || action == 0" class="line"></div>-->
         <div class ="pubIcon" v-if="action == 1 || action == 0"  @click="pubIcon(action)">
-        <img  
+        <img
           class="img2"
           src="../../assets/images/leveladd/pub.png"
         />
@@ -505,15 +505,15 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="3" tab="学员管理" force-render>
-          <TableStudent :type="2" :id="routerId"></TableStudent>
+          <TableStudent :type="2" :id="routerId" :stage="stage"></TableStudent>
         </a-tab-pane>
-            <!--1211注释 待开放  
+            <!--1211注释 待开放
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
 
           <a-tabs>
-      
-         
+
+
             <a-tab-pane key="1" tab="基本信息">
               <div class="sametab">
                 <div class="Gcon">
@@ -537,7 +537,7 @@
                           :disabled="number"
                           v-model:checked="previewSelect"
                         ></a-checkbox>
-                    
+
                         <span class="yulan">预览其他关卡</span><br />
                         <div style="width: 10px; height: 4px"></div>
                         <div style="display: flex; align-items: center">
@@ -574,7 +574,7 @@
                           :disabled="number"
                           v-model:checked="studySelect"
                         ></a-checkbox>
-                  
+
                         <span class="yulan">学习其他关卡</span><br />
                         <div style="width: 10px; height: 4px"></div>
                         <div style="display: flex; align-items: center">
@@ -611,7 +611,7 @@
                 </div>
               </div>
             </a-tab-pane>
-       
+
 
             <a-tab-pane key="2" tab="共享文档">
               <div class="sametab">
@@ -655,8 +655,8 @@
                         <span style="color: #999999">
                           支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
                         </span>
-                      </div> 
-                    
+                      </div>
+
                       <div
                         v-for="item in fileList"
                         :key="item.uid"
@@ -705,7 +705,7 @@
    -->
 
       </a-tabs>
-  
+
       <a-modal
         style="padding: 0"
         :closable="sh"
@@ -1135,6 +1135,7 @@ export default {
     const router = useRouter();
     // const store = useStore();
     const state = reactive({
+      stage: [],
       routerId: storage.get("routerId")
         ? JSON.parse(storage.get("routerId"))
         : null, //学习路径页面传的学习路径id
@@ -1867,6 +1868,7 @@ export default {
             state.nodata = false;
           }
           let data = res.data.data.chapterList;
+          state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name}))
           state.taskSyllabus = data;
           // for(let i in data) {
           //   state.taskSyllabus[i].name = data[i].name
@@ -4261,6 +4263,6 @@ export default {
     }
   }
 
-         
+
 }
 </style>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 0bd959c9..ce26f4c2 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3357,8 +3357,6 @@ export default {
              */
           }
           state.stage = res.data.data.stageList.map(e => ({id: e.stageId, name: e.name}))
-          console.log(1111111111111)
-          console.log(state.stage)
           let info = res.data.data.projectInfo;
           // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
           let start = info.beginTime;

From ac62da7d5cd01d92b5c39de2b1f9729af50a0a67 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 18 Dec 2022 17:18:19 +0800
Subject: [PATCH 6/7] -- bug

---
 src/api/request.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/request.js b/src/api/request.js
index 63628a19..7f7d83ca 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -138,6 +138,7 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
+    url = process.env.VUE_APP_BOE_API_URL + url
     return fetch(url,{
         method,
         headers:{

From 29faef7d52da12e38a2098392fe32c8a2b3ee282 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 18 Dec 2022 20:44:43 +0800
Subject: [PATCH 7/7] -- bug

---
 .env.boe     | 2 ++
 .env.prod    | 4 +++-
 .env.release | 2 ++
 .env.test    | 4 +++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.env.boe b/.env.boe
index 4775dcca..2afea7c4 100644
--- a/.env.boe
+++ b/.env.boe
@@ -2,4 +2,6 @@ NODE_ENV=boe
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
 
+VUE_APP_BOE_API_URL=https://u-pre.boe.com
+
 
diff --git a/.env.prod b/.env.prod
index e27ae2ff..d1875375 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,3 +1,5 @@
 NODE_ENV=prod
 VUE_APP_BASE=/manage
-VUE_APP_BASE_API=/manageApi
\ No newline at end of file
+VUE_APP_BASE_API=/manageApi
+
+VUE_APP_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.release b/.env.release
index d08feee0..b8513712 100644
--- a/.env.release
+++ b/.env.release
@@ -3,6 +3,8 @@ VUE_APP_BASE=/manage-release
 VUE_APP_BASE_API=/manageApi-release
 VUE_APP_LOGIN_URL=https://u.boe.com/web
 
+VUE_APP_BOE_API_URL=https://u.boe.com
+
 
 VUE_APP_IFRAME_URL=https://u.boe.com/pc-release/iframe
 VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 91608a91..77826102 100644
--- a/.env.test
+++ b/.env.test
@@ -1,3 +1,5 @@
 NODE_ENV=test
 VUE_APP_BASE=/manage
-VUE_APP_BASE_API=/manageApi
\ No newline at end of file
+VUE_APP_BASE_API=/manageApi
+
+VUE_APP_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file