样式优化

src/assets/styles/ruoyi.scss

@@ -331,3 +331,7 @@
 .el-input__inner{
   font-size: 14px!important;
 }
+
+.el-descriptions{
+	font-size: 16px !important;
+}

src/components/dateTime/daterange.picker.vue

@@ -87,10 +87,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .customDatePicker {
-  ::v-deep .el-date-editor--daterange {
-    width: 250px !important;
+  ::v-deep .el-range-input {
+    font-size: 16px !important;
   }
-  ::v-deep .el-range-editor--small .el-range-input {
+
+  ::v-deep .el-range-separator {
     font-size: 16px !important;
   }
 }

src/views/question/list/index.vue

@@ -108,7 +108,7 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="questionList" height="640">
+          <el-table v-loading="loading" :data="questionList" height="640" size="small">
             <el-table-column
               header-align="center"
               type="index"

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

@@ -91,7 +91,12 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="questionList" height="640">
+          <el-table
+            v-loading="loading"
+            :data="questionList"
+            height="640"
+            size="small"
+          >
             <el-table-column
               header-align="center"
               align="center"
@@ -111,7 +116,11 @@
               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="隐患描述"

src/views/resumption/rule/index.vue

@@ -25,11 +25,7 @@
               v-show="showSearch"
               label-width="120px"
             >
-              <el-form-item
-                prop="name"
-                label="履职库名称"
-                label-width="100"
-              >
+              <el-form-item prop="name" label="履职库名称" label-width="100">
                 <el-input
                   v-model="queryParams.name"
                   :maxlength="50"
@@ -92,6 +88,7 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
@@ -322,7 +319,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .el-table {
   display: flex;
   flex-direction: column;

src/views/resumption/ruleManager/index.vue

@@ -28,11 +28,7 @@
               :inline="true"
               label-width="100px"
             >
-              <el-form-item
-                prop="itemName"
-                label="履职项"
-                label-width="60px"
-              >
+              <el-form-item prop="itemName" label="履职项" label-width="60px">
                 <el-input
                   v-model="queryParams.itemName"
                   placeholder="请输入履职项"
@@ -124,6 +120,7 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             :data="tableData"
             border
             :default-expand-all="expandAll"

src/views/resumption/taskManager/index.vue

@@ -115,7 +115,7 @@
           </div>
           <el-table
             border
-            height="640"
+            height="600"
             size="small"
             v-loading="loading"
             :data="pageData"

src/views/safetycheck/rule/index.vue

@@ -24,11 +24,7 @@
               v-show="showSearch"
               label-width="120px"
             >
-              <el-form-item
-                prop="name"
-                label="检查库名称"
-                label-width="100"
-              >
+              <el-form-item prop="name" label="检查库名称" label-width="100">
                 <el-input
                   v-model="queryParams.name"
                   :maxlength="50"
@@ -91,6 +87,7 @@
           </div>
 
           <el-table
+            size="small"
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"

src/views/safetycheck/ruleManager/index.vue

@@ -29,11 +29,7 @@
               :inline="true"
               label-width="100px"
             >
-              <el-form-item
-                prop="itemName"
-                label="检查项"
-                label-width="60px"
-              >
+              <el-form-item prop="itemName" label="检查项" label-width="60px">
                 <el-input
                   v-model="queryParams.itemName"
                   placeholder="请输入内容"
@@ -100,6 +96,7 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             :data="tableData"
             border
             :default-expand-all="expandAll"