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-ele-update' into dev

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
chenjinsong
2024-03-07 15:58:35 +08:00
parent dbf6aada39 7d9e8f2790
commit f5926b265b
84 changed files with 1303 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/table/CnDataList.vue
View File

@@ -11,8 +11,9 @@
<div style="display: flex">
<el-input v-model="keyWord" size="small" @keyup.enter="onSearch"></el-input>
<!-- <el-button icon="el-icon-search" @click="onSearch" size="small"></el-button>-->
<button class="top-tool-btn top-tool-btn--search" style="border-radius: 0 2px 2px 0 !important;" @click="onSearch">
<i class="el-icon-search"></i>
<button class="top-tool-btn top-tool-btn--search" style="border-radius: 0 2px 2px 0 !important;" @click="onSearch">
<el-icon><Search /></el-icon>
<!--<i class="el-icon-search"></i>-->
</button>
</div>
</div>

4
src/components/table/administration/GalaxyProxyTable.vue
View File

@@ -48,7 +48,7 @@
<span style="color: #41ABFD">{...}</span>
</template>
<div class="highlight-box">
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><i class="el-icon-document-copy"></i></span>
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><el-icon><CopyDocument /></el-icon></span>
<highlightjs
language="json"
:code="scope.row[item.prop]"
@@ -70,7 +70,7 @@
<span style="color: #41ABFD">{...}</span>
</template>
<div class="highlight-box">
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><i class="el-icon-document-copy"></i></span>
<span class="highlight-box__copy-btn" @click="copyValue(scope.row[item.prop])"><el-icon><CopyDocument /></el-icon></span>
<highlightjs
language="js"
:code="scope.row[item.prop]"

6
src/components/table/administration/OperationLogTable.vue
View File

@@ -157,3 +157,9 @@ export default {
}
}
</script>
<style lang="scss">
.list-page .cn-table .el-table:not(.chart-table) td {
padding: 8px 0;
}
</style>

12
src/components/table/report/ReportTable.vue
View File

@@ -3,8 +3,9 @@
<el-table
id="reportTable"
ref="dataTable"
:header-cell-class-name="headerCellClass"
:data="tableData"
:height="height"
height="100%"
:expand-row-keys="expandedIds"
border
empty-text=" "
@@ -213,7 +214,7 @@ import Loading from '@/components/common/Loading'
import axios from 'axios'
import { api } from '@/utils/api'
import { storageKey, report } from '@/utils/constants'
import { urlParamsHandler, overwriteUrl } from '@/utils/tools'
import { urlParamsHandler, overwriteUrl, headerCellClass } from '@/utils/tools'
import { ref } from 'vue'
import { dateFormatToUTC, getNowTime } from '@/utils/date-util'
import chartDetectionPagination from '@/views/charts/charts/chartDetectionPagination'
@@ -479,6 +480,7 @@ export default {
})
},
methods: {
headerCellClass,
/**
* 进入页面判断是否需要展开表格
* 即展开表格后刷新界面，保持展开效果
@@ -783,3 +785,9 @@ export default {
}
}
</script>
<style lang="scss">
.list-page .cn-table .el-table:not(.chart-table) td {
padding: 7.5px 0;
}
</style>

32
src/components/table/setting/knowledgeBaseTableForCard.vue
View File

@@ -32,7 +32,7 @@
<div class="center-dialog">
<el-dialog v-model="showUpdateDialog"
:destroy-on-close="true"
:custom-class="showAddUpdateDialog ? 'update-knowledge update-knowledge--upload' : 'update-knowledge'"
:class="showAddUpdateDialog ? 'update-knowledge update-knowledge--upload' : 'update-knowledge'"
:before-close="beforeClose"
:after-close="handleClose">
<div class="knowledge-update__top" >
@@ -107,9 +107,8 @@
'update-dialog__table--psiphon3': updateKnowledge.source === 'cn_psiphon3_ip' && activeTab === 'intelligenceLearning',
'update-dialog__table--system-user': updateKnowledge.source === 'cn_psiphon3_ip' && activeTab !== 'intelligenceLearning'
}"
:header-cell-style="{background:'#f5f7fa',color:'#353636',fontWeight: '400',fontSize: '12px',borderRight: 'none',borderBottom: 'none'}"
cell-style="padding:6px 0px;font-size: 12px;color: #353636;font-weight: 400;line-height: 20px;border-right:none;"
header-cell-style="padding:8px 0px;font-size: 12px;color: #353636;font-weight: 500;border-right:none;">
:cell-style="myCellStyle"
:header-cell-style="myHeaderCellStyle">
<el-table-column prop="opTime" :label="$t('entities.tab.informationAggregation.updateTime')" width="150" >
<template #default="scope" :column="item">
<span>{{scope.row.opTime ? dateFormatByAppearance(scope.row.opTime) : '-'}}</span>
@@ -202,6 +201,7 @@
:on-error="uploadError"
:class="uploadErrorTip ? 'el-upload--error' : ''"
:accept="fileTypeLimit"
style="margin-bottom: -10px"
:auto-upload="false"
ref="knowledgeUpload"
id="knowledgeUpload"
@@ -228,7 +228,7 @@
</el-dialog>
<el-dialog v-model="showConfirmDialog"
:title="$t('overall.tips')"
custom-class="update-knowledge-tip"
class="update-knowledge-tip"
:width="480"
:before-close="handleConfirmClose">
<div class="dialog-message">{{$t('knowledge.updateTips')}}</div>
@@ -326,7 +326,27 @@
{ value: 10080, name: this.$t('dateTime.last7Days') },
{ value: 21600, name: this.$t('dateTime.last15Days') },
{ value: 43200, name: this.$t('dateTime.last30Days') }
]
],
myCellStyle: {
padding: '6px 0px',
'font-size': '12px',
color: '#353636',
'font-weight': 400,
'line-height': '20px',
'border-right': 'none'
},
myHeaderCellStyle: {
padding: '8px 0px',
'font-size': '12px',
color: '#353636',
'font-weight': 500,
'border-right': 'none',
background: '#f5f7fa',
fontWeight: '400',
fontSize: '12px',
borderRight: 'none',
borderBottom: 'none'
}
}
},
setup () {