Merge remote-tracking branch 'origin/master' into master

src/styles/variables.scss

@@ -90,7 +90,7 @@ $menuHover:#1A2137;
 $subMenuBg:#232C48;
 $subMenuHover:#1A2137;
 
-$sideBarWidth: 224px;
+$sideBarWidth: 200px;
 $sideHideWidth: 54px;
 
 // the :export directive is the magic sauce for webpack

src/views/IntegratedMonitor/Linux.vue

@@ -7,7 +7,7 @@
             :data="data"
             show-checkbox
             node-key="id"
-            :default-expanded-keys="[0,1,2, 3,4,7]"
+            :default-expanded-keys="[0,1,2, 3,4,7,10]"
             :default-checked-keys="[0,1,2,5]"
             :props="defaultProps"
           />
@@ -101,7 +101,7 @@
                         <el-input v-model="additionalForm.value" />
                       </el-form-item>
                       <el-form-item label="错误频率:">
-                        <el-input style="width: 69%" v-model="additionalForm.value1" />
+                        <el-input v-model="additionalForm.value1" style="width: 69%" />
                         <el-select
                           v-model="additionalForm.value2"
                           style="width: 30%"
@@ -214,7 +214,7 @@
                         <el-input v-model="additionalForm2.value4" />
                       </el-form-item>
                       <el-form-item label="错误频率:">
-                        <el-input style="width: 69%" v-model="additionalForm.value1" />
+                        <el-input v-model="additionalForm.value1" style="width: 69%" />
                         <el-select
                           v-model="additionalForm.value2"
                           style="width: 30%"
@@ -323,7 +323,7 @@
                       <el-input v-model="additionalForm.value" />
                     </el-form-item>
                     <el-form-item label="错误频率:">
-                      <el-input style="width: 69%" v-model="additionalForm.value1" />
+                      <el-input v-model="additionalForm.value1" style="width: 69%" />
                       <el-select
                         v-model="additionalForm.value2"
                         style="width: 30%"
@@ -431,7 +431,7 @@
                       <el-input v-model="additionalForm.value" />
                     </el-form-item>
                     <el-form-item label="错误频率:">
-                      <el-input style="width: 69%" v-model="additionalForm.value1" />
+                      <el-input v-model="additionalForm.value1" style="width: 69%" />
                       <el-select
                         v-model="additionalForm.value2"
                         style="width: 30%"
@@ -539,7 +539,7 @@
                       <el-input v-model="additionalForm.value" />
                     </el-form-item>
                     <el-form-item label="错误频率:">
-                      <el-input style="width: 69%" v-model="additionalForm.value1" />
+                      <el-input v-model="additionalForm.value1" style="width: 69%" />
                       <el-select
                         v-model="additionalForm.value2"
                         style="width: 30%"
@@ -586,7 +586,7 @@
                       <el-input v-model="additionalForm.value" />
                     </el-form-item>
                     <el-form-item label="错误频率:">
-                      <el-input style="width: 69%" v-model="additionalForm.value1" />
+                      <el-input v-model="additionalForm.value1" style="width: 69%" />
                       <el-select
                         v-model="additionalForm.value2"
                         style="width: 30%"
@@ -623,7 +623,7 @@
                       <el-input v-model="additionalForm.value" />
                     </el-form-item>
                     <el-form-item label="错误频率:">
-                      <el-input style="width: 69%" v-model="additionalForm.value1" />
+                      <el-input v-model="additionalForm.value1" style="width: 69%" />
                       <el-select
                         v-model="additionalForm.value2"
                         style="width: 30%"
@@ -721,7 +721,7 @@
                       <el-input v-model="additionalForm.value" />
                     </el-form-item>
                     <el-form-item label="错误频率:">
-                      <el-input style="width: 69%" v-model="additionalForm.value1" />
+                      <el-input v-model="additionalForm.value1" style="width: 69%" />
                       <el-select
                         v-model="additionalForm.value2"
                         style="width: 30%"
