Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into wangfeng-500-dev

 Conflicts:
	hg-monitor-web-qh/src/main/resources/static/vue3/src/router/index.js
	hg-monitor-web-qh/src/main/resources/static/vue3/src/views/documentationManagement/vulnerability.html
	hg-monitor-web-qh/src/main/resources/static/vue3/src/views/documentationManagement/vulnerability.js

@@ -47,7 +47,8 @@ const routes = [{
         path: '/vulnerability',
         path: '/vulnerability',
         name: 'vulnerability',
         name: 'vulnerability',
         component: () => myImport('views/documentationManagement/vulnerability')
         component: () => myImport('views/documentationManagement/vulnerability')
-    }, {
+    },{
+
         path: '/documentRecycle',
         path: '/documentRecycle',
         name: 'documentRecycle',
         name: 'documentRecycle',
         component: () => myImport('views/documentationManagement/documentRecycle')
         component: () => myImport('views/documentationManagement/documentRecycle')

@@ -145,4 +145,50 @@
         </template>
         </template>
     </cm-dialog>
     </cm-dialog>
 
 
+    <el-drawer
+        v-model="viewDrawer"
+        direction="rtl"
+        size="50%"
+    >
+        <template #header="{ close, titleId, titleClass }">
+            <span style="text-align: left;" :id="titleId" :class="titleClass">查看详情</span>
+        </template>
+        <div style="text-align: left;">
+            <ul>
+                <li style="margin-bottom: 15px;display: flex;">
+                    <div style="width: 80px;">漏洞名称：</div>
+                    <div style="flex: 1;">这是漏洞名称这是漏洞名称这是漏洞名称这是漏洞名称</div>
+                </li>
+                <li style="margin-bottom: 15px;display: flex;">
+                    <div style="width: 80px;">漏洞级别：</div>
+                    <div style="flex: 1;">高</div>
+                </li>
+                <li style="margin-bottom: 15px;display: flex;">
+                    <div style="width: 80px;">漏洞详情：</div>
+                    <div style="flex: 1;">这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情这是漏洞详情</div>
+                </li>
+                <li style="margin-bottom: 15px;display: flex;">
+                    <div style="width: 80px;">影响范围：</div>
+                    <div style="flex: 1;">这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围</div>
+                </li>
+                <li style="margin-bottom: 15px;display: flex;">
+                    <div style="width: 80px;">修复建议：</div>
+                    <div style="flex: 1;">这是修复建议这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围这是影响范围</div>
+                </li>
+                <li style="margin-bottom: 15px;display: flex;">
+                    <div style="width: 80px;">录入人：</div>
+                    <div style="flex: 1;">录入人</div>
+                </li>
+            </ul>
+
+            <el-table :data="viewManuResult">
+                <el-table-column align="center" prop="manu" label="处理厂商" width="100" show-overflow-tooltip/>
+                <el-table-column align="center" prop="status" label="处理状态" width="80" />
+                <el-table-column align="center" prop="user" label="处理人" width="80" />
+                <el-table-column align="center" prop="time" label="处理时间" width="160" />
+                <el-table-column align="center" prop="info" label="处理说明" />
+            </el-table>
+        </div>
+    </el-drawer>
+
 </div>
 </div>

@@ -210,6 +210,32 @@ export default {
             getVulnerabilityList();
             getVulnerabilityList();
         }
         }
 
 
+        let viewDrawer = Vue.ref(false)
+        const handleView = ()=>{
+            viewDrawer.value = true;
+        }
+        let viewManuResult = Vue.ref([
+            {
+                manu:'厂商名',
+                status:'已处理',
+                user:'测试用户',
+                time:'2020-12-22 17:00:00',
+                info:'处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息'
+            },{
+                manu:'厂商名',
+                status:'已处理',
+                user:'测试用户',
+                time:'2020-12-22 17:00:00',
+                info:'处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息'
+            },{
+                manu:'厂商名',
+                status:'已处理',
+                user:'测试用户',
+                time:'2020-12-22 17:00:00',
+                info:'处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息处理信息'
+            }
+        ])
+
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             getVulnerabilityList();
             getVulnerabilityList();
         })
         })
@@ -236,7 +262,10 @@ export default {
             handleDel,
             handleDel,
             handleDetail,
             handleDetail,
             dataList,
             dataList,
-            handleQuery
+            handleQuery,
+            handleView,
+            viewDrawer,
+            viewManuResult,
         };
         };
     },
     },
 }
 }