Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
线上迎新
/
onlinenew_manage
2
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

迎新系统管理平台新需求调整

hzj18279462576@163.com 10 kuukautta sitten
vanhempi
3ab822602e
commit
d0fc7780b2
9 muutettua tiedostoa jossa 375 lisäystä ja 109 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 1 1
      index.html
  2. 1 1
      src/layout/Navbar.vue
  3. 54 11
      src/views/bed/bed.vue
  4. 15 2
      src/views/building/building.vue
  5. 63 12
      src/views/dataOverview/dataOverview.vue
  6. 90 54
      src/views/dormitory/dormitory.vue
  7. 5 0
      src/views/moneySetting/moneySetting.vue
  8. 11 9
      src/views/role/role.vue
  9. 135 19
      src/views/studentInfo/studentInfo.vue

+ 1 - 1
index.html
Näytä tiedosto 

@@ -4,7 +4,7 @@
 
     <meta charset="UTF-8" />
 
     <meta charset="UTF-8" />
 
     <link rel="icon" type="image/svg+xml" href="./src/assets/img/logo.png" />
 
     <link rel="icon" type="image/svg+xml" href="./src/assets/img/logo.png" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title>迎新宿舍管理系统</title>
 
+    <title>迎新系统管理平台</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 1 - 1
src/layout/Navbar.vue
Näytä tiedosto 

@@ -21,7 +21,7 @@
 
     /></el-icon>
 
     /></el-icon>
 
     <div class="logo">
 
     <div class="logo">
 
       <!-- <img src="@/assets/img/nanchang.png" style="width: 30px; height: 30px" /> -->
 
       <!-- <img src="@/assets/img/nanchang.png" style="width: 30px; height: 30px" /> -->
 
-      <span>迎新宿舍管理系统</span>
 
+      <span>迎新系统管理平台</span>
 
     </div>
 
     </div>
 
     <div class="login">
 
     <div class="login">
 
       <span class="dateTime">{{ dateTime }}</span>
 
       <span class="dateTime">{{ dateTime }}</span>

+ 54 - 11
src/views/bed/bed.vue
Näytä tiedosto 

@@ -445,7 +445,6 @@
 
         <el-form-item label="寝室号 :" prop="dormitory">
 
         <el-form-item label="寝室号 :" prop="dormitory">
 
           <el-select
 
           <el-select
 
             clearable
 
             clearable
 
-            :disabled="dialongTitle == '编辑床位信息'"
 
             v-model="ruleForm.dormitory"
 
             v-model="ruleForm.dormitory"
 
             @change="dormitoryFormChange"
 
             @change="dormitoryFormChange"
 
             placeholder="请选择寝室号"
 
             placeholder="请选择寝室号"
 
@@ -481,11 +480,10 @@
 
             @change="collegeFormChange"
 
             @change="collegeFormChange"
 
             v-model="ruleForm.college"
 
             v-model="ruleForm.college"
 
             clearable
 
             clearable
 
-            disabled
 
             placeholder="请选择所属学院"
 
             placeholder="请选择所属学院"
 
           >
 
           >
 
             <el-option
 
             <el-option
 
-              v-for="i in collegeData"
 
+              v-for="i in useCollegeData"
 
               :key="i.id"
 
               :key="i.id"
 
               :label="i.name"
 
               :label="i.name"
 
               :value="`${i.name},${i.id}`"
 
               :value="`${i.name},${i.id}`"
 
@@ -782,6 +780,7 @@
 
           class="queding"
 
           class="queding"
 
           type="primary"
 
           type="primary"
 
           @click="projectImportConfirm(buildRef)"
 
           @click="projectImportConfirm(buildRef)"
 
+          :loading="buildImportLoading"
 
         >
 
         >
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
         </el-button>
 
         </el-button>
 
