feat:登录项目和学习路径导入学员

2025-12-08 10:26:44 +08:00 · 2023-01-11 17:40:28 +08:00
parent 55a64cd6ef aee6d4bbf4
commit 397071c425
24 changed files with 1624 additions and 1484 deletions
--- a/.env
+++ b/.env
@@ -3,11 +3,13 @@ VUE_APP_BASE=/manage
 # api项目基础url
 VUE_APP_BASE_API=/manageApi
 # 导出url
-VUE_APP_PROXY_URL=http://111.231.196.214:30001/
+VUE_APP_PROXY_URL=http://111.231.196.214/manageApi
 # 登录url
 VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
 # boe域名
 VUE_APP_BOE_API_URL=https://u-pre.boe.com
+#打包路径
+VUE_APP_OUTPUT_DIR=./dist

 # iframe嵌套url
 VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe
--- a/.env.alpine
+++ b/.env.alpine
@@ -0,0 +1,2 @@
+NODE_ENV=alpine
+VUE_APP_OUTPUT_DIR=./docker/dist
--- a/.env.test
+++ b/.env.test
@@ -1,5 +1,2 @@
 NODE_ENV=test
-VUE_APP_BASE=/manage
-VUE_APP_BASE_API=/manageApi
-
 VUE_APP_BOE_API_URL=https://u-pre.boe.com
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -0,0 +1,5 @@
+FROM devforth/spa-to-http:latest
+WORKDIR /
+
+ADD ./dist/ .
+EXPOSE 8080
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
    "build:boe": "vue-cli-service build --mode boe",
    "build:release": "vue-cli-service build --mode release",
    "build:prod": "vue-cli-service build --mode prod",
-    "build:test": "vue-cli-service build --mode test"
+    "build:test": "vue-cli-service build --mode test",
+    "build:alpine": "vue-cli-service build --mode alpine"
  },
  "dependencies": {
    "@wangeditor/editor": "^5.1.23",
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.0.3------------");
+		console.log("版本2.0.4------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -58,7 +58,7 @@ http.interceptors.response.use(
            return response;
        } else {
            if (code === 1000) {
-                process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+                (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
            }
            console.log("api %o", msg);
        }
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -31,13 +31,27 @@
                name="uploadFile"
                :multiple="false"
                @change="handleChange"
-                :data=" courseType==1?{
-                  stageId: Number(courseId), 
-                  type: 3
-                }:{
-                  targetId: Number(courseId), 
-                  type: 3
-                }"
+                :data="
+                  courseType == 1
+                    ? {
+                        stageId: Number(courseId),
+                        type: 3,
+                      }
+                    : courseType == 3
+                    ? {
+                        targetId: Number(courseId),
+                        type: 1,
+                      }
+                    : courseType == 4
+                    ? {
+                        targetId: Number(courseId),
+                        type: 2,
+                      }
+                    : {
+                        targetId: Number(courseId),
+                        type: 3,
+                      }
+                "
                :showUploadList="false"
              >
                <p class="ant-upload-drag-icon">
@@ -53,33 +67,61 @@
              <div class="tipz">支持扩展名：.xls/.xlsx</div>
            </div> -->
            <div class="loadstate">
-
-              <div v-if="uploadpercent!==-1" class="loadborder">
+              <div v-if="uploadpercent !== -1" class="loadborder">
                <div class="content">
                  <div class="img"></div>
                  <div class="timebox">
                    <div class="timetop">
                      <div class="tit">京东方商业模型.xls</div>
-                      <div v-if="uploadErr" class="stateloading" style="color:red;">上传失败</div>
-                      <div v-else class="stateloading">{{uploadpercent==100?"上传成功":"正在上传"}}</div>
+                      <div
+                        v-if="uploadErr"
+                        class="stateloading"
+                        style="color: red"
+                      >
+                        上传失败
+                      </div>
+                      <div v-else class="stateloading">
+                        {{ uploadpercent == 100 ? "上传成功" : "正在上传" }}
+                      </div>
                    </div>
                    <div class="prog">
-                      <div class="inprogloading" :style="{width:uploadpercent==-1?0:uploadpercent+'%', background:uploadErr?'#ff7474':'#35ae69'}"></div>
+                      <div
+                        class="inprogloading"
+                        :style="{
+                          width: uploadpercent == -1 ? 0 : uploadpercent + '%',
+                          background: uploadErr ? '#ff7474' : '#35ae69',
+                        }"
+                      ></div>
                    </div>
                  </div>
                  <div class="curloading">
-                    <div class="cur">{{uploadpercent==-1?0:uploadpercent}}%</div>
-                    <div class="cancel" style="margin-left: 20px;cursor: pointer;" @click="removeUpload">删除</div>
+                    <div class="cur">
+                      {{ uploadpercent == -1 ? 0 : uploadpercent }}%
+                    </div>
+                    <div
+                      class="cancel"
+                      style="margin-left: 20px; cursor: pointer"
+                      @click="removeUpload"
+                    >
+                      删除
+                    </div>
                    <div class="cancel" style="margin-left: 15px"></div>
                  </div>
