feat: 综合监控-自动发现 & 日志监控 修复

src/views/IntegratedMonitor/autoSearch.vue

@@ -98,8 +98,8 @@
     </el-dialog>
 
     <el-dialog :visible.sync="PasswordOpen" :title="passwordTitle" width="600px">
-      <el-form label-width="100px">
-        <div style="padding-right: 80px">
+      <el-form label-width="110px">
+        <div v-if="dialogFlag !== 'snmp'" style="padding-right: 80px">
           <el-form-item label="用户名">
             <el-input
               value="root"
@@ -112,7 +112,7 @@
             />
           </el-form-item>
         </div>
-        <div v-for="item in addPassword" :key="item.id">
+        <div v-if="dialogFlag !== 'snmp'" v-for="item in addPassword" :key="item.id">
           <div style="width: calc(100% - 80px);display: inline-block">
             <el-form-item label="用户名">
               <el-input />
@@ -125,7 +125,20 @@
           </div>
           <el-button type="text" @click="deleteAccount(item.id)">删除</el-button>
         </div>
-        <el-button type="text" @click="addAccount">添加一组用户名和密码</el-button>
+        <el-button v-if="dialogFlag !== 'snmp'" type="text" @click="addAccount">添加一组用户名和密码</el-button>
+        <el-form-item v-if="dialogFlag === 'oracle'" label="SID">
+          <el-input value="ORCLDB" />
+        </el-form-item>
+        <el-form-item v-if="dialogFlag === 'snmp'" label="可读共同体名称">
+          <el-input type="password" value="ORCLDB" />
+        </el-form-item>
+        <el-form-item v-if="dialogFlag === 'snmp'" label="版本">
+          <el-select value="V2">
+            <el-option value="V1"></el-option>
+            <el-option value="V2"></el-option>
+            <el-option value="V3"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
     </el-dialog>
 
@@ -151,6 +164,7 @@ export default {
       open: false,
       PasswordOpen: false,
       passwordTitle: '',
+      dialogFlag: 'mysql',
       addPassword: [],
       // 表单参数
       form: {},
@@ -229,17 +243,17 @@ export default {
           logContent: '1'
         },
         {
-          software: 'agent',
+          software: 'oracle',
           createTime: '1521',
           logContent: '1'
         },
         {
-          software: 'agent',
+          software: 'snmp',
           createTime: '161',
           logContent: '1'
         },
         {
-          software: 'agent',
+          software: 'ssh',
           createTime: '22',
           logContent: '1'
         }
@@ -290,6 +304,7 @@ export default {
     changeSenior(row) {
       this.PasswordOpen = true
       this.passwordTitle = row.software + '--高级'
+      this.dialogFlag = row.software
     },
     addAccount() {
       this.addPassword.push({

src/views/IntegratedMonitor/logMonitor/snmpTrapJournal.vue

@@ -45,7 +45,7 @@
       <el-form-item>
         <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
       </el-form-item>
-      <el-button id="fullScreen" style="float: right;margin: 0 10px">全屏</el-button>
+      <el-button id="fullScreen" style="float: right;margin: 0 10px">{{ isScreen ? '退出全屏' : '全屏' }}</el-button>
     </el-form>
     <div class="placeholder" />
     <div style="padding: 10px">
@@ -133,7 +133,7 @@ export default {
       // 表单参数
       form: {},
       // 表单参数
-      isScreen: screenfull.isEnabled,
+      isScreen: false,
       // 查询参数
       queryParams: {
         page: 1,
@@ -223,8 +223,10 @@ export default {
     handleExpand() {
       const element = document.getElementById('sylog-container')// 指定全屏区域元素
       document.getElementById('fullScreen').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
+        if (screenfull.isEnabled && this.isScreen === false) {
           screenfull.request(element)
+        } else {
+          screenfull.exit()
         }
       })// 实现模块全屏
     },

src/views/IntegratedMonitor/logMonitor/sylogJournal.vue

@@ -45,7 +45,7 @@
       <el-form-item>
         <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
       </el-form-item>
-      <el-button id="fullScreen" style="float: right;margin: 0 10px">全屏</el-button>
+      <el-button id="fullScreen" style="float: right;margin: 0 10px">{{ isScreen ? '退出全屏' : '全屏' }}</el-button>
     </el-form>
     <div class="placeholder" />
     <div style="padding: 10px">
@@ -133,7 +133,7 @@ export default {
       // 表单参数
       form: {},
       // 表单参数
-      isScreen: screenfull.isEnabled,
+      isScreen: false,
       // 查询参数
       queryParams: {
         page: 1,
@@ -223,8 +223,10 @@ export default {
     handleExpand() {
       const element = document.getElementById('sylog-container')// 指定全屏区域元素
       document.getElementById('fullScreen').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
+        if (screenfull.isEnabled && this.isScreen === false) {
           screenfull.request(element)
+        } else {
+          screenfull.exit()
         }
       })// 实现模块全屏
     },