zc

src/views/safetyCheck/checkConfiguration/checkUserPage.vue

@@ -1,52 +1,50 @@
 <template>
-  <div class="checkUserPage">
-    <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="关键字" prop="searchValue" label-width="80px">
-        <el-input
-          maxLength="30"
-          v-model="queryParams.searchValue"
-          placeholder="实验室/房间号/姓名"
-          clearable
-          style="width: 200px"/>
-      </el-form-item>
-      <el-form-item label="学院" prop="deptId" label-width="50px">
-        <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院">
-          <el-option
-            v-for="item in deptSelectList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId">
-          </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 style="float: right;" v-hasPermi="['check:set:query']">
-        <el-col :span="1.5">
-          <p class="inquire-button-one"
-             style="width:100px;"
-             @click="configButton(1)"
-          >检查者配置</p>
-        </el-col>
-      </el-form-item>
-    </el-form>
-    <el-table  border :data="tableList" ref="multipleTable">
-      <el-table-column label="序号" align="center"  type="index" width="60" />
-      <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
-      <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="300"/>
-      <el-table-column label="检查者" align="center" prop="nickNames" show-overflow-tooltip width="500"/>
-      <el-table-column label="操作人" align="center" prop="createName" show-overflow-tooltip width="200"/>
-      <!--<el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>-->
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-    />
+  <div class="page-container checkUserPage">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
+        <el-form-item label="" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="实验室/房间号/姓名"
+            clearable
+            style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="" prop="deptId" label-width="50px">
+          <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院">
+            <el-option
+              v-for="item in deptSelectList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="width:100px;float: right;"
+           @click="configButton(1)"
+        >检查者配置</p>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <el-table class="table-box" border :data="tableList" ref="multipleTable">
+        <el-table-column label="序号" align="center"  type="index" width="60" />
+        <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
+        <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="300"/>
+        <el-table-column label="检查者" align="center" prop="nickNames" show-overflow-tooltip width="500"/>
+        <el-table-column label="操作人" align="center" prop="createName" show-overflow-tooltip width="200"/>
+        <!--<el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>-->
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
     <configDialog v-if="configDialogType" :configDialogData="queryParams"></configDialog>
   </div>
 </template>
@@ -135,10 +133,5 @@
 
 <style scoped lang="scss">
   .checkUserPage{
-    padding:20px;
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
   }
 </style>

src/views/safetyCheck/checkConfiguration/rectificationUserPage.vue

@@ -1,52 +1,50 @@
 <template>
-  <div class="rectificationUserPage">
-    <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="关键字" prop="searchValue" label-width="80px">
-        <el-input
-          maxLength="30"
-          v-model="queryParams.searchValue"
-          placeholder="实验室/房间号/姓名"
-          clearable
-          style="width: 200px"/>
-      </el-form-item>
-      <el-form-item label="学院" prop="deptId" label-width="50px">
-        <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院">
-          <el-option
-            v-for="item in deptSelectList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId">
-          </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 style="float: right;" v-hasPermi="['check:set:query']">
-        <el-col :span="1.5">
-          <p class="inquire-button-one"
-             style="width:100px;"
-             @click="configButton(1)"
-          >整改者配置</p>
-        </el-col>
-      </el-form-item>
-    </el-form>
-    <el-table  border :data="tableList" ref="multipleTable">
-      <el-table-column label="序号" align="center"  type="index" width="60" />
-      <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
-      <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="300"/>
-      <el-table-column label="整改人" align="center" prop="nickNames" show-overflow-tooltip width="500"/>
-      <el-table-column label="操作人" align="center" prop="createName" show-overflow-tooltip width="200"/>
-      <!--<el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>-->
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-    />
+  <div class="page-container rectificationUserPage">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
+        <el-form-item label="" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="实验室/房间号/姓名"
+            clearable
+            style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="" prop="deptId" label-width="50px">
+          <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院">
+            <el-option
+              v-for="item in deptSelectList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="width:100px;float: right;"
+           @click="configButton(1)"
+        >整改者配置</p>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <el-table class="table-box" border :data="tableList" ref="multipleTable">
+        <el-table-column label="序号" align="center"  type="index" width="60" />
+        <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
+        <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="300"/>
+        <el-table-column label="整改人" align="center" prop="nickNames" show-overflow-tooltip width="500"/>
+        <el-table-column label="操作人" align="center" prop="createName" show-overflow-tooltip width="200"/>
+        <!--<el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>-->
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
     <configDialog v-if="configDialogType" :configDialogData="queryParams"></configDialog>
   </div>
 </template>
@@ -134,10 +132,5 @@
 
 <style scoped lang="scss">
   .rectificationUserPage{
-    padding:20px;
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
   }
 </style>

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -1,9 +1,9 @@
 <!--检查项目库-->
 <template>
   <div class="app-container checkItemLibrary">
-    <div class="title-box">
+    <div class="page-form-title-box">
       <el-form class="form-box" :model="queryParams" ref="examineForm" :inline="true" label-width="80px">
-        <el-form-item label="关键字" prop="name">
+        <el-form-item label="" prop="name">
           <el-input
             maxlength="10"
             v-model="queryParams.searchValue"
@@ -12,14 +12,14 @@
             size="small"/>
         </el-form-item>
         <el-form-item>
-          <p class="inquire-button-one" @click="onSearch">查询</p>
-          <p class="reset-button-one" @click="resetForm">重置</p>
+          <p class="page-inquire-common-style-button" @click="onSearch">查询</p>
+          <p class="page-reset-common-style-button" @click="resetForm">重置</p>
         </el-form-item>
         <el-form-item style="float: right;" v-hasPermi="['check:option:add']">
-          <p class="inquire-button-one" style="width:80px;" @click="addDialogOpen(1)">+ 添加</p>
+          <p class="page-save-common-style-button" style="width:80px;" @click="addDialogOpen(1)">添加</p>
         </el-form-item>
         <el-form-item style="float: right;" v-hasPermi="['check:option:remove']">
-          <p class="add-button-two-90" style="width:100px;" @click="allDel">批量删除</p>
+          <p class="page-add-common-style-button" style="width:100px;" @click="allDel">批量删除</p>
         </el-form-item>
         <el-form-item style="float: right;" v-hasPermi="['check:option:export']">
           <export-component :exportConfig="exportConfig"></export-component>
@@ -29,8 +29,9 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="content-box">
+    <div class="page-content-box">
       <el-table border
+                class="table-box"
                 :data="tableData"
                 ref="multipleTable" :row-key="getRowKeys"
                 default-expand-all
@@ -97,18 +98,6 @@
             style="width:548px;">
           </el-input>
         </el-form-item>
-<!--        <el-form-item label="检查要点" prop="mainPoint" v-if="addDialogLevel>1">-->
-<!--          <el-input-->
-<!--            type="textarea"-->
-<!--            :autosize="{ minRows: 8, maxRows: 8}"-->
-<!--            placeholder="请输入检查检查要点："-->
-<!--            v-model="addDialogForm.mainPoint"-->
-<!--            maxlength="300"-->
-<!--            resize="none"-->
-<!--            show-word-limit-->
-<!--            style="width:548px;">-->
-<!--          </el-input>-->
-<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
         <p class="dialog-footer-button-null"></p>
