Skip to content

G
gk
Commit d66eab98 authored by daniel's avatar daniel
Browse files
Options

feat(interceptor): 拦截器修复

parent e565b772
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 8 deletions
src/main/java/com/dlbridge/jadp/common/interceptor/SecurityInterceptor.java
View file @ d66eab98
...@@ -61,13 +61,13 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor ...@@ -61,13 +61,13 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor
Method method = handlerMethod.getMethod(); Method method = handlerMethod.getMethod();
PageView annotation = method.getAnnotation(PageView.class); PageView annotation = method.getAnnotation(PageView.class);
String userAgent = request.getHeader("user-agent").toLowerCase(); // String userAgent = request.getHeader("user-agent").toLowerCase();
if(userAgent.indexOf("miniprogram")>-1) {//小程序 // if(userAgent.indexOf("miniprogram")>-1) {//小程序
String partnerId = request.getParameter("partnerId"); // String partnerId = request.getParameter("partnerId");
if(partnerId == null){ // if(partnerId == null){
throw new NoAuthException("未查询到partnerdId,没权限！,uri: " + request.getRequestURI()); // throw new NoAuthException("未查询到partnerdId,没权限！,uri: " + request.getRequestURI());
} // }
} // }
if(request.getRequestURI().indexOf("easy") > -1 && request.getSession().getAttribute("user") == null){ if(request.getRequestURI().indexOf("easy") > -1 && request.getSession().getAttribute("user") == null){
response.sendRedirect(domain+"login"); response.sendRedirect(domain+"login");
......
src/main/webapp/WEB-INF/views/cmpt/markNoSelect.jsp
View file @ d66eab98
...@@ -201,6 +201,64 @@ ...@@ -201,6 +201,64 @@
negative-text="取消" negative-text="取消"
@positive-click="randomAssign" @positive-click="randomAssign"
/> />
<n-modal
v-model:show="showEditModal"
:mask-closable="false"
style="width: 600px"
title="编辑选手信息"
preset="card"
>
<n-form
ref="editFormRef"
:model="editFormData"
label-placement="left"
label-width="auto"
>
<n-form-item label="姓名" path="name">
<n-input v-model:value="editFormData.name" placeholder="请输入姓名" />
</n-form-item>
<n-form-item label="证件号" path="identityNo">
<n-input v-model:value="editFormData.identityNo" placeholder="请输入证件号" />
</n-form-item>
<n-form-item label="组别" path="roadName">
<n-input v-model:value="editFormData.roadName" placeholder="请输入组别" />
</n-form-item>
<n-form-item label="性别" path="gender">
<n-select v-model:value="editFormData.gender" :options="genderOptions" placeholder="请选择性别" />
</n-form-item>
<n-form-item label="年龄" path="age">
<n-input-number v-model:value="editFormData.age" placeholder="请输入年龄" />
</n-form-item>
<n-form-item label="参赛号" path="markNo">
<n-input v-model:value="editFormData.markNo" placeholder="请输入参赛号" />
</n-form-item>
<n-form-item label="手机号" path="phone">
<n-input v-model:value="editFormData.phone" placeholder="请输入手机号" />
</n-form-item>
<n-form-item label="分区" path="zone">
<n-input v-model:value="editFormData.zone" placeholder="请输入分区" />
</n-form-item>
</n-form>
<template #footer>
<div class="flex gap-x-2 flex-row items-center">
<n-button class="flex-1" :loading="loading" @click="showEditModal = false">
取消
</n-button>
<n-button class="flex-1" :loading="loading" type="primary" @click="submitEdit">
保存
</n-button>
</div>
</template>
</n-modal>
<n-modal
v-model:show="showDeleteModal"
preset="dialog"
title="确认删除"
content="确定要删除该选手吗?"
positive-text="确认"
negative-text="取消"
@positive-click="confirmDelete"
/>
</n-space> </n-space>
</script> </script>
<script> <script>
...@@ -285,6 +343,17 @@ ...@@ -285,6 +343,17 @@
total: 0 total: 0
}, },
]) ])
// 性别选项
const genderOptions = [
{
label: '男',
value: 0
},
{
label: '女',
value: 1
}
]
const playersColumns = [ const playersColumns = [
{ {
title: '姓名', title: '姓名',
...@@ -298,6 +367,10 @@ ...@@ -298,6 +367,10 @@
title: '组别', title: '组别',
key: 'roadName', key: 'roadName',
}, },
{
title: '性别',
key: 'genderName',
},
{ {
title: '手机号', title: '手机号',
key: 'phone', key: 'phone',
...@@ -313,6 +386,30 @@ ...@@ -313,6 +386,30 @@
{ {
title: '更新时间', title: '更新时间',
key: 'updateTime', key: 'updateTime',
},
{
title: '操作',
key: 'actions',
width: 200,
align: 'center',
render: (row) => {
return h(NSpace, {}, [
h(NButton, {
type: 'primary',
size: 'small',
onClick: () => {
editPlayer(row)
}
}, '编辑'),
h(NButton, {
type: 'error',
size: 'small',
onClick: () => {
deletePlayer(row)
}
}, '删除')
])
}
} }
] ]
const markNoColumns = [ const markNoColumns = [
...@@ -651,6 +748,94 @@ ...@@ -651,6 +748,94 @@
} }
} }
/***---------------- 自助选号背景 end -----------------*/ /***---------------- 自助选号背景 end -----------------*/
/***---------------- 编辑和删除功能 start -----------------*/
// 编辑弹窗显示
const showEditModal = ref(false)
// 删除弹窗显示
const showDeleteModal = ref(false)
// 编辑表单ref
const editFormRef = ref(null)
// 当前操作的选手
const currentPlayer = ref(null)
// 编辑表单数据
const editFormData = reactive({
id: null,
name: '',
identityNo: '',
roadName: '',
gender: 0,
age: 0,
markNo: '',
phone: '',
zone: ''
})
// 编辑选手
const editPlayer = (row) => {
currentPlayer.value = row
Object.assign(editFormData, {
id: row.id,
name: row.name,
identityNo: row.identityNo,
roadName: row.roadName,
gender: row.gender,
age: row.age,
markNo: row.markNo,
phone: row.phone,
zone: row.zone
})
showEditModal.value = true
}
// 提交编辑
const submitEdit = async () => {
loading.value = true
const [err, res] = await to(fetch(BASE_ECC_URL + '/api-pick/v1/update-markno-enroll', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(editFormData)
}).then(res => res.json()))
loading.value = false
if (err) {
message.error(err)
return
}
if (res.code === 200) {
message.success('更新成功')
showEditModal.value = false
fetchData()
} else {
message.error(res.message)
}
}
// 删除选手
const deletePlayer = (row) => {
currentPlayer.value = row
showDeleteModal.value = true
}
// 确认删除
const confirmDelete = async () => {
loading.value = true
const [err, res] = await to(fetch(BASE_ECC_URL + '/api-pick/v1/delete-enroll?id=' + currentPlayer.value.id, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
}
}).then(res => res.json()))
loading.value = false
if (err) {
message.error(err)
return
}
if (res.code === 200) {
message.success('删除成功')
showDeleteModal.value = false
fetchData()
} else {
message.error(res.message)
}
}
/***---------------- 编辑和删除功能 end -----------------*/
onMounted(() => { onMounted(() => {
fetchData() fetchData()
}) })
...@@ -676,6 +861,7 @@ ...@@ -676,6 +861,7 @@
StatusEnum, StatusEnum,
ListEnum, ListEnum,
statusOptions, statusOptions,
genderOptions,
// 名单导出 // 名单导出
exportExcel, exportExcel,
download, download,
...@@ -694,7 +880,16 @@ ...@@ -694,7 +880,16 @@
roadNames, roadNames,
changeRoad, changeRoad,
onFileUploadBg, onFileUploadBg,
beforeUploadBg beforeUploadBg,
// 编辑和删除
showEditModal,
showDeleteModal,
editFormRef,
editFormData,
editPlayer,
submitEdit,
deletePlayer,
confirmDelete
} }
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment