权限管理问题修复、导航栏动态变更

public/static/config.js

@@ -2,10 +2,11 @@
  * @Author: wt 1241351815@qq.com
  * @Date: 2022-04-25 10:21:18
  * @LastEditors: wt 1241351815@qq.com
- * @LastEditTime: 2022-05-09 13:30:35
+ * @LastEditTime: 2022-05-11 15:40:00
  * @FilePath: \securityHtml\public\static\config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
+
 // api 请求路径
 var PLATFROM_CONFIG = {};
 //PLATFROM_CONFIG.baseUrl = "https://smartpark.caih.com/spapi"

src/App.vue

@@ -2,7 +2,7 @@
  * @Author: wt 1241351815@qq.com
  * @Date: 2022-04-25 10:21:18
  * @LastEditors: wt 1241351815@qq.com
- * @LastEditTime: 2022-05-09 11:30:10
+ * @LastEditTime: 2022-05-11 09:14:38
  * @FilePath: \securityHtml\src\App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -119,5 +119,20 @@ background: transparent !important;
 .el-input-number.is-controls-right .el-input-number__increase, .el-input-number.is-controls-right .el-input-number__decrease{
   line-height:10px;
 }
+/* 部门框高度 */
+.vue-treeselect--searchable .vue-treeselect__input-container{
+  height:28px !important;
+  line-height: 20px !important;
+}
+.vue-treeselect__control{
+  height:28px !important;
+  margin-top:4px;
+}
 
+.vue-treeselect__placeholder, .vue-treeselect__single-value{
+  top:-2px !important;
+}
+.filter-item .el-select .el-input .el-select__caret{
+  margin-top:1px !important;
+}
 </style>

src/api/system/auth-manage.js

@@ -32,6 +32,24 @@ export function menuRemove(params) { //菜单管理-删除
     })
 }
 
+// 角色状态修改
+export function changeRoleStatus(roleId, status) {
+    const data = {
+        roleId,
+        status
+    }
+    return request({
+        url: '/system/role/changeStatus',
+        method: 'put',
+        data: data
+    })
+}
+
+
+
+
+
+
 
 
 

src/api/system/user.js

