From e7f5cc20e954aad4daf17d57765666d89a833d20 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 8 Jun 2023 17:35:29 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddetection=E9=A1=B5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E5=8F=96=E5=80=BC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detections/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue
index 156e109b..83930da8 100644
--- a/src/views/detections/Index.vue
+++ b/src/views/detections/Index.vue
@@ -612,7 +612,7 @@ export default {
       }
       get(api.detection[this.pageType].listBasic, params).then(response => {
         if (response.code === 200) {
-          this.listData = response.data
+          this.listData = response.data.result
         } else {
           this.listData = []
           console.error(response.message)

From 634caee9b393f4d1f150c4b7d79e98e53c78a3f5 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 8 Jun 2023 17:40:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?detections=E7=9A=84=E9=85=8D=E7=BD=AE=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detections/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue
index 83930da8..afd38db5 100644
--- a/src/views/detections/Index.vue
+++ b/src/views/detections/Index.vue
@@ -4,10 +4,10 @@
     <div class="explorer-top-tools explorer-detection-top-tools">
       <div class="explorer-top-tools-title">{{$t('overall.detections')}}</div>
       <div style="display: flex">
-        <div class="explorer-top-tools-block">
+<!--        <div class="explorer-top-tools-block">
           <i class="cn-icon cn-icon-configure-policies detection-icon-setting"></i>
           <span>{{$t('config.detections.configurePolicies')}}</span>
-        </div>
+        </div>-->
         <DateTimeRange
             class="date-time-range"
             :start-time="timeFilter.startTime"

From cd1edb1431b048392fa548005fb0f3cffacd4b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Thu, 8 Jun 2023 17:59:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20user=E7=A6=81=E6=AD=A2=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=B7=BB=E5=8A=A0=E7=A6=81=E6=AD=A2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/administration/UserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/table/administration/UserTable.vue b/src/components/table/administration/UserTable.vue
index eb2e33f1..3efec224 100644
--- a/src/components/table/administration/UserTable.vue
+++ b/src/components/table/administration/UserTable.vue
@@ -55,7 +55,7 @@
               v-if="scope.row.id"
               v-model="scope.row.status"
               active-value="1"
-              :disabled="(scope.row.username === loginName) || (scope.row.username==='admin' && scope.row.id===1) "
+              :disabled="(scope.row.username === loginName) || (scope.row.username==='admin' && scope.row.id===1) || scope.row.buildIn === 1"
               inactive-value="0"
               @change="()=>{statusChange(scope.row)}">
           </el-switch>

From 5b0e82a06ba0884182c866301d5e9b4711432a6b Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 8 Jun 2023 19:59:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89upload=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84onRemove=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/KnowledgeBaseForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/setting/KnowledgeBaseForm.vue b/src/views/setting/KnowledgeBaseForm.vue
index f41025dd..50ac5cc3 100644
--- a/src/views/setting/KnowledgeBaseForm.vue
+++ b/src/views/setting/KnowledgeBaseForm.vue
@@ -49,7 +49,6 @@
                      :file-list="fileList"
                      :on-change="fileChange"
                      :on-success="uploadSuccess"
-                     :on-remove="onRemove"
                      :before-upload="beforeUpload"
                      :on-progress="onUpload"
                      :on-error="uploadError"