monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wf
Commit 7fc02b13f1d52c3af0ddbb2113ce44a6533dac1b 1 parent c2ca544f

处理bug 2812

Inline Side-by-side
Showing 3 changed files with 41 additions and 40 deletions
@@ -11,12 +11,12 @@ server: @@ -11,12 +11,12 @@ server:
11 key-store-password: Hg0801.. 11 key-store-password: Hg0801..
12 key-password: Hg0801.. 12 key-password: Hg0801..
13 url: 13 url:
14 - gateway: http://192.168.0.44:8080  
15 - inspection_web: http://192.168.0.44:8082  
16 - assetsweb: http://192.168.0.44:8082  
17 - mxgraph_editor: http://192.168.0.44:8085  
18 - tingyun: http://192.168.0.44:8088  
19 - bigScreen: http://192.168.1.51:8081 14 + gateway: http://localhost:8080
  15 + inspection_web: http://localhost:8082
  16 + assetsweb: http://localhost:8082
  17 + mxgraph_editor: http://localhost:8085
  18 + tingyun: http://localhost:8088
  19 + bigScreen: http://localhost:8081
20 #流程系统路径，当ssl.enabled=true时，http要改为https,并修改流程nginx的conf文件 20 #流程系统路径，当ssl.enabled=true时，http要改为https,并修改流程nginx的conf文件
21 workflow: http://192.168.0.248:8002 21 workflow: http://192.168.0.248:8002
22 # 积木报表工具 22 # 积木报表工具
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 66
67 67
68 <cm-dialog :showDialogVisible="addDialogVisible" :showFooter="false" :title="addDialogTitle" @hidedialog="showFolder" 68 <cm-dialog :showDialogVisible="addDialogVisible" :showFooter="false" :title="addDialogTitle" @hidedialog="showFolder"
69 - width="600px"> 69 + width="800px">
70 <template v-slot> 70 <template v-slot>
71 <el-form 71 <el-form
72 :model="docForm" 72 :model="docForm"
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <!-- <el-input type="textarea" v-model="docForm.existsSite"></el-input>--> 90 <!-- <el-input type="textarea" v-model="docForm.existsSite"></el-input>-->
91 <!--</el-form-item>--> 91 <!--</el-form-item>-->
92 <el-form-item label="漏洞详情" prop="remark"> 92 <el-form-item label="漏洞详情" prop="remark">
93 - <el-input type="textarea" v-model="docForm.remark"></el-input> 93 + <el-input type="textarea" :rows="10" v-model="docForm.remark"></el-input>
94 </el-form-item> 94 </el-form-item>
95 <!--<el-form-item label="影响范围" prop="impactSite">--> 95 <!--<el-form-item label="影响范围" prop="impactSite">-->
96 <!-- <el-input type="textarea" v-model="docForm.impactSite"></el-input>--> 96 <!-- <el-input type="textarea" v-model="docForm.impactSite"></el-input>-->
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
110 </template> 110 </template>
111 </cm-dialog> 111 </cm-dialog>
112 112
  113 + <!-- 漏洞处理表单 -->
113 <cm-dialog :showDialogVisible="handleVisible" :showFooter="false" title="处理" @hidedialog="showHandleFolder" 114 <cm-dialog :showDialogVisible="handleVisible" :showFooter="false" title="处理" @hidedialog="showHandleFolder"
114 width="600px"> 115 width="600px">
115 <template v-slot> 116 <template v-slot>
@@ -131,9 +132,9 @@ @@ -131,9 +132,9 @@
131 </el-form-item> 132 </el-form-item>
132 <el-form-item label="处理情况" prop="solveResult"> 133 <el-form-item label="处理情况" prop="solveResult">
133 <el-select v-model="handleForm.solveResult" style="width: 100%;"> 134 <el-select v-model="handleForm.solveResult" style="width: 100%;">
134 - <el-option :value="0" label="未处理"/>  
135 - <el-option :value="1" label="已处理且处理成功"/>  
136 - <el-option :value="2" label="已处理且未处理成功"/> 135 + <el-option value="0" label="未处理"/>
  136 + <el-option value="1" label="已处理且处理成功"/>
  137 + <el-option value="2" label="已处理且未处理成功"/>
137 </el-select> 138 </el-select>
138 </el-form-item> 139 </el-form-item>
139 <el-form-item label="处理说明" prop="solveRemark"> 140 <el-form-item label="处理说明" prop="solveRemark">
@@ -184,20 +185,24 @@ @@ -184,20 +185,24 @@
184 <div style="width: 80px;">录入人：</div> 185 <div style="width: 80px;">录入人：</div>
185 <div style="flex: 1;">{{detail.createUserName}}</div> 186 <div style="flex: 1;">{{detail.createUserName}}</div>
186 </li> 187 </li>
  188 + <li style="margin-bottom: 15px;display: flex;">
  189 + <div style="width: 80px;">录入时间：</div>
  190 + <div style="flex: 1;">{{detail.createTime}}</div>
  191 + </li>