@@ -1,5 +1,13 @@
+/*
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:21:18
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-11 10:49:38
+ * @FilePath: \securityHtml\src\api\system\user.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import request from '@/utils/request'
-
+import { praseStrEmpty } from "@/utils/yongtian";
 
 
 
@@ -11,11 +19,14 @@ export function userList(params) { //用户查询
     })
 }
 
-export function userEdit(params) { //修改用户
+
+
+
+export function userEdit(data) { //修改用户
     return request({
         url: '/sys/user/edit',
-        method: 'post',
-        params
+        method: 'put',
+        data
     })
 }
 
@@ -51,4 +62,5 @@ export function listDept(params) { //部门查询=>全部
         method: 'get',
         params: params
     })
-}
+}
+

src/components/Breadcrumb/index.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:21:18
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-11 15:28:03
+ * @FilePath: \securityHtml\src\components\Breadcrumb\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
@@ -33,7 +41,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)

src/components/TimeMenu/index.vue

@@ -7,7 +7,7 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown" >
-          <router-link to="/#/index">
+          <router-link to="/">
             <el-dropdown-item> 首页 </el-dropdown-item>
           </router-link>
           <el-dropdown-item divided>

src/layout/components/Navbar.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class="navbar">
     <hamburger
@@ -5,9 +6,9 @@
       class="hamburger-container"
       @toggleClick="toggleSideBar"
     />
-    <!-- <breadcrumb class="breadcrumb-container" /> -->
+    <breadcrumb class="breadcrumb-container" />
 
-    <div class="title-top">安防综合管理平台</div>
+    <!-- <div class="title-top">安防综合管理平台</div> -->
     <time-menu></time-menu>
   </div>
 </template>

src/utils/yongtian.js

@@ -1,4 +1,12 @@
-/**
+/*
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:21:19
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-11 10:16:44
+ * @FilePath: \securityHtml\src\utils\yongtian.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+/**
  * 构造树型结构数据
  * @param {*} data 数据源
  * @param {*} id id字段 默认 'id'
@@ -73,4 +81,11 @@ export function resetForm(refName) {
     if (this.$refs[refName]) {
         this.$refs[refName].resetFields();
     }
+}
+// 转换字符串，undefined,null等转化为""
+export function praseStrEmpty(str) {
+    if (!str || str == "undefined" || str == "null") {
+        return "";
+    }
+    return str;
 }

src/views/404.vue

@@ -8,13 +8,10 @@
         <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
-        </div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
-        <a href="" class="bullshit__return-home">Back to home</a>
+        <div class="bullshit__oops">404错误!</div>
+        <div class="bullshit__info">找不到网页！</div>
+        <div class="bullshit__info">对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。</div>
+        <a href="/#/" class="bullshit__return-home">返回首页</a>
       </div>
     </div>
   </div>

src/views/MochaITOM/crew/index.vue

@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="责任人" prop="dutyName">
+      <el-form-item label="责任人：" prop="dutyName">
         <el-select v-model="queryParams.dutyName"   placeholder="请选择责任人" style="width: 140px" >
           <el-option
             v-for="item in zrr"
@@ -24,10 +24,9 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
-          type="primary"
-          plain
+          type="success"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -296,7 +295,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.queryParams = {
         dutyName:undefined,
         current:1,

src/views/MochaITOM/plan/index.vue

@@ -13,10 +13,9 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
-          type="primary"
-          plain
+          type="success"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -341,13 +340,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.queryParams = {
         name:undefined,
         current:1,
         size:15,
         pageSize:15,
-        pageNo1,
+        pageNo:1,
       }
       // this.resetForm("queryForm");
       this.handleQuery();

src/views/MochaITOM/point/index.vue

@@ -23,10 +23,9 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
-          type="primary"
-          plain
+          type="success"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -45,10 +44,7 @@
 
     <el-table v-loading="loading" :data="adminList"  :max-height="tableHeight">
       <el-table-column label="点位名称" align="center" prop="name"  show-overflow-tooltip />
-      <!-- <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip /> -->
       <el-table-column label="点位地址" align="center" prop="address"  show-overflow-tooltip />
-      <!-- <el-table-column label="设备类型" align="center" prop="type"  show-overflow-tooltip /> -->
-      <!-- <el-table-column label="点位唯一标识" align="center" prop="code"  show-overflow-tooltip /> -->
       <el-table-column label="摄像头名称" align="center" prop="dhDeviceName"  show-overflow-tooltip />
       <el-table-column label="摄像头通道ID" align="center" prop="vidCode"  show-overflow-tooltip />
       <el-table-column label="点位标签" align="center" prop="qrCodeUrl"  show-overflow-tooltip >
@@ -343,7 +339,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.queryParams = {
         name:undefined,
         current:1,

src/views/MochaITOM/record/index.vue

@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <!-- <el-button
           type="warning"
           plain

src/views/MochaITOM/route/index.vue

@@ -13,18 +13,15 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
-          type="primary"
-          plain
+          type="success"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
         >新增</el-button>
       </el-form-item>
     </el-form>
-
     <el-table v-loading="loading" :data="adminList" :max-height="tableHeight">
       <el-table-column label="路线名称" align="center" prop="name"  show-overflow-tooltip />
       <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
@@ -36,14 +33,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:admin:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -196,15 +191,13 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.queryParams = {
         name:undefined,
         current:1,
-        sizee:15,
+        size:15,
         pageSize:15,
-        pageNo1,
+        pageNo:1,
       }
-      // this.resetForm("queryForm");
       this.handleQuery();
     },
     // 表单重置

src/views/alarm/alarm-log/index.vue

@@ -6,13 +6,13 @@
           防区名:
           <el-input
             v-model="query.guardCode"
-            placeholder="请输入内容"
+            placeholder="请输入防区名"
             style="width: 150px"
           ></el-input>
         </div>
         <div class="filter-item">
           处理状态:
-          <el-select v-model="status_value" placeholder="" style="width: 150px" @change="select_status">
+          <el-select v-model="status_value" placeholder="请选择处理状态" style="width: 150px" @change="select_status">
             <el-option
               v-for="item in status"
               :key="item.value"
@@ -22,60 +22,58 @@
             </el-option>
           </el-select>
         </div>
-
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData()"
           >查询</el-button
         >
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <el-table
       id="out-table"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
+      style="margin-top:10px"
     >
-      <el-table-column prop="cidcode" label="设防码"></el-table-column>
-      <el-table-column prop="cidlevel" label="设防级别"></el-table-column>
-      <el-table-column prop="cidmemo" label="设防内容"></el-table-column>
-      <el-table-column prop="cidtype" label="设防类型"></el-table-column>
-      <el-table-column prop="commType" label="连接类型">
+      <el-table-column prop="cidcode" label="设防码" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="cidlevel" label="设防级别" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="cidmemo" label="设防内容" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="cidtype" label="设防类型" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="commType" label="连接类型" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.commType == "1" ? "网络" : scope.row.commType == "2" ? "串口" :""}}
         </template>
       </el-table-column>
-      <el-table-column prop="connect" label="主机连接号"></el-table-column>
-      <el-table-column prop="eventFlag" label="报警类型">
+      <el-table-column prop="connect" label="主机连接号" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eventFlag" label="报警类型" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.eventFlag == "1" ? "主机事件" : scope.row.eventFlag == "2" ? "dk903键盘事件" :""}}
         </template>
       </el-table-column>
-      <el-table-column prop="eventtriger" label="事件触发">
+      <el-table-column prop="eventtriger" label="事件触发" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.eventtriger == "1" ? "恢复事件" : scope.row.eventtriger == "2" ? "触发事件" :""}}
         </template>
       </el-table-column>
-      <el-table-column prop="guardCode" label="防区名"></el-table-column>
-      <el-table-column prop="handler" label="处理人"></el-table-column>
-      <el-table-column prop="ip" label="IP地址"></el-table-column>
-      <el-table-column prop="message" label="消息类型"></el-table-column>
-      <el-table-column prop="partCode" label="分区名"></el-table-column>
-      <el-table-column prop="status" label="告警处理状态">
+      <el-table-column prop="guardCode" label="防区名" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="handler" label="处理人" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ip" label="IP地址" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="message" label="消息类型" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="partCode" label="分区名" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="status" label="告警处理状态" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.status == "0" ? "未处理" : scope.row.status == "1" ? "已处理" :""}}
         </template>
       </el-table-column>
-      <el-table-column prop="creatTime" label="告警上传时间"></el-table-column>
-      <el-table-column prop="updateTime" label="告警处理时间"></el-table-column>
-      <el-table-column prop="remark" label="备注"></el-table-column>
-
+      <el-table-column prop="creatTime" label="告警上传时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="updateTime" label="告警处理时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status == '0'"
@@ -93,7 +91,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <el-dialog title="处置" :visible.sync="dialogFormVisible">
       <el-form :model="form">
         <el-form-item label="备注:" :label-width="formLabelWidth">
@@ -115,7 +112,6 @@
         >
       </div>
     </el-dialog>
-
     <el-pagination
       background
       @current-change="handleCurrentChange"
@@ -129,14 +125,11 @@
     </el-pagination>
   </div>
 </template>
-
-
 <script>
 // 引入导出Excel表格依赖
 import FileSaver from "file-saver";
 import XLSX from "xlsx";
 import api from "@/api/alarm/alarm-log";
-
 export default {
   name: "javascriptthree",
   data() {
@@ -210,6 +203,23 @@ export default {
     this.getData()
   },
   methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.status_value = undefined
+      this.query = {
+        //列表每页条目数
+        pageSize: 15,
+        //开始页
+        pageNo: 1,
+        status:undefined,
+        guardCode:undefined
+      },
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getData();
+    },
     //处置
     handleUpdate(index, row) {
       this.dialogFormVisible = true;
@@ -331,12 +341,6 @@ export default {
   },
 };
 </script>
-<style scoped>
-.filter-item{
-  vertical-align: top !important;
-  margin-bottom:0px !important
-}
-</style>
 <style>
 .el-radio {
   width: 70px;

src/views/alarm/alarm-task/index.vue

@@ -6,7 +6,7 @@
           实际班组:
           <el-input
             v-model="query.UserName"
-            placeholder=""
+            placeholder="请输入实际班组"
             style="width: 150px"
           ></el-input>
         </div>
@@ -14,7 +14,7 @@
           实际巡更人:
           <el-input
             v-model="query.eTeamName"
-            placeholder=""
+            placeholder="请输入实际巡更人"
             style="width: 150px"
           ></el-input>
         </div>
@@ -22,59 +22,54 @@
           线路名称:
           <el-input
             v-model="query.eLName"
-            placeholder=""
+            placeholder="请输入线路名称"
             style="width: 150px"
           ></el-input>
         </div>
-
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData('query')"
           >搜索</el-button
         >
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-
-    <el-divider></el-divider>
-
+    <!-- <el-divider></el-divider> -->
     <el-table
       v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%;"
+      style="width: 100%;margin-top:10px"
       id="out-table"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
     >
-      <el-table-column prop="eBindDevice" label="计划巡更设备" ></el-table-column>
-      <el-table-column prop="eBindTeam" label="计划绑定班组" ></el-table-column>
-      <el-table-column prop="eBindUser" label="计划巡更人" width="100"></el-table-column>
-      <el-table-column prop="eCreateTime" label="实际实施创建时间" width="130"></el-table-column>
-      <el-table-column prop="eDeviceName" label="实际巡检设备" width="120"></el-table-column>
-      <el-table-column prop="eDFlag" label="是否报警" ></el-table-column>
-      <el-table-column prop="eEndTime" label="结束时间" ></el-table-column>
-      <el-table-column prop="eErrorTime" label="误差时间" ></el-table-column>
-      <el-table-column prop="eLineOrder" label="线路顺序" ></el-table-column>
-      <el-table-column prop="eLName" label="线路名称" ></el-table-column>
-      <el-table-column prop="ePatrolTime" label="巡更时间" ></el-table-column>
-      <el-table-column prop="ePlaceName" label="巡更地点名称" ></el-table-column>
-      <el-table-column prop="ePlanMode" label="计划模式" >
+      <el-table-column prop="eBindDevice" label="计划巡更设备" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eBindTeam" label="计划绑定班组" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eBindUser" label="计划巡更人" width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eCreateTime" label="实际实施创建时间" width="130" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eDeviceName" label="实际巡检设备" width="120" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eDFlag" label="是否报警" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eEndTime" label="结束时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eErrorTime" label="误差时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eLineOrder" label="线路顺序" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eLName" label="线路名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePatrolTime" label="巡更时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePlaceName" label="巡更地点名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePlanMode" label="计划模式" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.ePlanMode == "0" ? "常规" : scope.row.ePlanMode == "1" ? "班组" : scope.row.ePlanMode == "2" ? "星期" : scope.row.ePlanMode == "3" ? "周期" : ""}}
         </template>
       </el-table-column>
-      <el-table-column prop="ePlanState" label="计划巡更状态" ></el-table-column>
-      <el-table-column prop="ePlanType" label="计划类型" ></el-table-column>
-      <el-table-column prop="eStartTime" label="开始时间" ></el-table-column>
-      <el-table-column prop="eStayTime" label="停留时间" ></el-table-column>
-      <el-table-column prop="eTeamName" label="实际班组" ></el-table-column>
-      <el-table-column prop="eUserName" label="实际巡更人" ></el-table-column>
+      <el-table-column prop="ePlanState" label="计划巡更状态" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePlanType" label="计划类型" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eStartTime" label="开始时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eStayTime" label="停留时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eTeamName" label="实际班组" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eUserName" label="实际巡更人" show-overflow-tooltip></el-table-column>
     </el-table>
-
     <el-pagination
       background
       @current-change="handleCurrentChange"
@@ -88,8 +83,6 @@
     </el-pagination>
   </div>
 </template>
-
-
 <script>
 //引入api文件
 import api from "@/api/patrol/elect-partol";
@@ -153,6 +146,21 @@ export default {
   },
 
   methods: {
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.query ={
+          UserName: undefined,
+          eLName: undefined,
+          eTeamName:undefined,
+          pageNo: 1,
+          pageSize: 15,
+        },
+        this.handleQuery();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getData();
+      },
     //列表查询
     getData(data) {
       if(data){

src/views/device/camera/index.vue

@@ -2,12 +2,11 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="filter-left">
-
         <div class="filter-item">
           设备id:
           <el-input
             v-model="query.deviceId"
-            placeholder="设备id"
+            placeholder="请输入设备id"
             style="width: 150px"
           ></el-input>
         </div>
@@ -15,7 +14,7 @@
           通道id:
           <el-input
             v-model="query.id"
-            placeholder="通道id"
+            placeholder="请输入通道id"
             style="width: 150px"
           ></el-input>
         </div>
@@ -23,7 +22,7 @@
           通道名称:
           <el-input
             v-model="query.name"
-            placeholder="通道名称"
+            placeholder="请输入通道名称"
             style="width: 150px"
           ></el-input>
         </div>
@@ -31,7 +30,7 @@
           通道状态:
          <el-select
               v-model="query.status"
-              placeholder="状态"
+              placeholder="请选择通道状态"
               clearable
               size="small"
                style="width: 150px"
@@ -48,7 +47,7 @@
           通道类型:
          <el-select
               v-model="query.cameraType"
-              placeholder="通道类型"
+              placeholder="请选择通道类型"
               clearable
               size="small"
                style="width: 150px"
@@ -61,54 +60,48 @@
               />
             </el-select>
         </div>
-
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData()"
           >搜索</el-button
         >
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
           type="primary"
           class="search-button"
           @click="getDhDeviceListNew()"
           >同步摄像头信息</el-button
         >
-
       </div>
       <div class="handle-button-right">
       </div>
     </div>
-
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <div ref="table">
-
       <el-table
       :data="tableData"
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      border
-      style="width: 100%"
+      style="width: 100%;margin-top:10px"
       row-key="id"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       v-loading="loading"
       :max-height="tableHeight"
-
     >
-      <el-table-column prop="{deviceName}" label="设备名称" >
+      <el-table-column prop="{deviceName}" label="设备名称"  show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.deviceName}}
         </template>
       </el-table-column>
-      <el-table-column prop="deviceId" label="设备Id" ></el-table-column>
-      <el-table-column prop="id" label="通道Id" ></el-table-column>
-      <el-table-column prop="name" label="通道名称" ></el-table-column>
-      <el-table-column prop="status" label="状态" >
+      <el-table-column prop="deviceId" label="设备Id" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="id" label="通道Id" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="通道名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="status" label="状态" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.status == "0" ? "未知" : scope.row.status == "1" ? "在线" : scope.row.status == "2" ? "离线" : ""}}
         </template>
       </el-table-column>
-      <el-table-column  prop="type" label="设备类型">
+      <el-table-column  prop="type" label="设备类型" show-overflow-tooltip>
          <template  slot-scope="scope">
             {{
               scope.row.type == "1" ? "编码单元" : scope.row.type == "2" ? "解码单元" :
@@ -121,20 +114,20 @@
         </template>
       </el-table-column>
 
-      <el-table-column   prop="manufacturer" label="品牌">
+      <el-table-column   prop="manufacturer" label="品牌" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.manufacturer == "0" ? "未知" : scope.row.manufacturer == "1" ? "大华" :scope.row.manufacturer == "2" ? "海康" : ""}}
         </template>
       </el-table-column>
-      <el-table-column   prop="cameraType" label="通道类型">
+      <el-table-column   prop="cameraType" label="通道类型" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.cameraType == "1" ? "枪机" : scope.row.cameraType == "2" ? "球机"
             : scope.row.cameraType == "3" ? "半球" : scope.row.cameraType == "4" ? "证据通道" :""}}
         </template>
       </el-table-column>
-      <el-table-column  prop="longitude" label="经度"></el-table-column>
-      <el-table-column  prop="latitude" label="维度"></el-table-column>
-      <el-table-column  prop="address" label="安装位置"></el-table-column>
+      <el-table-column  prop="longitude" label="经度" show-overflow-tooltip></el-table-column>
+      <el-table-column  prop="latitude" label="维度" show-overflow-tooltip></el-table-column>
+      <el-table-column  prop="address" label="安装位置" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" width="190" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -249,9 +242,7 @@
 import FileSaver from "file-saver";
 import XLSX from "xlsx";
 import Hls from "hls.js";
-import { getLocalDeviceList, getLocalUnitNodes,  getLocalChannel, getDhDeviceListNew } from "@/api/device/camera";
-import qs from 'qs'
-import { set } from 'js-cookie';
+import { getLocalChannel, getDhDeviceListNew } from "@/api/device/camera";
 export default {
   name: "javascriptthree",
   data() {
@@ -369,13 +360,30 @@ export default {
     this.getData();
   },
   methods: {
+    
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.query = {
+          id:undefined,
+          deviceId:undefined,
+          uuid:undefined,
+          cameraType:undefined,
+          name:undefined,
+          status:undefined,
+          pageNo:1,
+          pageSize:15,
+          unitType:1,
+        },
+        this.handleQuery();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getData();
+      },
     //同步信息
     getDhDeviceListNew(){
       getDhDeviceListNew().then((res)=>{
-        if(res.status == "SUCCESS"){
-          this.$message.success("数据同步成功")
-          this.getData()
-        }
+        this.$message.success("数据同步请求已发送，请稍后刷新查看")
       })
     },
     //回放时间选项
@@ -392,40 +400,6 @@ export default {
     },
     //数据初始化
     getData(){
-      //获取tableData数据
-      // getLocalDeviceList(this.query).then(Response =>{
-      //   if(Response.data.pageList){
-      //     let arr = []
-      //     for(let a = 0; a<Response.data.pageList.length; a++){
-      //       arr[a] = {}
-      //       arr[a] = Response.data.pageList[a]
-      //       arr[a].children = []
-      //       getLocalUnitNodes({deviceId:Response.data.pageList[a].id}).then(Response =>{
-      //         for(let b = 0; b<Response.data.pageList.length; b++){
-      //           arr[a].children[b] = Response.data.pageList[b]
-      //           arr[a].children[b].name = Response.data.pageList[b].deviceName
-      //           arr[a].children[b].children = []
-      //           getLocalChannel({unitNdesUuid:Response.data.pageList[b].unitUuid}).then(Response =>{
-      //             for(let c = 0; c<Response.data.pageList.length; c++){
-      //               arr[a].children[b].children[c] = Response.data.pageList[c]
-      //             }
-      //           })
-      //         }
-      //       })
-      //     }
-      //     setTimeout(()=>{
-      //       this.tableData = arr
-      //       this.loading = false
-      //       this.status2 = true
-      //       this.query ={
-      //         id:undefined,
-      //         name:undefined,
-      //         status:undefined
-      //       }
-      //     },1000)
-      //   }
-      // })
-
       let arr = []
       getLocalChannel(this.query).then(Response =>{
         for(let i = 0; i<Response.data.pageList.length; i++){

src/views/device/camera2/index.vue

@@ -7,7 +7,7 @@
           设备id:
           <el-input
             v-model="query.code"
-            placeholder="设备id"
+            placeholder="请输入设备id"
             style="width: 150px"
           ></el-input>
         </div>
@@ -15,7 +15,7 @@
           设备名称:
           <el-input
             v-model="query.name"
-            placeholder="设备名称"
+            placeholder="请输入设备名称"
             style="width: 150px"
           ></el-input>
         </div>
@@ -23,42 +23,41 @@
           单位名称:
           <el-input
             v-model="query.unit"
-            placeholder="单位名称"
+            placeholder="请输入单位名称"
             style="width: 150px"
           ></el-input>
         </div>
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData()"
           >搜索</el-button>
-        <el-button icon="el-icon-plus" type="success" @click="AddoOrEdit()">新增</el-button>
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-plus" type="success" size="mini" @click="AddoOrEdit()">新增</el-button>
       </div>
 
     </div>
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <!-- 初始化数据 -->
     <el-table
       :data="tableData"
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      border
-      style="width: 100%"
+      style="width: 100%;margin-top:10px"
       row-key="id"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       v-loading="loading"
       :max-height="tableHeight"
     >
-      <el-table-column prop="id" label="id" ></el-table-column>
-      <el-table-column prop="code" label="设备id" ></el-table-column>
-      <el-table-column prop="{name}" label="设备名称" >
+      <el-table-column prop="id" label="id" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="code" label="设备id" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="{name}" label="设备名称" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.name}}
         </template>
       </el-table-column>
-      <el-table-column  prop="brand" label="品牌"></el-table-column>
-      <el-table-column  prop="unit" label="单位名称"></el-table-column>
-      <el-table-column  prop="address" label="安装位置"></el-table-column>
+      <el-table-column  prop="brand" label="品牌" show-overflow-tooltip></el-table-column>
+      <el-table-column  prop="unit" label="单位名称" show-overflow-tooltip></el-table-column>
+      <el-table-column  prop="address" label="安装位置" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" width="250" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -460,6 +459,22 @@ export default {
 
   },
   methods: {
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.query = {
+          code:undefined,
+          name:undefined,
+          unit:undefined,
+          current:1,
+          size:15,
+          id:undefined
+        },
+        this.handleQuery();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getData();
+      },
     //获取大华 => 关联摄像头设备信息 (新增修改)
     GLSB(){
       getLocalDeviceList({"pageSize":1000,"size":"1","joinDevice":0}).then(Response =>{

src/views/device/guard/index.vue

@@ -6,7 +6,7 @@
           设备编号:
           <el-input
             v-model="query.deviceNum"
-            placeholder=""
+            placeholder="请输入设备编号"
             style="width: 150px"
           ></el-input>
         </div>
@@ -14,7 +14,7 @@
           设备名称:
           <el-input
             v-model="query.deviceName"
-            placeholder=""
+            placeholder="请输入设备名称"
             style="width: 150px"
           ></el-input>
         </div>
@@ -22,7 +22,7 @@
           设备地址:
           <el-input
             v-model="query.addr"
-            placeholder=""
+            placeholder="请输入设备地址"
             style="width: 150px"
           ></el-input>
         </div>
@@ -30,7 +30,7 @@
           状态:
           <el-select
             v-model="query.status"
-            placeholder="状态"
+            placeholder="请选择状态"
             clearable
             size="small"
             style="width: 150px"
@@ -47,7 +47,7 @@
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="
             queryPerimeterDevice({
               pageNo: pageNo,
@@ -60,20 +60,18 @@
           "
           >搜索</el-button
         >
-        <el-button icon="el-icon-plus" type="success" @click="insert_add()"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-plus" type="success" size="mini"  @click="insert_add()"
           >新增</el-button
         >
       </div>
     </div>
-
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <el-table
       v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%"
+      style="width: 100%;margin-top:10px"
       id="out-table"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
@@ -243,11 +241,24 @@ export default {
     window.onresize = function () {
       self.tableHeight = window.innerHeight - 300;
     };
-    this.getData();
   },
   methods: {
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.query = {
+          deviceNum: undefined,
+          deviceName: undefined,
+          addr: undefined,
+          status: undefined,
+        },
+        this.handleQuery();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.handleCurrentChange();
+      },
     insert_add() {
-      this.el_button = "新 增";
+      this.el_button = "新增";
       this.insert();
       this.dialogFormVisible = true;
       this.update_win = false;

src/views/patrol/elect-partol/index.vue

@@ -6,7 +6,7 @@
           实际班组:
           <el-input
             v-model="query.eTeamName"
-            placeholder=""
+            placeholder="请输入实际班组"
             style="width: 150px"
           ></el-input>
         </div>
@@ -14,7 +14,7 @@
           实际巡更人:
           <el-input
             v-model="query.UserName"
-            placeholder=""
+            placeholder="请输入实际巡更人"
             style="width: 150px"
           ></el-input>
         </div>
@@ -22,7 +22,7 @@
           线路名称:
           <el-input
             v-model="query.eLName"
-            placeholder=""
+            placeholder="请输入线路名称"
             style="width: 150px"
           ></el-input>
         </div>
@@ -30,49 +30,46 @@
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData('query')"
           >搜索</el-button
         >
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-
-    <el-divider></el-divider>
-
+    <!-- <el-divider></el-divider> -->
     <el-table
       v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%; margin-bottom: 5rem;"
+      style="width: 100%; margin-bottom: 5rem;margin-top:10px"
       id="out-table"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
     >
-      <el-table-column prop="eBindDevice" label="计划巡更设备" ></el-table-column>
-      <el-table-column prop="eBindTeam" label="计划绑定班组" ></el-table-column>
-      <el-table-column prop="eBindUser" label="计划巡更人" width="100"></el-table-column>
-      <el-table-column prop="eCreateTime" label="实际实施创建时间" width="130"></el-table-column>
-      <el-table-column prop="eDeviceName" label="实际巡检设备" width="120"></el-table-column>
-      <el-table-column prop="eDFlag" label="是否报警" ></el-table-column>
-      <el-table-column prop="eEndTime" label="结束时间" ></el-table-column>
-      <el-table-column prop="eErrorTime" label="误差时间" ></el-table-column>
-      <el-table-column prop="eLineOrder" label="线路顺序" ></el-table-column>
-      <el-table-column prop="eLName" label="线路名称" ></el-table-column>
-      <el-table-column prop="ePatrolTime" label="巡更时间" ></el-table-column>
-      <el-table-column prop="ePlaceName" label="巡更地点名称" ></el-table-column>
-      <el-table-column prop="ePlanMode" label="计划模式" >
+      <el-table-column prop="eBindDevice" label="巡更设备" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eBindTeam" label="绑定班组" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eBindUser" label="计划巡更人" width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eCreateTime" label="实际实施创建时间" width="130" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eDeviceName" label="实际巡检设备" width="120" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eDFlag" label="是否报警" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eEndTime" label="结束时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eErrorTime" label="误差时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eLineOrder" label="线路顺序" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eLName" label="线路名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePatrolTime" label="巡更时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePlaceName" label="巡更地点" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePlanMode" label="计划模式" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.ePlanMode == "0" ? "常规" : scope.row.ePlanMode == "1" ? "班组" : scope.row.ePlanMode == "2" ? "星期" : scope.row.ePlanMode == "3" ? "周期" : ""}}
         </template>
       </el-table-column>
-      <el-table-column prop="ePlanState" label="计划巡更状态" ></el-table-column>
-      <el-table-column prop="ePlanType" label="计划类型" ></el-table-column>
-      <el-table-column prop="eStartTime" label="开始时间" ></el-table-column>
-      <el-table-column prop="eStayTime" label="停留时间" ></el-table-column>
-      <el-table-column prop="eTeamName" label="实际班组" ></el-table-column>
-      <el-table-column prop="eUserName" label="实际巡更人" ></el-table-column>
+      <el-table-column prop="ePlanState" label="巡更状态" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ePlanType" label="计划类型" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eStartTime" label="开始时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eStayTime" label="停留时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eTeamName" label="实际班组" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="eUserName" label="实际巡更人" width="100" show-overflow-tooltip></el-table-column>
     </el-table>
 
     <el-pagination
@@ -154,6 +151,21 @@ export default {
   },
 
   methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.query = {
+        eTeamName:undefined,
+        UserName: undefined,
+        eLName: undefined,
+        pageNo: 1,
+        pageSize: 15,
+      },
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getData();
+    },
     //列表查询
     getData(data) {
       if(data){

src/views/patrol/partol-plan/index.vue

@@ -6,7 +6,7 @@
           计划模式:
           <el-select
             v-model="pMode_value"
-            placeholder="请选择"
+            placeholder="请选择计划模式"
             @change="select"
             style="width: 150px"
           >
@@ -19,45 +19,41 @@
             </el-option>
           </el-select>
         </div>
-
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData('query')"
           >搜索</el-button
         >
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <el-table
       v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%; margin-bottom: 5rem;"
+      style="width: 100%; margin-bottom: 5rem;margin-top:10px"
       id="out-table"
       :max-height="tableHeight"
     >
-      <el-table-column prop="lineId" label="巡更线路id" ></el-table-column>
-      <el-table-column prop="pCreateTime" label="计划创建时间" ></el-table-column>
-      <el-table-column prop="pEndTime" label="计划结束时间" ></el-table-column>
-      <el-table-column prop="pExcCycle" label="执行周期天数" ></el-table-column>
-      <el-table-column prop="pExcWeek" label="执行星期" ></el-table-column>
-      <el-table-column prop="planId" label="巡更计划id" ></el-table-column>
-      <el-table-column prop="pMode" label="计划模式" >
+      <el-table-column prop="lineId" label="巡更线路id" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pCreateTime" label="计划创建时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pEndTime" label="计划结束时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pExcCycle" label="执行周期天数" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pExcWeek" label="执行星期" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="planId" label="巡更计划id" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pMode" label="计划模式" show-overflow-tooltip>
         <template  slot-scope="scope">
             {{scope.row.pMode == "0" ? "常规" : scope.row.pMode == "1" ? "班组" : scope.row.pMode == "2" ? "星期" : scope.row.pMode == "3" ? "周期" : ""}}
         </template>
       </el-table-column>
-      <el-table-column prop="pRestCycle" label="休息周期天数" ></el-table-column>
-      <el-table-column prop="pStartDate" label="周期开始日期" ></el-table-column>
-      <el-table-column prop="pStartTime" label="计划开始时间" ></el-table-column>
-      <el-table-column prop="pType" label="计划类型" ></el-table-column>
+      <el-table-column prop="pRestCycle" label="休息周期天数" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pStartDate" label="周期开始日期" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pStartTime" label="计划开始时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="pType" label="计划类型" show-overflow-tooltip></el-table-column>
     </el-table>
-
     <el-pagination
       background
       @current-change="handleCurrentChange"
@@ -94,7 +90,7 @@ export default {
       //开始页
       pageNo: 1,
       //input计划模式
-      pMode_value: "",
+      pMode_value: undefined,
       //select计划模式
       pMode_list: [
         {
@@ -152,6 +148,20 @@ export default {
   },
 
   methods: {
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.pMode_value = undefined
+        this.query = {
+          pMode: undefined,
+          pageNo: 1,
+          pageSize: 15,
+        },
+        this.handleQuery();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getData();
+      },
     //下拉筛选
     select(value){
       this.query.pMode = value

src/views/patrol/patrol-point/index.vue

@@ -6,41 +6,34 @@
           点位名称:
           <el-input
             v-model="query.ptName"
-            placeholder=""
-            style="width: 150px"
+            placeholder="请输入点位名称"
+            style="width: 140px"
           ></el-input>
         </div>
-
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData('query')"
           >搜索</el-button
         >
-      </div>
-
-      <div class="handle-button-right">
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-
-    <el-divider></el-divider>
-
+    <!-- <el-divider></el-divider> -->
     <el-table
       v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%; margin-bottom: 5rem;"
+      style="width: 100%; margin-bottom: 5rem;margin-top:10px"
       id="out-table"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
     >
-      <el-table-column prop="ptName" label="点位名称"></el-table-column>
-      <el-table-column prop="ptCard" label="点位钮号"></el-table-column>
-      <el-table-column prop="ptNum" label="编号"></el-table-column>
-      <el-table-column prop="ptType" label="类型">
+      <el-table-column prop="ptName" label="点位名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ptCard" label="点位钮号" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ptNum" label="编号" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ptType" label="类型" show-overflow-tooltip>
         <template slot-scope="scope">
           {{
             scope.row.ptType == "0"
@@ -138,10 +131,18 @@ export default {
   },
 
   methods: {
-    reset() {
-      this.query.ptName = undefined;
-      this.query.pageNo = this.pageNo;
-      this.query.pageSize = this.pageSize;
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.query = {
+        ptName: undefined,
+        pageNo: 1,
+        pageSize: 15
+      },
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getData();
     },
     //初始化数据
     getData(id) {

src/views/patrol/patrol-route/index.vue

@@ -6,44 +6,36 @@
           路线名称:
           <el-input
             v-model="query.lName"
-            placeholder=""
-            style="width: 150px"
+            placeholder="请输入路线名称"
+            style="width: 140px"
           ></el-input>
         </div>
-
         <el-button
           type="primary"
           icon="el-icon-search"
-          class="search-button"
+          size="mini"
           @click="getData('query')"
           >搜索</el-button
         >
-      </div>
-
-      <div class="handle-button-right">
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-
-    <el-divider></el-divider>
-
+    <!-- <el-divider></el-divider> -->
     <el-table
-    v-laoding="loading"
+      v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%; margin-bottom: 5rem;"
+      style="width: 100%; margin-bottom: 5rem;margin-top:10px"
       id="out-table"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
     >
-      <el-table-column prop="placeId" label="巡检点ID" ></el-table-column>
-      <el-table-column prop="lName" label="路线名称" ></el-table-column>
-      <el-table-column prop="lNextPlaceTime" label="到达下一个点时间" ></el-table-column>
-      <el-table-column prop="lOrder" label="巡检顺序" ></el-table-column>
-      <el-table-column prop="lStayTime" label="停留时间" ></el-table-column>
+      <el-table-column prop="placeId" label="巡检点ID" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="lName" label="路线名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="lNextPlaceTime" label="到达下一个点时间" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="lOrder" label="巡检顺序" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="lStayTime" label="停留时间" show-overflow-tooltip></el-table-column>
     </el-table>
-
     <el-pagination
       background
       @current-change="handleCurrentChange"
@@ -121,6 +113,19 @@ export default {
   },
 
   methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.query = {
+        lName: undefined,
+        pageNo: 1,
+        pageSize: 15,
+      },
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getData();
+    },
     //列表查询
     getData(data) {
       if(data){

src/views/patrol/team/edit.vue

@@ -49,15 +49,11 @@
           ></el-option>
         </el-select>
       </el-form-item>
-
-     
       <div class="table-tit">组织人员</div>
       <el-table
         :data="tableData2"
         stripe
-        border
-        :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-        style="width: 100%"
+        style="width: 100%;margin-top:10px"
         id="out-table"
         @selection-change="handleSelectionChange"
       >

src/views/patrol/team/index.vue

@@ -54,7 +54,6 @@
     <el-table
       :data="list"
       stripe
-      border
       :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
       style="width: 100%"
       id="out-table"

src/views/system/organization/index.vue

@@ -3,36 +3,37 @@
     <div class="filter-container">
       <div class="filter-left">
         <div class="filter-item">
-          部门:
+          部门名称:
           <el-input
             v-model="queryForm.deptName"
-            placeholder=""
-            style="width: 120px"
+            placeholder="请输入部门名称"
+            style="width: 140px"
           ></el-input>
         </div>
 
-        <el-button type="primary" icon="el-icon-search" class="search-button" @click="query()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search"  size="mini" @click="query()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
           disabled
           icon="el-icon-plus"
           type="success"
+          size="mini"
           @click="handleAdd()"
           >新增</el-button
         >
       </div>
-
     </div>
-
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
+     <!-- default-expand-all -->
     <el-table
       v-loading="loading"
       :data="tableData"
       row-key="deptId"
-      default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       @selection-change="handleSelectionChange"
+      style="margin-top:10px"
     >
-      <el-table-column prop="deptName" label="部门名称" ></el-table-column>
+      <el-table-column prop="deptName" label="部门名称" align="left"></el-table-column>
       <!-- <el-table-column prop="leader" label="负责人" ></el-table-column>
       <el-table-column prop="phone" label="电话" ></el-table-column>
       <el-table-column prop="email" label="邮箱" ></el-table-column>
@@ -135,7 +136,9 @@ export default {
         total:0
 
       },
-      queryForm:{},
+      queryForm:{
+        deptName:undefined,
+      },
       list: [],
 
       tableData: [
@@ -208,9 +211,6 @@ export default {
   },
 
   methods: {
-    ff(val){
-
-    },
     //初始化
     getData(){
       listDept(this.queryForm).then(Response =>{
@@ -243,6 +243,18 @@ export default {
       this.queryForm ={}
       // this.resetForm("form");
     },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryForm = {
+        deptName:undefined,
+      }
+      // this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getData();
+    },
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {

src/views/system/unit-info/index.vue

@@ -4,32 +4,31 @@
       <div class="filter-left">
         <div class="filter-item">
           单位名称:
-          <el-input v-model="name" placeholder="" style="width: 150px"></el-input>
+          <el-input v-model="name"  placeholder="请输入单位名称" style="width: 140px"></el-input>
         </div>
-
-        <el-button type="primary" icon="el-icon-search" class="search-button"  @click="getList()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini"  @click="getList()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
           icon="el-icon-plus"
           type="success"
+          size="mini"
           @click="add"
           >新增</el-button
         >
       </div>
     </div>
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <el-table
       v-loading="loading"
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%"
+      style="width: 100%;margin-top:10px;"
       @selection-change="handleSelectionChange"
       :max-height="tableHeight"
     >
 
-      <el-table-column prop="name" label="单位名称"></el-table-column>
-      <el-table-column prop="introduce" label="单位介绍"> </el-table-column>
+      <el-table-column prop="name" label="单位名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="introduce" label="单位介绍" show-overflow-tooltip> </el-table-column>
       <el-table-column prop="logo" label="公司logo">
         <!-- <p>{{scope.row.logo}}</p> -->
         <template slot-scope="scope" >
@@ -42,8 +41,8 @@
         </template>
       </el-table-column>
       <!-- <el-table-column prop="remark" label="备注"> </el-table-column> -->
-      <el-table-column prop="createBy" label="创建者"> </el-table-column>
-      <el-table-column prop="createTime" label="创建时间"> </el-table-column>
+      <el-table-column prop="createBy" label="创建者" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip> </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button
@@ -67,7 +66,7 @@
       <el-form ref="form2" :model="form2" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位名称:" prop="name" >
+            <el-form-item label="单位名称" prop="name" >
               <el-input v-model="form2.name" placeholder="请输单位名称" maxlength="30" width="30%" />
             </el-form-item>
           </el-col>
@@ -127,7 +126,6 @@
 <script>
 
 import { companyList, companyAdd, companyUpdata, companyDel, imgAdd, imgDel } from "@/api/unit-info/unit-info";
-import {  Message, MessageBox } from 'element-ui'
 export default {
   data() {
     return {
@@ -213,6 +211,15 @@ export default {
     }
   },
   methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.name = undefined
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
     cancel() {
       this.open = false;
       this.handlePicRemove()

src/views/user/account-manage/index.vue

@@ -6,29 +6,27 @@
         <div class="head-container">
           <el-input
             v-model="deptName"
-            placeholder="请输入部门名称"
+            placeholder="请选择下方部门名称查询"
             clearable
             size="small"
-            prefix-icon="el-icon-search"
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container head-container2" style="height:calc(100vh - 200px)">
           <el-tree
             :data="deptOptions"
             :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
-            default-expand-all
             @node-click="handleNodeClick"
           />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="登录账户" prop="loginName">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+          <el-form-item label="登录账户：" prop="loginName">
             <el-input
               v-model="queryParams.loginName"
               placeholder="请输入登录账户"
@@ -38,7 +36,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
+          <el-form-item label="手机号码：" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
               placeholder="请输入手机号码"
@@ -48,7 +46,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="用户状态" prop="status">
+          <el-form-item label="用户状态：" prop="status">
             <el-select
               v-model="queryParams.status"
               placeholder="用户状态"
@@ -64,7 +62,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间" style="margin-top:-2px">
+          <el-form-item label="创建时间：" >
             <el-date-picker
               v-model="dateRange"
               size="small"
@@ -73,31 +71,33 @@
               range-separator="-"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              style="margin-left:0px;"
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-col :span="1.5">
             <el-button
-              type="primary"
-              plain
+              type="success"
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
             >新增</el-button>
           </el-col>
+          </el-form-item>
+        </el-form>
+
+        <!-- <el-row :gutter="10" class="mb8">
+          
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column label="用户ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="登录账户" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  />
+        </el-row> -->
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" :max-height="tableHeight">
+          <el-table-column label="用户ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" show-overflow-tooltip />
+          <el-table-column label="登录账户" align="center" key="userName" prop="userName" v-if="columns[1].visible" show-overflow-tooltip />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[1].visible" show-overflow-tooltip />
+          <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" show-overflow-tooltip />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  show-overflow-tooltip/>
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
@@ -108,7 +108,7 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.createTime }}</span>
             </template>
@@ -157,7 +157,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions"  placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptions"  placeholder="请选择归属部门"  />
             </el-form-item>
           </el-col>
         </el-row>
@@ -169,7 +169,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="40" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -262,6 +262,7 @@
       :page-size="pageSize"
       layout="sizes,prev, pager, next"
       :total="totalCount"
+      style="position:fixed;"
     >
     </el-pagination>
 
@@ -299,11 +300,10 @@
 </template>
 
 <script>
-//  listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate,
-import {userList, userEdit, resetPwd, userAdd, userRemove} from "@/api/system/user";
+import {userList, userEdit, resetPwd, userAdd, userRemove,} from "@/api/system/user";
 import { roleList } from '@/api/system/auth-manage'
 import { getToken } from "@/utils/auth";
-import {  Message, MessageBox } from 'element-ui'
+import {  Message } from 'element-ui'
 import { treeselect } from "@/api/system/orgnization";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -472,7 +472,8 @@ export default {
            { required: true, message: "用户角色不能为空", trigger: "change"},
         ],
 
-      }
+      },
+      tableHeight:undefined,
     };
   },
   watch: {
@@ -481,6 +482,19 @@ export default {
       this.$refs.tree.filter(val);
     }
   },
+  mounted() {
+    // table高度
+    if(window.innerWidth <1920){
+      this.tableHeight = window.innerHeight - 300
+    }else{
+      this.tableHeight = window.innerHeight - 295
+    }
+    // 监听窗口大小变化
+    let self = this;
+    window.onresize = function() {
+      self.tableHeight = window.innerHeight - 300
+    }
+  },
   created() {
     this.getList();
     this.getTreeselect();
@@ -495,6 +509,7 @@ export default {
     // });
   },
   methods: {
+    
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -511,7 +526,6 @@ export default {
           }
         this.loading = false;
       });
-      this.reset()
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -548,14 +562,28 @@ export default {
     },
     // 用户状态修改
     handleStatusChange(value,row) {
-      let _this = this
+      let that = this
       let text = row.status === "0" ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', "警告", {
+      this.$confirm('确认要"' + text + '""' + row.loginName + '"用户吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          _this.useredit("statue",value,row)
+          userList({loginName:row.loginName}).then(response => {
+            let arr = []
+            arr = response.data.pageList[0]
+            arr.params = undefined
+            arr.status = row.status
+            userEdit(arr).then(response => {
+              if(response.status == "SUCCESS"){
+                Message({
+                  message: ("账号'" + row.loginName + "'"  + text + "成功"),
+                  type: "success",
+                });
+              }
+            })
+          })
+          
         }).catch(function() {
           row.status = row.status === "0" ? "1" : "0";
         });
@@ -601,18 +629,25 @@ export default {
       this.queryParams ={}
       // this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.queryParams.pageSize = 15;
-      this.getList();
-    },
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 15,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined,
+        endTime:undefined,
+        startTime:undefined
+      }
       this.handleQuery();
     },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.userId);
@@ -698,17 +733,10 @@ export default {
           }
         }
       })
-
-
-      // this.roleOptions
-
-      // :label="item.roleName"
-      // :value="item.roleId"
-      // :disabled="item.status == 1"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      // this.reset();
       this.getTreeselect();
       this.roleIds()
       const loginName = row.loginName;
@@ -736,12 +764,12 @@ export default {
               if(this.form.deptName){
                 if(this.deptOptions){
                   for(let i = 0;i<this.deptOptions.length;i++){
-                    if(this.form.deptName == this.deptOptions[i].label){
+                    if(this.form.deptName = this.deptOptions[i].label){
                       this.form.deptId = this.deptOptions[i].label
                     }
                     if(this.deptOptions[i].children){
                       for(let a = 0;a<this.deptOptions[i].children.length;a++){
-                        if(this.form.deptName == this.deptOptions[i].children[a].label){
+                        if(this.form.deptName = this.deptOptions[i].children[a].label){
                           this.form.deptId = this.deptOptions[i].children[a].label
                         }
                       }
@@ -1017,4 +1045,7 @@ export default {
   height:32px;
   line-height: 32px;
 }
+.head-container2{
+  overflow-y: scroll;
+}
 </style>

src/views/user/log-manage/index.vue

@@ -3,29 +3,26 @@
     <div class="filter-container">
       <div class="filter-left">
         <div class="filter-item">操作内容：
-          <el-input v-model="operation" placeholder="" style="width: 150px"></el-input>
+          <el-input v-model="operation" placeholder="请输入操作内容" style="width: 140px"></el-input>
         </div>
-        <el-button type="primary" icon="el-icon-search" class="search-button"
-         @click="getList()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getList()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </div>
     </div>
-
-    <el-divider></el-divider>
+    <!-- <el-divider></el-divider> -->
     <el-table
       :data="tableData"
       stripe
-      border
-      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-      style="width: 100%"
+      style="width: 100%;margin-top:10px;"
       id="out-table"
       @selection-change="handleSelectionChange"
       :height="tableHeight"
     >
-      <el-table-column prop="id" label="序号" ></el-table-column>
-      <el-table-column prop="operation" label="操作内容"> </el-table-column>
-      <el-table-column prop="ip" label="请求ip" > </el-table-column>
-      <el-table-column prop="userName" label="操作人员"> </el-table-column>
-      <el-table-column prop="creatDate" label="操作时间" ></el-table-column>
+      <el-table-column prop="id" label="序号" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="operation" label="操作内容" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="ip" label="请求ip" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="userName" label="操作人员" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="creatDate" label="操作时间" show-overflow-tooltip></el-table-column>
 
     </el-table>
     <el-pagination
@@ -142,6 +139,15 @@ export default {
     }
   },
   methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.operation = undefined;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
     getList(){
        //获取tableData数据
       logList({