Merge branch 'zcwy-0306' into dev0223

src/views/evaluation/EvaDown.vue

@@ -205,7 +205,7 @@ import {boeRequest} from "@/api/request";
         dialog({
           content: '请您确认是否要删除该报告？',
           ok: () => {
-            deleteById({id:record.id,pid:route.query.id}).then((res)=>{
+            deleteById({id:record.id,kid:route.query.kid}).then((res)=>{
               message.success('删除成功')
               listData()
             })

src/views/evaluation/evaluationUpload.vue

@@ -2,7 +2,7 @@
   <div class="evaluationUpload">
     <div class="headers">
       <div class="headers_item">
-        <div class="headers_item_btn" @click="bgupload">
+        <div class="headers_item_btn" v-if="uploadAdmin('Upload-admin')" @click="bgupload">
           <div class="btnText">报告上传</div>
         </div>
       </div>
@@ -48,7 +48,7 @@
         :scroll="{ x: '1000' }"
         :pagination="false"
       >
-        <template #operation="{ record, column }">
+        <template #operation="{ record, column }" >
           <a-space>
             <a-button v-if="trueFalse(record.permission,1)" type="link" @click="bgcheck(record)">
               <a-tooltip>
@@ -761,6 +761,7 @@ import {timeoutUpload} from "@/api/configPublic";
       // ]);
       onMounted(()=>{
         state.tableLoading = true
+        console.log(userInfo.value,'userInfo.value')
         listData()
       })
       const uploadAdmin = (aaaa)=>{
@@ -794,8 +795,8 @@ import {timeoutUpload} from "@/api/configPublic";
           workNum:userInfo.value.userNo
         }).then((res) => {
           console.log(res,'resdata')
-          state.tableData = res.data.records
-          state.tableDataTotal = res.data.total
+          state.tableData = res.data.pageList.records
+          state.tableDataTotal = res.data.pageList.total
           state.tableLoading = false
         });
       }