diff --git a/src/renderer/src/api/login.js b/src/renderer/src/api/login.js index 16c03cf..9d9be49 100644 --- a/src/renderer/src/api/login.js +++ b/src/renderer/src/api/login.js @@ -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 }) -} \ No newline at end of file +} +// 发送验证码 +export function sendcode(query) { + return request({ + url: '/code/send', + method: 'post', + data + }) +} diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 9bc3530..7a2dab4 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -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"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 2ab5dd0..bc0fce0 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var v,a,t,z,i,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}v=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(v,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),v()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=v,z=l.document,i=!1,o(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){i||(i=!0,t())}function o(){try{z.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var v,a,t,z,i,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}v=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(v,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),v()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=v,z=l.document,i=!1,o(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){i||(i=!0,t())}function o(){try{z.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index e602f39..bc3a0e0 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -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", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index fc57eae..caaedec 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 61f95b2..2a10d4d 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index 707a061..0c91d58 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/assets/images/shenhe.png b/src/renderer/src/assets/images/shenhe.png new file mode 100644 index 0000000..38e227f Binary files /dev/null and b/src/renderer/src/assets/images/shenhe.png differ diff --git a/src/renderer/src/views/joinSchool/index.vue b/src/renderer/src/views/joinSchool/index.vue index 506bfdd..df39cf2 100644 --- a/src/renderer/src/views/joinSchool/index.vue +++ b/src/renderer/src/views/joinSchool/index.vue @@ -1,7 +1,26 @@ - \ No newline at end of file diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index 97529c7..d14c911 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -38,7 +38,7 @@ - 发送验证码 + 发送验证码 @@ -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) diff --git a/src/renderer/src/views/schoolCertification/index.vue b/src/renderer/src/views/schoolCertification/index.vue index 18ff6f9..f23d525 100644 --- a/src/renderer/src/views/schoolCertification/index.vue +++ b/src/renderer/src/views/schoolCertification/index.vue @@ -1,13 +1,124 @@ - \ No newline at end of file