From 2f0152419e1cb77e26c3e71d9c2dbfe91d8238a5 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Fri, 8 Apr 2022 10:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B7=B2=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../splitting/modules/ImportResult.vue        |  4 +-
 .../splitting/modules/SplitText.vue           | 89 ++++++++++++++-----
 2 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index d5f636481..f0591dda3 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -148,7 +148,7 @@
         OperationList:[],
         upload1:this.$t('upload1'),
         // accept:'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/msword',
-        accept:'application/zip',
+        accept:'application/x-zip-compressed',
         rows:[],
         token:Vue.ls.get(ACCESS_TOKEN),
         flag:false,  //提交表单标识
@@ -160,7 +160,7 @@
     },
     watch:{
       'form.file'(val){
-        console.log('val111',val)
+        // console.log('val111',val)
       },
 
     },
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
index ca183fd58..96e47f140 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
@@ -14,6 +14,36 @@
             <search :url="url" :flag="'condition'"></search>
           </div>
         </div>
+        <div class="table-operator operator-select">
+          <div class="operator-text">
+<!--            <a-icon type="download" />-->
+<!--            模板下载-->
+
+            <div  class="operator-select-type">
+              <span class="operator-file-type">文件类型：</span>
+              <a-select  v-model="fileGroup" style="width: 100px">
+                <a-select-option value="GSO" key="GSO">
+                  GSO
+                </a-select-option>
+                <a-select-option value="Korean" key="Korean">
+                  韩国
+                </a-select-option>
+                <a-select-option value="US" key="US">
+                  美国
+                </a-select-option>
+                <a-select-option value="EU" key="EU">
+                  欧洲
+                </a-select-option>
+                <a-select-option value="Japan" key="Japan">
+                  日本
+                </a-select-option>
+                <a-select-option value="CN" key="CN">
+                  中国
+                </a-select-option>
+              </a-select>
+            </div>
+          </div>
+        </div>
         <div class="split-table-detail">
           <tableData
             :flag="'header'"
@@ -24,29 +54,29 @@
             @onSelectChange="onSelectChange"
           />
         </div>
-        <div style="width: 100px">
-          文件类型：
-          <a-select  v-model="fileGroup" style="width: 100px">
-            <a-select-option value="GSO" key="GSO">
-              GSO
-            </a-select-option>
-            <a-select-option value="Korean" key="Korean">
-              韩国
-            </a-select-option>
-            <a-select-option value="US" key="US">
-              美国
-            </a-select-option>
-            <a-select-option value="EU" key="EU">
-              欧洲
-            </a-select-option>
-            <a-select-option value="Japan" key="Japan">
-              日本
-            </a-select-option>
-            <a-select-option value="CN" key="CN">
-              中国
-            </a-select-option>
-          </a-select>
-        </div>
+<!--        <div style="width: 100px">-->
+<!--          文件类型：-->
+<!--          <a-select  v-model="fileGroup" style="width: 100px">-->
+<!--            <a-select-option value="GSO" key="GSO">-->
+<!--              GSO-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="Korean" key="Korean">-->
+<!--              韩国-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="US" key="US">-->
+<!--              美国-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="EU" key="EU">-->
+<!--              欧洲-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="Japan" key="Japan">-->
+<!--              日本-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="CN" key="CN">-->
+<!--              中国-->
+<!--            </a-select-option>-->
+<!--          </a-select>-->
+<!--        </div>-->
         <div class="split-footer">
           <div class="split-footer-wrap">
             <a-button class="split-btn split-chai" type="primary" @click="submitSplit">{{$t('split')}}</a-button>
@@ -266,6 +296,19 @@
       }
     }
   }
+  .operator-select{
+    margin-bottom: 20px;
+    margin-left: 60px;
+    .operator-file-type{
+      /*width: 100px;*/
+      line-height: 32px;
+      display: inline-block;
+    }
+    .operator-select-type{
+      display: flex;
+      justify-content: start;
+    }
+  }
 
 </style>
 <style lang="less">