Compare commits

...

3 Commits

Author SHA1 Message Date
朱浩 a62dde1b93 Merge remote-tracking branch 'origin/main' 2024-12-13 10:06:23 +08:00
朱浩 82548ce937 Merge remote-tracking branch 'origin/main' 2024-12-12 16:55:19 +08:00
朱浩 aa3be39721 研学相关权限问题 2024-12-12 16:55:08 +08:00
3 changed files with 12 additions and 6 deletions

View File

@ -22,4 +22,4 @@ VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868' VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
# 是否显示开发工具 # 是否显示开发工具
VITE_SHOW_DEV_TOOLS = 'true' VITE_SHOW_DEV_TOOLS = 'false'

View File

@ -11,7 +11,7 @@
</template> </template>
<div class="head-aside"> <div class="head-aside">
<ul > <ul >
<li v-if="!isStadium" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')" > <li v-if="isStadium() !== true" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')" >
<i class="iconfont icon-renzheng-" :style="computedregistertype==4?'color:green;':''"></i> <i class="iconfont icon-renzheng-" :style="computedregistertype==4?'color:green;':''"></i>
<span class="mlr-5" v-if="computedregistertype!=4">学校认证</span> <span class="mlr-5" v-if="computedregistertype!=4">学校认证</span>
<span class="mlr-5" v-else>{{ userStore.DeptInfo.register.schoolName }}</span> <span class="mlr-5" v-else>{{ userStore.DeptInfo.register.schoolName }}</span>
@ -19,8 +19,8 @@
</li> </li>
<li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li> <li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li>
<li @click="onUserTo('/profile')">个人中心</li> <li @click="onUserTo('/profile')">个人中心</li>
<li v-if="!isStadium" @click="onUserTo('/schoolManagement')">学校管理</li> <li v-if="isStadium() !== true" @click="onUserTo('/schoolManagement')">学校管理</li>
<li v-if="!isStadium" @click="onUserTo('/class')">班级中心</li> <li v-if="isStadium() !== true" @click="onUserTo('/class')">班级中心</li>
<li @click="logout">退出登录</li> <li @click="logout">退出登录</li>
</ul> </ul>
</div> </div>

View File

@ -4,7 +4,7 @@
<userAvatar /> <userAvatar />
<div class="info"> <div class="info">
<div class="info-name">{{ state.user.nickName }}</div> <div class="info-name">{{ state.user.nickName }}</div>
<div class="infomation"> <div class="infomation" v-if="isStadium() !== true" >
<selectClass v-if="!isSubject"/> <selectClass v-if="!isSubject"/>
</div> </div>
</div> </div>
@ -35,7 +35,7 @@ import { getUserProfile } from '@/api/system/user'
import pkc from "../../../../../package.json" import pkc from "../../../../../package.json"
// //
import selectClass from './components/selectClass.vue' import selectClass from './components/selectClass.vue'
import useUserStore from '@/store/modules/user'
const version = ref(pkc.version) const version = ref(pkc.version)
const activeTab = ref('userinfo') const activeTab = ref('userinfo')
@ -46,6 +46,12 @@ const state = reactive({
postGroup: {} postGroup: {}
}) })
const isStadium = () => {
let user = useUserStore().user
let roles = user.roles
return roles.some(item => item.roleKey === 'stadium')
}
const isSubject = ref(false) const isSubject = ref(false)
async function getUser() { async function getUser() {
getUserProfile().then((response) => { getUserProfile().then((response) => {