From e9c563383fe983983b902afcae81a3410d20a0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Mon, 18 Sep 2023 15:05:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=AF=94=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/router.config.js                   |  12 -
 .../DocumentComparison.vue                    |  71 ++---
 .../DocumentDataComparison.vue                | 289 ++++++++----------
 .../InitiateComparison.vue                    | 112 +++----
 .../{ => documentSplit}/DocumentSplit.vue     |  12 +-
 .../DocumentSplitDetail.vue                   |  22 +-
 6 files changed, 218 insertions(+), 300 deletions(-)
 rename src/views/documentTool/{ => documentComparison}/DocumentComparison.vue (87%)
 rename src/views/documentTool/{modules => documentComparison}/DocumentDataComparison.vue (66%)
 rename src/views/documentTool/{modules => documentComparison}/InitiateComparison.vue (86%)
 rename src/views/documentTool/{ => documentSplit}/DocumentSplit.vue (95%)
 rename src/views/documentTool/{ => documentSplit}/DocumentSplitDetail.vue (96%)

diff --git a/src/config/router.config.js b/src/config/router.config.js
index 2aaf929c..4f070709 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -322,18 +322,6 @@ export const constantRouterMap = [
       }
     ]
   },
-  // 文档对比-发起对比
-  {
-    path: '/initiateDocumentComparison',
-    name: 'initiateDocumentComparison',
-    component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/modules/InitiateComparison')
-  },
-  // 文档对比-发起对比
-  {
-    path: '/documentDataComparison',
-    name: 'documentDataComparison',
-    component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/modules/DocumentDataComparison')
-  },
   // 文档对比-对比结果
   {
     path: '/comparisonResults',
diff --git a/src/views/documentTool/DocumentComparison.vue b/src/views/documentTool/documentComparison/DocumentComparison.vue
similarity index 87%
rename from src/views/documentTool/DocumentComparison.vue
rename to src/views/documentTool/documentComparison/DocumentComparison.vue
index e0eb9ef0..c443fc1e 100644
--- a/src/views/documentTool/DocumentComparison.vue
+++ b/src/views/documentTool/documentComparison/DocumentComparison.vue
@@ -3,44 +3,42 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <!--编号-->
           <a-col :md="6" :sm="8">
             <a-form-item :label="$t('number')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
               <a-input :placeholder="$t('pleaseEnter') + $t('number')"
                        v-model="queryParam.serialNumber"></a-input>
             </a-form-item>
           </a-col>
+          <!--标题-->
           <a-col :md="6" :sm="8">
             <a-form-item :label="$t('title')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
               <a-input :placeholder="$t('pleaseEnter') + $t('title')"
                        v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
+          <!--发布情况-->
           <a-col :md="6" :sm="8">
             <a-form-item :label="$t('docTool.comparison.releaseSituation')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
               <j-dict-select-tag v-model="queryParam.releaseState"
                                  :placeholder="$t('pleaseSelect')+$t('docTool.comparison.releaseSituation')"
                                  type="select"
-                                 :triggerChange="false" dictCode="release_condition"/>
+                                 :triggerChange="false" dictCode="release_condition" />
             </a-form-item>
           </a-col>
           <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-            <a-button type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-            <a-button style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+            <a-button type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
+            <a-button style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
           </div>
         </a-row>
       </a-form>
     </div>
     <div class="table-operator">
-<!--      v-has="'documentComparison:Initiate'"-->
-      <div @click="initiatingProcessClick" class="operator-text">
-        <a-icon type="block"/>
-        {{$t('docTool.comparison.initiateComparison')}}
-      </div>
-<!--      v-has="'documentComparison:batchDelete'"-->
-      <div @click="batchDelete" class="operator-text">
-        <a-icon type="delete"/>
-        {{$t('batchDelete')}}
-      </div>
+      <!--      v-has="'documentComparison:Initiate'"-->
+      <a-button icon="block" type="primary" ghost @click="initiatingProcessClick">{{ $t('docTool.comparison.initiateComparison') }}
+      </a-button>
+      <!--      v-has="'documentComparison:batchDelete'"-->
+      <a-button type="primary" icon="delete" ghost @click="batchDel" v-has="'split:sarFileSplitInfo:deleteBatch'">{{ $t('batchDelete') }}</a-button>
     </div>
     <div>
       <j-table
@@ -57,36 +55,37 @@
         @change="handleTableChange"
       >
         <template v-slot:operation="{text,record}">
-          <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('docTool.comparison.comparisonResults')}}</a>
+          <a class="text-operation" @click="comparisonResultsClick(record)">{{ $t('docTool.comparison.comparisonResults') }}</a>
 
           <a-divider type="vertical" v-if="record.createBy === userInfoQuery.username || administrators" />
 
           <a-dropdown v-if="record.createBy === userInfoQuery.username || administrators">
             <a class="ant-dropdown-link">
