修复缺陷；优化界面

src/components/RightToolbar/index.vue

@@ -2,7 +2,7 @@
   <div class="top-right-btn" :style="style">
     <el-row>
       <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top" v-if="search">
-        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
+        <el-button size="mini" circle icon="el-icon-view" @click="toggleSearch()" />
       </el-tooltip>
       <el-tooltip class="item" effect="dark" content="刷新" placement="top">
         <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />

src/components/orgTree/index.vue

@@ -122,7 +122,7 @@ export default {
     ...mapGetters(["orgTree"]),
   },
   mounted() {
-    if(autoHeight){
+    if(this.autoHeight){
       this.getHeight();
     }    
   },
@@ -131,7 +131,6 @@ export default {
       let orgTree = document.querySelector('.org-tree');
       const resizeObserver = new ResizeObserver(entries => {
         for (let entry of entries) {
-          debugger
           orgTree.style.height = entry.contentRect.height + 'px';
         }
       });

src/views/board/charts/question/report.vue

@@ -126,9 +126,9 @@ export default {
 
       this.data = r;
       if(r.total==0){
-        this.data.reformRate=1;
+        this.data.reformRate=100;
       }else{
-        this.data.reformRate=(r.reformed/r.total).toFixed(2);
+        this.data.reformRate=((r.reformed/r.total)*100).toFixed(0);
       }
     },
 
@@ -201,7 +201,7 @@ export default {
               color: "#fff",
               fontSize: 14,
               formatter: function (value) {
-                return `总数:${t.data.total}\n\n整改率:${t.data.reformRate*100}%`;
+                return `总数:${t.data.total}\n\n整改率:${t.data.reformRate}%`;
               },
             },
             emphasis: {

src/views/question/list/dialog.vue

@@ -1,150 +1,168 @@
 <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="标准依据">
-        <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-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.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
+        :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 :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-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="confirmForm"
-      :model="confirmData"
-      label-width="100px"
-      class="form"
-      v-if="type == 'confirm'"
-      :rules="confirmRule"
-    >
-      <el-form-item label="确认结果" prop="status">
-        <el-radio-group v-model="confirmData.status">
-          <el-radio :label="0">确认</el-radio>
-          <el-radio :label="1">提出异议</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        label="异议内容"
-        prop="description"
-        v-if="confirmData.status == 1"
+      <el-form
+        ref="confirmForm"
+        :model="confirmData"
+        label-width="100px"
+        class="form"
+        v-if="type == 'confirm'"
+        :rules="confirmRule"
       >
-        <el-input
-          v-model="confirmData.description"
-          maxlength="255"
-          placeHolder="请输入异议内容"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    <el-form
-      ref="confirmDissentForm"
-      :model="confirmDissentData"
-      label-width="100px"
-      class="form"
-      v-if="type == 'confirmDissent'"
-      :rules="confirmDissentRule"
-    >
-      <el-form-item label="审核结果" prop="status">
-        <el-radio-group v-model="confirmDissentData.status">
-          <el-radio :label="0">同意</el-radio>
-          <el-radio :label="1">不同意</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        label="原因"
-        prop="description"
-        v-if="confirmDissentData.status == 1"
+        <el-form-item label="确认结果" prop="status">
+          <el-radio-group v-model="confirmData.status">
+            <el-radio :label="0">确认</el-radio>
+            <el-radio :label="1">提出异议</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          label="异议内容"
+          prop="description"
+          v-if="confirmData.status == 1"
+        >
+          <el-input
+            v-model="confirmData.description"
+            maxlength="255"
+            placeHolder="请输入异议内容"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form
+        ref="confirmDissentForm"
+        :model="confirmDissentData"
+        label-width="100px"
+        class="form"
+        v-if="type == 'confirmDissent'"
+        :rules="confirmDissentRule"
       >
-        <el-input
-          v-model="confirmDissentData.description"
-          placeHolder="请输入原因"
-          maxlength="255"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    
-
+        <el-form-item label="审核结果" prop="status">
+          <el-radio-group v-model="confirmDissentData.status">
+            <el-radio :label="0">同意</el-radio>
+            <el-radio :label="1">不同意</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          label="原因"
+          prop="description"
+          v-if="confirmDissentData.status == 1"
+        >
+          <el-input
+            v-model="confirmDissentData.description"
+            placeHolder="请输入原因"
+            maxlength="255"
+          ></el-input>
+        </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 {
@@ -225,8 +243,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;
       });
@@ -351,14 +369,18 @@ export default {
 .imageList div {
   margin-left: 5px;
   margin-right: 5px;
+
+  ::v-deep .el-image__error {
+    display: none !important;
+  }
 }
-.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;
 
@@ -369,10 +391,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/list/index.vue

@@ -183,7 +183,7 @@
                 <span>{{
                   getLabel(
                     dict.type.question_confirm_status,
-                    scope.row.confirmStatus
+                    scope.row.overdueStatus?scope.row.overdueStatus:scope.row.confirmStatus
                   )
                 }}</span>
               </template>

src/views/question/reform/dialog.vue

@@ -343,6 +343,10 @@ export default {
 .imageList div {
   margin-left: 5px;
   margin-right: 5px;
+
+  ::v-deep .el-image__error {
+    display: none !important;
+  }
 }
 .question-dialog-body {
   max-height: 500px;

src/views/question/reform/index.vue

@@ -154,7 +154,7 @@
                 <span>{{
                   getLabel(
                     dict.type.question_reform_status,
-                    scope.row.reformStatus
+                    scope.row.overdueStatus?scope.row.overdueStatus:scope.row.reformStatus
                   )
                 }}</span>
               </template>

src/views/resumption/ruleManager/index.vue

@@ -130,7 +130,7 @@
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
-            height="640"
+            height="600"
           >
             <el-table-column type="expand">
               <template slot-scope="props">

src/views/safetycheck/ruleManager/index.vue

@@ -106,7 +106,7 @@
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
-            height="640"
+            height="600"
           >
             <el-table-column header-align="center" type="expand">
               <template slot-scope="props">