Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

src/api/stuCQS/synchronous-data/sync-class.js

@@ -22,4 +22,19 @@ export function syncClassinfo() {
     method: 'post'
   })
 }
-
+// 新查询班级列表
+export function listBj(query) {
+  return request({
+    url: '/syncdata/classInfoList',
+    method: 'get',
+    params: query
+  })
+}
+// 新同步班级信息
+export function syncBjinfo(query) {
+  return request({
+    url: '/syncdata/synchronousClass',
+    method: 'post',
+    params:query
+  })
+}

src/views/staff/oneStop/room/roomDetailedStatistics.vue

@@ -7,7 +7,7 @@
           <el-input v-model="queryParams.roomName" placeholder="请输入功能房名" clearable @keyup.enter.native="handleQuery" />
         </el-form-item> -->
         <el-form-item label="部门" prop="rtDepar">
-          <el-select v-model="queryParams.rtDepar" placeholder="请选择部门" filterable clearable @change="handleQuery">
+          <el-select v-model="queryParams.rtDepar" placeholder="请选择部门" filterable clearable multiple @change="handleQuery">
             <el-option v-for="item in departmentList" :key="item" :label="item" :value="item" />
           </el-select>
         </el-form-item>
@@ -83,7 +83,7 @@
           </div>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDepartmentUsageList">导出</el-button>
+              <el-button v-hasPermi="['staff:room:export']" type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDepartmentUsageList">导出</el-button>
             </el-col>
             <right-toolbar :show-search.sync="showSearch" @queryTable="getUser" />
           </el-row>
@@ -235,6 +235,12 @@ export default {
           this.queryParams.endTime = this.queryParams.rtTimeRange[1]
         }
 
+        // 将多选的部门数组转换为逗号分隔的字符串
+        let rtDeparParam = this.queryParams.rtDepar;
+        if (Array.isArray(this.queryParams.rtDepar) && this.queryParams.rtDepar.length > 0) {
+          rtDeparParam = this.queryParams.rtDepar.join(',');
+        }
+
         // 获取各部门预约功能房统计数据
         const departmentRes = await getDepartmentReservationCount({
           startTime: this.queryParams.startTime,
@@ -242,7 +248,7 @@ export default {
           role: this.queryParams.rtRole,
           borrower: this.queryParams.rtCreatRole,
           auditStatus: this.queryParams.auditStatus,
-          rtDepar: this.queryParams.rtDepar,
+          rtDepar: rtDeparParam,  // 使用转换后的逗号分隔字符串
           eventPromoter: this.queryParams.eventPromoter,
           userName: this.queryParams.userName,
         })
@@ -254,7 +260,7 @@ export default {
           role: this.queryParams.rtRole,
           borrower: this.queryParams.rtCreatRole,
           auditStatus: this.queryParams.auditStatus,
-          rtDepar: this.queryParams.rtDepar,
+          rtDepar: rtDeparParam,  // 使用转换后的逗号分隔字符串
           eventPromoter: this.queryParams.eventPromoter,
           userName: this.queryParams.userName,
         })

src/views/stuCQS/synchronous-data/sync-class/syncBj.vue

@@ -8,28 +8,25 @@
             </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-table v-loading="loading" :data="middleList">
-            <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>
-
-        <el-table v-loading="loading" :data="middleList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="ID" align="center" prop="BJID" />
             <el-table-column label="班级代码" align="center" prop="bjdm" />
-            <el-table-column label="专业id" align="center" prop="zyid" />
             <el-table-column label="班级名称" align="center" prop="bjmc" />
-            <el-table-column label="年级id" align="center" prop="njid" />
+            <el-table-column label="班级简称" align="center" prop="BJJC" />
+            <el-table-column label="专业代码" align="center" prop="zyid" />
+            <el-table-column label="年级代码" align="center" prop="njid" />
 
         </el-table>
 
@@ -38,7 +35,8 @@
     </div>
 </template>
 <script>
-import { listClass, syncClassinfo, getClassdm} from '@/api/stuCQS/synchronous-data/sync-class'
+import { listBj, syncBjinfo } from '@/api/stuCQS/synchronous-data/sync-class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
     name: 'Middle',