-              {{ $t('more') }} <a-icon type="down"/>
+              {{ $t('more') }}
+              <a-icon type="down" />
             </a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a v-if="record.createBy === userInfoQuery.username || administrators" @click="subscribe(record)">
-                  {{!record.releaseState || record.releaseState === 'draft' ? $t('release') :$t('withdraw')}}
-                 </a>
+                  {{ !record.releaseState || record.releaseState === 'draft' ? $t('release') : $t('withdraw') }}
+                </a>
               </a-menu-item>
               <a-menu-item>
                 <a v-if="(record.createBy === userInfoQuery.username || administrators) && record.releaseState === 'draft'"
-                   @click="edit(record)">{{$t('edit')}}</a>
+                   @click="edit(record)">{{ $t('edit') }}</a>
               </a-menu-item>
               <a-menu-item>
                 <a v-if="(record.createBy === userInfoQuery.username || administrators) && record.releaseState === 'draft'"
-                   @click="deleteData(record)">{{$t('delete')}}</a>
+                   @click="deleteData(record)">{{ $t('delete') }}</a>
               </a-menu-item>
             </a-menu>
           </a-dropdown>
         </template>
         <template v-slot:serialNumberRight="{text,record}">
-          <a @click="serialNumberRightClick(record)" :title="text">{{text}}</a>
+          <a @click="serialNumberRightClick(record)" :title="text">{{ text }}</a>
         </template>
         <template v-slot:serialNumberLeft="{text,record}">
-          <a @click="serialNumberLeftClick(record)" :title="text">{{text}}</a>
+          <a @click="serialNumberLeftClick(record)" :title="text">{{ text }}</a>
         </template>
       </j-table>
     </div>
@@ -94,11 +93,11 @@
 </template>
 
 <script>
-import { postAction, deleteAction } from '@/api/manage'
+import { postAction, deleteAction } from '../../../api/manage.js'
 import { mapGetters } from 'vuex'
