From 451c097ce7cf03273c3ff552b3dbf71998cfed5d Mon Sep 17 00:00:00 2001
From: wanglingyu <1512528122@qq.com>
Date: Tue, 4 Jul 2023 11:06:12 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=95=99=E8=81=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                         |  19 +-
 src/views/ReportView.vue                    |  10 +
 src/wanglingyu/api/{upload.js => import.js} |  28 ++-
 src/wanglingyu/views/GpaEvalView.vue        | 226 ++++++++++++++++++++
 src/wanglingyu/views/ImportFacultyView.vue  | 130 +++++++++++
 src/wanglingyu/views/ImportListView.vue     |   2 +-
 src/wanglingyu/views/ImportStudentView.vue  | 133 ++++++++++++
 src/wanglingyu/views/StuInformView.vue      | 121 +++++++++++
 8 files changed, 662 insertions(+), 7 deletions(-)
 rename src/wanglingyu/api/{upload.js => import.js} (43%)
 create mode 100644 src/wanglingyu/views/GpaEvalView.vue
 create mode 100644 src/wanglingyu/views/ImportFacultyView.vue
 create mode 100644 src/wanglingyu/views/ImportStudentView.vue
 create mode 100644 src/wanglingyu/views/StuInformView.vue

diff --git a/src/router/index.js b/src/router/index.js
index 54c0836..f8435db 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -69,6 +69,12 @@ const routes = [
         component: () => import('@/views/ReportView'),
         meta: { title: 'Report', icon: 'el-icon-edit'}
       },
