fix: modify
							parent
							
								
									4ab7fa1c21
								
							
						
					
					
						commit
						4e04b2d068
					
				| 
						 | 
				
			
			@ -7,11 +7,6 @@
 | 
			
		|||
      <el-container class="main-container">
 | 
			
		||||
        <ThirdMenu :menuData="thirdMenuData" v-if="thirdMenuData.children"></ThirdMenu>
 | 
			
		||||
        <el-main class="main-body">
 | 
			
		||||
          <div style="background-color: red">
 | 
			
		||||
            <el-select v-model="selectPostion" @change="SET_SELECTED_POSITION">
 | 
			
		||||
              <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 | 
			
		||||
            </el-select>
 | 
			
		||||
          </div>
 | 
			
		||||
          <el-scrollbar class="custom-scrollbar" style="flex: 1">
 | 
			
		||||
            <transition enter-active-class="fadeInUp" mode="out-in">
 | 
			
		||||
              <!-- <router-view v-if="$route.path === '/404'"></router-view> -->
 | 
			
		||||
| 
						 | 
				
			
			@ -136,10 +131,6 @@ export default {
 | 
			
		|||
    function setTime() {
 | 
			
		||||
      store.commit('SET_OPERATETIME')
 | 
			
		||||
    }
 | 
			
		||||
    const selectPostion = ref('')
 | 
			
		||||
    const SET_SELECTED_POSITION = () => {
 | 
			
		||||
      store.commit('SET_SELECTED_POSITION', selectPostion.value)
 | 
			
		||||
    }
 | 
			
		||||
    return {
 | 
			
		||||
      isCollapsed: computed(() => store.state.app.isCollapsed),
 | 
			
		||||
      basePath: computed(() => store.state.app.basePath),
 | 
			
		||||
| 
						 | 
				
			
			@ -151,9 +142,7 @@ export default {
 | 
			
		|||
      showSidebar,
 | 
			
		||||
      thirdMenuData,
 | 
			
		||||
      toggleCollapsed,
 | 
			
		||||
      setTime,
 | 
			
		||||
      selectPostion,
 | 
			
		||||
      SET_SELECTED_POSITION
 | 
			
		||||
      setTime
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  methods: {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,36 +0,0 @@
 | 
			
		|||
import { getSystemConfigs } from 'services'
 | 
			
		||||
 | 
			
		||||
const state = {
 | 
			
		||||
  // 是否主阵地
 | 
			
		||||
  isMainPosition: true,
 | 
			
		||||
  // 阵地列表
 | 
			
		||||
  positionList: [
 | 
			
		||||
    { name: '主阵地', id: 1 },
 | 
			
		||||
    { name: '子阵地 1', id: 2 }
 | 
			
		||||
  ],
 | 
			
		||||
  selectedPostion: ''
 | 
			
		||||
}
 | 
			
		||||
const mutations = {
 | 
			
		||||
  SET_SELECTED_POSITION(state, value) {
 | 
			
		||||
    state.selectedPostion = value
 | 
			
		||||
  },
 | 
			
		||||
  SET_IS_MAIN_POSITION(state, value) {
 | 
			
		||||
    state.isMainPosition = value
 | 
			
		||||
  },
 | 
			
		||||
  SET_POSITION_LIST(state, value) {
 | 
			
		||||
    state.positionList = value
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
const actions = {
 | 
			
		||||
  async GetPostionList({ commit }) {
 | 
			
		||||
    const data = await getSystemConfigs({ codes: 'pwdStrength,lockScreenTime' })
 | 
			
		||||
    if (data.success) {
 | 
			
		||||
      commit('SET_POSITION_LIST', data.data)
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
export default {
 | 
			
		||||
  state,
 | 
			
		||||
  mutations,
 | 
			
		||||
  actions
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -16,6 +16,7 @@
 | 
			
		|||
      <el-form :model="loginForm" ref="loginFormRef" label-position="left" label-width="0px" class="card-box login-form" @keyup.enter="activeName === 'normal' ? handleLogin : handleUkeyLogin">
 | 
			
		||||
        <el-tabs v-model="activeName">
 | 
			
		||||
          <el-tab-pane label="云管登录" name="normal">
 | 
			
		||||
            <div v-if="activeName === 'normal'">
 | 
			
		||||
              <div class="login-title">账号登录</div>
 | 
			
		||||
              <el-form-item class="login-form-item" prop="account" :rules="[{ ...required, message: '请输入用户名' }]">
 | 
			
		||||
                <el-input v-model="loginForm.account" autocomplete="off" placeholder="登录账户">
 | 
			
		||||
| 
						 | 
				
			
			@ -45,8 +46,10 @@
 | 
			
		|||
                </div>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
              <el-button class="login-btn" type="primary" :loading="loading" @click="handleLogin">登录</el-button>
 | 
			
		||||
            </div>
 | 
			
		||||
          </el-tab-pane>
 | 
			
		||||
          <el-tab-pane label="UKEY登录(待联调)" name="UKEY">
 | 
			
		||||
            <div v-if="activeName === 'UKEY'">
 | 
			
		||||
              <el-tooltip :visible="capsTooltip" content="大写锁定已打开" placement="right" :manual="true">
 | 
			
		||||
                <el-form-item class="login-form-item" prop="ukeyPassword" :rules="[{ ...required, message: '请输入UKEY密码' }]">
 | 
			
		||||
                  <el-input show-password v-model="loginForm.ukeyPassword" placeholder="UKEY密码" @blur="capsTooltip = false" @keyup="checkCapslock">
 | 
			
		||||
| 
						 | 
				
			
			@ -57,6 +60,7 @@
 | 
			
		|||
                </el-form-item>
 | 
			
		||||
              </el-tooltip>
 | 
			
		||||
              <el-button class="login-btn" type="primary" :loading="loading" @click="handleUkeyLogin">登录</el-button>
 | 
			
		||||
            </div>
 | 
			
		||||
          </el-tab-pane>
 | 
			
		||||
        </el-tabs>
 | 
			
		||||
      </el-form>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue