zxl #15

Merged
zhangxuelin merged 9 commits from zxl into main 2024-11-06 17:31:43 +08:00
11 changed files with 246 additions and 19 deletions
Showing only changes of commit bbf85c4337 - Show all commits

View File

@ -105,6 +105,14 @@ export function deptTree(data) {
params:data
})
}
//获取学校
export function getdeptTree(data) {
return request({
url: '/system/user/deptTree',
method: 'get',
params:data
})
}
// 查询部门详细
export function getDept(query) {
return request({
@ -129,4 +137,12 @@ export function listEvaluation(query) {
method: 'get',
params: query
})
}
}
// 发送验证码
export function sendcode(query) {
return request({
url: '/code/send',
method: 'post',
data
})
}

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1730256542457') format('woff2'),
url('iconfont.woff?t=1730256542457') format('woff'),
url('iconfont.ttf?t=1730256542457') format('truetype');
src: url('iconfont.woff2?t=1730272564579') format('woff2'),
url('iconfont.woff?t=1730272564579') format('woff'),
url('iconfont.ttf?t=1730272564579') format('truetype');
}
.iconfont {
@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-tianchongxing-:before {
content: "\e641";
}
.icon-daishenhe:before {
content: "\e64c";
}
.icon-A:before {
content: "\e6ef";
}

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,20 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "6446310",
"name": "博士",
"font_class": "tianchongxing-",
"unicode": "e641",
"unicode_decimal": 58945
},
{
"icon_id": "8651682",
"name": "待审核",
"font_class": "daishenhe",
"unicode": "e64c",
"unicode_decimal": 58956
},
{
"icon_id": "12688893",
"name": "A",

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -1,7 +1,26 @@
<template>
<div class="joinschool">
<div>加入学校</div>
<div class="box-item login" >
<div class="titletext"><span style="font-size:30px;margin-right:30px" class="iconfont icon-tianchongxing-"></span>加入学校</div>
<!-- <div style="border-bottom:1px solid #eee;padding-bottom:10px;margin-bottom:10px">
<img style="margin: 0 auto;height:85px" src="@/assets/images/shenhe.png" alt="">
<p style="color:#F59A23;font-size:22px">申请审核中</p>
<p style="color:#000;font-size:16px;font-weight:600">申请信息已提交请耐心等待审核通过即可完成申请</p>
</div> -->
<!-- <div style="border:1px solid #000;margin-bottom:20px;background:#DFF0D8">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="success"></el-result>
<p style="font-size:30px;color:#67C23A">审核通过</p>
</div>
<p style="margin-bottom:10px;color:#439FFE; cursor: pointer">重新认证</p>
</div> -->
<div style="border:1px solid #000;margin-bottom:20px;background:#F2DEDE">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="error"></el-result>
<p style="font-size:30px;color:#E10A07">申请驳回</p>
</div>
<p style="margin-bottom:10px;font-size:18px;font-weight:600">申请信息已驳回请重新提交申请信息</p>
</div>
<div class="box-item" >
<el-form ref="ruleFormRef" label-width="auto" size="large">
<el-form-item label="所属地区" prop="username">
<el-cascader
@ -10,20 +29,20 @@
:options="regionData"
/>
</el-form-item>
<el-form-item label="学校名称" prop="Code">
<el-input placeholder="请输入学校名称" />
<el-form-item label="学校名称" prop="school" >
<el-cascader :options="optionsSchool" style="width:100%" v-model="ruleForm.school" @change="handleSchoolChange" />
</el-form-item>
<el-form-item label="申请人" >
{{ state.user.nickName }}
</el-form-item>
<el-form-item label="申请人电话" >
{{ state.user.phonenumber }}
</el-form-item>
<el-form-item >
<div style="width:100%;text-align: right;padding-right:100px">
<el-button style="width:100px" type="default">关闭</el-button>
<el-button style="width:100px" type="primary" >确定</el-button>
<el-button style="width:150px" type="default">关闭</el-button>
<el-button style="width:150px" type="primary" >确定</el-button>
</div>
</el-form-item>
</el-form>
@ -32,11 +51,65 @@
</template>
<script setup >
import { ref, reactive, onMounted } from 'vue'
import { regionData, codeToText } from 'element-china-area-data'
import { getUserProfile } from '@/api/system/user'
import {getdeptTree} from '@/api/login'
const state = reactive({
user: {},
})
const ruleForm = reactive({
school:[],
})
const optionsSchool=ref([])
async function getUser() {
getUserProfile().then((response) => {
// response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
Object.assign(state.user,response.data)
})
}
const getSchoolList = () => {
getdeptTree().then(res=>{
optionsSchool.value=res.data
optionsSchool.value.forEach(item=>{
item.value=item.id
if(!item.children){
item.disabled=true
}
if(item.children){
item.children.forEach(child=>{
child.value=child.id
if(!child.children){
child.disabled=true
}
if(child.children){
child.children.forEach(grandson=>{
grandson.value=grandson.id
})
}
})
}
})
})
}
onMounted(() => {
getUser()
getSchoolList()
})
</script>
<style scoped>
<style scoped lang="scss">
.joinschool{
padding: 20px;
background: #fff;
.titletext{
text-align: left;
display: flex;
align-items: center;
font-size: 30px;
margin-bottom: 30px;
}
}
</style>

View File

@ -38,7 +38,7 @@
<el-input placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="验证码" prop="Code">
<el-input style="width:185px" placeholder="请输入验证码" /><el-button type="primary" >发送验证码</el-button>
<el-input style="width:185px" placeholder="请输入验证码" /><el-button type="primary" @click="sendyzm">发送验证码</el-button>
</el-form-item>
<el-form-item label="密码" prop="password" >
<el-input autocomplete="on" type="password" placeholder="请输入密码" />
@ -73,6 +73,7 @@ import WindowTools from '@/components/window-tools/index.vue'
import SelectSubject from '@/components/select-subject/index.vue'
import Register from './components/Register.vue'
import { sessionStore } from '@/utils/store'
import {sendcode} from '@/api/login'
const { session } = require('@electron/remote')
const downloadProp = ref(0)
@ -107,6 +108,10 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
downloadProp.value = prop
showDownLoading.value = prop !== 100
})
//
const sendyzm=()=>{
// sendcode
}
//
const RegisterModel = type => {
RegModel.value.OpenModel(type)

View File

@ -1,13 +1,124 @@
<template>
<div>
<div>加入学校</div>
<div class="joinschool">
<div class="titletext"><span style="font-size:30px;margin-right:30px" class="iconfont icon-tianchongxing-"></span>学校认证</div>
<div style="border-bottom:1px solid #eee;padding-bottom:10px;margin-bottom:10px">
<img style="margin: 0 auto;height:85px" src="@/assets/images/shenhe.png" alt="">
<p style="color:#F59A23;font-size:22px">申请审核中</p>
<p style="color:#000;font-size:16px;font-weight:600">申请信息已提交请耐心等待审核通过即可完成申请</p>
</div>
<!-- <div style="border:1px solid #000;margin-bottom:20px;background:#DFF0D8">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="success"></el-result>
<p style="font-size:30px;color:#67C23A">审核通过</p>
</div>
<p style="margin-bottom:10px;color:#439FFE; cursor: pointer">重新认证</p>
</div> -->
<!-- <div style="border:1px solid #000;margin-bottom:20px;background:#F2DEDE">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="error"></el-result>
<p style="font-size:30px;color:#E10A07">申请驳回</p>
</div>
<p style="margin-bottom:10px;font-size:18px;font-weight:600">申请信息已驳回请重新提交申请信息</p>
</div> -->
<div class="box-item">
<el-form ref="ruleFormRef" label-width="auto" size="large">
<el-form-item label="学校名称" prop="name" >
<el-input v-model="ruleForm.name" placeholder="请输入学校名称" />
</el-form-item>
<el-form-item label="所属地区" prop="username">
<el-cascader
style="width:100%"
popper-class="aix-regist-address"
:options="regionData"
/>
</el-form-item>
<el-form-item label="事业单位法人证书号" prop="school" >
<el-input v-model="ruleForm.name" placeholder="请输入事业单位法人证书号" />
</el-form-item>
<el-form-item label="经办人" >
{{ state.user.nickName }}
</el-form-item>
<el-form-item label="经办人电话" >
{{ state.user.phonenumber }}
</el-form-item>
<el-form-item >
<div style="display:flex;align-items:center;justify-content: space-between;padding-right:100px; width: 100%;">
<div style="display:flex;align-items:center;">
<el-checkbox style="margin: 0px 10px 0px 55px" size="large" /> 以上信息真实有效勾选后提交
</div>
<div >
<el-button style="width:150px" type="default">关闭</el-button>
<el-button style="width:150px" type="primary" >确定</el-button>
</div>
</div>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script setup >
import { ref, reactive, onMounted } from 'vue'
import { regionData, codeToText } from 'element-china-area-data'
import { getUserProfile } from '@/api/system/user'
import {getdeptTree} from '@/api/login'
const state = reactive({
user: {},
})
const ruleForm = reactive({
school:[],
})
const optionsSchool=ref([])
async function getUser() {
getUserProfile().then((response) => {
// response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
Object.assign(state.user,response.data)
})
}
const getSchoolList = () => {
getdeptTree().then(res=>{
optionsSchool.value=res.data
optionsSchool.value.forEach(item=>{
item.value=item.id
if(!item.children){
item.disabled=true
}
if(item.children){
item.children.forEach(child=>{
child.value=child.id
if(!child.children){
child.disabled=true
}
if(child.children){
child.children.forEach(grandson=>{
grandson.value=grandson.id
})
}
})
}
})
})
}
onMounted(() => {
getUser()
getSchoolList()
})
</script>
<style scoped>
<style scoped lang="scss">
.joinschool{
padding: 20px;
background: #fff;
.titletext{
text-align: left;
display: flex;
align-items: center;
font-size: 30px;
}
}
</style>