-- bug

2025-12-10 11:26:45 +08:00 · 2023-01-12 01:37:28 +08:00
parent f8068bb712
commit c04574fc40
8 changed files with 46 additions and 57 deletions
--- a/.env
+++ b/.env
@@ -2,7 +2,9 @@
 VUE_APP_BASE=/manage
 # api项目基础url
 VUE_APP_BASE_API=/manageApi
-# 导出url
+#文件路径
+VUE_APP_FILE_PATH=/file/
+# 代理url 本地调试，不可以用在其他地方
 VUE_APP_PROXY_URL=http://111.231.196.214/manageApi
 # 登录url
 VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
@@ -19,4 +21,5 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loading
 # 课程二维码
 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=
 # 导入学员模板
-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩 模板-1673450632417.xlsx
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673452888323.xlsx
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -51,18 +51,19 @@ http.interceptors.response.use(
    (response) => {
        // console.log('response', response)
        const {
-            data: { code, msg },
+            data: {code, msg, show},
        } = response;
-        // console.log('code', code)
+        console.log('code', code)
        if (code === 0 || code === 200) {
            return response;
-        } else {
+        }
        if (code === 1000) {
-                (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+            return Promise.reject(response);
        }
+        show && message.error(msg);
        console.log("api %o", msg);
-        }
-        return response;
+        return Promise.reject(response);
    },
    function (error) {
        if (error.message == "timeout of 1ms exceeded") {
--- a/src/components/Modals/ExportHomeWork.vue
+++ b/src/components/Modals/ExportHomeWork.vue
@@ -66,7 +66,7 @@ export default {
    const downloadHomeWork = () => {
      // props.url
      if (props.downloadUrl) {
-        window.open(props.downloadUrl);
+        window.open(process.env.VUE_APP_FILE_PATH+props.downloadUrl);
      }
    };
    console.log("props", props);
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -18,7 +18,7 @@
      <div class="main">
        <div class="minatitl">
          <div class="up1">请下载</div>
-          <a class="up2" :href="template" style="course: pointer">模板</a>
+          <a class="up2" :href="template" target="_blank" style="cursor: pointer">模板</a>
          <div class="up1">，按要求填写数据并导入</div>
        </div>
        <div class="upload">
@@ -221,10 +221,9 @@ export default {
  setup(props, ctx) {
    const store = useStore();
    const state = reactive({
-      template:
-        process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx",
+      template: process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_STUDENT_TEMPLATE,
      importStudent:
-        process.env.VUE_APP_BASE_API + "admin/student/importStudent",
+        process.env.VUE_APP_BASE_API + "/admin/student/importStudent",
      timers: "", // 定时器，用于清空定时器使用
      isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
      uploadpercent: -1,
@@ -235,11 +234,6 @@ export default {
      errNum: 0, //失败数据数
      downloadErrUrl: "",
      showBottomBar: false, // 显示底部成功条数和失败条数
-      locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://111.231.196.214:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
-
      userId: store.state.userInfo.id,
      userName: store.state.userInfo.realName,
      fileName: "",
@@ -337,9 +331,8 @@ export default {

    // 下载失败数据
    const downloadEeeorData = () => {
-      console.log(state.locationHref + state.downloadErrUrl);
      if (state.downloadErrUrl !== "") {
-        window.open(state.locationHref + state.downloadErrUrl);
+        window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
      }
    };

--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -20,7 +20,7 @@
      <div class="main">
        <div class="minatitl">
          <div class="up1">请下载</div>
-          <div class="up2">模板</div>
+          <div class="up2" @click="downTemplate" style="cursor:pointer">模板</div>
          <div class="up1">，按要求填写数据并导入</div>
        </div>
        <div class="upload">
@@ -352,15 +352,19 @@ export default {
    const downloadEeeorData = () => {
      console.log(state.locationHref + state.downloadErrUrl);
      if (state.downloadErrUrl !== "") {
-        window.open(state.locationHref + state.downloadErrUrl);
+        window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
      }
    };
+    function downTemplate(){
+      window.open(process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE)
+    }

    return {
      ...toRefs(state),
      afterVisibleChange,
      closeDrawer,
      handleChange,
+      downTemplate,
      BATCH_IMPORT_SCORE,
      beforeUpload,
      handleUpload,
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -682,19 +682,12 @@ const exportHomeWorkShow = () => {
  api
    .exportHomeWork(obj)
    .then((res) => {
-      console.log("导出作业", JSON.parse(res.data).data);
-      if (JSON.parse(res.data).code === 200) {
+      console.log("导出作业", res.data.data);
      message.destroy();
      message.success("导出作业成功");
      exportHomeWorkV.value = true;
-        downloadUrl.value = JSON.parse(res.data).data;
-      }
+      downloadUrl.value = res.data.data;
    })
-    .catch((err) => {
-      message.destroy();
-      message.error("导出作业失败");
-      console.log("导出作业失败", err);
-    });
 };
 // //导出作业
 // const exportHomeWork = () => {
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -80,7 +80,7 @@
                  <div class="timemanag" style="margin-top: 12px">
                    {{values.createTime?values.createTime:'-'}} {{values.createName?values.createName:'-'}}
                  </div>
-                  <div class="timemanag">来源：{{values.source?values.source:'-'}}</div>
+                  <div class="timemanag">来源：{{{1:'项目',2:'路径图',3:'开课'}[values.type]+'-'+values.name}}</div>
                </div>
              </div>
            </div>
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3067,14 +3067,7 @@ export default defineComponent({
          dataIndex: "evastatus",
          key: "8",
          align: "center",
-          customRender: ({ record }) => {
-            switch (String(record.evalStatus)) {
-              case "0":
-                return "未评估";
-              case "1":
-                return "已评估";
-            }
-          },
+          customRender: ({record}) => record.assessmentStatus ? '已评估' : '未评估'
        },
        {
          title: "作业成绩",
@@ -3085,8 +3078,8 @@ export default defineComponent({
          customRender: ({ record }) => {
            return (
              <div class="racona">
-                {record.workScore ? (
-                  <span>{record.workScore}</span>
+                {record.score ? (
+                  <span>{record.score}</span>
                ) : (
                  <span
                    style={{ color: "#4EA6FF", cursor: "pointer" }}
@@ -3121,16 +3114,17 @@ export default defineComponent({
        {
          title: "考试成绩",
          width: "15%",
-          dataIndex: "evastatus",
+          dataIndex: "examinationScore",
          key: "8",
          align: "center",
        },
        {
          title: "结业状态",
          width: "15%",
-          dataIndex: "evastatus",
+          dataIndex: "completionStatus",
          key: "8",
          align: "center",
+          customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
        },
      ],
      shipType: 1,
@@ -4761,6 +4755,7 @@ export default defineComponent({
    };

    const handleJoin = async () => {
+      state.lrcj_inputV1 || message.error("请输入成绩")
      if (state.rg_hs) {
        if (state.piliang) {
          api1.updateStudent({