Просмотр исходного кода

Merge branch 'cc-dev' into 'dev'

修改走查问题

See merge request product-group-fe/sfy-safety-group/sfy-safety!104
陈昶 10 месяцев назад
Родитель
Сommit
5ef575d339

+ 0 - 6
src/views/disaster/components/PreviewOnline.vue

@@ -66,12 +66,6 @@
     height: 100% !important;
     height: 100% !important;
     overflow-y: auto !important;
     overflow-y: auto !important;
   }
   }
-  :deep(.vue-office-pdf-wrapper) {
-    padding: 0 !important;
-    canvas {
-      top: 0 !important;
-    }
-  }
   :deep(.pptx-preview-wrapper) {
   :deep(.pptx-preview-wrapper) {
     height: 1080px !important;
     height: 1080px !important;
   }
   }

+ 1 - 20
src/views/disaster/disaster-control/PageDisposalRectification.vue

@@ -93,7 +93,7 @@
                         <span v-else>--</span>
                         <span v-else>--</span>
                       </template>
                       </template>
                       <template #action="scope">
                       <template #action="scope">
-                        <div class="action-container" v-if="scope.row.fixStatus === FIX_STATUS.TO_BE_RECTIFIED">
+                        <div class="action-container">
                           <ActionButton
                           <ActionButton
                             text="查看"
                             text="查看"
                             @click="
                             @click="
@@ -117,25 +117,6 @@
                             @click="handleAddFixer(scope.row.id, scope.row.fixerList)"
                             @click="handleAddFixer(scope.row.id, scope.row.fixerList)"
                           />
                           />
                         </div>
                         </div>
-                        <div class="action-container" v-else>
-                          <ActionButton
-                            text="查看"
-                            @click="
-                              handleViewTask(item.id, 'item', scope.row.fixTaskId, scope.row.deptId, scope.row.id)
-                            "
-                          />
-                          <ActionButton
-                            text="去整改"
-                            @click="
-                              handleRectification(
-                                scope.row.id,
-                                item.id,
-                                scope.row.fixTaskId,
-                                item.tableData[0].disasterReportRecordDetailList,
-                              )
-                            "
-                          />
-                        </div>
                       </template>
                       </template>
                     </BasicTable>
                     </BasicTable>
                   </div>
                   </div>

+ 1 - 1
src/views/disaster/disaster-control/src/components/Rectification.vue

@@ -20,7 +20,7 @@
           处置优先级:<span>{{ getPriority(rectificationPriority) }}</span>
           处置优先级:<span>{{ getPriority(rectificationPriority) }}</span>
         </p>
         </p>
       </div>
       </div>
-      <BasicTable :tableData="rectificationList" :tableConfig="tableConfig">
+      <BasicTable :tableData="[...rectificationList].reverse()" :tableConfig="tableConfig">
         <template #fixMethod="scope">
         <template #fixMethod="scope">
           <div class="long-text-container">
           <div class="long-text-container">
             <el-tooltip
             <el-tooltip