feat:合并

2025-12-10 03:16:44 +08:00 · 2022-12-19 10:16:52 +08:00
parent 777b257b1b 29faef7d52
commit 0c7db91d78
13 changed files with 21271 additions and 21226 deletions
--- 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
+

--- a/.env.prod
+++ b/.env.prod
@@ -1,3 +1,5 @@
 NODE_ENV=prod
 VUE_APP_BASE=/manage
-VUE_APP_BASE_API=/manageApi
+VUE_APP_BASE_API=/manageApi
+
+VUE_APP_BOE_API_URL=https://u-pre.boe.com
--- 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
--- a/.env.test
+++ b/.env.test
@@ -1,3 +1,5 @@
 NODE_ENV=test
 VUE_APP_BASE=/manage
-VUE_APP_BASE_API=/manageApi
+VUE_APP_BASE_API=/manageApi
+
+VUE_APP_BOE_API_URL=https://u-pre.boe.com
--- a/package-lock.json
+++ b/package-lock.json
--- 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",
--- 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,36 @@ export async function request(_url, params) {
        }
    }
    const body = method !== 'get' ? params || {} : {}
-    console.log('token', getCookie('token'))
-    return axios({
-        url,
+    url = process.env.VUE_APP_BOE_API_URL + 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'})
+    // })
 }
--- 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;
--- 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="3" :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>
--- 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();
--- 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;
--- a/src/views/report/ReportCenter.vue
+++ b/src/views/report/ReportCenter.vue
--- a/src/views/teacher/TeacherManage.vue
+++ b/src/views/teacher/TeacherManage.vue