From 095f6619183ac03f584c859150ce9039ad655ece Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 13 May 2024 19:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=88=97=E8=A1=A8=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8F=97=E6=8E=A7=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                        |  2 ++
 src/components/NavLeft.vue              |  3 +--
 src/components/student/TableStudent.vue |  4 ++++
 src/utils/zipdownload.js                | 12 ++++++++++++
 src/views/projectcenter/TaskPage.vue    | 20 ++++++++++++++++----
 src/views/report/TrainingNewManager.vue |  6 ++++--
 6 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index f3f684d2..733c29b2 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -80,3 +80,5 @@ export const getProjectCount = (projectId) => http.get('/admin/project/projectCo
 export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
 export const userInfo = () => http.get('/admin/CheckUser/userInfo')
 
+//修改备注
+export const editStudent = (obj) => http.post('/admin/student/editStudent', obj)
\ No newline at end of file
diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 73f6be58..c9930ed9 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -573,7 +573,7 @@
               <router-link to="/employeelearning">员工学习数据</router-link>
             </a-menu-item>
           </a-sub-menu>
-          <a-menu-item key="sub17-4">
+          <a-menu-item key="sub17-4" v-if="checkMenu('trainingnewmanager')||getReportOrgs()">
             <span
               :class="{
                 circleActive: selectedKeys[0] === 'sub17-4' ? true : false,
@@ -1175,7 +1175,6 @@ export default {
     const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
-
     onMounted(() => {
       // console.log("11111", 1);
       window.addEventListener("resize", getClientHeight, false);
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index ee9bd636..91325888 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -441,6 +441,10 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  remarksTrue: {
+    type: Boolean,
+    default: false,
+  }
 });
 
 const { loading: stuAsyncLoading, start } = useAsyncStu(props.id, props.type, getStuList);
diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js
index d42e85c2..710a8c3d 100644
--- a/src/utils/zipdownload.js
+++ b/src/utils/zipdownload.js
@@ -18,6 +18,18 @@ export function downLoadZip(str, filename) {
     resolveBlob(res, mimeMap.zip,filename)
   })
 }
+const baseUrlManage = process.env.VUE_APP_BASE_API
+export function downLoadZipManage(str, filename) {
+  var url = baseUrlManage + str
+  axios({
+    method: 'get',
+    url: url,
+    responseType: 'blob',
+    headers: { 'Authorization': 'Bearer ' + getCookieForName("token") }
+  }).then(res => {
+    resolveBlob(res, mimeMap.xlsx,filename)
+  })
+}
 /**
  * 解析blob响应内容并下载
  * @param {*} res blob响应内容
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 52af4519..4af15d2a 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -827,6 +827,7 @@
                   :stage="stage"
                   :visable="tabFlag"
                   :groupList="groupList"
+                  :remarksTrue="remarksTrue"
                 >
                   <template #extension="{ data: { record } }">
                     <a-button @click="showStudent(record)" type="link"
@@ -2645,9 +2646,9 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.finishTaskNum == 0
+              {record.status == 0
                 ? "未开始"
-                : record.finishTaskNum == record.totalTaskNum
+                : record.status == 1
                 ? "已完成"
                 : "进行中"}
             </div>
@@ -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
     });
   };