From 141b3770c4fff1605719a104ee84d8a0f22733ba Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Sun, 7 Apr 2024 10:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/evaluation/EvaDown.vue          |  2 +-
 src/views/evaluation/evaluationUpload.vue | 27 ++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/evaluation/EvaDown.vue b/src/views/evaluation/EvaDown.vue
index 7156bb60..4a422f62 100644
--- a/src/views/evaluation/EvaDown.vue
+++ b/src/views/evaluation/EvaDown.vue
@@ -205,7 +205,7 @@ import {boeRequest} from "@/api/request";
         dialog({
           content: '请您确认是否要删除该报告？',
           ok: () => {
-            deleteById({id:record.id,kid:route.query.kid}).then((res)=>{
+            deleteById({id:record.id,kid:record.kid}).then((res)=>{
               message.success('删除成功')
               listData()
             })
diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue
index 86f4431a..bd66da59 100644
--- a/src/views/evaluation/evaluationUpload.vue
+++ b/src/views/evaluation/evaluationUpload.vue
@@ -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>
@@ -692,6 +692,7 @@ import {timeoutUpload} from "@/api/configPublic";
       const userInfo = computed(() => store.state.userInfo);
       const router = useRouter();
       const state = reactive({
+        isRegularAdministrator: '',
         loadNewDown:false,
         totalNumber: {},
         stateType:'',
@@ -795,9 +796,22 @@ import {timeoutUpload} from "@/api/configPublic";
           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
           state.tableLoading = false
+          const operationColumn = {
+            title: "操作",
+            width: "20%",
+            dataIndex: "id",
+            key: "id",
+            align: "right",
+            slots: { customRender: "operation" },
+          };
+          if (!addedOperationColumn && state.isRegularAdministrator == '0') {
+            columns.value.push(operationColumn);
+            addedOperationColumn = true;
+          }
         });
       }
       //分配权限
@@ -837,6 +851,7 @@ import {timeoutUpload} from "@/api/configPublic";
         state.paramsAdd.pageSize = pageSize
         searchSave()
       }
+      let addedOperationColumn = false;
       const columns = ref([
         {
           title: "ID",
@@ -877,15 +892,7 @@ import {timeoutUpload} from "@/api/configPublic";
           className: "h",
           ellipsis: true,
           width: 100,
-        },
-        {
-          title: "操作",
-          width: "20%",
-          dataIndex: "id",
-          key: "id",
-          align: "right",
-          slots: { customRender: "operation" },
-        },
+        }
       ])
       const columns2 = ref([
         {