Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/assets/styles/ruoyi.scss

@@ -322,6 +322,9 @@
    line-height: 23px!important;
    font-size: 16px!important;
  }
+ .tags-view-item.active::before{
+   top:-2px;
+ }
  .el-pagination button, .el-pagination span:not([class*=suffix]){
    font-size: 16px!important;
  }
@@ -331,3 +334,7 @@
 .el-input__inner{
   font-size: 14px!important;
 }
+
+.el-descriptions{
+	font-size: 16px !important;
+}

src/components/Pagination/index.vue

@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [20, 30, 50]
       }
     },
     // 移动端页码按钮的数量端默认值5

src/components/dateTime/daterange.picker.vue

@@ -1,89 +1,104 @@
 <template>
-    <el-date-picker
-        v-model="value"
-        type="daterange"
-        :clearable="clearable"
-        :picker-options="pickerOptions"
-        @change="onSelect"
-        v-bind="$attrs"
-    />
+  <el-date-picker
+    v-model="value"
+    type="daterange"
+    :clearable="clearable"
+    :picker-options="pickerOptions"
+    @change="onSelect"
+    v-bind="$attrs"
+    class="customDatePicker"
+  />
 </template>
 <script>
 // import sync from '@/components/computed.sync.ts'
 // import { set } from 'vue/types/umd';
 export default {
-    inheritAttrs: false,
-    data() {
-        return {};
+  inheritAttrs: false,
+  data() {
+    return {};
+  },
+  computed: {
+    // pv: sync("value"),
+
+    // val:{
+    //     get(){return this.value},
+    //     set(v){
+    //         this.$emit("input",v)
+    //     }
+    // },
+    pickerOptions() {
+      return {
+        shortcuts: [
+          {
+            text: "今天",
+            onClick: (picker) => {
+              let date = this.$dateRange.before(0);
+              date[1] = date[0];
+              console.log(date);
+              picker.$emit("pick", date);
+            },
+          },
+          {
+            text: "昨天",
+            onClick: (picker) => {
+              let date = this.$dateRange.yesterday(-1);
+              date[1] = date[0];
+              console.log(date);
+              picker.$emit("pick", date);
+            },
+          },
+          {
+            text: "最近一周",
+            onClick: (picker) => {
+              picker.$emit("pick", this.$dateRange.before(-6));
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick: (picker) => {
+              picker.$emit("pick", this.$dateRange.before(-29));
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick: (picker) => {
+              picker.$emit("pick", this.$dateRange.before(-90));
+            },
+          },
+          {
+            text: "最近半年",
+            onClick: (picker) => {
+              picker.$emit("pick", this.$dateRange.before(-180));
+            },
+          },
+        ],
+      };
     },
-    computed: {        // pv: sync("value"),
-       
-        // val:{
-        //     get(){return this.value},
-        //     set(v){
-        //         this.$emit("input",v)
-        //     }
-        // },
-        pickerOptions() {
-            return {
-                shortcuts: [
-                    {
-                        text: "今天",
-                        onClick: (picker) => {
-                            let date = this.$dateRange.before(0);
-                            date[1] = date[0];
-                            console.log(date);
-                            picker.$emit("pick", date);
-                        },
-                    },
-                    {
-                        text: "昨天",
-                        onClick: (picker) => {
-                            let date = this.$dateRange.yesterday(-1);
-                            date[1] = date[0];
-                            console.log(date);
-                            picker.$emit("pick", date);
-                        },
-                    },
-                    {
-                        text: "最近一周",
-                        onClick: (picker) => {
-                            picker.$emit("pick", this.$dateRange.before(-6));
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick: (picker) => {
-                            picker.$emit("pick", this.$dateRange.before(-29));
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick: (picker) => {
-                            picker.$emit("pick", this.$dateRange.before(-90));
-                        },
-                    },
-                ],
-            };
-        },
+  },
+  watch: {},
+  props: {
+    value: {},
+    clearable: {
+      type: Boolean,
+      default: true,
     },
-    watch: {},
-    props: {
-        value: {},
-        clearable:{
-            type: Boolean,
-            default: true,
-        },
+  },
+  methods: {
+    onSelect(v) {
+      this.$emit("input", v);
     },
-    methods: {
-        onSelect(v) {
-            this.$emit("input",v);
-        },
-    },
-    mounted() {},
+  },
+  mounted() {},
 };
 </script>
-<style lang="scss">
-.k-date-range {
+<style lang="scss" scoped>
+.customDatePicker {
+  ::v-deep .el-range-input {
+    font-size: 14px !important;
+  }
+
+  ::v-deep .el-range-separator {
+    font-size: 14px !important;
+  }
 }
-</style>
+</style>

src/views/core/accessPlan/index.vue

@@ -115,7 +115,7 @@
 
     <!-- 添加或修改监控调阅计划对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="任务名称" prop="planName">
           <el-input v-model="form.planName" placeholder="请输入任务名称" maxlength="50" :disabled="form.isEdit"/>
         </el-form-item>

src/views/core/task/index.vue

@@ -7,7 +7,7 @@
                     @click="clickTreeNode"></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 <!--
       <el-form-item label="调阅周期" prop="cycle">
         <el-select v-model="queryParams.cycle" placeholder="请选择周期" clearable>
@@ -43,8 +43,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="计划时间" prop="planStartTime">
-        <el-date-picker
+      <el-form-item label="任务时间" prop="planStartTime">
+        <!-- <el-date-picker
           v-model="queryParams.dateRange"
           style="width: 240px"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -53,24 +53,42 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']"
-        ></el-date-picker>
+        ></el-date-picker> -->
+        <DataRangePicker
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              v-model="queryParams.dateRange"
+              :picker-options="pickerOptions"
+            >
+            </DataRangePicker>
       </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-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <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"
-          plain
-          icon="el-icon-download"
+        type="primary" icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['core:task:export']"
@@ -166,8 +184,9 @@ import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import {listPlanRole} from "@/api/core/edu/plan";
 import {formatTime} from "@/utils/ruoyi";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
-  components: {OrgTree,DialogInfo},
+  components: {OrgTree,DialogInfo, DataRangePicker,},
   name: "Task",
   dicts: ['sys_access_cycle', 'retrieval_task_status'],
   data() {

src/views/question/list/dialog.vue

@@ -12,7 +12,7 @@
         data.checkItem
       }}</el-descriptions-item>
       <el-descriptions-item label="标准依据">
-        {{ data.checkContent }}
+        <pre>{{ data.checkContent }}</pre>
       </el-descriptions-item>
       <el-descriptions-item label="隐患描述">
         {{ data.questionDesc }}</el-descriptions-item

src/views/question/list/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
@@ -20,9 +20,9 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="68px"
+              label-width="80px"
             >
-              <el-form-item label="关键字" prop="searchKey">
+              <el-form-item label="关键字" label-width="60px">
                 <el-input
                   v-model="queryParams.searchKey"
                   placeholder="请输入关键字"
@@ -86,7 +86,7 @@
                   >搜索</el-button
                 >
                 <el-button
-                type="primary"
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -108,41 +108,51 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="questionList" height="650">
+          <el-table v-loading="loading" :data="questionList" height="640" size="small">
             <el-table-column
+              header-align="center"
               type="index"
               label="序号"
+              align="center"
               width="60px"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               label="所属机构"
               prop="orgName"
               v-if="columns[1].visible"
             />
             <el-table-column
+              header-align="center"
               label="隐患来源"
               prop="srcTaskName"
               v-if="columns[2].visible"
             />
             <el-table-column
+              header-align="center"
               label="检查标准"
               prop="checkItem"
               v-if="columns[3].visible"
             />
             <el-table-column
+              header-align="center"
               label="隐患描述"
               prop="questionDesc"
               v-if="columns[4].visible"
             />
             <el-table-column
+              header-align="center"
               label="提出人"
+              align="center"
               prop="submitorName"
               width="100px"
               v-if="columns[5].visible"
             />
             <el-table-column
+              header-align="center"
               label="发现时间"
+              align="center"
               prop="submitTime"
               width="160px"
               v-if="columns[6].visible"
@@ -154,9 +164,10 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               label="隐患状态"
+              width="100px"
               align="center"
-              width="80px"
               prop="confirmStatus"
               v-if="columns[7].visible"
             >
@@ -170,8 +181,9 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               label="操作"
-              align="center"
+              width="180"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">

src/views/question/reform/dialog.vue

@@ -1,134 +1,150 @@
 <template>
-  <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
+  <DialogCom
+    :title="title"
+    :visible.sync="open"
+    width="800px"
+    append-to-body
+    @close="cancel"
+  >
     <div class="question-dialog-body">
       <el-descriptions :column="2" class="contentArea">
-      <el-descriptions-item label="机构名称">{{
-        data.orgName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="隐患来源">{{
-        data.srcTaskName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="标准项">{{
-        data.checkItem
-      }}</el-descriptions-item>
-      <el-descriptions-item label="标准依据">
-        {{ data.checkContent }}
-      </el-descriptions-item>
-      <el-descriptions-item label="隐患描述">
-        {{ data.questionDesc }}</el-descriptions-item
-      >
-      <el-descriptions-item label="提出人">
-        {{ data.submitorName }}</el-descriptions-item
-      >
-      <el-descriptions-item label="发现时间">
-        {{ dayjs(data.submitTime).format("YYYY-MM-DD HH:mm:ss") }}</el-descriptions-item
-      >
-      <el-descriptions-item label="整改期限">
-        {{
-          dayjs(data.reformDeadline).format("YYYY-MM-DD")
-        }}</el-descriptions-item
-      >
-      <el-descriptions-item label="隐患图片">
-        <div class="imageList">
-          <el-image
-            style="width: 100px"
-            v-for="url in data.images"
-            :src="url"
-            :preview-src-list="data.images"
-          >
-          </el-image></div
-      ></el-descriptions-item>
-    </el-descriptions>
-    <el-descriptions :column="2" class="contentArea" v-if="data.confirm">
-      <el-descriptions-item label="确认结果">{{
-        data.confirm.executeStatus == 0 ? "确认" : "提出异议"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="确认人">{{
-        data.confirm.executorName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="异议内容" :span="2" v-if="data.confirm.executeStatus==1">{{
-        data.confirm.description
-      }}</el-descriptions-item>
-    </el-descriptions>
-
-    <el-descriptions :column="2" class="contentArea" v-if="data.confirmDissent">
-      <el-descriptions-item label="审核结果">{{
-        data.confirmDissent.executeStatus == 0 ? "同意" : "不同意"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="审核人">{{
-        data.confirmDissent.executorName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="描述" :span="2" v-if="data.confirmDissent.executeStatus==1">{{
-        data.confirmDissent.description
-      }}</el-descriptions-item>
-    </el-descriptions>
+        <el-descriptions-item label="机构名称">{{
+          data.orgName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="隐患来源">{{
+          data.srcTaskName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="标准项">{{
+          data.checkItem
+        }}</el-descriptions-item>
+        <el-descriptions-item label="标准依据">
+          <pre>{{ data.checkContent }}</pre>
+        </el-descriptions-item>
+        <el-descriptions-item label="隐患描述">
+          {{ data.questionDesc }}</el-descriptions-item
+        >
+        <el-descriptions-item label="提出人">
+          {{ data.submitorName }}</el-descriptions-item
+        >
+        <el-descriptions-item label="发现时间">
+          {{
+            dayjs(data.submitTime).format("YYYY-MM-DD HH:mm:ss")
+          }}</el-descriptions-item
+        >
+        <el-descriptions-item label="整改期限">
+          {{
+            dayjs(data.reformDeadline).format("YYYY-MM-DD")
+          }}</el-descriptions-item
+        >
+        <el-descriptions-item label="隐患图片">
+          <div class="imageList">
+            <el-image
+              style="width: 100px"
+              v-for="url in data.images"
+              :src="url"
+              :preview-src-list="data.images"
+            >
+            </el-image></div
+        ></el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions :column="2" class="contentArea" v-if="data.confirm">
+        <el-descriptions-item label="确认结果">{{
+          data.confirm.executeStatus == 0 ? "确认" : "提出异议"
+        }}</el-descriptions-item>
+        <el-descriptions-item label="确认人">{{
+          data.confirm.executorName
+        }}</el-descriptions-item>
+        <el-descriptions-item
+          label="异议内容"
+          :span="2"
+          v-if="data.confirm.executeStatus == 1"
+          >{{ data.confirm.description }}</el-descriptions-item
+        >
+      </el-descriptions>
 
-    <el-descriptions :column="2" class="contentArea" v-if="data.reform">
-      <el-descriptions-item label="整改时间">{{
-        dayjs(data.reform.executeTime).format("YYYY-MM-DD")
-      }}</el-descriptions-item>
-      <el-descriptions-item label="整改状态">{{
-        data.reform.executeStatus == 0 ? "已整改" : "未整改"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="描述" :span="2">{{
-        data.reform.description
-      }}</el-descriptions-item>
-      <el-descriptions-item label="整改图片" :span="2">
-        <div class="imageList">
-          <el-image
-            style="width: 100px; height: 100px"
-            v-for="url in data.reform.images"
-            :src="url"
-            :preview-src-list="data.reform.images"
-          >
-          </el-image></div
-      ></el-descriptions-item>
-    </el-descriptions>
-    <el-form
-      ref="reformForm"
-      :model="reformData"
-      label-width="100px"
-      class="form"
-      v-if="type == 'reform'"
-      :rules="reformRule"
-    >
-      <el-form-item label="整改时间" prop="reformDate">
-        <el-date-picker
-          v-model="reformData.reformDate"
-          type="date"
-          placeholder="选择日期"
-          :pickerOptions="pickerOptions"
+      <el-descriptions
+        :column="2"
+        class="contentArea"
+        v-if="data.confirmDissent"
+      >
+        <el-descriptions-item label="审核结果">{{
+          data.confirmDissent.executeStatus == 0 ? "同意" : "不同意"
+        }}</el-descriptions-item>
+        <el-descriptions-item label="审核人">{{
+          data.confirmDissent.executorName
+        }}</el-descriptions-item>
+        <el-descriptions-item
+          label="描述"
+          :span="2"
+          v-if="data.confirmDissent.executeStatus == 1"
+          >{{ data.confirmDissent.description }}</el-descriptions-item
         >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="整改描述" prop="description">
-        <el-input
-          v-model="reformData.description"
-          maxlength="255"
-          placeHolder="请输入整改描述"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="整改图片" prop="images">
-        <imgUpload
-          type="more"
-          :value="reformData.images"
-          @input="imageListChanged"
-        ></imgUpload>
-      </el-form-item>
-    </el-form>
+      </el-descriptions>
 
+      <el-descriptions :column="2" class="contentArea" v-if="data.reform">
+        <el-descriptions-item label="整改时间">{{
+          dayjs(data.reform.executeTime).format("YYYY-MM-DD")
+        }}</el-descriptions-item>
+        <el-descriptions-item label="整改状态">{{
+          data.reform.executeStatus == 0 ? "已整改" : "未整改"
+        }}</el-descriptions-item>
+        <el-descriptions-item label="描述" :span="2">{{
+          data.reform.description
+        }}</el-descriptions-item>
+        <el-descriptions-item label="整改图片" :span="2">
+          <div class="imageList">
+            <el-image
+              style="width: 100px; height: 100px"
+              v-for="url in data.reform.images"
+              :src="url"
+              :preview-src-list="data.reform.images"
+            >
+            </el-image></div
+        ></el-descriptions-item>
+      </el-descriptions>
+      <el-form
+        ref="reformForm"
+        :model="reformData"
+        label-width="100px"
+        class="form"
+        v-if="type == 'reform'"
+        :rules="reformRule"
+      >
+        <el-form-item label="整改时间" prop="reformDate">
+          <el-date-picker
+            v-model="reformData.reformDate"
+            type="date"
+            placeholder="选择日期"
+            :pickerOptions="pickerOptions"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="整改描述" prop="description">
+          <el-input
+            v-model="reformData.description"
+            maxlength="255"
+            placeHolder="请输入整改描述"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="整改图片" prop="images">
+          <imgUpload
+            type="more"
+            :value="reformData.images"
+            @input="imageListChanged"
+          ></imgUpload>
+        </el-form-item>
+      </el-form>
     </div>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm" v-if="type!='detail'">确 定</el-button>
+      <el-button type="primary" @click="submitForm" v-if="type != 'detail'"
+        >确 定</el-button
+      >
       <el-button @click="cancel">取 消</el-button>
     </div>
- </DialogCom>
+  </DialogCom>
 </template>
 <script>
-import {
-  get,
-  reform,
-} from "@/api/question/reform.js";
+import { get, reform } from "@/api/question/reform.js";
 import dayjs from "dayjs";
 import imgUpload from "@/components/ImageUpload/index.vue";
 export default {
@@ -201,8 +217,8 @@ export default {
         this.data.confirmDissent = r.data.flows.find((d) => d.executeStep == 2);
         this.data.confirm = r.data.flows.find((d) => d.executeStep == 1);
         this.data.reform = r.data.flows.find((d) => d.executeStep == 11);
-        if(this.data.reform && this.data.reform.images)     {
-          this.data.reform.images=this.data.reform.images.split(",")
+        if (this.data.reform && this.data.reform.images) {
+          this.data.reform.images = this.data.reform.images.split(",");
         }
         this.open = true;
       });
@@ -328,13 +344,13 @@ export default {
   margin-left: 5px;
   margin-right: 5px;
 }
-.question-dialog-body{
+.question-dialog-body {
   max-height: 500px;
   overflow-y: auto;
   padding-right: 20px;
 }
 
-.question-dialog-body>div{
+.question-dialog-body > div {
   border-bottom: 1px solid #606266;
   padding-bottom: 20px;
 
@@ -345,10 +361,10 @@ export default {
   }
 }
 
-.question-dialog-body>div:not(:first-child){
+.question-dialog-body > div:not(:first-child) {
   padding-top: 20px;
 }
-.question-dialog-body>div:last-child{
+.question-dialog-body > div:last-child {
   border: none;
 }
 </style>

src/views/question/reform/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
@@ -20,9 +20,9 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="68px"
+              label-width="80px"
             >
-              <el-form-item label="关键字" prop="searchKey">
+              <el-form-item label="关键字" prop="searchKey" label-width="60px">
                 <el-input
                   v-model="queryParams.searchKey"
                   placeholder="请输入关键字"
@@ -91,30 +91,46 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="questionList" height="650">
+          <el-table
+            v-loading="loading"
+            :data="questionList"
+            height="640"
+            size="small"
+          >
             <el-table-column
+              header-align="center"
+              align="center"
               type="index"
               label="序号"
               width="60px"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               label="所属机构"
               prop="orgName"
               v-if="columns[1].visible"
             />
             <el-table-column
+              header-align="center"
               label="标准依据"
               prop="checkContent"
               v-if="columns[2].visible"
-            />
+            >
+              <template slot-scope="scope">
+                <pre>{{ scope.row.checkContent }}</pre>
+              </template>
+            </el-table-column>
             <el-table-column
+              header-align="center"
               label="隐患描述"
               prop="questionDesc"
               v-if="columns[3].visible"
             />
 
             <el-table-column
+              header-align="center"
+              align="center"
               label="整改期限"
               prop="submitTime"
               width="120"
@@ -127,9 +143,11 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               label="整改状态"
               prop="reformStatus"
-              width="80px"
+              width="100px"
               v-if="columns[5].visible"
             >
               <template slot-scope="scope">
@@ -142,8 +160,9 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               label="操作"
-              align="center"
+              width="150"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">

src/views/resumption/protection/dialog.history.vue

@@ -34,7 +34,7 @@
             </DataRangePicker>
           </div>
           <el-table :data="tableData" border style="width: 100%">
-            <el-table-column type="index" label="序号"></el-table-column>
+            <el-table-column type="index" label="序号" width="60"></el-table-column>
             <el-table-column prop="statusText" label="报警控制器状态"
               ><template slot-scope="r">
                 {{ getLabel(statusDict, r.row.status) }}

src/views/resumption/protection/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -21,7 +21,7 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="120px"
+              label-width="130px"
             >
               <el-form-item prop="key" label="报警控制器名称">
                 <el-input
@@ -132,25 +132,32 @@
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="650"
+            height="640"
           >
             <el-table-column
+              header-align="center"
+              align="center"
               type="index"
               label="序号"
+              width="60"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               prop="orgName"
               label="所属机构"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               prop="name"
               label="报警控制器名称"
               v-if="columns[2].visible"
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="status"
               label="报警控制器状态"
               v-if="columns[3].visible"
@@ -162,18 +169,22 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="statusUpdatorName"
               label="登记人"
               v-if="columns[4].visible"
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="statusUpdateTime"
               label="最近登记时间"
               v-if="columns[5].visible"
             >
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column header-align="center" label="操作">
               <template slot-scope="r">
                 <!-- <el-button
                 size="mini"

src/views/resumption/rule/dialog.edit.vue

@@ -13,7 +13,7 @@
           size="small"
           ref="form"
           label-position="right"
-          label-width="130px"
+          label-width="150px"
           label-prefix=":"
         >
           <el-form-item prop="name" label="履职内容库名称:">

src/views/resumption/rule/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20" class="el-row-ex">
+    <el-row :gutter="10" class="el-row-ex">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -23,9 +23,9 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="100px"
+              label-width="120px"
             >
-              <el-form-item prop="name" label="履职库名称">
+              <el-form-item prop="name" label="履职库名称" label-width="100">
                 <el-input
                   v-model="queryParams.name"
                   :maxlength="50"
@@ -88,22 +88,28 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="650"
+            height="640"
           >
             <el-table-column
+              header-align="center"
               type="index"
               label="序号"
+              width="60"
+              align="center"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               prop="name"
               label="履职库名称"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               prop="orgType"
               label="履职机构类型"
               v-if="columns[2].visible"
@@ -113,13 +119,16 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="orgName"
               label="发布机构"
               v-if="columns[3].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               prop="status"
               label="状态"
+              align="center"
               v-if="columns[4].visible"
             >
               <template slot-scope="r">
@@ -127,11 +136,17 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="remark"
               label="备注"
               v-if="columns[5].visible"
             ></el-table-column>
-            <el-table-column label="操作" class="small-padding fixed-width">
+            <el-table-column
+              header-align="center"
+              label="操作"
+              class="small-padding fixed-width"
+              width="150"
+            >
               <template slot-scope="r">
                 <el-button
                   size="mini"
@@ -144,7 +159,7 @@
                 >
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   slot="reference"
                   icon="el-icon-delete"
                   v-if="orgId == r.row.orgId"

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -37,20 +37,30 @@
             >
           </div>
           <el-table :data="formData.pointDtoList" border style="width: 100%">
-            <el-table-column prop="name" label="履职内容">
+            <el-table-column prop="name" label="履职内容" header-align="center">
               <template slot-scope="scope">
                 <pre>{{ scope.row.name }}</pre>
               </template>
             </el-table-column>
-            <el-table-column prop="areaName" label="履职区域">
+            <el-table-column
+            header-align="center"
+              align="center"
+              prop="areaName"
+              label="履职区域"             
+            >
             </el-table-column>
-            <el-table-column prop="checkName" label="履职点位">
+            <el-table-column
+              prop="checkName"
+              label="履职点位"
+              header-align="center"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column label="操作" width="140">
+            <el-table-column label="操作" width="140" header-align="center">
               <template slot-scope="scope">
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="onEdit(scope.$index, scope.row)"
                   >编辑</el-button
                 >
@@ -59,7 +69,7 @@
                   @confirm="delitem(scope.$index)"
                   style="margin-left: 20px"
                 >
-                  <el-button slot="reference" type="text" size="small"
+                  <el-button slot="reference" type="text" size="mini"
                     >删除</el-button
                   >
                 </el-popconfirm>

src/views/resumption/ruleManager/dialog.select.point.vue

@@ -40,32 +40,41 @@
                 :label="item.name"
               ></el-option>
             </el-select>
-          </el-form-item>          
+          </el-form-item>
         </template>
 
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column
+            header-align="center"
             prop="itemName"
             label="履职项"
             min-width="40%"
           ></el-table-column>
-          <el-table-column label="履职内容" prop="pointName" min-width="40%">
+          <el-table-column
+            header-align="center"
+            label="履职内容"
+            prop="pointName"
+            min-width="40%"
+          >
             <template slot-scope="scope">
               <pre>{{ scope.row.pointName }}</pre>
             </template>
           </el-table-column>
           <el-table-column
+            header-align="center"
+            align="center"
             prop="areaName"
             label="履职区域"
             min-width="20%"
           ></el-table-column>
           <el-table-column
+            header-align="center"
             prop="checkName"
             label="履职点位"
             min-width="20%"
           ></el-table-column>
-          <!--          <el-table-column prop="nfcName"
+          <!--         <el-table-column  header-align="center"   prop="nfcName"
                            label="采集点"
                            width="120"></el-table-column>-->
         </template>

src/views/resumption/ruleManager/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
@@ -26,14 +26,9 @@
               ref="search"
               size="small"
               :inline="true"
-              
               label-width="100px"
             >
-              <el-form-item
-                prop="itemName"
-                label="履职项"
-                class="search_itemname"
-              >
+              <el-form-item prop="itemName" label="履职项" label-width="60px">
                 <el-input
                   v-model="queryParams.itemName"
                   placeholder="请输入履职项"
@@ -125,13 +120,14 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             :data="tableData"
             border
             :default-expand-all="expandAll"
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
-            height="650"
+            height="640"
           >
             <el-table-column type="expand">
               <template slot-scope="props">
@@ -141,18 +137,24 @@
                   style="width: 100%"
                 >
                   <el-table-column
+                    header-align="center"
                     prop="name"
                     label="履职内容"
                     v-if="columns[3].visible"
                   >
                   </el-table-column>
                   <el-table-column
+                    header-align="center"
                     prop="areaName"
                     label="履职区域"
                     v-if="columns[4].visible"
                   >
                   </el-table-column>
-                  <el-table-column prop="checkName" label="履职点位">
+                  <el-table-column
+                    prop="checkName"
+                    label="履职点位"
+                    header-align="center"
+                  >
                   </el-table-column>
                   <!-- <el-table-column prop="dataTypeName" label="数据类型">
                 </el-table-column>
@@ -162,6 +164,8 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               type="index"
               label="序号"
               width="80"
@@ -169,6 +173,7 @@
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="name"
               label="履职项"
               v-if="columns[1].visible"
@@ -177,20 +182,23 @@
             <!-- <el-table-column prop="itemDesc" label="标准及要求">
           </el-table-column> -->
             <el-table-column
+              header-align="center"
+              align="center"
               prop="pointNums"
               label="履职内容数量"
               v-if="columns[2].visible"
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               label="操作"
-              width="140"
+              width="150"
               v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
             >
               <template slot-scope="scope">
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   icon="el-icon-edit-outline"
                   @click="onEditItem(scope.row.id)"
                   v-hasPermi="['resumption:ruleManager:edit']"
@@ -198,7 +206,7 @@
                 >
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   slot="reference"
                   icon="el-icon-delete"
                   @click="deldata(scope.row.id)"
@@ -386,7 +394,7 @@ export default {
             <span style="display: flex">
               <i
                 class="el-icon-s-management"
-                style="color: #008cd6; padding-top: 3px"
+                style="color: #008cd6; padding-top: 12px"
               ></i>
               <span class="show-ellipsis">{data.shortName}</span>
             </span>
@@ -432,11 +440,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.search_itemname {
-  ::v-deep .el-form-item__label {
-    width: 60px !important;
-  }
-}
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0;
   padding-left: 47px;

src/views/resumption/taskManager/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -121,14 +121,17 @@
             :data="pageData"
           >
             <el-table-column
+              header-align="center"
+              align="center"
               type="index"
               fixed
-              min-width="50"
+              width="60px"
               label="序号"
               v-if="columns[0].visible"
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="name"
               label="任务名称"
               min-width="120"
@@ -136,6 +139,7 @@
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="orgName"
               label="履职机构"
               min-width="120"
@@ -143,6 +147,7 @@
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="roleName"
               label="履职人员"
               min-width="120"
@@ -150,6 +155,8 @@
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="status"
               label="任务进度"
               width="100px"
@@ -160,6 +167,7 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="planStartTime"
               label="任务时间"
               width="200px"
@@ -172,6 +180,8 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="abnormalDataNums"
               label="隐患数量"
               min-width="80"
@@ -184,7 +194,12 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" fixed="right" min-width="120px">
+            <el-table-column
+              header-align="center"
+              label="操作"
+              fixed="right"
+              min-width="120px"
+            >
               <template slot-scope="r">
                 <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&

src/views/safetycheck/rule/dialog.edit.vue

@@ -13,7 +13,7 @@
           size="small"
           ref="form"
           label-position="right"
-          label-width="130px"
+          label-width="150px"
           label-prefix=":"
         >
           <el-form-item prop="name" label="检查内容库名称:">

src/views/safetycheck/rule/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -22,9 +22,9 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="100px"
+              label-width="120px"
             >
-              <el-form-item prop="name" label="检查库名称">
+              <el-form-item prop="name" label="检查库名称" label-width="100">
                 <el-input
                   v-model="queryParams.name"
                   :maxlength="50"
@@ -87,22 +87,29 @@
           </div>
 
           <el-table
+            size="small"
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="650"
+            height="640"
           >
             <el-table-column
+              header-align="center"
+              align="center"
               type="index"
               label="序号"
+              width="60"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
               prop="name"
               label="检查库名称"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="orgType"
               label="受检机构类型"
               v-if="columns[2].visible"
@@ -112,11 +119,14 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="orgName"
               label="发布机构"
               v-if="columns[3].visible"
             ></el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="status"
               label="状态"
               v-if="columns[4].visible"
@@ -126,11 +136,12 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="remark"
               label="备注"
               v-if="columns[5].visible"
             ></el-table-column>
-            <el-table-column label="操作">
+            <el-table-column header-align="center" label="操作" width="150">
               <template slot-scope="r" v-if="orgId == r.row.orgId">
                 <el-button
                   size="mini"
@@ -302,6 +313,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.brand {
+.search_itemname {
+  ::v-deep .el-form-item__label {
+    width: 100px !important;
+  }
 }
 </style>

src/views/safetycheck/ruleManager/dialog.editItem.vue

@@ -34,18 +34,23 @@
             >
           </div>
           <el-table :data="formData.pointDtoList" border style="width: 100%">
-            <el-table-column prop="name" label="检查内容">
+            <el-table-column header-align="center" prop="name" label="检查内容">
               <template slot-scope="scope">
                 <pre>{{ scope.row.name }}</pre>
               </template>
             </el-table-column>
-            <el-table-column prop="areaName" label="检查区域">
+            <el-table-column
+              header-align="center"
+              align="center"
+              prop="areaName"
+              label="检查区域"
+            >
             </el-table-column>
-            <el-table-column label="操作" width="140">
+            <el-table-column header-align="center" label="操作" width="140">
               <template slot-scope="scope">
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="onEdit(scope.$index, scope.row)"
                   >编辑</el-button
                 >
@@ -54,7 +59,7 @@
                   @confirm="delitem(scope.$index)"
                   style="margin-left: 20px"
                 >
-                  <el-button slot="reference" type="text" size="small"
+                  <el-button slot="reference" type="text" size="mini"
                     >删除</el-button
                   >
                 </el-popconfirm>

src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -46,21 +46,29 @@
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column
+            header-align="center"
             prop="itemName"
             label="检查项"
             min-width="40%"
           ></el-table-column>
-          <el-table-column label="检查内容" prop="pointName" min-width="40%">
+          <el-table-column
+            header-align="center"
+            label="检查内容"
+            prop="pointName"
+            min-width="40%"
+          >
             <template slot-scope="scope">
               <pre>{{ scope.row.pointName }}</pre>
             </template>
           </el-table-column>
           <el-table-column
+            header-align="center"
+            align="center"
             prop="areaName"
             label="检查区域"
             min-width="20%"
           ></el-table-column>
-          <!--          <el-table-column prop="nfcName"
+          <!--         <el-table-column  header-align="center"   prop="nfcName"
                            label="采集点"
                            width="120"></el-table-column>-->
         </template>

src/views/safetycheck/ruleManager/index.vue

@@ -1,7 +1,7 @@
 <!-- 动环设备管理 -->
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
@@ -29,11 +29,7 @@
               :inline="true"
               label-width="100px"
             >
-              <el-form-item
-                prop="itemName"
-                label="检查项"
-                class="search_itemname"
-              >
+              <el-form-item prop="itemName" label="检查项" label-width="60px">
                 <el-input
                   v-model="queryParams.itemName"
                   placeholder="请输入内容"
@@ -100,15 +96,16 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             :data="tableData"
             border
             :default-expand-all="expandAll"
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
-            height="650"
+            height="640"
           >
-            <el-table-column type="expand">
+            <el-table-column header-align="center" type="expand">
               <template slot-scope="props">
                 <el-table
                   :data="props.row.pointDtoList"
@@ -116,12 +113,15 @@
                   style="width: 100%"
                 >
                   <el-table-column
+                    header-align="center"
                     prop="name"
                     label="检查内容"
                     v-if="columns[3].visible"
                   >
                   </el-table-column>
                   <el-table-column
+                    header-align="center"
+                    align="center"
                     prop="areaName"
                     label="检查区域"
                     v-if="columns[4].visible"
@@ -131,6 +131,8 @@
               </template>
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               type="index"
               label="序号"
               width="80"
@@ -138,18 +140,22 @@
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               prop="name"
               label="检查项"
               v-if="columns[1].visible"
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="pointNums"
               label="检查内容数量"
               v-if="columns[2].visible"
             >
             </el-table-column>
             <el-table-column
+              header-align="center"
               label="操作"
               width="140"
               v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
@@ -157,7 +163,7 @@
               <template slot-scope="scope">
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   icon="el-icon-edit-outline"
                   @click="onEditItem(scope.row.id)"
                   v-hasPermi="['safetycheck:ruleManager:edit']"
@@ -165,7 +171,7 @@
                 >
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   slot="reference"
                   icon="el-icon-delete"
                   @click="deldata(scope.row.id)"
@@ -357,7 +363,7 @@ export default {
             <span style="display: flex">
               <i
                 class="el-icon-s-management"
-                style="color: #008cd6; padding-top: 3px"
+                style="color: #008cd6; padding-top: 12px"
               ></i>
               <span class="show-ellipsis">{data.shortName}</span>
             </span>
@@ -392,11 +398,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.search_itemname {
-  ::v-deep .el-form-item__label {
-    width: 60px !important;
-  }
-}
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0;
   padding-left: 47px;

src/views/safetycheck/taskManager/components/checkRegister.vue

@@ -9,26 +9,26 @@
     >
       <el-row>
         <el-col :span="6">
-          <el-form-item label="检查名称" prop="taskName">
+          <el-form-item label="任务名称" prop="taskName">
             <el-input
               v-model="info.taskName"
-              placeholder="请输入检查名称"
+              placeholder="请输入任务名称"
               maxlength="50"
             ></el-input> </el-form-item
         ></el-col>
         <el-col :span="6"
-          ><el-form-item label="检查机构" prop="checkOrgId">
+          ><el-form-item label="检查主体" prop="checkOrgId">
             <orgDropDown
               v-model="info.checkOrgId"
-              placeholder="选择检查机构"
+              placeholder="选择检查主体"
               @select="onCheckOrgSelect"
             /> </el-form-item
         ></el-col>
         <el-col :span="6">
-          <el-form-item label="检查角色" prop="checkRoleId">
+          <el-form-item label="检查人员" prop="checkRoleId">
             <el-select
               v-model="info.checkRoleId"
-              placeholder="请选择检查角色"
+              placeholder="请选择检查人员"
               style="width: 100%"
             >
               <el-option
@@ -73,7 +73,7 @@
       </el-row>
     </el-form>
     <div>
-      <span style="margin-right: 20px">巡检区域</span>
+      <span style="margin-right: 20px">检查区域</span>
       <el-button type="primary" size="mini" @click="onAddPoint()"
         >选择检查内容</el-button
       >
@@ -101,7 +101,7 @@
                   v-if="point.isAdd"
                   style="margin-left: 50px"
                   @click="onDeletePoint(area, item, point)"
-                  >移除</el-button
+                  >删除</el-button
                 >
               </div>
               <div v-if="point.status == 1">

src/views/safetycheck/taskManager/components/register.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-descriptions title="检查任务">
-      <el-descriptions-item label="检查名称">{{
+      <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>
-      <el-descriptions-item label="检查机构">{{
+      <el-descriptions-item label="检查主体">{{
         taskInfo.checkOrgName
       }}</el-descriptions-item>
       <el-descriptions-item label="受检机构">{{
         taskInfo.beCheckedOrgName
       }}</el-descriptions-item>
-      <el-descriptions-item label="检查角色"
+      <el-descriptions-item label="检查人员"
         >{{
           taskInfo.checkRoles
             ? taskInfo.checkRoles.map((r) => r.name).join(",")
@@ -42,7 +42,7 @@
     </el-descriptions>
     <el-row class="el-row-button">
       <el-col>
-        <span style="margin-right: 20px">巡检区域</span>
+        <span style="margin-right: 20px">检查区域</span>
         <el-button
           type="primary"
           size="mini"
@@ -89,7 +89,7 @@
                   v-if="point.isAdd && isRegister"
                   style="margin-left: 50px"
                   @click="onDeletePoint(area, item, point)"
-                  >移除</el-button
+                  >删除</el-button
                 >
               </div>
               <div v-if="point.status == 1">

src/views/system/dept/index.vue

@@ -449,7 +449,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         name: undefined,
         status: undefined,
         parentId: undefined,

src/views/system/device/index.vue

@@ -19,7 +19,7 @@
                   <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                             @keyup.enter.native="handleQuery" />
                 </el-form-item>
-                <el-form-item label="设备类别" prop="assetType">
+                <el-form-item label="设备类别" prop="assetType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
                              @change="searchChangeSelectDevice">
@@ -28,7 +28,7 @@
                   </el-select>
                 </el-form-item>
 
-                <el-form-item label="设备分类" prop="deviceType">
+                <el-form-item label="设备分类" prop="deviceType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
                     <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
@@ -47,13 +47,34 @@
                   >
                 </el-col>
                 <el-col :span="1.5">
-                  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                  <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-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"
@@ -91,7 +112,7 @@
             </div>
           <el-table
             border
-            height="650"
+            height="646"
             size="small"
             v-loading="loading"
             :data="deviceList"
@@ -438,7 +459,7 @@ export default {
       },
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         orgId: null,
         orgName: null,
         deviceName: null,

src/views/system/user/index.vue

@@ -135,7 +135,6 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-upload2"
                   size="mini"
                   @click="handleImport"
@@ -147,7 +146,6 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
@@ -158,7 +156,6 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExportManager"
@@ -174,7 +171,7 @@
           </div>
           <el-table
             border
-            height="650"
+            height="646"
             size="small"
             v-loading="loading"
             :data="userList"
@@ -185,7 +182,7 @@
               label="序号"
               type="index"
               align="center"
-              width="50"
+              width="70"
             ></el-table-column>
             <el-table-column
               label="账号"
@@ -646,7 +643,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         username: null,
         phone: null,
         status: null,