Merge remote-tracking branch 'origin/dev' into dev

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>

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"
@@ -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)

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"