hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-06 17:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0524' into 'master'

Browse Source 
Zcwy0524

See merge request !181
This commit is contained in:
joshen
2024-06-03 18:31:47 +08:00
parent 3108e6be68 34e5190ccc
commit 359cbabf9c
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/project/ProjectManagerNew.vue
View File

@@ -62,9 +62,9 @@ const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value,
const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({ const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({
label: e.realName + e.userNo, label: e.realName + e.userNo,
value: e.id, value: e.id //,
...e, // ...e,
audienceList: null // audienceList: null
}))) })))
watch(props, init) watch(props, init)

6
src/components/project/ProjectManagerNewTeacher.vue
View File

@@ -62,9 +62,9 @@ const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value,
const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({ const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({
label: e.realName + e.userNo, label: e.realName + e.userNo,
value: e.id, value: e.id // ,
...e, // ...e,
audienceList: null // audienceList: null
}))) })))
watch(props, init) watch(props, init)

3
src/utils/zipdownload.js
View File

@@ -19,7 +19,7 @@ export function downLoadZip(str, filename) {
}) })
} }
const baseUrlManage = process.env.VUE_APP_BASE_API const baseUrlManage = process.env.VUE_APP_BASE_API
export function downLoadZipManage(str, filename) { export function downLoadZipManage(str, filename,fun) {
var url = baseUrlManage + str var url = baseUrlManage + str
axios({ axios({
method: 'get', method: 'get',
@@ -28,6 +28,7 @@ export function downLoadZipManage(str, filename) {
headers: { 'Authorization': 'Bearer ' + getCookieForName("token") } headers: { 'Authorization': 'Bearer ' + getCookieForName("token") }
}).then(res => { }).then(res => {
resolveBlob(res, mimeMap.xlsx,filename) resolveBlob(res, mimeMap.xlsx,filename)
if(fun) fun()
}) })
} }
/** /**

28
src/views/report/TrainingNewManager.vue
View File

@@ -1,11 +1,13 @@
<template> <template>
<div class="train_newman"> <a-spin :spinning="spinning" tip="报表生成中...">
<div class="title">新任管理者线下学习项目定制报表</div> <div class="train_newman">
<div class="btn" @click="downReport" v-if="uploadAdmin('training-admin')||adminType?.length>0"> <div class="title">新任管理者线下学习项目定制报表</div>
<div class="img"></div> <div class="btn" @click="downReport" v-if="uploadAdmin('training-admin')||adminType?.length>0">
<div class="text">报表下载</div> <div class="img"></div>
</div> <div class="text">报表下载</div>
</div> </div>
</div>
</a-spin>
</template> </template>
<script setup> <script setup>
@@ -14,14 +16,18 @@ import { useStore } from "vuex";
import { reportOrgs } from "@/api/indexProject"; import { reportOrgs } from "@/api/indexProject";
import {downLoadZipManage} from "@/utils/zipdownload"; import {downLoadZipManage} from "@/utils/zipdownload";
const downReport = () => { const downReport = () => {
console.log('下载报表') spinning.value = true
if(uploadAdmin('training-admin')){ if(uploadAdmin('training-admin')){
downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据') downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据',function(){
spinning.value = false
})
return return
} }
if(adminType?.value.length>0){ if(adminType?.value.length>0){
let orgs = adminType.value.join(',') let orgs = adminType.value.join(',')
downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据') downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据',function(){
spinning.value = false
})
} }
} }
const userInfo = computed(() => store.state.userInfo); const userInfo = computed(() => store.state.userInfo);
@@ -30,6 +36,7 @@ import {downLoadZipManage} from "@/utils/zipdownload";
}) })
const store = useStore(); const store = useStore();
const adminType = ref() const adminType = ref()
const spinning = ref(false)
const getReportOrgs = () => { const getReportOrgs = () => {
reportOrgs({workNum: userInfo.value.userNo}).then((res) => { reportOrgs({workNum: userInfo.value.userNo}).then((res) => {
console.log(res,'res') console.log(res,'res')
@@ -46,6 +53,7 @@ import {downLoadZipManage} from "@/utils/zipdownload";
<style lang="scss" scoped> <style lang="scss" scoped>
.train_newman{ .train_newman{
width: calc(100vw - 300px);
margin: 40px 0 0 50px; margin: 40px 0 0 50px;
.title{ .title{
color: #000000; color: #000000;