diff --git a/src/views/ThemeAnalize/index.vue b/src/views/ThemeAnalize/index.vue
index 86dd4c7..ccf69c9 100644
--- a/src/views/ThemeAnalize/index.vue
+++ b/src/views/ThemeAnalize/index.vue
@@ -66,36 +66,37 @@
       </div>
       <a-modal :title="modalObj.title" width="1200px" :footer="null" :visible="modalObj.visible" :dialog-style="{ top: '20px' }">
           <div class="modal-outter">
-              <a-tabs type="card" @change="handlerTabs">
-                  <a-tab-pane key="0" tab="便捷模式">
-                      <div class="modal-container">
+                <div class="modal-top">
+                  <v-tab-group :btns="['便捷模式', '高级模式']" @change="changeMode"></v-tab-group>
+                </div>
+                    <div v-if="isHigh==0">
+                      <div class="modal-container" >
                           <div class="modal-form">
                               <a-form-model :model="addForm" :label-col="{span : 4}" :wrapper-col="{span : 18}">
-                                  <a-tabs type="card"><a-tab-pane key="10" tab="名称设置">
+                                  <v-label-div title="名称设置"></v-label-div>
                                   <a-form-model-item label="主题名称"><a-input placeholder="请输入主题名称" v-model="addForm.Name"></a-input></a-form-model-item>
                                   <a-form-model-item label="监测周期">
                                       <a-range-picker show-time v-model="selTime" :disabled-date="disabledDate" @calendarChange="calendarPriceRangeChange" valueFormat="YYYY-MM-DD HH:mm:ss" @ok="handlerChangeTime">
                                             <a-icon slot="suffixIcon" type="calendar" />
                                       </a-range-picker>
                                   </a-form-model-item>
-                                  </a-tab-pane></a-tabs>
-                                  <a-tabs type="card">
-                                      <a-tab-pane key="11" tab="必选词“和”的关系">
+                                  <v-label-div title="分析词设置">
+                                      <v-tab-group style="margin-right: 48px" :btns="['必选词和的关系', '主题词或的关系']" @change="handlerHH"></v-tab-group>
+                                  </v-label-div>
+                                      <div v-if="mode == 0">
                                           <a-form-model-item label="必选词"><a-input placeholder="请输入分析关键词，多个词用，隔开，最多支持5个" @change="doCombo" v-model="addForm.DetailsData[0].AnalyzeWord"></a-input></a-form-model-item>
                                           <a-form-model-item label="可选词"><a-input placeholder="请输入可选词，多个词用，隔开，最多支持5个" @change="doCombo" v-model="addForm.DetailsData[0].HuoWord"></a-input></a-form-model-item>
                                           <a-form-model-item label="排除词"><a-input placeholder="请输入排除词，多个词用，隔开，最多支持5个" v-model="addForm.DetailsData[0].PaiChu"></a-input></a-form-model-item>
-                                      </a-tab-pane>
-                                      <a-tab-pane key="12" tab="主题词“或”的关系">
-                                          <a-form-model-item label="主体词"><a-input placeholder="请输入主体词，多个词用，隔开，最多支持5个" @change="doCombo"></a-input></a-form-model-item>
+                                      </div>
+                                      <div v-if="mode == 1">
+                                          <a-form-model-item label="主体词"><a-input placeholder="请输入主体词，多个词用，隔开，最多支持5个" @change="doCombo" v-model="addForm.DetailsData[0].AnalyzeWord"></a-input></a-form-model-item>
                                           <a-form-model-item label="关键词组一"><a-input placeholder="请输入关键词，多个词用，隔开，最多支持5个" @change="doCombo"></a-input></a-form-model-item>
                                           <a-form-model-item label="关键词组二"><a-input placeholder="请输入关键词，多个词用，隔开，最多支持5个" @change="doCombo"></a-input></a-form-model-item>
-                                          <a-form-model-item label="排除词"><a-input placeholder="请输入排除词，多个词用，隔开，最多支持5个"></a-input></a-form-model-item>
-                                      </a-tab-pane>
-                                  </a-tabs>
-                                  <a-tabs type="card"><a-tab-pane key="13" tab="定向监测">
+                                          <a-form-model-item label="排除词"><a-input placeholder="请输入排除词，多个词用，隔开，最多支持5个" v-model="addForm.DetailsData[0].PaiChu"></a-input></a-form-model-item>
+                                      </div>
+                                  <v-label-div title="定向监测"></v-label-div>
                                   <a-form-model-item label="媒体"><a-input placeholder="请输入媒体名称，多个词用，隔开，最多支持5个"></a-input></a-form-model-item>
                                   <a-form-model-item label="作者"><a-input placeholder="请输入作者名称，多个词用，隔开，最多支持5个"></a-input></a-form-model-item>
-                                  </a-tab-pane></a-tabs>
                               </a-form-model>
                           </div>
                           <div class="modal-display">
@@ -108,9 +109,13 @@
                               </a-descriptions>
                           </div>
                       </div>
-                  </a-tab-pane>
-                  <a-tab-pane key="1" tab="高级模式">
-                      <div class="modal-container">
+                      <div align="center">
+                        <v-btn @click="handlerOk">确定</v-btn>
+                        <v-btn @click="handlerCancel">关闭</v-btn>
+                      </div>
+                    </div>
+                    <div v-if="isHigh==1">
+                      <div class="modal-container" >
                           <div class="modal-form">
                               <a-form-model :model="addForm" :label-col="{span : 4}" :wrapper-col="{span : 18}">
                                   <a-tabs type="card"><a-tab-pane key="21" tab="名称设置">
