47 4 months ago
parent
commit
d33184f36b

+ 10 - 0
src/api/system/user/index.ts

@@ -227,4 +227,14 @@ export const getInnerSupervisor = () => {
 export const getExternalSupervisor = () => {
   return request.get({ url: '/system/user/getExternalSupervisor'})
 }
+
+// 获取今年通过的学生名单
+export const exportStudentPassedExcel = (params) => {
+  return request.download({ url: '/system/user/exportStudentPassedExcel', params })
+}
+
+// 获取今年未通过的学生名单
+export const exportStudentUnPassedExcel = (params) => {
+  return request.download({ url: '/system/user/exportStudentUnPassedExcel', params })
+}
   

+ 1 - 2
src/views/system/Home/Index.vue

@@ -80,7 +80,7 @@
                     <span style="color: rgba(4,53,103,0.89)">实时打卡状态</span>
                   </div>
                 </template>
-                <!--                <div class="demo" >-->
+                <!-- <div class="demo" >-->
                 <div class="table-header" >
                   <div class="header" >
                     <el-row class="shouye" >
@@ -654,7 +654,6 @@ const list1Options = reactive({
       if (chartRef.value) {
         chartInstance.value = echarts.init(chartRef.value);
         chartInstance.value.setOption(pieOptionsData);
-
         window.addEventListener('resize', resizeChart);
         resizeChart();
       }

+ 24 - 0
src/views/system/studentSelection/studentSelectionNo/index.vue

@@ -69,6 +69,14 @@
     <el-form-item>
       <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
       <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      <el-button
+        type="primary"
+        @click="exportExcel"
+        :loading="exportLoading"
+        v-hasPermi="['system:user:exportStudentUnPassedExcel']"
+      >
+        批量导出
+      </el-button>
     </el-form-item>
     </el-form>
   </ContentWrap>
@@ -143,6 +151,7 @@ import {studentSelectSupervisorRecordApi, studentSelectSupervisorRecordVO} from
 import {studentSelectionProjectApi, studentSelectionProjectVO} from "@/api/system/studentSelectionProject"
 import * as UserApi from '@/api/system/user'
 import studentSelectSupervisorRecordForm from '../studentSelectSupervisorRecord/studentSelectSupervisorRecordForm.vue'
+import  download  from '@/utils/download'
 
 defineOptions({ name: 'StudentSelectionWait' })
 
@@ -245,6 +254,21 @@ const handleDownload = (row) => {
     }
 };
 
+const exportLoading = ref(false) // 导出的加载中
+const exportExcel = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UserApi.exportStudentUnPassedExcel(queryForm)
+    download.excel(data, '未分配学生名单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 onMounted(() => {
   getUnPassList()
   getSupervisor()

+ 24 - 0
src/views/system/studentSelection/studentSelectionYes/index.vue

@@ -73,6 +73,14 @@
     <el-form-item>
       <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
       <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      <el-button
+        type="primary"
+        @click="exportExcel"
+        :loading="exportLoading"
+        v-hasPermi="['system:user:exportStudentPassedExcel']"
+      >
+        批量导出
+      </el-button>
     </el-form-item>
     </el-form>
   </ContentWrap>
@@ -136,6 +144,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import {studentSelectionProjectApi, studentSelectionProjectVO} from "@/api/system/studentSelectionProject"
 import * as UserApi from '@/api/system/user'
 import studentSelectSupervisorRecordForm from '../studentSelectSupervisorRecord/studentSelectSupervisorRecordForm.vue'
+import  download  from '@/utils/download'
 
 defineOptions({ name: 'StudentSelectionWait' })
 
@@ -239,6 +248,21 @@ const handleDownload = (row) => {
     }
 };
 
+const exportLoading = ref(false) // 导出的加载中
+const exportExcel = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UserApi.exportStudentPassedExcel(queryForm)
+    download.excel(data, '分配成功学生名单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 onMounted(() => {
   getPassList()
   getSupervisor()