+      {
+        path: '/student/inform',
+        name: '个人信息确认',
+        component: () => import('@/wanglingyu/views/StuInformView'),
+        meta: { title: 'Report', icon: 'el-icon-edit'}
+      },
       {
         path: '/student/summary',
         name: '学年总结填报',
@@ -114,7 +120,7 @@ const routes = [
       {
         path: '/eval/gpa',
         name: '学生成绩审核',
-        component: () => import('@/views/evals/GpaEvalView'),
+        component: () => import('@/wanglingyu/views/GpaEvalView'),
         meta: { title: 'Report', icon: 'el-icon-edit'}
       },
       {
@@ -158,12 +164,17 @@ const routes = [
     path: '/admin',
     name: '学工页面', icon: 'el-icon-s-check',
     component: () => import('@/layout'),
-    redirect: '/admin/import',
+    redirect: '/admin/importStudent',
     children: [
       {
-        path: '/admin/import',
+        path: '/admin/importStudent',
         name: '导入学生名单',
-        component: () => import('@/wanglingyu/views/ImportListView')
+        component: () => import('@/wanglingyu/views/ImportStudentView')
+      },
+      {
+        path: '/admin/importFaculty',
+        name: '导入教职工名单',
+        component: () => import('@/wanglingyu/views/ImportFacultyView')
       },
       {
         path: '/admin/collect',
diff --git a/src/views/ReportView.vue b/src/views/ReportView.vue
index 85c31ad..5c916eb 100644
--- a/src/views/ReportView.vue
+++ b/src/views/ReportView.vue
@@ -16,6 +16,16 @@
       <el-button @click="$router.push({ path: '/practiceEval' })" >进入实践评委打分页面</el-button>
     </div>
 
+    <div class="report-container" style="width:70vw; background-color: rgba(178,180,178,0.16)">
+
+<h2>王灵语接口</h2>
+<br>
+<el-button @click="$router.push({ path: '/admin/importStudent' })" >导入学生名单</el-button>
+<el-button @click="$router.push({ path: '/admin/importFaculty' })" >导入教职工名单</el-button>
+<el-button @click="$router.push({ path: '/eval/gpa' })" >学生成绩审核（导入gpa）</el-button>
+<el-button @click="$router.push({ path: '/student/inform' })" >学生个人信息确认（gpa确认）</el-button>
+</div>
+
   </div>
 </template>
 
diff --git a/src/wanglingyu/api/upload.js b/src/wanglingyu/api/import.js
similarity index 43%
rename from src/wanglingyu/api/upload.js
rename to src/wanglingyu/api/import.js
index 07bdbe3..4e7fa6b 100644
--- a/src/wanglingyu/api/upload.js
+++ b/src/wanglingyu/api/import.js
@@ -1,6 +1,6 @@
 import service from '@/utils/service';
 
-// 导入名单
+// 导入学生名单
 export function importStu(file) {
     const data = {
       file
@@ -12,7 +12,7 @@ export function importStu(file) {
     })
   }
 
-  export function getPage(page, pageSize){
+  export function getStuPage(page, pageSize){
       const data = {
         page,
         pageSize
@@ -22,4 +22,28 @@ export function importStu(file) {
         method:'get',
         data:data
       })
+  }
+
+// 导入教职工名单
+  export function importFaculty(file) {
+    const data = {
+      file
+    }
+    return service({
+      url: '/faculty/import',
+      method: 'post',
+      data: data
+    })
+  }
+
+  export function getFacultyPage(page, pageSize){
+      const data = {
+        page,
+        pageSize
+      }
+      return service({
+        url:'/faculty/page',
+        method:'get',
+        data:data
+      })
   }
\ No newline at end of file
diff --git a/src/wanglingyu/views/GpaEvalView.vue b/src/wanglingyu/views/GpaEvalView.vue
new file mode 100644
index 0000000..01987ca
--- /dev/null
+++ b/src/wanglingyu/views/GpaEvalView.vue
@@ -0,0 +1,226 @@
+<!-- 学生成绩审核页面 -->
+<template>
+    <div>
+      <h1>学生成绩审核</h1>
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+        :default-sort="{ prop: 'stuNum' }"
+      >
+        <el-table-column prop="stuNum" label="学号" sortable> </el-table-column>
+        <el-table-column prop="name" label="姓名"> </el-table-column>
+        <el-table-column prop="gpa" label="GPA" sortable> </el-table-column>
+        <el-table-column prop="score" label="分数" sortable> </el-table-column>
+        <el-table-column
+          prop="tag"
+          label="状态"
+          :filters="[
+            { text: '学生未确认', value: '学生未确认' },
+            { text: '学生已确认', value: '学生已确认' },
+            { text: '评委已确认', value: '评委已确认' },
+            { text: '申诉中', value: '申诉中' },
+          ]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="
+                scope.row.tag === '学生未确认'
+                  ? 'info'
+                  : scope.row.tag === '学生已确认'
+                  ? 'primary'
+                  : scope.row.tag === '评委已确认'
+                  ? 'success'
+                  : 'danger'
+              "
+              close-transition
+              >{{ scope.row.tag }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              @click="gpaConfirm(scope.$index, scope.row)"
+              type="text"
+              size="small"
+              >确认</el-button
+            >
+            <el-button
+              @click="sendReminder(scope.$index, scope.row)"
+              type="text"
+              size="small"
+              >提醒</el-button
+            >
+            <el-button
+              @click="handleAppeal(scope.$index, scope.row)"
+              type="text"
+              size="small"
+              >处理</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      
+  
+      <el-dialog title="申诉处理" :visible.sync="AppealVisible" center>
+        <el-input type="textarea" :rows="5" v-model="textarea" readonly="true">
+          {{ textarea }}
+        </el-input>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="AppealVisible = false">取 消</el-button>
+          <el-button type="danger" @click="rejectAppeal()">驳回申请</el-button>
+          <el-button type="primary" @click="acceptAppeal()">修改成绩</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  
+  
+  
+  <script>
+  export default {
+    data() {
+      return {
+        textarea: "成绩评定有误",
+        tableData: [
+          {
+            stuNum: "2200022901",
+            name: "张一",
+            gpa: "3.9",
+            score: "80",
+            tag: "学生已确认",
+            appeal: "true",
+          },
+          {
+            stuNum: "2200022902",
+            name: "张二",
+            gpa: "3.9",
+            score: "80",
+            tag: "评委已确认",
+          },
+          {
+            stuNum: "2200022903",
+            name: "张三",
+            gpa: "3.9",
+            score: "80",
+            tag: "学生未确认",
+          },
+          {
+            stuNum: "2200022904",
+            name: "张四",
+            gpa: "3.9",
+            score: "80",
+            tag: "申诉中",
+          },
+          {
+            stuNum: "2200022905",
+            name: "张五",
+            gpa: "3.9",
+            score: "80",
+            tag: "学生未确认",
+          },
+          {
+            stuNum: "2200022906",
+            name: "张六",
+            gpa: "3.9",
+            score: "80",
+            tag: "申诉中",
+          },
+        ],
+        AppealVisible: false,
+      };
+    },
+    methods: {
+      filterTag(value, row) {
+        return row.tag === value;
+      },
+  
+      gradeConfirm(index, row) {
+        console.log(index, row);
+        //弹窗
+  
+        if (row.tag == "学生已确认") {
+          this.$confirm("确认分数无误?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "success",
+          })
+            .then(() => {
+              //确认
+              //……
+              row.tag = "评委已确认";
+  
+              this.$message({
+                type: "success",
+                message: "确认成功!",
+              });
+            })
+            .catch(() => {
+              this.$message({
+                type: "info",
+                message: "已取消确认",
+              });
+            });
+        }
+      },
+  
+      sendReminder(index, row) {
+        console.log(index, row);
+        //弹窗
+        if (row.tag == "学生未确认") {
+          this.$confirm("提醒学生确认成绩?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              //发送提醒
+              //……
+              this.$message({
+                type: "success",
+                message: "已发送提醒!",
+              });
+            })
+            .catch(() => {
+              this.$message({
+                type: "info",
+                message: "取消发送提醒",
+              });
+            });
+        }
+      },
+  
+      handleAppeal(index, row) {
+        console.log(index, row);
+  
+        if (row.tag == "申诉中") {
+          this.AppealVisible = true;
+        }
+      },
+  
+      rejectAppeal() {
+        // 驳回申诉，发送通知
+        // ……
+  
+        this.AppealVisible = false;
+        this.$message({
+          type: "danger",
+          message: "已驳回申请!",
+        });
+      },
+      acceptAppeal() {
+        // 接受申诉，修改成绩
+        // ……
+  
+        this.AppealVisible = false;
+        this.$message({
+          type: "success",
+          message: "已修改成绩!",
+        });
+      },
+    },
+  };
+  </script>
\ No newline at end of file
diff --git a/src/wanglingyu/views/ImportFacultyView.vue b/src/wanglingyu/views/ImportFacultyView.vue
new file mode 100644
index 0000000..2ca2600
--- /dev/null
+++ b/src/wanglingyu/views/ImportFacultyView.vue
@@ -0,0 +1,130 @@
+<template>
+  <div>
+    <el-container>
+      <el-header
+        ><el-button type="primary" @click="dialogVisible = true"
+          >导入教职工名单</el-button
+        >
+
+        <el-dialog
+          title="导入教职工名单"
+          :visible.sync="dialogVisible"
+          width="40%"
+        >
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            drag
+            :action="uploadUrl"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :auto-upload="false"
+            :on-change="handleFileChange"
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+              将文件拖到此处，或<em>点击上传</em>
+            </div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <span>仅允许导入xls、xlsx格式文件。</span>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="uploadFile">上 传</el-button>
+          </div>
+        </el-dialog></el-header
+      >
+      <el-main
+        ><el-table v-if="facultyList.length > 0" :data="facultyList" border
+          ><el-table-column
+            type="index"
+            :index="indexMethod"
+            align="center"
+            label="序号"
+            width="50"
+          ></el-table-column>
+          <el-table-column prop="cardId" label="学号"></el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
+          <el-table-column prop="depart" label="部门"></el-table-column>
+          <el-table-column prop="job" label="职位"></el-table-column>
+          <el-table-column prop="role" label="角色"></el-table-column>
+          <el-table-column prop="password" label="密码"></el-table-column>
+          <el-table-column prop="status" label="状态"></el-table-column>
+          <el-table-column prop="birthday" label="生日"></el-table-column>
+          <el-table-column prop="gender" label="性别"></el-table-column>
+          <el-table-column prop="phone" label="电话"></el-table-column>
+          <el-table-column
+            prop="email"
+            label="邮箱"
+          ></el-table-column> </el-table
+      ></el-main>
+      <el-footer
+        ><el-pagination
+          v-if="facultyList.length > 0"
+          background
+          :current-page="currentPage"
+          :page-size="pageSize"
+          :total="totalFaculties"
+          :page-sizes="[10, 20, 30, 50]"
+          @current-change="handlePageChange"
+          @size-change="handleSizeChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        >
+        </el-pagination
+      ></el-footer>
+    </el-container>
+  </div>
+</template>
+  
+  <script>
+import { getFacultyPage } from "@/wanglingyu/api/import";
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      uploadUrl: "http://localhost:20235/faculty/import",
+      file: null,
+      currentPage: 1,
+      pageSize: 10,
+      facultyList: [], // 学生列表数据
+      totalFaculties: 0, // 总学生数
+    };
+  },
+  mounted() {
+    this.fetchFacultyList();
+  },
+  methods: {
+    indexMethod(index) {
+      return index + 1 + (this.currentPage - 1) * this.pageSize; // 返回表格序号
+    },
+    async fetchFacultyList() {
+      const response = await getFacultyPage(this.currentPage, this.pageSize);
+      this.facultyList = response.data.data.rows; // 将数据赋值给facultyList
+      this.totalFaculties = response.data.data.total; // 设置总学生数
+    },
+    handleFileChange(file) {
+      this.file = file;
+    },
+    uploadFile() {
+      if (this.file) {
+        this.$refs.upload.submit();
+        this.dialogVisible = false;
+      } else {
+        // 处理未选择文件的情况
+        // 可以显示提示信息或进行其他操作
+      }
+    },
+    handlePageChange(currentPage) {
+      this.currentPage = currentPage;
+      this.fetchFacultyList();
+    },
+    handleSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.fetchFacultyList();
+    },
+  },
+};
+</script>
+  
\ No newline at end of file
diff --git a/src/wanglingyu/views/ImportListView.vue b/src/wanglingyu/views/ImportListView.vue
index 1c6c3a8..fd63295 100644
--- a/src/wanglingyu/views/ImportListView.vue
+++ b/src/wanglingyu/views/ImportListView.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import { getPage } from "@/wanglingyu/api/upload";
+import { getPage } from "@/wanglingyu/api/import";
 
 export default {
   data() {
diff --git a/src/wanglingyu/views/ImportStudentView.vue b/src/wanglingyu/views/ImportStudentView.vue
new file mode 100644
index 0000000..04bb642
--- /dev/null
+++ b/src/wanglingyu/views/ImportStudentView.vue
@@ -0,0 +1,133 @@
+<template>
+  <div>
+    <el-container>
+      <el-header
+        ><el-button type="primary" @click="dialogVisible = true"
+          >导入学生名单</el-button
+        >
+        <!-- <el-button type="primary" @click="dialogVisible = true"
+          >新增学生</el-button
+        > -->
+      </el-header>
+      <el-main>
+        <el-table v-if="studentList.length > 0" :data="studentList" border
+          ><el-table-column
+            type="index"
+            :index="indexMethod"
+            align="center"
+            label="序号"
+            width="50"
+          ></el-table-column>
+          <el-table-column prop="cardId" label="学号"></el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
+          <el-table-column prop="school" label="学院"></el-table-column>
+          <el-table-column prop="grade" label="年级"></el-table-column>
+          <el-table-column prop="clas" label="班级"></el-table-column>
+          <el-table-column prop="major" label="专业"></el-table-column>
+          <el-table-column prop="password" label="密码"></el-table-column>
+          <el-table-column prop="status" label="状态"></el-table-column>
+          <el-table-column prop="birthday" label="生日"></el-table-column>
+          <el-table-column prop="gender" label="性别"></el-table-column>
+          <el-table-column prop="phone" label="电话"></el-table-column>
+          <el-table-column
+            prop="email"
+            label="邮箱"
+          ></el-table-column> </el-table
+      ></el-main>
+      <el-footer
+        ><el-pagination
+          v-if="studentList.length > 0"
+          background
+          :current-page="currentPage"
+          :page-size="pageSize"
+          :total="totalStudents"
+          :page-sizes="[10, 20, 30, 50]"
+          @current-change="handlePageChange"
+          @size-change="handleSizeChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        >
+        </el-pagination
+      ></el-footer>
+
+      <el-dialog title="导入学生" :visible.sync="dialogVisible" width="40%">
+        <el-upload
+          ref="upload"
+          class="upload-demo"
+          drag
+          :action="uploadUrl"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :auto-upload="false"
+          :on-change="handleFileChange"
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-center" slot="tip">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+          </div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="uploadFile">上 传</el-button>
+        </div>
+      </el-dialog>
+    </el-container>
+  </div>
+</template>
+  
+  <script>
+import { getStuPage } from "@/wanglingyu/api/import";
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      uploadUrl: "http://localhost:20235/student/import",
+      file: null,
+      currentPage: 1,
+      pageSize: 10,
+      studentList: [], // 学生列表数据
+      totalStudents: 0, // 总学生数
+    };
+  },
+  mounted() {
+    this.fetchStudentList();
+  },
+  methods: {
+    indexMethod(index) {
+      return index + 1 + (this.currentPage - 1) * this.pageSize; // 返回表格序号
+    },
+    async fetchStudentList() {
+      const response = await getStuPage(this.currentPage, this.pageSize);
+      this.studentList = response.data.data.rows; // 将数据赋值给studentList
+      this.totalStudents = response.data.data.total; // 设置总学生数
+    },
+    handleFileChange(file) {
+      this.file = file;
+    },
+    uploadFile() {
+      if (this.file) {
+        this.$refs.upload.submit();
+        this.dialogVisible = false;
+      } else {
+        // 处理未选择文件的情况
+        // 可以显示提示信息或进行其他操作
+      }
+    },
+    handlePageChange(currentPage) {
+      this.currentPage = currentPage;
+      this.fetchStudentList();
+    },
+    handleSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.fetchStudentList();
+    },
+  },
+};
+</script>
+  
+<!-- <style>
+.el-header {
+  text-align: left;
+}
+</style> -->
\ No newline at end of file
diff --git a/src/wanglingyu/views/StuInformView.vue b/src/wanglingyu/views/StuInformView.vue
new file mode 100644
index 0000000..4cfdf04
--- /dev/null
+++ b/src/wanglingyu/views/StuInformView.vue
@@ -0,0 +1,121 @@
+<template>
+    <div>
+      <el-container>
+        <el-header
+          ><el-button type="primary" @click="dialogVisible = true"
+            >导入学生</el-button
+          >
+  
+          <el-dialog title="导入学生" :visible.sync="dialogVisible" width="40%">
+            <el-upload
+              ref="upload"
+              class="upload-demo"
+              drag
+              :action="uploadUrl"
+              :limit="1"
+              accept=".xlsx, .xls"
+              :auto-upload="false"
+              :on-change="handleFileChange"
+            >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                将文件拖到此处，或<em>点击上传</em>
+              </div>
+              <div class="el-upload__tip text-center" slot="tip">
+                <span>仅允许导入xls、xlsx格式文件。</span>
+              </div>
+            </el-upload>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogVisible = false">取 消</el-button>
+              <el-button type="primary" @click="uploadFile">上 传</el-button>
+            </div>
+          </el-dialog></el-header
+        >
+        <el-main
+          ><el-table v-if="studentList.length > 0" :data="studentList" border
+            ><el-table-column
+              type="index"
+              :index="indexMethod"
+              align="center"
+              label="序号"
+              width="50"
+            ></el-table-column>
+            <el-table-column prop="card_id" label="学号"></el-table-column>
+            <el-table-column prop="name" label="姓名"></el-table-column>
+            <el-table-column prop="school" label="学院"></el-table-column>
+            <el-table-column prop="grade" label="年级"></el-table-column>
+            <el-table-column prop="stu_class" label="班级"></el-table-column>
+            <el-table-column
+              prop="major"
+              label="专业"
+            ></el-table-column> </el-table
+        ></el-main>
+        <el-footer
+          ><el-pagination
+            v-if="studentList.length > 0"
+            background
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :total="totalStudents"
+            :page-sizes="[10, 20, 30, 50]"
+            @current-change="handlePageChange"
+            @size-change="handleSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+          >
+          </el-pagination
+        ></el-footer>
+      </el-container>
+    </div>
+  </template>
+  
+  <script>
+  import { getPage } from "@/wanglingyu/api/import";
+  
+  export default {
+    data() {
+      return {
+        dialogVisible: false,
+        uploadUrl: "http://localhost:20235/student/import",
+        file: null,
+        currentPage: 1,
+        pageSize: 10,
+        studentList: [], // 学生列表数据
+        totalStudents: 0, // 总学生数
+      };
+    },
+    mounted() {
+      this.fetchStudentList();
+    },
+    methods: {
+      indexMethod(index) {
+        return index + 1 + (this.currentPage - 1) * this.pageSize; // 返回表格序号
+      },
+      async fetchStudentList() {
+        const response = await getPage(this.currentPage, this.pageSize);
+        this.studentList = response.data.data.rows; // 将数据赋值给studentList
+        this.totalStudents = response.data.data.total; // 设置总学生数
+      },
+      handleFileChange(file) {
+        this.file = file;
+      },
+      uploadFile() {
+        if (this.file) {
+          this.$refs.upload.submit();
+          this.dialogVisible = false;
+        } else {
+          // 处理未选择文件的情况
+          // 可以显示提示信息或进行其他操作
+        }
+      },
+      handlePageChange(currentPage) {
+        this.currentPage = currentPage;
+        this.fetchStudentList();
+      },
+      handleSizeChange(pageSize) {
+        this.pageSize = pageSize;
+        this.fetchStudentList();
+      },
+    },
+  };
+  </script>
+  
\ No newline at end of file
-- 
Gitee


