Przeglądaj źródła

安全检查详情、登记界面优化;

jiawuxian 1 rok temu
rodzic
commit
fcd7aa071e

+ 1 - 0
src/views/board/charts/question/report.vue

@@ -156,6 +156,7 @@ export default {
         !reformed &&
         !overdue
       ) {
+        //如果全是0,饼图显示有问题
         unconfirm = 1;
         dissent = 1;
         closed = 1;

+ 52 - 35
src/views/safetycheck/task/components/detail.vue

@@ -1,25 +1,28 @@
 <template>
   <div class="app-container">
-    <el-descriptions title="检查任务详情" border>
+    <el-descriptions title="检查任务详情" border :labelStyle="{'width':'180px'}">
       <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>
       <el-descriptions-item label="任务进度"
         >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
       </el-descriptions-item>
-      <el-descriptions-item label="任务时间"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
-      <el-descriptions-item label="截止日期"
-        >{{ dayjs(taskInfo.planEndTime).format("YYYY-MM-DD") }}
+      <el-descriptions-item label="登记人"
+        >{{ taskInfo.submitBy }}
       </el-descriptions-item>
 
-      <el-descriptions-item label="检查主体">{{
-        taskInfo.checkOrgName
-      }}</el-descriptions-item>
+      <el-descriptions-item label="任务开始时间"
+        >{{ dayjs(taskInfo.planStartTime).format("YYYY年MM月DD") }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务结束时间"
+        >{{ dayjs(taskInfo.planEndTime).format("YYYY年MM月DD") }}
+      </el-descriptions-item>
       <el-descriptions-item label="受检机构">{{
         taskInfo.beCheckedOrgName
       }}</el-descriptions-item>
+      <el-descriptions-item label="检查主体">{{
+        taskInfo.checkOrgName
+      }}</el-descriptions-item>      
       <el-descriptions-item label="检查人员"
         >{{
           taskInfo.checkRoles
@@ -27,53 +30,61 @@
             : ""
         }}
       </el-descriptions-item>
-      <el-descriptions-item label="检查组成员"
-        >{{ taskInfo.checkTeam }}
-      </el-descriptions-item>
-      <el-descriptions-item label="登记人"
-        >{{ taskInfo.submitBy }}
-      </el-descriptions-item>
-      <el-descriptions-item label="隐患问题数"
-        >{{ taskInfo.exceptionCount }}
-      </el-descriptions-item>
       <el-descriptions-item label="检查时间"
         >{{
           taskInfo.submitTime
-            ? dayjs(taskInfo.submitTime).format("YYYY-MM-DD")
+            ? dayjs(taskInfo.submitTime).format("YYYY年MM月DD")
             : ""
         }}
       </el-descriptions-item>
+       
+      <el-descriptions-item label="隐患问题数"
+        >{{ taskInfo.exceptionCount }}
+      </el-descriptions-item>
+      <el-descriptions-item label="检查组成员" :span="2"
+        >{{ taskInfo.checkTeam }}
+      </el-descriptions-item>
+     
+      
     </el-descriptions>
 
     <div class="itemDetail">
-      <div class="extend_mod">
+      <div>
         <el-table
           size="small"
           :data="taskInfo.checkList"
           row-key="itemId"
-          height="441"
+          height="500"
           border
-          style="max-height: 450px; overflow-y: auto"
+          style=" overflow-y: auto"
           default-expand-all
           :show-header="false"
+          :row-style="{'backgroundColor':'rgb(215, 215, 215)'}"
         >
-          <el-table-column type="expand">
+          <el-table-column type="expand"  width="60">
             <template slot-scope="scope">
-              <el-table :data="scope.row.pointList" size="small">
-                <el-table-column type="index" />
+              <el-table :data="scope.row.pointList" class="point-table" size="small" :header-cell-style="{'backgroundColor':'rgb(255, 255, 255) !important'} ">
+                <el-table-column type="index" label="序号" width="60"  align="center"/>
                 <el-table-column
                   align="center"
                   prop="pointName"
                   label="检查内容"
+                  min-width="500"
                 >
+                <template slot-scope="r">
+                  <div class="text_nbsp">
+                    {{r.row.pointName}}
+                  </div>
+                </template>
                 </el-table-column>
                 <el-table-column
                   align="center"
                   prop="areaName"
                   label="检查区域"
+                  min-width="180"
                 >
                 </el-table-column>
-                <el-table-column align="center" prop="status" label="检查结果">
+                <el-table-column align="center" prop="status" label="检查结果" min-width="180">
                   <template slot-scope="r">
                     {{
                       r.row.status == null
@@ -84,16 +95,12 @@
                     }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" prop="remark" label="问题描述">
+                <el-table-column align="center" prop="remark" label="问题描述"  min-width="300">
                   <template slot-scope="r">
                     {{ r.row.remark ? r.row.remark : "-" }}
                   </template>
                 </el-table-column>
-                <el-table-column
-                  align="center"
-                  prop="imgData"
-                  label="异常图片"
-                >
+                <el-table-column align="center" prop="imgData" label="异常图片"  min-width="300">
                   <template slot-scope="r">
                     <div v-if="r.row.imgData && r.row.imgData.length > 0">
                       <el-image
@@ -118,7 +125,12 @@
             label="检查项"
             prop="itemName"
             :show-overflow-tooltip="true"
-          />
+            ><template slot-scope="scope">
+              ({{ arabicToChinese(scope.$index + 1) }}){{
+                scope.row.itemName
+              }}
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -133,7 +145,7 @@ import * as api from "@/api/safetycheck/register.js";
 import dayjs from "dayjs";
 
 import { getLabel } from "@/views/commonOption.js";
-import { checkPermi } from "@/utils/permission.js";
+import { arabicToChinese } from "@/utils/util.js";
 export default {
   name: "safetyCheckRegister",
   data() {
@@ -158,7 +170,7 @@ export default {
   methods: {
     dayjs,
     getLabel,
-
+    arabicToChinese,
     onClose() {
       this.$tab.closePageAndPushPrev();
     },
@@ -192,4 +204,9 @@ export default {
     background-color: transparent !important;
   }
 }
+
+.point-table{
+  margin-top:-10px !important;
+  margin-bottom:-10px !important;
+}
 </style>

+ 5 - 5
src/views/safetycheck/task/components/register.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
-    <el-descriptions title="检查任务" border>
+    <el-descriptions title="检查任务" border :labelStyle="{'width':'180px'}">
       <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>
       <el-descriptions-item label="任务进度"
         >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
       </el-descriptions-item>
-      <el-descriptions-item label="任务时间"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
+      <el-descriptions-item label="任务开始时间"
+        >{{ dayjs(taskInfo.planStartTime).format("YYYY年MM月DD") }}
       </el-descriptions-item>
-      <el-descriptions-item label="截止日期"
-        >{{ dayjs(taskInfo.planEndTime).format("YYYY-MM-DD") }}
+      <el-descriptions-item label="任务结束时间"
+        >{{ dayjs(taskInfo.planEndTime).format("YYYY年MM月DD") }}
       </el-descriptions-item>
 
       <el-descriptions-item label="检查主体">{{