-                  <div v-if="errNum!==0" class="defeat">
-                    <div class="detext" @click="downloadEeeorData">下载失败数据</div>
+                  <div v-if="errNum !== 0" class="defeat">
+                    <div class="detext" @click="downloadEeeorData">
+                      下载失败数据
+                    </div>
                  </div>
                </div>
              </div>
-              <div v-if="showBottomBar" :class="errNum==0?'succebox':'defeatbox'">
+              <div
+                v-if="showBottomBar"
+                :class="errNum == 0 ? 'succebox' : 'defeatbox'"
+              >
                <div class="lefimg"></div>
-                <div class="tacl">{{succNum}}条数据导入成功，{{errNum}}条数据导入失败</div>
+                <div class="tacl">
+                  {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                </div>
              </div>

              <!-- <div class="loadborder">
@@ -169,19 +211,24 @@ export default {
  },
  setup(props, ctx) {
    const state = reactive({
-      template: process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx",
-      importStudent: process.env.VUE_APP_BASE_API + "admin/student/importStudent",
+      template:
+        process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx",
+      importStudent:
+        process.env.VUE_APP_BASE_API + "admin/student/importStudent",
      timers: "", // 定时器，用于清空定时器使用
      isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
      uploadpercent: -1,
      uploadErr: false, //上传失败
      addLoading: false,
-      fileList: [], 
+      fileList: [],
      succNum: 0, //成功数据数
      errNum: 0, //失败数据数
-      downloadErrUrl: '',
+      downloadErrUrl: "",
      showBottomBar: false, // 显示底部成功条数和失败条数
-      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
+      locationHref:
+        location.href.indexOf("http://") !== -1
+          ? "http://111.231.196.214:12016/"
+          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
    });
    const closeDrawer = () => {
      clearInterval(state.timers);
@@ -206,14 +253,14 @@ export default {
    const handleChange = (info) => {
      console.log("info", info);

-      if(info){
-        var FileExt = info.file.name.replace(/.+\./, ""); 
-        if (['xls','xlsx'].indexOf(FileExt.toLowerCase()) === -1){  
+      if (info) {
+        var FileExt = info.file.name.replace(/.+\./, "");
+        if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
          state.fileList = [];
-          state.uploadpercent = -1;          
-          message.destroy()
-          message.error("请上传正确的文件格式")
-          return     
+          state.uploadpercent = -1;
+          message.destroy();
+          message.error("请上传正确的文件格式");
+          return;
        }
      }

@@ -226,59 +273,58 @@ export default {
        console.log(info.file, info.fileList);
      }
      if (status === "done") {
-        console.log('上传成功返回的UUID', info.file.response.data)
-        console.log('上传成功返回的UUID----->', info)
+        console.log("上传成功返回的UUID", info.file.response.data);
+        console.log("上传成功返回的UUID----->", info);
        console.log("我是导入学员接口传递的参数", {
          uploadFile: info.file.originFileObj,
          targetId: props.courseId,
-          type: 3
-        })
+          type: 3,
+        });
        let i = 0;
        state.timers = setInterval(() => {
-            let uid = info.file.response.data;
-            api
-              .getImportStatus(uid)
-              .then((res) => {
-                console.log("查询导入状态", res);
-                if (res.data.code === 200) {
-                  if (res.data.data.status !== "START") {
-                    i++;
-                    if (i === 1) {
-                      message.destroy();
-                      message.success(`${info.file.name}上传成功`);
-                      state.showBottomBar = true;
-                      state.addLoading = false;
-                      state.isAddStudent = true;
-                    }
-                    state.succNum = res.data.data.successNum;
-                    state.errNum = res.data.data.failedNum;
-                    state.downloadErrUrl = res.data.data.url;
-                    clearInterval(state.timers);
+          let uid = info.file.response.data;
+          api
+            .getImportStatus(uid)
+            .then((res) => {
+              console.log("查询导入状态", res);
+              if (res.data.code === 200) {
+                if (res.data.data.status !== "START") {
+                  i++;
+                  if (i === 1) {
+                    message.destroy();
+                    message.success(`${info.file.name}上传成功`);
+                    state.showBottomBar = true;
+                    state.addLoading = false;
+                    state.isAddStudent = true;
                  }
+                  state.succNum = res.data.data.successNum;
+                  state.errNum = res.data.data.failedNum;
+                  state.downloadErrUrl = res.data.data.url;
+                  clearInterval(state.timers);
                }
-              })
-              .catch((err) => {
-                clearInterval(state.timers);
-                state.showBottomBar = true;
-                state.addLoading = false;
-                console.log("查询导入状态失败", err);
-              });
+              }
+            })
+            .catch((err) => {
+              clearInterval(state.timers);
+              state.showBottomBar = true;
+              state.addLoading = false;
+              console.log("查询导入状态失败", err);
+            });
        }, 500);
      } else if (status === "error") {
        state.addLoading = false;
        state.uploadErr = true;
        message.error(`${info.file.name}上传失败`);
      }
-      
    };

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

    //删除
    const removeUpload = () => {
@@ -301,7 +347,7 @@ export default {
      handleChange,
      BATCH_IMPORT_SCORE,
      downloadEeeorData,
-      removeUpload
+      removeUpload,
    };
  },
 };
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -36,7 +36,7 @@
                :showUploadList="false"
                :data="{
                  type: type,
-                  targetid: Number(id),
+                  targetId: Number(id),
                }"
              >
                <p class="ant-upload-drag-icon">
--- a/src/components/drawers/project/ProjectEvalManage.vue
+++ b/src/components/drawers/project/ProjectEvalManage.vue
@@ -4,7 +4,7 @@
    :visible="Evalvisible"
    class="drawerStyle ProjectEvalManage"
    placement="right"
-    width="60%"
+    width="80%"
    @after-visible-change="afterVisibleChange"
  >
    <div class="drawerMain">
@@ -20,7 +20,7 @@
      </div>
      <div class="main">
        <div
-          v-if="datasource.startTime"
+          v-if="datasource.startTime && datasource.endTime"
          class="endtime"
        >
          起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
@@ -35,7 +35,7 @@
              <div class="name">姓名：</div>
              <a-input
                v-model:value="name"
-                style="width: 270px; height: 40px; border-radius: 8px"
+                style="width: 200px; height: 40px; border-radius: 8px"
                placeholder="请输入姓名"
              />
            </div>
@@ -44,12 +44,11 @@
              <div class="select">
                <a-select
                  v-model:value="projectName"
-                  style="width: 270px"
+                  style="width: 200px"
                  placeholder="请选择"
                  :options="projectNameList"
                  @change="selectProjectName"
-                  allowClear
-                  showSearch
+                 
                ></a-select>
              </div>
            </div>
@@ -159,7 +158,7 @@ export default {
      pageSize: 10,
      currentPage: 1,
      tableDataTotal: 0,
-      projectName: "",
+      projectName:undefined,
      projectNameList: [
          {
            id: 1,
@@ -186,9 +185,10 @@ export default {
            title: "工号",
            dataIndex: "studentUserNo",
            key: "studentUserNo",
-            width: 50,
+            width: 60,
            align: "center",
            className: "h head",
+            ellipsis: true,
            customRender: (text) => {
            return (
              <div class="racona">
@@ -203,6 +203,7 @@ export default {
            key: "studentName",
            width: 50,
            align: "left",
+            ellipsis: true,
            className: "h head",
            customRender: (text) => {
            return (
@@ -218,6 +219,7 @@ export default {
            key: "studentDepartName",
            width: 60,
            align: "center",
+            ellipsis: true,
            className: "h",
            customRender: (text) => {
            return (
@@ -233,6 +235,7 @@ export default {
            key: "studentJobName",
            width: 60,
            align: "center",
+            ellipsis: true,
            className: "h",
            customRender: (text) => {
              return (
@@ -248,6 +251,7 @@ export default {
            key: "currentStageName",
            width: 60,
            align: "center",
+           ellipsis: true,
            className: "h",
            customRender: () => {
              return (
@@ -263,7 +267,8 @@ export default {
            key: "endStudyTime",
            width: 60,
            align: "center",
-            className: "h",
+             ellipsis: true,
+          className: "h",
            customRender: (text) => {
            return (
              <div class="racona">
@@ -279,7 +284,8 @@ export default {
            key: "finishStatus",
            width: 60,
            align: "center",
-            className: "h",
+            ellipsis: true,
+           className: "h",
            customRender: (text) => {
              return (
                <div class="racona">
@@ -294,6 +300,7 @@ export default {
            key: "PDFstatus",
            width: 60,
            align: "center",
+           ellipsis: true,
            className: "h",
            customRender: (text) => {
              return (
@@ -311,7 +318,7 @@ export default {
      ctx.emit("update:Evalvisible", false);
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.tabledata = [];
    };
    const afterVisibleChange = (bol) => {
@@ -385,7 +392,7 @@ export default {
      state.tableDataTotalLoading = true;
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      getData();
    }

--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -4,7 +4,7 @@
    :visible="TMvisible"
    class="drawerStyle ProjectExamManage"
    placement="right"
-    width="60%"
+    width="80%"
    @after-visible-change="afterVisibleChange"
  >
    <div class="drawerMain">
@@ -23,7 +23,7 @@
            <div class="name">姓名：</div>
            <a-input
              v-model:value="name"
-              style="width: 270px; height: 40px; border-radius: 8px"
+              style="width: 200px; height: 40px; border-radius: 8px"
              placeholder="请输入姓名"
            />
          </div>
@@ -32,7 +32,7 @@
            <div class="select">
              <a-select
                v-model:value="projectName"
-                style="width: 270px"
+                style="width: 170px"
                placeholder="请选择"
                :options="projectNameList"
                @change="selectProjectName"
@@ -155,7 +155,7 @@ export default {
    const state = reactive({
      name: "",
      open: false,
-      projectName: "",
+      projectName: undefined,
      projectNameList: [
        {
          id: 1,
@@ -185,7 +185,7 @@ export default {
          title: "工号",
          dataIndex: "studentCode",
          key: "studentCode",
-          width: 50,
+          width: 60,
          align: "center",
          className: "h head",
          customRender: (text) => {
@@ -217,6 +217,7 @@ export default {
          key: "studentDepartName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -232,7 +233,8 @@ export default {
          key: "studentJobName",
          width: 60,
          align: "center",
-          className: "h",
+          ellipsis: true,
+            className: "h",
          customRender: (text) => {
            return (
              <div class="racona">
@@ -247,7 +249,8 @@ export default {
          key: "testNumber",
          width: 60,
          align: "center",
-          className: "h",
+          ellipsis: true,
+           className: "h",
          customRender: (text) => {
            return (
              <div class="racona">
@@ -262,6 +265,7 @@ export default {
          key: "score",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -278,6 +282,7 @@ export default {
          key: "finishedTime",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -293,6 +298,7 @@ export default {
          key: "status",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            console.log(text.record.status);
@@ -310,7 +316,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:TMvisible", false);
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.selectedRowKeys = [];
      state.currentPage = 1;
      state.tabledata = [];
@@ -395,7 +401,7 @@ export default {
      state.loadingData = true;
      state.currentPage = 1; 
      state.name = '';
-      state.projectName = '';
+      state.projectName = undefined;
      getData();
    }

--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -30,7 +30,9 @@
                : "-"
            }}
          </div>
-          <div class="endtime" style="margin-left: 64px">签到时间：14:00</div>
+          <div class="endtime" style="margin-left: 64px">
+            签到时间：{{ beginTime }}~{{ endTime }}
+          </div>
        </div>

        <div class="search">
@@ -39,7 +41,7 @@
              <div class="name">姓名：</div>
              <a-input
                v-model:value="name"
-                style="width: 270px; height: 40px; border-radius: 8px"
+                style="width: 200px; height: 40px; border-radius: 8px"
                placeholder="请输入姓名"
              />
            </div>
@@ -62,7 +64,7 @@
              <div class="select">
                <a-select
                  v-model:value="projectName2"
-                  style="width: 160px"
+                  style="width: 200px"
                  placeholder="请选择"
                  :options="projectNameList2"
                  @change="selectProjectName2"
@@ -234,6 +236,7 @@ import SignQR from "../SignQR.vue";
 import * as api from "../../../api/index1";
 import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
 import { message } from "ant-design-vue";
+import { toDate } from "../../../api/method";
 export default {
  name: "FaceManage",
  components: {
@@ -264,7 +267,7 @@ export default {
      closeStop: false, //签退弹窗关闭图标
      signQRvisible: false, //二维码弹窗
      name: null,
-      projectName2: null,
+      projectName2: undefined,
      showmodal: false, //勾选提示框
      closable: false, //modal右上角的关闭按钮
      pageSize: 10,
@@ -341,10 +344,13 @@ export default {
      codeIndex: null,
      codeInfo: null, //二维码内容
      // selectOption: [],
+      beginTime: null, //签到开始时间
+      endTime: null, //签到结束时间
    });
    const afterVisibleChange = (bol) => {
      if (bol == true) {
        getStudent();
+        isSignClick();
      }
    };
    //考勤
@@ -358,7 +364,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:FSvisible", false);
      state.name = null;
-      state.projectName2 = null;
+      state.projectName2 = undefined;
      state.selectedRowKeys = [];
      state.selectedStudents = [];
      state.currentPage = 1;
@@ -492,6 +498,7 @@ export default {
          key: "studentUserNo",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -530,6 +537,7 @@ export default {
          width: 50,
          align: "center",
          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -548,6 +556,7 @@ export default {
          key: "studentJobName",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -567,6 +576,7 @@ export default {
          key: "signTime",
          width: 110,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -590,6 +600,7 @@ export default {
          key: "signStatus",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            // console.log("text", text);
@@ -612,6 +623,7 @@ export default {
          key: "signStatus",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -623,6 +635,7 @@ export default {
        },
        {
          title: "考勤情况",
+          ellipsis: true,
          className: "h",
          dataIndex: "opacation",
          key: "opacation",
@@ -831,7 +844,7 @@ export default {
    function resetTaskList() {
      state.currentPage = 1;
      state.name = null;
-      state.projectName2 = null;
+      state.projectName2 = undefined;
      state.tableDataTotal = -1;
      state.tableDataTotal2 = 0;
      getStudent();
@@ -882,7 +895,31 @@ export default {
        getStudent();
      }
    };
+    // 计算签到时间
+    const isSignClick = () => {
+      let beginTime = new Date(props.datasource.startTime).getTime();
+      let endTime = !props.datasource.afterStart
+        ? new Date(props.datasource.endTime).getTime()
+        : new Date(props.datasource.beginTime).getTime();
+      if (props.datasource.beforeStart && props.datasource.afterStart) {
+        //有开始前有开始后
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
+        console.log("1111");
+      } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
+        //只有开始前无开始后
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        console.log("11112222");
+      } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
+        //无开始前有开始后
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
+        console.log("1111333");
+      }

+      state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
+      state.endTime = toDate(endTime / 1000, "Y/M/D h:m:s");
+      console.log("beginTime,endTime", state.beginTime, state.endTime);
+    };
    return {
      ...toRefs(state),
      selectProjectName,
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -34,7 +34,7 @@
            <div class="name">姓名：</div>
            <a-input
              v-model:value="name"
-              style="width: 270px; height: 40px; border-radius: 8px"
+              style="width: 200px; height: 40px; border-radius: 8px"
              placeholder="请输入姓名"
            />
          </div>
@@ -43,7 +43,7 @@
            <div class="select">
              <a-select
                v-model:value="projectName"
-                style="width: 270px"
+                style="width: 200px"
                placeholder="请选择"
                :options="projectNameList"
                @change="selectProjectName"
@@ -228,7 +228,7 @@ export default {
      name: "",

      open: false,
-      projectName: null,
+      projectName: undefined,
      projectNameList: [
        {
          id: 0,
@@ -307,6 +307,7 @@ export default {
          width: 60,
          align: "center",
          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -325,6 +326,7 @@ export default {
          key: "studentJobName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -344,6 +346,7 @@ export default {
          key: "workScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -363,6 +366,7 @@ export default {
          key: "examinationScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -383,6 +387,7 @@ export default {
          key: "assessmentScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -403,6 +408,7 @@ export default {
          key: "finishStatus",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -427,6 +433,7 @@ export default {
          key: "operation",
          width: 100,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return text.record.finishStatus == 1 ? (
@@ -558,7 +565,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:Fvisible", false);
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.selectedRowKeys = [];
      state.currentPage = 1;
      state.tableDataTotal = -1;
@@ -651,7 +658,7 @@ export default {
    function resetTaskList() {
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.tableDataTotal = -1;
      state.tableDataTotal2 = 0;
      getStudent();
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -3,7 +3,7 @@
    :visible="Wvisible"
    class="drawerStyle ProjectHomeWorkManage"
    placement="right"
-    width="60%"
+    width="80%"
    @after-visible-change="afterVisibleChange"
    :zIndex="100"
  >
@@ -35,7 +35,7 @@
            <div class="name">姓名：</div>
            <a-input
              v-model:value="name"
-              style="width: 270px; height: 40px; border-radius: 8px"
+              style="width: 200px; height: 40px; border-radius: 8px"
              placeholder="请输入姓名"
            />
          </div>
@@ -44,7 +44,7 @@
            <div class="select">
              <a-select
                v-model:value="projectName"
-                style="width: 270px"
+                style="width: 200px"
                placeholder="请选择"
                :options="projectNameList"
                @change="selectProjectName"
@@ -197,7 +197,7 @@ export default {
      name: "",

      open: false,
-      projectName: null,
+      projectName: undefined,
      projectNameList: [
        {
          id: 1,
@@ -276,6 +276,7 @@ export default {
          width: 60,
          align: "center",
          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -294,6 +295,7 @@ export default {
          key: "studentJobName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -313,6 +315,7 @@ export default {
          key: "studentOrgName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -332,6 +335,7 @@ export default {
          key: "workScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -352,6 +356,7 @@ export default {
          key: "lastStudyTime",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -369,6 +374,7 @@ export default {
          key: "finishStatus",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -393,6 +399,7 @@ export default {
          key: "operation",
          width: 100,
          align: "center",
+          ellipsis: true,
          className: "h",
        },
      ],
@@ -449,7 +456,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:Wvisible", false);
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.selectedRowKeys = [];
      state.currentPage = 1;
      state.tableDataTotal = -1;
@@ -542,7 +549,7 @@ export default {
    function resetTaskList() {
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.tableDataTotal = -1;
      state.tableDataTotal2 = 0;
      getStudent();
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -4,7 +4,7 @@
    :visible="Tvisible"
    class="drawerStyle ProjectOnlineManage"
    placement="right"
-    width="60%"
+    width="80%"
    @after-visible-change="afterVisibleChange"
  >
    <div class="drawerMain">
@@ -51,7 +51,7 @@
              <div class="name">姓名：</div>
              <a-input
                v-model:value="name"
-                style="width: 270px; height: 40px; border-radius: 8px"
+                style="width: 200px; height: 40px; border-radius: 8px"
                placeholder="请输入姓名"
              />
            </div>
@@ -60,7 +60,7 @@
              <div class="select">
                <a-select
                  v-model:value="projectName"
-                  style="width: 270px"
+                  style="width: 200px"
                  placeholder="请选择"
                  :options="projectNameList"
                  @change="selectProjectName"
@@ -175,7 +175,7 @@ export default {
      pageSize: 10,
      currentPage: 1,
      tableDataTotal: 0,
-      projectName: "",
+      projectName: undefined,
      projectNameList: [
          {
            id: 1,
@@ -234,6 +234,7 @@ export default {
          key: "studentDepartName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -249,6 +250,7 @@ export default {
          key: "studentJobName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -264,6 +266,7 @@ export default {
          key: "currentStageName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: () => {
            return (
@@ -279,6 +282,7 @@ export default {
          key: "lastStudyTime",
          width: 100,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -294,6 +298,7 @@ export default {
          key: "finishStatus",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -311,7 +316,7 @@ export default {
      ctx.emit("update:Tvisible", false);
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.tabledata = [];
    };
    const afterVisibleChange = (bol) => {
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -51,7 +51,7 @@
              <div class="name">姓名：</div>
              <a-input
                v-model:value="name"
-                style="width: 170px; height: 40px; border-radius: 8px"
+                style="width: 200px; height: 40px; border-radius: 8px"
                placeholder="请输入姓名"
              />
            </div>
@@ -60,7 +60,7 @@
              <div class="select">
                <a-select
                  v-model:value="projectName"
-                  style="width: 170px"
+                  style="width: 200px"
                  placeholder="请选择"
                  :options="projectNameList"
                  @change="selectProjectName"
@@ -174,13 +174,9 @@ export default {
      pageSize: 10,
      currentPage: 1,
      tableDataTotal: 0,
-      projectName: "",
+      projectName: undefined,
      projectNameList: [
-        {
-            id: 0,
-            value: '',
-            label: "全部",
-          },
+        
          {
            id: 1,
            value: "0",
@@ -323,7 +319,7 @@ export default {
      ctx.emit("update:CommonModelVisible", false);
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.tabledata = [];
    };
    const afterVisibleChange = (bol) => {
@@ -444,7 +440,7 @@ export default {
      state.tableDataTotalLoading = true;
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      getData();
    }

--- a/src/components/drawers/router/RouterEvaluationManage.vue
+++ b/src/components/drawers/router/RouterEvaluationManage.vue
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -24,7 +24,9 @@
            ～
            {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
          </div>
-          <div class="endtime" style="margin-left: 64px">签到时间：14:00</div>
+          <div class="endtime" style="margin-left: 64px">
+            签到时间：{{ beginTime }}~{{ endTime }}
+          </div>
        </div>

        <div class="search">
@@ -33,7 +35,7 @@
              <div class="name">姓名：</div>
              <a-input
                v-model:value="name"
-                style="width: 270px; height: 40px; border-radius: 8px"
+                style="width: 200px; height: 40px; border-radius: 8px"
                placeholder="请输入姓名"
              />
            </div>
@@ -56,7 +58,7 @@
              <div class="select">
                <a-select
                  v-model:value="projectName2"
-                  style="width: 160px"
+                  style="width: 200px"
                  placeholder="请选择"
                  :options="projectNameList2"
                  @change="selectProjectName2"
@@ -228,6 +230,7 @@ import SignQR from "../SignQR.vue";
 import * as api from "../../../api/index1";
 import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
 import { message } from "ant-design-vue";
+import { toDate } from "../../../api/method";
 export default {
  name: "FaceManage",
  components: {
@@ -258,7 +261,7 @@ export default {
      closeStop: false, //签退弹窗关闭图标
      signQRvisible: false, //二维码弹窗
      name: null,
-      projectName2: null,
+      projectName2: undefined,
      showmodal: false, //勾选提示框
      closable: false, //modal右上角的关闭按钮
      pageSize: 10,
@@ -335,10 +338,14 @@ export default {
      codeType: null,
      codeIndex: null,
      codeInfo: null, //二维码内容
+      beginTime: null, //签到开始时间
+      endTime: null, //签到结束时间
    });
    const afterVisibleChange = (bol) => {
      if (bol == true) {
        getStudent();
+        console.log("1111");
+        isSignClick();
      }
    };
    //考勤
@@ -352,7 +359,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:FSvisible", false);
      state.name = null;
-      state.projectName2 = null;
+      state.projectName2 = undefined;
      state.selectedRowKeys = [];
      state.selectedStudents = [];
      state.currentPage = 1;
@@ -431,8 +438,9 @@ export default {
          dataIndex: "studentUserNo",
          // width: "30%",
          key: "studentUserNo",
-          width: 50,
+          width: 120,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -468,7 +476,8 @@ export default {
          dataIndex: "studentDepartName",
          // width: "30%",
          key: "studentDepartName",
-          width: 50,
+          width: 60,
+          ellipsis: true,
          align: "center",
          className: "h",
          customRender: (text) => {
@@ -489,6 +498,7 @@ export default {
          key: "studentJobName",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -508,6 +518,7 @@ export default {
          key: "signTime",
          width: 110,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -531,6 +542,7 @@ export default {
          key: "signStatus  ",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            // console.log("text", text);
@@ -553,6 +565,7 @@ export default {
          key: "signStatus",
          width: 50,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -564,6 +577,7 @@ export default {
        },
        {
          title: "考勤情况",
+          ellipsis: true,
          className: "h",
          dataIndex: "opacation",
          key: "opacation",
@@ -728,7 +742,7 @@ export default {

    //获取学员
    const getStudent = () => {
-      console.log("我是传递的查询参数", props.datasource, {
+      console.log("我是传递的查询参数222", props.datasource, {
        pageNo: state.currentPage,
        pageSize: state.pageSize,
        currentStageId: props.datasource.chapterId,
@@ -779,7 +793,7 @@ export default {
    function resetTaskList() {
      state.currentPage = 1;
      state.name = null;
-      state.projectName2 = null;
+      state.projectName2 = undefined;
      state.tableDataTotal = -1;
      state.tableDataTotal2 = 0;
      getStudent();
@@ -848,53 +862,33 @@ export default {
      }
    };

-    //计算签到时间
-    // function isSignClick() {
-    //   let beginTime = new Date(datasource.startTime).getTime();
-    //     let endTime = datasource.endTime
-    //   timer = setInterval(() => {
-    //     let beginTime = new Date(data.value.planDto.beginTime).getTime();
-    //     let endTime = !data.value.planDto.afterStart
-    //       ? new Date(data.value.planDto.endTime).getTime()
-    //       : new Date(data.value.planDto.beginTime).getTime();
-    //     let nowTime = new Date().getTime();
-    //     if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
-    //       //有开始前有开始后
-    //       beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
-    //       endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
-    //       console.log("1111");
-    //     } else if (
-    //       data.value.planDto.beforeStart &&
-    //       !data.value.planDto.afterStart
-    //     ) {
-    //       //只有开始前无开始后
-    //       beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
-    //       console.log("11112222");
-    //     } else if (
-    //       !data.value.planDto.beforeStart &&
-    //       data.value.planDto.afterStart
-    //     ) {
-    //       //无开始前有开始后
-    //       endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
-    //       console.log("1111333");
-    //     }
-    //     if (nowTime < endTime && nowTime > beginTime) {
-    //       state.isAllowSign = true;
-    //     } else {
-    //       state.isAllowSign = false;
-    //     }
-    //     // console.log(
-    //     //   "isAllowSign",
-    //     //   state.isAllowSign,
-    //     //   nowTime,
-    //     //   endTime,
-    //     //   beginTime,
-    //     //   nowTime < endTime,
-    //     //   nowTime > beginTime
-    //     // );
-    //   }, 1000);
-    // }
-    // isSignClick();
+    // 计算签到时间
+    const isSignClick = () => {
+      console.log("计算签到时间");
+      let beginTime = new Date(props.datasource.startTime).getTime();
+      let endTime = !props.datasource.afterStart
+        ? new Date(props.datasource.endTime).getTime()
+        : new Date(props.datasource.beginTime).getTime();
+      if (props.datasource.beforeStart && props.datasource.afterStart) {
+        //有开始前有开始后
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
+        console.log("1111");
+      } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
+        //只有开始前无开始后
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        console.log("11112222");
+      } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
+        //无开始前有开始后
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
+        console.log("1111333");
+      }
+
+      state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
+      state.endTime = toDate(endTime / 1000, "Y/M/D h:m:s");
+      console.log("beginTime,endTime", state.beginTime, state.endTime);
+    };
+
    return {
      ...toRefs(state),
      selectProjectName,
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -29,7 +29,7 @@
            <div class="name">姓名：</div>
            <a-input
              v-model:value="name"
-              style="width: 270px; height: 40px; border-radius: 8px"
+              style="width: 200px; height: 40px; border-radius: 8px"
              placeholder="请输入姓名"
            />
          </div>
@@ -38,7 +38,7 @@
            <div class="select">
              <a-select
                v-model:value="projectName"
-                style="width: 270px"
+                style="width: 200px"
                placeholder="请选择"
                :options="projectNameList"
                @change="selectProjectName"
@@ -211,7 +211,7 @@ export default {
      name: "",

      open: false,
-      projectName: null,
+      projectName: undefined,
      projectNameList: [
        {
          id: 0,
@@ -253,7 +253,7 @@ export default {
          title: "工号",
          dataIndex: "studentUserNo",
          key: "studentUserNo",
-          width: 50,
+          width: 120,
          align: "left",
          className: "h head",
          customRender: (text) => {
@@ -272,7 +272,8 @@ export default {
          key: "studentName",
          width: 50,
          align: "left",
-          className: "h head",
+          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -290,6 +291,7 @@ export default {
          width: 60,
          align: "center",
          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -308,6 +310,7 @@ export default {
          key: "studentJobName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -327,6 +330,7 @@ export default {
          key: "chapterName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -344,6 +348,7 @@ export default {
          key: "workScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -363,6 +368,7 @@ export default {
          key: "examinationScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -383,6 +389,7 @@ export default {
          key: "assessmentScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -403,6 +410,7 @@ export default {
          key: "finishStatus",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -427,6 +435,7 @@ export default {
          key: "operation",
          width: 100,
          align: "center",
+          ellipsis: true,
          className: "h",
        },
      ],
@@ -501,7 +510,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:FaceTeachModelVisible", false);
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.selectedRowKeys = [];
      state.currentPage = 1;
      state.tableDataTotal = -1;
@@ -595,7 +604,7 @@ export default {
    function resetTaskList() {
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName =undefined;
      state.tableDataTotal = -1;
      state.tableDataTotal2 = 0;
      getStudent();
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -4,7 +4,7 @@
    :visible="HomeworkModelVisible"
    class="drawerStyle ProjectHomeWorkManage"
    placement="right"
-    width="60%"
+    width="80%"
    @after-visible-change="afterVisibleChange"
    :zIndex="100"
  >
@@ -30,7 +30,7 @@
            <div class="name">姓名：</div>
            <a-input
              v-model:value="name"
-              style="width: 270px; height: 40px; border-radius: 8px"
+              style="width: 200px; height: 40px; border-radius: 8px"
              placeholder="请输入姓名"
            />
          </div>
@@ -39,7 +39,7 @@
            <div class="select">
              <a-select
                v-model:value="projectName"
-                style="width: 270px"
+                style="width: 200px"
                placeholder="请选择"
                :options="projectNameList"
                @change="selectProjectName"
@@ -192,7 +192,7 @@ export default {
      name: "",

      open: false,
-      projectName: null,
+      projectName: undefined,
      projectNameList: [
        {
          id: 1,
@@ -233,7 +233,7 @@ export default {
          title: "工号",
          dataIndex: "studentUserNo",
          key: "studentUserNo",
-          width: 50,
+          width: 120,
          align: "left",
          className: "h head",
          customRender: (text) => {
@@ -252,7 +252,8 @@ export default {
          key: "studentName",
          width: 50,
          align: "left",
-          className: "h head",
+          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -270,6 +271,7 @@ export default {
          width: 60,
          align: "center",
          className: "h",
+          ellipsis: true,
          customRender: (text) => {
            return (
              <div class="racona">
@@ -288,6 +290,7 @@ export default {
          key: "studentJobName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -307,6 +310,7 @@ export default {
          key: "chapterName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -324,6 +328,7 @@ export default {
          key: "studentOrgName",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -343,6 +348,7 @@ export default {
          key: "workScore",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -363,6 +369,7 @@ export default {
          key: "lastStudyTime",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -380,6 +387,7 @@ export default {
          key: "finishStatus",
          width: 60,
          align: "center",
+          ellipsis: true,
          className: "h",
          customRender: (text) => {
            return (
@@ -404,6 +412,7 @@ export default {
          key: "operation",
          width: 100,
          align: "center",
+          ellipsis: true,
          className: "h",
        },
      ],
@@ -461,7 +470,7 @@ export default {
    const closeDrawer = () => {
      ctx.emit("update:HomeworkModelVisible", false);
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.selectedRowKeys = [];
      state.currentPage = 1;
      state.tableDataTotal = -1;
@@ -551,7 +560,7 @@ export default {
    function resetTaskList() {
      state.currentPage = 1;
      state.name = "";
-      state.projectName = "";
+      state.projectName = undefined;
      state.tableDataTotal = -1;
      getStudent();
    }
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -359,7 +359,7 @@
    v-model:AddImpStuvisible="AddImpStuvisible"
    @AddImpStuvisibleClose="AddImpStuvisibleClose"
    :courseId="id"
-    :type="type"
+    :courseType="type === 1 ? 3 : 4"
  />
 </template>
 <script setup>
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -50,7 +50,8 @@ export default {
    const router = useRouter();
    const state = reactive({
      form: {
-        account: "10181457",
+        account: "00004409",
+        // account: "10181457",
        password: "1234567890Aa",
      },
    });
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,26 +6,24 @@
 * @FilePath: /fe-manage/vue.config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
-const { defineConfig } = require("@vue/cli-service");
+const {defineConfig} = require("@vue/cli-service");

 module.exports = defineConfig({
-	publicPath: process.env.VUE_APP_BASE,
-	// transpileDependencies: true,
-	devServer: {
-		port: 8080,
-		proxy: {
-			"/manageApi": {
-				target: process.env.VUE_APP_PROXY_URL,
-				changeOrigin: true, //表示是否改变原域名
-				// secure: false,
-				// ws: false, //表示WebSocket协议
-				pathRewrite: {
-					"^/manageApi": "",
-				},
-			}, "/userbasic": {
-				target: process.env.VUE_APP_BOE_API_URL,
-				changeOrigin: true, //表示是否改变原域名
-			},
-		},
-	},
+    publicPath: process.env.VUE_APP_BASE,
+    outputDir: process.env.VUE_APP_OUTPUT_DIR,
+    devServer: {
+        port: 8080,
+        proxy: {
+            "/manageApi": {
+                target: process.env.VUE_APP_PROXY_URL,
+                changeOrigin: true, //表示是否改变原域名
+                pathRewrite: {
+                    "^/manageApi": "",
+                },
+            }, "/userbasic": {
+                target: process.env.VUE_APP_BOE_API_URL,
+                changeOrigin: true, //表示是否改变原域名
+            },
+        },
+    },
 });