fix 80314

src/views/documentTool/documentComparison/ComparisonResults.vue

@@ -39,7 +39,7 @@
     </template>
 
     <div class="result-content">
-      <div class="result-content-header">
+      <div class="result-content-header" :class="{'result-content-header-has-scroll': hasScrollBar}">
         <a-checkbox @change="onChange" :indeterminate="indeterminate" :checked="checkAll"></a-checkbox>
         <div class="result-content-header-content">
           <div class="result-content-header-content-item result-content-header-content-item-standard"
@@ -169,7 +169,8 @@ export default {
         exportData: '/compare/sarFileCompareItemComment/exportResXls'
       },
       image: false,
-      imageUrl: ''
+      imageUrl: '',
+      hasScrollBar: false // 页面中间部分是否有滚动条
     }
   },
   mounted () {
@@ -275,6 +276,15 @@ export default {
       getComparisonResultDetail(query).then((res) => {
         if (res.success) {
           this.resultData = res.result || {}
+          // 处理页面中部滚动导致表格对不齐的问题
+          this.$nextTick(() => {
+            const scrollBoxDom = document.getElementsByClassName('scroll-content')[0]
+            if (scrollBoxDom && scrollBoxDom.scrollHeight > scrollBoxDom.clientHeight) {
+              this.hasScrollBar = true
+            } else {
+              this.hasScrollBar = false
+            }
+          })
         } else {
           this.resultData = {}
         }
@@ -409,11 +419,19 @@ export default {
   }
 }
 
+.result-content-header-has-scroll {
+  padding-right: 8px;
+}
+
 .scroll-content {
   height: calc(100% - 76px - 71px - 58px);
   overflow: auto;
 }
 
+.ant-checkbox-group {
+  width: 100%;
+}
+
 .clause-item {
   width: 100%;
   height: auto;

src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue

@@ -23,20 +23,15 @@
           <label>{{ $t('workCenter.esInspectionProcess.rectificationStatus') }}</label>
           <span>{{ detailData.state_dictText }}</span>
         </div>
-        <!--相关项目-->
-        <div class="detail-page-part-form-item">
-          <label>{{ $t('projectLibrary.noncoincidenceItem.relevantProject') }}</label>
-          <span>{{ detailData.projectName }}</span>
-        </div>
         <!--预计整改完成日期-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('projectLibrary.vehicleItemLibrary.estimatedDateOfCompletionOfRectification') }}</label>
           <span>{{ detailData.expectedTime }}</span>
         </div>
-        <!--责任部门-->
+        <!--相关项目-->
         <div class="detail-page-part-form-item">
-          <label>{{ $t('projectLibrary.vehicleItemLibrary.responsibleDepartment') }}</label>
-          <span>{{ detailData.departmentId_dictText }}</span>
+          <label>{{ $t('projectLibrary.noncoincidenceItem.relevantProject') }}</label>
+          <span>{{ detailData.projectName }}</span>
         </div>
         <!--设计工程师-->
         <div class="detail-page-part-form-item">
@@ -73,11 +68,6 @@
           <label>{{ $t('projectLibrary.noncoincidenceItem.involvedItem') }}</label>
           <span>{{ detailData.projectName }}</span>
         </div>
-        <!--责任部门-->
-        <div class="line-form-item">
-          <label>{{ $t('projectLibrary.vehicleItemLibrary.responsibleDepartment') }}</label>
-          <span>{{ detailData.departmentId_dictText }}</span>
-        </div>
         <!--设计工程师-->
         <div class="line-form-item">
           <label>{{ $t('workCenter.standardConsultationProcess.designEngineer') }}</label>
@@ -117,7 +107,7 @@ export default {
 }
 
 .detail-page-part-form {
-  padding: 0 20px;
+  padding: 0;
 }
 
 .detail-page-part-form-item {