@@ -140,32 +145,23 @@
                               </a-descriptions>
                           </div>
                       </div>
-                  </a-tab-pane>
-              </a-tabs>
-              <div>
-                    <div align="center">
+                      <div align="center">
                         <v-btn @click="handlerOk">确定</v-btn>
                         <v-btn @click="handlerCancel">关闭</v-btn>
+                      </div>
                     </div>
-              </div>
-          </div>
-          <div slot="footer">
-              <div align="center">
-                  <v-btn @click="handlerOk">确定</v-btn>
-              </div>
+                <div>
+                    
+                </div>
           </div>
       </a-modal>
   </div>
 </template>
 
 <script>
-import newThemeModal from "./newThemeModal"
 import tbEvent from './tbEvent'
 export default {
     name: "themeAnalize",
-    components: {
-        newThemeModal
-    },
     data() {
         return {
             myThemeArr: [],
@@ -196,6 +192,17 @@ export default {
                     }
                 ]
             },
+            searchWord: {
+                mustWord: '', //和模式-必选词
+                huoWord: '', //可选词
+                mainWord: '', //或模式-主体词
+                keyWord1: '', //关键词1
+                keyWord2: '', //关键词2
+                highlvlWord: '', //高级模式分析词
+                paichuWord: '', //排除词
+            },
+            mode: 0,
+            isHigh: 0,
             //配置组合示例
             combo:{
                 number: 0,
@@ -279,13 +286,16 @@ export default {
 }
 .modal-outter {
     background: rgb(28, 39, 65);
+    .modal-top {
+        padding: 16px;
+    }
 }
 .modal-container {
     display: flex;
     justify-content: flex-start;
     color: white;
     width: 1200px;
-    height: 680px;
+    // height: 680px;
     .modal-form {
         width: 60%;
     }
diff --git a/src/views/ThemeAnalize/tbEvent.js b/src/views/ThemeAnalize/tbEvent.js
index 6460eb6..4c47bc3 100644
--- a/src/views/ThemeAnalize/tbEvent.js
+++ b/src/views/ThemeAnalize/tbEvent.js
@@ -48,7 +48,7 @@ export default {
             token: this.getToken,
             Guids: guids
         };
-    getSchemeDataByGuid(obj).then(res => {
+        getSchemeDataByGuid(obj).then(res => {
             let data = res.data;
             this.addForm = data;
             this.doCombo();
@@ -68,6 +68,22 @@ export default {
     },
     //删除确认框
     cancel() {},
+    //处理输入的词
+    doWords() {
+        if(this.mode == 0 && this.isHigh == 0) { //和模式
+            this.addForm.IsAdvancedQuery = 0;
+            this.addForm.AnalyzeWord = this.searchWord.mustWord;
+            this.addForm.HuoWord = this.searchWord.huoWord;
+            this.addForm.PaiChu = this.searchWord.paichuWord;
+        } else if (this.mode == 2 && this.isHigh == 0) { //或模式
+            this.addForm.AnalyzeWord = this.searchWord.mustWord;
+            this.addForm.HuoWord = this.searchWord.keyWord1 + ';' + this.searchWord.keyWord2;
+            this.addForm.PaiChu = this.searchWord.paichuWord;
+        } else { //高级模式
+            this.addForm.IsAdvancedQuery = 1;
+            this.addForm.AnalyzeWord = this.searchWord.highlvlWord;
+        }   
+    },
     //新增确认框
     handlerOk() {
         let newForm = {
@@ -120,8 +136,12 @@ export default {
         this.comboHigh = this.addForm.DetailsData[0].AnalyzeWord
     },
     //切换模式
-    handlerTabs(activeTab) {
+    handlerHH(activeTab) {
+        this.mode = activeTab;
+    },
+    changeMode(activeTab) {
         this.addForm.DetailsData[0].IsAdvancedQuery = activeTab;
+        this.isHigh = activeTab;
     },
     //切换主题
     handlerChangeTheme(n) {
@@ -200,6 +220,6 @@ export default {
         this.selectPriceDate = "";
     },
     disabledDate(current) {
-        return current > moment();
+        return false;
     },
 }
\ No newline at end of file
diff --git a/src/views/ThemeData/index.vue b/src/views/ThemeData/index.vue
index e8a0a38..433f1d2 100644
--- a/src/views/ThemeData/index.vue
+++ b/src/views/ThemeData/index.vue
@@ -43,7 +43,7 @@
                     <span class="s1">共计<span class="ss1">{{totalNum}}</span>条数据，已选中<span class="ss1">{{tableAll ? totalNum : sk.length}}</span>条数据</span>
                     <div>
                         <a-button type="primary" @click="goOutput">导出数据</a-button>
-                        <a-button type="primary" @click="goThemeBoard">数据看板</a-button>
+                        <a-button type="primary" @click="goThemeBoard" style="margin-left: 12px">数据看板</a-button>
                     </div>
                 </div>
                 <v-table ref="rtable" :row-selection="rowSelection" :columns="columns" :data="tbData" :loading="tableLoading" :pagination="pagination" @change="handlerPage">