Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

This commit is contained in:
guochunsi
2026-02-04 14:01:11 +08:00
4 changed files with 42 additions and 12 deletions

View File

@@ -0,0 +1,30 @@
/*
* Copyright (c) 2018-2025, cyweb All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the pig4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
*/
import request from '/@/utils/request';
/**
* 获取列表
* @param query
*/
export const fetchList = (query?: any) => {
return request({
url: '/basic/basicAsyncTask/page',
method: 'get',
params: query,
});
};

View File

@@ -1,9 +1,9 @@
import request from '/@/utils/request'; import request from '/@/utils/request';
export const exportTeacherInfoBySelf = (data?: any) => { export const makeExportTeacherInfoBySelfTask = (data?: any) => {
return request({ return request({
url: '/professional/file/exportTeacherInfoBySelf', url: '/professional/file/makeExportTeacherInfoBySelfTask',
method: 'post', method: 'post',
data: data, data: data,
}); });

View File

@@ -68,7 +68,7 @@ import { ElNotification } from 'element-plus';
import { Download } from '@element-plus/icons-vue'; import { Download } from '@element-plus/icons-vue';
import global from '/@/components/tools/commondict.vue'; import global from '/@/components/tools/commondict.vue';
import request from '/@/utils/request'; import request from '/@/utils/request';
import { exportTeacherInfoBySelf } from '/@/api/professional/professionalfile'; import { makeExportTeacherInfoBySelfTask } from '/@/api/professional/professionalfile';
// Props // Props
const props = defineProps<{ const props = defineProps<{
@@ -224,7 +224,7 @@ const exportTeacherInfo = async () => {
teacherBaseDTO: searchData, teacherBaseDTO: searchData,
}; };
exportTeacherInfoBySelf(params).then((res:any)=>{ makeExportTeacherInfoBySelfTask(params).then((res:any)=>{
ElNotification.success({ ElNotification.success({
title: '下载后台进行中', title: '下载后台进行中',
message: '操作成功' message: '操作成功'

View File

@@ -215,14 +215,14 @@
icon="Lock" icon="Lock"
@click="dialogVisible.statusDialogFormVisible=true">状态锁定 @click="dialogVisible.statusDialogFormVisible=true">状态锁定
</el-button> </el-button>
<el-button <!-- <el-button-->
v-if="permissions.professional_teacherbase_export" <!-- v-if="permissions.professional_teacherbase_export"-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="Download" <!-- icon="Download"-->
:loading="exportLoading" <!-- :loading="exportLoading"-->
@click="handleDownLoadWord('')">导出WORD <!-- @click="handleDownLoadWord('')">导出WORD-->
</el-button> <!-- </el-button>-->
<el-button <el-button
v-if="permissions.professional_teacherbase_export" v-if="permissions.professional_teacherbase_export"
type="warning" type="warning"