From 17b8e72d512457c3838969ce9184c128b20ec844 Mon Sep 17 00:00:00 2001
From: wanglingyu <1512528122@qq.com>
Date: Tue, 4 Jul 2023 11:09:47 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ReportView.vue             |  12 +-
 src/wanglingyu/api/import.js         |  25 +++
 src/wanglingyu/views/GpaEvalView.vue | 305 +++++++++------------------
 3 files changed, 127 insertions(+), 215 deletions(-)

diff --git a/src/views/ReportView.vue b/src/views/ReportView.vue
index 5c916eb..b5b9e11 100644
--- a/src/views/ReportView.vue
+++ b/src/views/ReportView.vue
@@ -16,17 +16,7 @@
       <el-button @click="$router.push({ path: '/practiceEval' })" >进入实践评委打分页面</el-button>
     </div>
 
-    <div class="report-container" style="width:70vw; background-color: rgba(178,180,178,0.16)">
-
-<h2>王灵语接口</h2>
-<br>
-<el-button @click="$router.push({ path: '/admin/importStudent' })" >导入学生名单</el-button>
-<el-button @click="$router.push({ path: '/admin/importFaculty' })" >导入教职工名单</el-button>
-<el-button @click="$router.push({ path: '/eval/gpa' })" >学生成绩审核（导入gpa）</el-button>
-<el-button @click="$router.push({ path: '/student/inform' })" >学生个人信息确认（gpa确认）</el-button>
-</div>
-
-  </div>
+    
 </template>
 
 <script>
