Skip to content

N
nse-ui
Commit b196a6f3 by ningjihai
Options

发现梳理

parent 3cb3c08a
正在显示 包含 178 行增加 和 86 行删除
src/views/discover/Discover/addEditDiscovery.vue
...@@ -187,30 +187,34 @@ ...@@ -187,30 +187,34 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<!-- <template #footer> --> <!-- <template #footer> -->
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="handleCancel">取消</el-button> <el-button type="danger" @click="handleCancel">取消</el-button>
<el-button <el-button
color="rgba(255, 141, 26, 1)"
type="primary"
v-if="currentStep > 1" v-if="currentStep > 1"
@click="handlePrevStep" @click="handlePrevStep"
> >
上一步 <span style="color: #fff;">上一步</span>
</el-button> </el-button>
<el-button <!-- <el-button
v-if="currentStep < 3" v-if="currentStep < 3"
type="primary" type="primary"
@click="handleNextStep" @click="handleNextStep"
> >
下一步 下一步
</el-button> </el-button> -->
<el-button v-if="currentStep < 3" type="primary" color="rgba(33, 103, 217, 1)" @click="handleNextStep">下一步</el-button>
<el-button <!-- <el-button
v-if="currentStep === 3" v-if="currentStep === 3"
type="primary" type="primary"
@click="handleConfirm" @click="handleConfirm"
> >
确定 确定
</el-button> </el-button> -->
<el-button v-if="currentStep === 3" type="primary" color="rgba(33, 103, 217, 1)" @click="handleConfirm">确定</el-button>
</div> </div>
<!-- </template> --> <!-- </template> -->
......
src/views/discover/Discover/discoverResult.vue
...@@ -12,6 +12,10 @@ import DomainRuleDialog from './modules/DomainRuleDialog.vue' ...@@ -12,6 +12,10 @@ import DomainRuleDialog from './modules/DomainRuleDialog.vue'
import MatchPreviewDialog from './modules/MatchPreviewDialog.vue' import MatchPreviewDialog from './modules/MatchPreviewDialog.vue'
import SaveVersionDialog from './modules/SaveVersionDialog.vue' import SaveVersionDialog from './modules/SaveVersionDialog.vue'
import arrowDown from '@/assets/images/arrowDown.png'
import arrowUp from '@/assets/images/arrowUp.png'
import eye from '@/assets/images/eye.png'
import { import {
tdiscoverresultQuery, tdiscoverresultQuery,
getdiscoverresultreport, getdiscoverresultreport,
...@@ -798,59 +802,60 @@ const handleError = (error, file, fileList) => { ...@@ -798,59 +802,60 @@ const handleError = (error, file, fileList) => {
查看结果 查看结果
</template> </template>
<template #buttons> <template #buttons>
</template>
</PageTitle>
<div class="app-container__body">
<div class="discovery-report-container">
<!-- 上方：发现任务执行报告概览 -->
<div class="report-overview">
<div class="flex-container report-item" v-for="(item,index) in reportData" :class="`report-back${index+1}`">
<div class="item-label">{{ item.label }}</div>
<div class="item-content">{{ item.content }}</div>
</div>
</div>
<div class="option-container">
<el-checkbox style="margin-right: 10px;" v-model="selectAll" @change="displaySensitive" class="select-all-checkbox">仅显示敏感字段</el-checkbox> <el-checkbox style="margin-right: 10px;" v-model="selectAll" @change="displaySensitive" class="select-all-checkbox">仅显示敏感字段</el-checkbox>
<el-button <el-button
type="primary" plain
:Loading="confirmAllLoading" color="rgba(255, 141, 26, 1)"
:loading="confirmAllLoading"
@click="confirmAll" @click="confirmAll"
> >
确认所有 确认所有
</el-button> </el-button>
<el-button <el-button
type="danger" plain
color="rgba(121, 72, 234, 1)"
:loading="cancelAllLoading" :loading="cancelAllLoading"
@click="cancelAll" @click="cancelAll"
> >
取消所有 取消所有
</el-button> </el-button>
<el-button <!-- <el-button
type="success" type="success"
@click="openSaveDialog" @click="openSaveDialog"
> >
保存版本 保存版本
</el-button> </el-button> -->
<el-button <el-button
type="primary" color="rgba(83, 178, 87, 1)"
plain
@click="exportData" @click="exportData"
> >
导出 导出
</el-button> </el-button>
<el-button <el-button
type="success" color="rgba(172, 51, 193, 1)"
plain
@click="handleImport" @click="handleImport"
> >
导入 导入
</el-button> </el-button>
</template>
</PageTitle>
<div class="app-container__body">
<div class="discovery-report-container">
<!-- 上方：发现任务执行报告概览 -->
<div class="report-overview">
<h2 class="report-title">发现任务执行报告</h2>
<div class="overview-cards">
<el-descriptions :column="4" border>
<el-descriptions-item :label="item.label" v-for="(item,index) in reportData" :key="index">
<span class="highlight-text">{{item.content}}</span>
</el-descriptions-item>
</el-descriptions>
</div>
</div> </div>
<!-- 下方：详细数据表格 --> <!-- 下方：详细数据表格 -->
...@@ -858,11 +863,22 @@ const handleError = (error, file, fileList) => { ...@@ -858,11 +863,22 @@ const handleError = (error, file, fileList) => {
<el-collapse v-model="activeNames" v-if="collapseDataList.length > 0" v-loading="listLoading" accordion @change="handleChangeTableByCollapse"> <el-collapse v-model="activeNames" v-if="collapseDataList.length > 0" v-loading="listLoading" accordion @change="handleChangeTableByCollapse">
<!-- 第一个表格 --> <!-- 第一个表格 -->
<el-collapse-item :name="item.tfields" v-for="(item, index) in collapseDataList" :key="index"> <el-collapse-item :name="item.tfields" v-for="(item, index) in collapseDataList" :key="index">
<template #icon="{ isActive }">
<!-- <span class="icon-ele">
{{ isActive ? 'Expanded' : 'Collapsed' }}
</span> -->
<img v-if="isActive" :src="arrowUp" alt="">
<img v-else :src="arrowDown" alt="">
</template>
<template #title> <template #title>
<div>
<span class="collapse-title">{{ item.tfields }}</span> <span class="collapse-title">{{ item.tfields }}</span>
<span class="sensitive-count">{{item.dataarea_name}}</span> <span class="sensitive-count">{{item.dataarea_name}}</span>
</div>
</template> </template>
<el-table :data="item.children" height="300px" style="width: 100%;"> <el-table :data="item.children" height="300px" stripe style="width: 100%;">
<el-table-column <el-table-column
v-for="(tableItem,tableIndex) in tableColumns" v-for="(tableItem,tableIndex) in tableColumns"
...@@ -879,9 +895,12 @@ const handleError = (error, file, fileList) => { ...@@ -879,9 +895,12 @@ const handleError = (error, file, fileList) => {
<template #default="scope"> <template #default="scope">
<div v-if="tableItem.key === 'index'">{{ scope.$index + 1 }}</div> <div v-if="tableItem.key === 'index'">{{ scope.$index + 1 }}</div>
<el-button type="primary" link v-if="tableItem.key === 'dataarea_name'" @click="setDataarea(scope.row)">{{ scope.row.icon.find(x =>x.key === 'dataarea_name').label }}</el-button> <el-button type="primary" link v-if="tableItem.key === 'dataarea_name'" @click="setDataarea(scope.row)">{{ scope.row.icon.find(x =>x.key === 'dataarea_name').label }}</el-button>
<el-button type="primary" plain v-if="tableItem.key === 'confirm'" size="small" @click="confirmKey(scope.row)">{{ scope.row.button[0].label }}</el-button> <el-button :type="scope.row.issure === '1' ? 'primary' : ''" :plain="scope.row.issure === '0'" v-if="tableItem.key === 'confirm'" size="small" @click="confirmKey(scope.row)">{{ scope.row.button[0].label }}</el-button>
<el-button type="success" plain v-if="tableItem.key === 'actStatus'" size="small" @click="matchingPercent(scope.row)">{{ scope.row.icon.find(x =>x.key === 'actStatus').label }}</el-button> <el-button type="primary" link v-if="tableItem.key === 'actStatus'" size="small" @click="matchingPercent(scope.row)">
<img :src="eye" alt="" class="eye">
{{ scope.row.icon.find(x =>x.key === 'actStatus').label }}
</el-button>
</template> </template>
...@@ -983,17 +1002,52 @@ const handleError = (error, file, fileList) => { ...@@ -983,17 +1002,52 @@ const handleError = (error, file, fileList) => {
.discovery-report-container { .discovery-report-container {
padding: 20px; // padding: 20px;
background: #f5f7fa; // background: #f5f7fa;
// min-height: 100vh; // min-height: 100vh;
} }
.report-overview { .report-overview {
background: white; display: flex;
border-radius: 8px; justify-content: space-between;
padding: 24px;
margin-bottom: 20px; .report-item {
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); padding: 24px 16px 23px 12px;
.item-label{
font-size: 12px;
color: rgba(255, 255, 255, 1);
}
.item-content{
margin-left: 76px;
font-size: 12px;
color: rgba(255, 255, 255, 1);
}
}
.report-back1{
background-image: url("@/assets/images/resultBack1.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.report-back2{
background-image: url("@/assets/images/resultBack2.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.report-back3{
background-image: url("@/assets/images/resultBack3.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.report-back4{
background-image: url("@/assets/images/resultBack4.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.report-back5{
background-image: url("@/assets/images/resultBack5.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
} }
.report-title { .report-title {
...@@ -1012,7 +1066,11 @@ const handleError = (error, file, fileList) => { ...@@ -1012,7 +1066,11 @@ const handleError = (error, file, fileList) => {
.main-cards { .main-cards {
flex: 1; flex: 1;
} }
.eye {
height: 10px;
width: 10px;
object-fit: cover;
}
.sensitive-column-card { .sensitive-column-card {
background: #f0f7ff; background: #f0f7ff;
border: 1px solid #1890ff; border: 1px solid #1890ff;
...@@ -1067,12 +1125,18 @@ const handleError = (error, file, fileList) => { ...@@ -1067,12 +1125,18 @@ const handleError = (error, file, fileList) => {
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
} }
.option-container {
margin-top: 32px;
display: flex;
align-items: center;
justify-content: flex-end;
}
.detailed-data { .detailed-data {
background: white; margin-top: 37px;
border-radius: 8px; // background: white;
padding: 20px; // border-radius: 8px;
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); // padding: 20px;
// box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
} }
:deep(.el-collapse) { :deep(.el-collapse) {
...@@ -1082,23 +1146,26 @@ const handleError = (error, file, fileList) => { ...@@ -1082,23 +1146,26 @@ const handleError = (error, file, fileList) => {
margin-bottom: 12px; margin-bottom: 12px;
&__header { &__header {
background: #f0f7ff; background: rgba(72, 158, 255, 1);
border: 1px solid #1890ff; // border: 1px solid #1890ff;
border-radius: 4px; border-radius: 4px;
padding: 0 16px; padding: 0 16px;
height: 48px; height: 48px;
font-weight: 600; font-weight: 600;
display: flex;
justify-content: space-between;
.collapse-title { .collapse-title {
color: #303133; font-size: 16px;
font-size: 14px; font-weight: 500;
color: rgba(255, 255, 255, 1);
} }
.sensitive-count { .sensitive-count {
color: #1890ff;
margin-left: 12px; margin-left: 31px;
font-size: 13px; font-size: 16px;
font-weight: normal; font-weight: 500;
color: rgba(255, 255, 255, 1);
} }
} }
......
src/views/discover/Discover/list.vue
...@@ -10,8 +10,8 @@ import { changeRoute } from '@/utils/switchRoute' ...@@ -10,8 +10,8 @@ import { changeRoute } from '@/utils/switchRoute'
import QueryForm from './QueryForm.vue' import QueryForm from './QueryForm.vue'
// import AddDiscoveryDialog from './modules/AddDiscoveryDialog.vue' // 引入新增发现任务弹窗 // import AddDiscoveryDialog from './modules/AddDiscoveryDialog.vue' // 引入新增发现任务弹窗
import SmartDiscoveryDialog from './modules/SmartDiscoveryDialog.vue' import SmartDiscoveryDialog from './modules/SmartDiscoveryDialog.vue'
import find from '@/assets/images/find.png'
import jiankong from '@/assets/images/jiankong.png'
import { import {
queryDiscoverList, queryDiscoverList,
delDiscoverTask, delDiscoverTask,
...@@ -520,8 +520,9 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{ ...@@ -520,8 +520,9 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
<!-- 编辑按钮 --> <!-- 编辑按钮 -->
<el-button <el-button
link link
type="primary" type="danger"
size="small" size="small"
icon="edit"
@click="handleEdit(row)" @click="handleEdit(row)"
class="op-btn" class="op-btn"
> >
...@@ -531,23 +532,23 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{ ...@@ -531,23 +532,23 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
<!-- 发现按钮 --> <!-- 发现按钮 -->
<el-button <el-button
link link
type="success" type="danger"
size="small" size="small"
@click="handleDiscover(row)" @click="handleDiscover(row)"
class="op-btn" class="op-btn"
> >
发现 <img :src="find" alt="" class="btn-logo"> 发现
</el-button> </el-button>
<!-- 监控按钮 --> <!-- 监控按钮 -->
<el-button <el-button
link link
type="warning" type="danger"
size="small" size="small"
@click="handleMonitor(row)" @click="handleMonitor(row)"
class="op-btn" class="op-btn"
> >
监控 <img :src="jiankong" alt="" class="btn-logo">监控
</el-button> </el-button>
<!-- 更多操作下拉菜单 --> <!-- 更多操作下拉菜单 -->
...@@ -557,7 +558,7 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{ ...@@ -557,7 +558,7 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
> >
<el-button <el-button
link link
type="info" type="danger"
size="small" size="small"
class="more-btn" class="more-btn"
icon="MoreFilled" icon="MoreFilled"
...@@ -570,12 +571,12 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{ ...@@ -570,12 +571,12 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
</el-button> </el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item command="smartDiscover"> <!-- <el-dropdown-item command="smartDiscover">
<span class="dropdown-item smart-discover">智能发现</span> <span class="dropdown-item smart-discover">智能发现</span>
</el-dropdown-item> </el-dropdown-item> -->
<el-dropdown-item command="viewHistory"> <!-- <el-dropdown-item command="viewHistory">
<span class="dropdown-item">查看历史</span> <span class="dropdown-item">查看历史</span>
</el-dropdown-item> </el-dropdown-item> -->
<el-dropdown-item command="viewResult"> <el-dropdown-item command="viewResult">
<span class="dropdown-item">查看结果</span> <span class="dropdown-item">查看结果</span>
</el-dropdown-item> </el-dropdown-item>
...@@ -615,7 +616,10 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{ ...@@ -615,7 +616,10 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
margin-top: var(--container-pd); margin-top: var(--container-pd);
margin-bottom: 20px; margin-bottom: 20px;
} }
.btn-logo {
height: 10px;
width: 10px;
}
.item-content { .item-content {
margin: 8px 0; margin: 8px 0;
.label { .label {
...@@ -763,4 +767,11 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{ ...@@ -763,4 +767,11 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
} }
} }
} }
:deep(.el-button--danger){
--el-button-text-color: rgba(33, 103, 217, 1);
--el-button-hover-text-color: rgba(33, 103, 217, 1);
--el-button-hover-bg-color: rgba(33, 103, 217, 1);
--el-button-hover-border-color:rgba(33, 103, 217, 1);
--el-button-hover-link-text-color:rgba(33, 103, 217, 1);
}
</style> </style>
\ No newline at end of file
src/views/discover/Discover/modules/DomainRuleDialog.vue
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<el-dialog <el-dialog
v-model="dialogVisible" v-model="dialogVisible"
:title="title" :title="title"
width="800px" class="custom-dialog"
width="900px"
destroy-on-close destroy-on-close
:before-close="handleClose" :before-close="handleClose"
> >
...@@ -68,11 +69,16 @@ ...@@ -68,11 +69,16 @@
</div> </div>
</div> </div>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<div class="dialog-footer">
<el-button @click="handleReset">重置规则</el-button>
<el-button type="primary" @click="handleConfirm">确定规则</el-button>
</div>
</div> </div>
<template #footer>
<!-- <el-button @click="handleReset">重置规则</el-button>
<el-button type="primary" @click="handleConfirm">确定规则</el-button> -->
<el-button type="primary" color="rgba(33, 103, 217, 1)" @click="handleReset">确定规则</el-button>
<el-button type="primary" plain @click="handleConfirm">重置规则</el-button>
</template>
</el-dialog> </el-dialog>
</template> </template>
...@@ -330,12 +336,12 @@ watch(() => props.ruleList, (newRuleList) => { ...@@ -330,12 +336,12 @@ watch(() => props.ruleList, (newRuleList) => {
} }
.dialog-footer { .dialog-footer {
display: flex; // display: flex;
justify-content: flex-end; // // justify-content: flex-end;
gap: 12px; // gap: 12px;
margin-top: 20px; // margin-top: 20px;
padding-top: 16px; // padding-top: 16px;
border-top: 1px solid #e0e0e0; // border-top: 1px solid #e0e0e0;
} }
} }
......
src/views/discover/Discover/modules/MatchPreviewDialog.vue
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<el-dialog <el-dialog
v-model="dialogVisible" v-model="dialogVisible"
title="查看匹配" title="查看匹配"
class="custom-dialog"
width="900px" width="900px"
:before-close="handleClose" :before-close="handleClose"
> >
...@@ -77,11 +78,13 @@ ...@@ -77,11 +78,13 @@
</div> </div>
</div> </div>
<!-- 底部按钮 -->
<div class="dialog-footer">
<el-button type="primary" @click="handleClose">关闭</el-button>
</div>
</div> </div>
<template #footer>
<el-button type="primary" color="rgba(33, 103, 217, 1)" @click="handleClose">关闭</el-button>
</template>
</el-dialog> </el-dialog>
</template> </template>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论