@@ -798,11 +798,11 @@ export default {
     return {
       faultForm: {
         value: '',
-        value1: '',
+        value1: ''
       },
       faultForm2: {
         value: '',
-        value1: '',
+        value1: ''
       },
       additionalForm: {
         value: '',
@@ -856,7 +856,7 @@ export default {
       },
       basicForm3: {
         value: '',
-        value1: '',
+        value1: ''
       },
       activeNames: ['1', '2', '3', '4'],
       activeNames2: ['1', '2', '3', '4'],
@@ -879,39 +879,57 @@ export default {
       }, {
         id: 2,
         label: '交换分区'
+      }, {
+        id: 13,
+        label: '物理内存'
       }, {
         id: 3,
-        label: '一级 1',
+        label: '磁盘',
         children: [{
           id: 4,
-          label: '二级 1-1',
+          label: '/dev/mapper/centos-root (/)',
           children: [{
             id: 5,
-            label: '三级 1-1-1'
+            label: '/dev/sda1 (/boot)'
           }, {
             id: 6,
-            label: '三级 1-1-2'
+            label: 'devtmpfs (/dev)'
           }]
         }]
       }, {
         id: 7,
-        label: '一级 2',
+        label: '进程',
         children: [{
           id: 8,
-          label: '二级 2-1'
+          label: '/bin/bash /usr/local/JianKongYi/Server/bin/../python/python.sh ../web_terminal/webserver.py'
         }, {
           id: 9,
-          label: '二级 2-2'
+          label: '/bin/bash /usr/sbin/ksmtuned'
+        }, {
+          id: 14,
+          label: '/bin/ps auxw'
+        }, {
+          id: 15,
+          label: '/sbin/audispd'
+        }, {
+          id: 16,
+          label: '/sbin/rpcbind -w'
         }]
       }, {
         id: 10,
-        label: '一级 3',
+        label: '磁盘IO',
         children: [{
           id: 11,
-          label: '二级 3-1'
+          label: 'dm-o'
         }, {
           id: 12,
-          label: '二级 3-2'
+          label: 'dm-1'
+        }, {
+          id: 17,
+          label: 'scd0'
+        }, {
+          id: 18,
+          label: 'sda'
         }]
       }],
       defaultProps: {

src/views/IntegratedMonitor/equipment.vue

 <template>
   <div id="container_max" class="monitor">
     <div class="mointorHead">
-      <span>监测总数:
-        <span class="equipmentCount" @click="toMonitorPage">104</span>设备的
-        <span class="MonitorPointCount" @click="toMonitorPage">2142</span>个监测点</span>
+<!--      <el-form inline label-width="auto" label-position="right">-->
+<!--        <el-form-item v-if="showList === false" class="headSearch" label=" ">-->
+<!--          <i style="font-size: 23px;line-height: 32px; background-color: #d6d6d6;  border: 1px solid #cccccc " class="el-icon-search" />-->
+<!--          <el-input v-model.trim="serchForm.CONNAMECN" class="searchInput" clearable placeholder="请输入关键字" />-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+      <el-form inline label-width="auto" label-position="right">
+        <el-form-item v-if="showList === false" class="headSearch" label=" ">
+          <el-input v-model.trim="serchForm.CONNAMECN"  clearable placeholder="请输入关键字" />
+        </el-form-item>
+        <el-button type="primary" size="mini" class="headBtn">查询</el-button>
+      </el-form>
+      <el-link v-if="showList" class="backClass" type="primary" @click.stop="handleGoback">返回</el-link>
+      <div>
+        <el-button type="primary" size="mini" class="headBtn" @click="handleToRecovery">回收站</el-button>
+        <el-button type="primary" size="mini" class="headBtn" @click="refresh">刷新</el-button>
+        <el-button v-if="!fullscreen" id="fullscreen_btn" type="primary" size="mini" class="headBtn">全屏</el-button>
+        <el-button v-if="fullscreen" id="fullscreen_btn2" type="primary" size="mini" class="headBtn">取消全屏</el-button>
+      </div>
+    </div>
+    <el-divider />
+    <div class="mointorBody">
+      <div style="display: flex;justify-content: space-between;padding-top: 5px;padding-bottom: 10px">
+        <div style="font-weight: bold">设备管理列表</div>
+        <div style="display: flex">
+          <div>
+            <span><span style="color: #333333">监测总数:</span>
+              <span class="equipmentCount" @click="toMonitorPage">104</span><span style="color: #333333">设备的</span>
+              <span class="MonitorPointCount" @click="toMonitorPage">2142</span><span style="color: #333333">个监测点</span></span>
+          </div>
           <div style="display: flex">
             <div id="count1" class="blockDiv" onclick="handleShowList(1)">
               <span class="st-square" style="background-color: #3db58d;" />
@@ -26,20 +53,8 @@
               <span class="blockCount">1</span>
             </div>
           </div>
-      <el-form inline label-width="auto" label-position="right">
-        <el-form-item v-if="showList === false" class="headSearch" label=" ">
-          <i style="font-size: 23px;line-height: 32px; background-color: #d6d6d6;  border: 1px solid #cccccc " class="el-icon-search" />
-          <el-input v-model.trim="serchForm.CONNAMECN" class="searchInput" clearable placeholder="请输入关键字" />
-        </el-form-item>
-      </el-form>
-      <el-link v-if="showList" class="backClass" type="primary" @click.stop="handleGoback">返回</el-link>
-      <div>
-        <el-button type="button" size="mini" class="headBtn" @click="handleToRecovery">回收站</el-button>
-        <el-button type="button" size="mini" class="headBtn" @click="refresh">刷新</el-button>
-        <el-button id="fullscreen_btn" type="button" size="mini" class="headBtn">全屏</el-button>
         </div>
       </div>
-    <div class="mointorBody">
       <el-table
         v-if="showList === true"
         :data="countDataList"
@@ -140,6 +155,7 @@ export default {
   name: 'Equipment',
   data() {
     return {
+      fullscreen: false,
       prohibitForm: {
         starTime: '',
         timeLength: ''
@@ -264,9 +280,37 @@ export default {
     handleExpand() {
       const element = document.getElementById('container_max')// 指定全屏区域元素
       document.getElementById('fullscreen_btn').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
-          screenfull.request(element)
+        // if (screenfull.isEnabled) {
+        //   screenfull.request(element)
+        // }
+        // 判断是否已经是全屏
+        // 如果是全屏，退出
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen()
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen()
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen()
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen()
+          }
+          console.log('已还原！')
+        } else { // 否则，进入全屏
+          if (element.requestFullscreen) {
+            element.requestFullscreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen()
+          }
+          console.log('已全屏！')
         }
+        // 改变当前全屏状态
+        this.fullscreen = !this.fullscreen
       })// 实现模块全屏
     },
     handleGoback() {
@@ -323,7 +367,34 @@ export default {
   }
 }
 .monitor{
-  padding: 10px;
+  .blockDiv{
+    margin: 0 15px;
+    .blockCount{
+      cursor: pointer;
+      color: #3c8dbc;
+    }
+    .st-square{
+      cursor: pointer;
+      margin-right: 6px;
+      width: 9px;
+      height: 9px;
+      display: inline-block;
+    }
+  }
+  .equipmentCount{
+    color: #72afd2;
+    cursor: pointer;
+  }
+  .MonitorPointCount{
+    color: #eb5d5d;
+    cursor: pointer;
+  }
+  .el-divider--horizontal{
+    padding-top: 10px;
+    margin: 0!important;
+    height: 14px!important;
+    background-color: #F1F1F1!important;
+  }
   .caretDown{
     display: inline-block;
     width: 0;
@@ -335,6 +406,7 @@ export default {
     border-left: 4px solid transparent;
   }
   .mointorBody{
+    padding: 10px 10px 0 10px;
     .name-icon{
       width: 20px;
       height: 20px;
@@ -357,22 +429,20 @@ export default {
     }
   }
   .mointorHead{
-    padding-top: 10px;
-    background-color: #edeef3 !important;
+    padding: 10px 10px 0 10px;
     line-height: 32px;
     display: flex;
     justify-content: space-between;
-    padding-left: 15px;
-    .headBtn{
-      height: 24px;
-      border-radius: 4px;
-      line-height: 22px;
-      font-size: 12px;
-      padding: 0 10px;
-      margin: 5px;
-      color: #444;
-      border-color: #ddd;
-    }
+    //.headBtn{
+    //  height: 24px;
+    //  border-radius: 4px;
+    //  line-height: 22px;
+    //  font-size: 12px;
+    //  padding: 0 10px;
+    //  margin: 5px;
+    //  color: #444;
+    //  border-color: #ddd;
+    //}
     .headSearch{
       .searchInput{
         border: 1px solid #cccccc;
@@ -386,28 +456,6 @@ export default {
         display: flex;
       }
     }
-    .blockDiv{
-      margin: 0 15px;
-      .blockCount{
-        cursor: pointer;
-        color: #3c8dbc;
-      }
-      .st-square{
-        cursor: pointer;
-        margin-right: 6px;
-        width: 9px;
-        height: 9px;
-        display: inline-block;
-      }
-    }
-    .equipmentCount{
-      color: #72afd2;
-      cursor: pointer;
-    }
-    .MonitorPointCount{
-      color: #eb5d5d;
-      cursor: pointer;
-    }
   }
 }
 </style>

src/views/IntegratedMonitor/viewExhibition/logicalGroup.vue

@@ -2,10 +2,12 @@
   <div id="container_max" class="logicalClass">
     <div class="logicalHead">
       <div class="logicalBtns">
-        <el-button class="headBtnW" @click="refresh">刷新</el-button>
-        <el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
+        <el-button type="primary" @click="refresh">刷新</el-button>
+        <el-button v-if="!fullscreen" id="fullscreen_btn" type="primary">全屏</el-button>
+        <el-button v-if="fullscreen" id="fullscreen_btn2" type="primary">取消全屏</el-button>
       </div>
     </div>
+    <el-divider />
     <div class="logicalBody">
       <el-table
         :data="dataList"
@@ -181,6 +183,7 @@ export default {
   name: 'LogicalGroup',
   data() {
     return {
+      fullscreen: false,
       dataTree: [{
         id: 1,
         icon: require('@/assets/image/shebei.png'),
@@ -229,25 +232,25 @@ export default {
           children: [{
             id: 111,
             icon: require('@/assets/image/shebei2-zhengchang.png'),
-            label: '三级 1-1-1'
+            label: '智盘服务器10.1.1.50'
           }, {
             id: 112,
             icon: require('@/assets/image/shebei2-zhengchang.png'),
-            label: '三级 1-1-2'
+            label: '127.0.0.1'
           }]
         },
         {
           id: 12,
           icon: require('@/assets/image/shebei9-weixian.png'),
-          label: '虚拟化平台',
+          label: '虚拟设备（默认每个设备支持5个监测点）',
           children: [{
             id: 121,
             icon: require('@/assets/image/shebei2-guzhang.png'),
-            label: '三级 1-1-1'
+            label: 'ping'
           }, {
             id: 122,
             icon: require('@/assets/image/shebei2-guzhang.png'),
-            label: '三级 1-1-2'
+            label: 'url'
           }]
         }]
       }],
@@ -353,9 +356,37 @@ export default {
     handleExpand() {
       const element = document.getElementById('container_max')// 指定全屏区域元素
       document.getElementById('fullscreen_btn').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
-          screenfull.request(element)
+        // if (screenfull.isEnabled) {
+        //   screenfull.request(element)
+        // }
+        // 判断是否已经是全屏
+        // 如果是全屏，退出
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen()
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen()
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen()
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen()
+          }
+          console.log('已还原！')
+        } else { // 否则，进入全屏
+          if (element.requestFullscreen) {
+            element.requestFullscreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen()
           }
+          console.log('已全屏！')
+        }
+        // 改变当前全屏状态
+        this.fullscreen = !this.fullscreen
       })// 实现模块全屏
     }
   }
@@ -364,6 +395,12 @@ export default {
 
 <style lang="scss">
 .logicalClass{
+  .el-divider--horizontal{
+    padding-top: 10px;
+    margin: 0!important;
+    height: 14px!important;
+    background-color: #F1F1F1!important;
+  }
   .el-input__inner{
     padding: 0 0 0 9px;
   }
@@ -371,6 +408,7 @@ export default {
     padding: 5px 0;
   }
   .logicalBody{
+    padding: 10px;
     .name-icon{
       width: 20px;
       height: 20px;
@@ -388,8 +426,8 @@ export default {
   .logicalHead{
     height: 58px;
     padding: 15px 20px 10px 20px;
-    background-color: #edeef3 !important;
-    border-bottom: 1px solid #DBDDE3;
+    //background-color: #edeef3 !important;
+    //border-bottom: 1px solid #DBDDE3;
     .logicalBtns{
       float: right;
       .headBtn{

src/views/IntegratedMonitor/viewExhibition/monitorView.vue

 <template>
-  <div class="monitorView">
+  <div  id="container_max" class="monitorView">
     <div class="warnHead">
+      <el-form ref="searchForm" :inline="true" label-width="auto" :model="searchForm">
+        <el-form-item label="设备标题:">
+          <el-select
+            v-model="searchForm.title"
+          >
+            <el-option value="名称" label="名称" />
+            <el-option value="ip地址" label="ip地址" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态:">
+          <el-select
+            v-model="searchForm.type"
+          >
+            <el-option value="故障" label="故障" />
+            <el-option value="危险" label="危险" />
+            <el-option value="正常" label="正常" />
+          </el-select>
+        </el-form-item>
+        <el-button type="primary">查询</el-button>
+      </el-form>
       <div class="warnBtns">
-        <el-button class="headBtn" @click="handleAdd">添加</el-button>
-        <el-button class="headBtn" @click="handleAdd">修改</el-button>
-        <el-button class="headBtn">删除</el-button>
-        <el-button class="headBtnW" @click="refresh">刷新</el-button>
-        <el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
+        <el-button type="primary" @click="handleAdd">添加</el-button>
+        <el-button type="primary" @click="handleAdd">修改</el-button>
+        <el-button type="primary">删除</el-button>
+        <el-button type="primary" @click="refresh">刷新</el-button>
+        <el-button  v-if="!fullscreen" id="fullscreen_btn" type="primary">全屏</el-button>
+        <el-button v-if="fullscreen" id="fullscreen_btn2" type="primary">取消全屏</el-button>
       </div>
     </div>
+    <el-divider />
     <div class="monitorViewBody">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="设备视图" name="first">
@@ -54,27 +76,8 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane name="searchBtn">
-          <span slot="label">
-            <el-form ref="searchForm" :inline="true" label-width="auto" :model="searchForm">
-              <el-form-item label="设备标题:">
-                <el-select
-                  v-model="searchForm.title"
-                >
-                  <el-option value="名称" label="名称" />
-                  <el-option value="ip地址" label="ip地址" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="状态:">
-                <el-select
-                  v-model="searchForm.type"
-                >
-                  <el-option value="故障" label="故障" />
-                  <el-option value="危险" label="危险" />
-                  <el-option value="正常" label="正常" />
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </span>
+<!--          <span slot="label">-->
+<!--          </span>-->
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -111,6 +114,7 @@ export default {
   name: 'MonitorView',
   data() {
     return {
+      fullscreen: false,
       searchForm: {
         title: '',
         type: ''
@@ -188,9 +192,37 @@ export default {
     handleExpand() {
       const element = document.getElementById('container_max')// 指定全屏区域元素
       document.getElementById('fullscreen_btn').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
-          screenfull.request(element)
+        // if (screenfull.isEnabled) {
+        //   screenfull.request(element)
+        // }
+        // 判断是否已经是全屏
+        // 如果是全屏，退出
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen()
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen()
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen()
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen()
+          }
+          console.log('已还原！')
+        } else { // 否则，进入全屏
+          if (element.requestFullscreen) {
+            element.requestFullscreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen()
           }
+          console.log('已全屏！')
+        }
+        // 改变当前全屏状态
+        this.fullscreen = !this.fullscreen
       })// 实现模块全屏
     },
     refresh() {
@@ -208,6 +240,12 @@ export default {
 
 <style lang="scss">
 .monitorView{
+  .el-divider--horizontal{
+    padding-top: 10px;
+    margin: 0!important;
+    height: 14px!important;
+    background-color: #F1F1F1!important;
+  }
   .name-icon{
     width: 20px;
     height: 20px;
@@ -242,10 +280,12 @@ export default {
     }
   }
   .warnHead{
+    display: flex;
+    justify-content: space-between;
     height: 58px;
     padding: 15px 20px 10px 20px;
-    background-color: #edeef3 !important;
-    border-bottom: 1px solid #DBDDE3;
+    //background-color: #edeef3 !important;
+    //border-bottom: 1px solid #DBDDE3;
     .warnBtns{
       float: right;
       .headBtn{

src/views/IntegratedMonitor/viewExhibition/stateStatistics.vue

 <template>
-  <div class="stateModule">
+  <div id="container_max" class="stateModule">
     <div class="warnHead">
       <div class="warnBtns">
-        <el-button class="headBtn" @click="handleAdd">添加</el-button>
-        <el-button class="headBtn" @click="handleAdd">修改</el-button>
-        <el-button class="headBtn">删除</el-button>
-        <el-button class="headBtnW" @click="refresh">刷新</el-button>
-        <el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
+        <el-button type="primary"  @click="handleAdd">添加</el-button>
+        <el-button type="primary"  @click="handleAdd">修改</el-button>
+        <el-button type="primary">删除</el-button>
+        <el-button type="primary" @click="refresh">刷新</el-button>
+        <el-button type="primary" v-if="!fullscreen" id="fullscreen_btn" >全屏</el-button>
+        <el-button type="primary" v-if="fullscreen" id="fullscreen_btn2" >取消全屏</el-button>
       </div>
     </div>
+    <el-divider />
     <div style="padding: 15px 40px 15px;">
       <div class="bar-header">
         <span class="header-pre" />
@@ -153,6 +155,7 @@ export default {
   name: 'StateStatistics',
   data() {
     return {
+      fullscreen: false,
       data: [{
         id: 1,
         label: '本机容器',
@@ -389,9 +392,37 @@ export default {
     handleExpand() {
       const element = document.getElementById('container_max')// 指定全屏区域元素
       document.getElementById('fullscreen_btn').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
-          screenfull.request(element)
+        // if (screenfull.isEnabled) {
+        //   screenfull.request(element)
+        // }
+        // 判断是否已经是全屏
+        // 如果是全屏，退出
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen()
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen()
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen()
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen()
           }
+          console.log('已还原！')
+        } else { // 否则，进入全屏
+          if (element.requestFullscreen) {
+            element.requestFullscreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen()
+          }
+          console.log('已全屏！')
+        }
+        // 改变当前全屏状态
+        this.fullscreen = !this.fullscreen
       })// 实现模块全屏
     },
     refresh() {
@@ -409,6 +440,12 @@ export default {
 
 <style lang="scss">
 .stateModule{
+  .el-divider--horizontal{
+    padding-top: 10px;
+    margin: 0!important;
+    height: 14px!important;
+    background-color: #F1F1F1!important;
+  }
   .columLabel{
     padding: 8px;
   }
@@ -426,8 +463,8 @@ export default {
   .warnHead{
     height: 58px;
     padding: 15px 20px 10px 20px;
-    background-color: #edeef3 !important;
-    border-bottom: 1px solid #DBDDE3;
+    //background-color: #edeef3 !important;
+    //border-bottom: 1px solid #DBDDE3;
     .warnBtns{
       float: right;
       .headBtn{

src/views/IntegratedMonitor/warning/warningSetup.vue

@@ -2,14 +2,16 @@
   <div id="container_max" class="warnModule">
     <div class="warnHead">
       <div class="warnBtns">
-        <el-button class="headBtn" @click="handleAdd">添加</el-button>
-        <el-button class="headBtn" @click="handleUpdate">编辑</el-button>
-        <el-button class="headBtn">删除</el-button>
-        <el-button class="headBtn">禁止</el-button>
-        <el-button class="headBtnW" @click="refresh">刷新</el-button>
-        <el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
+        <el-button type="primary" @click="handleAdd">添加</el-button>
+        <el-button type="primary" @click="handleUpdate">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+        <el-button type="primary">禁止</el-button>
+        <el-button type="primary" @click="refresh">刷新</el-button>
+        <el-button  v-if="!fullscreen" id="fullscreen_btn" type="primary">全屏</el-button>
+        <el-button v-if="fullscreen" id="fullscreen_btn2" type="primary">取消全屏</el-button>
       </div>
     </div>
+    <el-divider />
     <div class="warnBody">
       <span style="font-size:24px;margin-right: 10px ">告警设置</span>
       <el-link type="primary" @click="addWarn">新增告警</el-link>
@@ -165,6 +167,7 @@ export default {
   name: 'WarningSetup',
   data() {
     return {
+      fullscreen: false,
       data: [{
         id: 1,
         icon: require('@/assets/image/shebei.png'),
@@ -176,11 +179,11 @@ export default {
           children: [{
             id: 111,
             icon: require('@/assets/image/shebei2-zhengchang.png'),
-            label: '三级 1-1-1'
+            label: '智盘服务器10.1.1.50'
           }, {
             id: 112,
             icon: require('@/assets/image/shebei2-zhengchang.png'),
-            label: '三级 1-1-2'
+            label: '127.0.0.1'
           }]
         },
         {
@@ -190,11 +193,11 @@ export default {
           children: [{
             id: 121,
             icon: require('@/assets/image/shebei2-guzhang.png'),
-            label: '三级 1-1-1'
+            label: 'ping'
           }, {
             id: 122,
             icon: require('@/assets/image/shebei2-guzhang.png'),
-            label: '三级 1-1-2'
+            label: 'url'
           }]
         }]
       }],
@@ -255,9 +258,37 @@ export default {
     handleExpand() {
       const element = document.getElementById('container_max')// 指定全屏区域元素
       document.getElementById('fullscreen_btn').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
-          screenfull.request(element)
+        // if (screenfull.isEnabled) {
+        //   screenfull.request(element)
+        // }
+        // 判断是否已经是全屏
+        // 如果是全屏，退出
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen()
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen()
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen()
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen()
           }
+          console.log('已还原！')
+        } else { // 否则，进入全屏
+          if (element.requestFullscreen) {
+            element.requestFullscreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen()
+          }
+          console.log('已全屏！')
+        }
+        // 改变当前全屏状态
+        this.fullscreen = !this.fullscreen
       })// 实现模块全屏
     },
     closeAddDialog() {
@@ -301,6 +332,12 @@ export default {
 
 <style lang="scss">
 .warnModule{
+  .el-divider--horizontal{
+    padding-top: 10px;
+    margin: 0!important;
+    height: 14px!important;
+    background-color: #F1F1F1!important;
+  }
   .strategyRow{
     padding: 5px 0;
   }
@@ -331,8 +368,8 @@ export default {
 .warnHead{
   height: 58px;
   padding: 15px 20px 10px 20px;
-  background-color: #edeef3 !important;
-  border-bottom: 1px solid #DBDDE3;
+  //background-color: #edeef3 !important;
+  //border-bottom: 1px solid #DBDDE3;
   .warnBtns{
     float: right;
     .headBtn{

src/views/assetManagement/assetList.vue

@@ -3,13 +3,14 @@
     <div class="assetListHead">
       <div class="assetListTitle">资产清单</div>
       <div class="warnBtns">
-        <el-button class="headBtn" @click="addAsset">新增</el-button>
-        <el-button class="headBtn" @click="deleteRow">删除</el-button>
-        <el-button class="headBtn">更多</el-button>
-        <el-button class="headBtnW" @click="refresh">刷新</el-button>
-        <el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
+        <el-button type="primary" @click="addAsset">新增</el-button>
+        <el-button type="primary" @click="deleteRow">删除</el-button>
+        <el-button type="primary">更多</el-button>
+        <el-button type="primary" @click="refresh">刷新</el-button>
+        <el-button id="fullscreen_btn" type="primary">全屏</el-button>
       </div>
     </div>
+    <el-divider />
     <div class="assetListBody">
       <el-row :gutter="12">
         <el-col :span="6">
@@ -287,11 +288,17 @@ export default {
 
 <style lang="scss">
 .assetListMoudle{
+  .el-divider--horizontal{
+    padding-top: 10px;
+    margin: 0!important;
+    height: 14px!important;
+    background-color: #F1F1F1!important;
+  }
 .assetListHead{
     height: 58px;
     padding: 15px 20px 10px 20px;
-    background-color: #edeef3 !important;
-    border-bottom: 1px solid #DBDDE3;
+    //background-color: #edeef3 !important;
+    //border-bottom: 1px solid #DBDDE3;
   .assetListTitle{
     float: left;
     font-size: 24px;

src/views/overView/dashboard/equipment.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="12">
       <el-col :span="6">
         <div class="equipmentLeft">
-          <div style="height: 50px"></div>
+          <div style="height: 50px" />
           <el-card class="box-card">
             <div style="display: flex;margin-top: 10px">
               <el-divider direction="vertical" />
@@ -106,7 +106,8 @@
       <el-col :span="6">
         <div class="equipmentRight">
           <div style="display: flex;justify-content: end; height: 50px;padding-right: 5px">
-            <img id="fullscreen_btn" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPage">
+            <img v-if="!fullscreen" id="fullscreen_btn" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPage">
+            <img v-if="fullscreen" id="fullscreen_btn2" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPageShrink">
             <div style="font-size: 30px;padding-left: 20px; padding-right: 20px">{{ nowDate }}</div>
             <div>
               <div style="font-size: 20px">{{ week }}</div>
@@ -159,6 +160,7 @@ export default {
   name: 'Equipment',
   data() {
     return {
+      fullscreen: false,
       isFullscrenn: false,
       expandPage: require('@/assets/image/expand.png'),
       nowDate: '',
@@ -173,6 +175,7 @@ export default {
         { label: '智盘服务器-10.1.154', time: '2019-12-09' }
       ],
       equipmentIcon: require('@/assets/image/shebeizongshu.png'),
+      expandPageShrink: require('@/assets/image/exitFullBtn.png'),
       monitorIcon: require('@/assets/image/jiankongdianshu.png'),
       warnIcon: require('@/assets/image/gaojingshu.png')
     }
@@ -270,9 +273,37 @@ export default {
     handleExpand() {
       const element = document.getElementById('container_max')// 指定全屏区域元素
       document.getElementById('fullscreen_btn').addEventListener('click', () => {
-        if (screenfull.isEnabled) {
-          screenfull.request(element)
-        }
+        // if (screenfull.isEnabled) {
+        //   screenfull.request(element)
+        // }
+        // 判断是否已经是全屏
+        // 如果是全屏，退出
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen()
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen()
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen()
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen()
+          }
+          console.log('已还原！')
+        } else { // 否则，进入全屏
+          if (element.requestFullscreen) {
+            element.requestFullscreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen()
+          }
+          console.log('已全屏！')
+        }
+        // 改变当前全屏状态
+        this.fullscreen = !this.fullscreen
       })// 实现模块全屏
     },
     getTime() {
@@ -349,7 +380,7 @@ export default {
         grid: {
           top: '3%',
           left: '3%',
-          right: '4%',
+          right: '8%',
           containLabel: true
         },
         xAxis: {
@@ -427,7 +458,7 @@ export default {
         grid: {
           top: '3%',
           left: '3%',
-          right: '4%',
+          right: '8%',
           containLabel: true
         },
         xAxis: {