187 </ul> 192 </ul>
188 193
189 <el-table :data="detail.resolutions" v-if="detail.resolutions.length > 0"> 194 <el-table :data="detail.resolutions" v-if="detail.resolutions.length > 0">
190 <el-table-column align="center" prop="manufacturerName" label="处理厂商" width="150" show-overflow-tooltip/> 195 <el-table-column align="center" prop="manufacturerName" label="处理厂商" width="150" show-overflow-tooltip/>
191 - <el-table-column align="center" prop="solveResult" label="接收状态" width="100" > 196 + <el-table-column align="center" prop="isRead" label="接收状态" width="100" >
192 <template #default="scope"> 197 <template #default="scope">
193 <span v-if="scope.row.isRead == '0'">未读</span> 198 <span v-if="scope.row.isRead == '0'">未读</span>
194 <span v-if="scope.row.isRead == '1'">已读</span> 199 <span v-if="scope.row.isRead == '1'">已读</span>
195 </template> 200 </template>
196 </el-table-column> 201 </el-table-column>
197 - <el-table-column align="center" prop="solveResult" label="自查结果" width="100" > 202 + <el-table-column align="center" prop="isRelated" label="自查结果" width="100" >
198 <template #default="scope"> 203 <template #default="scope">
199 - <span v-if="scope.row.isRead == '0'">涉及</span>  
200 - <span v-if="scope.row.isRead == '1'">不涉及</span> 204 + <span v-if="scope.row.isRelated == '1'">涉及</span>
  205 + <span v-if="scope.row.isRelated == '0'">不涉及</span>
201 </template> 206 </template>
202 </el-table-column> 207 </el-table-column>
203 <el-table-column align="center" prop="impactSite" label="影响范围" width="200" show-overflow-tooltip/> 208 <el-table-column align="center" prop="impactSite" label="影响范围" width="200" show-overflow-tooltip/>
@@ -17,41 +17,26 @@ export default { @@ -17,41 +17,26 @@ export default {
17 { 17 {
18 prop: 'name', 18 prop: 'name',
19 label: '漏洞名称', 19 label: '漏洞名称',
20 - sortable: true,  
21 align: 'center', 20 align: 'center',
22 width: '200', 21 width: '200',
23 }, 22 },
24 { 23 {
25 - prop: 'level',  
26 - label: '漏洞类型',  
27 - sortable: true, 24 + prop: 'remark',
  25 + label: '漏洞详情',
28 align: 'center' 26 align: 'center'
29 }, 27 },
30 { 28 {
31 - prop: 'existsSite',  
32 - label: '存在站点',  
33 - sortable: true,  
34 - align: 'center',  
35 - width: '130'  
36 - },  
37 - {  
38 - prop: 'impactSite',  
39 - label: '影响范围',  
40 - sortable: true,  
41 - align: 'center',  
42 - },  
43 - {  
44 prop: 'createTime', 29 prop: 'createTime',
45 label: '披露时间', 30 label: '披露时间',
46 sortable: true, 31 sortable: true,
47 align: 'center', 32 align: 'center',
48 - width: '180'  
49 - }, {  
50 - prop: 'repairPriority',  
51 - label: '处理优先级',  
52 - sortable: true, 33 + width: '150'
  34 + },
  35 + {
  36 + prop: 'createUserName',
  37 + label: '录入人',
53 align: 'center', 38 align: 'center',
54 - width: '130' 39 + width: '100'
55 } 40 }
56 ] 41 ]
57 }) 42 })
@@ -59,8 +44,7 @@ export default { @@ -59,8 +44,7 @@ export default {
59 let dataList = Vue.ref([]); 44 let dataList = Vue.ref([]);
60 let userVulnRole = Vue.ref(''); 45 let userVulnRole = Vue.ref('');
61 let addDialogVisible = Vue.ref(false) 46 let addDialogVisible = Vue.ref(false)
62 - let addDialogTitle = Vue.ref('')  
63 - 47 + let addDialogTitle = Vue.ref('');
64 // 新增按钮 48 // 新增按钮
65 const handleAdd = ()=>{ 49 const handleAdd = ()=>{
66 getManufacturer(); 50 getManufacturer();
@@ -142,6 +126,15 @@ export default { @@ -142,6 +126,15 @@ export default {
142 let handleFun = (v)=>{ 126 let handleFun = (v)=>{
143 handleVisible.value = true; 127 handleVisible.value = true;
144 handleForm.value.vulnerabilitiesId = v.id; 128 handleForm.value.vulnerabilitiesId = v.id;
  129 + handleForm.value.solveTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
  130 + if(v.currentUserResolution){
  131 + handleForm.value.manufacturerName = v.currentUserResolution.manufacturerName;
  132 + handleForm.value.solveResult = v.currentUserResolution.solveResult;
  133 + handleForm.value.solveRemark = v.currentUserResolution.solveRemark;
  134 + handleForm.value.solveTime = v.currentUserResolution.solveTime;
  135 + handleForm.value.impactSite = v.currentUserResolution.impactSite;
  136 + }
  137 +
145 getManufacturer(); 138 getManufacturer();
146 } 139 }
147 let handleVisible = Vue.ref(false); 140 let handleVisible = Vue.ref(false);
@@ -184,6 +177,7 @@ export default { @@ -184,6 +177,7 @@ export default {
184 177
185 if(res.success){ 178 if(res.success){
186 proxy.$global.showMsg('处理成功'); 179 proxy.$global.showMsg('处理成功');
  180 + getVulnerabilityList();
187 }else{ 181 }else{
188 proxy.$global.showMsg('处理失败，请稍后再试！', 'warning'); 182 proxy.$global.showMsg('处理失败，请稍后再试！', 'warning');
189 } 183 }
@@ -267,6 +261,8 @@ export default { @@ -267,6 +261,8 @@ export default {
267 viewDrawer, 261 viewDrawer,
268 detail, 262 detail,
269 userVulnRole 263 userVulnRole
  264 + // defaultSolveTime,
  265 + // defaultSolveDate
270 }; 266 };
271 }, 267 },
272 } 268 }