diff --git a/src/wanglingyu/api/import.js b/src/wanglingyu/api/import.js
index 4e7fa6b..c9c415f 100644
--- a/src/wanglingyu/api/import.js
+++ b/src/wanglingyu/api/import.js
@@ -46,4 +46,29 @@ export function importStu(file) {
         method:'get',
         data:data
       })
+  }
+
+
+  // 导入GPA
+  export function importGpa(file) {
+    const data = {
+      file
+    }
+    return service({
+      url: '/gpa/import',
+      method: 'post',
+      data: data
+    })
+  }
+
+  export function getGpaPage(page, pageSize){
+      const data = {
+        page,
+        pageSize
+      }
+      return service({
+        url:'/gpa/page',
+        method:'get',
+        data:data
+      })
   }
\ No newline at end of file
diff --git a/src/wanglingyu/views/GpaEvalView.vue b/src/wanglingyu/views/GpaEvalView.vue
index 01987ca..b13fa78 100644
--- a/src/wanglingyu/views/GpaEvalView.vue
+++ b/src/wanglingyu/views/GpaEvalView.vue
@@ -1,225 +1,122 @@
-<!-- 学生成绩审核页面 -->
 <template>
     <div>
-      <h1>学生成绩审核</h1>
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-        :default-sort="{ prop: 'stuNum' }"
-      >
-        <el-table-column prop="stuNum" label="学号" sortable> </el-table-column>
-        <el-table-column prop="name" label="姓名"> </el-table-column>
-        <el-table-column prop="gpa" label="GPA" sortable> </el-table-column>
-        <el-table-column prop="score" label="分数" sortable> </el-table-column>
-        <el-table-column
-          prop="tag"
-          label="状态"
-          :filters="[
-            { text: '学生未确认', value: '学生未确认' },
-            { text: '学生已确认', value: '学生已确认' },
-            { text: '评委已确认', value: '评委已确认' },
-            { text: '申诉中', value: '申诉中' },
-          ]"
-          :filter-method="filterTag"
-          filter-placement="bottom-end"
-        >
-          <template slot-scope="scope">
-            <el-tag
-              :type="
-                scope.row.tag === '学生未确认'
-                  ? 'info'
-                  : scope.row.tag === '学生已确认'
-                  ? 'primary'
-                  : scope.row.tag === '评委已确认'
-                  ? 'success'
-                  : 'danger'
-              "
-              close-transition
-              >{{ scope.row.tag }}</el-tag
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button
-              @click="gpaConfirm(scope.$index, scope.row)"
-              type="text"
-              size="small"
-              >确认</el-button
-            >
-            <el-button
-              @click="sendReminder(scope.$index, scope.row)"
-              type="text"
-              size="small"
-              >提醒</el-button
-            >
-            <el-button
-              @click="handleAppeal(scope.$index, scope.row)"
-              type="text"
-              size="small"
-              >处理</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      
+      <el-container>
+        <el-header
+          ><el-button type="primary" @click="dialogVisible = true"
+            >导入学生成绩</el-button
+          >
   
