diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
index 7194bea46..cdc03a047 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
@@ -5,11 +5,10 @@
         <el-col :span="2">
           <div class="nav-border login">
             <el-row>
-              <el-button v-if="isLogin" style="width: 100px;line-height: 19px;" plain @click="login">{{ loginText }}</el-button>
-              <div v-else class="loginClass" style="width: 100px;height:20px;text-align:center;border:1px #ccc solid">{{ loginText }}</div>
+              <el-button style="width: 100px;line-height: 19px;" plain @click="login">{{ loginText }}</el-button>
             </el-row>
             <el-row>
-              <input v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="isLogin" @keyup.enter="validateData">
+              <input v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="isLogin||this.loginText == '登录'" @keyup.enter="validateData">
             </el-row>
           </div>
         </el-col>
@@ -389,9 +388,10 @@ export default {
             this.$refs.logDetail.doShow();
         },
         login() {
-			this.loginText = this.loginText == '退出' ? '登录': '用户';
+			this.loginText = this.loginText == '注销' ? '登录': '名称';
 			this.inputStr = '';
 			this.$emit('login', '');
+			console.log(this.loginText)
         },
         validateData() {
             if (this.keydownTimes === 0) {
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 856db3b0c..00452a7e4 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -240,7 +240,9 @@ export default {
                         trainingOperateConfigList.push({value: item.operateObject, label: Cookies.get('user_lang') == 'en' ? objectLabel.enlabel : objectLabel.label});
                     }
                 });
-                this.queryForm.queryObject.type.config.data = trainingOperateConfigList;
+				this.queryForm.queryObject.type.config.data = trainingOperateConfigList;
+				this.queryForm.queryObject.type.config.value = '';
+				this.queryForm.queryObject.operateType.config.value = '';
                 this.trainingTypeList = trainingOperateConfigList;
                 this.trainingTypeMap = operateTypeMap;
             } else {