Merge remote-tracking branch 'origin/master'

jero-web/src/components/tools/Logo.vue

@@ -6,10 +6,11 @@
       <!--      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">-->
       <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-
+     <span v-if="showTitle">拆分比对工具</span>
-      <img v-if="showTitle" src='../../assets/image/logoExpand.png' alt="logo" />
+      <span v-else class="noTitle">拆分比对工具</span>
+      <!--      <img v-if="showTitle" src='../../assets/image/logoExpand.png' alt="logo" />-->
       <!--<img src="~@/assets/image/analysisLogo.png" alt="logo">-->
-      <img v-else src="../../assets/image/logoFold.png" />
+<!--      <img v-else src="../../assets/image/logoFold.png" />-->
     </router-link>
   </div>
 </template>
@@ -57,6 +58,7 @@ export default {
     transition: background 300ms;
     background-color: transparent !important;
     padding: 0 24px 0 0;
+    text-align: center;
 
     h1 {
       color: @primary-color !important;
@@ -66,7 +68,11 @@ export default {
     a {
       width: 100%;
       display: inline-block;
-      color: white;
+      /*color: #000;*/
+      font-weight: bold;
+      font-size: 16px;
+      /*color: white;*/
+
 
       img {
         width: 100%;
@@ -74,7 +80,7 @@ export default {
       }
 
       &:hover {
-        color: rgba(255, 255, 255, 0.8);
+        /*color: rgba(255, 255, 255, 0.8);*/
       }
     }
   }
@@ -83,4 +89,7 @@ export default {
     background-color: @primary-color;
   }
 }
+  .noTitle{
+     font-size: 12px;
+  }
 </style>

jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue

@@ -32,7 +32,7 @@
             size="middle"
             :can-drag="true"
             :loading="loadingLeft"
-            :pagination="false"
+            :pagination="ipaginationLeft"
             :scroll="{x: '100%',y:'calc(100vh - 400px)'}"
             rowKey="id"
             :data-source="dataSourceLeft"
@@ -87,7 +87,7 @@
             size="middle"
             :can-drag="true"
             :loading="loadingRight"
-            :pagination="false"
+            :pagination="ipaginationRight"
             :scroll="{x: '100%',y:'calc(100vh - 400px)'}"
             rowKey="id"
             :data-source="dataSourceRight"
@@ -96,7 +96,8 @@
             @change="tableChangeRight"
           >
           </j-table>
-<!--          <div class="box-button-standard">-->
+
+          <div class="box-button-standard">
 <!--                <span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')">-->
 <!--                     {{ $t('docTool.comparison.selectedStandard') }}-->
 <!--                </span>-->
@@ -108,7 +109,7 @@
 <!--                selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')-->
 <!--              }}-->
 <!--              </span>-->
-<!--          </div>-->
+          </div>
         </div>
       </div>