monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 高磊
Commit 337357f6d173bc25dd08a587849c37041c0a38ef 2 parents 476dd365 dba8e09b

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

Wangfeng 500 dev



See merge request !1238
Inline Side-by-side
Showing 3 changed files with 42 additions and 41 deletions
... ... @@ -11,12 +11,12 @@ server:
key-store-password: Hg0801..
key-password: Hg0801..
url:
gateway: http://192.168.0.44:8080
inspection_web: http://192.168.0.44:8082
assetsweb: http://192.168.0.44:8082
mxgraph_editor: http://192.168.0.44:8085
tingyun: http://192.168.0.44:8088
bigScreen: http://192.168.1.51:8081
gateway: http://localhost:8080
inspection_web: http://localhost:8082
assetsweb: http://localhost:8082
mxgraph_editor: http://localhost:8085
tingyun: http://localhost:8088
bigScreen: http://localhost:8081
#流程系统路径，当ssl.enabled=true时，http要改为https,并修改流程nginx的conf文件
workflow: http://192.168.0.248:8002
# 积木报表工具
... ...
... ... @@ -66,7 +66,7 @@
<cm-dialog :showDialogVisible="addDialogVisible" :showFooter="false" :title="addDialogTitle" @hidedialog="showFolder"
width="600px">
width="800px">
<template v-slot>
<el-form
:model="docForm"
... ... @@ -90,7 +90,7 @@
<!-- <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-input type="textarea" :rows="10" 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>-->
... ... @@ -110,6 +110,7 @@
</template>
</cm-dialog>
<!-- 漏洞处理表单 -->
<cm-dialog :showDialogVisible="handleVisible" :showFooter="false" title="处理" @hidedialog="showHandleFolder"
width="600px">
<template v-slot>
... ... @@ -127,13 +128,14 @@
<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-date-picker v-model="handleForm.solveTime"
placeholder="选择日期" ></el-date-picker>
</el-form-item>
<el-form-item label="处理情况" prop="solveResult">
<el-select v-model="handleForm.solveResult" style="width: 100%;">
<el-option :value="0" label="未处理"/>
<el-option :value="1" label="已处理且处理成功"/>
<el-option :value="2" 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">
... ... @@ -184,20 +186,24 @@
<div style="width: 80px;">录入人：</div>
<div style="flex: 1;">{{detail.createUserName}}</div>
</li>
<li style="margin-bottom: 15px;display: flex;">
<div style="width: 80px;">录入时间：</div>
<div style="flex: 1;">{{detail.createTime}}</div>
</li>
</ul>
<el-table :data="detail.resolutions" v-if="detail.resolutions.length > 0">
<el-table-column align="center" prop="manufacturerName" label="处理厂商" width="150" show-overflow-tooltip/>
<el-table-column align="center" prop="solveResult" label="接收状态" width="100" >
<el-table-column align="center" prop="isRead" 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" >
<el-table-column align="center" prop="isRelated" label="自查结果" width="100" >
<template #default="scope">
<span v-if="scope.row.isRead == '0'">涉及</span>
<span v-if="scope.row.isRead == '1'">不涉及</span>
<span v-if="scope.row.isRelated == '1'">涉及</span>
<span v-if="scope.row.isRelated == '0'">不涉及</span>
</template>
</el-table-column>
<el-table-column align="center" prop="impactSite" label="影响范围" width="200" show-overflow-tooltip/>
... ...
... ... @@ -17,41 +17,26 @@ export default {
{
prop: 'name',
label: '漏洞名称',
sortable: true,
align: 'center',
width: '200',
},
{
prop: 'level',
label: '漏洞类型',
sortable: true,
prop: 'remark',
label: '漏洞详情',
align: 'center'
},
{
prop: 'existsSite',
label: '存在站点',
sortable: true,
align: 'center',
width: '130'
},
{
prop: 'impactSite',
label: '影响范围',
sortable: true,
align: 'center',
},
{
prop: 'createTime',
label: '披露时间',
sortable: true,
align: 'center',
width: '180'
}, {
prop: 'repairPriority',
label: '处理优先级',
sortable: true,
width: '150'
},
{
prop: 'createUserName',
label: '录入人',
align: 'center',
width: '130'
width: '100'
}
]
})
... ... @@ -59,8 +44,7 @@ export default {
let dataList = Vue.ref([]);
let userVulnRole = Vue.ref('');
let addDialogVisible = Vue.ref(false)
let addDialogTitle = Vue.ref('')
let addDialogTitle = Vue.ref('');
// 新增按钮
const handleAdd = ()=>{
getManufacturer();
... ... @@ -142,6 +126,14 @@ export default {
let handleFun = (v)=>{
handleVisible.value = true;
handleForm.value.vulnerabilitiesId = v.id;
if(v.currentUserResolution){
handleForm.value.manufacturerName = v.currentUserResolution.manufacturerName;
handleForm.value.solveResult = v.currentUserResolution.solveResult;
handleForm.value.solveRemark = v.currentUserResolution.solveRemark;
handleForm.value.solveTime = v.currentUserResolution.solveTime;
handleForm.value.impactSite = v.currentUserResolution.impactSite;
}
getManufacturer();
}
let handleVisible = Vue.ref(false);
... ... @@ -184,6 +176,7 @@ export default {
if(res.success){
proxy.$global.showMsg('处理成功');
getVulnerabilityList();
}else{
proxy.$global.showMsg('处理失败，请稍后再试！', 'warning');
}
... ... @@ -267,6 +260,8 @@ export default {
viewDrawer,
detail,
userVulnRole
// defaultSolveTime,
// defaultSolveDate
};
},
}
... ...