样式修改

src/views/IntegratedMonitor/reportStatistics/networkEquipment.vue

@@ -732,7 +732,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     },
     /** 查询登录日志 */
     getList() {

src/views/IntegratedMonitor/reportStatistics/theServer.vue

@@ -323,7 +323,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     }
   }
 }

src/views/movingRingMonitoring/accessControl/accessControlList.vue

@@ -88,7 +88,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     },
     addEquipment() {
       this.$router.push({

src/views/movingRingMonitoring/accessControl/accessRecord.vue

@@ -222,7 +222,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     }
   }
 }

src/views/movingRingMonitoring/accessControl/personnelInformation.vue

@@ -104,7 +104,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     },
     addEquipment() {
       this.$router.push({

src/views/patrolManagement/patrolInspectionPlan.vue

@@ -9,7 +9,6 @@
         <el-form-item class="headSearch">
           <el-select
             v-model="searchBy.operationStatus"
-            class="searchInput"
             placeholder="请选择"
             clearable
             style="width: 150px"
@@ -53,17 +52,23 @@
         <el-table-column label="下次巡检时间" prop="NextTime" show-overflow-tooltip />
         <el-table-column label="描述" prop="describe" show-overflow-tooltip />
         <el-table-column width="200px" label="操作">
-          <el-link type="primary" @click="implement">执行</el-link>
-          <el-link type="primary" @click="report">报告</el-link>
-          <el-link type="primary" @click="handleUpdate">编辑</el-link>
-          <el-tooltip effect="light" placement="bottom" popper-class="moreTip">
-            <div slot="content" class="tooltipText" @click="deleteRow">删除</div>
-            <div slot="content" class="tooltipText" @click="addWarn">复制</div>
-            <div slot="content" class="tooltipText" @click="enable">启用</div>
-            <el-link>...
-              <div class="caretDown" />
-            </el-link>
-          </el-tooltip>
+          <template slot-scope="scope">
+            <el-link type="primary" @click="implement">执行</el-link>
+            <el-link type="primary" @click="report">报告</el-link>
+            <el-link type="primary" @click="handleUpdate">编辑</el-link>
+            <el-popover
+              placement="bottom"
+              width="200"
+              trigger="click"
+            >
+              <div class="tooltipText" @click="deleteRow">删除</div>
+              <div class="tooltipText" @click="addWarn">复制</div>
+              <div class="tooltipText" @click="enable">启用</div>
+              <el-link type="primary" slot="reference">更多
+                <div class="caretDown" />
+              </el-link>
+            </el-popover>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -671,6 +676,10 @@ export default {
 
 <style lang="scss" scoped>
 .warnModule{
+  .tooltipText{
+    cursor: pointer;
+    padding: 5px!important;
+  }
   .strategyRow{
     padding: 5px 0;
   }
@@ -756,11 +765,11 @@ export default {
     display: inline-block;
     width: 0;
     height: 0;
-    margin-left: 8px;
-    //vertical-align: middle;
-    //border-top: 4px solid;
-    //border-right: 4px solid transparent;
-    //border-left: 4px solid transparent;
+    margin-left: 2px;
+    vertical-align: middle;
+    border-top: 4px solid;
+    border-right: 4px solid transparent;
+    border-left: 4px solid transparent;
   }
 }
 

src/views/patrolManagement/patrolInspectionReport.vue

@@ -109,13 +109,13 @@
             <span>{{ scope.row.reportsNumber }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="报告发送时间" prop="latestTime" show-overflow-tooltip />
+        <el-table-column  label="报告发送时间" prop="latestTime" show-overflow-tooltip />
         <el-table-column label="巡检计划名称" prop="NextTime" show-overflow-tooltip />
         <el-table-column width="250px" label="操作">
           <template #default="{ row }">
-            <el-link @click="report(row)">查看</el-link>
-            <el-link @click="implement">发送</el-link>
-            <el-link @click="deleteRow">下载</el-link>
+            <el-link type="primary" @click="report(row)">查看</el-link>
+            <el-link type="primary" @click="implement">发送</el-link>
+            <el-link type="primary" @click="deleteRow">下载</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -487,7 +487,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     },
     enable() {
       this.$confirm('此操作将启用此数据, 是否继续?', '提示', {

src/views/workManagement/myCreated.vue

@@ -103,14 +103,13 @@
         <el-form-item label="设备信息:">
           <div>
             <el-input v-model="addWarnForm.equipmentInformation" style="width: 50%" placeholder="请选择设备信息" :disabled="true"  />
-            <el-button @click="equipmentInformation"> 设备</el-button>
+            <el-button @click="equipmentInformations"> 设备</el-button>
           </div>
           <el-table
-            :data="equipmenData"
+            :data="equipmenData1"
             border
             style="width: 100%;padding-top: 20px;padding-left: 10px"
           >
-            <el-table-column type="selection" width="60" align="center" />
             <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
             <el-table-column label="监测点类型" prop="theme" show-overflow-tooltip />
             <el-table-column label="监测点状态" prop="source" show-overflow-tooltip />
@@ -327,6 +326,54 @@
         <el-button @click="advancedQueryDialog = false">取消</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="equipmentInformation" title="设备信息" width="50%" class="addGroup" :model="information">
+      <el-row>
+        <el-col :span="12" class="equipmentDiv">
+          <span>选择告警设备</span>
+          <el-form ref="addWarnForm" label-width="auto" :model="addWarnForm">
+            <el-form-item label="">
+              <el-tree
+                :data="data"
+                node-key="id"
+                :default-expanded-keys="[2, 3]"
+                :default-checked-keys="[5]"
+                :props="defaultProps"
+                @node-click="handleNodeClick"
+              >
+                <template slot-scope="{ node, data }">
+                  <span>
+                    <img :src="data.icon" class="treeIcon">
+                    <label>{{ node.label }}</label>
+                  </span>
+                </template>
+              </el-tree>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="12" class="equipmentDiv">
+          <div>
+            <span>选择检测点</span>
+            <el-link type="primary" @click="checkName1">全选</el-link>
+            <el-link type="primary" @click="checkName2(equipmenData)">反选</el-link>
+          </div>
+          <el-table
+            ref="equipmenData"
+            :data="equipmenData"
+            border
+            :show-header="false"
+            height="100px"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" align="center" width="50px"/>
+            <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
+          </el-table>
+        </el-col>
+      </el-row>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="equipmentInformationSubmit">提交</el-button>
+        <el-button type="primary" @click="equipmentInformation = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -338,43 +385,84 @@ export default {
   components: { Template },
   data() {
     return {
+      information: {
+        monitoringPointName: '',
+        monitoringPointType: '',
+        monitoringPointStatus: ''
+      },
       data: [{
         id: 1,
         label: '本机容器',
+        icon: require('@/assets/image/shebei.png'),
         children: [{
           id: 4,
+          icon: require('@/assets/image/shebei9-guzhang.png'),
           label: '虚拟化平台',
           children: [{
             id: 9,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '127.0.0.1'
           }, {
             id: 10,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.1.1'
           }]
         }, {
           id: 5,
+          icon: require('@/assets/image/shebei9-guzhang.png'),
           label: '虚拟设备',
           children: [{
-            id: 9,
+            id: 11,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.5.4'
           }, {
-            id: 10,
+            id: 12,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.44.2'
           }]
         }, {
           id: 6,
+          icon: require('@/assets/image/shebei9-guzhang.png'),
           label: '服务器硬件',
           children: [{
-            id: 9,
+            id: 13,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '打印机'
           }, {
-            id: 10,
+            id: 14,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.2.5'
           }]
         }]
       }],
       stepActive: 1,
       equipmenData: [],
+      equipmenData1: [],
+      dataD: [],
+      data1: [
+        { number: '/dev/sda1 (/boot)', theme: 'UnixDisk', source: '正常' },
+        { number: 'tmpfs (/dev/shm)', theme: 'UnixDisk', source: '正常' },
+        { number: 'Ping', theme: 'Ping', source: '正常' },
+        { number: 'CPU', theme: 'CPU', source: '正常' },
+        { number: '连接', theme: 'UnixDisk', source: '正常' },
+        { number: '交换分区', theme: 'UnixDisk', source: '正常' }
+      ],
+      data2: [
+        { number: 'Agent连接', theme: 'UnixDisk', source: '正常' },
+        { number: 'Ping 127.0.0.1)', theme: 'UnixDisk', source: '正常' },
+        { number: 'Linux CPU)', theme: 'CPU', source: '正常' },
+        { number: 'Linux Swap', theme: 'Swap', source: '正常' },
+        { number: 'Linux memory', theme: 'memory', source: '正常' },
+        { number: 'sysfs', theme: 'sysfs', source: '正常' }
+      ],
+      data3: [
+        { number: 'Ping', theme: 'UnixDisk', source: '正常' },
+        { number: 'CPU', theme: 'CPU', source: '正常' },
+        { number: '内存', theme: 'UnixDependence', source: '正常' },
+        { number: '连接', theme: 'UnixDependence', source: '正常' },
+        { number: '10.61.36.156', theme: 'UnixDisk', source: '正常' },
+        { number: '10.61.36.156', theme: 'UnixDisk', source: '正常' }
+      ],
       updateWarnForm: {
         founder: '',
         theme: '',
@@ -415,6 +503,7 @@ export default {
       addDialog: false,
       updateDialog: false,
       advancedQueryDialog: false,
+      equipmentInformation: false,
       isEdit: '',
       // 是否显示弹出层
       open: false,
@@ -812,7 +901,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     },
     userLove() {
       this.$confirm('此操作将撤回该数据, 是否继续?', '提示', {
@@ -833,6 +924,12 @@ export default {
     closeDialog() {
       this.addDialog = false
     },
+    /**
+     * 设备信息
+     */
+    equipmentInformations() {
+      this.equipmentInformation = true
+    },
     addWarn() {
       this.isEdit = 3
       this.addDialog = true
@@ -857,6 +954,33 @@ export default {
         this.name2[i] = this.priorityOptions[i].label
       }
       this.addWarnForm.priority = val ? this.name2 : []
+    },
+    handleNodeClick(data) {
+      if (data.id === 9 || data.id === 10) {
+        this.equipmenData = this.data1
+      } else if (data.id === 11 || data.id === 12) {
+        this.equipmenData = this.data2
+      } else if (data.id === 13 || data.id === 14) {
+        this.equipmenData = this.data3
+      } else {
+        this.equipmenData = []
+      }
+    },
+    handleSelectionChange(data) {
+      this.dataD = data
+    },
+    checkName1() {
+      this.$refs.equipmenData.toggleAllSelection()
+    },
+    checkName2(rows) {
+      rows.forEach(row => {
+        this.$refs.equipmenData.toggleRowSelection(row)
+      })
+    },
+    equipmentInformationSubmit() {
+      this.equipmentInformation = false
+      this.equipmenData = []
+      this.equipmenData1 = this.dataD
     }
   }
 }
@@ -1037,5 +1161,9 @@ export default {
       width: 0;
     }
   }
+  .treeIcon{
+    width: 17px;
+    height: 17px;
+  }
 }
 </style>

src/views/workManagement/myMission.vue

@@ -122,11 +122,10 @@
             <el-button @click="equipmentInformations"> 设备</el-button>
           </div>
           <el-table
-            :data="equipmenData"
+            :data="equipmenData1"
             border
             style="width: 100%;padding-top: 20px;padding-left: 10px"
           >
-            <el-table-column type="selection" width="60" align="center" />
             <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
             <el-table-column label="监测点类型" prop="theme" show-overflow-tooltip />
             <el-table-column label="监测点状态" prop="source" show-overflow-tooltip />
@@ -341,10 +340,18 @@
           </el-form>
         </el-col>
         <el-col :span="12" class="equipmentDiv">
-          <span>选择检测点</span>
+          <div>
+            <span>选择检测点</span>
+            <el-link type="primary" @click="checkName1">全选</el-link>
+            <el-link type="primary" @click="checkName2(equipmenData)">反选</el-link>
+          </div>
           <el-table
+            ref="equipmenData"
             :data="equipmenData"
             border
+            :show-header="false"
+            height="100px"
+            @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" align="center" width="50px"/>
             <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
@@ -352,7 +359,7 @@
         </el-col>
       </el-row>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="equipmentInformation = false">提交</el-button>
+        <el-button @click="equipmentInformationSubmit">提交</el-button>
         <el-button type="primary" @click="equipmentInformation = false">取消</el-button>
       </div>
     </el-dialog>
@@ -471,41 +478,75 @@ export default {
       data: [{
         id: 1,
         label: '本机容器',
+        icon: require('@/assets/image/shebei.png'),
         children: [{
           id: 4,
+          icon: require('@/assets/image/shebei9-guzhang.png'),
           label: '虚拟化平台',
           children: [{
             id: 9,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '127.0.0.1'
           }, {
             id: 10,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.1.1'
           }]
         }, {
           id: 5,
+          icon: require('@/assets/image/shebei9-guzhang.png'),
           label: '虚拟设备',
           children: [{
-            id: 9,
+            id: 11,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.5.4'
           }, {
-            id: 10,
+            id: 12,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.44.2'
           }]
         }, {
           id: 6,
+          icon: require('@/assets/image/shebei9-guzhang.png'),
           label: '服务器硬件',
           children: [{
-            id: 9,
+            id: 13,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '打印机'
           }, {
-            id: 10,
+            id: 14,
+            icon: require('@/assets/image/shebei2-zhengchang.png'),
             label: '192.168.2.5'
           }]
         }]
       }],
       stepActive: 1,
-      equipmenData: [
-        { number: '/dev/sda1 (/boot)' }
+      equipmenData: [],
+      equipmenData1: [],
+      dataD: [],
+      data1: [
+        { number: '/dev/sda1 (/boot)', theme: 'UnixDisk', source: '正常' },
+        { number: 'tmpfs (/dev/shm)', theme: 'UnixDisk', source: '正常' },
+        { number: 'Ping', theme: 'Ping', source: '正常' },
+        { number: 'CPU', theme: 'CPU', source: '正常' },
+        { number: '连接', theme: 'UnixDisk', source: '正常' },
+        { number: '交换分区', theme: 'UnixDisk', source: '正常' }
+      ],
+      data2: [
+        { number: 'Agent连接', theme: 'UnixDisk', source: '正常' },
+        { number: 'Ping 127.0.0.1)', theme: 'UnixDisk', source: '正常' },
+        { number: 'Linux CPU)', theme: 'CPU', source: '正常' },
+        { number: 'Linux Swap', theme: 'Swap', source: '正常' },
+        { number: 'Linux memory', theme: 'memory', source: '正常' },
+        { number: 'sysfs', theme: 'sysfs', source: '正常' }
+      ],
+      data3: [
+        { number: 'Ping', theme: 'UnixDisk', source: '正常' },
+        { number: 'CPU', theme: 'CPU', source: '正常' },
+        { number: '内存', theme: 'UnixDependence', source: '正常' },
+        { number: '连接', theme: 'UnixDependence', source: '正常' },
+        { number: '10.61.36.156', theme: 'UnixDisk', source: '正常' },
+        { number: '10.61.36.156', theme: 'UnixDisk', source: '正常' }
       ],
       updateWarnForm: {
         founder: '',
@@ -977,7 +1018,9 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {})
+      }).then(() => {
+        window.location.href = process.env.BASE_URL + 'exportFile.xls'
+      })
     },
     enable() {
       this.$confirm('此操作将启用此数据, 是否继续?', '提示', {
@@ -1081,6 +1124,33 @@ export default {
         this.name2[i] = this.priorityOptions[i].label
       }
       this.addWarnForm.priority = val ? this.name2 : []
+    },
+    handleNodeClick(data) {
+      if (data.id === 9 || data.id === 10) {
+        this.equipmenData = this.data1
+      } else if (data.id === 11 || data.id === 12) {
+        this.equipmenData = this.data2
+      } else if (data.id === 13 || data.id === 14) {
+        this.equipmenData = this.data3
+      } else {
+        this.equipmenData = []
+      }
+    },
+    handleSelectionChange(data) {
+      this.dataD = data
+    },
+    checkName1() {
+      this.$refs.equipmenData.toggleAllSelection()
+    },
+    checkName2(rows) {
+      rows.forEach(row => {
+        this.$refs.equipmenData.toggleRowSelection(row)
+      })
+    },
+    equipmentInformationSubmit() {
+      this.equipmentInformation = false
+      this.equipmenData = []
+      this.equipmenData1 = this.dataD
     }
   }
 }