-      <el-dialog title="申诉处理" :visible.sync="AppealVisible" center>
-        <el-input type="textarea" :rows="5" v-model="textarea" readonly="true">
-          {{ textarea }}
-        </el-input>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="AppealVisible = false">取 消</el-button>
-          <el-button type="danger" @click="rejectAppeal()">驳回申请</el-button>
-          <el-button type="primary" @click="acceptAppeal()">修改成绩</el-button>
-        </div>
-      </el-dialog>
+          <el-dialog
+            title="导入学生成绩"
+            :visible.sync="dialogVisible"
+            width="40%"
+          >
+            <el-upload
+              ref="upload"
+              class="upload-demo"
+              drag
+              :action="uploadUrl"
+              :limit="1"
+              accept=".xlsx, .xls"
+              :auto-upload="false"
+              :on-change="handleFileChange"
+            >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                将文件拖到此处，或<em>点击上传</em>
+              </div>
+              <div class="el-upload__tip text-center" slot="tip">
+                <span>仅允许导入xls、xlsx格式文件。</span>
+              </div>
+            </el-upload>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogVisible = false">取 消</el-button>
+              <el-button type="primary" @click="uploadFile">上 传</el-button>
+            </div>
+          </el-dialog></el-header
+        >
+        <el-main
+          ><el-table v-if="gpaList.length > 0" :data="gpaList" border
+            ><el-table-column
+              type="index"
+              :index="indexMethod"
+              align="center"
+              label="序号"
+              width="50"
+            ></el-table-column>
+            <el-table-column prop="cardId" label="学号"></el-table-column>
+            <el-table-column prop="name" label="学年"></el-table-column>
+            <el-table-column prop="depart" label="GPA"></el-table-column>
+            <el-table-column prop="job" label="排名"></el-table-column>
+            <el-table-column prop="role" label="总人数"></el-table-column>
+            <el-table-column prop="password" label="确认状态"></el-table-column>
+            <el-table-column prop="status" label="确认时间"></el-table-column>
+       </el-table
+        ></el-main>
+        <el-footer
+          ><el-pagination
+            v-if="gpaList.length > 0"
+            background
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :total="totalGpa"
+            :page-sizes="[10, 20, 30, 50]"
+            @current-change="handlePageChange"
+            @size-change="handleSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+          >
+          </el-pagination
+        ></el-footer>
+      </el-container>
     </div>
   </template>