-import JDictSelectTag from '@/components/dict/JDictSelectTag'
-import JTable from '@/components/jero/JTable'
-import { JeroListMixin } from '../../mixins/JeroListMixin'
+import JDictSelectTag from '../../../components/dict/JDictSelectTag.vue'
+import JTable from '../../../components/jero/JTable.vue'
+import { JeroListMixin } from '../../../mixins/JeroListMixin.js'
 
 export default {
   name: 'DocumentComparison',
@@ -113,7 +112,7 @@ export default {
       },
       loading: false,
       dataSource: [
-        {id: 1}
+        { id: 1 }
       ],
       selectedRowKeys: [],
       selectionRows: [],
@@ -137,7 +136,6 @@ export default {
       columns: [
         {
           title: this.$t('number') + ' 1',
-          align: 'left',
           dataIndex: 'serialNumberLeft',
           width: 170,
           ellipsis: true,
@@ -145,7 +143,6 @@ export default {
         },
         {
           title: this.$t('title') + ' 1',
-          align: 'left',
           dataIndex: 'titleLeft',
           width: 170,
           ellipsis: true,
@@ -153,14 +150,12 @@ export default {
         },
         {
           title: this.$t('docTool.comparison.textStatus') + ' 1',
-          align: 'left',
-          width: 200,
+          width: 150,
           ellipsis: true,
           dataIndex: 'fileTypeLeft'
         },
         {
           title: this.$t('number') + ' 2',
-          align: 'left',
           dataIndex: 'serialNumberRight',
           ellipsis: true,
           scopedSlots: { customRender: 'serialNumberRight' },
@@ -168,7 +163,6 @@ export default {
         },
         {
           title: this.$t('title') + ' 2',
-          align: 'left',
           dataIndex: 'titleRight',
           scopedSlots: { customRender: 'serialNumberRight' },
           ellipsis: true,
@@ -176,35 +170,30 @@ export default {
         },
         {
           title: this.$t('docTool.comparison.textStatus') + ' 2',
-          align: 'left',
-          width: 200,
+          width: 150,
           ellipsis: true,
           dataIndex: 'fileTypeRight'
         },
         {
           title: this.$t('docTool.comparison.releaseSituation'),
-          align: 'left',
           width: 170,
           ellipsis: true,
           dataIndex: 'releaseStateTitle'
         },
         {
           title: this.$t('creator'),
-          align: 'left',
-          width: 170,
+          width: 150,
           ellipsis: true,
           dataIndex: 'createBy'
         },
         {
           title: this.$t('remarks'),
-          align: 'left',
           ellipsis: true,
           width: 270,
           dataIndex: 'remark'
         },
         {
           title: this.$t('operation'),
-          align: 'center',
           fixed: 'right',
           width: 310,
           scopedSlots: { customRender: 'operation' }
@@ -319,7 +308,7 @@ export default {
     // 发起对比按钮点击
     initiatingProcessClick () {
       this.$router.push({
-        path: '/initiateDocumentComparison'
+        path: '/documentTool/InitiateComparison'
       })
       // let newUrl = this.$router.resolve({
       //   path: '/initiateDocumentComparison'
@@ -366,5 +355,5 @@ export default {
 </script>
 
 <style scoped lang="less">
-@import '~@assets/less/common.less';
+@import '~../../../assets/less/common.less';
 </style>
diff --git a/src/views/documentTool/modules/DocumentDataComparison.vue b/src/views/documentTool/documentComparison/DocumentDataComparison.vue
similarity index 66%
rename from src/views/documentTool/modules/DocumentDataComparison.vue
rename to src/views/documentTool/documentComparison/DocumentDataComparison.vue
index 2db8a6cd..291a5f1d 100644
--- a/src/views/documentTool/modules/DocumentDataComparison.vue
+++ b/src/views/documentTool/documentComparison/DocumentDataComparison.vue
@@ -1,130 +1,117 @@
 <template>
-  <a-spin :spinning="loading">
-    <div class="doc-detail-wrap">
-      <div class="doc-detail-header" style="position: fixed;top: 0">
-        <div class="doc-detail-title">
-             <span style="line-height: 66px;display: inline-block;float: left" @click="goBack">
-               <a-icon type="arrow-left" style="margin-right: 6px;"/>
-             </span>
-          <span> {{$t('docTool.comparison.documentComparison')}}</span>
-        </div>
-        <div class="doc-detail-right">
-          <div @click="viewTheComparisonResultsClick" class="operator-text-text"
-               :title="$t('docTool.comparison.viewTheComparisonResults')">
-            <a-icon type="eye"/>
-            {{$t('docTool.comparison.viewTheComparisonResults')}}
-          </div>
-          <div @click="addFullTextCommentClick" class="operator-text-text"
-               :title="$t('docTool.comparison.addFullTextComment')">
-            <a-icon type="message"/>
-            {{$t('docTool.comparison.addFullTextComment')}}
-          </div>
-          <div @click="turnOffAutomaticMatchingClick" class="operator-text-text"
-               :title="isMatching ? $t('docTool.comparison.turnOffAutomaticMatching'):$t('docTool.comparison.turnOnAutoMatch')">
-            <a-icon :type="isMatching?'close-circle':'check-circle'"/>
-            {{isMatching ? $t('docTool.comparison.turnOffAutomaticMatching'):$t('docTool.comparison.turnOnAutoMatch')}}
-          </div>
-        </div>
-      </div>
+  <internal-detail-page :title="$t('docTool.comparison.documentComparison')" :content-padding="0" :loading="loading">
+    <template v-slot:titleRightCustom>
+      <a-button class="header-btn" type="primary" icon="eye" ghost @click="viewTheComparisonResultsClick">
+        {{ $t('docTool.comparison.viewTheComparisonResults') }}
+      </a-button>
+      <a-button class="header-btn" type="primary" icon="message" ghost @click="addFullTextCommentClick">
+        {{ $t('docTool.comparison.addFullTextComment') }}
+      </a-button>
+      <a-button class="header-btn" type="primary" :icon="isMatching?'close-circle':'check-circle'" ghost @click="turnOffAutomaticMatchingClick">
+        {{ isMatching ? $t('docTool.comparison.turnOffAutomaticMatching') : $t('docTool.comparison.turnOnAutoMatch') }}
+      </a-button>
+    </template>
+    <div class="can-scroll-content">
       <div class="detail-content">
-        <div class="detail-content-cont">
-          <div class="detail-content-left">
-            <div class="detail-content-left-header"
-                 :title="resultData.serialNumberLeft + resultData.fileNameLeft">
-              {{this.resultData.serialNumberLeft}}&nbsp;
-              {{this.resultData.fileNameLeft}}
-            </div>
-            <div class="detail-content-content-left">
-              <a-tree
-                class="draggable-tree"
-                @select="onSelectLeft"
-                :tree-data="resultData.menuLeft"
-              />
-            </div>
-            <div class="detail-content-content-right-top">
-              <div class="detail-content-content-right">
-                <div class="detail-content-content-right-data" @click="detailLeft(index,item)"
-                     v-for="(item,index) in resultData.textLeft" :key="index"
-                     :class="{'detail-content-content-right-data-blue':item.reviewed === '1'}">
-                  <div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29">
-                    {{item.itemsNum + ' ' + item.itemsName}}
-                  </div>
-                  <div class="detail-content-content-right-data-text" v-html="item.itemsText"></div>
+        <div class="detail-content-left">
+          <div class="detail-content-left-header"
+               :title="resultData.serialNumberLeft + resultData.fileNameLeft">
+            {{ this.resultData.serialNumberLeft }}&nbsp;
+            {{ this.resultData.fileNameLeft }}
+          </div>
+          <div class="detail-content-content-left">
+            <a-tree
+              class="draggable-tree"
+              @select="onSelectLeft"
+              :tree-data="resultData.menuLeft"
+            />
+          </div>
+          <div class="detail-content-content-right-top">
+            <div class="detail-content-content-right">
+              <div class="detail-content-content-right-data" @click="detailLeft(index,item)"
+                   v-for="(item,index) in resultData.textLeft" :key="index"
+                   :class="{'detail-content-content-right-data-blue':item.reviewed === '1'}">
+                <div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29">
+                  {{ item.itemsNum + ' ' + item.itemsName }}
                 </div>
+                <div class="detail-content-content-right-data-text" v-html="item.itemsText"></div>
               </div>
             </div>
           </div>
-          <div class="detail-content-right">
-            <div class="detail-content-left-header">
+        </div>
+        <div class="detail-content-right">
+          <div class="detail-content-left-header">
                 <span class="detail-content-left-header-text"
                       :title="resultData.serialNumberRight + resultData.fileNameRight">
-                   {{this.resultData.serialNumberRight}}&nbsp;
-                   {{this.resultData.fileNameRight}}
+                   {{ this.resultData.serialNumberRight }}&nbsp;
+                   {{ this.resultData.fileNameRight }}
                 </span>
-              <!--                <span class="detail-content-left-header-text-right">-->
-              <!--                    <span style="color: #9B9DA9">相似度:</span>-->
-              <!--                    <span style="color: #E83030">98%</span>-->
-              <!--                 </span>-->
-            </div>
-            <div class="detail-content-content-left">
-              <a-tree
-                class="draggable-tree"
-                @select="onSelectRight"
-                :tree-data="resultData.menuRight"
-              />
-            </div>
-            <div class="detail-content-content-right-right-top">
-              <div class="detail-content-content-right-right">
-                <div class="detail-content-content-right-data-right" @click="detailRight(index,item)"
-                     v-for="(item,index) in resultData.textRight" :key="index"
-                     :class="{'detail-content-content-right-data-blue-right':item.reviewed === '1'}">
-                  <div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29">
-                    {{item.itemsNum + ' ' + item.itemsName}}
-                  </div>
-                  <div class="detail-content-content-right-data-text" v-html="item.itemsText">
-                  </div>
+            <!--                <span class="detail-content-left-header-text-right">-->
+            <!--                    <span style="color: #9B9DA9">相似度:</span>-->
+            <!--                    <span style="color: #E83030">98%</span>-->
+            <!--                 </span>-->
+          </div>
+          <div class="detail-content-content-left">
+            <a-tree
+              class="draggable-tree"
+              @select="onSelectRight"
+              :tree-data="resultData.menuRight"
+            />
+          </div>
+          <div class="detail-content-content-right-right-top">
+            <div class="detail-content-content-right-right">
+              <div class="detail-content-content-right-data-right" @click="detailRight(index,item)"
+                   v-for="(item,index) in resultData.textRight" :key="index"
+                   :class="{'detail-content-content-right-data-blue-right':item.reviewed === '1'}">
+                <div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29">
+                  {{ item.itemsNum + ' ' + item.itemsName }}
+                </div>
+                <div class="detail-content-content-right-data-text" v-html="item.itemsText">
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div class="remarks">
-          <a-form-model :model="formInline"
-                        class="formAdd" :rules="rules"
-                        ref="ruleForm">
-            <div class="box-title-text-remarks">
-              <div class="title-text-remarks" :title="$t('docTool.comparison.comparisonOfArticles')" style="width: 84px">
-                <span>{{$t('docTool.comparison.comparisonOfArticles')}}</span>
-              </div>
-              <a-form-model-item class="item-model" prop="comment">
-                <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.comparisonOfArticles')"
-                            v-model="formInline.comment"
-                            :maxLength="500"
-                            :rows="3"/>
-              </a-form-model-item>
+      </div>
+
+      <div class="remarks">
+        <a-form-model :model="formInline"
+                      class="formAdd" :rules="rules"
+                      ref="ruleForm">
+          <div class="box-title-text-remarks">
+            <div class="title-text-remarks" :title="$t('docTool.comparison.comparisonOfArticles')" style="width: 84px">
+              <span>{{ $t('docTool.comparison.comparisonOfArticles') }}</span>
             </div>
-          </a-form-model>
-        </div>
-        <div class="submit-button">
-          <a-button style="margin-right: 10px"
-                    type="primary" @click="consistentAssessmentClick()">{{$t('docTool.comparison.consistentAssessment')}}
-          </a-button>
-          <a-button type="primary" @click="submit()">{{$t('preservation')}}</a-button>
-        </div>
+            <a-form-model-item class="item-model" prop="comment">
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.comparisonOfArticles')"
+                          v-model="formInline.comment"
+                          :maxLength="500"
+                          :rows="3" />
+            </a-form-model-item>
+          </div>
+        </a-form-model>
       </div>
     </div>
+
+    <div class="submit-button">
+      <a-button style="margin-right: 10px" type="primary" @click="consistentAssessmentClick()">{{ $t('docTool.comparison.consistentAssessment') }}
+      </a-button>
+      <a-button type="primary" @click="submit()">{{ $t('preservation') }}</a-button>
+    </div>
+
     <comparison-add-full-comment ref="comparisonAddFullComment"></comparison-add-full-comment>
-  </a-spin>
+  </internal-detail-page>
 </template>
 
 <script>
-import { postAction, getAction } from '@/api/manage'
+import { postAction, getAction } from '../../../api/manage.js'
 // 添加全文评论弹框
-import ComparisonAddFullComment from './ComparisonAddFullComment'
+import ComparisonAddFullComment from '../modules/ComparisonAddFullComment.vue'
+import InternalDetailPage from '../../../components/InternalDetailPage.vue'
 
 export default {
   name: 'DocumentDataComparison',
-  components: { ComparisonAddFullComment },
+  components: { ComparisonAddFullComment, InternalDetailPage },
   data () {
     return {
       formInline: {},
@@ -409,79 +396,64 @@ export default {
 </script>
 
 <style scoped lang="less">
-.doc-detail-wrap {
-  .doc-detail-header {
-    width: 100%;
-    z-index: 1000;
-    height: 68px;
-    line-height: 68px;
-    padding: 0 0 0 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2px #eff1f3 solid;
-    background: #fff;
+.header-btn {
+  margin-left: 12px;
+}
 
-    .doc-detail-title {
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      font-size: 20px;
-      font-weight: 400;
-      color: #040B29;
-      line-height: 68px;
-    }
-  }
-  .doc-detail-right {
-    width: 600px;
-    line-height: 68px;
-    display: flex;
+.header-btn:first-child {
+  margin-left: 0;
+}
 
-    .operator-text-text {
-      cursor: pointer;
-      margin-right: 53px;
-      font-size: 14px;
-      font-weight: 400;
-      color: #040B29;
-      display: inline-block;
-      width: 33.3%;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      text-align: right;
-    }
+.can-scroll-content {
+  height: calc(100% - 52px);
+  overflow: auto;
+}
+
+.doc-detail-right {
+  width: 600px;
+  line-height: 68px;
+  display: flex;
+
+  .operator-text-text {
+    cursor: pointer;
+    margin-right: 53px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    width: 33.3%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-align: right;
   }
 }
 
 .detail-content {
-  padding-top: 68px;
-  background: #fff;
-  padding-bottom: 30px;
-  overflow-y: auto;
-  &-cont {
-    width: 100%;
-    overflow: hidden;
-    display: flex;
-  }
+  height: calc(100% - 131px);
+  display: flex;
+
   &-left {
     width: 50%;
-    height: calc(100vh - 210px);
+    height: 100%;
     border-right: 2px #EFF1F3 solid;
     padding: 24px 32px;
     box-sizing: border-box;
     border-bottom: 2px #EFF1F3 solid;
   }
+
   &-right {
     width: 50%;
-    height: calc(100vh - 210px);
+    height: 100%;
     padding: 24px 32px;
     box-sizing: border-box;
     border-bottom: 2px #EFF1F3 solid;
   }
+
   &-left-header {
     margin-bottom: 24px;
   }
+
   &-left-header-text {
     white-space: nowrap;
     overflow: hidden;
@@ -499,6 +471,7 @@ export default {
   height: 520px;
   float: left;
   overflow: auto;
+
   /deep/ .ant-tree-node-content-wrapper {
     display: inline-block !important;
     color: #040B29 !important;
@@ -543,14 +516,8 @@ export default {
 }
 
 .submit-button {
-  width: 100%;
-  height: 60px;
+  height: 52px;
   text-align: right;
-  padding: 14px 32px 0;
-  box-sizing: border-box;
-  border-top: 2px #eff1f3 solid;
-  background: #ffffff;
-  position: fixed;
-  bottom: 0;
+  padding: 10px 24px;
 }
 </style>
diff --git a/src/views/documentTool/modules/InitiateComparison.vue b/src/views/documentTool/documentComparison/InitiateComparison.vue
similarity index 86%
rename from src/views/documentTool/modules/InitiateComparison.vue
rename to src/views/documentTool/documentComparison/InitiateComparison.vue
index 72b5b389..a72b97d6 100644
--- a/src/views/documentTool/modules/InitiateComparison.vue
+++ b/src/views/documentTool/documentComparison/InitiateComparison.vue
@@ -1,15 +1,7 @@
 <template>
-  <div class="doc-detail-wrap">
-    <div class="doc-detail-header">
-      <div class="doc-detail-title">
-        <span style="line-height: 66px;display: inline-block;float: left" @click="goBack">
-         <a-icon type="arrow-left" style="margin-right: 6px;"/>
-        </span>
-        <span> {{$t('docTool.comparison.initiateComparison')}}</span>
-      </div>
-    </div>
-    <div class="detail-content">
-      <div style="width: 100%;height: auto;overflow: hidden">
+  <internal-detail-page :title="$t('docTool.comparison.initiateComparison')" :content-padding="0" :loading="loading">
+    <div class="can-scroll-content">
+      <div class="detail-content-box">
         <div class="detail-content-left">
           <a-form layout="inline" @keyup.enter.native="searchQueryLeft">
             <a-row :gutter="24">
@@ -27,8 +19,8 @@
               </a-col>
               <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="8" :sm="24">
-                  <a-button @click="searchResetLeft">{{$t('reset')}}</a-button>
-                  <a-button style="margin-left: 8px" type="primary" @click="searchQueryLeft">{{$t('query')}}</a-button>
+                  <a-button @click="searchResetLeft">{{ $t('reset') }}</a-button>
+                  <a-button style="margin-left: 8px" type="primary" @click="searchQueryLeft">{{ $t('query') }}</a-button>
                 </a-col>
               </span>
             </a-row>
@@ -49,13 +41,14 @@
           </j-table>
           <div class="box-button-standard">
             <span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')">
-                 {{$t('docTool.comparison.selectedStandard')}}
+                 {{ $t('docTool.comparison.selectedStandard') }}
             </span>
             <span class="box-button-standard-right"
                   @click="selectLeftClick(selectedRowsLeft[0])"
                   :title="selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
                   :class="{'box-button-standard-right-color':selectedRowsLeft[0]}">
-                      {{selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')}}
+                      {{ selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
+              }}
                </span>
           </div>
         </div>
@@ -76,8 +69,8 @@
               </a-col>
               <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="8" :sm="24">
-                  <a-button @click="searchResetRight">{{$t('reset')}}</a-button>
-                  <a-button style="margin-left: 8px" type="primary" @click="searchQueryRight">{{$t('query')}}</a-button>
+                  <a-button @click="searchResetRight">{{ $t('reset') }}</a-button>
+                  <a-button style="margin-left: 8px" type="primary" @click="searchQueryRight">{{ $t('query') }}</a-button>
                </a-col>
                </span>
             </a-row>
@@ -98,56 +91,59 @@
           </j-table>
           <div class="box-button-standard">
                 <span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')">
-                     {{$t('docTool.comparison.selectedStandard')}}
+                     {{ $t('docTool.comparison.selectedStandard') }}
                 </span>
             <span class="box-button-standard-right"
                   @click="selectLeftClick(selectedRowsRight[0])"
                   :title="selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
                   :class="{'box-button-standard-right-color':selectedRowsRight[0]}">
-                        {{selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')}}
+                        {{ selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
+              }}
               </span>
           </div>
         </div>
       </div>
+
       <div class="remarks">
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
           <div class="box-title-text-remarks">
             <div class="title-text-remarks" :title="$t('docTool.comparison.remarkInfo')">
-              <span>{{$t('docTool.comparison.remarkInfo')}}</span>
+              <span>{{ $t('docTool.comparison.remarkInfo') }}</span>
             </div>
             <a-form-model-item class="item-model" prop="remark">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.remarkInfo')"
                           :maxLength="300"
                           v-model="formInline.remark"
-                          :rows="4"/>
+                          :rows="4" />
             </a-form-model-item>
           </div>
         </a-form-model>
       </div>
-      <div class="submit-button">
-        <a-button class="box-button" type="primary" @click="submit">{{$t('docTool.comparison.initiateDocumentComparison')}}</a-button>
-      </div>
-
     </div>
-    <!--      <JLoading :loading="loading">{{$t('pleaseWaitWhileRunning')}}</JLoading>-->
+
+    <div class="box-button">
+      <a-button type="primary" @click="submit">{{ $t('docTool.comparison.initiateDocumentComparison') }}</a-button>
+    </div>
     <div id="images">
       <div class="image" v-viewer="{movable: false}">
         <img v-show="image" :src="imageUrl">
       </div>
     </div>
-  </div>
+  </internal-detail-page>
 </template>
 
 <script>
-import JTable from '@/components/jero/JTable'
-import { getAction, downloadFile, getFileAccessHttpUrl } from '@/api/manage'
-import { previewPdf } from '@/utils/previewPdf'
+import JTable from '../../../components/jero/JTable.vue'
+import { getAction, downloadFile, getFileAccessHttpUrl } from '../../../api/manage.js'
+import { previewPdf } from '../../../utils/previewPdf.js'
 import { Base64 } from 'js-base64'
 import { mapGetters } from 'vuex'
 
+import InternalDetailPage from '../../../components/InternalDetailPage.vue'
+
 export default {
   name: 'InitiateComparison',
-  components: { JTable },
+  components: { JTable, InternalDetailPage },
   data () {
     return {
       loading: false,
@@ -347,7 +343,7 @@ export default {
     },
     submit () {
       this.$router.push({
-        path: '/documentDataComparison',
+        path: '/documentTool/DocumentDataComparison'
       })
       // if (!this.selectedRowsRight[0] || !this.selectedRowsLeft[0]) {
       //   this.$message.warning(this.$t('pleaseSelectTheDataCompared'))
@@ -470,59 +466,33 @@ export default {
 </script>
 
 <style scoped lang="less">
-@import'~@assets/less/common.less';
+@import '~../../../assets/less/common.less';
 
-.doc-detail-wrap {
-  padding-bottom: 20px;
-  position: relative;
-
-  .doc-detail-header {
-    width: 100%;
-    z-index: 1000;
-    height: 68px;
-    line-height: 68px;
-    padding: 0 0 0 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2px #eff1f3 solid;
-    background: #fff;
-    position: fixed;
-    top: 0;
-
-    .doc-detail-title {
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      font-size: 20px;
-      font-weight: 400;
-      color: #040B29;
-      line-height: 68px;
-    }
-  }
+.can-scroll-content {
+  height: calc(100% - 52px);
+  overflow: auto;
 }
 
-.detail-content {
-  padding-top: 68px;
+.detail-content-box {
+  display: flex;
+  height: calc(100% - 152px);
 }
+
 .detail-content-left {
   width: 50%;
-  float: left;
   border-right: 2px #EFF1F3 solid;
   padding: 24px 32px;
   box-sizing: border-box;
   border-bottom: 2px #EFF1F3 solid;
-  height: 610px;
+  height: 100%;
 }
 
 .detail-content-right {
   width: 50%;
-  float: left;
   padding: 24px 32px;
   box-sizing: border-box;
   border-bottom: 2px #EFF1F3 solid;
-  height: 610px;
+  height: 100%;
 }
 
 .box-title-text-remarks {
@@ -545,6 +515,11 @@ export default {
   text-overflow: ellipsis;
 }
 
+.box-button {
+  padding: 10px 24px;
+  text-align: right;
+}
+
 .box-button-standard {
   width: 100%;
   margin-top: 20px;
@@ -586,7 +561,6 @@ export default {
   width: 50%;
   padding: 0 32px;
   box-sizing: border-box;
-  margin-bottom: 60px;
 }
 
 .item-model {
diff --git a/src/views/documentTool/DocumentSplit.vue b/src/views/documentTool/documentSplit/DocumentSplit.vue
similarity index 95%
rename from src/views/documentTool/DocumentSplit.vue
rename to src/views/documentTool/documentSplit/DocumentSplit.vue
index 247f63af..4f1b59aa 100644
--- a/src/views/documentTool/DocumentSplit.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplit.vue
@@ -93,14 +93,14 @@
 </template>
 
 <script>
-import '@assets/less/common.less'
-import JTable from '@/components/jero/JTable'
+import '../../../assets/less/common.less'
+import JTable from '../../../components/jero/JTable.vue'
 // 拆分已入库文本弹框
-import SplitText from './modules/SplitText'
+import SplitText from '../modules/SplitText.vue'
 // 导入拆分结果弹框
-import ImportResult from './modules/ImportResult'
-import { JeroListMixin } from '../../mixins/JeroListMixin.js'
-import { releaseSplitStandard } from '../../api/documentToolApi.js'
+import ImportResult from '../modules/ImportResult.vue'
+import { JeroListMixin } from '../../../mixins/JeroListMixin.js'
+import { releaseSplitStandard } from '../../../api/documentToolApi.js'
 
 export default {
   name: 'DocumentSplit',
diff --git a/src/views/documentTool/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
similarity index 96%
rename from src/views/documentTool/DocumentSplitDetail.vue
rename to src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index 5a56521a..78ece2b4 100644
--- a/src/views/documentTool/DocumentSplitDetail.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -180,21 +180,21 @@
 </template>
 
 <script>
-import InternalDetailPage from '../../components/InternalDetailPage.vue'
-import JTable from '../../components/jero/JTable.vue'
+import InternalDetailPage from '../../../components/InternalDetailPage.vue'
+import JTable from '../../../components/jero/JTable.vue'
 // 条款添加
-import SplitAddForm from './modules/SplitAddForm.vue'
+import SplitAddForm from '../modules/SplitAddForm.vue'
 // 条款内容弹框
-import SplitClauseDetail from './modules/SplitClauseDetail.vue'
+import SplitClauseDetail from '../modules/SplitClauseDetail.vue'
 // 添加左侧树节点弹框
-import SplitDetailNodeAdd from './modules/SplitDetailNodeAdd.vue'
+import SplitDetailNodeAdd from '../modules/SplitDetailNodeAdd.vue'
 // 批量设置弹框
-import SplitDetailBatchSetting from './modules/SplitDetailBatchSetting.vue'
+import SplitDetailBatchSetting from '../modules/SplitDetailBatchSetting.vue'
 import { mapGetters } from 'vuex'
-import { postAction, getAction, downloadFile } from '../../api/manage.js'
-import { ConfigurableTableMixin } from '../../mixins/ConfigurableTableMixin.js'
-import { getDocSplitTableHeader, getDocSplitSearch } from '../../api/documentToolApi.js'
-import Search from '../../components/customField/Search.vue'
+import { postAction, getAction } from '../../../api/manage.js'
+import { ConfigurableTableMixin } from '../../../mixins/ConfigurableTableMixin.js'
+import { getDocSplitTableHeader, getDocSplitSearch } from '../../../api/documentToolApi.js'
+import Search from '../../../components/customField/Search.vue'
 
 export default {
   name: 'DocumentSplitDetail',
@@ -554,7 +554,7 @@ export default {
 </script>
 
 <style scoped lang="less">
-@import '~../../assets/less/common.less';
+@import '~@assets/less/common.less';
 
 .page-left-right-layout {
   height: 100%;