@@ -684,46 +673,7 @@
 
 <style scoped lang="scss">
   .checkItemLibrary{
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    overflow: hidden;
-    .title-box{
-      padding-top:20px;
-      .form-box{
-        border-bottom:1px solid #E0E0E0;
-        .form-dropdown-box{
-          display: flex;
-          margin:0;
-          padding:0 10px;
-          cursor: pointer;
-          height:40px;
-          img:nth-child(1){
-            width:16px;
-            height:16px;
-            margin-top:12px;
-          }
-          p{
-            width:47px;
-            text-align: center;
-            font-size:14px;
-            margin:0;
-            line-height:40px;
-          }
-          img:nth-child(3){
-            width:10px;
-            height:6px;
-            margin-top:17px;
-          }
-        }
-      }
-    }
-    .content-box{
-      flex:1;
-      overflow: hidden;
-      display: flex;
-      flex-direction: column;
-      padding:20px;
+    .page-form-title-box{
     }
   }
 </style>

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -1,86 +1,88 @@
 <!--指标统计列表-->
 <template>
-  <div class="checkIndexStatistics">
-    <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="" prop="deptId" label-width="50px" v-if="!userFlg">
-        <el-select v-model="queryParams.deptId" clearable placeholder="全部">
-          <el-option
-            v-for="item in deptSelectList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="subId" label-width="50px" v-if="userFlg">
-        <el-select placeholder="请输入关键词" filterable remote reserve-keyword
-                   v-model="queryParams.subId" :remote-method="getSubList">
-          <el-option
-            v-for="item in subSelectList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="searchValue" label-width="80px">
-        <el-input
-          maxLength="30"
-          v-model="queryParams.searchValue"
-          placeholder="计划任务"
-          clearable
-          style="width: 200px"/>
-      </el-form-item>
-      <el-form-item label="" prop="dateRange" label-width="70px">
-        <el-date-picker
-          :clearable="false"
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          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 style="float: right;" v-hasPermi="['safety:dataSub:export']">
-        <export-component :exportConfig="exportConfig"></export-component>
+  <div class="page-container checkIndexStatistics">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
+        <el-form-item label="" prop="deptId" label-width="50px" v-if="!userFlg">
+          <el-select v-model="queryParams.deptId" clearable placeholder="全部">
+            <el-option
+              v-for="item in deptSelectList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="subId" label-width="50px" v-if="userFlg">
+          <el-select placeholder="请输入关键词" filterable remote reserve-keyword
+                     v-model="queryParams.subId" :remote-method="getSubList">
+            <el-option
+              v-for="item in subSelectList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="计划任务"
+            clearable
+            style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="" prop="dateRange" label-width="70px">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <el-form-item style="float: right;" v-hasPermi="['safety:dataSub:export']">
+          <export-component :exportConfig="exportConfig"></export-component>
 
-      </el-form-item>
-    </el-form>
-    <div class="num-data-box">
-      共搜索到隐患总数 {{numData.sumTotal}}，一级指标隐患总数 {{numData.level1}}，占比 {{numData.percent1}}，二级指标隐患总数 {{numData.level2}}，占比 {{numData.percent2}}，三级指标隐患总数 {{numData.level3}}，占比 {{numData.percent3}}，四级指标隐患总数 {{numData.level4}}，占比 {{numData.percent4}}
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <div class="num-data-box">
+        共搜索到隐患总数 {{numData.sumTotal}}，一级指标隐患总数 {{numData.level1}}，占比 {{numData.percent1}}，二级指标隐患总数 {{numData.level2}}，占比 {{numData.percent2}}，三级指标隐患总数 {{numData.level3}}，占比 {{numData.percent3}}，四级指标隐患总数 {{numData.level4}}，占比 {{numData.percent4}}
+      </div>
+      <el-table class="table-box" border :data="tableList" ref="multipleTable"
+                 :row-key="getRowKeys"
+                 @select="select" @select-all="selectAll">
+        <el-table-column type="selection" width="50" align="center"/>
+        <el-table-column label="序号" align="center"  type="index" width="60" />
+        <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
+        <el-table-column v-if="!userFlg" label="学院" align="center" prop="collegeName" show-overflow-tooltip width="230"/>
+        <el-table-column v-if="userFlg" label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="230"/>
+        <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>
+        <el-table-column label="一级指标隐患数" align="center" prop="itemsTotal1" show-overflow-tooltip width="130"/>
+        <el-table-column label="一级指标占比" align="center" prop="percent" show-overflow-tooltip width="130"/>
+        <el-table-column label="二级指标隐患数" align="center" prop="itemsTotal2" show-overflow-tooltip width="130"/>
+        <el-table-column label="二级指标占比" align="center" prop="percent2" show-overflow-tooltip width="130"/>
+        <el-table-column label="三级指标隐患数" align="center" prop="itemsTotal3" show-overflow-tooltip width="130"/>
+        <el-table-column label="三级指标占比" align="center" prop="percent3" show-overflow-tooltip width="130"/>
+        <el-table-column label="四级指标隐患数" align="center" prop="itemsTotal4" show-overflow-tooltip width="130"/>
+        <el-table-column label="四级指标占比" align="center" prop="percent4" show-overflow-tooltip width="130"/>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
     </div>
-    <el-table  border :data="tableList" ref="multipleTable"
-               :row-key="getRowKeys"
-               @select="select" @select-all="selectAll">
-      <el-table-column type="selection" width="50" align="center"/>
-      <el-table-column label="序号" align="center"  type="index" width="60" />
-      <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
-      <el-table-column v-if="!userFlg" label="学院" align="center" prop="collegeName" show-overflow-tooltip width="230"/>
-      <el-table-column v-if="userFlg" label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="230"/>
-      <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>
-      <el-table-column label="一级指标隐患数" align="center" prop="itemsTotal1" show-overflow-tooltip width="130"/>
-      <el-table-column label="一级指标占比" align="center" prop="percent" show-overflow-tooltip width="130"/>
-      <el-table-column label="二级指标隐患数" align="center" prop="itemsTotal2" show-overflow-tooltip width="130"/>
-      <el-table-column label="二级指标占比" align="center" prop="percent2" show-overflow-tooltip width="130"/>
-      <el-table-column label="三级指标隐患数" align="center" prop="itemsTotal3" show-overflow-tooltip width="130"/>
-      <el-table-column label="三级指标占比" align="center" prop="percent3" show-overflow-tooltip width="130"/>
-      <el-table-column label="四级指标隐患数" align="center" prop="itemsTotal4" show-overflow-tooltip width="130"/>
-      <el-table-column label="四级指标占比" align="center" prop="percent4" show-overflow-tooltip width="130"/>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-    />
   </div>
 </template>
 
@@ -312,11 +314,6 @@
 
 <style scoped lang="scss">
   .checkIndexStatistics{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    padding:20px;
     .form-box{
       .form-dropdown-box{
         display: flex;

src/views/safetyCheck/dataStatistics/inspectContent.vue

@@ -1,83 +1,85 @@
 <!--检查内容统计列表-->
 <template>
-  <div class="safetyHazardStatistics">
-    <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="" prop="rectifyStatus">
-        <el-select v-model="queryParams.hazardTypeMode" clearable placeholder="全部检查内容">
-          <el-option
-            v-for="item in materialTypeList"
-            :key="item.dictValue"
-            :label="item.dictLabel"
-            :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="deptId" label-width="50px">
-        <el-select v-model="queryParams.deptId" @change="handleNodeClick" clearable placeholder="全部学院">
-          <el-option
-            v-for="item in deptSelectList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="subId" label-width="58px">
-        <el-select v-model="queryParams.subId" placeholder="请选择实验室">
-          <el-option
-            v-for="item in subjectOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="dateRange" label-width="70px">
-        <el-date-picker
-          :clearable="false"
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          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 style="float: right;" v-hasPermi="['safety:dataSub:export']">
-        <export-component :exportConfig="exportConfig"></export-component>
+  <div class="page-container safetyHazardStatistics">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
+        <el-form-item label="" prop="rectifyStatus">
+          <el-select v-model="queryParams.hazardTypeMode" clearable placeholder="全部检查内容">
+            <el-option
+              v-for="item in materialTypeList"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="deptId" label-width="50px">
+          <el-select v-model="queryParams.deptId" @change="handleNodeClick" clearable placeholder="全部学院">
+            <el-option
+              v-for="item in deptSelectList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="subId" label-width="58px">
+          <el-select v-model="queryParams.subId" placeholder="请选择实验室">
+            <el-option
+              v-for="item in subjectOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="dateRange" label-width="70px">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <el-form-item style="float: right;" v-hasPermi="['safety:dataSub:export']">
+          <export-component :exportConfig="exportConfig"></export-component>
 
-      </el-form-item>
-    </el-form>
-    <div class="num-data-box">
-      共搜索到隐患总数 {{numData.numData}}，已整改数 {{numData.sumYzg}}， 未整改数 {{numData.sumWzg}}，整改率 {{numData.rate}}
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <div class="num-data-box">
+        共搜索到隐患总数 {{numData.numData}}，已整改数 {{numData.sumYzg}}， 未整改数 {{numData.sumWzg}}，整改率 {{numData.rate}}
+      </div>
+      <el-table class="table-box" border :data="tableList" ref="multipleTable"
+                 :row-key="getRowKeys"
+                 @select="select" @select-all="selectAll">
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+        <el-table-column label="检查内容" align="center" prop="hazardName" show-overflow-tooltip width="200" fixed/>
+        <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
+        <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
+        <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="100"/>
+        <el-table-column label="隐患占比" align="center" prop="percent" show-overflow-tooltip width="180"/>
+        <el-table-column label="已整改" align="center" prop="sumYzg" show-overflow-tooltip width="180"/>
+        <el-table-column label="未整改" align="center" prop="sumWzg" show-overflow-tooltip width="180"/>
+        <el-table-column label="整改率" align="center" prop="percent2" show-overflow-tooltip width="180"/>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
     </div>
-    <el-table  border :data="tableList" ref="multipleTable"
-               :row-key="getRowKeys"
-               @select="select" @select-all="selectAll">
-      <el-table-column type="selection" width="50" align="center" fixed/>
-      <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
-      <el-table-column label="检查内容" align="center" prop="hazardName" show-overflow-tooltip width="200" fixed/>
-      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
-      <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
-      <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="100"/>
-      <el-table-column label="隐患占比" align="center" prop="percent" show-overflow-tooltip width="180"/>
-      <el-table-column label="已整改" align="center" prop="sumYzg" show-overflow-tooltip width="180"/>
-      <el-table-column label="未整改" align="center" prop="sumWzg" show-overflow-tooltip width="180"/>
-      <el-table-column label="整改率" align="center" prop="percent2" show-overflow-tooltip width="180"/>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-    />
   </div>
 </template>
 
@@ -291,11 +293,6 @@
     overflow-y: auto;
   }
   .safetyHazardStatistics{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    padding:20px;
     .form-box{
       .form-dropdown-box{
         display: flex;

src/views/safetyCheck/dataStatistics/laboratoryStatistics.vue

@@ -1,94 +1,83 @@
 <!--实验室统计列表-->
 <template>
-  <div class="laboratoryStatistics">
-    <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="" prop="deptId" label-width="50px">
-        <el-select v-model="queryParams.deptId" clearable placeholder="全部">
-          <el-option
-            v-for="item in deptSelectList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="typeId">
-        <el-select v-model="queryParams.typeId" clearable placeholder="安全分类" style="width: 120px">
-          <el-option
-            v-for="item in classTypeList"
-            :key="item.id"
-            :label="item.typeName"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="level">
-        <el-select v-model="queryParams.level" clearable placeholder="安全分级" style="width: 120px">
-          <el-option
-            v-for="item in classifiedList"
-            :key="item.id"
-            :label="item.classifiedName"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="searchValue" label-width="80px">
-        <el-input
-          maxLength="30"
-          v-model="queryParams.searchValue"
-          placeholder="实验室/房间号"
-          clearable
-          style="width: 200px"/>
-      </el-form-item>
-      <!--<el-form-item label="" prop="dateRange" label-width="70px">-->
-        <!--<el-date-picker-->
-          <!--:clearable="false"-->
-          <!--v-model="dateRange"-->
-          <!--size="small"-->
-          <!--style="width: 240px"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--type="daterange"-->
-          <!--range-separator="-"-->
-          <!--start-placeholder="开始日期"-->
-          <!--end-placeholder="结束日期"-->
-        <!--&gt;</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 style="float: right;" v-hasPermi="['safety:dataSub:export']">
-        <export-component :exportConfig="exportConfig"></export-component>
-      </el-form-item>
-    </el-form>
-    <div class="num-data-box">
-      搜索到实验室总数 {{numData.sumTotal}}，存在危险源的实验室数 {{numData.hazardSubjectTotal}}，危险源总数 {{numData.hazardTotal}}<span v-for="item in numData.classListVo">，{{item.levelName}} {{item.amount}}</span>
+  <div class="page-container laboratoryStatistics">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
+        <el-form-item label="" prop="deptId" label-width="50px">
+          <el-select v-model="queryParams.deptId" clearable placeholder="全部">
+            <el-option
+              v-for="item in deptSelectList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="typeId">
+          <el-select v-model="queryParams.typeId" clearable placeholder="安全分类" style="width: 120px">
+            <el-option
+              v-for="item in classTypeList"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="level">
+          <el-select v-model="queryParams.level" clearable placeholder="安全分级" style="width: 120px">
+            <el-option
+              v-for="item in classifiedList"
+              :key="item.id"
+              :label="item.classifiedName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="实验室/房间号"
+            clearable
+            style="width: 200px"/>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <el-form-item style="float: right;" v-hasPermi="['safety:dataSub:export']">
+          <export-component :exportConfig="exportConfig"></export-component>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <div class="num-data-box">
+        搜索到实验室总数 {{numData.sumTotal}}，存在危险源的实验室数 {{numData.hazardSubjectTotal}}，危险源总数 {{numData.hazardTotal}}<span v-for="item in numData.classListVo">，{{item.levelName}} {{item.amount}}</span>
+      </div>
+      <el-table class="table-box" border :data="tableList" ref="multipleTable"
+                 tooltip-effect="dark" :row-key="getRowKeys"
+                 @select="select" @select-all="selectAll">
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+        <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
+        <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180" fixed/>
+        <el-table-column label="房间号" align="center" prop="roomNumber" show-overflow-tooltip width="100"/>
+        <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
+        <el-table-column label="安全分类" align="center" prop="typeName" show-overflow-tooltip width="100"/>
+        <el-table-column label="安全分级" align="center" prop="levelName" show-overflow-tooltip width="100"/>
+        <el-table-column label="危险源" align="center" prop="hazardName" show-overflow-tooltip width="260"/>
+        <el-table-column label="实验室安全责任人" align="center" prop="safeUserNameAdminPhone" show-overflow-tooltip width="185"/>
+        <el-table-column label="实验室负责人" align="center" prop="adminNameAndPhone" show-overflow-tooltip width="180"/>
+        <el-table-column label="隐患总数" align="center" prop="dangerNum" show-overflow-tooltip width="100"/>
+        <el-table-column label="整改率" align="center" prop="percent" show-overflow-tooltip width="100"/>
+        <el-table-column label="复核通过率" align="center" prop="percent2" show-overflow-tooltip width="100"/>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
     </div>
-    <el-table  border :data="tableList" ref="multipleTable"
-               tooltip-effect="dark" :row-key="getRowKeys"
-               @select="select" @select-all="selectAll">
-      <el-table-column type="selection" width="50" align="center" fixed/>
-      <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
-      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
-      <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180" fixed/>
-      <el-table-column label="房间号" align="center" prop="roomNumber" show-overflow-tooltip width="100"/>
-      <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
-      <el-table-column label="安全分类" align="center" prop="typeName" show-overflow-tooltip width="100"/>
-      <el-table-column label="安全分级" align="center" prop="levelName" show-overflow-tooltip width="100"/>
-      <el-table-column label="危险源" align="center" prop="hazardName" show-overflow-tooltip width="260"/>
-      <el-table-column label="实验室安全责任人" align="center" prop="safeUserNameAdminPhone" show-overflow-tooltip width="185"/>
-      <el-table-column label="实验室负责人" align="center" prop="adminNameAndPhone" show-overflow-tooltip width="180"/>
-      <el-table-column label="隐患总数" align="center" prop="dangerNum" show-overflow-tooltip width="100"/>
-      <el-table-column label="整改率" align="center" prop="percent" show-overflow-tooltip width="100"/>
-      <el-table-column label="复核通过率" align="center" prop="percent2" show-overflow-tooltip width="100"/>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-    />
   </div>
 </template>
 
@@ -289,11 +278,6 @@
     overflow-y: auto;
   }
   .laboratoryStatistics{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    padding:20px;
     .form-box{
       .form-dropdown-box{
         display: flex;

src/views/safetyCheck/dataStatistics/safetyHazardStatistics.vue

@@ -1,108 +1,110 @@
 <!--安全隐患统计列表-->
 <template>
-  <div class="safetyHazardStatistics">
-    <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="" prop="deptId" label-width="50px">
-        <el-select v-model="queryParams.deptId" clearable placeholder="全部">
-          <el-option
-            v-for="item in deptSelectList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="rectifyStatus">
-        <el-select v-model="queryParams.rectifyStatus" clearable placeholder="全部状态" style="width: 120px">
-          <el-option
-            v-for="item in typeList"
-            :key="item.key"
-            :label="item.label"
-            :value="item.key">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="hdLevel">
-        <el-select v-model="queryParams.hdLevel" clearable placeholder="全部隐患等级" style="width: 140px">
-          <el-option
-            v-for="item in levelList"
-            :key="item.key"
-            :label="item.label"
-            :value="item.key">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="searchValue" label-width="80px">
-        <el-input
-          maxLength="30"
-          v-model="queryParams.searchValue"
-          placeholder="计划任务/实验室/房间号"
-          clearable
-          style="width: 200px"/>
-      </el-form-item>
-      <el-form-item label="" prop="dateRange" label-width="70px">
-        <el-date-picker
-          :clearable="false"
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          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 style="float: right;" v-hasPermi="['safety:dataSub:export']">
-        <export-component :exportConfig="exportConfig"></export-component>
-      </el-form-item>
-    </el-form>
-    <div class="num-data-box">
-      共搜索到隐患总数 {{numData.sumTotal}}，重大隐患数 {{numData.zdHazardTotal}}，一般隐患数 {{numData.ybHazardTotal}}，管理问题数 {{numData.glHazardTotal}} ，待整改总数 {{numData.rectifiedTotal}}，复核总数 {{numData.resultTotal}}，复核通过率 {{numData.rate}}
+  <div class="page-container safetyHazardStatistics">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
+        <el-form-item label="" prop="deptId" label-width="50px">
+          <el-select v-model="queryParams.deptId" clearable placeholder="全部">
+            <el-option
+              v-for="item in deptSelectList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="rectifyStatus">
+          <el-select v-model="queryParams.rectifyStatus" clearable placeholder="全部状态" style="width: 120px">
+            <el-option
+              v-for="item in typeList"
+              :key="item.key"
+              :label="item.label"
+              :value="item.key">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="hdLevel">
+          <el-select v-model="queryParams.hdLevel" clearable placeholder="全部隐患等级" style="width: 140px">
+            <el-option
+              v-for="item in levelList"
+              :key="item.key"
+              :label="item.label"
+              :value="item.key">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="计划任务/实验室/房间号"
+            clearable
+            style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="" prop="dateRange" label-width="70px">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <el-form-item style="float: right;" v-hasPermi="['safety:dataSub:export']">
+          <export-component :exportConfig="exportConfig"></export-component>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <div class="num-data-box">
+        共搜索到隐患总数 {{numData.sumTotal}}，重大隐患数 {{numData.zdHazardTotal}}，一般隐患数 {{numData.ybHazardTotal}}，管理问题数 {{numData.glHazardTotal}} ，待整改总数 {{numData.rectifiedTotal}}，复核总数 {{numData.resultTotal}}，复核通过率 {{numData.rate}}
+      </div>
+      <el-table class="table-box" border :data="tableList" ref="multipleTable"
+                 :row-key="getRowKeys"
+                 @select="select" @select-all="selectAll">
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+        <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip width="200" fixed/>
+        <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
+        <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
+        <el-table-column label="房间号" align="center" prop="subRoom" show-overflow-tooltip width="100"/>
+        <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
+        <el-table-column label="隐患等级" align="center" prop="hazardLevel" show-overflow-tooltip width="100">
+          <template slot-scope="scope">
+            {{scope.row.hazardLevel==1?'重大隐患':(scope.row.hazardLevel==2?'一般隐患':(scope.row.hazardLevel==3?'管理问题':''))}}
+          </template>
+        </el-table-column>
+        <el-table-column label="不符合项" align="center" prop="hazardCheckPoint" show-overflow-tooltip width="260">
+          <template slot-scope="scope">
+            <span>{{scope.row.hazardCheckCode}}</span>
+            <span v-if="scope.row.checkCategory==1">{{scope.row.hazardCheckPoint}}</span>
+            <span v-if="scope.row.checkCategory!=1">{{scope.row.hazardCheckName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="历史出现次数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>
+        <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="180"/>
+        <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="100"/>
+        <el-table-column label="检查时间" align="center" prop="checkTime2" show-overflow-tooltip width="180"/>
+        <el-table-column label="状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="100">
+          <template slot-scope="scope">
+            {{scope.row.rectifyStatus==1?'复核完毕':(scope.row.rectifyStatus==2?'未整改':(scope.row.rectifyStatus==3?'已整改':(scope.row.rectifyStatus==4?'暂无法整改':'')))}}
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
     </div>
-    <el-table  border :data="tableList" ref="multipleTable"
-               :row-key="getRowKeys"
-               @select="select" @select-all="selectAll">
-      <el-table-column type="selection" width="50" align="center" fixed/>
-      <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
-      <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip width="200" fixed/>
-      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
-      <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
-      <el-table-column label="房间号" align="center" prop="subRoom" show-overflow-tooltip width="100"/>
-      <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
-      <el-table-column label="隐患等级" align="center" prop="hazardLevel" show-overflow-tooltip width="100">
-        <template slot-scope="scope">
-          {{scope.row.hazardLevel==1?'重大隐患':(scope.row.hazardLevel==2?'一般隐患':(scope.row.hazardLevel==3?'管理问题':''))}}
-        </template>
-      </el-table-column>
-      <el-table-column label="不符合项" align="center" prop="hazardCheckPoint" show-overflow-tooltip width="260">
-        <template slot-scope="scope">
-          <span>{{scope.row.hazardCheckCode}}</span>
-          <span v-if="scope.row.checkCategory==1">{{scope.row.hazardCheckPoint}}</span>
-          <span v-if="scope.row.checkCategory!=1">{{scope.row.hazardCheckName}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="历史出现次数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>
-      <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="180"/>
-      <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="100"/>
-      <el-table-column label="检查时间" align="center" prop="checkTime2" show-overflow-tooltip width="180"/>
-      <el-table-column label="状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="100">
-        <template slot-scope="scope">
-          {{scope.row.rectifyStatus==1?'复核完毕':(scope.row.rectifyStatus==2?'未整改':(scope.row.rectifyStatus==3?'已整改':(scope.row.rectifyStatus==4?'暂无法整改':'')))}}
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-    />
   </div>
 </template>
 
@@ -289,11 +291,6 @@
     overflow-y: auto;
   }
   .safetyHazardStatistics{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    padding:20px;
     .form-box{
       .form-dropdown-box{
         display: flex;

src/views/safetyCheck/equipmentConfig/index.vue

@@ -1,62 +1,66 @@
 <!--设备检查配置-->
 <template>
   <div class="app-container approval_handle">
-    <div class="approval_handle-page" v-if="pageType == 1">
-      <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true">
-        <el-form-item label="类型:" prop="checkLevel">
-          <el-select  v-model="queryParams.hazardType" placeholder="请选择类型">
-            <el-option
-              v-for="item in dangerArr"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关键字" prop="name">
-          <el-input
-            v-model="queryParams.searchValue"
-            placeholder="名称/型号"
-            clearable
-            maxLength="30"
-            size="small"
-          />
-        </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="inquire-button-one" v-hasPermi="['check:device:add']" style="width:120px;" @click="handleClick('','','add')">+ 新增检查内容</p>
-        </el-form-item>
-      </el-form>
-      <el-table border v-loading="loading" :data="tableData">
-        <el-table-column label="序号"  width="100" align="left"  type="index"/>
-        <el-table-column label="类型" align="left" prop="dictLabel"/>
-        <el-table-column label="名称" align="left" prop="anotherName"></el-table-column>
-        <el-table-column label="型号" align="left" prop="anotherCode"></el-table-column>
-        <el-table-column label="检查项目数" align="left" prop="checkNum"></el-table-column>
-        <el-table-column label="编辑人" align="left" prop="createName"></el-table-column>
-        <el-table-column label="编辑时间" align="left" prop="createTimeStr"></el-table-column>
-        <el-table-column label="操作" width="180">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p" v-hasPermi="['check:device:query']" @click="handleClick('',scope.row,'detail')">详情</p>
-              <p class="table-button-p" v-hasPermi="['check:device:edit']" @click="handleClick('',scope.row,'edit')">编辑</p>
-              <p class="table-button-p" v-hasPermi="['check:device:remove']" @click="handleClick('',scope.row,'delete')">删除</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-                  :total="total"
-                  layout="total, prev, pager, next, sizes, jumper"
-                  :page.sync="queryParams.pageNum"
-                  :limit.sync="queryParams.pageSize"
-                  @pagination="getList"
-      />
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" ref="queryForm" :inline="true">
+          <el-form-item label="" prop="checkLevel">
+            <el-select  v-model="queryParams.hazardType" placeholder="请选择类型">
+              <el-option
+                v-for="item in dangerArr"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="name">
+            <el-input
+              v-model="queryParams.searchValue"
+              placeholder="名称/型号"
+              clearable
+              maxLength="30"
+              size="small"
+            />
+          </el-form-item>
+          <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-item>
+          <el-form-item style="float: right;">
+            <p class="page-add-common-style-button" v-hasPermi="['check:device:add']" style="width:120px;" @click="handleClick('','','add')">新增检查内容</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" border v-loading="loading" :data="tableData">
+          <el-table-column label="序号"  width="100" align="left"  type="index"/>
+          <el-table-column label="类型" align="left" prop="dictLabel"/>
+          <el-table-column label="名称" align="left" prop="anotherName"></el-table-column>
+          <el-table-column label="型号" align="left" prop="anotherCode"></el-table-column>
+          <el-table-column label="检查项目数" align="left" prop="checkNum"></el-table-column>
+          <el-table-column label="编辑人" align="left" prop="createName"></el-table-column>
+          <el-table-column label="编辑时间" align="left" prop="createTimeStr"></el-table-column>
+          <el-table-column label="操作" width="180">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p" v-hasPermi="['check:device:query']" @click="handleClick('',scope.row,'detail')">详情</p>
+                <p class="table-button-p" v-hasPermi="['check:device:edit']" @click="handleClick('',scope.row,'edit')">编辑</p>
+                <p class="table-button-p" v-hasPermi="['check:device:remove']" @click="handleClick('',scope.row,'delete')">删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
     </div>
     <!--添加窗口-->
     <el-dialog :title="addDialogTitle" :visible.sync="addDialogType" @close="addDialogOff" width="780px" append-to-body class="checkItemLibrary-dialog-box"
@@ -148,7 +152,7 @@ export default {
         searchValue:'',
       },
       total:0,
-      tableData:[{}],
+      tableData:[],
       dateRange:[],
       pageData2:{},
       addDialogTitle:'新增检查项',
@@ -387,26 +391,9 @@ export default {
 
 <style scoped lang="scss">
 .approval_handle {
-  display: flex!important;
-  flex-direction: column;
   .goods-category-cascader-stocking-page .el-cascader-menu:nth-of-type(1) .el-checkbox__input {
     display: none !important;
   }
-  .approval_handle-page{
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px 20px 20px!important;
-    border-radius:10px;
-
-    .button-box{
-      width:200px;
-      display: flex;
-    }
-
-  }
-
 }
 .el-dialog__body{
   padding: 20px 0!important;

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -1,11 +1,11 @@
 <!--自查管理-->
 <template>
   <div class="app-container selfInspectionManagement">
-    <div class="selfInspectionManagement-page" v-if="pageType == 1">
-      <div class="title-box">
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.manageStatus=='-1'?'checkDiv':''" @click="topLeftClickType('-1')">全部</p>
               <p class="text-p" :class="queryParams.manageStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">待检查</p>
               <p class="text-p" :class="queryParams.manageStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">检查中</p>
@@ -21,7 +21,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" style="margin-left:10px;" prop="searchValue">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -30,7 +30,7 @@
               style="width: 250px"
             />
           </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="50px">
+          <el-form-item label="" prop="deptId" label-width="50px">
             <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院" style="width: 150px">
               <el-option
                 v-for="item in deptSelectList"
@@ -40,7 +40,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检查时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -53,14 +53,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" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250" fixed/>
           <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220" fixed>
@@ -343,21 +341,11 @@
     overflow-y: auto;
   }
   .selfInspectionManagement{
-    flex: 1;
-    display: flex !important;
-    flex-direction: column;
-    overflow: hidden;
-    .selfInspectionManagement-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        border-bottom:1px solid #dedede;
+    .page-container{
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -401,6 +389,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -436,13 +425,6 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:20px;
-        overflow: hidden;
-      }
     }
   }
 </style>

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/index.vue

@@ -1,11 +1,11 @@
 <!--自查任务-->
 <template>
   <div class="app-container selfInspectionTask">
-    <div class="selfInspectionTask-page" v-if="pageType == 1">
-      <div class="title-box">
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.checkStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">全部</p>
               <p class="text-p" :class="queryParams.checkStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">未开始</p>
               <p class="text-p" :class="queryParams.checkStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">进行中</p>
@@ -21,7 +21,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" style="margin-left:10px;" prop="searchValue">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -30,7 +30,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="检查周期" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -43,22 +43,16 @@
               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 style="float: right;" v-hasPermi="['security:checkPlan_1:add']">
-            <el-col :span="1.5">
-              <p class="inquire-button-one"
-                 style="width:130px;"
-                 @click="addDialogOpen(1)"
-              ><i class="el-icon-plus"></i> 创建自查任务</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="width:130px;float: right;"
+             @click="addDialogOpen(1)"
+          >创建自查任务</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
           <el-table-column label="检查范围" align="center" prop="checkRange" show-overflow-tooltip width="120">
@@ -325,21 +319,11 @@
 
 <style scoped lang="scss">
   .selfInspectionTask{
-    flex: 1;
-    display: flex !important;
-    flex-direction: column;
-    overflow: hidden;
-    .selfInspectionTask-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        border-bottom:1px solid #dedede;
+    .page-container{
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -383,6 +367,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -418,12 +403,7 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:20px;
-        overflow: hidden;
+      .page-content-box{
         .checkStatus-color-1{
           color:#0183FA;
         }

src/views/safetyCheck/rectificationReport/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container rectificationReport">
-    <div class="rectificationReport-page" v-if="pageType == 1">
-      <div class="title-box">
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <!--与我相关-->
-          <div class="form-button-max-big-box-me" style="margin-left:10px;">
+          <div class="form-button-max-big-box-me">
             <div class="form-button-big-box-me">
               <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
                 <p class="text-p-me">与我有关{{correlationNum}}</p>
@@ -12,7 +12,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" prop="searchValue" style="margin-left:10px;">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -21,7 +21,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="50px">
+          <el-form-item label="" prop="deptId" label-width="50px">
             <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 150px">
               <el-option
                 v-for="item in deptSelectList"
@@ -31,7 +31,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检查时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" style="margin-left:10px;" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -44,22 +44,16 @@
               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 style="float: right;" v-hasPermi="['safety:checkRectify:export']">
-            <el-col :span="1.5">
-              <p class="inquire-button-one"
-                 style="width:100px;"
-                 @click="allDownload"
-              >批量下载</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="width:100px;float: right;"
+             @click="allDownload"
+          >批量下载</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @selection-change="handleSelectionChange"  :row-key="getRowKeys">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @selection-change="handleSelectionChange"  :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
           <el-table-column label="序号" align="center"  type="index" width="50" />
           <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
@@ -265,19 +259,11 @@
 
 <style scoped lang="scss">
   .rectificationReport{
-    flex: 1;
-    display: flex !important;
-    flex-direction: column;
-    overflow: hidden;
-    .rectificationReport-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
+    .page-container{
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             div{
@@ -303,6 +289,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -315,7 +302,6 @@
               font-size:14px;
               border:1px solid #999;
               border-radius:4px;
-              margin-left:10px;
               font-weight:500;
               cursor: pointer;
               .icon-p-me{
@@ -338,13 +324,6 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:0 20px 20px;
-        overflow: hidden;
-      }
     }
   }
 </style>

src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -1,83 +1,75 @@
 <!--批量审核-->
 <template>
-  <div class="batchAudit">
-    <div class="batchAudit-page">
-      <div class="title-box">
-        <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
-          <el-form-item label="关键字" prop="searchValue">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.searchValue"
-              placeholder="计划标题/实验室/房间号"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item label="整改时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
-            <el-date-picker
-              :clearable="false"
-              v-model="dateRange"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              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>
-      </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange"
-                   @selection-change="tableChange" :row-key="getRowKeys">
-          <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
-          <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
-          <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="220"/>
-          <el-table-column label="实验室" align="center" prop="subRoom" show-overflow-tooltip width="170"/>
-          <el-table-column label="安全责任人" align="center" prop="safeUserName" show-overflow-tooltip width="170"/>
-          <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>
-          <el-table-column label="整改人" align="center" prop="rectifyName" show-overflow-tooltip width="90"/>
-          <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
-          <el-table-column label="状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
-            <template slot-scope="scope">
-              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2?'rectifyStatusColorB':(scope.row.rectifyStatus==3?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
-            </template>
-          </el-table-column>
-          <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
-            <template slot-scope="scope">
-              <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="80">
-            <template slot-scope="scope">
-              <div class="table-button-box">
-                <p class="table-button-null"></p>
-                <p class="table-button-p" @click="addDialogOpen(true,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.pageNum"
-                    :limit.sync="queryParams.pageSize"
-                    @pagination="getList"
-        />
-      </div>
-      <div class="dialog-footer-box">
-        <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-info" @click="outButton">返回</p>
-        <p class="dialog-footer-button-primary" @click="openDialogPage(1)">确认</p>
-        <p class="dialog-footer-button-null"></p>
-      </div>
+  <div class="page-container batchAudit">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+        <el-form-item label="" prop="searchValue">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="计划标题/实验室/房间号"
+            clearable
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button" style="float: right;" @click="openDialogPage(1)">确认</p>
+        <p class="page-out-common-style-button" style="float: right;margin-right:20px;" @click="outButton">返回</p>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange"
+                 @selection-change="tableChange" :row-key="getRowKeys">
+        <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
+        <el-table-column label="序号" align="center"  type="index" width="60" />
+        <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
+        <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="220"/>
+        <el-table-column label="实验室" align="center" prop="subRoom" show-overflow-tooltip width="170"/>
+        <el-table-column label="安全责任人" align="center" prop="safeUserName" show-overflow-tooltip width="170"/>
+        <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>
+        <el-table-column label="整改人" align="center" prop="rectifyName" show-overflow-tooltip width="90"/>
+        <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
+        <el-table-column label="状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
+          <template slot-scope="scope">
+            <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2?'rectifyStatusColorB':(scope.row.rectifyStatus==3?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
+          <template slot-scope="scope">
+            <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="80">
+          <template slot-scope="scope">
+            <div class="table-button-box">
+              <p class="table-button-null"></p>
+              <p class="table-button-p" @click="addDialogOpen(true,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.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
     </div>
     <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
     <el-dialog class="inspectionPlan-dialog-box"
@@ -299,76 +291,61 @@
 
 <style scoped lang="scss">
   .batchAudit{
-    flex: 1;
-    display: flex !important;
-    flex-direction: column;
-    overflow: hidden;
-    .batchAudit-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        .form-button-max-big-box{
-          display: inline-block;
-          .form-button-big-box{
-            display: flex;
-            div{
-              position: relative;
-              height:40px;
-              width:80px;
-              line-height: 40px;
+    .page-form-title-box{
+      .form-button-max-big-box{
+        display: inline-block;
+        overflow: hidden;
+        .form-button-big-box{
+          display: flex;
+          div{
+            position: relative;
+            height:40px;
+            width:80px;
+            line-height: 40px;
+            text-align: center;
+            color:#999;
+            font-size:14px;
+            border:1px solid #999;
+            border-radius:4px;
+            margin-left:10px;
+            font-weight:500;
+            cursor: pointer;
+            .icon-p{
+              width:15px;
+              height:15px;
+              line-height:15px;
               text-align: center;
-              color:#999;
-              font-size:14px;
-              border:1px solid #999;
-              border-radius:4px;
-              margin-left:10px;
-              font-weight:500;
-              cursor: pointer;
-              .icon-p{
-                width:15px;
-                height:15px;
-                line-height:15px;
-                text-align: center;
-                position: absolute;
-                right:0;
-                bottom:0;
-                color:#fff;
-                background: #0183fa;
-                border-top-left-radius:4px;
-              }
-            }
-            .checkDiv{
-              color:#0183FA;
-              border:1px solid #0183FA;
+              position: absolute;
+              right:0;
+              bottom:0;
+              color:#fff;
+              background: #0183fa;
+              border-top-left-radius:4px;
             }
           }
+          .checkDiv{
+            color:#0183FA;
+            border:1px solid #0183FA;
+          }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:0 20px 20px;
-        overflow: hidden;
-        .rectifyStatusColorA{
-          color:#23B303;
-        }
-        .rectifyStatusColorB{
-          color:#0183FA;
-        }
-        .rectifyStatusColorC{
-          color:#EE0606;
-        }
+    }
+    .page-content-box{
+      .rectifyStatusColorA{
+        color:#23B303;
+      }
+      .rectifyStatusColorB{
+        color:#0183FA;
       }
-      .dialog-footer-box{
-        padding:20px 0;
-        height:70px;
-        border-top:1px solid #D8D8D8;
-        display: flex;
+      .rectifyStatusColorC{
+        color:#EE0606;
       }
     }
+    .dialog-footer-box{
+      padding:20px 0;
+      height:70px;
+      border-top:1px solid #D8D8D8;
+      display: flex;
+    }
   }
 </style>

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -1,10 +1,10 @@
 <!--暂无法整改隐患-->
 <template>
   <div class="cannotListPage">
-    <div class="title-box">
+    <div class="page-form-title-box">
       <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
         <div class="form-button-max-big-box">
-          <div class="form-button-big-box" style="margin-left:10px;">
+          <div class="form-button-big-box">
             <p class="text-p" :class="queryParams.hazardType=='1'?'checkDiv':''" @click="topLeftClickType('1')">校院巡查</p>
             <p class="text-p" :class="queryParams.hazardType=='2'?'checkDiv':''" @click="topLeftClickType('2')">实验室自查</p>
           </div>
@@ -18,7 +18,7 @@
             </div>
           </div>
         </div>
-        <el-form-item label="关键字" prop="searchValue">
+        <el-form-item label="" prop="searchValue" style="margin-left:10px;">
           <el-input
             maxLength="30"
             v-model="queryParams.searchValue"
@@ -27,7 +27,7 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item label="处置时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+        <el-form-item label="" prop="dateRange" label-width="70px">
           <el-date-picker
             :clearable="false"
             v-model="dateRange"
@@ -40,14 +40,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" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
       </el-form>
     </div>
-    <div class="content-box">
-      <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+    <div class="page-content-box">
+      <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
         <el-table-column label="序号" align="center"  type="index" width="60" />
         <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
         <el-table-column label="检查组织" align="center" prop="deptName" show-overflow-tooltip width="180">
@@ -227,11 +225,10 @@
     display: flex !important;
     flex-direction: column;
     overflow: hidden;
-    .title-box{
-      padding-top:20px;
+    .page-form-title-box{
       .form-button-max-big-box{
         display: inline-block;
-        margin-left:10px;
+        overflow: hidden;
         .form-button-big-box{
           display: flex;
           p:nth-child(1){
@@ -267,6 +264,7 @@
       }
       .form-button-max-big-box-me{
         display: inline-block;
+        overflow: hidden;
         .form-button-big-box-me{
           display: flex;
           div{
@@ -302,12 +300,5 @@
         }
       }
     }
-    .content-box{
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      padding:0 20px 20px;
-      overflow: hidden;
-    }
   }
 </style>

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -2,10 +2,10 @@
 <template>
   <div class="departmentListPage">
     <div class="departmentListPage-page" v-if="minPageType == 1">
-      <div class="title-box">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.rectifyStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">待整改</p>
               <p class="text-p" :class="queryParams.rectifyStatus=='3'?'checkDiv':''" @click="topLeftClickType('3')">待复核</p>
               <p class="text-p" :class="queryParams.rectifyStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">已完成</p>
@@ -20,7 +20,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" prop="searchValue" style="margin-left:10px;">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -29,7 +29,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="整改时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -42,8 +42,8 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="审核状态" prop="examineResult">
-            <el-select v-model="queryParams.examineResult" placeholder="请选择" style="width: 160px">
+          <el-form-item label="" prop="examineResult">
+            <el-select v-model="queryParams.examineResult" placeholder="审核状态" style="width: 160px">
               <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -52,22 +52,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 style="float: right;" v-hasPermi="['safety:rectifyHazard:approve']">
-            <el-col :span="1.5">
-              <p class="inquire-button-one"
-                 style="width:90px;"
-                 @click="goPage(2)"
-              >批量审核</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="width:90px;float: right;"
+             @click="goPage(2)"
+          >批量审核</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
           <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="220"/>
@@ -323,11 +317,10 @@
       display: flex !important;
       flex-direction: column;
       overflow: hidden;
-      .title-box{
-        padding-top:20px;
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -367,6 +360,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -402,12 +396,7 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:0 20px 20px;
-        overflow: hidden;
+      .page-content-box{
         .rectifyStatusColorA{
           color:#23B303;
         }

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -2,10 +2,10 @@
 <template>
   <div class="schoolListPage">
     <div class="schoolListPage-page" v-if="minPageType == 1">
-      <div class="title-box">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.rectifyStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">待整改</p>
               <p class="text-p" :class="queryParams.rectifyStatus=='3'?'checkDiv':''" @click="topLeftClickType('3')">待复核</p>
               <p class="text-p" :class="queryParams.rectifyStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">已完成</p>
@@ -20,7 +20,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" prop="searchValue" style="margin-left:10px;">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -29,7 +29,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="整改时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -42,8 +42,8 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="审核状态" prop="examineResult">
-            <el-select v-model="queryParams.examineResult" placeholder="请选择" style="width: 160px">
+          <el-form-item label="" prop="examineResult">
+            <el-select v-model="queryParams.examineResult" placeholder="审核状态" style="width: 160px">
               <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -52,22 +52,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 style="float: right;" v-hasPermi="['safety:rectifyHazard:approve']">
-            <el-col :span="1.5">
-              <p class="inquire-button-one"
-                 style="width:90px;"
-                 @click="goPage(2)"
-              >批量审核</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="width:90px;float: right;"
+             @click="goPage(2)"
+          >批量审核</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
           <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="220"/>
@@ -323,11 +317,10 @@
       display: flex !important;
       flex-direction: column;
       overflow: hidden;
-      .title-box{
-        padding-top:20px;
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -367,6 +360,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -402,12 +396,7 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:0 20px 20px;
-        overflow: hidden;
+      .page-content-box{
         .rectifyStatusColorA{
           color:#23B303;
         }

src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue

@@ -1,9 +1,9 @@
 <!--校院巡查组-->
 <template>
   <div class="app-container inspectionGroup">
-    <div class="title-box">
+    <div class="page-form-title-box">
       <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
-        <el-form-item label="关键字" prop="searchValue">
+        <el-form-item label="" prop="searchValue">
           <el-input
             maxLength="30"
             v-model="queryParams.searchValue"
@@ -12,7 +12,7 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item label="状态" prop="enable" label-width="60px">
+        <el-form-item label="" prop="enable" label-width="60px">
           <el-select v-model="queryParams.enable" clearable placeholder="请选择状态" style="width: 150px">
             <el-option
               v-for="item in optionsTwo"
@@ -22,22 +22,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 style="float: right;" v-hasPermi="['security:checkGroup:add']">
-          <el-col :span="1.5">
-            <p class="inquire-button-one"
-               style="width:130px;"
-               @click="addDialogOpen(1)"
-            ><i class="el-icon-plus"></i>添加巡查组</p>
-          </el-col>
-        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-add-common-style-button"
+           style="width:130px;float: right;"
+           @click="addDialogOpen(1)"
+        >添加巡查组</p>
       </el-form>
     </div>
-    <div class="content-box">
-      <el-table  border :data="tableList" ref="multipleTable">
+    <div class="page-content-box">
+      <el-table class="table-box" border :data="tableList" ref="multipleTable">
         <el-table-column label="序号"  width="60" align="center"  type="index"/>
         <el-table-column label="巡查组名称" align="center" prop="groupName" show-overflow-tooltip/>
         <el-table-column label="成员人数" align="center" prop="peopleNum" show-overflow-tooltip width="150"/>
@@ -220,10 +214,6 @@
     display: flex !important;
     flex-direction: column;
     overflow: hidden;
-    .title-box{
-      padding-top:20px;
-      border-bottom:1px solid #dedede;
-    }
     .content-box{
       flex: 1;
       display: flex;

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -1,11 +1,11 @@
 <!--巡查管理-->-
 <template>
   <div class="app-container inspectionManagement">
-    <div class="inspectionManagement-page" v-if="pageType == 1">
-      <div class="title-box">
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.manageStatus=='-1'?'checkDiv':''" @click="topLeftClickType('-1')">全部</p>
               <p class="text-p" :class="queryParams.manageStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">待检查</p>
               <p class="text-p" :class="queryParams.manageStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">检查中</p>
@@ -21,7 +21,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" style="margin-left:10px;" prop="searchValue">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -30,7 +30,7 @@
               style="width: 250px"
             />
           </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="50px">
+          <el-form-item label="" prop="deptId" label-width="50px">
             <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院" style="width: 150px">
               <el-option
                 v-for="item in deptSelectList"
@@ -40,7 +40,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检查时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -53,14 +53,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" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250" fixed/>
           <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220" fixed>
@@ -345,17 +343,11 @@
     display: flex !important;
     flex-direction: column;
     overflow: hidden;
-    .inspectionManagement-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        border-bottom:1px solid #dedede;
+    .page-container{
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -399,6 +391,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -434,13 +427,6 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:20px;
-        overflow: hidden;
-      }
     }
   }
 </style>

src/views/safetyCheck/schoolInspection/inspectionPlan/index.vue

@@ -1,11 +1,11 @@
 <!--巡查计划-->
 <template>
   <div class="app-container inspectionPlan">
-    <div class="inspectionPlan-page" v-if="pageType == 1">
-      <div class="title-box">
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.checkStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">全部</p>
               <p class="text-p" :class="queryParams.checkStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">未开始</p>
               <p class="text-p" :class="queryParams.checkStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">进行中</p>
@@ -21,7 +21,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" prop="searchValue" style="margin-left:10px;" label-width="70px">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -30,7 +30,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="检查周期" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -43,22 +43,16 @@
               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 style="float: right;" v-hasPermi="['security:checkPlan:add']">
-            <el-col :span="1.5">
-              <p class="inquire-button-one"
-                 style="width:130px;"
-                 @click="addDialogOpen(1)"
-              ><i class="el-icon-plus"></i> 创建巡查计划</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="width:130px;float: right;"
+             @click="addDialogOpen(1)"
+          >创建巡查计划</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
           <el-table-column label="检查范围" align="center" prop="checkRange" show-overflow-tooltip width="120">
@@ -329,17 +323,11 @@
     display: flex !important;
     flex-direction: column;
     overflow: hidden;
-    .inspectionPlan-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        border-bottom:1px solid #dedede;
+    .page-container{
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -383,6 +371,7 @@
         }
         .form-button-max-big-box-me{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -418,12 +407,7 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:20px;
-        overflow: hidden;
+      .page-content-box{
         .checkStatus-color-1{
           color:#0183FA;
         }

src/views/safetyCheck/snapshotManagement/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container snapshotManagement">
-    <div class="snapshotManagement-page" v-if="pageType == 1">
-      <div class="title-box">
+    <div class="page-container" v-if="pageType == 1">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="70px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <p class="text-p" :class="queryParams.rectifyStatus==''?'checkDiv':''" @click="topLeftClickType('')">全部</p>
               <p class="text-p" :class="queryParams.rectifyStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">待整改</p>
               <p class="text-p" :class="queryParams.rectifyStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">已整改</p>
@@ -20,7 +20,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" prop="searchValue" style="margin-left:10px;">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -28,8 +28,8 @@
               clearable
               style="width: 180px"/>
           </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="40px">
-            <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 130px">
+          <el-form-item label="" prop="deptId" label-width="40px">
+            <el-select v-model="queryParams.deptId" clearable placeholder="选择学院" style="width: 130px">
               <el-option
                 v-for="item in deptSelectList"
                 :key="item.deptId"
@@ -38,7 +38,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="上报时间" prop="dateRange"  label-width="70px">
+          <el-form-item label="" prop="dateRange"  label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -51,30 +51,20 @@
               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 style="float: right;" v-hasPermi="['safety:rectifyClap:add']">
-            <el-col :span="1.5">
-              <p class="inquire-button-one"
-                 style="width:70px;margin-right:0;"
-                 @click="addButton"
-              >随手拍</p>
-            </el-col>
-          </el-form-item>
-          <el-form-item style="float: right;">
-            <el-col :span="1.5">
-              <p class="add-button-one-90"
-                 style="width:80px;"
-                 @click="goPage(2)"
-              >上报记录</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="width:90px;float: right;"
+             @click="addButton"
+          >随手拍</p>
+          <p class="page-add-common-style-button"
+             style="width:90px;float: right;margin-right:20px;"
+             @click="goPage(2)"
+          >上报记录</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
           <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip width="220">
@@ -483,21 +473,11 @@
 
 <style scoped lang="scss">
   .snapshotManagement{
-    flex: 1;
-    display: flex !important;
-    flex-direction: column;
-    overflow: hidden;
-    .snapshotManagement-page{
-      flex: 1;
-      display: flex !important;
-      flex-direction: column;
-      overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        border-bottom:1px solid #dedede;
+    .page-container{
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
-          margin-left:10px;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){
@@ -515,6 +495,7 @@
               border-bottom:1px solid #E0E0E0;
             }
             p:nth-child(4){
+              width:100px;
               border-top-right-radius: 4px;
               border-bottom-right-radius: 4px;
               border-top:1px solid #E0E0E0;
@@ -542,6 +523,7 @@
         .form-button-max-big-box-me{
           margin-left:10px;
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box-me{
             display: flex;
             div{
@@ -576,13 +558,6 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:20px;
-        overflow: hidden;
-      }
     }
   }
   ::v-deep .snapshotManagement-for-img-box{

src/views/safetyCheck/snapshotManagement/listPage.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="snapshotManagement-listPage">
     <div class="snapshotManagement-listPage-min" v-if="infoPageType == 1">
-      <div class="title-box">
+      <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box" style="margin-left:10px;">
+            <div class="form-button-big-box">
               <div :class="queryParams.rectifyStatus===''?'checkDiv':''" @click="topLeftClickType('')">
                 <p class="text-p">全部</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus===''"></p>
@@ -23,7 +23,7 @@
               </div>
             </div>
           </div>
-          <el-form-item label="关键字" prop="searchValue">
+          <el-form-item label="" prop="searchValue" style="margin-left:10px;">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -32,7 +32,7 @@
               style="width: 180px"
             />
           </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="50px">
+          <el-form-item label="" prop="deptId" label-width="50px">
             <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 150px">
               <el-option
                 v-for="item in deptSelectList"
@@ -42,7 +42,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="上报时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="" prop="dateRange" style="margin-left:10px;" label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -55,22 +55,16 @@
               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 style="float: right;">
-            <el-col :span="1.5">
-              <p class="add-button-one-90"
-                 style="width:100px;font-weight:500;"
-                 @click="outButton"
-              >返回</p>
-            </el-col>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-out-common-style-button"
+             style="float: right;"
+             @click="outButton"
+          >返回</p>
         </el-form>
       </div>
-      <div class="content-box">
-        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
           <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip width="220">
@@ -244,11 +238,10 @@
       display: flex !important;
       flex-direction: column;
       overflow: hidden;
-      .title-box{
-        padding-top:20px;
-        border-bottom:1px solid #dedede;
+      .page-form-title-box{
         .form-button-max-big-box{
           display: inline-block;
+          overflow: hidden;
           .form-button-big-box{
             display: flex;
             div{
@@ -277,6 +270,9 @@
                 border-top-left-radius:4px;
               }
             }
+            div:nth-child(4){
+              width:110px;
+            }
             .checkDiv{
               color:#0183FA;
               border:1px solid #0183FA;
@@ -284,13 +280,6 @@
           }
         }
       }
-      .content-box{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding:20px;
-        overflow: hidden;
-      }
     }
   }
 </style>

src/views/safetyCheck/startInspection/index.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="app-container startInspection" v-loading.fullscreen.lock="loading">
-      <div class="title-max-box">
-        <p class="title-p">开展检查</p>
+      <div class="page-top-title-box">
+        <p class="page-top-title-name-p">开展检查</p>
+        <p class="page-top-title-button-p" v-hasPermi="['safety:checkManage_4:edit']" @click="upDataButton(1)">保存</p>
+        <p class="page-top-title-submit-p" v-hasPermi="['safety:checkManage_4:edit']" @click="upDataButton(2)">提交</p>
       </div>
       <div class="content-max-box scrollbar-box">
         <el-form ref="addForm" :model="addForm" :rules="rules" label-width="82px">
@@ -331,12 +333,6 @@
           </div>
         </el-form>
       </div>
-      <div class="bottom-button-max-box" v-hasPermi="['safety:checkManage_4:edit']">
-        <p class="null-p"></p>
-        <p class="add-button-two-90" @click="upDataButton(1)">保存</p>
-        <p class="inquire-button-one" @click="upDataButton(2)">提交</p>
-        <p class="null-p"></p>
-      </div>
       <lookImgDialog ref="lookImgDialog"></lookImgDialog>
       <!--设备弹窗-->
       <el-dialog title="检查项" v-if="dialogVisible" :visible.sync="dialogVisible" width="730px" :append-to-body="false" :modal-append-to-body="false" :close-on-click-modal="false">

src/views/safetyCheck/worktable/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container worktable">
+  <div class="app-container worktable scrollbar-box">
     <div class="top-max-big-box">
       <!--校级数据卡-->
       <div class="school-data-box">
@@ -278,7 +278,6 @@
     flex:1;
     display: flex;
     flex-direction: column;
-    overflow: hidden;
     padding:10px!important;
     font-weight: 400;
     .top-max-big-box{