浏览代码

Merge branch 'fix_yjw' into debug

jwyu 5 月之前
父节点
当前提交
61f71d3ecf
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      src/views/Home.vue
  2. 3 3
      src/views/Login.vue
  3. 1 1
      src/views/login_manage/OrdinaryModel.vue

+ 2 - 2
src/views/Home.vue

@@ -624,8 +624,8 @@ export default {
         ['BI看板', require('@/assets/icons/menu/icon07.png')],
         ['研报管理', require('@/assets/icons/menu/icon08.png')],
         ['任务管理', require('@/assets/icons/menu/icon09.png')],
-        ['AI问答', require('@/assets/icons/menu/icon10.png')],
-        ['系统设置', require('@/assets/icons/menu/icon11.png')],
+        ['AI问答', require('@/assets/icons/menu/icon11.png')],
+        ['系统设置', require('@/assets/icons/menu/icon10.png')],
       ])
       return iconMap.get(item.name) || require('@/assets/icons/menu/icon01.png')
     },

+ 3 - 3
src/views/Login.vue

@@ -98,10 +98,10 @@
                         :loading="logining"
                         class="submit_btn"
                         ><!-- 登录 -->{{ $t('LoginPage.login_btn') }}</el-button>
-                    <div class="another-login-type">
+                    <!-- <div class="another-login-type">
                         <div class="another-type-hint">
                             <div class="type-hint-line"></div>
-                            <div class="type-hint-text"><!-- 其他登录方式 -->{{ $t('LoginPage.other_login_type') }}</div>
+                            <div class="type-hint-text">{{ $t('LoginPage.other_login_type') }}</div>
                             <div class="type-hint-line"></div>
                         </div>
                         <div class="another-type">
@@ -115,7 +115,7 @@
                             {{item.label}}
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
 			</div>
 			<div class="login-box" v-else>

+ 1 - 1
src/views/login_manage/OrdinaryModel.vue

@@ -41,7 +41,7 @@
                         </span>
                     </el-tooltip>
                 </el-checkbox>
-                <el-button type="text" style="font-size: 16px;" @click="changeModel"><!-- 忘记密码 -->{{ $t('LoginPage.label_forget') }}</el-button>
+                <!-- <el-button type="text" style="font-size: 16px;" @click="changeModel">{{ $t('LoginPage.label_forget') }}</el-button> -->
             </el-form-item>
         </el-form>
     </div>