+    
+    <script>
+  import { getGpaPage } from "@/wanglingyu/api/import";
   
-  
-  
-  
-  <script>
   export default {
     data() {
       return {
-        textarea: "成绩评定有误",
-        tableData: [
-          {
-            stuNum: "2200022901",
-            name: "张一",
-            gpa: "3.9",
-            score: "80",
-            tag: "学生已确认",
-            appeal: "true",
-          },
-          {
-            stuNum: "2200022902",
-            name: "张二",
-            gpa: "3.9",
-            score: "80",
-            tag: "评委已确认",
-          },
-          {
-            stuNum: "2200022903",
-            name: "张三",
-            gpa: "3.9",
-            score: "80",
-            tag: "学生未确认",
-          },
-          {
-            stuNum: "2200022904",
-            name: "张四",
-            gpa: "3.9",
-            score: "80",
-            tag: "申诉中",
-          },
-          {
-            stuNum: "2200022905",
-            name: "张五",
-            gpa: "3.9",
-            score: "80",
-            tag: "学生未确认",
-          },
-          {
-            stuNum: "2200022906",
-            name: "张六",
-            gpa: "3.9",
-            score: "80",
-            tag: "申诉中",
-          },
-        ],
-        AppealVisible: false,
+        dialogVisible: false,
+        uploadUrl: "http://localhost:20235/gpa/import",
+        file: null,
+        currentPage: 1,
+        pageSize: 10,
+        gpaList: [], // 学生列表数据
+        totalGpa: 0, // 总学生数
       };
     },
+    mounted() {
+      this.fetchGpaList();
+    },
     methods: {
-      filterTag(value, row) {
-        return row.tag === value;
+      indexMethod(index) {
+        return index + 1 + (this.currentPage - 1) * this.pageSize; // 返回表格序号
       },
-  
-      gradeConfirm(index, row) {
-        console.log(index, row);
-        //弹窗
-  
-        if (row.tag == "学生已确认") {
-          this.$confirm("确认分数无误?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "success",
-          })
-            .then(() => {
-              //确认
-              //……
-              row.tag = "评委已确认";
-  
-              this.$message({
-                type: "success",
-                message: "确认成功!",
-              });
-            })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "已取消确认",
-              });
-            });
-        }
+      async fetchGpaList() {
+        const response = await getGpaPage(this.currentPage, this.pageSize);
+        this.gpaList = response.data.data.rows; // 将数据赋值给gpaList
+        this.totalGpa = response.data.data.total; // 设置总学生数
       },
