ui样式调整

src/App.vue

@@ -36,7 +36,7 @@ export default  {
   .el-table__body-wrapper::-webkit-scrollbar-thumb {
     border-radius: 6px;
     height: 50px;
-    background: rgba(40, 190, 252, .6);//滚动条颜色
+    background: #D7000F;//滚动条颜色
   }
   .el-table__body-wrapper::-webkit-scrollbar-track {
     box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
@@ -147,5 +147,12 @@ export default  {
   /* font-weight: 700; */
   /* color:#1890ff; */
 }
+.el-menu-item{
+  height:48px;
+  line-height: 48px;
+}
+.el-form-item__label{
+  padding:0 12px 0 0 !important;
+}
 </style>
 

src/assets/icons/svg/刷新.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1663055880128" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2371" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M960 416V192l-73.056 73.056a447.712 447.712 0 0 0-373.6-201.088C265.92 63.968 65.312 264.544 65.312 512S265.92 960.032 513.344 960.032a448.064 448.064 0 0 0 415.232-279.488 38.368 38.368 0 1 0-71.136-28.896 371.36 371.36 0 0 1-344.096 231.584C308.32 883.232 142.112 717.024 142.112 512S308.32 140.768 513.344 140.768c132.448 0 251.936 70.08 318.016 179.84L736 416h224z" p-id="2372" fill="#bfbfbf"></path></svg>

src/assets/styles/element-ui.scss

@@ -1,92 +1,95 @@
 // cover some element-ui styles
-
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
-  font-weight: 400 !important;
+    font-weight: 400 !important;
 }
 
 .el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
+    input[type="file"] {
+        display: none !important;
+    }
 }
 
 .el-upload__input {
-  display: none;
+    display: none;
 }
 
 .cell {
-  .el-tag {
-    margin-right: 0px;
-  }
+    .el-tag {
+        margin-right: 0px;
+    }
 }
 
 .small-padding {
-  .cell {
-    padding-left: 5px;
-    padding-right: 5px;
-  }
+    .cell {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
 }
 
 .fixed-width {
-  .el-button--mini {
-    padding: 7px 10px;
-    width: 60px;
-  }
+    .el-button--mini {
+        padding: 7px 10px;
+        width: 60px;
+    }
 }
 
 .status-col {
-  .cell {
-    padding: 0 10px;
-    text-align: center;
-
-    .el-tag {
-      margin-right: 0px;
+    .cell {
+        padding: 0 10px;
+        text-align: center;
+        .el-tag {
+            margin-right: 0px;
+        }
     }
-  }
 }
 
 // to fixed https://github.com/ElemeFE/element/issues/2461
 .el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
+    transform: none;
+    left: 0;
+    position: relative;
+    margin: 0 auto;
 }
 
 // refine element ui upload
 .upload-container {
-  .el-upload {
-    width: 100%;
-
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
+    .el-upload {
+        width: 100%;
+        .el-upload-dragger {
+            width: 100%;
+            height: 200px;
+        }
     }
-  }
 }
 
 // dropdown
 .el-dropdown-menu {
-  a {
-    display: block
-  }
+    a {
+        display: block
+    }
 }
 
 // fix date-picker ui bug in filter-item
 .el-range-editor.el-input__inner {
-  display: inline-flex !important;
+    display: inline-flex !important;
 }
 
 // to fix el-date-picker css style
 .el-range-separator {
-  box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow {
+    display: none;
+}
+
+.el-input__inner:hover {
+    border: 1px solid #ff3b30 !important;
+    box-shadow: 0px 0px 2px #ff3b30;
+    color: #ff3b30 !important;
 }
 
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
-  display: none;
+.el-form-item {
+    margin-bottom: 10px;
 }

src/assets/styles/element-variables.scss

@@ -3,29 +3,26 @@
 * So I modified the default color and you can modify it to your liking.
 **/
 
+
 /* theme color */
-$--color-primary: #1890ff;
+
+$--color-primary: #D7000F;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;
-
 $--button-font-weight: 400;
-
 // $--color-text-regular: #1f2d3d;
-
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
-
-$--table-border:1px solid#dfe6ec;
+$--table-border:1px solid #dfe6ec;
 
 /* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
 
+$--font-path: '~element-ui/lib/theme-chalk/fonts';
 @import "~element-ui/packages/theme-chalk/src/index";
-
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
-  theme: $--color-primary;
-}
+    theme: $--color-primary;
+}

src/assets/styles/sidebar.scss

@@ -64,7 +64,8 @@
         .submenu-title-noDropdown,
         .el-submenu__title {
             &:hover {
-                background-color: #004BAD !important;
+                background-color: $subMenuHover !important;
+                color: #fff !important;
             }
         }
         & .theme-dark .is-active>.el-submenu__title {

src/assets/styles/variables.scss

@@ -18,7 +18,7 @@ $menuLightBg:#ccc;
 $menuLightHover:#f0f1f5;
 $sidebarLightTitle: #001529;
 $subMenuBg:#161523;
-$subMenuHover:#004BAD;
+$subMenuHover:#D7000F;
 $sideBarWidth: 200px;
 $zfb:#44B2FF;
 $wx:#51D455;

src/assets/styles/yongtian.scss

@@ -291,4 +291,30 @@
  .top-right-btn {
      position: relative;
      float: right;
+ }
+ 
+ .lans {
+     color: #016de7;
+ }
+ 
+ .lvs {
+     color: #1abc5e;
+ }
+ 
+ .chengs {
+     color: #ff9500;
+ }
+ 
+ .hongs {
+     color: #ff3b30;
+ }
+ 
+ .right {
+     float: right;
+ }
+ 
+ .el-table--border {
+     border: 1px solid #dfe6ec !important;
+     //  border-bottom: 1px solid #dfe6ec !important;
+     border-right: none !important;
  }

src/layout/components/Navbar.vue

@@ -24,19 +24,10 @@
         <div class="avatar-wrapper">
           {{$store.state.user.nickName}}
           <!-- <img :src="avatar" class="user-avatar"> -->
-          <i class="el-icon-caret-bottom" />
         </div>
-        <el-dropdown-menu slot="dropdown">
-          <!-- <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link> -->
-          <!-- <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
-          </el-dropdown-item> -->
-          <el-dropdown-item divided @click.native="logout">
-            <span>退出登录</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
+        <div class="logout"  @click="logout">
+          <span>安全退出</span>
+        </div>
       </el-dropdown>
     </div>
   </div>
@@ -195,9 +186,10 @@ export default {
       margin-right: 30px;
 
       .avatar-wrapper {
-        margin-top: 5px;
+        margin-top: 0px;
         position: relative;
-
+        display: inline-block;
+        cursor: default;
         .user-avatar {
           cursor: pointer;
           width: 40px;
@@ -206,13 +198,19 @@ export default {
         }
 
         .el-icon-caret-bottom {
-          cursor: pointer;
+
           position: absolute;
           right: -20px;
           top: 25px;
           font-size: 12px;
         }
       }
+      .logout{
+        margin: 0px 0 0 20px;
+        position: relative;
+        display: inline-block;
+        z-index: 1;
+      }
     }
   }
 }

src/layout/components/Sidebar/SidebarItem.vue

@@ -97,12 +97,27 @@ export default {
 .item2:last-child{
     margin-bottom:80px !important
 }
-.router-link-active:active,.router-link-active:hover,.item2:hover{
-    background-color: #004BAD !important;
-    color:#fff !important;
-}
 #app .sidebar-container,.sidebar-container,.sidebar-logo-container{
     background-color: #1F1E2E;
 }
+.el-menu-item.is-active{
+  color:#D7000F !important;
+  .is-opened>.el-submenu__title svg,.is-opened>.el-submenu__title span,.is-opened>.el-submenu__title i{
+    color:#D7000F !important;
+  }
+}
+.el-submenu__title:hover{
+  .is-opened>.el-submenu__title svg,.is-opened>.el-submenu__title span,.is-opened>.el-submenu__title i{
+    color:#fff !important;
+  }
+}
+
+</style>
+<style>
+
+#app .sidebar-container .theme-dark .nest-menu .el-submenu > .el-submenu__title:hover, #app .sidebar-container .theme-dark .el-submenu .el-menu-item:hover{
+  color:#fff !important;
+  background: #D7000F ;
+}
 
 </style>

src/layout/components/Sidebar/index.vue

@@ -55,4 +55,9 @@ export default {
     }
 };
 </script>
-
+<style>
+.item2:hover{
+    background-color: #D7000F !important;
+    color:#fff !important;
+}
+</style>

src/views/business/OM/MochaITOM/crew/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="班组名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="班组名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入班组名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="责任人：" prop="userName">
+      <el-form-item label="责任人:" prop="userName">
         <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
           <el-option
             v-for="item in zrr"
@@ -22,40 +22,39 @@
           ></el-option>
         </el-select>
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        plain
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="班组名称" align="center" prop="teamName"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="dutyName"  show-overflow-tooltip />
-      <el-table-column label="联系方式" align="center" prop="dutyPhone"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="班组名称" align="left" prop="teamName"  show-overflow-tooltip />
+      <el-table-column label="所属单位" align="left" prop="companyName"  show-overflow-tooltip />
+      <el-table-column label="责任人" align="left" prop="dutyName"  show-overflow-tooltip />
+      <el-table-column label="联系方式" align="left" prop="dutyPhone"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="addPeople"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -102,8 +101,6 @@
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.switch"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"
                   @change="handleStatusChange(scope.row,scope.$index)"
                 ></el-switch>
               </template>
@@ -165,7 +162,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
         userName:undefined
       },
@@ -275,7 +272,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/OM/MochaITOM/plan/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="计划名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="计划名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入计划名称"
@@ -11,54 +11,51 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item class="right">
         <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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="计划名称" align="center" prop="planName"  show-overflow-tooltip />
-      <el-table-column label="周期" align="center" prop="cycle"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="计划名称" align="left" prop="planName"  show-overflow-tooltip />
+      <el-table-column label="周期" align="left" prop="cycle"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.cycle == 1 ? "日" : scope.row.cycle == 2 ? "周" : "月"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="计划开始时间" align="center" prop="startDate"  show-overflow-tooltip />
-      <el-table-column label="计划开始时间" align="center" prop="endDate"  show-overflow-tooltip />
-      <el-table-column label="执行开始时间" align="center" prop="startInspectTime"  show-overflow-tooltip />
-      <el-table-column label="执行结束时间" align="center" prop="endInspectTime"  show-overflow-tooltip />
-      <el-table-column label="执行班组" align="center" prop="teamName"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="计划开始时间" align="left" prop="startDate"  show-overflow-tooltip />
+      <el-table-column label="计划开始时间" align="left" prop="endDate"  show-overflow-tooltip />
+      <el-table-column label="执行开始时间" align="left" prop="startInspectTime"  show-overflow-tooltip />
+      <el-table-column label="执行结束时间" align="left" prop="endInspectTime"  show-overflow-tooltip />
+      <el-table-column label="执行班组" align="left" prop="teamName"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -184,8 +181,8 @@
           <el-col style="font-size:16px;font-weight:700;margin:10px 0 20px;">巡更路线</el-col>
           <el-table v-loading="loading2" :data="adminList2" height="200"   @select="dialogCheck" ref="dataTable">
             <el-table-column type="selection" />
-            <el-table-column label="线路名称" align="center" prop="name"  show-overflow-tooltip />
-            <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
+            <el-table-column label="线路名称" align="left" prop="name"  show-overflow-tooltip />
+            <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
           </el-table>
           <pagination
             v-show="total2>0"
@@ -241,13 +238,13 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
       },
       // 查询参数
       queryParams2: {
         current: 1,
-        size: 20,
+        size: 10,
       },
       // 表单参数
       form: {},
@@ -318,7 +315,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/OM/MochaITOM/point/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="点位名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="点位名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入点位名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点位地址：" prop="address">
+      <el-form-item label="点位地址:" prop="address">
         <el-input
           v-model.trim="queryParams.address"
           placeholder="请输入点位地址"
@@ -21,35 +21,31 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="点位名称" align="center" prop="spotName"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="点位地址" align="center" prop="spotAddress"  show-overflow-tooltip />
-      <!-- <el-table-column label="设备类型" align="center" prop="phone"  show-overflow-tooltip /> -->
-      <el-table-column label="点位标签" align="center" prop="spotLabelRoute"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="点位名称" align="left" prop="spotName"  show-overflow-tooltip />
+      <el-table-column label="所属单位" align="left" prop="companyName"  show-overflow-tooltip />
+      <el-table-column label="点位地址" align="left" prop="spotAddress"  show-overflow-tooltip />
+      <!-- <el-table-column label="设备类型" align="left" prop="phone"  show-overflow-tooltip /> -->
+      <el-table-column label="点位标签" align="left" prop="spotLabelRoute"  show-overflow-tooltip >
         <template slot-scope="scope">
           <el-image
             v-if="scope.row.spotLabelRoute"
@@ -59,7 +55,7 @@
           </el-image>
     　　</template>
       </el-table-column>
-      <el-table-column label="点位图片" align="center" prop="pictureRoute"  show-overflow-tooltip >
+      <el-table-column label="点位图片" align="left" prop="pictureRoute"  show-overflow-tooltip >
         <template slot-scope="scope">
           <el-image
             v-if="scope.row.pictureRoute"
@@ -69,21 +65,21 @@
           </el-image>
     　　</template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks"  show-overflow-tooltip />
-      <el-table-column label="最新更新时间" align="center" prop="latestChangeTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="备注" align="left" prop="remarks"  show-overflow-tooltip />
+      <el-table-column label="最新更新时间" align="left" prop="latestChangeTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -203,7 +199,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
         address:undefined
       },
@@ -305,7 +301,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/OM/MochaITOM/record/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="时间:" label-width="50px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="时间:">
         <el-date-picker style="vertical-align: middle;width:340px"
           v-model="dateRange"
           size="small"
@@ -12,27 +12,19 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="完成状态：">
+      <el-form-item label="完成状态:">
         <el-select v-model.trim="queryParams.isComplete"  size="small" style="width:160px" placeholder="请选择完成状态">
           <el-option value="false" label="未完成"></el-option>
           <el-option value="true" label="已完成"></el-option>
         </el-select>
       </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button> -->
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="20" v-loading="loading2">
+
+    <el-row :gutter="20" v-loading="loading2" style="margin-top:20px">
       <el-col :span="2.4">
         <el-col class="event">
             维保人员数量<span class="color1 colorc">{{collectList.userCount}}</span>
@@ -55,35 +47,35 @@
         </el-col>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" height="calc(100vh - 34vh)">
-      <el-table-column label="任务名称" align="center" prop="planName" show-overflow-tooltip />
-      <el-table-column label="维保点位" align="center" prop="pointName" show-overflow-tooltip />
-      <el-table-column label="应完成时间" align="center" prop="ywcTime" show-overflow-tooltip />
-      <!-- <el-table-column label="当前状态" align="center" prop="property" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" border >
+      <el-table-column label="任务名称" align="left" prop="planName" show-overflow-tooltip />
+      <el-table-column label="维保点位" align="left" prop="pointName" show-overflow-tooltip />
+      <el-table-column label="应完成时间" align="left" prop="ywcTime" show-overflow-tooltip />
+      <!-- <el-table-column label="当前状态" align="left" prop="property" show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.alarmStatus == 0 ? 'color3' : 'color4'">{{scope.row.alarmStatus == 0 ? "未处理" : "已处理"}}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="完成情况" align="center" prop="isComplete" show-overflow-tooltip >
+      <el-table-column label="完成情况" align="left" prop="isComplete" show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.isComplete == false ? 'color3' : 'color4'">{{scope.row.isComplete == false ? "未完成" : "已完成"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="相关责任人" align="center" prop="dutyName" show-overflow-tooltip />
-      <el-table-column label="联系电话" align="center" prop="dutyPhone" show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="相关责任人" align="left" prop="dutyName" show-overflow-tooltip />
+      <el-table-column label="联系电话" align="left" prop="dutyPhone" show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button v-if="scope.row.isComplete === false"
             size="mini"
             type="text"
-            icon="el-icon-s-promotion"
+            class="lans"
             @click="jump(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >跳转至工单</el-button>
            <el-button v-if="scope.row.isComplete === true"
             size="mini"
             type="text"
-            icon="el-icon-s-promotion"
+            class="lans"
             @click="jump(scope.row)"
             disabled
             v-hasPermi="['system:admin:edit']"

src/views/business/OM/MochaITOM/route/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="路线名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="路线名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入路线名称"
@@ -11,37 +11,35 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
     </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="路线名称" align="center" prop="name"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="路线名称" align="left" prop="name"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="createBy"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -61,9 +59,9 @@
           <el-col style="font-size:16px;font-weight:700;margin:10px 0 20px;">维保点位</el-col>
           <el-table v-loading="loading2" :data="adminList2" height="300" @selection-change="handleSelectionChange"  ref="dataTable">
             <el-table-column type="selection" />
-            <el-table-column label="点位名称" align="center" prop="spotName"  show-overflow-tooltip />
-            <el-table-column label="点位地址" align="center" prop="spotAddress"  show-overflow-tooltip />
-            <el-table-column label="点位图片" align="center" prop="pictureRoute"  show-overflow-tooltip >
+            <el-table-column label="点位名称" align="left" prop="spotName"  show-overflow-tooltip />
+            <el-table-column label="点位地址" align="left" prop="spotAddress"  show-overflow-tooltip />
+            <el-table-column label="点位图片" align="left" prop="pictureRoute"  show-overflow-tooltip >
               <template slot-scope="scope">
                 <el-image
                   v-if="scope.row.pictureRoute"
@@ -127,14 +125,14 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
         dutyId:undefined
       },
       // 查询参数
       queryParams2: {
         current: 1,
-        size: 20,
+        size: 10,
       },
       // 表单参数
       form: {},
@@ -150,7 +148,7 @@ export default {
     this.getList();//初始化table
   },
   methods: {
-    
+
     //强制el-input刷新
     onInput(){
         this.$forceUpdate();
@@ -166,7 +164,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();
@@ -235,7 +233,7 @@ export default {
           }
           this.getList2(row)
           this.open = true;
-      })  
+      })
     },
     /** 新增按钮操作 */
     handleAdd() {

src/views/business/OM/eventCenter/alarm/index.vue

@@ -5,9 +5,8 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="90px"
     >
-      <el-form-item label="上报时间：">
+      <el-form-item label="上报时间:">
         <el-date-picker
           style="margin-top: 5px; width: 340px"
           v-model="dateRange"
@@ -30,30 +29,29 @@
           <el-option value="1" label="已处理"></el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item>
-        <el-button
+
+        <el-form-item class="right">
+          <el-button plain size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+          <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-form-item>
+        <br>
         <el-button
-          type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['system:admin:export']"
           >导出</el-button
         >
-      </el-form-item>
     </el-form>
-    <el-row :gutter="20" v-loading="loading2">
+    <el-row :gutter="20" v-loading="loading2" style="margin-top:20px">
       <el-col :span="2.4">
         <el-col class="event">
           事件总数<span class="color1 colorc">{{ collectList.total }}</span>
@@ -85,50 +83,50 @@
       v-loading="loading"
       :data="adminList"
       style="margin-top: 20px"
-      height="calc(100vh - 34vh)"
+      border
     >
-      <el-table-column label="事件id" align="center" prop="id" />
+      <el-table-column label="事件id" align="left" prop="id" />
       <el-table-column
         label="单位名称"
-        align="center"
+        align="left"
         prop="companyName"
         show-overflow-tooltip
       />
       <el-table-column
         label="告警设备"
-        align="center"
+        align="left"
         prop="deviceName"
         show-overflow-tooltip
       />
       <el-table-column
         label="报告数据"
-        align="center"
+        align="left"
         prop="property"
         show-overflow-tooltip
       />
       <el-table-column
         label="上报时间"
-        align="center"
+        align="left"
         prop="createTime"
         show-overflow-tooltip
       />
       <el-table-column
         label="操作"
-        align="center"
+        align="left"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
+            class="lans"
             @click="getOne(scope.row)"
             >查看详情</el-button
           >
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-s-promotion"
+            class="lans"
             @click="jump(scope.row)"
             v-hasPermi="['system:admin:edit']"
             >跳转至工单</el-button

src/views/business/OM/eventCenter/event/index.vue

@@ -5,9 +5,8 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="90px"
     >
-      <el-form-item label="上报时间：">
+      <el-form-item label="上报时间:">
         <el-date-picker
           style="margin-top: 5px; width: 340px"
           v-model="dateRange"
@@ -19,7 +18,7 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="事件类型：">
+      <el-form-item label="事件类型:">
         <el-select
           v-model.trim="queryParams.type"
           size="small"
@@ -31,30 +30,28 @@
           <el-option value="3" label="设备设施"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery"
+          >重置</el-button
+        >
         <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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-          >导出</el-button
-        >
       </el-form-item>
+      <br>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+        >导出</el-button
+      >
     </el-form>
-    <el-row :gutter="20" v-loading="loading2">
+    <el-row :gutter="20" v-loading="loading2" style="margin-top:20px">
       <el-col :span="2.4">
         <el-col class="event">
           事件总数<span class="color1 colorc">{{ collectList.total }}</span>
@@ -86,24 +83,24 @@
       v-loading="loading"
       :data="adminList"
       style="margin-top: 20px"
-      height="calc(100vh - 34vh)"
+      border
     >
-      <el-table-column label="事件id" align="center" prop="id" />
+      <el-table-column label="事件id" align="left" prop="id" />
       <el-table-column
         label="单位名称"
-        align="center"
+        align="left"
         prop="companyName"
         show-overflow-tooltip
       />
       <el-table-column
         label="事件名称"
-        align="center"
+        align="left"
         prop="eventName"
         show-overflow-tooltip
       />
       <el-table-column
         label="事件类型"
-        align="center"
+        align="left"
         prop="eventType"
         show-overflow-tooltip
       >
@@ -128,33 +125,33 @@
       </el-table-column>
       <el-table-column
         label="报告内容"
-        align="center"
+        align="left"
         prop="eventContent"
         show-overflow-tooltip
       />
       <el-table-column
         label="上报时间"
-        align="center"
+        align="left"
         prop="reportingTime"
         show-overflow-tooltip
       />
       <el-table-column
         label="操作"
-        align="center"
+        align="left"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
+            class="lans"
             @click="getOne(scope.row)"
             >查看详情</el-button
           >
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-s-promotion"
+            class="lans"
             @click="jump(scope.row)"
             v-hasPermi="['system:admin:edit']"
             >跳转至工单</el-button

src/views/business/OM/eventCenter/hiddenDanger/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="上报时间：">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="上报时间:">
          <el-date-picker
           style="margin-top:5px;;width:340px"
           v-model="dateRange"
@@ -19,21 +19,20 @@
           <el-option value="1" label="已处理"></el-option>
         </el-select>
       </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="warning"
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      </el-form-item>
+      <br>
+      <el-button
           plain
-          icon="el-icon-download"
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['system:admin:export']"
         >导出</el-button>
-      </el-form-item>
     </el-form>
-    <el-row :gutter="20" v-loading="loading2">
+    <el-row :gutter="20" v-loading="loading2" style="margin-top:20px">
       <el-col :span="2.4">
         <el-col class="event">
             事件总数<span class="color1 colorc">{{collectList.total}}</span>
@@ -55,25 +54,25 @@
         </el-col>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" height="calc(100vh - 34vh)">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
-      <el-table-column label="设备名称" align="center" prop="deviceName" show-overflow-tooltip />
-      <el-table-column label="报告数据" align="center" prop="property" show-overflow-tooltip />
-      <el-table-column label="上报时间" align="center" prop="createTime" show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" border>
+      <el-table-column label="id" align="left" prop="id" />
+      <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
+      <el-table-column label="报告数据" align="left" prop="property" show-overflow-tooltip />
+      <el-table-column label="上报时间" align="left" prop="createTime" show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-view"
+                   class="lans"
                   @click="getOne(scope.row)"
                   >查看详情</el-button
                 >
                 <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-s-promotion"
+                  class="lans"
                   @click="jump(scope.row)"
                   v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button

src/views/business/OM/workMange/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="上报时间：">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="上报时间:">
          <el-date-picker
           style="margin-top:5px;width:340px"
           v-model="dateRange"
@@ -13,14 +13,14 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="处理状态：">
+      <el-form-item label="处理状态:">
         <el-select v-model.trim="queryParams.status"  size="small" style="width:160px" placeholder="请选择处理状态">
           <el-option value="0" label="未处理"></el-option>
           <el-option value="1" label="已处理:通过"></el-option>
           <el-option value="2" label="已处理：未通过"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="执行班组">
+      <el-form-item label="执行班组:">
         <el-select
           v-model="queryParams.teamId"
           placeholder="请选择执行班组"
@@ -36,29 +36,26 @@
           />
         </el-select>
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-    <el-row :gutter="20" v-loading="loading2">
+    <el-row :gutter="20" v-loading="loading2" style="margin-top:20px">
       <el-col :span="2.4">
         <el-col class="event">
             事件总数<span class="color1 colorc">{{collectList.total}}</span>
@@ -80,43 +77,43 @@
         </el-col>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" height="calc(100vh - 34vh)" >
-      <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" border >
+      <el-table-column label="id" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip >
          <template slot-scope="scope">
           {{scope.row.companyName || "东信智慧园区"}}
         </template>
       </el-table-column>
-      <el-table-column label="工单名称" align="center" prop="workOrderName" show-overflow-tooltip />
-      <el-table-column label="工单内容" align="center" prop="workOrderContent" show-overflow-tooltip />
-      <el-table-column label="工单类型" align="center" prop="workOrderType"  >
+      <el-table-column label="工单名称" align="left" prop="workOrderName" show-overflow-tooltip />
+      <el-table-column label="工单内容" align="left" prop="workOrderContent" show-overflow-tooltip />
+      <el-table-column label="工单类型" align="left" prop="workOrderType"  >
          <template slot-scope="scope">
           {{scope.row.workOrderType == "1" ?  "消防告警" : scope.row.workOrderType == "2" ?  "巡检计划"  : scope.row.workOrderType == "3" ?  "厕位故障" : ""}}
         </template>
       </el-table-column>
-      <el-table-column label="上报时间" align="center" prop="addTime" show-overflow-tooltip />
-      <el-table-column label="处理状态" align="center" prop="clzt" >
+      <el-table-column label="上报时间" align="left" prop="addTime" show-overflow-tooltip />
+      <el-table-column label="处理状态" align="left" prop="clzt" >
         <template slot-scope="scope">
           <span :class="scope.row.clzt == '0' ? 'color3' : scope.row.clzt == '1' ? 'color4' : 'color2'">{{scope.row.clzt == '0' ? "未处理" : scope.row.clzt == '1' ? "已处理:通过" : "已处理:未通过"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="执行班组" align="center" prop="teamName" show-overflow-tooltip />
-      <el-table-column label="处置内容" align="center" prop="clnr" show-overflow-tooltip />
-      <el-table-column label="处理人" align="center" prop="czPeople" show-overflow-tooltip/>
-      <el-table-column label="处理时间" align="center" prop="czTime" show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="执行班组" align="left" prop="teamName" show-overflow-tooltip />
+      <el-table-column label="处置内容" align="left" prop="clnr" show-overflow-tooltip />
+      <el-table-column label="处理人" align="left" prop="czPeople" show-overflow-tooltip/>
+      <el-table-column label="处理时间" align="left" prop="czTime" show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button v-if="scope.row.clzt == '0'"
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >处置</el-button>
           <el-button v-if="scope.row.clzt != '0' "
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
             disabled

src/views/business/ba/airConditioner/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <!-- <el-form-item label="安装位置：" prop="name">
         <el-input
           v-model.trim="queryParams.name"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-       <el-form-item label="采集时间：" class="time">
+       <el-form-item label="采集时间:" class="time">
          <el-date-picker
           style="margin-top:5px;;width:340px"
           v-model="dateRange"
@@ -33,113 +33,104 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button> -->
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="设备名称" align="center" prop="deviceName"  show-overflow-tooltip />
-      <el-table-column label="采集时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="运行状态" align="center" prop="rs"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" prop="deviceName"  show-overflow-tooltip />
+      <el-table-column label="采集时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="运行状态" align="left" prop="rs"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.rs == 0 ? 'color3' : 'color4'">{{scope.row.rs == 0 ? "停止" : scope.row.rs == 1 ? "运行"  : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="故障状态" align="center" prop="al"  show-overflow-tooltip >
+      <el-table-column label="故障状态" align="left" prop="al"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.al == 1 ? 'color3' : 'color4'">{{scope.row.al == 1 ? "故障" : scope.row.al == 0 ? "正常" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="手自动" align="center" prop="aom"  show-overflow-tooltip >
+      <el-table-column label="手自动" align="left" prop="aom"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.aom == 0 ? 'color3' : 'color4'">{{scope.row.aom == 0 ? "手动" : scope.row.amo == 1 ?  "自动" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="启停控制" align="center" prop="c"  show-overflow-tooltip >
+      <el-table-column label="启停控制" align="left" prop="c"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.c == 0 ? 'color3' : 'color4'">{{scope.row.c == 0 ? "停止" : scope.row.c == 1 ?  "启动" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="风机压差" align="center" prop="jdps"  show-overflow-tooltip >
+      <el-table-column label="风机压差" align="left" prop="jdps"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.jdps == 0 ? 'color3' : 'color4'">{{scope.row.c == 0 ? "停止" : scope.row.jdps == 1 ?  "启动" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="滤网压差" align="center" prop="zx"  show-overflow-tooltip >
+      <el-table-column label="滤网压差" align="left" prop="zx"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.zx == 0 ? 'color4' : 'color3'">{{scope.row.zx == 0 ? "干净" : scope.row.zx == 1 ? "脏堵" :""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="防冻报警" align="center" prop="fd"  show-overflow-tooltip >
+      <el-table-column label="防冻报警" align="left" prop="fd"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.fd == 0 ? 'color3' : 'color4'">{{scope.row.fd == 0 ? "正常" : scope.row.fd == 1 ?  "冷冻" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="送风温度" align="center" prop="st"  show-overflow-tooltip >
+      <el-table-column label="送风温度" align="left" prop="st"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.st">{{scope.row.st}}℃</span>
         </template>
       </el-table-column>
-      <el-table-column label="送风湿度" align="center" prop="sh"  show-overflow-tooltip >
+      <el-table-column label="送风湿度" align="left" prop="sh"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.st">{{scope.row.sh}}RH</span>
         </template>
       </el-table-column>
-      <el-table-column label="回风温度" align="center" prop="rt"  show-overflow-tooltip >
+      <el-table-column label="回风温度" align="left" prop="rt"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.rt">{{scope.row.rt}}℃</span>
         </template>
       </el-table-column>
-      <el-table-column label="回风湿度" align="center" prop="rh"  show-overflow-tooltip >
+      <el-table-column label="回风湿度" align="left" prop="rh"  show-overflow-tooltip >
        <template slot-scope="scope">
           <span v-if="scope.row.rh">{{scope.row.rh}}RH</span>
         </template>
       </el-table-column>
-      <el-table-column label="排风温度" align="center" prop="pt"  show-overflow-tooltip >
+      <el-table-column label="排风温度" align="left" prop="pt"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.pt">{{scope.row.pt}}℃</span>
         </template>
       </el-table-column>
-      <el-table-column label="排风湿度" align="center" prop="ph"  show-overflow-tooltip >
+      <el-table-column label="排风湿度" align="left" prop="ph"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.ph">{{scope.row.ph}}RH</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="新风阀反馈（%）" align="center" prop="xffb"  show-overflow-tooltip />
-      <el-table-column label="新风阀开关控制（%）" align="center" prop="xfc"  show-overflow-tooltip />
-      <el-table-column label="回风阀反馈（%）" align="center" prop="hffb"  show-overflow-tooltip />
-      <el-table-column label="回风阀开关控制（%）" align="center" prop="hfc"  show-overflow-tooltip />
-      <el-table-column label="排风阀反馈" align="center" prop="pffb"  show-overflow-tooltip />
-      <el-table-column label="排风阀开关控制（%)" align="center" prop="pfc"  show-overflow-tooltip /> -->
-      <el-table-column label="水阀调节控(%)" align="center" prop="sfm"  show-overflow-tooltip >
+      <!-- <el-table-column label="新风阀反馈（%）" align="left" prop="xffb"  show-overflow-tooltip />
+      <el-table-column label="新风阀开关控制（%）" align="left" prop="xfc"  show-overflow-tooltip />
+      <el-table-column label="回风阀反馈（%）" align="left" prop="hffb"  show-overflow-tooltip />
+      <el-table-column label="回风阀开关控制（%）" align="left" prop="hfc"  show-overflow-tooltip />
+      <el-table-column label="排风阀反馈" align="left" prop="pffb"  show-overflow-tooltip />
+      <el-table-column label="排风阀开关控制（%)" align="left" prop="pfc"  show-overflow-tooltip /> -->
+      <el-table-column label="水阀调节控(%)" align="left" prop="sfm"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.sfm">{{scope.row.sfm}}%</span>
         </template>
       </el-table-column>
-      <el-table-column label="水阀反馈" align="center" prop="sffb"  show-overflow-tooltip >
+      <el-table-column label="水阀反馈" align="left" prop="sffb"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.sffb">{{scope.row.sffb}}%</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="风阀调节控制(%)" align="center" prop="ffm"  show-overflow-tooltip />
-      <el-table-column label="风阀反馈" align="center" prop="fffb"  show-overflow-tooltip /> -->
-      <el-table-column label="设定温度" align="center" prop="sett"  show-overflow-tooltip >
+      <!-- <el-table-column label="风阀调节控制(%)" align="left" prop="ffm"  show-overflow-tooltip />
+      <el-table-column label="风阀反馈" align="left" prop="fffb"  show-overflow-tooltip /> -->
+      <el-table-column label="设定温度" align="left" prop="sett"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.sett">{{scope.row.sett}}℃</span>
         </template>
       </el-table-column>
-      <el-table-column label="冬夏季切换" align="center" prop="mode"  show-overflow-tooltip >
+      <el-table-column label="冬夏季切换" align="left" prop="mode"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.mode == 0 ? 'color3' : 'color4'">{{scope.row.mode == 0 ? "夏季" : scope.row.mode == 1 ? "冬季" : ""}}</span>
         </template>

src/views/business/ba/extension/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <!-- <el-form-item label="安装位置：" prop="name">
         <el-input
           v-model.trim="queryParams.name"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-       <el-form-item label="采集时间：" class="time">
+       <el-form-item label="采集时间:" class="time">
          <el-date-picker
           style="margin-top:5px;;width:340px"
           v-model="dateRange"
@@ -33,80 +33,71 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button> -->
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="设备名称" align="center" prop="deviceName"  show-overflow-tooltip />
-      <el-table-column label="采集时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="运行状态" align="center" prop="rs"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" prop="deviceName"  show-overflow-tooltip />
+      <el-table-column label="采集时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="运行状态" align="left" prop="rs"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.rs == 0 ? 'color3' : 'color4'">{{scope.row.rs == 0 ? "停止" : "运行"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="故障状态" align="center" prop="al"  show-overflow-tooltip >
+      <el-table-column label="故障状态" align="left" prop="al"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.al == 1 ? 'color3' : 'color4'">{{scope.row.al == 1 ? "故障" : "正常"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="手自动" align="center" prop="aom"  show-overflow-tooltip >
+      <el-table-column label="手自动" align="left" prop="aom"  show-overflow-tooltip >
          <template slot-scope="scope">
           <span :class="scope.row.aom == 0 ? 'color3' : 'color4'">{{scope.row.aom == 0 ? "手动" : "自动"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="启停控制" align="center" prop="c"  show-overflow-tooltip >
+      <el-table-column label="启停控制" align="left" prop="c"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.c == 0 ? 'color3' : 'color4'">{{scope.row.c == 0 ? "停止" : "启动"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="风机压差" align="center" prop="jdps"  show-overflow-tooltip >
+      <el-table-column label="风机压差" align="left" prop="jdps"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.jdps == 0 ? 'color3' : 'color4'">{{scope.row.jdps == 0 ? "手动" : "自动"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="滤网压差" align="center" prop="zx"  show-overflow-tooltip >
+      <el-table-column label="滤网压差" align="left" prop="zx"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.zx == 0 ? 'color4' : 'color3'">{{scope.row.zx == 0 ? "干净" : "脏堵"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="送风温度" align="center" prop="st"  show-overflow-tooltip >
+      <el-table-column label="送风温度" align="left" prop="st"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.st}}℃</span>
         </template>
       </el-table-column>
-      <el-table-column label="送风湿度" align="center" prop="sh"  show-overflow-tooltip >
+      <el-table-column label="送风湿度" align="left" prop="sh"  show-overflow-tooltip >
          <template slot-scope="scope">
           <span>{{scope.row.sh}}RH</span>
         </template>
       </el-table-column>
-      <el-table-column label="水阀调节控制" align="center" prop="fm"  show-overflow-tooltip >
+      <el-table-column label="水阀调节控制" align="left" prop="fm"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.fm}}%</span>
         </template>
       </el-table-column>
-      <el-table-column label="水阀反馈" align="center" prop="sffb"  show-overflow-tooltip >
+      <el-table-column label="水阀反馈" align="left" prop="sffb"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.sffb}}%</span>
         </template>
       </el-table-column>
-      <el-table-column label="设定温度" align="center" prop="sett"  show-overflow-tooltip >
+      <el-table-column label="设定温度" align="left" prop="sett"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.sett}}℃</span>
         </template>
       </el-table-column>
-      <el-table-column label="冬夏季切换" align="center" prop="mode"  show-overflow-tooltip >
+      <el-table-column label="冬夏季切换" align="left" prop="mode"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.mode == 0 ? 'color3' : 'color4'">{{scope.row.mode == 0 ? "夏季" : "冬季"}}</span>
         </template>

src/views/business/ba/lateralPosition/index.vue

@@ -1,26 +1,26 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
 
-      <el-form-item label="厕位类型：">
+      <el-form-item label="厕位类型:">
         <el-select v-model.trim="queryParams.type"  size="small" style="width:160px" placeholder="请选择类型">
           <el-option value="female" label="女厕"></el-option>
           <el-option value="male" label="男厕"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="使用状态：">
+      <el-form-item label="使用状态:">
         <el-select v-model.trim="queryParams.status"  size="small" style="width:160px" placeholder="请选择使用状态">
           <el-option value="0" label="空闲"></el-option>
           <el-option value="1" label="在用"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="故障状态：">
+      <el-form-item label="故障状态:">
         <el-select v-model.trim="queryParams.isAlert"  size="small" style="width:160px" placeholder="请选择故障状态">
           <el-option value="false" label="正常"></el-option>
           <el-option value="true" label="故障"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="设备名称：" prop="name">
+      <el-form-item label="设备名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入设备名称"
@@ -30,7 +30,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-       <el-form-item label="采集时间：" class="time">
+       <el-form-item label="采集时间:" class="time">
          <el-date-picker
           style="margin-top:5px;;width:340px"
           v-model="dateRange"
@@ -42,40 +42,31 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button> -->
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="采集时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="设备名称" align="center" prop="deviceName"  show-overflow-tooltip />
-      <el-table-column label="厕位类型" align="center" prop="wcType"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="采集时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" prop="deviceName"  show-overflow-tooltip />
+      <el-table-column label="厕位类型" align="left" prop="wcType"  show-overflow-tooltip >
         <template slot-scope="scope">
           {{scope.row.wcType == 'female' ? '女厕' : "男厕"}}
         </template>
       </el-table-column>
-      <el-table-column label="使用状态" align="center" prop="status"  show-overflow-tooltip >
+      <el-table-column label="使用状态" align="left" prop="status"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.status == 0 ? 'color3' : 'color4'">{{scope.row.status == 0 ? "空闲" : "在用"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="故障状态" align="center" prop="isAlert"  show-overflow-tooltip >
+      <el-table-column label="故障状态" align="left" prop="isAlert"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.isAlert === true ? 'color3' : 'color4'">{{scope.row.isAlert === true ? "故障" : "正常"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button v-if="scope.row.isAlert === true"
             size="mini"

src/views/business/ba/well/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <!-- <el-form-item label="安装位置：" prop="name">
         <el-input
           v-model.trim="queryParams.name"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-       <el-form-item label="采集时间：" class="time">
+       <el-form-item label="采集时间:" class="time">
          <el-date-picker
           style="margin-top:5px;;width:340px"
           v-model="dateRange"
@@ -33,45 +33,36 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button> -->
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="设备名称" align="center" prop="deviceName"  show-overflow-tooltip />
-      <el-table-column label="采集时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="泵1运行状态" align="center" prop=""  show-overflow-tooltip  >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" prop="deviceName"  show-overflow-tooltip />
+      <el-table-column label="采集时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="泵1运行状态" align="left" prop=""  show-overflow-tooltip  >
         <template slot-scope="scope">
           <span :class="scope.row.b1rs == 0 ? 'color3' : 'color4'">{{scope.row.b1rs == 0 ? "停止" : "运行"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="泵1故障状态 " align="center" prop=""  show-overflow-tooltip  >
+      <el-table-column label="泵1故障状态 " align="left" prop=""  show-overflow-tooltip  >
         <template slot-scope="scope">
           <span :class="scope.row.b1al == 0 ? 'color4' : 'color3'">{{scope.row.b1al == 0 ? "正常" : "故障"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="泵2运行状态" align="center" prop=""  show-overflow-tooltip  >
+      <el-table-column label="泵2运行状态" align="left" prop=""  show-overflow-tooltip  >
         <template slot-scope="scope">
           <span :class="scope.row.b2rs == 0 ? 'color3' : 'color4'">{{scope.row.b2rs == 0 ? "停止" : "运行"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="泵2故障状态" align="center" prop=""  show-overflow-tooltip  >
+      <el-table-column label="泵2故障状态" align="left" prop=""  show-overflow-tooltip  >
         <template slot-scope="scope">
           <span :class="scope.row.b2al == 0 ? 'color4' : 'color3'">{{scope.row.b2al == 0 ? "正常" : "故障"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="液位开关" align="center" prop=""  show-overflow-tooltip  >
+      <el-table-column label="液位开关" align="left" prop=""  show-overflow-tooltip  >
         <template slot-scope="scope">
           <span :class="scope.row.yw == 0 ? 'color4' : 'color3'">{{scope.row.yw == 0 ? "低液位" : "高液位"}}</span>
         </template>

src/views/business/buildMange/building/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="建筑名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="建筑名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入建筑名称"
@@ -11,48 +11,46 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="建筑名称" align="center" prop="buildName"  show-overflow-tooltip />
-      <el-table-column label="地理坐标" align="center" prop="posistion"  show-overflow-tooltip />
-      <el-table-column label="省" align="center" prop="data2"  show-overflow-tooltip />
-      <el-table-column label="市" align="center" prop="data3"  show-overflow-tooltip />
-      <el-table-column label="区/县" align="center" prop="data4"  show-overflow-tooltip />
-      <el-table-column label="详细地址" align="center" prop="address"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addMan"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="建筑名称" align="left" prop="buildName"  show-overflow-tooltip />
+      <el-table-column label="地理坐标" align="left" prop="posistion"  show-overflow-tooltip />
+      <el-table-column label="省" align="left" prop="data2"  show-overflow-tooltip />
+      <el-table-column label="市" align="left" prop="data3"  show-overflow-tooltip />
+      <el-table-column label="区/县" align="left" prop="data4"  show-overflow-tooltip />
+      <el-table-column label="详细地址" align="left" prop="address"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="addMan"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-
     <!-- 修改、新增对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
@@ -139,7 +137,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
       },
       // 表单参数
@@ -197,7 +195,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/buildMange/floor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-form-item label="楼层名称：" prop="name">
         <el-input
           v-model.trim="queryParams.name"
@@ -11,39 +11,37 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
     </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="楼层名称" align="center" prop="floorName"  show-overflow-tooltip />
-      <el-table-column label="建筑名称" align="center" prop="buildName"  show-overflow-tooltip />
-      <el-table-column label="备注" align="center" prop="remark"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="creatMan"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="creatTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="楼层名称" align="left" prop="floorName"  show-overflow-tooltip />
+      <el-table-column label="建筑名称" align="left" prop="buildName"  show-overflow-tooltip />
+      <el-table-column label="备注" align="left" prop="remark"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="creatMan"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="creatTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -119,7 +117,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
       },
       // 表单参数
@@ -157,7 +155,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/buildMange/room/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="房间名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="房间名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入房间名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="楼层名称：" prop="floorName">
+      <el-form-item label="楼层名称:" prop="floorName">
         <el-input
           v-model.trim="queryParams.floorName"
           placeholder="请输入楼层名称"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="建筑名称：" prop="buildName">
+      <el-form-item label="建筑名称:" prop="buildName">
         <el-input
           v-model.trim="queryParams.buildName"
           placeholder="请输入建筑名称"
@@ -31,40 +31,38 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
     </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="房间名称" align="center" prop="roomName"  show-overflow-tooltip />
-      <el-table-column label="楼层名称" align="center" prop="floorName"  show-overflow-tooltip />
-      <el-table-column label="建筑名称" align="center" prop="buildName"  show-overflow-tooltip />
-      <el-table-column label="备注" align="center" prop="remark"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="creatMan"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="房间名称" align="left" prop="roomName"  show-overflow-tooltip />
+      <el-table-column label="楼层名称" align="left" prop="floorName"  show-overflow-tooltip />
+      <el-table-column label="建筑名称" align="left" prop="buildName"  show-overflow-tooltip />
+      <el-table-column label="备注" align="left" prop="remark"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="creatMan"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -156,7 +154,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
         floorName:undefined,
         buildName:undefined
@@ -205,7 +203,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/deviceMange/deviceApi/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="厂商名称：" prop="storeName">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="厂商名称:" prop="storeName">
         <el-input
           v-model.trim="queryParams.storeName"
           placeholder="请输入设备名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="传输方式：" prop="transferType">
+      <el-form-item label="传输方式:" prop="transferType">
         <el-select v-model="queryParams.transferType"   size="small" style="width: 160px" placeholder="请选择传输方式" >
           <el-option
             v-for="item in transferTypeList"
@@ -21,66 +21,62 @@
           ></el-option>
         </el-select>
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" key="Math.random()" height="calc(100vh - 28vh)">
-      <el-table-column label="接口名称" align="center" prop="interfaceName"  show-overflow-tooltip />
-      <el-table-column label="接口路径" align="center" prop="interfaceRoute"  show-overflow-tooltip />
-      <el-table-column label="接口参数" align="center" prop="interfaceParameter"  show-overflow-tooltip />
-      <el-table-column label="接口传输方式" align="center" prop="interfaceTransmissionMode"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" key="Math.random()" border style="margin-top:20px">
+      <el-table-column label="接口名称" align="left" prop="interfaceName"  show-overflow-tooltip />
+      <el-table-column label="接口路径" align="left" prop="interfaceRoute"  show-overflow-tooltip />
+      <el-table-column label="接口参数" align="left" prop="interfaceParameter"  show-overflow-tooltip />
+      <el-table-column label="接口传输方式" align="left" prop="interfaceTransmissionMode"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.interfaceTransmissionMode=="1"?"NB-IOT" : scope.row.interfaceTransmissionMode=="2"?"Lord-IOT" : "2G/4G/5G" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="接口说明" align="center" prop="interfaceExplain"  show-overflow-tooltip />
-      <el-table-column label="接口文档" align="center" prop="interfaceFileRoute"  show-overflow-tooltip >
+      <el-table-column label="接口说明" align="left" prop="interfaceExplain"  show-overflow-tooltip />
+      <el-table-column label="接口文档" align="left" prop="interfaceFileRoute"  show-overflow-tooltip >
         <template slot-scope="scope">
           <el-button
-          type="warning"
           plain
-          icon="el-icon-download"
+          class="chengs"
           size="mini"
           :loading="scope.row.loading"
           @click="FileDownload(scope.row)"
         >下载</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="厂家（商家）" align="center" prop="business"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="厂家（商家）" align="left" prop="business"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="addPeople"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -204,7 +200,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         storeName: undefined,
         transferType:undefined,
       },
@@ -293,7 +289,7 @@ export default {
         storeName: undefined,
         transferType:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/deviceMange/deviceList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="设备名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="设备名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入设备名称"
@@ -11,32 +11,29 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item class="right">
         <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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="设备编号" align="center" prop="ownerCode"  show-overflow-tooltip />
-      <el-table-column label="设备名称" align="center" prop="ownerName"  show-overflow-tooltip />
-      <el-table-column label="设备类型" align="center" prop="deviceType"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="设备编号" align="left" prop="ownerCode"  show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" prop="ownerName"  show-overflow-tooltip />
+      <el-table-column label="设备类型" align="left" prop="deviceType"  show-overflow-tooltip >
         <!-- <template slot-scope="scope">
           <span>
             {{scope.row.dwtype=="1"?"火系统" : scope.row.dwtype=="2"?"水系统" : scope.row.dwtype=="3"?"烟感系统" :
@@ -46,11 +43,11 @@
             scope.row.dwtype=="16"?"视频监控" : scope.row.dwtype=="128"?"井盖":""}}</span>
         </template> -->
       </el-table-column>
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="所属建筑" align="center" prop="louyu"  show-overflow-tooltip />
-      <el-table-column label="安装位置" align="center" prop="posistion"  show-overflow-tooltip />
-      <el-table-column label="详细地址" align="center" prop="address"  show-overflow-tooltip />
-      <el-table-column label="设备状态" align="center" prop="deviceStatus"  show-overflow-tooltip >
+      <el-table-column label="所属单位" align="left" prop="companyName"  show-overflow-tooltip />
+      <el-table-column label="所属建筑" align="left" prop="louyu"  show-overflow-tooltip />
+      <el-table-column label="安装位置" align="left" prop="posistion"  show-overflow-tooltip />
+      <el-table-column label="详细地址" align="left" prop="address"  show-overflow-tooltip />
+      <el-table-column label="设备状态" align="left" prop="deviceStatus"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.deviceStatus == '0' ? 'color4' : scope.row.deviceStatus == '300' ? 'color3' : 'color2'">{{scope.row.deviceStatus == '0' ? "正常" : scope.row.deviceStatus == '300' ? "故障" : "离线"}}</span>
         </template>
@@ -58,21 +55,21 @@
 
       <!-- 设备状态(75:离 300:故 0:正) -->
 
-      <!-- <el-table-column label="创建人" align="center" prop="addMan" />
-      <el-table-column label="创建时间" align="center" prop="addTime" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <!-- <el-table-column label="创建人" align="left" prop="addMan" />
+      <el-table-column label="创建时间" align="left" prop="addTime" /> -->
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -242,7 +239,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
       },
       dateRange:[],
@@ -341,7 +338,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20
+        size:10
       }
       this.resetForm("queryForm");
       this.handleQuery();

src/views/business/deviceMange/devicePassageWay/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="通道名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="通道名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入通道名称"
@@ -21,38 +21,35 @@
           ></el-option>
         </el-select>
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="通道名称" align="center" prop="passagewayName"  show-overflow-tooltip />
-      <el-table-column label="设备类型" align="center" prop="dwtype"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" style="margin-top:20px" border>
+      <el-table-column label="通道名称" align="left" prop="passagewayName"  show-overflow-tooltip />
+      <el-table-column label="设备类型" align="left" prop="dwtype"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ scope.row.dwtype=="1" ? "用户传输装置": scope.row.dwtype=="2"?"喷淋水压" : scope.row.dwtype=="3" ? "独立烟感" :
             scope.row.dwtype=="4" ? "消火栓压力":   scope.row.dwtype=="7" ? "电器火灾监控":  scope.row.dwtype=="5" ?
             "消防水箱液位" : scope.row.dwtype=="6" ? "RTU": scope.row.dwtype=="16" ? "消防视频监控": ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="通道类型" align="center" prop="passagewayType"  show-overflow-tooltip >
+      <el-table-column label="通道类型" align="left" prop="passagewayType"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>
             {{scope.row.dwtype=="1" && scope.row.passagewayType=="1" ?"待定义" :
@@ -69,22 +66,22 @@
             }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位名称" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="单位名称" align="left" prop="companyName"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="addPeople"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>

src/views/business/deviceMange/deviceType/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="厂家名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="厂家名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入厂家名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型参数：" prop="typeValue">
+      <el-form-item label="类型参数:" prop="typeValue">
         <el-input
           v-model.trim="queryParams.typeValue"
           placeholder="请输入厂家名称"
@@ -21,41 +21,38 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="类型名称" align="center" prop="typeName"  show-overflow-tooltip />
-      <el-table-column label="类型参数" align="center" prop="typeValue"  show-overflow-tooltip />
-      <el-table-column label="传输方式" align="center" prop="transmissionModel"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <el-table-column label="类型名称" align="left" prop="typeName"  show-overflow-tooltip />
+      <el-table-column label="类型参数" align="left" prop="typeValue"  show-overflow-tooltip />
+      <el-table-column label="传输方式" align="left" prop="transmissionModel"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span >{{scope.row.transmissionModel == 1 ? "NB-IOT" : scope.row.transmissionModel == 2 ? "Lord-IOT" : scope.row.transmissionModel == 3 ? "2G/4G/5G" :""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="厂家名称" align="center" prop="business"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="厂家名称" align="left" prop="business"  show-overflow-tooltip />
+      <el-table-column label="所属单位" align="left" prop="companyName"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="addPeople"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -164,7 +161,7 @@ export default {
       // 查询参数
       queryParams: {
         current: 1,
-        size: 20,
+        size: 10,
         name: undefined,
         typeValue:undefined
       },
@@ -217,7 +214,7 @@ export default {
       this.queryParams = {
         name:undefined,
         current:1,
-        size:20,
+        size:10,
         typeVaule:undefined
       }
       this.resetForm("queryForm");

src/views/business/fireInternet/deviceMonitoring/SSMonitoring/index.vue

@@ -67,8 +67,8 @@
           </el-col>
           <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
-              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-                <el-form-item label="单位名称：" prop="companyCode">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+                <el-form-item label="单位名称:" prop="companyCode">
                   <el-select
                     v-model="queryParams.companyCode"
                     placeholder="请选择单位名称"
@@ -90,7 +90,7 @@
                     <el-option label="已处理" :value="1"/>
                   </el-select>
                 </el-form-item> -->
-                <el-form-item label="时间:" label-width="50px">
+                <el-form-item label="时间:" >
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
                     size="small"
@@ -101,12 +101,13 @@
                     end-placeholder="结束日期"
                   ></el-date-picker>
                 </el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-form-item class="right">
+                  <el-button plain size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary"  size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
+                </el-form-item>
+                <br>
                 <el-button
-                  type="warning"
                   plain
-                  icon="el-icon-download"
                   size="mini"
                   :loading="exportLoading"
                   @click="handleExport"
@@ -114,26 +115,26 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table  :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'createTime', order: 'descending'}">
-              <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-              <!-- <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip >
+            <el-table  :data="adminList"  :default-sort = "{prop: 'createTime', order: 'descending'}" border style="margin-top:20px;">
+              <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+              <!-- <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip >
                   {{companyList[0].dictLabel}}
               </el-table-column> -->
-              <el-table-column label="报告时间" align="center" prop="createTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+              <el-table-column label="报告时间" align="left" prop="createTime" sortable  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="left" prop="deviceName"  show-overflow-tooltip />
+              <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-view"
+                    class="lans"
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-s-promotion"
+                    class="lans"
                     @click="jump(scope.row)"
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>

src/views/business/fireInternet/deviceMonitoring/fireMonitoring/index.vue

@@ -67,8 +67,8 @@
           </el-col>
           <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
-              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-                <el-form-item label="单位名称：" prop="companyCode">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+                <el-form-item label="单位名称:" prop="companyCode">
                   <el-select
                     v-model="queryParams.companyCode"
                     placeholder="请选择单位名称"
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="时间:" label-width="50px">
+                <el-form-item label="时间:" >
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
                     size="small"
@@ -95,39 +95,39 @@
                     end-placeholder="结束日期"
                   ></el-date-picker>
                 </el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-form-item class="right">
+                  <el-button plain size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary"  size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
+                </el-form-item>
+                <br>
                 <el-button
-                  type="warning"
                   plain
-                  icon="el-icon-download"
                   size="mini"
-                  :loading="exportLoading"
                   @click="handleExport"
                   v-hasPermi="['system:admin:export']"
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
-              <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-              <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
-              <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+            <el-table :data="adminList"  :default-sort = "{prop: 'alarmTime', order: 'descending'}" border style="margin-top:20px;">
+              <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+              <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
+              <el-table-column label="报告时间" align="left" prop="alarmTime" sortable  show-overflow-tooltip />
+              <el-table-column label="报告数据" align="left" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="left" prop="deviceName"  show-overflow-tooltip />
+              <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-view"
+                    class="lans"
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
+                    class="lans"
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
                 </template>

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/device/index.vue

@@ -56,8 +56,8 @@
           </el-col>
           <el-col :span="24">
             <div class="card_bottom">
-              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-                <el-form-item label="单位名称：" prop="companyCode">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+                <el-form-item label="单位名称:" prop="companyCode">
                   <el-select
                     v-model="queryParams.companyCode"
                     placeholder="请选择单位名称"
@@ -73,7 +73,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="时间:" label-width="50px">
+                <el-form-item label="时间:">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
                     size="small"
@@ -84,17 +84,18 @@
                     end-placeholder="结束日期"
                   ></el-date-picker>
                 </el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-
+                <el-form-item class="right">
+                  <el-button  plain size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary"  size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
+                </el-form-item>
               </el-form>
             </div>
-            <el-table @row-click="clickData" v-loading="loading3" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'createTime', order: 'descending'}" highlight-current-row>
-              <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-              <el-table-column label="单位名称" align="center" prop="companyName"  show-overflow-tooltip />
-              <el-table-column label="剩余电量" align="center" prop="pointData"  show-overflow-tooltip />
-              <el-table-column label="报告时间" align="center" prop="createTime" sortable  show-overflow-tooltip />
-              <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+            <el-table @row-click="clickData" v-loading="loading3" :data="adminList"  :default-sort = "{prop: 'createTime', order: 'descending'}" highlight-current-row border style="margin-top:20px">
+              <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+              <el-table-column label="单位名称" align="left" prop="companyName"  show-overflow-tooltip />
+              <el-table-column label="剩余电量" align="left" prop="pointData"  show-overflow-tooltip />
+              <el-table-column label="报告时间" align="left" prop="createTime" sortable  show-overflow-tooltip />
+              <!-- <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
@@ -411,7 +412,7 @@ export default {
     .el-table__body-wrapper::-webkit-scrollbar-thumb {
       border-radius: 6px;
       height: 50px;
-      background: rgba(40, 190, 252, .6);//滚动条颜色
+      background: #D7000F;//滚动条颜色
     }
     .el-table__body-wrapper::-webkit-scrollbar-track {
       box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/offLine/index.vue

@@ -67,8 +67,8 @@
           </el-col>
           <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
-              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-                <el-form-item label="单位名称：" prop="companyCode">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+                <el-form-item label="单位名称:" prop="companyCode">
                   <el-select
                     v-model="queryParams.companyCode"
                     placeholder="请选择单位名称"
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="时间:" label-width="50px">
+                <el-form-item label="时间:">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
                     size="small"
@@ -95,12 +95,13 @@
                     end-placeholder="结束日期"
                   ></el-date-picker>
                 </el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-form-item class="right">
+                  <el-button plain size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary"  size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
+                </el-form-item>
+                <br>
                 <el-button
-                  type="warning"
                   plain
-                  icon="el-icon-download"
                   size="mini"
                   :loading="exportLoading"
                   @click="handleExport"
@@ -108,25 +109,25 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table  :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
-              <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-              <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
-              <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="alertValue"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="alarmContent"  show-overflow-tooltip />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+            <el-table  :data="adminList"  :default-sort = "{prop: 'alarmTime', order: 'descending'}" border style="margin-top:20px;">
+              <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+              <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
+              <el-table-column label="报告时间" align="left" prop="alarmTime" sortable  show-overflow-tooltip />
+              <el-table-column label="报告数据" align="left" prop="alertValue"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="left" prop="alarmContent"  show-overflow-tooltip />
+              <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-view"
+                    class="lans"
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-s-promotion"
+                    class="lans"
                     @click="jump(scope.row)"
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
@@ -534,7 +535,7 @@ export default {
     .el-table__body-wrapper::-webkit-scrollbar-thumb {
       border-radius: 6px;
       height: 50px;
-      background: rgba(40, 190, 252, .6);//滚动条颜色
+      background: #D7000F;//滚动条颜色
     }
     .el-table__body-wrapper::-webkit-scrollbar-track {
       box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);

src/views/business/fireInternet/fireAlarm/fireMonitoring/index.vue

@@ -81,9 +81,8 @@
               ref="queryForm"
               :inline="true"
               v-show="showSearch"
-              label-width="90px"
             >
-              <el-form-item label="单位名称：" prop="companyCode">
+              <el-form-item label="单位名称:" prop="companyCode">
                 <el-select
                   v-model="queryParams.companyCode"
                   placeholder="请选择单位名称"
@@ -111,7 +110,7 @@
                   <el-option label="已处理" :value="1" />
                 </el-select>
               </el-form-item> -->
-              <el-form-item label="时间:" label-width="50px">
+              <el-form-item label="时间:">
                 <el-date-picker
                   style="vertical-align: middle; width: 340px"
                   v-model="dateRange"
@@ -123,21 +122,24 @@
                   end-placeholder="结束日期"
                 ></el-date-picker>
               </el-form-item>
+              <el-form-item class="right">
+                <el-button
+                  plain
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="handleQuery"
+                  style="margin-top: 4px"
+                  >搜索</el-button
+                >
+              </el-form-item>
+              <br>
               <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                style="margin-top: 4px"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-              <el-button
-                type="warning"
                 plain
-                icon="el-icon-download"
                 size="mini"
                 :loading="exportLoading"
                 @click="handleExport"
@@ -148,57 +150,58 @@
           </div>
           <el-table
             :data="adminList"
-            height="calc(100vh - 67vh)"
+            border
+            style="margin-top: 20px"
             :default-sort="{ prop: 'alarmTime', order: 'descending' }"
           >
             <el-table-column
               label="工单序号"
-              align="center"
+              align="left"
               prop="id"
               show-overflow-tooltip
             />
             <el-table-column
               label="单位名称"
-              align="center"
+              align="left"
               prop="companyName"
               show-overflow-tooltip
             />
             <el-table-column
               label="报告时间"
-              align="center"
+              align="left"
               prop="alarmTime"
               sortable
               show-overflow-tooltip
             />
             <el-table-column
               label="报告数据"
-              align="center"
+              align="left"
               prop="property"
               show-overflow-tooltip
             />
             <el-table-column
               label="报告内容"
-              align="center"
+              align="left"
               prop="deviceName"
               show-overflow-tooltip
             />
             <el-table-column
               label="操作"
-              align="center"
+              align="left"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
                 <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-view"
+                  class="lans"
                   @click="getOne(scope.row)"
                   >查看详情</el-button
                 >
                 <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-s-promotion"
+                  class="lans"
                   @click="jump(scope.row)"
                   v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button
@@ -221,52 +224,52 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="工单序号：" prop="id">
-                <span>{{form.id}}</span>
+                <span>{{ form.id }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="单位名称：" prop="companyName">
-                <span>{{form.companyName}}</span>
+                <span>{{ form.companyName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告时间：" prop="alarmTime">
-                <span>{{form.alarmTime}}</span>
+                <span>{{ form.alarmTime }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property || "--"}}</span>
+                <span>{{ form.property || "--" }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName || "--"}}</span>
+                <span>{{ form.deviceName || "--" }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理状态：" prop="alarmStatus">
-                <span>{{form.alarmStatus}}</span>
+                <span>{{ form.alarmStatus }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy || "--"}}</span>
+                <span>{{ form.updateBy || "--" }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime || "--"}}</span>
+                <span>{{ form.updateTime || "--" }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent || "--"}}</span>
+                <span>{{ form.checkContent || "--" }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="误报：" prop="isAlarm">
-                <span>{{form.isAlarm}}</span>
+                <span>{{ form.isAlarm }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -313,8 +316,8 @@ export default {
   },
   data() {
     return {
-      bt:false,
-      zxt:false,
+      bt: false,
+      zxt: false,
       img: require("@/assets/images/1.gif"),
       title: "火警监控告警处理情况",
       index1Data: {}, //饼图
@@ -339,7 +342,7 @@ export default {
         size: 10,
         companyCode: undefined,
         status: undefined,
-        type:2,
+        type: 2,
       },
       queryParams2: {
         type: 2,
@@ -373,12 +376,12 @@ export default {
       /* 饼图 */
       collectTbAlarm(this.queryParams).then((response) => {
         this.index1Data = response.data;
-        this.bt = true
+        this.bt = true;
         this.loading1 = false;
       });
       /* 折线图 */
       getTbAlarmCollectIcoDetail(this.queryParams2).then((response) => {
-        console.log(response)
+        console.log(response);
         let data = response.data;
         let lineData = [];
         let total = [];
@@ -400,7 +403,7 @@ export default {
             name: "火警监控告警处理情况跟踪",
             color: "#FF2416",
           });
-          this.zxt = true
+          this.zxt = true;
           this.loading2 = false;
         }
       });
@@ -474,17 +477,22 @@ export default {
     getOne(row) {
       this.title = "详情信息";
       this.form = JSON.parse(JSON.stringify(row));
-      getWorkOrder({"id":row.workId,size:1,current:1}).then(res=>{
-        if(res.data.records.length>0){
-          let data = res.data.records[0]
-          this.form.checkContent = data.clnr
-          this.form.updateBy = data.czPeople
-          this.form.updateTime = data.czTime
-          this.form.isAlarm = data.clzt == '1' ? '否' : '是'
-          this.form.alarmStatus = data.clzt == '0' ? "未处理" : data.clzt == '1' ? "已处理:通过" : "已处理:未通过"
+      getWorkOrder({ id: row.workId, size: 1, current: 1 }).then((res) => {
+        if (res.data.records.length > 0) {
+          let data = res.data.records[0];
+          this.form.checkContent = data.clnr;
+          this.form.updateBy = data.czPeople;
+          this.form.updateTime = data.czTime;
+          this.form.isAlarm = data.clzt == "1" ? "否" : "是";
+          this.form.alarmStatus =
+            data.clzt == "0"
+              ? "未处理"
+              : data.clzt == "1"
+              ? "已处理:通过"
+              : "已处理:未通过";
         }
         this.open = true;
-      })
+      });
       this.open = true;
     },
     // 取消按钮
@@ -495,7 +503,7 @@ export default {
 };
 </script>
 
-<style  lang="scss">
+<style lang="scss">
 ::-webkit-scrollbar-track {
   background: #fff;
   border-radius: 0;

src/views/business/fireInternet/fireAlarm/waterAlarm/index.vue

@@ -67,8 +67,8 @@
           </el-col>
           <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
-              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-                <el-form-item label="单位名称：" prop="companyCode">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+                <el-form-item label="单位名称:" prop="companyCode">
                   <el-select
                     v-model="queryParams.companyCode"
                     placeholder="请选择单位名称"
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="时间:" label-width="50px">
+                <el-form-item label="时间:">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
                     size="small"
@@ -95,12 +95,13 @@
                     end-placeholder="结束日期"
                   ></el-date-picker>
                 </el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-form-item class="right">
+                  <el-button plain size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary"  size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
+                </el-form-item>
+                <br>
                 <el-button
-                  type="warning"
                   plain
-                  icon="el-icon-download"
                   size="mini"
                   :loading="exportLoading"
                   @click="handleExport"
@@ -108,25 +109,25 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
-              <el-table-column label="工单序号" align="center" prop="id"  show-overflow-tooltip />
-              <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
-              <el-table-column label="报告时间" align="center" prop="alarmTime" sortable show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+            <el-table :data="adminList" :default-sort = "{prop: 'alarmTime', order: 'descending'}" border style="margin-top:20px">
+              <el-table-column label="工单序号" align="left" prop="id"  show-overflow-tooltip />
+              <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
+              <el-table-column label="报告时间" align="left" prop="alarmTime" sortable show-overflow-tooltip />
+              <el-table-column label="报告数据" align="left" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="left" prop="deviceName"  show-overflow-tooltip />
+              <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-view"
+                    class="lans"
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-s-promotion"
+                    class="lans"
                     @click="jump(scope.row)"
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>

src/views/business/fireInternet/hiddenDanger/index.vue

@@ -67,7 +67,7 @@
           </el-col>
           <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
-              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
                 <el-form-item label="单位名称：" prop="companyCode">
                   <el-select
                     v-model="queryParams.companyCode"
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="时间:" label-width="50px">
+                <el-form-item label="时间:">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
                     size="small"
@@ -95,12 +95,13 @@
                     end-placeholder="结束日期"
                   ></el-date-picker>
                 </el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-form-item class="right">
+                  <el-button plain size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary"  size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
+                </el-form-item>
+                <br>
                 <el-button
-                  type="warning"
                   plain
-                  icon="el-icon-download"
                   size="mini"
                   :loading="exportLoading"
                   @click="handleExport"
@@ -108,25 +109,25 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
-              <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-              <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
-              <el-table-column label="报告时间" align="center" prop="alarmTime" sortable show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+            <el-table :data="adminList"  :default-sort = "{prop: 'alarmTime', order: 'descending'}" border style="margin-top:20px">
+              <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
+              <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
+              <el-table-column label="报告时间" align="left" prop="alarmTime" sortable show-overflow-tooltip />
+              <el-table-column label="报告数据" align="left" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="left" prop="deviceName"  show-overflow-tooltip />
+              <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-view"
+                    class="lans"
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
                   <el-button
                     size="mini"
                     type="text"
-                    icon="el-icon-s-promotion"
+                    class="lans"
                     @click="jump(scope.row)"
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
@@ -531,7 +532,7 @@ export default {
     .el-table__body-wrapper::-webkit-scrollbar-thumb {
       border-radius: 6px;
       height: 50px;
-      background: rgba(40, 190, 252, .6);//滚动条颜色
+      background: #D7000F;//滚动条颜色
     }
     .el-table__body-wrapper::-webkit-scrollbar-track {
       box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);

src/views/business/propertyMange/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="资产名称：" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="资产名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入资产名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="存放地点：" prop="address">
+      <el-form-item label="存放地点:" prop="address">
         <el-input
           v-model.trim="queryParams.address"
           placeholder="请输入存放地点"
@@ -21,32 +21,29 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['system:admin:export']"
+      >导出</el-button>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-    <el-table-column label="资产编号" align="center" prop="facilityNo"  show-overflow-tooltip />
-    <el-table-column label="资产名称" align="center" prop="facilityName"  show-overflow-tooltip />
-    <el-table-column label="资产类型" align="center" prop="facilityType"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+    <el-table-column label="资产编号" align="left" prop="facilityNo"  show-overflow-tooltip />
+    <el-table-column label="资产名称" align="left" prop="facilityName"  show-overflow-tooltip />
+    <el-table-column label="资产类型" align="left" prop="facilityType"  show-overflow-tooltip >
       <template slot-scope="scope">
         <span>{{ scope.row.facilityType == 1 ? '办公用品': scope.row.facilityType == 2 ? '办公设备' :
           scope.row.facilityType == 3 ? '计算机及外围设备': scope.row.facilityType == 4 ? '数码及影音设备' :
@@ -54,13 +51,13 @@
           scope.row.facilityType == 7 ? '其它': "" }}</span>
       </template>
     </el-table-column>
-    <el-table-column label="负责人" align="center" prop="man"  show-overflow-tooltip />
-    <el-table-column label="购入方式" align="center" prop="purchase"  show-overflow-tooltip />
-    <el-table-column label="存放地点" align="center" prop="addrs"  show-overflow-tooltip />
-    <el-table-column label="购入日期" align="center" prop="buyTime"  show-overflow-tooltip />
-    <el-table-column label="采购编号" align="center" prop="buyNo"  show-overflow-tooltip />
-    <el-table-column label="发票号" align="center" prop="invoice"  show-overflow-tooltip />
-    <el-table-column label="资产二维码" align="center" prop="qrurl" show-overflow-tooltip >
+    <el-table-column label="负责人" align="left" prop="man"  show-overflow-tooltip />
+    <el-table-column label="购入方式" align="left" prop="purchase"  show-overflow-tooltip />
+    <el-table-column label="存放地点" align="left" prop="addrs"  show-overflow-tooltip />
+    <el-table-column label="购入日期" align="left" prop="buyTime"  show-overflow-tooltip />
+    <el-table-column label="采购编号" align="left" prop="buyNo"  show-overflow-tooltip />
+    <el-table-column label="发票号" align="left" prop="invoice"  show-overflow-tooltip />
+    <el-table-column label="资产二维码" align="left" prop="qrurl" show-overflow-tooltip >
       <template slot-scope="scope">
           <el-image
             v-if="scope.row.qrurl"
@@ -70,20 +67,20 @@
           </el-image>
   　　</template>
     </el-table-column>
-    <el-table-column label="创建时间" align="center" prop="creatTime"  show-overflow-tooltip />
-    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+    <el-table-column label="创建时间" align="left" prop="creatTime"  show-overflow-tooltip />
+    <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>

src/views/components/index/index4.vue

@@ -13,7 +13,7 @@
       v-for="item in headerData"
       :key="item.prop"
       :prop="item.prop"
-      align="center"
+      align="left"
       :label="item.name"
     ></el-table-column>
   </el-table>

src/views/index.vue

@@ -23,9 +23,9 @@
           <el-col :span="12">
             <div class="card_center">
               <el-card class="box-card card_center1" style="padding:0 !important">
-                  <div class="map" style="height:45vh">
+                  <!-- <div class="map" style="height:45vh">
                     <iframe style="width:100%;height:100%;border:none;" src='https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'></iframe>
-                  </div>
+                  </div> -->
               </el-card>
               <el-card class="box-card card_center2 mg10">
                 <div class="title">
@@ -33,11 +33,11 @@
                 </div>
                 <div class="contain">
                   <el-table :data="index4Data"  style="margin-top:10px" height="calc(100vh - 54vh - 100px)">
-                    <el-table-column label="告警时间" align="center" prop="alarmTime"  show-overflow-tooltip />
-                    <el-table-column label="告警内容" align="center" prop="property"  show-overflow-tooltip />
-                    <el-table-column label="设备名称" align="center" prop="deviceName"  show-overflow-tooltip />
-                    <el-table-column label="设备编号" align="center" prop="deviceId"  show-overflow-tooltip />
-                    <el-table-column label="设备类型" align="center" prop="deviceTypeName"  show-overflow-tooltip />
+                    <el-table-column label="告警时间" align="left" prop="alarmTime"  show-overflow-tooltip />
+                    <el-table-column label="告警内容" align="left" prop="property"  show-overflow-tooltip />
+                    <el-table-column label="设备名称" align="left" prop="deviceName"  show-overflow-tooltip />
+                    <el-table-column label="设备编号" align="left" prop="deviceId"  show-overflow-tooltip />
+                    <el-table-column label="设备类型" align="left" prop="deviceTypeName"  show-overflow-tooltip />
                   </el-table>
                 </div>
               </el-card>
@@ -94,14 +94,14 @@
                   <div>
                     <div>
                       <el-table :data="index6Data" height="calc(100vh - 61.8vh - 100px)">
-                        <el-table-column label="序号" align="center" prop="id" />
-                        <el-table-column label="告警值" align="center" prop="property" show-overflow-tooltip />
-                        <el-table-column label="当前状态" align="center" prop="alarmStatus" >
+                        <el-table-column label="序号" align="left" prop="id" />
+                        <el-table-column label="告警值" align="left" prop="property" show-overflow-tooltip />
+                        <el-table-column label="当前状态" align="left" prop="alarmStatus" >
                           <template slot-scope="scope">
                             <span :class="scope.row.alarmStatus == 1 ? 'processed' : 'unprocess'">{{ scope.row.alarmStatus == 1 ? '已处理': '未处理' }}</span>
                           </template>
                         </el-table-column>
-                        <el-table-column label="处理时间" align="center" prop="updateTime" show-overflow-tooltip />
+                        <el-table-column label="处理时间" align="left" prop="updateTime" show-overflow-tooltip />
                       </el-table>
                     </div>
                   </div>

src/views/login.vue

@@ -20,10 +20,28 @@
           placeholder="密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-          <svg-icon slot="prefix" icon-class="eye"  class="el-input__icon input-icon"  style="position:absolute;right:-340px"  @click="eyeTab" v-show="passwordtxt =='password'" />
-          <svg-icon slot="prefix" icon-class="eye-open"  class="el-input__icon input-icon"  style="position:absolute;right:-340px"  @click="eyeTab" v-show="passwordtxt =='text'" />
+          <template #prefix>
+            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          </template>
         </el-input>
+         <div class="eyeWrap">
+          <svg-icon
+            slot="prefix"
+            icon-class="eye"
+            class="el-input__icon input-icon eye"
+            style="file: currentColor"
+            @click="eyeTab"
+            v-show="passwordtxt == 'password'"
+          />
+          <svg-icon
+            slot="prefix"
+            icon-class="eye-open"
+            class="el-input__icon input-icon eye"
+            style="file: currentColor"
+            @click="eyeTab"
+            v-show="passwordtxt == 'text'"
+          />
+        </div>
 
       </el-form-item>
       <el-form-item prop="code" v-if="captchaOnOff">
@@ -31,7 +49,7 @@
           v-model="loginForm.code"
           auto-complete="off"
           placeholder="验证码"
-          style="width: 63%"
+          style="width: 61%"
           @keyup.enter.native="handleLogin"
         >
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
@@ -39,6 +57,9 @@
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
+        <div class="shuaxin" :class="xuan ? 'xuanz' :''" @click="getCode">
+          <svg-icon slot="prefix" icon-class="刷新"  />
+        </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;"  @change="memory">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
@@ -111,7 +132,8 @@ export default {
       captchaOnOff: false,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      xuan:false,
     };
   },
   watch: {
@@ -146,6 +168,7 @@ export default {
 
     },
     getCode() {
+      this.xuan = true
       getCodeImg().then(res => {
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
         if (this.captchaOnOff) {
@@ -156,6 +179,7 @@ export default {
             this.ERPloading = false
           },)
         }
+        this.xuan = false
       });
     },
     getCookie() {
@@ -252,17 +276,17 @@ export default {
   text-align: left;
   color: #000000;
   font-size: 20px;
+  font-weight: 700;
   span{
     margin-left:10px;
     opacity: 0.25;
   }
 }
-
 .login-form {
   border-radius: 6px;
   background: #ffffff;
   width: 456px;
-  padding: 63px 35px;
+  padding: 48px;
   .el-input {
     height: 40px;
     font-size: 16px !important;
@@ -282,15 +306,37 @@ export default {
   color: #bfbfbf;
 }
 .login-code {
-  width: 33%;
+  width: 30%;
   height: 36px;
-  float: right;
+  display: inline-block;
+  margin: 10px 0 0 10px !important;
   img {
-    cursor: pointer;
     vertical-align: middle;
-    width:100%;
     height: 36px;
-    margin-top:-1px;
+    margin-top: -4px;
+  }
+}
+.shuaxin {
+  font-size: 20px;
+  float: right;
+  margin-top: 10px;
+  cursor: pointer;
+}
+.xuanz {
+  animation: mymove 2s 1;
+  -webkit-animation: mymove 2s 1; /* Safari and Chrome */
+}
+@keyframes mymove {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+@-webkit-keyframes mymove {
+  /* Safari and Chrome */
+
+  100% {
+    transform: rotate(360deg);
   }
 }
 .el-login-footer {
@@ -309,6 +355,15 @@ export default {
   height:36px !important;
   line-height: 36px !important;
 }
+.eyeWrap {
+  position: relative;
+}
+.eye {
+  position: absolute;
+  right: 10px;
+  top: -40px;
+  fill: #ccc;
+}
 </style>
 <style>
 html,

src/views/monitor/jobTaskIndex/index.vue

@@ -39,13 +39,13 @@
 
 
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="任务编号" align="center" prop="jobId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <!-- <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" /> -->
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center">
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="任务编号" align="left" prop="jobId" />
+      <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" /> -->
+      <el-table-column label="调用目标字符串" align="left" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="cron执行表达式" align="left" prop="cronExpression" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="left">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -55,7 +55,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/monitor/jobTaskLog/log.vue

@@ -46,19 +46,19 @@
     </el-form>
 
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <!-- <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" /> -->
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
-      <el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="日志编号" width="80" align="left" prop="jobLogId" />
+      <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="调用目标字符串" align="left" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="日志信息" align="left" prop="jobMessage" :show-overflow-tooltip="true" />
+      <el-table-column label="执行状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="执行时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/monitor/logininfor/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="登录地址：" prop="ipaddr">
+      <el-form-item label="登录地址:" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"
           placeholder="请输入登录地址"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名称：" prop="userName" >
+      <el-form-item label="用户名称:" prop="userName" >
         <el-input
           v-model="queryParams.userName"
           placeholder="请输入用户名称"
@@ -21,7 +21,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="请选择登录状态"
@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="登录时间：" >
+      <el-form-item label="登录时间:" >
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -49,22 +49,22 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </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-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="访问编号" align="center" prop="infoId" show-overflow-tooltip/>
-      <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" show-overflow-tooltip />
-      <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip />
-      <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip />
-      <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat"  show-overflow-tooltip />
-      <el-table-column label="操作信息" align="center" prop="msg"  show-overflow-tooltip />
-      <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']"  show-overflow-tooltip >
+    <el-table ref="tables" v-loading="loading" :data="list" border style="margin-top:20px;" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="访问编号" align="left" prop="infoId" show-overflow-tooltip/>
+      <el-table-column label="用户名称" align="left" prop="userName" show-overflow-tooltip sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="登录地址" align="left" prop="ipaddr" show-overflow-tooltip />
+      <el-table-column label="登录地点" align="left" prop="loginLocation" show-overflow-tooltip />
+      <el-table-column label="浏览器" align="left" prop="browser" show-overflow-tooltip />
+      <el-table-column label="操作系统" align="left" prop="os" show-overflow-tooltip />
+      <el-table-column label="登录状态" align="left" prop="status" :formatter="statusFormat"  show-overflow-tooltip />
+      <el-table-column label="操作信息" align="left" prop="msg"  show-overflow-tooltip />
+      <el-table-column label="登录日期" align="left" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>

src/views/monitor/operlog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="系统模块：" prop="title">
+      <el-form-item label="系统模块:" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入系统模块"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员：" prop="operName" >
+      <el-form-item label="操作人员:" prop="operName" >
         <el-input
           v-model="queryParams.operName"
           placeholder="请输入操作人员"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型：" prop="businessType">
+      <el-form-item label="类型:" prop="businessType">
         <el-select
           v-model="queryParams.businessType"
           placeholder="请选择类型"
@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态：" prop="status" >
+      <el-form-item label="状态:" prop="status" >
         <el-select
           v-model="queryParams.status"
           placeholder="请选择状态"
@@ -53,7 +53,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="操作时间：">
+      <el-form-item label="操作时间:">
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -65,32 +65,32 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </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-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="日志编号" align="center" prop="operId" show-overflow-tooltip />
-      <el-table-column label="系统模块" align="center" prop="title"  show-overflow-tooltip />
-      <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat"  show-overflow-tooltip />
-      <el-table-column label="请求方式" align="center" prop="requestMethod"  show-overflow-tooltip />
-      <el-table-column label="操作人员" align="center" prop="operName" show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column label="操作地址" align="center" prop="operIp" width="130"  show-overflow-tooltip  />
-      <el-table-column label="操作地点" align="center" prop="operLocation"  show-overflow-tooltip  />
-      <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="操作日期" align="center" prop="operTime"  show-overflow-tooltip sortable="custom" :sort-orders="['descending', 'ascending']" >
+    <el-table ref="tables" v-loading="loading" :data="list" border style="margin-top:20px;" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="日志编号" align="left" prop="operId" show-overflow-tooltip />
+      <el-table-column label="系统模块" align="left" prop="title"  show-overflow-tooltip />
+      <el-table-column label="操作类型" align="left" prop="businessType" :formatter="typeFormat"  show-overflow-tooltip />
+      <el-table-column label="请求方式" align="left" prop="requestMethod"  show-overflow-tooltip />
+      <el-table-column label="操作人员" align="left" prop="operName" show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作地址" align="left" prop="operIp" width="130"  show-overflow-tooltip  />
+      <el-table-column label="操作地点" align="left" prop="operLocation"  show-overflow-tooltip  />
+      <el-table-column label="操作状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作日期" align="left" prop="operTime"  show-overflow-tooltip sortable="custom" :sort-orders="['descending', 'ascending']" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
+            class="lans"
             @click="handleView(scope.row,scope.index)"
             v-hasPermi="['monitor:operlog:query']"
           >详细</el-button>

src/views/system/config/index.vue

@@ -107,19 +107,19 @@
     </el-row>
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="参数主键" align="center" prop="configId" />
-      <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键值" align="center" prop="configValue" />
-      <el-table-column label="系统内置" align="center" prop="configType" :formatter="typeFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="参数主键" align="left" prop="configId" />
+      <el-table-column label="参数名称" align="left" prop="configName" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键名" align="left" prop="configKey" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键值" align="left" prop="configValue" />
+      <el-table-column label="系统内置" align="left" prop="configType" :formatter="typeFormat" />
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/dept/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称：" prop="deptName">
+      <el-form-item label="部门名称:" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
           placeholder="请输入部门名称"
@@ -21,54 +21,54 @@
           />
         </el-select>
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:dept:add']"
+      >新增</el-button>
     </el-form>
-
     <el-table
       v-loading="loading"
       :data="deptList"
       row-key="deptId"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      border
+      style="margin-top:20px"
     >
       <el-table-column prop="deptName" label="部门名称" ></el-table-column>
       <!-- <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="200"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column label="创建时间" align="left" prop="createTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="250" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-plus"
+            class="lans"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
           >删除</el-button>

src/views/system/dict/data.vue

@@ -84,28 +84,28 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="dictCode" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="字典编码" align="left" prop="dictCode" />
+      <el-table-column label="字典标签" align="left" prop="dictLabel">
         <template slot-scope="scope">
           <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
           <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="字典键值" align="left" prop="dictValue" />
+      <el-table-column label="字典排序" align="left" prop="dictSort" />
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/dict/index.vue

@@ -113,28 +113,28 @@
     </el-row>
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="字典编号" align="left" prop="dictId" />
+      <el-table-column label="字典名称" align="left" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="字典类型" align="left" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/menu/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="菜单名称：" prop="menuName">
+      <el-form-item label="菜单名称:" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
           placeholder="请输入菜单名称"
@@ -10,7 +10,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="请选择菜单状态" size="small" style="width:160px">
           <el-option
             v-for="dict in statusOptions"
@@ -20,20 +20,18 @@
           />
         </el-select>
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:menu:add']"
+      >新增</el-button>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
@@ -43,9 +41,11 @@
       :data="menuList"
       row-key="menuId"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      border
+      style="margin-top:20px"
     >
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <el-table-column prop="icon" label="图标" align="left" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
@@ -54,30 +54,30 @@
       <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
+      <el-table-column label="创建时间" align="left" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-plus"
+            class="lans"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:menu:remove']"
           >删除</el-button>

src/views/system/notice/index.vue

@@ -72,35 +72,35 @@
     </el-row>
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="序号" align="left" prop="noticeId" width="100" />
       <el-table-column
         label="公告标题"
-        align="center"
+        align="left"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="公告类型"
-        align="center"
+        align="left"
         prop="noticeType"
         :formatter="typeFormat"
         width="100"
       />
       <el-table-column
         label="状态"
-        align="center"
+        align="left"
         prop="status"
         :formatter="statusFormat"
         width="100"
       />
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      <el-table-column label="创建者" align="left" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/post/index.vue

@@ -83,18 +83,18 @@
     </el-row>
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
-      <el-table-column label="岗位编码" align="center" prop="postCode" />
-      <el-table-column label="岗位名称" align="center" prop="postName" />
-      <el-table-column label="岗位排序" align="center" prop="postSort" />
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="岗位编号" align="left" prop="postId" />
+      <el-table-column label="岗位编码" align="left" prop="postCode" />
+      <el-table-column label="岗位名称" align="left" prop="postName" />
+      <el-table-column label="岗位排序" align="left" prop="postSort" />
+      <el-table-column label="状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/product/index.vue

@@ -11,26 +11,24 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:admin:add']"
+      >新增</el-button>
     </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <!-- <el-table-column label="单位编号" align="center" prop="ownerId"/> -->
-      <el-table-column label="单位名称" align="center" prop="name" show-overflow-tooltip/>
-      <!-- <el-table-column label="所属建筑id" align="center" prop="buildingId" />
-      <el-table-column label="单位联系人" align="center" prop="contacts" /> -->
-      <el-table-column label="单位介绍" align="center" prop="remark" show-overflow-tooltip/>
+    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px">
+      <!-- <el-table-column label="单位编号" align="left" prop="ownerId"/> -->
+      <el-table-column label="单位名称" align="left" prop="name" show-overflow-tooltip/>
+      <!-- <el-table-column label="所属建筑id" align="left" prop="buildingId" />
+      <el-table-column label="单位联系人" align="left" prop="contacts" /> -->
+      <el-table-column label="单位介绍" align="left" prop="remark" show-overflow-tooltip/>
       <el-table-column label="公司LOGO">
         <template slot-scope="scope">
           <el-image
@@ -41,21 +39,21 @@
           </el-image>
   　　</template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy" show-overflow-tooltip/>
-      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="创建人" align="left" prop="createBy" show-overflow-tooltip/>
+      <el-table-column label="创建时间" align="left" prop="createTime" show-overflow-tooltip/>
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>

src/views/system/role/authUser.vue

@@ -62,22 +62,22 @@
     </el-row>
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="left" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -210,4 +210,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/role/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="角色名称：" prop="roleName">
+      <el-form-item label="角色名称:" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
           placeholder="请输入角色名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符：" prop="roleKey">
+      <el-form-item label="权限字符:" prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"
           placeholder="请输入权限字符"
@@ -21,7 +21,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="请选择角色状态"
@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间：">
+      <el-form-item label="创建时间:">
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -49,37 +49,32 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:role:add']"
-        >新增</el-button>
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
-        >删除</el-button>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
+      <br>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:role:add']"
+      >新增</el-button>
+      <el-button
+        plain
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:role:remove']"
+      >删除</el-button>
     </el-form>
-
-
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
-      <el-table-column type="selection" width="55" align="center" show-overflow-tooltip />
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" border style="margin-top:20px">
+      <el-table-column type="selection" width="55" align="left" show-overflow-tooltip />
       <el-table-column label="角色编号" prop="roleId"  show-overflow-tooltip />
       <el-table-column label="角色名称" prop="roleName"  show-overflow-tooltip  />
       <el-table-column label="权限字符" prop="roleKey"  show-overflow-tooltip  />
       <el-table-column label="显示顺序" prop="roleSort"  show-overflow-tooltip  />
-      <el-table-column label="状态" align="center"  show-overflow-tooltip >
+      <el-table-column label="状态" align="left"  show-overflow-tooltip >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -89,31 +84,31 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-circle-check"
+            class="lans"
             @click="handleDataScope(scope.row)"
             v-hasPermi="['system:role:edit']"
           >数据权限</el-button>

src/views/system/role/selectUser.vue

@@ -32,12 +32,12 @@
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-        <el-table-column label="状态" align="center" prop="status">
+        <el-table-column label="状态" align="left" prop="status">
           <template slot-scope="scope">
             <dict-tag :options="statusOptions" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <el-table-column label="创建时间" align="left" prop="createTime" width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>

src/views/system/security/index.vue

@@ -4,15 +4,13 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
         >新增</el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="adminList" >
+    <el-table v-loading="loading" :data="adminList" style="margin-top:20px" border>
       <el-table-column label="编号" prop="id"  />
       <el-table-column label="密码长度不少于" prop="pwdLength" >
         <template slot-scope="scope">
@@ -22,23 +20,21 @@
       <el-table-column label="账号锁定次数" prop="lockNumber" />
       <el-table-column label="锁定时间" prop="loseDate" >
         <template slot-scope="scope">
-          <span>{{scope.row.loseDate == 1 ? "1分钟" : scope.row.loseDate == 5 ? "5分钟" 
-            : scope.row.loseDate == 15 ? "15分钟" : scope.row.loseDate == 30 ? "30分钟" : scope.row.loseDate == 120 ? "2小时" 
+          <span>{{scope.row.loseDate == 1 ? "1分钟" : scope.row.loseDate == 5 ? "5分钟"
+            : scope.row.loseDate == 15 ? "15分钟" : scope.row.loseDate == 30 ? "30分钟" : scope.row.loseDate == 120 ? "2小时"
             : scope.row.loseDate == 1440 ? "1天" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="默认账户" align="center" >
+      <el-table-column label="默认账户" align="left" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.isEnable"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
              @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>
       </el-table-column>
-      
-      <!-- <el-table-column label="大小写敏感" align="center" width="100">
+
+      <!-- <el-table-column label="大小写敏感" align="left" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -48,23 +44,23 @@
           ></el-switch>
         </template>y
       </el-table-column> -->
-      <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip/>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip/>
-      <!-- <el-table-column label="修改人" align="center" prop="updateBy"  show-overflow-tooltip/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  show-overflow-tooltip/> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="创建人" align="left" prop="createBy"  show-overflow-tooltip/>
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip/>
+      <!-- <el-table-column label="修改人" align="left" prop="updateBy"  show-overflow-tooltip/>
+      <el-table-column label="修改时间" align="left" prop="updateTime"  show-overflow-tooltip/> -->
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="lans"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
@@ -80,7 +76,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false" >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="12">
@@ -113,8 +109,7 @@
             <el-form-item label="默认账户" prop="isEnable">
               <el-switch
                 v-model="form.isEnable"
-                active-color="#13ce66"
-                inactive-color="#ff4949">
+              >
               </el-switch>
             </el-form-item>
           </el-col>
@@ -206,7 +201,7 @@ export default {
           this.adminList = response.data.records;
           this.total = response.data.total;
           this.loading = false;
-          
+
         }
       );
     },

src/views/system/user/authRole.vue

@@ -18,16 +18,16 @@
 
     <h4 class="form-header h4">角色信息</h4>
     <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
-      <el-table-column label="序号" type="index" align="center">
+      <el-table-column label="序号" type="index" align="left">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-      <el-table-column label="角色编号" align="center" prop="roleId" />
-      <el-table-column label="角色名称" align="center" prop="roleName" />
-      <el-table-column label="权限字符" align="center" prop="roleKey" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="角色编号" align="left" prop="roleId" />
+      <el-table-column label="角色名称" align="left" prop="roleName" />
+      <el-table-column label="权限字符" align="left" prop="roleKey" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/system/user/index.vue

@@ -26,8 +26,8 @@
       </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="userName">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+          <el-form-item label="用户名称:" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="请输入用户名称"
@@ -37,7 +37,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="请输入手机号码"
@@ -47,7 +47,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="用户状态"
@@ -63,7 +63,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间:">
             <el-date-picker
               v-model="dateRange"
               size="small"
@@ -75,36 +75,33 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+          <el-form-item class="right">
+            <el-button plain size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
           </el-form-item>
+          <br>
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:user:add']"
+          >新增</el-button>
+          <el-button
+            plain
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:user:remove']"
+          >删除</el-button>
         </el-form>
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" 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[2].visible"  show-overflow-tooltip  />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.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">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border style="margin-top:20px">
+          <el-table-column type="selection" width="50" align="left" />
+          <el-table-column label="用户编号" align="left" key="userId" prop="userId" v-if="columns[0].visible" show-overflow-tooltip />
+          <el-table-column label="用户名称" align="left" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
+          <el-table-column label="用户昵称" align="left" key="nickName" prop="nickName" v-if="columns[2].visible"  show-overflow-tooltip  />
+          <el-table-column label="部门" align="left" key="deptName" prop="dept.deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
+          <el-table-column label="手机号码" align="left" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  show-overflow-tooltip  />
+          <el-table-column label="状态" align="left" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -114,14 +111,14 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible"  show-overflow-tooltip >
+          <el-table-column label="创建时间" align="left" prop="createTime" v-if="columns[6].visible"  show-overflow-tooltip >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             label="操作"
-            align="center"
+            align="left"
             width="160"
             class-name="small-padding fixed-width"
           >
@@ -129,21 +126,21 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                class="lans"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-delete"
+                class="lans"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-key"
+                class="lans"
                 @click="handleResetPwd(scope.row)"
                 v-hasPermi="['system:user:resetPwd']"
               >重置密码</el-button>
@@ -713,7 +710,7 @@ export default {
   .elTree::-webkit-scrollbar-thumb {
     border-radius: 6px;
     height: 50px;
-    background: rgba(40, 190, 252, .6);
+    background: #D7000F;
   }
   .elTree::-webkit-scrollbar-track {
     box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);