(
- {record.finishTaskNum == 0
+ {record.status == 0
? "未开始"
- : record.finishTaskNum == record.totalTaskNum
+ : record.status == 1
? "已完成"
: "进行中"}
@@ -2664,8 +2665,8 @@ export default {
},
{
title: "备注",
- dataIndex: "lastLearnTime",
- key: "lastLearnTime",
+ dataIndex: "batch",
+ key: "batch",
width: 120,
align: "center",
className: "h",
@@ -3090,6 +3091,8 @@ export default {
modal1Visible: false, // 证书预览
changegroupV: false, //换组弹窗
remarks: '',
+ remarksId: '',
+ remarksTrue: false,
showRemarks: false, //修改备注
checkgroupStuId: null, //换组id
ImpoterGroupLeaderV: false, //导入小组长抽屉
@@ -3449,12 +3452,21 @@ export default {
};
//修改备注
const modifyRemarks = (record) => {
+ state.remarksId = record.id
state.showRemarks = true;
}
const of_remarks = () => {
+ state.remarksTrue = false;
state.showRemarks = false;
}
const RemarksUpdata = () => {
+ apitl.editStudent({
+ id: state.remarksId,
+ batch: state.remarks
+ }).then(res=>{
+ console.log(res,'res')
+ state.remarksTrue = true;
+ })
of_remarks()
}
const showModal2 = (item, isEdit) => {
diff --git a/src/views/report/TrainingNewManager.vue b/src/views/report/TrainingNewManager.vue
index 88e8dda6..db40fcb8 100644
--- a/src/views/report/TrainingNewManager.vue
+++ b/src/views/report/TrainingNewManager.vue
@@ -12,15 +12,16 @@
import { computed,onMounted,ref } from "vue";
import { useStore } from "vuex";
import { reportOrgs } from "@/api/indexProject";
+import {downLoadZipManage} from "@/utils/zipdownload";
const downReport = () => {
console.log('下载报表')
if(uploadAdmin('training-admin')){
- window.open(`${process.env.VUE_APP_BASE_API}/admin/project/report/data`)
+ downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据')
return
}
if(adminType?.value.length>0){
let orgs = adminType.value.join(',')
- window.open(`${process.env.VUE_APP_BASE_API}/admin/project/report/data?orgs=${orgs}`)
+ downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据')
}
}
const userInfo = computed(() => store.state.userInfo);
@@ -31,6 +32,7 @@ import { reportOrgs } from "@/api/indexProject";
const adminType = ref()
const getReportOrgs = () => {
reportOrgs({workNum: userInfo.value.userNo}).then((res) => {
+ console.log(res,'res')
adminType.value = res.data
});
};