-  
-      sendReminder(index, row) {
-        console.log(index, row);
-        //弹窗
-        if (row.tag == "学生未确认") {
-          this.$confirm("提醒学生确认成绩?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              //发送提醒
-              //……
-              this.$message({
-                type: "success",
-                message: "已发送提醒!",
-              });
-            })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "取消发送提醒",
-              });
-            });
-        }
+      handleFileChange(file) {
+        this.file = file;
       },
-  
-      handleAppeal(index, row) {
-        console.log(index, row);
-  
-        if (row.tag == "申诉中") {
-          this.AppealVisible = true;
+      uploadFile() {
+        if (this.file) {
+          this.$refs.upload.submit();
+          this.dialogVisible = false;
+        } else {
+          // 处理未选择文件的情况
+          // 可以显示提示信息或进行其他操作
         }
       },
-  
-      rejectAppeal() {
-        // 驳回申诉，发送通知
-        // ……
-  
-        this.AppealVisible = false;
-        this.$message({
-          type: "danger",
-          message: "已驳回申请!",
-        });
+      handlePageChange(currentPage) {
+        this.currentPage = currentPage;
+        this.fetchGpaList();
       },
-      acceptAppeal() {
-        // 接受申诉，修改成绩
-        // ……
-  
-        this.AppealVisible = false;
-        this.$message({
-          type: "success",
-          message: "已修改成绩!",
-        });
+      handleSizeChange(pageSize) {
+        this.pageSize = pageSize;
+        this.fetchGpaList();
       },
     },
   };
-- 
Gitee


From 0cac99d6640de2bae25c0e4eebf18e03d507bceb Mon Sep 17 00:00:00 2001
From: wanglingyu <1512528122@qq.com>
Date: Tue, 4 Jul 2023 11:14:02 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ReportView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ReportView.vue b/src/views/ReportView.vue
index b5b9e11..85c31ad 100644
--- a/src/views/ReportView.vue
+++ b/src/views/ReportView.vue
@@ -16,7 +16,7 @@
       <el-button @click="$router.push({ path: '/practiceEval' })" >进入实践评委打分页面</el-button>
     </div>
 
-    
+  </div>
 </template>
 
 <script>
-- 
Gitee


From 2c4d48dbf77fa18529b7e681505cb4cb0cb866ed Mon Sep 17 00:00:00 2001
From: wanglingyu <1512528122@qq.com>
Date: Tue, 4 Jul 2023 15:30:33 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/wanglingyu/api/import.js               | 6 +++---
 src/wanglingyu/views/ImportStudentView.vue | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/wanglingyu/api/import.js b/src/wanglingyu/api/import.js
index c9c415f..e812d63 100644
--- a/src/wanglingyu/api/import.js
+++ b/src/wanglingyu/api/import.js
@@ -20,7 +20,7 @@ export function importStu(file) {
       return service({
         url:'/student/page',
         method:'get',
-        data:data
+        params:data
       })
   }
 
@@ -44,7 +44,7 @@ export function importStu(file) {
       return service({
         url:'/faculty/page',
         method:'get',
-        data:data
+        params:data
       })
   }
 
@@ -69,6 +69,6 @@ export function importStu(file) {
       return service({
         url:'/gpa/page',
         method:'get',
-        data:data
+        params:data
       })
   }
\ No newline at end of file
diff --git a/src/wanglingyu/views/ImportStudentView.vue b/src/wanglingyu/views/ImportStudentView.vue
index 04bb642..2af0aeb 100644
--- a/src/wanglingyu/views/ImportStudentView.vue
+++ b/src/wanglingyu/views/ImportStudentView.vue
@@ -99,6 +99,9 @@ export default {
     },
     async fetchStudentList() {
       const response = await getStuPage(this.currentPage, this.pageSize);
+      console.log(this.currentPage);
+      console.log(this.pageSize);
+      console.log(response)
       this.studentList = response.data.data.rows; // 将数据赋值给studentList
       this.totalStudents = response.data.data.total; // 设置总学生数
     },
-- 
Gitee


From 52518ce32526db2e417bb95ab9e52b08637098a3 Mon Sep 17 00:00:00 2001
From: wanglingyu <1512528122@qq.com>
Date: Tue, 4 Jul 2023 15:45:15 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/wanglingyu/views/GpaEvalView.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wanglingyu/views/GpaEvalView.vue b/src/wanglingyu/views/GpaEvalView.vue
index b13fa78..310cc60 100644
--- a/src/wanglingyu/views/GpaEvalView.vue
+++ b/src/wanglingyu/views/GpaEvalView.vue
@@ -45,12 +45,12 @@
               width="50"
             ></el-table-column>
             <el-table-column prop="cardId" label="学号"></el-table-column>
-            <el-table-column prop="name" label="学年"></el-table-column>
-            <el-table-column prop="depart" label="GPA"></el-table-column>
-            <el-table-column prop="job" label="排名"></el-table-column>
-            <el-table-column prop="role" label="总人数"></el-table-column>
-            <el-table-column prop="password" label="确认状态"></el-table-column>
-            <el-table-column prop="status" label="确认时间"></el-table-column>
+            <el-table-column prop="acYear" label="学年"></el-table-column>
+            <el-table-column prop="gpa" label="GPA"></el-table-column>
+            <el-table-column prop="ranking" label="排名"></el-table-column>
+            <el-table-column prop="base" label="总人数"></el-table-column>
+            <el-table-column prop="confirmStatus" label="确认状态" ></el-table-column>
+            <el-table-column prop="confirmTime" label="确认时间"></el-table-column>
        </el-table
         ></el-main>
         <el-footer
-- 
Gitee