staging #23

Merged
hy merged 38 commits from staging into master 2025-10-14 11:13:16 +08:00
2 changed files with 17 additions and 10 deletions
Showing only changes of commit eb306eab72 - Show all commits

View File

@ -7,8 +7,12 @@ VITE_PUBLIC_PATH = /
# 开发环境路由历史模式Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数"
VITE_ROUTER_HISTORY = "hash"
VITE_API_BASEURL = "http://192.168.2.33:5199/api"
# # 接口地址
# VITE_API_BASEURL = "http://192.168.2.33:5199/api"
# #数据中心后台地址
# VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"
# 接口地址
# VITE_API_BASEURL = "http://localhost:5199/api"
VITE_API_BASEURL = "https://learn-archives-admin-dev.23544.com/api"
#数据中心后台地址
VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"

View File

@ -163,20 +163,20 @@
</el-table-column>
</el-table>
<el-card class="box-card">
<div class="clearfix clearfixCss">
<div class="flex justify-between clearfixCss">
<span style="line-height: 32px; font-weight: 600"
>{{ userType == 1 ? "就读班级" : "已选职位" }}[{{
selectPositions.length
}}]</span
>
<el-button
style="float: right"
type="success"
@click="handleConfirm"
:icon="Check"
<div>
<el-button @click="reload">重置</el-button>
<el-button type="success" @click="handleConfirm" :icon="Check"
>提交分配职位</el-button
>
</div>
</div>
<div class="positionGap">
<el-tag
v-for="(p, o) in selectPositions"
@ -433,6 +433,9 @@ const fetchPagedData = async () => {
}
};
const reload = () => {
selectPositions.value = [];
};
const handleConfirm = () => {
if (selectPositions.value.length === 0) {
ElMessage.warning("请选择要分配的职位");