Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/views/core/configuration/index.vue

@@ -1,168 +1,176 @@
 <template>
   <div class="app-container" style="min-height: 100%;">
-    <el-form :model="day" :rules="rules" ref="day" label-width="130px">
+    <div class="business-options">
+      <div class="item-title">
+        每日履职
+      </div>
       <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每日履职
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业前：" prop="front">
-
-                <template >
+        <el-form ref="day" :model="day" :rules="rules">
+            <el-row :gutter="10">
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="营业前：" prop="front" >
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.front"/>
-                </template>
-            
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业中：" prop="centre">
-              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-              点提醒 -->
-              <template >
+                    v-model="day.front"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="营业中：" prop="centre">
+                  <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
+                    :max="24" label="描述文字"></el-input-number>
+                  点提醒 -->
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.centre"/>
-                </template>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业后：" prop="after">
-              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-                点提醒 -->
-                <template >
+                    v-model="day.centre"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="营业后：" prop="after">
+                  <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
+                    :max="24" label="描述文字"></el-input-number>
+                    点提醒 -->
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.after"/>
-                </template>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="全天提醒：" prop="allDay">
-              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-                点提醒 -->
-                <template >
+                    v-model="day.after"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="全天提醒：" prop="allDay">
+                  <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
+                    :max="24" label="描述文字"></el-input-number>
+                    点提醒 -->
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.allDay"/>
-                </template>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
+                    v-model="day.allDay"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-form>
       </div>
-    </el-form>
-
-    <el-form :model="week" :rules="rules" ref="week" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每周履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
-                :max="100" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-
-
-          </el-col>
-        </el-row>
+      <div class="item-title">
+        每周履职
       </div>
-    </el-form>
+      <el-form ref="week" :model="week" :rules="rules">
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="week.allDay"
+                  :max="100"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
 
-    <el-form :model="month" :rules="rules" ref="month" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每月履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="month.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <el-form :model="season" :rules="rules" ref="season" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每季履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="season.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
+
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">
+        每月履职
       </div>
-    </el-form>
-    <el-form :model="halfYear" :rules="rules" ref="halfYear" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              半年履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前：" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="halfYear.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-form ref="month" :model="month" :rules="rules">
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="month.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">
+        每季履职
       </div>
-    </el-form>
-    <el-form :model="year" :rules="rules" ref="year" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每年履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前：" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="year.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <div style="margin-top: 50px; margin-left: 42%">
-      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-form ref="season" :model="season" :rules="rules">
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="season.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">半年履职</div>
+      <el-form ref="halfYear" :model="halfYear" :rules="rules" >
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="halfYear.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">每年履职</div>
+      <el-form ref="year" :model="year" :rules="rules" >
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="year.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <div class="button-box">
+      <el-button size="small" type="primary" @click="saveExtend">保存配置</el-button>
       <!--    <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import { insertConfiguration, getInfo } from "@/api/resumption/configuration";