@@ -68,35 +66,35 @@ export default {
                 pageSize: 10,
                 BJID: null,
                 bjdm: null,
-                bjjc:null,
+                bjjc: null,
                 bjmc: null,
                 njid: null,
-                zyid : null,
+                zyid: null,
+                gradeCode: null
             },
             // 表单参数
             form: {},
             // 表单校验
             rules: {
-            }
+            },
+            grade_list: []
         }
     },
     created() {
         this.getList()
+        this.listGrade()
     },
     methods: {
-        //关键字查询
+        async listGrade() {
-        getbjdm() {
+            let res = await listGrade()
-            this.loading = true
+            if (res.code == 200) {
-            getClassdm(this.queryParams.bjdm).then(response => {
+                this.grade_list = [...res.rows]
-                this.middleList = response.data
+            }
-                this.total = response.total 
-                this.loading = false
-            })
         },
         /** 查询【请填写功能名称】列表 */
         getList() {
             this.loading = true
-            listClass(this.queryParams).then(response => {
+            listBj(this.queryParams).then(response => {
                 this.middleList = [...response.rows]
                 this.total = response.total
                 this.loading = false
@@ -112,17 +110,17 @@ export default {
             this.form = {
                 BJID: null,
                 bjdm: null,
-                bjjc:null,
+                bjjc: null,
                 bjmc: null,
                 njid: null,
-                zyid : null,
+                zyid: null,
             }
             this.resetForm('form')
         },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1
-            this.getbjdm()
+            this.getList()
         },
         /** 重置按钮操作 */
         resetQuery() {
@@ -130,24 +128,39 @@ export default {
             this.queryParams.pageNum = 1
             this.getList()
         },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-            this.single = selection.length !== 1
-            this.multiple = !selection.length
-        },
         /** 导出按钮操作 */
         handleExport() {
             this.download('system/middle/export', {
                 ...this.queryParams
             }, `middle_${new Date().getTime()}.xlsx`)
         },
-        handleSync() {
+        //同步数据
-            syncClassinfo().then(res => {
+        async handleSync() {
-                this.$modal.msgSuccess(res.msg)
+            if (this.queryParams.gradeCode == null || this.queryParams.gradeCode == "") {
-            })
+                this.$modal.msgError('请选择年级代码')
+                return
             }
+            this.loading = true
+            try {
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncBjinfo(this.queryParams)
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
+                if (res.code == 200) {
+                    this.$modal.msgSuccess('同步完成')
+                } else {
+                    this.$modal.msgError('同步失败')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
+            }
+        }
+
     }
 }
 </script>
-  

src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue

@@ -1,5 +1,15 @@
 <template>
     <div class="app-container">
+        <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true"
+            label-width="72px">
+            <el-form-item label="职工号" prop="zgh">
+                <el-input v-model="queryParams.zgh" placeholder="请输入职工号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</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"
@@ -14,9 +24,16 @@
             <el-table-column label="职工号" align="center" prop="zgh" />
             <el-table-column label="姓名" align="center" prop="xm" />
             <el-table-column label="性别" align="center" prop="xb" />
+            <el-table-column label="民族代码" align="center" prop="MZDM" />
+            <el-table-column label="职工类别代码" align="center" prop="ZGLBDM" />
+            <el-table-column label="职工类别名称" align="center" prop="ZGLBMC" />
+            <el-table-column label="职工状态代码" align="center" prop="ZGDQZTDM" />
+            <el-table-column label="职工状态代码名称" align="center" prop="ZGDQZTDMMC" />
+            <el-table-column label="职工排序号" align="center" prop="ZGPXH" />
+            <el-table-column label="部门代码" align="center" prop="SZBMBH" />
             <el-table-column label="科室名称" align="center" prop="ksmc" />
             <el-table-column label="院校名称" align="center" prop="yxmc" />
-            <!-- <el-table-column label="院校代码" align="center" prop="yxdm" /> -->
+            <el-table-column label="数据更新时间" align="center" prop="UPTIME" />
         </el-table>
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@@ -73,6 +90,17 @@ export default {
                 this.loading = false
             })
         },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
         /** 导出按钮操作 */
         handleExport() {
             this.download('system/middle/export', {
@@ -81,9 +109,25 @@ export default {
         },
         //同步数据
         async handleSync() {
-            let res = await syncInstructorinfonew()
+            this.loading = true
+            try {
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncInstructorinfonew()
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
                 if (res.code == 200) {
-                this.$modal.msgSuccess(res.msg)
+                    this.$modal.msgSuccess('同步完成')
+                } else {
+                    this.$modal.msgError('同步失败')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                //this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+                this.$modal.msgSuccess('同步完成')
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
             }
         }
 

src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue

@@ -26,6 +26,7 @@
             <el-table-column label="专业代码" align="center" prop="zydm" />
             <el-table-column label="专业简称" align="center" prop="zyjc" />
             <el-table-column label="专业名称" align="center" prop="zymc" />
+            <el-table-column label="部门代码" align="center" prop="BMBH" />
             <el-table-column label="院校名称" align="center" prop="yxmc" />
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@@ -95,9 +96,25 @@ export default {
             }, `middle_${new Date().getTime()}.xlsx`)
         },
         async handleSync() {
-            let res = await syncZhuanYeInfo()
+            this.loading = true
+            try {
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncZhuanYeInfo()
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
                 if (res.code == 200) {
-                this.$modal.msgSuccess(res.msg)
+                    this.$modal.msgSuccess('同步完成')
+                } else {
+                    this.$modal.msgError('同步失败')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                //this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+                this.$modal.msgSuccess('同步完成')
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
             }
         },
         /** 搜索按钮操作 */