gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hyx
2023-06-09 09:46:08 +08:00
parent a1267daa72 5b0e82a06b
commit 0a13e99c43
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/table/administration/UserTable.vue
View File

@@ -55,7 +55,7 @@
v-if="scope.row.id" v-if="scope.row.id"
v-model="scope.row.status" v-model="scope.row.status"
active-value="1" 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" inactive-value="0"
@change="()=>{statusChange(scope.row)}"> @change="()=>{statusChange(scope.row)}">
</el-switch> </el-switch>

6
src/views/detections/Index.vue
View File

@@ -4,10 +4,10 @@
<div class="explorer-top-tools explorer-detection-top-tools"> <div class="explorer-top-tools explorer-detection-top-tools">
<div class="explorer-top-tools-title">{{$t('overall.detections')}}</div> <div class="explorer-top-tools-title">{{$t('overall.detections')}}</div>
<div style="display: flex"> <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> <i class="cn-icon cn-icon-configure-policies detection-icon-setting"></i>
<span>{{$t('config.detections.configurePolicies')}}</span> <span>{{$t('config.detections.configurePolicies')}}</span>
</div> </div>-->
<DateTimeRange <DateTimeRange
class="date-time-range" class="date-time-range"
:start-time="timeFilter.startTime" :start-time="timeFilter.startTime"
@@ -612,7 +612,7 @@ export default {
} }
get(api.detection[this.pageType].listBasic, params).then(response => { get(api.detection[this.pageType].listBasic, params).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.listData = response.data this.listData = response.data.result
} else { } else {
this.listData = [] this.listData = []
console.error(response.message) console.error(response.message)

1
src/views/setting/KnowledgeBaseForm.vue
View File

@@ -49,7 +49,6 @@
:file-list="fileList" :file-list="fileList"
:on-change="fileChange" :on-change="fileChange"
:on-success="uploadSuccess" :on-success="uploadSuccess"
:on-remove="onRemove"
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-progress="onUpload" :on-progress="onUpload"
:on-error="uploadError" :on-error="uploadError"