Merge branch 'zcwy-0306' into dev0223

src/views/evaluation/evaluationUpload.vue

@@ -762,7 +762,6 @@ import {timeoutUpload} from "@/api/configPublic";
       // ]);
       onMounted(()=>{
         state.tableLoading = true
-        console.log(userInfo.value,'userInfo.value')
         listData()
       })
       const uploadAdmin = (aaaa)=>{
@@ -795,7 +794,6 @@ import {timeoutUpload} from "@/api/configPublic";
           pageSize: state.searchParam.pageSize,
           workNum:userInfo.value.userNo
         }).then((res) => {
-          console.log(res,'resdata')
           state.isRegularAdministrator = res.data.isRegularAdministrator
           state.tableData = res.data.pageList.records
           state.tableDataTotal = res.data.pageList.total
@@ -1036,13 +1034,8 @@ import {timeoutUpload} from "@/api/configPublic";
           slots: { customRender: "addAuthority" },
         },
       ])
-      // const textEnable = (record) => {
-      //   record.status = 1
-      //   console.log(record,'aaaaa')
-      // }
       const textDisabled = async (record) => {
         await updateStatus({status:1,id:record.id}).then((res)=>{
-          console.log(res,'res')
           if(res.code === 200){
             message.success('禁用成功')
             saveListItem()
@@ -1050,7 +1043,6 @@ import {timeoutUpload} from "@/api/configPublic";
         })
       }
       const textDelete = (record) => {
-        console.log(record.id,'aaaaa')
         dialog({
           content: '是否删除？',
           ok: () => {
@@ -1101,7 +1093,6 @@ import {timeoutUpload} from "@/api/configPublic";
       const bgupload1 = (record) => {
         state.loadNewDown = true
         state.downloadUrl = null
-        console.log(record,'record')
         state.valueAll = []
         state.uploadDownId =record.id
         state.btShowEdit = trueFalse(record.permission,2)
@@ -1150,7 +1141,6 @@ import {timeoutUpload} from "@/api/configPublic";
           message.error('请输入测评标题名称')
           return
         }
-        console.log(state.valueAll,'aaaa')
         if(state.totalNumber.failedEntries&&state.valueAll.length!=0){
           message.error('请先下载失败数据，并修改后重新上传')
           state.bg_results = true
@@ -1172,7 +1162,6 @@ import {timeoutUpload} from "@/api/configPublic";
           await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
             if(res.code == 200){
               if(res.data.length!=0){
-                // message.success(res.msg)
                 if(state.valueAll.length>1){
                   state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.length
                   state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.length
@@ -1191,11 +1180,9 @@ import {timeoutUpload} from "@/api/configPublic";
             if(res.data.code == -1){
               message.error('保存失败')
             }
-            console.log(res,'aaa')
           })
         }
         if(state.uploadStatus||state.btShow){
-          console.log(state.uploadStatus,'state.uploadStatus')
           await boeRequest('/activityApi/evaluation/save post',{
             id: state.uploadDownId,
             createId:userInfo.value.userId,
@@ -1223,20 +1210,8 @@ import {timeoutUpload} from "@/api/configPublic";
               state.bg_check = false
               return
             }
-            console.log(res.data,'save')
           })
         }
-        //else{
-        //   state.bg_results = true
-        //   state.valueAll.forEach((item)=>{
-        //     if(item.createId){
-        //       item.createId = userInfo.value.userId
-        //     }
-        //   })
-        //   await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
-        //     console.log(res.data,'json')
-        //   })
-        // }
         of_exit()
         listData()
       }
@@ -1247,7 +1222,6 @@ import {timeoutUpload} from "@/api/configPublic";
       //上传图片
       const headers = { token: getCookieForName("token") };
       const beforeUpload = (file) => {
-        console.log(file,'file')
         const isJpgOrPng =
           file.type === "image/jpeg" ||
           file.type === "image/png"
@@ -1257,7 +1231,6 @@ import {timeoutUpload} from "@/api/configPublic";
         }
 
         let isLt1M = file.size < 2000000;
-        console.log(file.size, isLt1M)
         if (!isLt1M) {
           message.error("图片大小超过2MB!");
           return false;
@@ -1274,7 +1247,6 @@ import {timeoutUpload} from "@/api/configPublic";
       const beforeUpload3 = async (file) => {
         state.stateType = file.type
         const pattern = /^([0-9\u4e00-\u9fa5\a-z\A-Z]+-){2}[0-9\u4e00-\u9fa5\a-z\A-Z]+\.\w*$/;
-        console.log(file,'file')
         if (!pattern.test(file.name)) {
           message.error('上传文件名称格式不对')
           return false
@@ -1282,34 +1254,19 @@ import {timeoutUpload} from "@/api/configPublic";
         const isJpgOrPng =
           file.type === "application/x-zip-compressed" ||
           file.type === "application/pdf"
-          console.log(isJpgOrPng,'false')
         if (!isJpgOrPng) {
           message.error("仅支持zip、pdf格式!");
           return false;
         }
         state.uploadDownLoad = true
-        // const formData = new FormData();
         const formData = {
-          file: file
+          file: file,
+          uploadName: userInfo.value.realName,
+          createId: userInfo.value.userId,
+          createName: userInfo.value.realName
         }
-        // formData.append("file", file);
         if(state.uploadId){
-            formData.pid= state.uploadId,
-            formData.uploadName=userInfo.value.realName,
-            formData.createId= userInfo.value.userId,
-            formData.createName= userInfo.value.realName
-          // formData.append("pid", state.uploadId);
-          // formData.append("uploadName", userInfo.value.realName);
-          // formData.append("createId", userInfo.value.userId);
-          // formData.append("createName", userInfo.value.realName);
-        }else{
-          // formData.append("uploadName", userInfo.value.realName);
-          // formData.append("createId", userInfo.value.userId);
-          // formData.append("createName", userInfo.value.realName);
-            // pid: state.uploadId,
-            formData.uploadName=userInfo.value.realName,
-            formData.createId= userInfo.value.userId,
-            formData.createName= userInfo.value.realName
+            formData.pid= state.uploadId
         }
         boeRequest('/activityApi/evaluation/import post formData',formData).then((res)=>{
           if(res.code === 200){
@@ -1321,47 +1278,14 @@ import {timeoutUpload} from "@/api/configPublic";
               // state.idValue = res.data.evaluationDetailList.map(item=>item.id)
               state.downloadUrl = res.data.evaluationDetailList.map(item=>item.downloadUrl)
               state.totalNumber = res.data
-              // if(state.totalNumber.failedEntries!=0){
-                console.log('aaaaa')
-                state.valueAll = res.data.evaluationDetailList
-              // }
+              state.valueAll = res.data.evaluationDetailList
             }
-            console.log(state.valueAll,'state.valueAll')
             state.uploadDownLoad = false
           }
         })
-        // await importList(formData).then((res)=>{
-        //   if(res.code === 200){
-        //     if(state.stateType == "application/pdf"){
-        //       state.idValue = res.data.map(item=>item.id)
-        //       state.valueAll = res.data
-        //     }else{
-        //       state.idValue = res.data.evaluationDetailList.map(item=>item.id)
-        //       state.valueAll = res.data.evaluationDetailList
-        //       state.totalNumber = res.data
-        //     }
-        //     console.log(state.valueAll,'state.valueAll')
-        //     state.uploadDownLoad = false
-        //   }
-        // }).catch((err)=>{
-        //   state.uploadDownLoad = false
-        //   console.log(err,'err')
-        // })
-        // try {
-        //   const response = await axios.post('/activityApi/evaluation/import', formData);
-        //   const jsonData = JSONbig({ storeAsString: true }).parse(response.data);
-
-        //   if (jsonData.code === 200) {
-        //     console.log(jsonData.data, 'jsondata.data')
-        //   }
-        // } catch (error) {
-        //   console.error("Error fetching data:", error);
-        // }
         return false
       }
       const handleChange = (info) => {
-        // return
-        console.log(info,'inffofofoffo')
         let resFileList = [...info.fileList];
 
         resFileList = resFileList.slice(-2);
@@ -1395,25 +1319,12 @@ import {timeoutUpload} from "@/api/configPublic";
               createId:userInfo.value.userId,
               id:record.id
             }).then((res)=>{
-              console.log(res,'data')
               message.success('清空成功')
               listData()
             })
           }
         })
       }
