From 51b24f02db63e784881d9a5836ca9fe83e3bbf53 Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Tue, 6 Jan 2026 15:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AD=A6=E7=94=9F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/stuCQS/synchronous-data/sync-stu.js   |  7 +++
 .../studentinfo/syncStudent.vue               | 62 ++++++++++++++-----
 .../synchronous-data/sync-class/syncBj.vue    |  2 -
 .../sync-instructor/syncTeacher.vue           |  4 +-
 .../sync-major/syncZhuanYe.vue                |  2 -
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/src/api/stuCQS/synchronous-data/sync-stu.js b/src/api/stuCQS/synchronous-data/sync-stu.js
index 6f73ee0..01f01c7 100644
--- a/src/api/stuCQS/synchronous-data/sync-stu.js
+++ b/src/api/stuCQS/synchronous-data/sync-stu.js
@@ -24,3 +24,10 @@ export function listStudent(query) {
     params: query
   })
 }
+// 新同步学生信息
+export function syncStudentInfo() {
+  return request({
+    url: '/syncdata/synchronousStudent',
+    method: 'post'
+  })
+}
diff --git a/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue b/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue
index 0ba8b60..fce3cd6 100644
--- a/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue
+++ b/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue
@@ -7,18 +7,20 @@
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+            <el-form-item label="年级代码" prop="gradeCode">
+                <el-select v-model="queryParams.gradeCode" filterable clearable placeholder="请选择年级代码">
+                    <el-option v-for="item in grade_list" :key="item.gradeCode" :label="item.gradeCode"
+                        :value="item.gradeCode" size="mini" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button v-hasPermi="['system:middle:add']" type="primary" plain icon="el-icon-plus" size="mini"
+                    @click="handleSync">同步数据</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button v-hasPermi="['system:middle:export']" type="warning" plain icon="el-icon-download"
-                    size="mini" @click="handleExport">导出</el-button>
-                <el-col :span="1.5">
-                    <el-button v-hasPermi="['system:middle:add']" type="primary" plain icon="el-icon-plus" size="mini"
-                        @click="handleSync">同步数据</el-button>
-                </el-col>
-            </el-col>
             <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
         </el-row>
 
@@ -39,7 +41,8 @@
 </template>
 
 <script>
-import { listStudent} from '@/api/stuCQS/synchronous-data/sync-stu'
+import { listStudent, syncStudentInfo } from '@/api/stuCQS/synchronous-data/sync-stu'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
     name: 'Middle',
@@ -75,24 +78,33 @@ export default {
                 xf: null,
                 jd: null,
                 cj: null,
-                fzlx: null
+                fzlx: null,
+                gradeCode: null
             },
             // 表单参数
             form: {},
             // 表单校验
             rules: {
-            }
+            },
+            grade_list: []
         }
     },
     created() {
         this.getList()
+        this.listGrade();
     },
     methods: {
+        async listGrade() {
+            let res = await listGrade()
+            if (res.code == 200) {
+                this.grade_list = [...res.rows]
+            }
+        },
         /** 查询【请填写功能名称】列表 */
         getList() {
             this.loading = true
             listStudent(this.queryParams).then(response => {
-                this.middleList =response.data
+                this.middleList = response.data
                 console.log(response)
                 this.total = response.total
                 this.loading = false
@@ -136,10 +148,28 @@ export default {
                 ...this.queryParams
             }, `middle_${new Date().getTime()}.xlsx`)
         },
-        handleSync() {
-            syncStuinfo().then(res => {
-                this.$modal.msgSuccess(res.msg)
-            })
+        async handleSync() {
+            if (this.queryParams.gradeCode == null || this.queryParams.gradeCode == "") {
+                this.$modal.msgError('请选择年级代码')
+                return
+            }
+            this.loading = true
+            try {
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncStudentInfo(this.queryParams)
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
+                if (res.code == 200) {
+                    this.$modal.msgSuccess('同步完成')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
+            }
         }
     }
 }
diff --git a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue
index 06579c0..2ac688a 100644
--- a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue
+++ b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue
@@ -150,8 +150,6 @@ export default {
                 // 增加接口返回值校验，避免res.msg不存在导致的二次报错
                 if (res.code == 200) {
                     this.$modal.msgSuccess('同步完成')
-                } else {
-                    this.$modal.msgError('同步失败')
                 }
                 //this.getList() // 仅接口正常返回时刷新列表
             } catch (error) {
diff --git a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue
index 6b3a6da..a6829f0 100644
--- a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue
+++ b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue
@@ -19,7 +19,7 @@
                         @click="handleSync">同步数据</el-button>
                 </el-col>
             </el-col>
-             <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+            <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
         </el-row>
         <el-table v-loading="loading" :data="middleList">
             <el-table-column label="职工号" align="center" prop="zgh" />
@@ -117,8 +117,6 @@ export default {
                 // 增加接口返回值校验，避免res.msg不存在导致的二次报错
                 if (res.code == 200) {
                     this.$modal.msgSuccess('同步完成')
-                } else {
-                    this.$modal.msgError('同步失败')
                 }
                 //this.getList() // 仅接口正常返回时刷新列表
             } catch (error) {
diff --git a/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue b/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue
index 6705147..d0a90c9 100644
--- a/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue
+++ b/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue
@@ -103,8 +103,6 @@ export default {
                 // 增加接口返回值校验，避免res.msg不存在导致的二次报错
                 if (res.code == 200) {
                     this.$modal.msgSuccess('同步完成')
-                } else {
-                    this.$modal.msgError('同步失败')
                 }
                 //this.getList() // 仅接口正常返回时刷新列表
             } catch (error) {