@@ -1153,6 +1152,7 @@ const cancelChangeBed = () => {
 
 const buildImportVisible = ref(false);
 
 const buildImportVisible = ref(false);
 
 const buildRef = ref();
 
 const buildRef = ref();
 
 const buildFile = ref();
 
 const buildFile = ref();
 
+const buildImportLoading = ref(false);
 
 
 
 // 校区数据
 
 // 校区数据
 
 const schoolData = ref([]);
 
 const schoolData = ref([]);
 
@@ -1164,6 +1164,7 @@ const dormitoryData = ref([]);
 
 const dormitoryFormData = ref([]);
 
 const dormitoryFormData = ref([]);
 
 // 学院
 
 // 学院
 
 const collegeData = ref([]);
 
 const collegeData = ref([]);
 
+const useCollegeData = ref([]); // 根据床位号获取学院
 
 // 专业
 
 // 专业
 
 const majorData = ref([]);
 
 const majorData = ref([]);
 
 const majorFormData = ref([]);
 
 const majorFormData = ref([]);
 
@@ -1389,14 +1390,24 @@ const buildFormChange = async (val) => {
 
 const dormitoryFormChange = (val) => {
 
 const dormitoryFormChange = (val) => {
 
   // 选择寝室号 时判断是 所属学院和性别
 
   // 选择寝室号 时判断是 所属学院和性别
 
   if (val) {
 
   if (val) {
 
-    dormitoryFormData.value.forEach((i) => {
 
-      if (i.id == val.split(",")[1]) {
 
-        ruleForm.college = `${i.college},${i.collegeId}`;
 
-        collegeFormChange(ruleForm.college);
 
-        ruleForm.sex = i.sex;
 
-        ruleForm.retentionState = i.retentionState;
 
-      }
 
+    useCollegeList(val.split(",")[1]).then(() => {
 
+      dormitoryFormData.value.forEach((i) => {
 
+        if (i.id == val.split(",")[1]) {
 
+          ruleForm.college = `${i.college.split(',')[0]},${i.collegeId.split(',')[0]}`;
 
+          collegeFormChange(ruleForm.college);
 
+          ruleForm.sex = i.sex;
 
+          ruleForm.retentionState = i.retentionState;
 
+        }
 
+      });
 
     });
 
     });
 
+    // dormitoryFormData.value.forEach((i) => {
 
+    //   if (i.id == val.split(",")[1]) {
 
+    //     ruleForm.college = `${i.college},${i.collegeId}`;
 
+    //     collegeFormChange(ruleForm.college);
 
+    //     ruleForm.sex = i.sex;
 
+    //     ruleForm.retentionState = i.retentionState;
 
+    //   }
 
+    // });
 
   } else {
 
   } else {
 
     ruleForm.college = null;
 
     ruleForm.college = null;
 
     ruleForm.sex = null;
 
     ruleForm.sex = null;
 
@@ -1531,6 +1542,8 @@ const addlist = () => {
 
   ruleForm.dormitory = null;
 
   ruleForm.dormitory = null;
 
   dormitoryFormData.value = null;
 
   dormitoryFormData.value = null;
 
   ruleForm.sex = null;
 
   ruleForm.sex = null;
 
+
 
+  useCollegeData.value = [];
 
   ruleForm.college = null;
 
   ruleForm.college = null;
 
   ruleForm.major = null;
 
   ruleForm.major = null;
 
   majorFormData.value = null;
 
   majorFormData.value = null;
 
@@ -1544,6 +1557,29 @@ const addlist = () => {
 
   ruleForm.retentionState = null;
 
   ruleForm.retentionState = null;
 
   ruleForm.id = null;
 
   ruleForm.id = null;
 
 };
 
 };
 
+
 
+const useCollegeList = async (dormitoryId) => {
 
+  let params = {
 
+    dormitoryId: dormitoryId,
 
+  };
 
+
 
+  let res = await https.get(
 
+    "/welcome/api/welcome-dormitory/getColleges",
 
+    "params",
 
+    params
 
+  );
 
+  console.log(res, "根据寝室号获取学院");
 
+  if (res.code == 200) {
 
+    useCollegeData.value = res.data;
 
+  } else {
 
+    ElMessage({
 
+      type: "error",
 
+      showClose: true,
 
+      message: res.message,
 
+      center: true,
 
+    });
 
+  }
 
+};
 
 // 添加账号
 
 // 添加账号
 
 const updateS = (row) => {
 
 const updateS = (row) => {
 
   console.log(row);
 
   console.log(row);
 
@@ -1575,11 +1611,15 @@ const updateS = (row) => {
 
     ruleForm.dormitory = null;
 
     ruleForm.dormitory = null;
 
   }
 
   }
 
   ruleForm.sex = row.sex;
 
   ruleForm.sex = row.sex;
 
+
 
   if (row.college && row.collegeId) {
 
   if (row.college && row.collegeId) {
 
-    ruleForm.college = `${row.college},${row.collegeId}`;
 
+    useCollegeList(row.dormitoryId).then(() => {
 
+      ruleForm.college = `${row.college},${row.collegeId}`;
 
+    });
 
   } else {
 
   } else {
 
     ruleForm.college = null;
 
     ruleForm.college = null;
 
   }
 
   }
 
+
 
   majorList(row.collegeId).then(() => {
 
   majorList(row.collegeId).then(() => {
 
     if (row.major && row.majorId) {
 
     if (row.major && row.majorId) {
 
       ruleForm.major = `${row.major},${row.majorId}`;
 
       ruleForm.major = `${row.major},${row.majorId}`;
 
@@ -1982,6 +2022,7 @@ const projectImportExceed = (files) => {
 
 };
 
 };
 
 // 导入项目
 
 // 导入项目
 
 const projectImportConfirm = async () => {
 
 const projectImportConfirm = async () => {
 
+  buildImportLoading.value = true;
 
   let data = new FormData();
 
   let data = new FormData();
 
   data.set("file", buildFile.value);
 
   data.set("file", buildFile.value);
 
   let res = await https.post(
 
   let res = await https.post(
 
@@ -1992,6 +2033,8 @@ const projectImportConfirm = async () => {
 
   console.log(res, "导入项目");
 
   console.log(res, "导入项目");
 
   if (res.code == 200) {
 
   if (res.code == 200) {
 
     buildImportVisible.value = false;
 
     buildImportVisible.value = false;
 
+
 
+    buildImportLoading.value = false;
 
     getList();
 
     getList();
 
     ElMessage({
 
     ElMessage({
 
       type: "success",
 
       type: "success",

+ 15 - 2
src/views/building/building.vue
Näytä tiedosto 

@@ -108,9 +108,17 @@
 
             index="1"
 
             index="1"
 
           />
 
           />
 
           <el-table-column align="center" prop="schoolName" label="校区名称" />
 
           <el-table-column align="center" prop="schoolName" label="校区名称" />
 
-          <el-table-column align="center" prop="build" label="楼栋名称" />
 
+          <el-table-column
 
+            align="center"
 
+            prop="build"
 
+            label="楼栋名称"
 
+          />
 
           <el-table-column align="center" prop="sex" label="楼栋性别" />
 
           <el-table-column align="center" prop="sex" label="楼栋性别" />
 
-          <el-table-column align="center" prop="floors" label="楼栋层数">
 
+          <el-table-column
 
+            align="center"
 
+            prop="floors"
 
+            label="楼栋层数"
 
+          >
 
             <template #default="{ row }">
 
             <template #default="{ row }">
 
               <span>{{ row.floors }}</span>
 
               <span>{{ row.floors }}</span>
 
             </template>
 
             </template>
 
@@ -287,6 +295,7 @@
 
           class="queding"
 
           class="queding"
 
           type="primary"
 
           type="primary"
 
           @click="projectImportConfirm(buildRef)"
 
           @click="projectImportConfirm(buildRef)"
 
+          :loading="buildImportLoading"
 
         >
 
         >
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
         </el-button>
 
         </el-button>
 
@@ -376,6 +385,7 @@ const buildData = ref([]);
 
 const buildImportVisible = ref(false);
 
 const buildImportVisible = ref(false);
 
 const buildRef = ref();
 
 const buildRef = ref();
 
 const buildFile = ref();
 
 const buildFile = ref();
 
+const buildImportLoading = ref(false);
 
 
 
 const schoolList = async () => {
 
 const schoolList = async () => {
 
   let res = await https.get("/welcome/api/welcome-build/schoolGroup", "params");
 
   let res = await https.get("/welcome/api/welcome-build/schoolGroup", "params");
 
@@ -710,6 +720,7 @@ const projectImportExceed = (files) => {
 
 };
 
 };
 
 // 导入项目
 
 // 导入项目
 
 const projectImportConfirm = async () => {
 
 const projectImportConfirm = async () => {
 
+  buildImportLoading.value = true;
 
   let data = new FormData();
 
   let data = new FormData();
 
   data.set("file", buildFile.value);
 
   data.set("file", buildFile.value);
 
   let res = await https.post(
 
   let res = await https.post(
 
@@ -720,6 +731,8 @@ const projectImportConfirm = async () => {
 
   console.log(res, "导入项目");
 
   console.log(res, "导入项目");
 
   if (res.code == 200) {
 
   if (res.code == 200) {
 
     buildImportVisible.value = false;
 
     buildImportVisible.value = false;
 
+
 
+    buildImportLoading.value = false;
 
     getList();
 
     getList();
 
     ElMessage({
 
     ElMessage({
 
       type: "success",
 
       type: "success",

+ 63 - 12
src/views/dataOverview/dataOverview.vue
Näytä tiedosto 

@@ -86,9 +86,28 @@
 
         <div class="system_title">
 
         <div class="system_title">
 
           <h4>学院新生报到情况</h4>
 
           <h4>学院新生报到情况</h4>
 
         </div>
 
         </div>
 
-        <div class="total">
 
-          <span>总数 : </span
 
-          ><span style="font-size: 20px">{{ studentTotal }}</span>
 
+        <div
 
+          class="total"
 
+          style="width: 88%; display: flex; justify-content: space-between"
 
+        >
 
+          <span>
 
+            <span>总数 : </span>
 
+            <span style="font-size: 20px">{{ studentTotal }} / {{ studentTotalP }}%</span>
 
+          </span>
 
+          <el-select
 
+            @change="collegeChange"
 
+            v-model="searchInput.college"
 
+            placeholder="请选择院系"
 
+            clearable
 
+            style="width: 250px"
 
+          >
 
+            <el-option
 
+              v-for="i in collegeData"
 
+              :key="i.id"
 
+              :label="i.name"
 
+              :value="i.id"
 
+            />
 
+          </el-select>
 
         </div>
 
         </div>
 
         <div id="echarts_register"></div>
 
         <div id="echarts_register"></div>
 
       </div>
 
       </div>
 
@@ -149,7 +168,7 @@ const pageSize = ref(10);
 
 const total = ref(0); // 当前总数
 
 const total = ref(0); // 当前总数
 
 
 
 // 为避免解构时失去响应性
 
 // 为避免解构时失去响应性
 
-const { name, age, isCollapse, realAge } = storeToRefs(store);
 
+const { name, age, isCollapse, realAge, collegeRole } = storeToRefs(store);
 
 
 
 // 处置情况
 
 // 处置情况
 
 const disposeList = ref([
 
 const disposeList = ref([
 
@@ -161,7 +180,7 @@ const disposeList = ref([
 
   {
 
   {
 
     icon: "yubao",
 
     icon: "yubao",
 
     num: 1,
 
     num: 1,
 
-    title: "预报到人数",
 
+    title: "预报到人数/缴费率",
 
   },
 
   },
 
   {
 
   {
 
     icon: "jiaofei",
 
     icon: "jiaofei",
 
@@ -201,7 +220,28 @@ const carSchoolChange = (title) => {
 
 
 
 // 学院新生报到情况
 
 // 学院新生报到情况
 
 let registerEcharts = null;
 
 let registerEcharts = null;
 
+const searchInput = reactive({
 
+  college: "",
 
+});
 
 const studentTotal = ref();
 
 const studentTotal = ref();
 
+const studentTotalP=ref()
 
+// 学院
 
+const collegeData = ref([]);
 
+const collegeList = async () => {
 
+  // collegeData.value = collegeRole.value;
 
+  let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
 
+  console.log(res, "学院数据");
 
+  if (res.code == 200) {
 
+    collegeData.value = res.data;
 
+  } else {
 
+    ElMessage({
 
+      type: "error",
 
+      showClose: true,
 
+      message: res.message,
 
+      center: true,
 
+    });
 
+  }
 
+};
 
 
 
 // 学院新生报到情况
 
 // 学院新生报到情况
 
 let trafficEcharts = null;
 
 let trafficEcharts = null;
 
@@ -240,13 +280,14 @@ const studentOverview = async () => {
 
       {
 
       {
 
         icon: "jiaofei",
 
         icon: "jiaofei",
 
         num: res.data.payCount,
 
         num: res.data.payCount,
 
-        title: "已缴费人数",
 
+        numTotal: `${res.data.payRate}%`,
 
+        title: "已缴费人数 / 缴费率",
 
       },
 
       },
 
       {
 
       {
 
         icon: "ruzhu",
 
         icon: "ruzhu",
 
         num: res.data.checkInBedTotal,
 
         num: res.data.checkInBedTotal,
 
         numTotal: `${res.data.registrationRate}%`,
 
         numTotal: `${res.data.registrationRate}%`,
 
-        title: "已入住床位数 / 报到率",
 
+        title: "已入住床位数 / 入住率",
 
       },
 
       },
 
     ];
 
     ];
 
   } else {
 
   } else {
 
@@ -268,14 +309,19 @@ const callerClick = () => {
 
 const register = async () => {
 
 const register = async () => {
 
   let dom = document.getElementById("echarts_register");
 
   let dom = document.getElementById("echarts_register");
 
   registerEcharts = echarts.init(dom);
 
   registerEcharts = echarts.init(dom);
 
+  let params = {
 
+    collegeId: searchInput.college,
 
+  };
 
   let res = await https.get(
 
   let res = await https.get(
 
     "/welcome/api/welcomeStudent/studentRegister",
 
     "/welcome/api/welcomeStudent/studentRegister",
 
-    "params"
 
+    "params",
 
+    params
 
   );
 
   );
 
   console.log(res, "新生报到情况");
 
   console.log(res, "新生报到情况");
 
   if (res.code == 200) {
 
   if (res.code == 200) {
 
     if (res.data.length) {
 
     if (res.data.length) {
 
       studentTotal.value = res.data[res.data.length - 1].count;
 
       studentTotal.value = res.data[res.data.length - 1].count;
 
+      studentTotalP.value = res.data[res.data.length - 1].rate;
 
     }
 
     }
 
     // const data = genData(20);
 
     // const data = genData(20);
 
     const data = {
 
     const data = {
 
@@ -286,9 +332,9 @@ const register = async () => {
 
     let manTotal = 0;
 
     let manTotal = 0;
 
     data.seriesData = arr.map((i) => {
 
     data.seriesData = arr.map((i) => {
 
       manTotal += i.count;
 
       manTotal += i.count;
 
-      data.legendData.push(i.collegeName);
 
+      data.legendData.push(i.name);
 
       return {
 
       return {
 
-        name: i.collegeName,
 
+        name: i.name,
 
         value: i.count,
 
         value: i.count,
 
       };
 
       };
 
     });
 
     });
 
@@ -364,6 +410,10 @@ const register = async () => {
 
     });
 
     });
 
   }
 
   }
 
 };
 
 };
 
+const collegeChange=()=>{
 
+  register()
 
+} 
+
 
 const traffic = async () => {
 
 const traffic = async () => {
 
   var chartDom = document.getElementById("echarts_traffic");
 
   var chartDom = document.getElementById("echarts_traffic");
 
   trafficEcharts = echarts.init(chartDom);
 
   trafficEcharts = echarts.init(chartDom);
 
@@ -412,7 +462,7 @@ const traffic = async () => {
 
             rich: {
 
             rich: {
 
               time: {
 
               time: {
 
                 // fontSize: 10,
 
                 // fontSize: 10,
 
-                color: "#999",
 
+                color: "#000",
 
               },
 
               },
 
               percent: {
 
               percent: {
 
                 // fontSize: 10,
 
                 // fontSize: 10,
 
@@ -578,6 +628,7 @@ onMounted(() => {
 
   traffic();
 
   traffic();
 
   gender();
 
   gender();
 
   studentStay();
 
   studentStay();
 
+  collegeList();
 
   window.addEventListener("resize", updateChartSize);
 
   window.addEventListener("resize", updateChartSize);
 
 });
 
 });
 
 
 
@@ -661,7 +712,7 @@ onBeforeUnmount(() => {
 
       margin: 0 10px;
 
       margin: 0 10px;
 
       height: 133px;
 
       height: 133px;
 
       border: 1px solid rgba(143, 143, 143, 1);
 
       border: 1px solid rgba(143, 143, 143, 1);
 
-      border-radius: 6.98px;
 
+      border-radius: 0.98px;
 
       background: rgba(250, 252, 255, 1);
 
       background: rgba(250, 252, 255, 1);
 
       display: flex;
 
       display: flex;
 
       align-items: center;
 
       align-items: center;

+ 90 - 54
src/views/dormitory/dormitory.vue
Näytä tiedosto 

@@ -188,16 +188,8 @@
 
           }"
 
           }"
 
         >
 
         >
 
           <el-table-column type="selection" align="center" width="55" />
 
           <el-table-column type="selection" align="center" width="55" />
 
-          <el-table-column
 
-            align="center"
 
-            prop="school"
 
-            label="校区名称"
 
-          />
 
-          <el-table-column
 
-            align="center"
 
-            prop="build"
 
-            label="楼栋名称"
 
-          />
 
+          <el-table-column align="center" prop="school" label="校区名称" />
 
+          <el-table-column align="center" prop="build" label="楼栋名称" />
 
           <el-table-column align="center" prop="dormitory" label="寝室号" />
 
           <el-table-column align="center" prop="dormitory" label="寝室号" />
 
           <el-table-column
 
           <el-table-column
 
             width="100"
 
             width="100"
 
@@ -205,11 +197,7 @@
 
             prop="sex"
 
             prop="sex"
 
             label="寝室性别"
 
             label="寝室性别"
 
           />
 
           />
 
-          <el-table-column
 
-            align="center"
 
-            prop="college"
 
-            label="所属学院"
 
-          />
 
+          <el-table-column align="center" prop="college" label="所属学院" />
 
           <!-- <el-table-column align="center" prop="major" label="专业" /> -->
 
           <!-- <el-table-column align="center" prop="major" label="专业" /> -->
 
           <el-table-column
 
           <el-table-column
 
             width="100"
 
             width="100"
 
@@ -347,7 +335,7 @@
 
         </el-form-item>
 
         </el-form-item>
 
         <el-form-item label="楼栋名称 :" prop="build">
 
         <el-form-item label="楼栋名称 :" prop="build">
 
           <el-select
 
           <el-select
 
-          :disabled="dialongTitle == '编辑寝室信息'"
 
+            :disabled="dialongTitle == '编辑寝室信息'"
 
             clearable
 
             clearable
 
             v-model="ruleForm.build"
 
             v-model="ruleForm.build"
 
             placeholder="请选择楼栋名称"
 
             placeholder="请选择楼栋名称"
 
@@ -384,6 +372,10 @@
 
             @change="collegeFormChange"
 
             @change="collegeFormChange"
 
             v-model="ruleForm.college"
 
             v-model="ruleForm.college"
 
             clearable
 
             clearable
 
+            multiple
 
+            collapse-tags
 
+            collapse-tags-tooltip
 
+            :max-collapse-tags="2"
 
             placeholder="请选择所属学院"
 
             placeholder="请选择所属学院"
 
           >
 
           >
 
             <el-option
 
             <el-option
 
@@ -474,6 +466,7 @@
 
           class="queding"
 
           class="queding"
 
           type="primary"
 
           type="primary"
 
           @click="projectImportConfirm(buildRef)"
 
           @click="projectImportConfirm(buildRef)"
 
+          :loading="buildImportLoading"
 
         >
 
         >
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
         </el-button>
 
         </el-button>
 
@@ -564,6 +557,7 @@ const rules = reactive({
 
 const buildImportVisible = ref(false);
 
 const buildImportVisible = ref(false);
 
 const buildRef = ref();
 
 const buildRef = ref();
 
 const buildFile = ref();
 
 const buildFile = ref();
 
+const buildImportLoading = ref(false);
 
 
 
 // 校区数据
 
 // 校区数据
 
 const schoolData = ref([]);
 
 const schoolData = ref([]);
 
@@ -621,7 +615,7 @@ const dormitoryList = async () => {
 
   let params = {
 
   let params = {
 
     schoolId: searchInput.schoolId,
 
     schoolId: searchInput.schoolId,
 
     buildId: searchInput.buildId,
 
     buildId: searchInput.buildId,
 
-    accountId:sessionStorage.getItem("accountId"),
 
+    accountId: sessionStorage.getItem("accountId"),
 
   };
 
   };
 
   let res = await https.get(
 
   let res = await https.get(
 
     "/welcome/api/welcome-dormitory/dormitoryTGroup",
 
     "/welcome/api/welcome-dormitory/dormitoryTGroup",
 
@@ -640,31 +634,31 @@ const dormitoryList = async () => {
 
     });
 
     });
 
   }
 
   }
 
 };
 
 };
 
-const majorList = async (flag) => {
 
-  let params = {
 
-    collegeId: flag ? flag : searchInput.collegeId,
 
-  };
 
-  let res = await https.get(
 
-    "/welcome/api/welcomeOrg/getMajors",
 
-    "params",
 
-    params
 
-  );
 
-  console.log(res, "专业数据");
 
-  if (res.code == 200) {
 
-    if (flag) {
 
-      majorFormData.value = res.data;
 
-    } else {
 
-      majorData.value = res.data;
 
-    }
 
-  } else {
 
-    ElMessage({
 
-      type: "error",
 
-      showClose: true,
 
-      message: res.message,
 
-      center: true,
 
-    });
 
-  }
 
-};
 
+// const majorList = async (flag) => {
 
+//   let params = {
 
+//     collegeId: flag ? flag : searchInput.collegeId,
 
+//   };
 
+//   let res = await https.get(
 
+//     "/welcome/api/welcomeOrg/getMajors",
 
+//     "params",
 
+//     params
 
+//   );
 
+//   console.log(res, "专业数据");
 
+//   if (res.code == 200) {
 
+//     if (flag) {
 
+//       majorFormData.value = res.data;
 
+//     } else {
 
+//       majorData.value = res.data;
 
+//     }
 
+//   } else {
 
+//     ElMessage({
 
+//       type: "error",
 
+//       showClose: true,
 
+//       message: res.message,
 
+//       center: true,
 
+//     });
 
+//   }
 
+// };
 
 const collegeList = async () => {
 
 const collegeList = async () => {
 
   collegeData.value = collegeRole.value;
 
   collegeData.value = collegeRole.value;
 
   // let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
 
   // let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
 
@@ -739,18 +733,35 @@ const collegeChange = async (val) => {
 
   } else {
 
   } else {
 
     majorData.value = null;
 
     majorData.value = null;
 
   }
 
   }
 
-  majorList();
 
+  // majorList();
 
 };
 
 };
 
+
 
+// 冒泡排序
 
+function bubbleSortById(arr) {
 
+  const n = arr.length;
 
+  for (let i = 0; i < n - 1; i++) {
 
+    for (let j = 0; j < n - 1 - i; j++) {
 
+      if (arr[j].id > arr[j + 1].id) {
 
+        // 只改这一行
 
+        [arr[j], arr[j + 1]] = [arr[j + 1], arr[j]];
 
+      }
 
+    }
 
+  }
 
+  return arr;
 
+}
 
 const collegeFormChange = async (val) => {
 
 const collegeFormChange = async (val) => {
 
   console.log(val);
 
   console.log(val);
 
+
 
+  console.log(ruleForm.college);
 
+
 
   // ruleForm.major = null;
 
   // ruleForm.major = null;
 
-  if (!val) {
 
-    majorFormData.value = null;
 
-    return;
 
-  } else {
 
-    majorFormData.value = null;
 
-  }
 
-  majorList(val.split(",")[1]);
 
+  // if (!val) {
 
+  //   majorFormData.value = null;
 
+  //   return;
 
+  // } else {
 
+  //   majorFormData.value = null;
 
+  // }
 
+  // majorList(val.split(",")[1]);
 
 };
 
 };
 
 
 
 // 获取账户列表
 
 // 获取账户列表
 
@@ -834,7 +845,11 @@ const updateS = (row) => {
 
   ruleForm.dormitory = row.dormitory;
 
   ruleForm.dormitory = row.dormitory;
 
   ruleForm.sex = row.sex;
 
   ruleForm.sex = row.sex;
 
   // collegeList().then(()=>{
 
   // collegeList().then(()=>{
 
-  ruleForm.college = `${row.college},${row.collegeId}`;
 
+  let arr=[]
 
+  row.college.split(",").forEach((i,ind) => {
 
+    arr.push(`${i},${row.collegeId.split(',')[ind]}`)
 
+  });
 
+  ruleForm.college =arr;
 
   // })
 
   // })
 
   // majorList(row.collegeId).then(() => {
 
   // majorList(row.collegeId).then(() => {
 
   //   ruleForm.major = `${row.major},${row.majorId}`;
 
   //   ruleForm.major = `${row.major},${row.majorId}`;
 
@@ -964,6 +979,24 @@ const submitAdd = lodash.debounce(async (formEl) => {
 
   if (!formEl) return;
 
   if (!formEl) return;
 
   await formEl.validate(async (valid, fields) => {
 
   await formEl.validate(async (valid, fields) => {
 
     if (valid) {
 
     if (valid) {
 
+      let arr = [];
 
+      ruleForm.college.forEach((i) => {
 
+        if (i) {
 
+          arr.push({
 
+            id: Number(i.split(",")[1]),
 
+            name: i.split(",")[0],
 
+          });
 
+        }
 
+      });
 
+      let collegeList = bubbleSortById(arr);
 
+      let college = [];
 
+      let collegeId = [];
 
+      collegeList.forEach((i) => {
 
+        college.push(i.name);
 
+        collegeId.push(i.id);
 
+      });
 
+      console.log(college.join(","), collegeId.join(","));
 
+
 
       let data = {
 
       let data = {
 
         school: ruleForm.school.split(",")[0],
 
         school: ruleForm.school.split(",")[0],
 
         schoolId: ruleForm.school.split(",")[1],
 
         schoolId: ruleForm.school.split(",")[1],
 
@@ -971,8 +1004,8 @@ const submitAdd = lodash.debounce(async (formEl) => {
 
         buildId: ruleForm.build.split(",")[1],
 
         buildId: ruleForm.build.split(",")[1],
 
         dormitory: ruleForm.dormitory,
 
         dormitory: ruleForm.dormitory,
 
         sex: ruleForm.sex,
 
         sex: ruleForm.sex,
 
-        college: ruleForm.college.split(",")[0],
 
-        collegeId: ruleForm.college.split(",")[1],
 
+        college: college.join(","),
 
+        collegeId: collegeId.join(","),
 
         // major: ruleForm.major.split(",")[0],
 
         // major: ruleForm.major.split(",")[0],
 
         // majorId: ruleForm.major.split(",")[1],
 
         // majorId: ruleForm.major.split(",")[1],
 
         bedNumber: ruleForm.bedNumber,
 
         bedNumber: ruleForm.bedNumber,
 
@@ -1155,6 +1188,7 @@ const projectImportExceed = (files) => {
 
 };
 
 };
 
 // 导入项目
 
 // 导入项目
 
 const projectImportConfirm = async () => {
 
 const projectImportConfirm = async () => {
 
+  buildImportLoading.value = true;
 
   let data = new FormData();
 
   let data = new FormData();
 
   data.set("file", buildFile.value);
 
   data.set("file", buildFile.value);
 
   let res = await https.post(
 
   let res = await https.post(
 
@@ -1165,6 +1199,8 @@ const projectImportConfirm = async () => {
 
   console.log(res, "导入项目");
 
   console.log(res, "导入项目");
 
   if (res.code == 200) {
 
   if (res.code == 200) {
 
     buildImportVisible.value = false;
 
     buildImportVisible.value = false;
 
+
 
+    buildImportLoading.value = false;
 
     getList();
 
     getList();
 
     ElMessage({
 
     ElMessage({
 
       type: "success",
 
       type: "success",
 
@@ -1183,7 +1219,7 @@ const projectImportConfirm = async () => {
 
 };
 
 };
 
 const cancelProjectImport = () => {
 
 const cancelProjectImport = () => {
 
   buildImportVisible.value = false;
 
   buildImportVisible.value = false;
 
-   if (buildRef.value) {
 
+  if (buildRef.value) {
 
     buildRef.value.clearFiles();
 
     buildRef.value.clearFiles();
 
     buildFile.value = null;
 
     buildFile.value = null;
 
   }
 
   }

+ 5 - 0
src/views/moneySetting/moneySetting.vue
Näytä tiedosto 

@@ -285,6 +285,7 @@
 
           class="queding"
 
           class="queding"
 
           type="primary"
 
           type="primary"
 
           @click="projectImportConfirm(buildRef)"
 
           @click="projectImportConfirm(buildRef)"
 
+          :loading="buildImportLoading"
 
         >
 
         >
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
         </el-button>
 
         </el-button>
 
@@ -388,6 +389,7 @@ const majorFormData = ref([]);
 
 const buildImportVisible = ref(false);
 
 const buildImportVisible = ref(false);
 
 const buildRef = ref();
 
 const buildRef = ref();
 
 const buildFile = ref();
 
 const buildFile = ref();
 
+const buildImportLoading=ref(false)
 
 
 
 const collegeList = async () => {
 
 const collegeList = async () => {
 
   collegeData.value = collegeRole.value;
 
   collegeData.value = collegeRole.value;
 
@@ -737,6 +739,7 @@ const projectImportExceed = (files) => {
 
 };
 
 };
 
 // 导入项目
 
 // 导入项目
 
 const projectImportConfirm = async () => {
 
 const projectImportConfirm = async () => {
 
+  buildImportLoading.value=true;
 
   let data = new FormData();
 
   let data = new FormData();
 
   data.set("file", buildFile.value);
 
   data.set("file", buildFile.value);
 
   let res = await https.post(
 
   let res = await https.post(
 
@@ -747,6 +750,8 @@ const projectImportConfirm = async () => {
 
   console.log(res, "导入项目");
 
   console.log(res, "导入项目");
 
   if (res.code == 200) {
 
   if (res.code == 200) {
 
     buildImportVisible.value = false;
 
     buildImportVisible.value = false;
 
+
 
+    buildImportLoading.value=false;
 
     getList();
 
     getList();
 
     ElMessage({
 
     ElMessage({
 
       type: "success",
 
       type: "success",

+ 11 - 9
src/views/role/role.vue
Näytä tiedosto 

@@ -260,7 +260,7 @@
 
         <span>角色名称 : &nbsp;&nbsp;</span>
 
         <span>角色名称 : &nbsp;&nbsp;</span>
 
         <el-input
 
         <el-input
 
           :clearable="true"
 
           :clearable="true"
 
-          :disabled="addRolesTitle=='编辑角色'"
 
+          :disabled="addRolesTitle == '编辑角色'"
 
           v-model="addRoles.roleName"
 
           v-model="addRoles.roleName"
 
           class="w-50 m-2"
 
           class="w-50 m-2"
 
           style="width: 450px"
 
           style="width: 450px"
 
@@ -435,8 +435,8 @@
 
                   />
 
                   />
 
                 </td>
 
                 </td>
 
               </tr>
 
               </tr>
 
-               <!-- 选宿舍金额设置 -->
 
-               <tr align="center">
 
+              <!-- 选宿舍金额设置 -->
 
+              <tr align="center">
 
                 <td>选宿舍金额设置</td>
 
                 <td>选宿舍金额设置</td>
 
                 <td>/</td>
 
                 <td>/</td>
 
                 <td>
 
                 <td>
 
@@ -495,7 +495,7 @@
 
                   />
 
                   />
 
                 </td>
 
                 </td>
 
               </tr>
 
               </tr>
 
-             
+
 
               <!-- 系统设置 11 -->
 
               <!-- 系统设置 11 -->
 
               <tr align="center">
 
               <tr align="center">
 
                 <td rowspan="2">系统设置</td>
 
                 <td rowspan="2">系统设置</td>
 
@@ -627,6 +627,7 @@ const addRolesList2 = reactive({
 
         { name: "编辑", id: 5 },
 
         { name: "编辑", id: 5 },
 
         { name: "删除", id: 6 },
 
         { name: "删除", id: 6 },
 
         { name: "查看页面", id: 7 },
 
         { name: "查看页面", id: 7 },
 
+        { name: "现场报到", id: 8 },
 
       ],
 
       ],
 
     },
 
     },
 
   ],
 
   ],
 
@@ -1056,11 +1057,12 @@ const updateS = async (row) => {
 
     }
 
     }
 
     // 选宿舍金额设置 12
 
     // 选宿舍金额设置 12
 
     if (addRolesData12.value) {
 
     if (addRolesData12.value) {
 
-      addRoles.dormitoryMoneySetting =
 
-        row.dormitoryMoneySetting.split(",");
 
-      addRolesData12.value.setCheckedKeys(
 
-        row.dormitoryMoneySetting.split(",")
 
-      );
 
+      if (row.dormitoryMoneySetting) {
 
+        addRoles.dormitoryMoneySetting = row.dormitoryMoneySetting.split(",");
 
+        addRolesData12.value.setCheckedKeys(
 
+          row.dormitoryMoneySetting.split(",")
 
+        );
 
+      }
 
     }
 
     }
 
 
 
     // 门锁管理 11
 
     // 门锁管理 11

+ 135 - 19
src/views/studentInfo/studentInfo.vue
Näytä tiedosto 

@@ -80,6 +80,17 @@
 
             </el-select>
 
             </el-select>
 
           </div>
 
           </div>
 
           <div class="condition">
 
           <div class="condition">
 
+            <span>现场报到 :</span>
 
+            <el-select
 
+              clearable
 
+              v-model="searchInput.isRegistered"
 
+              placeholder="请选择现场报到"
 
+            >
 
+              <el-option label="已报到" value="1" />
 
+              <el-option label="未报到" value="2" />
 
+            </el-select>
 
+          </div>
 
+          <div class="condition">
 
             <span>姓名 :</span>
 
             <span>姓名 :</span>
 
             <el-input
 
             <el-input
 
               clearable
 
               clearable
 
@@ -271,12 +282,22 @@
 
               <span v-else>{{ row.dormitory }}</span>
 
               <span v-else>{{ row.dormitory }}</span>
 
             </template>
 
             </template>
 
           </el-table-column>
 
           </el-table-column>
 
-
 
+          <el-table-column
 
+            width="160"
 
+            align="center"
 
+            prop="isRegistered"
 
+            label="现在报到"
 
+          >
 
+            <template #default="{ row }">
 
+              <span v-if="row.isRegistered == 1" style="color: #2279ec">已报到</span>
 
+              <span v-else>未报到</span>
 
+            </template>
 
+          </el-table-column>
 
           <el-table-column
 
           <el-table-column
 
             align="center"
 
             align="center"
 
             label="操作"
 
             label="操作"
 
             fixed="right"
 
             fixed="right"
 
-            min-width="180"
 
+            min-width="230"
 
           >
 
           >
 
             <template #default="{ row }">
 
             <template #default="{ row }">
 
               <div class="options">
 
               <div class="options">
 
@@ -298,6 +319,26 @@
 
                   @click="deleteS(row)"
 
                   @click="deleteS(row)"
 
                   >删除</span
 
                   >删除</span
 
                 >
 
                 >
 
+                <span
 
+                  class="delete"
 
+                  style="color: #c003a2; margin-left: 15px"
 
+                  v-if="
 
+                    store.BtnRole('studentManagementSetting8') &&
 
+                    row.isRegistered != 1
 
+                  "
 
+                  @click="registerS(row, 1)"
 
+                  >现场报到</span
 
+                >
 
+                <span
 
+                  class="delete"
 
+                  style="color: #c003a2; margin-left: 15px"
 
+                  v-if="
 
+                    store.BtnRole('studentManagementSetting8') &&
 
+                    row.isRegistered == 1
 
+                  "
 
+                  @click="registerS(row, 2)"
 
+                  >取消报到</span
 
+                >
 
               </div>
 
               </div>
 
             </template>
 
             </template>
 
           </el-table-column>
 
           </el-table-column>
 
@@ -421,13 +462,13 @@
 
                 clearable
 
                 clearable
 
               />
 
               />
 
             </el-form-item>
 
             </el-form-item>
 
-            <el-form-item label="毕业中学 :" prop="graduationSchool">
 
+            <!-- <el-form-item label="毕业中学 :" prop="graduationSchool">
 
               <el-input
 
               <el-input
 
                 v-model.trim="ruleForm.graduationSchool"
 
                 v-model.trim="ruleForm.graduationSchool"
 
                 placeholder="请输入毕业中学"
 
                 placeholder="请输入毕业中学"
 
                 clearable
 
                 clearable
 
               />
 
               />
 
-            </el-form-item>
 
+            </el-form-item> -->
 
             <el-form-item label="政治面貌 :" prop="politicalStatu">
 
             <el-form-item label="政治面貌 :" prop="politicalStatu">
 
               <el-input
 
               <el-input
 
                 v-model.trim="ruleForm.politicalStatu"
 
                 v-model.trim="ruleForm.politicalStatu"
 
@@ -973,10 +1014,10 @@
 
               <span class="title">考生号 :</span>
 
               <span class="title">考生号 :</span>
 
               <span class="title_content">{{ ruleForm.examNum }}</span>
 
               <span class="title_content">{{ ruleForm.examNum }}</span>
 
             </div>
 
             </div>
 
-            <div class="el-form-item" prop="graduationSchool">
 
+            <!-- <div class="el-form-item" prop="graduationSchool">
 
               <span class="title">毕业中学 :</span>
 
               <span class="title">毕业中学 :</span>
 
               <span class="title_content">{{ ruleForm.graduationSchool }}</span>
 
               <span class="title_content">{{ ruleForm.graduationSchool }}</span>
 
-            </div>
 
+            </div> -->
 
             <div class="el-form-item">
 
             <div class="el-form-item">
 
               <span class="title">政治面貌 :</span>
 
               <span class="title">政治面貌 :</span>
 
               <span class="title_content">{{ ruleForm.politicalStatu }}</span>
 
               <span class="title_content">{{ ruleForm.politicalStatu }}</span>
 
@@ -1325,6 +1366,7 @@
 
           class="queding"
 
           class="queding"
 
           type="primary"
 
           type="primary"
 
           @click="projectImportConfirm(buildRef)"
 
           @click="projectImportConfirm(buildRef)"
 
+          :loading="buildImportLoading"
 
         >
 
         >
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
           &nbsp;&nbsp;确认导入&nbsp;&nbsp;
 
         </el-button>
 
         </el-button>
 
@@ -1373,8 +1415,9 @@ const searchInput = reactive({
 
   major: "",
 
   major: "",
 
   classstr: "",
 
   classstr: "",
 
   trafficMethod: "",
 
   trafficMethod: "",
 
-  fillStatus:"",
 
+  fillStatus: "",
 
   name: "",
 
   name: "",
 
+  isRegistered:"",
 
 }); // 搜索按钮数据
 
 }); // 搜索按钮数据
 
 
 
 const currentPage = ref(1); // 当前页
 
 const currentPage = ref(1); // 当前页
 
@@ -1955,6 +1998,7 @@ const dormitoryChange = async (val) => {
 
 const buildImportVisible = ref(false);
 
 const buildImportVisible = ref(false);
 
 const buildRef = ref();
 
 const buildRef = ref();
 
 const buildFile = ref();
 
 const buildFile = ref();
 
+const buildImportLoading = ref(false);
 
 
 
 // 获取账户列表
 
 // 获取账户列表
 
 const getList = async () => {
 
 const getList = async () => {
 
@@ -1967,7 +2011,8 @@ const getList = async () => {
 
     classstrId: searchInput.classstr,
 
     classstrId: searchInput.classstr,
 
     trafficMethod: searchInput.trafficMethod,
 
     trafficMethod: searchInput.trafficMethod,
 
     name: searchInput.name,
 
     name: searchInput.name,
 
-    fillStatus:searchInput.fillStatus
 
+    fillStatus: searchInput.fillStatus,
 
+    isRegistered: searchInput.isRegistered,
 
   };
 
   };
 
   console.log(params);
 
   console.log(params);
 
 
 
@@ -2005,7 +2050,8 @@ const resetBtn = lodash.debounce(async () => {
 
   classstrData.value = null;
 
   classstrData.value = null;
 
   searchInput.trafficMethod = null;
 
   searchInput.trafficMethod = null;
 
   searchInput.name = null;
 
   searchInput.name = null;
 
-  searchInput.fillStatus=null
 
+  searchInput.fillStatus = null;
 
+  searchInput.isRegistered = null;
 
   getList();
 
   getList();
 
 }, 300);
 
 }, 300);
 
 
 
@@ -2164,10 +2210,10 @@ const updateS = async (row) => {
 
     majorList(resData.collegeId).then(() => {
 
     majorList(resData.collegeId).then(() => {
 
       ruleForm.major = `${resData.major},${resData.majorId}`;
 
       ruleForm.major = `${resData.major},${resData.majorId}`;
 
       classstrList(resData.majorId).then(() => {
 
       classstrList(resData.majorId).then(() => {
 
-        if(resData.classstr){
 
+        if (resData.classstr) {
 
           ruleForm.classstr = `${resData.classstr},${resData.classstrId}`;
 
           ruleForm.classstr = `${resData.classstr},${resData.classstrId}`;
 
-        }else{
 
-          ruleForm.classstr = null
 
+        } else {
 
+          ruleForm.classstr = null;
 
         }
 
         }
 
       });
 
       });
 
     });
 
     });
 
@@ -2182,13 +2228,13 @@ const updateS = async (row) => {
 
     // 填报明细
 
     // 填报明细
 
     ruleForm.phone = resData.phone;
 
     ruleForm.phone = resData.phone;
 
 
 
-    if (ruleForm.oprovince) {
 
+    if (resData.oprovince) {
 
       ruleForm.oprovince = `${resData.oprovince},${resData.oprovinceId}`;
 
       ruleForm.oprovince = `${resData.oprovince},${resData.oprovinceId}`;
 
       cityList("籍贯").then(() => {
 
       cityList("籍贯").then(() => {
 
-        if (ruleForm.ocity) {
 
+        if (resData.ocity) {
 
           ruleForm.ocity = `${resData.ocity},${resData.ocityId}`;
 
           ruleForm.ocity = `${resData.ocity},${resData.ocityId}`;
 
           districtList("籍贯").then(() => {
 
           districtList("籍贯").then(() => {
 
-            if (ruleForm.odistrict) {
 
+            if (resData.odistrict) {
 
               ruleForm.odistrict = `${resData.odistrict},${resData.odistrictId}`;
 
               ruleForm.odistrict = `${resData.odistrict},${resData.odistrictId}`;
 
             }
 
             }
 
           });
 
           });
 
@@ -2196,13 +2242,13 @@ const updateS = async (row) => {
 
       });
 
       });
 
     }
 
     }
 
 
 
-    if (ruleForm.province) {
 
+    if (resData.province) {
 
       ruleForm.province = `${resData.province},${resData.provinceId}`;
 
       ruleForm.province = `${resData.province},${resData.provinceId}`;
 
       cityList().then(() => {
 
       cityList().then(() => {
 
-        if (ruleForm.city) {
 
+        if (resData.city) {
 
           ruleForm.city = `${resData.city},${resData.cityId}`;
 
           ruleForm.city = `${resData.city},${resData.cityId}`;
 
           districtList().then(() => {
 
           districtList().then(() => {
 
-            if (ruleForm.district) {
 
+            if (resData.district) {
 
               ruleForm.district = `${resData.district},${resData.districtId}`;
 
               ruleForm.district = `${resData.district},${resData.districtId}`;
 
             }
 
             }
 
           });
 
           });
 
@@ -2271,6 +2317,71 @@ const deleteS = async (row) => {
 
       loading.value = false;
 
       loading.value = false;
 
     });
 
     });
 
 };
 
 };
 
+const registerS = async (row, flag) => {
 
+  if (flag == 1) {
 
+    let data = {
 
+      id: row.id,
 
+      isRegistered: flag, //已报到：1，未报到：2，为空默认是未报到
 
+    };
 
+    let res = await https.post(
 
+      "/welcome/api/welcomeStudent/isRegistered",
 
+      "data",
 
+      data
 
+    );
 
+    if (res.code == 200) {
 
+      ElMessage({
 
+        type: "success",
 
+        showClose: true,
 
+        message: res.message,
 
+        center: true,
 
+      });
 
+      getList();
 
+    } else {
 
+      ElMessage({
 
+        type: "error",
 
+        showClose: true,
 
+        message: res.message,
 
+        center: true,
 
+      });
 
+    }
 
+  } else if (flag != 1) {
 
+    ElMessageBox.confirm("是否取消报到?", "提示!!!", {
 
+      confirmButtonText: "确认",
 
+      cancelButtonText: "取消",
 
+      type: "warning",
 
+    })
 
+      .then(async () => {
 
+        let data = {
 
+          id: row.id,
 
+          isRegistered: flag, //已报到：1，未报到：2，为空默认是未报到
 
+        };
 
+        let res = await https.post(
 
+          "/welcome/api/welcomeStudent/isRegistered",
 
+          "data",
 
+          data
 
+        );
 
+        if (res.code == 200) {
 
+          ElMessage({
 
+            type: "success",
 
+            showClose: true,
 
+            message: res.message,
 
+            center: true,
 
+          });
 
+          getList();
 
+        } else {
 
+          ElMessage({
 
+            type: "error",
 
+            showClose: true,
 
+            message: res.message,
 
+            center: true,
 
+          });
 
+        }
 
+      })
 
+      .catch(() => {
 
+        loading.value = false;
 
+      });
 
+  }
 
+};
 
 const arriveTimeChange = (val) => {
 
 const arriveTimeChange = (val) => {
 
   console.log(val);
 
   console.log(val);
 
 };
 
 };
 
@@ -2626,7 +2737,8 @@ const buildExportbtn = async () => {
 
     classstrId: searchInput.classstr,
 
     classstrId: searchInput.classstr,
 
     trafficMethod: searchInput.trafficMethod,
 
     trafficMethod: searchInput.trafficMethod,
 
     name: searchInput.name,
 
     name: searchInput.name,
 
-    fillStatus:searchInput.fillStatus
 
+    fillStatus: searchInput.fillStatus,
 
+    isRegistered: searchInput.isRegistered,
 
   };
 
   };
 
   let res = await https.getBlob(
 
   let res = await https.getBlob(
 
     "/welcome/api/welcomeStudent/welcomeStudentExport",
 
     "/welcome/api/welcomeStudent/welcomeStudentExport",
 
@@ -2703,6 +2815,8 @@ const projectImportExceed = (files) => {
 
 };
 
 };
 
 // 导入项目
 
 // 导入项目
 
 const projectImportConfirm = async () => {
 
 const projectImportConfirm = async () => {
 
+  buildImportLoading.value = true;
 
+
 
   let data = new FormData();
 
   let data = new FormData();
 
   data.set("file", buildFile.value);
 
   data.set("file", buildFile.value);
 
   let res = await https.post(
 
   let res = await https.post(
 
@@ -2713,6 +2827,8 @@ const projectImportConfirm = async () => {
 
   console.log(res, "导入项目");
 
   console.log(res, "导入项目");
 
   if (res.code == 200) {
 
   if (res.code == 200) {
 
     buildImportVisible.value = false;
 
     buildImportVisible.value = false;
 
+
 
+    buildImportLoading.value = false;
 
     getList();
 
     getList();
 
     ElMessage({
 
     ElMessage({
 
       type: "success",
 
       type: "success",