zc

src/assets/styles/commonality.scss

@@ -109,9 +109,33 @@
       text-align: center;
     }
   }
-  td div{
-    font-size:14px;
-    font-weight:500;
+  td{
+    .cell{
+      padding:0 10px 0 12px;
+    }
+    div{
+      font-size:14px;
+      font-weight:500;
+    }
+    //勾选框
+    .el-checkbox{
+      display: block;
+      height:22px;
+      width:14px;
+      margin:auto;
+      overflow: hidden;
+      span{
+        display: block;
+        height: 24px;
+        width: 14px;
+        overflow: hidden;
+        span{
+          height: 14px;
+          width: 14px;
+          margin: 4px auto;
+        }
+      }
+    }
   }
   //默认对齐方向
   .cell{

src/views/serviceCenter/apkManage/applyList/index.vue

@@ -1,3 +1,4 @@
+<!--应用列表-->
 <template>
   <div class="app-container applyList">
     <div class="title-box">
@@ -22,22 +23,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" style="float: right">
-          <el-col :span="1.5" style="margin-right: 10px;">
-            <p class="add-button-one-120"
-               @click="handleClick()"
-               v-hasPermiRouter="['system:appManage:add']"
-            >添加应用</p>
-          </el-col>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="float: right;margin-right:20px;"
+           @click="handleClick()"
+           v-hasPermiRouter="['system:appManage:add']"
+        >添加应用</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+      <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
         <el-table-column label="应用名" align="center" prop="name" show-overflow-tooltip/>
         <el-table-column label="版本号" align="center" prop="version" show-overflow-tooltip width="100"/>
         <el-table-column label="文件尺寸(MB)" align="center" prop="size" show-overflow-tooltip width="120"/>

src/views/serviceCenter/apkManage/applyUpgrades/index.vue

@@ -1,3 +1,4 @@
+<!--应用升级-->
 <template>
   <div class="app-container applyUpgrades">
     <div class="title-box">
@@ -28,21 +29,16 @@
             <el-option label="禁用" :value="false"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" style="float: right">
-          <el-col :span="1.5" style="margin-right: 10px;">
-            <p class="add-button-one-120"
-               @click="handleClick()"
-            ><i class="el-icon-plus"></i>批量升级</p>
-          </el-col>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="float: right;margin-right:20px;"
+           @click="handleClick()"
+        >批量升级</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+      <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
         <el-table-column label="设备号" align="center" prop="deviceNum" show-overflow-tooltip width="180"/>
         <el-table-column label="设备类型" align="center" prop="type" show-overflow-tooltip width="180">
           <template slot-scope="scope">

src/views/serviceCenter/certificationManagement/certificationAccredit/index.vue

@@ -32,22 +32,17 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" prop="title" style="float: right">
-          <el-col :span="1.5" style="margin-right:10px;">
-            <p class="add-button-one-90"
-               @click="dialogOpen"
-               v-hasPermiRouter="['auth:license:add']"
-            >新增</p>
-          </el-col>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="float: right;margin-right:20px;"
+           @click="dialogOpen"
+           v-hasPermiRouter="['auth:license:add']"
+        >新增</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+      <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
         <el-table-column label="平台/企业" align="center" prop="customerName" show-overflow-tooltip/>
         <el-table-column label="appId" align="center" prop="appId" show-overflow-tooltip width="200">
           <template slot-scope="scope">

src/views/serviceCenter/certificationManagement/certificationInfo/index.vue

@@ -32,22 +32,17 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" prop="title" style="float: right">
-          <el-col :span="1.5" style="margin-right:10px;">
-            <p class="add-button-one-90"
-               @click="dialogOpen"
-               v-hasPermiRouter="['auth:customer:add']"
-            >新增</p>
-          </el-col>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="float: right;margin-right:20px;"
+           @click="dialogOpen"
+           v-hasPermiRouter="['auth:customer:add']"
+        >新增</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+      <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
         <el-table-column label="平台/企业" align="center" prop="customerName" show-overflow-tooltip/>
         <el-table-column label="昵称" align="center" prop="customerNickname" show-overflow-tooltip width="120"/>
         <el-table-column label="联系人" align="center" prop="contact" show-overflow-tooltip width="120"/>

src/views/serviceCenter/logManagement/algorithmLogs/index.vue

@@ -38,14 +38,12 @@
               <el-option label="未通过" :value="false"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-            <p class="reset-button-one" @click="resetQuery">重置</p>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
       </div>
       <div class="content-box">
-        <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+        <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
           <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
           <el-table-column label="识别名称" align="center" prop="checkName" show-overflow-tooltip/>
           <el-table-column label="识别类型" align="center" prop="ipAddr" show-overflow-tooltip width="100">

src/views/serviceCenter/logManagement/algorithmLogs/infoPage.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="algorithmLogsInfoPage">
-    <div class="title-box">
-      <p>详情</p>
-      <p class="reset-button-one" @click="backPage">返回</p>
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">详情</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
     </div>
     <div class="content-box scrollbar-box">
       <div class="left-content-box scrollbar-box">
@@ -129,21 +129,6 @@
     flex-direction: column;
     overflow: hidden;
     font-weight:500;
-    .title-box{
-      display: flex;
-      border-bottom:1px solid #dedede;
-      p:nth-child(1){
-        margin-left:20px;
-        flex:1;
-        line-height:80px;
-        font-size:16px;
-        color:#0045af;
-      }
-      p:nth-child(2){
-        margin:20px;
-        width:80px;
-      }
-    }
     .content-box{
       flex:1;
       display: flex;

src/views/serviceCenter/logManagement/systemLogs/index.vue

@@ -38,14 +38,12 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-            <p class="reset-button-one" @click="resetQuery">重置</p>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
       </div>
       <div class="content-box">
-        <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+        <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
           <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip width="180"/>
           <el-table-column label="操作类型" align="center" prop="businessType" show-overflow-tooltip/>
           <el-table-column label="请求IP" align="center" prop="ipAddr" show-overflow-tooltip width="120"/>

src/views/serviceCenter/logManagement/systemLogs/infoPage.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="systemLogsInfoPage">
-    <div class="title-box">
-      <p>详情</p>
-      <p class="reset-button-one" @click="backPage">返回</p>
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">详情</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
     </div>
     <div class="content-box scrollbar-box">
       <div>

src/views/serviceCenter/merchantManagement/index.vue

@@ -23,21 +23,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-            <p class="reset-button-one" @click="resetQuery">重置</p>
-          </el-form-item>
-          <el-form-item label="" prop="title" style="float: right">
-            <el-col :span="1.5" style="margin-right:10px;">
-              <p class="add-button-one-90"
-                 @click="dialogOpen"
-              ><i class="el-icon-plus"></i>新增</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="float: right;"
+             @click="dialogOpen"
+          >新增</p>
         </el-form>
       </div>
       <div class="content-box">
-        <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+        <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
           <el-table-column label="编号" align="center" prop="fileName" show-overflow-tooltip width="80"/>
           <el-table-column label="名称" align="center" prop="fileType" show-overflow-tooltip/>
           <el-table-column label="简称" align="center" prop="fileSize" show-overflow-tooltip width="80"/>

src/views/serviceCenter/onlineUser/index.vue

@@ -21,14 +21,12 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+      <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
         <el-table-column label="序号" type="index" align="center" width="50"/>
         <el-table-column label="登录令牌" align="center" prop="token" show-overflow-tooltip/>
         <el-table-column label="用户ID" align="center" prop="userId" show-overflow-tooltip width="180"/>

src/views/serviceCenter/timingTask/index.vue

@@ -33,21 +33,16 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" prop="title" style="float: right">
-          <el-col :span="1.5" style="margin-right:10px;">
-            <p class="add-button-one-90"
-               @click="dialogOpen"
-            ><i class="el-icon-plus"></i>新增</p>
-          </el-col>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="float: right;"
+           @click="dialogOpen"
+        >新增</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="dataList">
+      <el-table class="table-box" v-loading="loading" border :data="dataList">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="日志编号" width="80" align="left" prop="jobLogId" />
         <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />

src/views/systemManagement/dict/data.vue

@@ -20,22 +20,20 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <p class="inquire-button-one" @click="handleQuery">查询</p>
-        <p class="reset-button-one" @click="resetQuery">重置</p>
-      </el-form-item>
-      <el-form-item style="float: right">
-        <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-      </el-form-item>
-      <el-col :span="1.5" style="margin-right:20px;float: right">
-        <p class="add-button-one-90"
-           @click="handleAdd"
-           v-hasPermiRouter="['system:dict:add']"
-        >新增</p>
-      </el-col>
+      <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+      <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+      <p class="page-out-common-style-button"
+         style="float: right;"
+         @click="backPage"
+      >返回</p>
+      <p class="page-add-common-style-button"
+         style="float: right;margin-right:20px;"
+         @click="handleAdd"
+         v-hasPermiRouter="['system:dict:add']"
+      >新增</p>
     </el-form>
 
-    <el-table v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange" class="table-box">
+    <el-table class="table-box" v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column label="字典名称" align="left" prop="label"/>
       <el-table-column label="字典数值" align="left" prop="value" />
       <el-table-column label="显示顺序" align="left" prop="sort" />

src/views/systemManagement/dict/index.vue

@@ -2,7 +2,6 @@
 <template>
   <div class="app-container dict">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" class="form-box" v-if="pageType == 1">
-
       <el-form-item label="关键字" prop="dictName" label-width="68px">
         <el-input
           v-model="queryParams.searchValue"
@@ -30,21 +29,16 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5" >
-          <p class="add-button-one-90"
-             @click="handleAdd"
-             v-hasPermiRouter="['system:dict:add']"
-          >新增字典</p>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <p class="inquire-button-one" @click="handleQuery">查询</p>
-        <p class="reset-button-one" @click="resetQuery">重置</p>
-      </el-form-item>
+      <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+      <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+      <p class="page-add-common-style-button"
+         style="float: right;"
+         @click="handleAdd"
+         v-hasPermiRouter="['system:dict:add']"
+      >新增字典</p>
     </el-form>
 
-    <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange" class="table-box" v-if="pageType == 1">
+    <el-table class="table-box" v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange" v-if="pageType == 1">
       <el-table-column label="字典名称" align="left" prop="dictName"/>
       <el-table-column label="字典类型" align="left" prop="dictCode"/>
       <el-table-column label="状态" align="left" prop="state" v-hasPermiRouter="['system:dict:edit']">

src/views/systemManagement/filePreview/index.vue

@@ -34,14 +34,12 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
       </el-form>
     </div>
     <div class="content-box">
-      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+      <el-table class="table-box" v-loading="loading" border :data="tableList" ref="multipleTable">
         <el-table-column label="文件名" align="center" prop="fileName" show-overflow-tooltip/>
         <el-table-column label="类型" align="center" prop="fileType" show-overflow-tooltip width="130"/>
         <el-table-column label="尺寸（MB）" align="center" prop="fileSize" show-overflow-tooltip width="130"/>

src/views/systemManagement/menu/index.vue

@@ -20,26 +20,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            style="margin-right:20px;"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermiRouter="['system:menu:add']"
-          >新增</el-button>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <p class="inquire-button-one" @click="handleQuery">查询</p>
-        <p class="reset-button-one" @click="resetQuery">重置</p>
-      </el-form-item>
+      <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+      <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+      <p class="page-add-common-style-button"
+         style="float: right;"
+         @click="handleAdd"
+         v-hasPermiRouter="['system:menu:add']"
+      >新增</p>
     </el-form>
 
-    <el-table border
+    <el-table class="table-box" border
       v-loading="loading"
       :data="menuList"
       row-key="menuId"

src/views/systemManagement/notice/index.vue

@@ -1,3 +1,4 @@
+<!--通知公告-->
 <template>
   <div class="app-container notice-page">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
@@ -19,24 +20,15 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermiRouter="['system:notice:add']"
-          >新增</el-button>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <p class="inquire-button-one" @click="handleQuery">查询</p>
-        <p class="reset-button-one" @click="resetQuery">重置</p>
-      </el-form-item>
+      <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+      <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+      <p class="page-add-common-style-button"
+         style="float: right;"
+         @click="handleAdd"
+         v-hasPermiRouter="['system:notice:add']"
+      >新增</p>
     </el-form>
-    <el-table v-loading="loading" border :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table class="table-box" v-loading="loading" border :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column label="公告标题" align="left" prop="title" show-overflow-tooltip/>
       <el-table-column label="公告类型" align="left" prop="noticeType" :formatter="typeFormat" show-overflow-tooltip width="100"/>
       <el-table-column label="状态" align="left" prop="state" :formatter="statusFormat" show-overflow-tooltip width="100"/>

src/views/systemManagement/organizationalStructure/index.vue

@@ -24,14 +24,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-            <p class="reset-button-one" @click="resetQuery">重置</p>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
       </div>
       <div class="content-box">
-        <el-table v-loading="loading" border :data="dataList"
+        <el-table class="table-box" v-loading="loading" border :data="dataList"
                   row-key="deptId"
                   default-expand-all
                   :tree-props="{children: 'child', hasChildren: 'hasChildren'}">>

src/views/systemManagement/parameterSetting/index.vue

@@ -1,3 +1,4 @@
+<!--参数设置-->
 <template>
   <div class="app-container parameterSetting">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
@@ -23,22 +24,13 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermiRouter="['system:conf:add']"
-          >新增</el-button>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <p class="inquire-button-one" @click="handleQuery">查询</p>
-        <p class="reset-button-one" @click="resetQuery">重置</p>
-      </el-form-item>
+      <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+      <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+      <p class="page-add-common-style-button"
+         style="float: right;"
+         @click="handleAdd"
+         v-hasPermiRouter="['system:conf:add']"
+      >新增</p>
     </el-form>
     <el-table v-loading="loading" border :data="dataList">
       <el-table-column label="参数名称" align="left" prop="configName" :show-overflow-tooltip="true" />

src/views/systemManagement/publicConfig/basicsConfig.vue

@@ -50,10 +50,10 @@
         <p style="margin-left:160px;font-size:16px;color:#666;font-weight:500;">尺寸限制为110*500px，支持PNG格式</p>
       </div>
     </el-form>
-    <div class="sub_btn" v-hasPermiRouter="['system:conf:edit']">
-      <p class="null-p"></p>
-      <p class="inquire-button-one"  @click="addOrUpdate">保存</p>
-      <p class="null-p"></p>
+    <div class="page-bottom-button-box" v-hasPermiRouter="['system:conf:edit']">
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-submit-p" @click="addOrUpdate">保存</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
     <!--单张图片预览-->
     <lookSingleImgDialog ref="lookSingleImgDialog"></lookSingleImgDialog>
@@ -216,9 +216,6 @@
         margin:36px 10px 0 0;
       }
     }
-    *{
-      margin:0;
-    }
     .title-box{
       border-bottom:1px solid #dedede;
       p{

src/views/systemManagement/publicConfig/chemicalsConfig.vue

@@ -20,10 +20,10 @@
         </el-form-item>
       </div>
     </el-form>
-    <div class="sub_btn" v-hasPermiRouter="['system:conf:edit']">
-      <p class="null-p"></p>
-      <p class="inquire-button-one"  @click="addOrUpdate">保存</p>
-      <p class="null-p"></p>
+    <div class="page-bottom-button-box" v-hasPermiRouter="['system:conf:edit']">
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-submit-p" @click="addOrUpdate">保存</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
     <!--查看图片-->
     <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
@@ -190,9 +190,6 @@
         margin:36px 10px 0 0;
       }
     }
-    *{
-      margin:0;
-    }
     .title-box{
       border-bottom:1px solid #dedede;
       p{

src/views/systemManagement/publicConfig/exploitConfig.vue

@@ -152,10 +152,10 @@
         <i class="tip"><i class="el-icon-question"></i>用于微信外部扫一扫跳转指引,需与微信小程序后台二维码规则配置一致</i>
       </div>
     </el-form>
-    <div class="sub_btn" v-hasPermiRouter="['system:conf:edit']">
-      <p class="null-p"></p>
-      <p class="inquire-button-one"  @click="addOrUpdate">保存</p>
-      <p class="null-p"></p>
+    <div class="page-bottom-button-box" v-hasPermiRouter="['system:conf:edit']">
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-submit-p" @click="addOrUpdate">保存</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
   </div>
 </template>
@@ -266,9 +266,6 @@
         margin:36px 10px 0 0;
       }
     }
-    *{
-      margin:0;
-    }
     .title-box{
       p{
         margin-left:78px;

src/views/systemManagement/publicConfig/homeConfig.vue

@@ -320,9 +320,9 @@
       </el-form-item>
     </el-form>
     <div class="page-bottom-button-box" v-hasPermiRouter="['system:conf:edit']">
-      <p class="page-bottom-button-null"></p>
-      <p class="page-bottom-button-p" @click="addOrUpdate">保存</p>
-      <p class="page-bottom-button-null"></p>
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-submit-p" @click="addOrUpdate">保存</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
   </div>
 </template>
@@ -609,7 +609,7 @@
     display: flex;
     flex:1;
     flex-direction: column;
-    padding:20px;
+    padding:20px 20px 0 20px;
     overflow: hidden;
     .homeConfig-form{
       display: flex;

src/views/systemManagement/publicConfig/integrationConfig.vue

@@ -48,10 +48,10 @@
         </el-form-item>
       </div>
     </el-form>
-    <div class="sub_btn" v-hasPermiRouter="['system:conf:edit']">
-      <p class="null-p"></p>
-      <p class="inquire-button-one"  @click="addOrUpdate">保存</p>
-      <p class="null-p"></p>
+    <div class="page-bottom-button-box" v-hasPermiRouter="['system:conf:edit']">
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-submit-p" @click="addOrUpdate">保存</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
     <!--单张图片预览-->
     <lookSingleImgDialog ref="lookSingleImgDialog"></lookSingleImgDialog>
@@ -256,9 +256,6 @@ export default {
       margin:36px 10px 0 0;
     }
   }
-  *{
-    margin:0;
-  }
   .title-box{
     border-bottom:1px solid #dedede;
     p{

src/views/systemManagement/publicConfig/programConfig.vue

@@ -39,10 +39,10 @@
         </el-form-item>
       </div>
     </el-form>
-    <div class="sub_btn" v-hasPermiRouter="['system:conf:edit']">
-      <p class="null-p"></p>
-      <p class="inquire-button-one"  @click="addOrUpdate">保存</p>
-      <p class="null-p"></p>
+    <div class="page-bottom-button-box" v-hasPermiRouter="['system:conf:edit']">
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-submit-p" @click="addOrUpdate">保存</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
     <!--单张图片预览-->
     <lookSingleImgDialog ref="lookSingleImgDialog"></lookSingleImgDialog>
@@ -177,9 +177,6 @@ export default {
       margin:36px 10px 0 0;
     }
   }
-  *{
-    margin:0;
-  }
   .title-box{
     border-bottom:1px solid #dedede;
     p{

src/views/systemManagement/roleManagement/addPage.vue

@@ -138,11 +138,11 @@
         </div>
       </el-dialog>
     </div>
-    <div class="bottom-button-box">
-      <p class="null-p"></p>
-      <p class="button-p-1 reset-button-one" @click="outPageButton">返回</p>
-      <p class="inquire-button-one" @click="upDataButton">提交</p>
-      <p class="null-p"></p>
+    <div class="page-bottom-button-box">
+      <p class="page-bottom-button-null-p"></p>
+      <p class="page-bottom-button-cancel-p" @click="outPageButton">返回</p>
+      <p class="page-bottom-button-submit-p" @click="upDataButton">提交</p>
+      <p class="page-bottom-button-null-p"></p>
     </div>
   </div>
 </template>
@@ -453,11 +453,7 @@ export default {
   display: flex;
   flex-direction: column;
   box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-  padding:0 0 20px!important;
   overflow: hidden;
-  *{
-    margin:0;
-  }
   .public-form-box{
     flex:1;
     overflow-y: scroll;

src/views/systemManagement/roleManagement/index.vue

@@ -26,21 +26,16 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item style="float: right;">
-          <el-col :span="1.5">
-            <p class="add-button-one-90"
-               @click="dialogOpen"
-               v-hasPermiRouter="['system:role:add']"
-            >新增</p>
-          </el-col>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="float: right;"
+           @click="dialogOpen"
+           v-hasPermiRouter="['system:role:add']"
+        >新增</p>
       </el-form>
-      <el-table v-loading="loading" border :data="roleList" class="table-box" v-if="pageType==1">
-        <el-table-column label="序号" width="50" align="center"  type="index"/>
+      <el-table class="table-box" v-loading="loading" border :data="roleList" v-if="pageType==1">
+        <el-table-column label="序号" width="80" align="center"  type="index"/>
         <el-table-column label="名称" prop="roleName" align="center" :show-overflow-tooltip="true" width="200"/>
         <el-table-column label="权限字符" prop="roleKey" align="center" :show-overflow-tooltip="true" width="200"/>
         <el-table-column label="数据范围" prop="dataScope" align="center" :show-overflow-tooltip="true" width="296">

src/views/systemManagement/sensorConfiguration/index.vue

@@ -1,462 +0,0 @@
-<template>
-  <div class="app-container sensorConfiguration">
-    <div class="title-box">
-      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-        <el-form-item label="状态" prop="category" label-width="60px">
-          <el-select v-model="queryParams.category" clearable placeholder="请选择分类" style="width: 200px">
-            <el-option
-              v-for="item in optionList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="文件名" prop="fileName">
-          <el-input
-            maxLength="30"
-            v-model="queryParams.fileName"
-            placeholder="文件名"
-            clearable
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" prop="title" style="float: right;margin-right:20px;">
-          <p class="add-button-one-90" @click="tableButton(1)">新增</p>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="content-box">
-      <el-table v-loading="loading" border :data="dataList" ref="multipleTable">
-        <el-table-column label="文件名" align="center" prop="fileName" show-overflow-tooltip/>
-        <el-table-column label="PC端正常图标" align="center" prop="pcNormal" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <img class="icon-img-box" v-if="scope.row.pcNormal" :src="scope.row.pcNormal" @click="lookImgButton(scope.row.pcNormal)">
-            <p v-else>未上传</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="PC端异常图标" align="center" prop="pcAbnormal" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <img class="icon-img-box" v-if="scope.row.pcAbnormal" :src="scope.row.pcAbnormal" @click="lookImgButton(scope.row.pcAbnormal)">
-            <p v-else>未上传</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="疏散正常图标" align="center" prop="evacuationNormal" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <img class="icon-img-box" v-if="scope.row.evacuationNormal" :src="scope.row.evacuationNormal" @click="lookImgButton(scope.row.evacuationNormal)">
-            <p v-else>未上传</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="疏散异常图标" align="center" prop="evacuationAbnormal" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <img class="icon-img-box" v-if="scope.row.evacuationAbnormal" :src="scope.row.evacuationAbnormal" @click="lookImgButton(scope.row.evacuationAbnormal)">
-            <p v-else>未上传</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="小程序正常图标" align="center" prop="smallProgramNormal" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <img class="icon-img-box" v-if="scope.row.smallProgramNormal" :src="scope.row.smallProgramNormal" @click="lookImgButton(scope.row.smallProgramNormal)">
-            <p v-else>未上传</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="小程序异常图标" align="center" prop="smallProgramAbnormal" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <img class="icon-img-box" v-if="scope.row.smallProgramAbnormal" :src="scope.row.smallProgramAbnormal" @click="lookImgButton(scope.row.smallProgramAbnormal)">
-            <p v-else>未上传</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="170">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p" @click="tableButton(2,scope.row)">编辑</p>
-              <p class="table-button-p" @click="tableButton(3,scope.row)">删除</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-                  v-show="total>0"
-                  :total="total"
-                  :page.sync="queryParams.page"
-                  :limit.sync="queryParams.pageSize"
-                  @pagination="getList"/>
-    </div>
-    <!--新增编辑dialog-->
-    <el-dialog class="sensorConfiguration-dialog" :title="dialogTitle"
-               :visible.sync="dialogType" v-if="dialogType" width="600px"
-               append-to-body :close-on-click-modal="false">
-      <el-form ref="dialogForm" :model="dialogForm" :rules="dialogRules" label-width="90px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="dialogForm.name" placeholder="请输入备注" style="width:410px;"/>
-        </el-form-item>
-        <el-form-item label="字符" prop="value">
-          <el-input v-model="dialogForm.value" placeholder="请输入备注" style="width:410px;"/>
-        </el-form-item>
-        <el-form-item label="状态" prop="isStart">
-          <el-radio-group v-model="dialogForm.start" style="margin-top:4px;">
-            <el-radio :label="true" style="margin:0 40px 0 10px;">启用</el-radio>
-            <el-radio :label="false">停用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <div class="up-img-box">
-          <el-form-item label="pc端正常图标：" prop="pcNormal" label-width="160px">
-            <el-upload
-              class="certificate-avatar-uploader"
-              :action="uploadImgUrl"
-              :show-file-list="false"
-              accept="image/jpeg,image/gif,image/png"
-              :on-success="(res)=>handleAvatarSuccess(res,'pcNormal')"
-              :headers="headers"
-              :before-upload="beforeAvatarUpload">
-              <img class="up-img" v-if="dialogForm.pcNormal" :src="dialogForm.pcNormal">
-              <i class="el-icon-plus up-i" v-if="!dialogForm.pcNormal"></i>
-            </el-upload>
-            <i v-if="dialogForm.pcNormal" class="el-icon-view look-i" @click="lookImgButton(dialogForm.pcNormal)"
-               style=""></i>
-          </el-form-item>
-          <el-form-item label="pc端正常图标：" prop="pcAbnormal" label-width="180px">
-            <el-upload
-              class="certificate-avatar-uploader"
-              :action="uploadImgUrl"
-              :show-file-list="false"
-              accept="image/jpeg,image/gif,image/png"
-              :on-success="(res)=>handleAvatarSuccess(res,'pcAbnormal')"
-              :headers="headers"
-              :before-upload="beforeAvatarUpload">
-              <img class="up-img" v-if="dialogForm.pcAbnormal" :src="dialogForm.pcAbnormal">
-              <i class="el-icon-plus up-i" v-if="!dialogForm.pcAbnormal"></i>
-            </el-upload>
-            <i v-if="dialogForm.pcAbnormal" class="el-icon-view look-i" @click="lookImgButton(dialogForm.pcAbnormal)"
-               style=""></i>
-          </el-form-item>
-        </div>
-        <div class="up-img-box">
-          <el-form-item label="疏散正常图标：" prop="evacuationNormal" label-width="160px">
-            <el-upload
-              class="certificate-avatar-uploader"
-              :action="uploadImgUrl"
-              :show-file-list="false"
-              accept="image/jpeg,image/gif,image/png"
-              :on-success="(res)=>handleAvatarSuccess(res,'evacuationNormal')"
-              :headers="headers"
-              :before-upload="beforeAvatarUpload">
-              <img class="up-img" v-if="dialogForm.evacuationNormal" :src="dialogForm.evacuationNormal">
-              <i class="el-icon-plus up-i" v-if="!dialogForm.evacuationNormal"></i>
-            </el-upload>
-            <i v-if="dialogForm.evacuationNormal" class="el-icon-view look-i" @click="lookImgButton(dialogForm.evacuationNormal)"
-               style=""></i>
-          </el-form-item>
-          <el-form-item label="疏散正常图标：" prop="evacuationAbnormal" label-width="180px">
-            <el-upload
-              class="certificate-avatar-uploader"
-              :action="uploadImgUrl"
-              :show-file-list="false"
-              accept="image/jpeg,image/gif,image/png"
-              :on-success="(res)=>handleAvatarSuccess(res,'evacuationAbnormal')"
-              :headers="headers"
-              :before-upload="beforeAvatarUpload">
-              <img class="up-img" v-if="dialogForm.evacuationAbnormal" :src="dialogForm.evacuationAbnormal">
-              <i class="el-icon-plus up-i" v-if="!dialogForm.evacuationAbnormal"></i>
-            </el-upload>
-            <i v-if="dialogForm.evacuationAbnormal" class="el-icon-view look-i" @click="lookImgButton(dialogForm.evacuationAbnormal)"
-               style=""></i>
-          </el-form-item>
-        </div>
-        <div class="up-img-box">
-          <el-form-item label="小程序正常图标：" prop="smallProgramNormal" label-width="160px">
-            <el-upload
-              class="certificate-avatar-uploader"
-              :action="uploadImgUrl"
-              :show-file-list="false"
-              accept="image/jpeg,image/gif,image/png"
-              :on-success="(res)=>handleAvatarSuccess(res,'smallProgramNormal')"
-              :headers="headers"
-              :before-upload="beforeAvatarUpload">
-              <img class="up-img" v-if="dialogForm.smallProgramNormal" :src="dialogForm.smallProgramNormal">
-              <i class="el-icon-plus up-i" v-if="!dialogForm.smallProgramNormal"></i>
-            </el-upload>
-            <i v-if="dialogForm.smallProgramNormal" class="el-icon-view look-i" @click="lookImgButton(dialogForm.smallProgramNormal)"
-               style=""></i>
-          </el-form-item>
-          <el-form-item label="小程序正常图标：" prop="smallProgramAbnormal" label-width="180px">
-            <el-upload
-              class="certificate-avatar-uploader"
-              :action="uploadImgUrl"
-              :show-file-list="false"
-              accept="image/jpeg,image/gif,image/png"
-              :on-success="(res)=>handleAvatarSuccess(res,'smallProgramAbnormal')"
-              :headers="headers"
-              :before-upload="beforeAvatarUpload">
-              <img class="up-img" v-if="dialogForm.smallProgramAbnormal" :src="dialogForm.smallProgramAbnormal">
-              <i class="el-icon-plus up-i" v-if="!dialogForm.smallProgramAbnormal"></i>
-            </el-upload>
-            <i v-if="dialogForm.smallProgramAbnormal" class="el-icon-view look-i" @click="lookImgButton(dialogForm.smallProgramAbnormal)"
-               style=""></i>
-          </el-form-item>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer dialog-footer-box">
-        <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-info" @click="dialogCancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
-        <p class="dialog-footer-button-null"></p>
-      </div>
-    </el-dialog>
-    <!--单张图片预览-->
-    <lookSingleImgDialog ref="lookSingleImgDialog"></lookSingleImgDialog>
-  </div>
-</template>
-
-<script>
-  import { getToken } from "@/utils/auth";
-  import lookSingleImgDialog from '@/components/lookSingleImgDialog/lookSingleImgDialog.vue'
-  export default {
-    name: 'index',
-    components: {
-      lookSingleImgDialog,
-    },
-    data(){
-      return{
-        uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
-        headers: {
-          Authorization:getToken(),
-        },
-        loading:false,
-        optionList:[{label:'启用',value:true},{label:'停用',value:false}],
-        queryParams:{
-          page:1,
-          pageSize:20,
-          category:"",
-          fileName:"",
-        },
-        dataList:[],
-        total:0,
-        //dialog
-        dialogTitle:"",
-        dialogType:false,
-        dialogForm:{},
-        dialogRules:{
-          demo: [
-            { required: true, message: "学校名称不能为空", trigger: "blur" },
-            { required: true, message: "学校名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          pcNormal: [
-            { required: true, message: "请上传图标", trigger: "blur" },
-          ],
-          pcAbnormal: [
-            { required: true, message: "请上传图标", trigger: "blur" },
-          ],
-          evacuationNormal: [
-            { required: true, message: "请上传图标", trigger: "blur" },
-          ],
-          evacuationAbnormal: [
-            { required: true, message: "请上传图标", trigger: "blur" },
-          ],
-          smallProgramNormal: [
-            { required: true, message: "请上传图标", trigger: "blur" },
-          ],
-          smallProgramAbnormal: [
-            { required: true, message: "请上传图标", trigger: "blur" },
-          ],
-        }
-      }
-    },
-    created(){
-
-    },
-    mounted(){
-
-    },
-    methods:{
-      //查询
-      handleQuery(){
-        this.$set(this.queryParams,'page',1);
-        this.getList();
-      },
-      //重置
-      resetQuery(){
-        this.$set(this,'dateRange',[])
-        this.$set(this,'queryParams',{
-          page:1,
-          pageSize:20,
-          category:"",
-          fileName:"",
-        });
-        this.getList();
-      },
-      //获取数据列表
-      getList(){
-        this.$set(this,'loading',true);
-        let obj = JSON.parse(JSON.stringify(this.queryParams))
-        if(this.dateRange[0]){
-          obj.startTime = this.dateRange[0]+'T00:00:00'
-          obj.endTime = this.dateRange[1]+'T23:59:59'
-        }else{
-          obj.startTime = "";
-          obj.endTime = "";
-        }
-        getFileList(obj).then(response => {
-          this.$set(this,'loading',false);
-          this.$set(this,'tableList',response.data.records);
-          this.$set(this,'total',response.data.total);
-        });
-      },
-      lookImgButton(url){
-        if(url){
-          this.$refs.lookSingleImgDialog.lookImgDialogOpen(1,url,'预览');
-        }
-      },
-      //table操作按钮
-      tableButton(type,row){
-        let self = this;
-        if(type == 1){
-          //新增
-          this.resetForm();
-          this.$set(this,'dialogTitle','新增');
-          this.$set(this,'dialogType',true);
-        }else if(type == 2){
-          //编辑
-          this.resetForm();
-          this.$set(this,'dialogTitle','编辑');
-          this.$set(this,'dialogType',true);
-          this.$set(this,'dialogForm',row);
-        }else if(type == 3){
-          //删除
-          this.$confirm('是否确认删除?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            // appInfoDelete({id:row.id}).then(response => {
-            //   self.msgSuccess(response.message)
-            //   self.getList();
-            // });
-          }).catch(() => {});
-        }
-      },
-      //重置
-      resetForm() {
-        this.$set(this,'dialogForm',{
-          pcNormal:'121',
-          pcAbnormal:'',
-          evacuationNormal:'',
-          evacuationAbnormal:'',
-          smallProgramNormal:'',
-          smallProgramAbnormal:'',
-        });
-      },
-      //dialog提交
-      dialogSubmit(){
-        this.$refs["dialogForm"].validate(valid => {
-          if (valid) {
-
-          }
-        })
-      },
-      //dialog取消
-      dialogCancel(){
-        this.$set(this,'dialogType',false);
-      },
-      //上传
-      handleAvatarSuccess(res,type) {
-        console.log('res',res)
-        console.log('type',type)
-        if(type == 'pcNormal'){
-          this.$set(this.dialogForm,'pcNormal',res.data.url);
-        }else if(type == 'pcAbnormal'){
-          this.$set(this.dialogForm,'pcAbnormal',res.data.url);
-        }else if(type == 'evacuationNormal'){
-          this.$set(this.dialogForm,'evacuationNormal',res.data.url);
-        }else if(type == 'evacuationAbnormal'){
-          this.$set(this.dialogForm,'evacuationAbnormal',res.data.url);
-        }else if(type == 'smallProgramNormal'){
-          this.$set(this.dialogForm,'smallProgramNormal',res.data.url);
-        }else if(type == 'smallProgramAbnormal'){
-          this.$set(this.dialogForm,'smallProgramAbnormal',res.data.url);
-        }
-        this.$forceUpdate()
-      },
-      beforeAvatarUpload(file) {
-        let type = false;
-        console.log('file',file);
-        if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif') {
-          type = true;
-        }else{
-          this.$message.error('只能上传png/jpeg/gif格式图片');
-          type = false;
-        }
-        return type;
-      },
-    },
-  }
-</script>
-
-<style scoped lang="scss">
-.sensorConfiguration{
-  .title-box{
-    padding-top:20px;
-    border-bottom:1px solid #dedede;
-    .form-box{
-      flex:1;
-    }
-  }
-  .content-box{
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    padding:20px;
-    overflow: hidden;
-    ::v-deep .el-table .icon-img-box{
-      width:23px;
-      height:23px;
-      display: block;
-      margin:auto;
-      cursor: pointer;
-    }
-  }
-}
-</style>
-<style lang="scss">
-  .sensorConfiguration-dialog{
-    .certificate-avatar-uploader{
-      height:80px;
-      overflow: hidden;
-    }
-    .up-img-box{
-      height:100px;
-      display: flex;
-      overflow: hidden;
-      .up-img{
-        height:80px;
-        width:80px;
-        border:1px solid #e0e0e0;
-        border-radius:4px;
-        overflow: hidden;
-      }
-      .up-i{
-
-      }
-      .look-i{
-        position: absolute;
-        top:0;
-        right:0;
-        z-index:999;
-        border-radius:3px;
-        cursor:pointer;
-        width:20px;
-        height:20px;
-        line-height:20px;
-        text-align: center;
-        background: rgba(0,0,0,0.2);
-        color:#fff;
-      }
-    }
-  }
-</style>

src/views/systemManagement/systemUser/index.vue

@@ -58,22 +58,13 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item style="float: right;">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermiRouter="['system:user:add']"
-              >新增</el-button>
-            </el-col>
-          </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" @click="handleQuery">查询</p>
-            <p class="reset-button-one" @click="resetQuery">重置</p>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="float: right;"
+             @click="handleAdd"
+             v-hasPermiRouter="['system:user:add']"
+          >新增</p>
         </el-form>
         <el-table v-loading="loading" border :data="userList" class="min-list-box">
           <el-table-column label="账号" align="left" key="account" prop="account" show-overflow-tooltip/>