feat:合并

.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
+
 

.env.prod

@@ -1,3 +1,5 @@
 NODE_ENV=prod
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
+
+VUE_APP_BOE_API_URL=https://u-pre.boe.com

.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

.env.test

@@ -1,3 +1,5 @@
 NODE_ENV=test
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
+
+VUE_APP_BOE_API_URL=https://u-pre.boe.com

package-lock.json

@@ -18,6 +18,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",
@@ -3927,6 +3928,14 @@
         "node": "*"
       }
     },
+    "node_modules/bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -7285,6 +7294,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -14864,6 +14881,11 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true
     },
+    "bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -17566,6 +17588,14 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
+    "json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "requires": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",

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",

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,36 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    console.log('token', getCookie('token'))
+    url = process.env.VUE_APP_BOE_API_URL + url
-    return axios({
+    return fetch(url,{
-        url,
         method,
-        headers: {
+        headers:{
             token: getCookie('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '',
+        ...method !== 'get' ? {body: JSON.stringify(body)} : {}
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+    }).then(res=>{
-    }).then(resp => resp.data).then(response => {
+        return res.text()
-        console.log(response)
+    }).then(res=>{
-        // if (response.status !== 200 && response.code !== 0) {
+        return JSONBigIntStr.parse(res)
-        //     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'})
     })
+    // 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'})
+    // })
 }

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;

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" :stage="stage"></TableStudent>
         </a-tab-pane>
             <!--1211注释 待开放
         <a-tab-pane key="4" tab="设置">
@@ -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

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();

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;