+import {getInfo, insertConfiguration} from "@/api/resumption/configuration";
+
 export default {
   props: [],
   components: {},
@@ -171,7 +179,7 @@ export default {
       coreResumptionConfigurationDTO: [],
       num: 1,
       day: {
-        id:null,
+        id: null,
         resumptionCycle: 2,
         front: null,
         centre: null,
@@ -180,31 +188,31 @@ export default {
         timeUnit: 1,
       },
       week: {
-        id:null,
+        id: null,
         resumptionCycle: 3,
         allDay: null,
         timeUnit: 2
       },
       month: {
-        id:null,
+        id: null,
         resumptionCycle: 4,
         allDay: null,
         timeUnit: 2
       },
       season: {
-        id:null,
+        id: null,
         resumptionCycle: 5,
         allDay: null,
         timeUnit: 2
       },
       halfYear: {
-        id:null,
+        id: null,
         resumptionCycle: 6,
         allDay: null,
         timeUnit: 2
       },
       year: {
-        id:null,
+        id: null,
         resumptionCycle: 7,
         allDay: null,
         timeUnit: 2
@@ -283,19 +291,27 @@ export default {
       };
     },
   },
-  beforeCreate() { },
+  beforeCreate() {
+  },
 
-  beforeMount() { },
-  mounted() { },
-  beforeUpdate() { },
-  updated() { },
-  destroyed() { },
+  beforeMount() {
+  },
+  mounted() {
+  },
+  beforeUpdate() {
+  },
+  updated() {
+  },
+  destroyed() {
+  },
   created() {
     this.selectInfo();
   },
   methods: {
-    request() { },
-    handleChange(value) { },
+    request() {
+    },
+    handleChange(value) {
+    },
     selectInfo() {
       this.loading = true;
       getInfo().then(response => {
@@ -312,11 +328,10 @@ export default {
     },
 
 
-
     checkForm(form) {
       let val
       this.$refs[form].validate(valid => {
-        
+
         val = valid
       });
       return val;
@@ -327,21 +342,21 @@ export default {
       arr.forEach(v => {
         flags.push(this.checkForm(v));
       });
-     
+
       let flag = flags.every(v => {
-      
+
         return v == true;
       })
-    
+
       if (!flag) return;
       let data = {
-      
+
         coreResumptionConfiguration: [this.day, this.week, this.month, this.season, this.halfYear, this.year]
       };
       insertConfiguration(data).then(response => {
         this.$modal.msgSuccess("保存成功");
         this.open = false;
-      this.  selectInfo();
+        this.selectInfo();
       })
     }
   },
@@ -350,21 +365,38 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.business-options {
+
+}
+::v-deep{
+  .el-form-item{
+    margin-bottom: 10px;
+  }
+}
 .form-item {
+  width: 100%;
   border: 1px solid #f1f1f1;
-  margin-bottom: 2px;
-  min-height: 100px;
-  display: flex;
-  align-items: center;
+  padding: 20px;
+  margin-bottom: 10px;
+  min-height: 70px;
+  background-color: #fff;
+  box-shadow: 0 5px 10px #eaeaea;
 }
 
 .item-title {
   width: 100px;
   color: #fff;
-  background-color: #ccc;
+  background-color: #1ea8e9;
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
+
+}
+.button-box{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
 }
 </style>

src/views/core/drill/plan/index.vue

@@ -140,6 +140,7 @@
               align="left"
               header-align="center"
               prop="planName"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
               label="创建机构"

src/views/core/materials/index.vue

@@ -10,62 +10,62 @@
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <div class="main-search-box">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-          <el-form-item label="创建机构">
-            <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" wholeTree></org-tree>
-          </el-form-item>
-          <el-form-item label="资料名称" prop="title">
-            <el-input
-              v-model="queryParams.title"
-              placeholder="请输入关键字"
-              clearable
-              maxlength="50"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+            <el-form-item label="创建机构">
+              <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+                    @click="clickTreeNode" wholeTree></org-tree>
+            </el-form-item>
+            <el-form-item label="资料名称" prop="title">
+              <el-input
+                v-model="queryParams.title"
+                placeholder="请输入关键字"
+                clearable
+                maxlength="50"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
 
-          <el-form-item label="资料类型" prop="knowledgeId">
-            <el-select v-model="queryParams.knowledgeId" placeholder="请选择资料类型" style="width: 100%;" clearable>
-              <el-option v-for="dict in dict.type.edu_materials_type" :key="dict.value" :label="dict.label"
-                         :value="parseInt(dict.value)"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item label="资料类型" prop="knowledgeId">
+              <el-select v-model="queryParams.knowledgeId" placeholder="请选择资料类型" style="width: 100%;" clearable>
+                <el-option v-for="dict in dict.type.edu_materials_type" :key="dict.value" :label="dict.label"
+                           :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
 
 
-          <el-form-item label="资料状态" prop="isOpen">
-            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
-              <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
-                         :value="parseInt(dict.value)"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item label="资料状态" prop="isOpen">
+              <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
+                <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
+                           :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
 
-          <!-- <el-form-item>
+            <!-- <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item> -->
+          </el-form>
+          <el-row :gutter="10" >
+            <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item> -->
-        </el-form>
-        <el-row :gutter="10" >
-          <el-col :span="1.5">
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['core:materials:add']"
-            >新增资料
-            </el-button>
-          </el-col>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['core:materials:add']"
+              >新增资料
+              </el-button>
+            </el-col>
 
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-          </div>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </div>
         <!-- 表格数据 -->
         <el-table
           border
@@ -74,7 +74,7 @@
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="70"/>
           <el-table-column label="创建机构" align="left" header-align="center"  prop="orgName"/>
-          <el-table-column label="资料名称" align="left" header-align="center"  prop="title"/>
+          <el-table-column label="资料名称" align="left" header-align="center"  prop="title" :show-overflow-tooltip="true"/>
 
           <el-table-column label="资料类型" align="center"  prop="knowledgeId">
             <template slot-scope="scope">

src/views/core/reportForms/intrusionTestReport.vue

@@ -38,7 +38,7 @@
       </div>
           <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/monitorAccessReport.vue

@@ -1,9 +1,8 @@
 <template>
     <div class="app-container">
-
+      <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch"
-          label-width="100px">
+          v-show="showSearch">
 
             <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
@@ -26,7 +25,8 @@
             <el-date-picker  :picker-options="{ firstDayOfWeek: 1 }"  v-model="weeks"  type="week"   format='yyyy 第 WW 周'  placeholder="选择周" @change='setWeekNum'>
              </el-date-picker>
           </el-form-item>
-          <el-row :gutter="10" class="mb8">
+
+          <el-row :gutter="10">
             <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -37,15 +37,15 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 
           </el-row>
-            </el-form-item>
           </el-form>
-          <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
-          <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </el-row>
+
+          </div>
+          <div class="main-search-box" style="margin-bottom: 0;">
+            <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+          </div>
           <el-table
             border
-            height="666"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/resumptionReport.vue

@@ -1,9 +1,8 @@
 <template>
     <div class="app-container">
-
+      <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch"
-          label-width="100px">
+          v-show="showSearch">
 
             <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
@@ -40,21 +39,29 @@
                                 align="right" type="month" placeholder="请选择查询时间">
                 </el-date-picker>
               </el-form-item>
+          </el-form>
 
+          <el-row :gutter="10" >
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
                          v-hasPermi="['core:resumptionReport:export']">导出
               </el-button>
-            </el-form-item>
-          </el-form>
-          <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
-          <el-row :gutter="10" class="mb8">
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
+      </div>
+      <div class="main-search-box" style="margin-bottom: 0;">
+        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+      </div>
           <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 
@@ -64,7 +71,7 @@
               </template>
             </el-table-column>
             <el-table-column label="地区" align="center" prop="city" />
-            <el-table-column label="单位名称" align="center" prop="orgName" width="100"/>
+            <el-table-column label="单位名称" align="center" prop="orgName" width="240"/>
             <el-table-column label="网点数量" align="left" prop="networkNumber" width="100"/>
 
                 <el-table-column label="总计" align="center">

src/views/core/reportForms/safetyInspectReport.vue

@@ -70,7 +70,7 @@
     </div>
     <el-table
       border
-      height="732"
+      height="616"
       size="small"
       v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/selfInspectReport.vue

@@ -60,7 +60,7 @@
       v-loading="loading"
       :data="checkList"
       border
-      height="700" size="small" @selection-change="handleSelectionChange">
+      height="616" size="small" @selection-change="handleSelectionChange">
 
       <el-table-column align="center" label="序号" min-width="50">
         <template v-slot:default="scope">

src/views/core/reportForms/serviceBankReport.vue

@@ -1,9 +1,8 @@
 <template>
     <div class="app-container">
-
+      <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch"
-          label-width="100px">
+          v-show="showSearch">
 
             <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
@@ -24,21 +23,31 @@
                                 align="right" type="month" placeholder="请选择查询时间">
                 </el-date-picker>
               </el-form-item>
+          </el-form>
 
+          <el-row :gutter="10">
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
                          v-hasPermi="['core:resumptionReport:export']">导出
               </el-button>
-            </el-form-item>
-          </el-form>
-          <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
-          <el-row :gutter="10" class="mb8">
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
-          <el-table
+
+          </div>
+      <div class="main-search-box" style="margin-bottom: 0;">
+        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+      </div>
+
+      <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/standbyPowerReport.vue

@@ -34,7 +34,7 @@
       </div>
           <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/safeLevel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-table v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
+    <el-table border height="760" v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
 
       <el-table-column label="安全等级" align="center" prop="levelName"/>
       <el-table-column label="风险等级" align="center" prop="riskLevel">

src/views/question/list/index.vue

@@ -118,8 +118,9 @@
           <el-table
             v-loading="loading"
             :data="questionList"
-            height="640"
+            height="646"
             size="small"
+            border
           >
             <el-table-column
               header-align="center"
@@ -163,6 +164,7 @@
               header-align="center"
               label="隐患描述"
               prop="questionDesc"
+              :show-overflow-tooltip="true"
               v-if="columns[4].visible"
             />
             <el-table-column

src/views/question/reform/index.vue

@@ -102,8 +102,9 @@
           <el-table
             v-loading="loading"
             :data="questionList"
-            height="640"
+            height="646"
             size="small"
+            border
           >
             <el-table-column
               header-align="center"
@@ -141,6 +142,7 @@
               header-align="center"
               label="隐患描述"
               prop="questionDesc"
+              :show-overflow-tooltip="true"
               v-if="columns[3].visible"
             />
 

src/views/resumption/plan/index.vue

@@ -23,9 +23,7 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="90px"
             >
-              <el-row>
                 <el-form-item label="行社名称">
                   <org-tree
                     v-model="queryParams.orgId"
@@ -69,7 +67,6 @@
                     />
                   </el-select>
                 </el-form-item>
-
                 <el-form-item prop="planCycle" label="任务周期">
                   <el-select
                     prop="planCycle"
@@ -87,8 +84,6 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <!-- </el-row>
-              <el-row> -->
                 <el-form-item prop="planStatus" label="任务状态">
                   <el-select
                     prop="planStatus"
@@ -116,9 +111,7 @@
                     clearable
                   />
                 </el-form-item>
-              </el-row>
               <el-row>
-                <el-form-item>
                   <el-button
                     type="primary"
                     icon="el-icon-search"
@@ -141,16 +134,16 @@
                     v-hasPermi="['system:user:add']"
                     >新增任务</el-button
                   >
-                </el-form-item>
+                <right-toolbar
+                  :showSearch.sync="showSearch"
+                  @queryTable="getList"
+
+                ></right-toolbar>
               </el-row>
               <!-- <el-row :gutter="10" >
             <el-col :span="1.5"> </el-col>
 
-            <right-toolbar
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
 
-            ></right-toolbar>
           </el-row> -->
             </el-form>
           </div>
@@ -158,7 +151,7 @@
 
           <el-table
             border
-            height="596"
+            height="594"
             size="small"
             v-loading="loading"
             :data="pageData"

src/views/resumption/protection/index.vue

@@ -140,7 +140,7 @@
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="640"
+            height="594"
           >
             <el-table-column
               header-align="center"

src/views/resumption/rule/index.vue

@@ -96,11 +96,12 @@
             </el-row>
           </div>
           <el-table
+            border
             size="small"
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="640"
+            height="646"
           >
             <el-table-column
               header-align="center"

src/views/resumption/taskManager/index.vue

@@ -132,7 +132,7 @@
           </div>
           <el-table
             border
-            height="580"
+            height="594"
             size="small"
             v-loading="loading"
             :data="pageData"

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -102,7 +102,7 @@
 
           <el-table
             border
-            height="650"
+            height="646"
             size="small"
             v-loading="loading"
             :data="dataList"

src/views/safetycheck/rule/index.vue

@@ -95,10 +95,11 @@
 
           <el-table
             size="small"
+            border
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="640"
+            height="646"
           >
             <el-table-column
               header-align="center"

src/views/system/operlog/index.vue

@@ -73,8 +73,7 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="danger"
-            plain
+            type="primary"
             icon="el-icon-delete"
             size="mini"
             :disabled="multiple"
@@ -84,8 +83,7 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="danger"
-            plain
+            type="primary"
             icon="el-icon-delete"
             size="mini"
             @click="handleClean"
@@ -94,8 +92,7 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            plain
+            type="primary"
             icon="el-icon-download"
             size="mini"
             @click="handleExport"