monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 高磊
Commit 476dd3650b090969c71e33428c6969d685fd7c92 2 parents 9c396b13 c2ca544f

Merge branch 'wangfeng-500-dev' into 'master-500-dev' 

Wangfeng 500 dev



See merge request !1237
Inline Side-by-side
Showing 3 changed files with 70 additions and 51 deletions
... ... @@ -74,7 +74,6 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
text-overflow: ellipsis;white-space: nowrap;max-width: 100%;display: inline-block;"
class="vulnerability-name" data-id="${item.id}">${item.name}</span>
<div style="margin-top: 20px;">
<span style="margin-right: 30px;">漏洞级别:<span style="padding: 4px 10px;color: white;background-color: #C41011;border-radius: 4px;">${item.level}</span></span>
<span>披露时间: ${item.createTime}</span>
</div>
</li>`
... ... @@ -122,17 +121,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
<div class="layui-input-block">${d.repairSuggestions}</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red;">*</span>阅读状态:</label>
<label class="layui-form-label"><span style="color: red;">*</span>接收状态:</label>
<div class="layui-input-inline">
<input type="radio" name="isRead" value="1" title="已读" lay-filter="isRead"checked>
<input type="radio" name="isRead" value="0" title="未读" lay-filter="isRead">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red;">*</span>是否涉及:</label>
<label class="layui-form-label"><span style="color: red;">*</span>自查结果:</label>
<div class="layui-input-inline">
<input type="radio" name="isRelated" value="1" title="是" lay-filter="isRelated">
<input type="radio" name="isRelated" value="0" title="否" lay-filter="isRelated" checked>
<input type="radio" name="isRelated" value="1" title="涉及" lay-filter="isRelated">
<input type="radio" name="isRelated" value="0" title="不涉及" lay-filter="isRelated" checked>
</div>
<div><input type="hidden" id="vulnerabilitiesId" name="vulnerabilitiesId" value="${d.id}"></div>
</div>
... ...
... ... @@ -6,15 +6,15 @@
<el-form-item>
<el-input clearable :size="$global.elementConfig.size.input" v-model="queryParams.name" placeholder="关键字搜索" />
</el-form-item>
<el-form-item>
<el-select clearable :size="$global.elementConfig.size.input" v-model="queryParams.type" placeholder="漏洞类型">
<el-option :value="" label="全部漏洞"/>
<el-option :value="1" label="高危漏洞"/>
<el-option :value="2" label="中危漏洞"/>
<el-option :value="3" label="低危漏洞"/>
<el-option :value="4" label="信息漏洞"/>
</el-select>
</el-form-item>
<!--<el-form-item>-->
<!-- <el-select clearable :size="$global.elementConfig.size.input" v-model="queryParams.type" placeholder="漏洞类型">-->
<!-- <el-option :value="" label="全部漏洞"/>-->
<!-- <el-option :value="1" label="高危漏洞"/>-->
<!-- <el-option :value="2" label="中危漏洞"/>-->
<!-- <el-option :value="3" label="低危漏洞"/>-->
<!-- <el-option :value="4" label="信息漏洞"/>-->
<!-- </el-select>-->
<!--</el-form-item>-->
<el-form-item>
<el-button @click="handleQuery" :size="$global.elementConfig.size.button" type="primary">查询</el-button>
</el-form-item>
... ... @@ -78,26 +78,26 @@
<el-form-item label="漏洞名称" prop="name">
<el-input :size="$global.elementConfig.size.input" clearable v-model="docForm.name"></el-input>
</el-form-item>
<el-form-item label="漏洞级别" prop="type">
<el-select v-model="docForm.type" style="width: 100%;">
<el-option :value="1" label="高危漏洞"/>
<el-option :value="2" label="中危漏洞"/>
<el-option :value="3" label="低危漏洞"/>
<el-option :value="4" label="信息漏洞"/>
</el-select>
</el-form-item>
<el-form-item label="存在站点" prop="existsSite">
<el-input type="textarea" v-model="docForm.existsSite"></el-input>
</el-form-item>
<!--<el-form-item label="漏洞级别" prop="type">-->
<!-- <el-select v-model="docForm.type" style="width: 100%;">-->
<!-- <el-option :value="1" label="高危漏洞"/>-->
<!-- <el-option :value="2" label="中危漏洞"/>-->
<!-- <el-option :value="3" label="低危漏洞"/>-->
<!-- <el-option :value="4" label="信息漏洞"/>-->
<!-- </el-select>-->
<!--</el-form-item>-->
<!--<el-form-item label="存在站点" prop="existsSite">-->
<!-- <el-input type="textarea" v-model="docForm.existsSite"></el-input>-->
<!--</el-form-item>-->
<el-form-item label="漏洞详情" prop="remark">
<el-input type="textarea" v-model="docForm.remark"></el-input>
</el-form-item>
<el-form-item label="影响范围" prop="impactSite">
<el-input type="textarea" v-model="docForm.impactSite"></el-input>
</el-form-item>
<el-form-item label="修复建议" prop="repairSuggestions">
<el-input type="textarea" v-model="docForm.repairSuggestions"></el-input>
</el-form-item>
<!--<el-form-item label="影响范围" prop="impactSite">-->
<!-- <el-input type="textarea" v-model="docForm.impactSite"></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item label="修复建议" prop="repairSuggestions">-->
<!-- <el-input type="textarea" v-model="docForm.repairSuggestions"></el-input>-->
<!--</el-form-item>-->
<el-form-item>
... ... @@ -123,14 +123,17 @@
<el-form-item label="厂商" prop="manufacturer">
<el-input :size="$global.elementConfig.size.input" clearable v-model="handleForm.manufacturerName" disabled></el-input>
</el-form-item>
<el-form-item label="影响范围" prop="impactSite">
<el-input type="textarea" v-model="handleForm.impactSite"></el-input>
</el-form-item>
<el-form-item label="处理时间" prop="solveTime">
<el-date-picker v-model="handleForm.solveTime"></el-date-picker>
</el-form-item>
<el-form-item label="处理情况" prop="solveResult">
<el-select v-model="handleForm.solveResult" style="width: 100%;">
<el-option :value="1" label="已处理"/>
<el-option :value="0" label="未处理"/>
<el-option :value="1" label="已处理且处理成功"/>
<el-option :value="2" label="已处理且未处理成功"/>
</el-select>
</el-form-item>
<el-form-item label="处理说明" prop="solveRemark">
... ... @@ -150,7 +153,7 @@
<el-drawer
v-model="viewDrawer"
direction="rtl"
size="50%"
size="95%"
>
<template #header="{ close, titleId, titleClass }">
<span style="text-align: left;" :id="titleId" :class="titleClass">查看详情</span>
... ... @@ -161,22 +164,22 @@
<div style="width: 80px;">漏洞名称：</div>
<div style="flex: 1;">{{detail.name}}</div>
</li>
<li style="margin-bottom: 15px;display: flex;">
<div style="width: 80px;">漏洞级别：</div>
<div style="flex: 1;">{{detail.level}}</div>
</li>
<!--<li style="margin-bottom: 15px;display: flex;">-->
<!-- <div style="width: 80px;">漏洞级别：</div>-->
<!-- <div style="flex: 1;">{{detail.level}}</div>-->
<!--</li>-->
<li style="margin-bottom: 15px;display: flex;">
<div style="width: 80px;">漏洞详情：</div>
<div style="flex: 1;">{{detail.remark}}</div>
</li>
<li style="margin-bottom: 15px;display: flex;">
<div style="width: 80px;">影响范围：</div>
<div style="flex: 1;">{{detail.impactSite}}</div>
</li>
<li style="margin-bottom: 15px;display: flex;">
<div style="width: 80px;">修复建议：</div>
<div style="flex: 1;">{{detail.repairSuggestions}}</div>
</li>
<!--<li style="margin-bottom: 15px;display: flex;">-->
<!-- <div style="width: 80px;">影响范围：</div>-->
<!-- <div style="flex: 1;">{{detail.impactSite}}</div>-->
<!--</li>-->
<!--<li style="margin-bottom: 15px;display: flex;">-->
<!-- <div style="width: 80px;">修复建议：</div>-->
<!-- <div style="flex: 1;">{{detail.repairSuggestions}}</div>-->
<!--</li>-->
<li style="margin-bottom: 15px;display: flex;">
<div style="width: 80px;">录入人：</div>
<div style="flex: 1;">{{detail.createUserName}}</div>
... ... @@ -184,15 +187,29 @@
</ul>
<el-table :data="detail.resolutions" v-if="detail.resolutions.length > 0">
<el-table-column align="center" prop="manufacturerName" label="处理厂商" width="100" show-overflow-tooltip/>
<el-table-column align="center" prop="solveResult" label="处理状态" width="80" >
<el-table-column align="center" prop="manufacturerName" label="处理厂商" width="150" show-overflow-tooltip/>
<el-table-column align="center" prop="solveResult" label="接收状态" width="100" >
<template #default="scope">
<span v-if="scope.row.isRead == '0'">未读</span>
<span v-if="scope.row.isRead == '1'">已读</span>
</template>
</el-table-column>
<el-table-column align="center" prop="solveResult" label="自查结果" width="100" >
<template #default="scope">
<span v-if="scope.row.isRead == '0'">涉及</span>
<span v-if="scope.row.isRead == '1'">不涉及</span>
</template>
</el-table-column>
<el-table-column align="center" prop="impactSite" label="影响范围" width="200" show-overflow-tooltip/>
<el-table-column align="center" prop="solveResult" label="处理状态" width="150" >
<template #default="scope">
<span v-if="scope.row.solveResult == '0'">未处理</span>
<span v-if="scope.row.solveResult == '1'">已处理</span>
<span v-if="scope.row.solveResult == '1'">已处理且处理成功</span>
<span v-if="scope.row.solveResult == '2'">已处理且未处理成功</span>
</template>
</el-table-column>
<el-table-column align="center" prop="solveUserName" label="处理人" width="120" />
<el-table-column align="center" prop="solveTime" label="处理时间" width="160" />
<el-table-column align="center" prop="solveTime" label="处理时间" width="100" />
<el-table-column align="center" prop="solveRemark" label="处理说明" />
</el-table>
... ...
... ... @@ -102,6 +102,7 @@ export default {
let docForm = Vue.ref({
name:'',
level:'',
type:'1',
remark:'',
impactSite:'',
repairSuggestions:'',
... ... @@ -152,7 +153,8 @@ export default {
solveResult:'',
solveRemark:'',
solveTime:'',
vulnerabilitiesId:''
vulnerabilitiesId:'',
impactSite:''
})
let handleRulesForm = Vue.ref({
solveResult:[{
... ... @@ -178,6 +180,7 @@ export default {
handleForm.value.solveRemark = '';
handleForm.value.solveTime = '';
handleForm.value.vulnerabilitiesId = '';
handleForm.value.impactSite = '';
if(res.success){
proxy.$global.showMsg('处理成功');
... ...