-      // 备注
-      // const openRemarks = (record) => {
-      //   state.bg_remarks = true
-      //   state.formData.remarks = record.remarks
-      // }
-      // const of_remarks = () => {
-      //   state.bg_remarks = false
-      // }
-      // const remarksUpdata = () => {
-      //   state.tableData[0].remarks = state.formData.remarks
-      //   state.bg_remarks = false
-      // }
       // 编辑
       const openEdit = (record) => {
         state.loadNewDown = true
@@ -1440,24 +1351,9 @@ import {timeoutUpload} from "@/api/configPublic";
             state.tableLoadingAut = false
           }
         })
-        // await saveLists({
-        //   pid:state.saveListPid,
-        //   nameOrWorkNum:state.searchParam.createNames,
-        //   status:state.searchParam.status2,
-        //   pageNo: state.params.pageNo,
-        //   pageSize: state.params.pageSize
-        // }).then((res)=>{
-        //   console.log(res,'res')
-        //   if(res.code === 200){
-        //     state.tableData1 = res.data.records
-        //     state.total = res.data.total
-        //     state.tableLoadingAut = false
-        //   }
-        // })
       }
       // 权限
       const authorityItem = async (record) => {
-        console.log(record,'record')
         state.saveListPid = record.id
         state.bg_setting = true
         saveListItem()
@@ -1465,24 +1361,11 @@ import {timeoutUpload} from "@/api/configPublic";
       const of_setting = () => {
         state.params.pageNo = 1
         state.bg_setting = false
-        // listData()
       }
       const settingUp = () => {
         state.bg_setting = false
         listData()
       }
-      // 测评
-      // const editName = (record) => {
-      //   state.bg_edit = true
-      //   console.log(record,'aaa')
-      //   state.formData.evaluationName = record.evaluationName
-      // }
-      // const of_edit = () => {
-      //   state.bg_edit = false
-      // }
-      // const editUpdata = () => {
-      //   state.bg_edit = false
-      // }
       //添加权限
       const addAuths = () => {
         state.bg_addsetting = true
@@ -1502,33 +1385,14 @@ import {timeoutUpload} from "@/api/configPublic";
       //搜索权限
       const searchSave = async () => {
         state.tableLoadingAdd = true
-        // await adminList({
-        //   keyword:state.searchParam.createName,
-        //   pageNo: state.paramsAdd.pageNo,
-        //   pageSize: state.paramsAdd.pageSize,
-        // }).then((res)=>{
-        //   if(res.code === 200){
-        //     console.log(res.data,'aaaa')
-        //     state.tableDataAdd = res.data
-        //     state.tableLoadingAdd = false
-        //     console.log(res,'res')
-        //     const workNums = state.tableData1.map(item=>item.workNum)
-        //     state.tableDataAdd.forEach(item => {
-        //       if(workNums.includes(item.userNo))
-        //       item.status = 0
-        //     })
-        //   }
-        // })
         await boeRequest('/activityApi/permission/adminList post',{
           keyword:state.searchParam.createName,
           pageNo: state.paramsAdd.pageNo,
           pageSize: state.paramsAdd.pageSize,
         }).then((res)=>{
-          console.log(res.data,'aaaaa')
           if(res.code === 200){
             state.tableDataAdd = res.data
             state.tableLoadingAdd = false
-            console.log(res,'res')
             const workNums = state.tableData1.map(item=>item.workNum)
             state.tableDataAdd.forEach(item => {
               if(workNums.includes(item.userNo))
@@ -1543,7 +1407,6 @@ import {timeoutUpload} from "@/api/configPublic";
       }
       //添加权限确定
       const addSettingUp = async () => {
-        console.log(state.saveList,'saveList')
         await savePermission({userList:state.saveList,pid:state.saveListPid})
         saveListItem()
         of_addsetting()
@@ -1552,7 +1415,6 @@ import {timeoutUpload} from "@/api/configPublic";
       const powerSetting = async (record) => {
         state.powerStatus = (record)
         state.bg_power2 = true
-        // state.checkclick = record.permission
       }
       const of_power = () => {
         state.bg_power = false
@@ -1562,19 +1424,9 @@ import {timeoutUpload} from "@/api/configPublic";
         state.checkclick = []
       }
       const powerTrue = async () => {
-        // state.tableLoadingAdd = true
         state.powerStatus.permission = state.checkclick.join(",")
-        // state.powerStatus.permissionStatus = 0
-        // state.powerStatus[0].permission = state.checkclick.join(",")
-        // await savePermission({userList:state.powerStatus,pid:state.saveListPid}).then((res)=>{
-        //   if(res.code === 200){
-        //     searchSave()
-        //     saveListItem()
-        //   }
-        // })
         if(state.permissionId){
           await updateStatus({id:state.permissionId,permission:state.checkclick.join(",")}).then((res)=>{
-            console.log(res,'res')
             saveListItem()
           })
         }
@@ -1585,12 +1437,6 @@ import {timeoutUpload} from "@/api/configPublic";
         await updateStatus({status:0,id:record.id}).then((res)=>{
           if(res.code === 200){
             message.success('启用成功')
-            // record.statusList = 0
-            // if(state.powerStatus.id === record.id){
-            //   state.saveList.push(state.powerStatus)
-            // }else{
-            //   state.saveList.push(record)
-            // }
             listData()
             saveListItem()
           }
@@ -1605,18 +1451,6 @@ import {timeoutUpload} from "@/api/configPublic";
           record.permissionStatus = 0
           state.saveList.push(record)
         }
-        // await updateStatus({status:0,id:record.id}).then((res)=>{
-        //   if(res.code === 200){
-        //     message.success('启用成功')
-        //     record.statusList = 0
-        //     if(state.powerStatus.id === record.id){
-        //       state.saveList.push(state.powerStatus)
-        //     }else{
-        //       state.saveList.push(record)
-        //     }
-        //     saveListItem()
-        //   }
-        // })
       }
       const textDeleteAdd = (record,index) => {
         dialog({
@@ -1630,7 +1464,6 @@ import {timeoutUpload} from "@/api/configPublic";
       return {
         ...toRefs(state),
         userInfo,
-        // searchStatusVal,
         listData,
         addAuths,
         searchSaveList,