Merge remote-tracking branch 'origin/master'

This commit is contained in:
wushaofeng 2020-12-30 17:18:16 +08:00
commit 7f96ccca8b
11 changed files with 13 additions and 4 deletions

View File

@ -49,7 +49,7 @@ const constantRoutes = [
path: 'student/list', path: 'student/list',
component: () => import('@/views/user/student/list'), component: () => import('@/views/user/student/list'),
name: 'UserStudentPageList', name: 'UserStudentPageList',
meta: { title: '学生列表', noCache: true } meta: { title: '招聘专员列表', noCache: true }
}, },
{ {
path: 'student/edit', path: 'student/edit',

View File

@ -113,6 +113,7 @@ export default {
this.initSubject(function () { this.initSubject(function () {
_this.subjectFilter = _this.subjects _this.subjectFilter = _this.subjects
}) })
this.subjectFilter = this.subjects.filter(data => data.level === this.form.gradeLevel)
if (id && parseInt(id) !== 0) { if (id && parseInt(id) !== 0) {
_this.formLoading = true _this.formLoading = true
questionApi.select(id).then(re => { questionApi.select(id).then(re => {
@ -177,13 +178,13 @@ export default {
items: [], items: [],
analyze: '', analyze: '',
correct: '', correct: '',
score: '', score: '0',
difficult: 0 difficult: 0
} }
}, },
levelChange () { levelChange () {
this.form.subjectId = null this.form.subjectId = null
this.subjectFilter = this.subjects.filter(data => data.level === this.form.gradeLevel) //this.subjectFilter = this.subjects.filter(data => data.level === this.form.gradeLevel)
console.log(this.subjectFilter); console.log(this.subjectFilter);
}, },

View File

@ -13,4 +13,4 @@
hm.src = 'https://hm.baidu.com/hm.js?cd8218cd51f800ed2b73e5751cb3f4f9' hm.src = 'https://hm.baidu.com/hm.js?cd8218cd51f800ed2b73e5751cb3f4f9'
var s = document.getElementsByTagName('script')[0] var s = document.getElementsByTagName('script')[0]
s.parentNode.insertBefore(hm, s) s.parentNode.insertBefore(hm, s)
})()</script><link href="static/css/chunk-066bbd34.c306629d.css" rel="prefetch"><link href="static/css/chunk-111f3671.d650a2aa.css" rel="prefetch"><link href="static/css/chunk-157f9069.c306629d.css" rel="prefetch"><link href="static/css/chunk-1c4df292.50289542.css" rel="prefetch"><link href="static/css/chunk-2baa78ac.c306629d.css" rel="prefetch"><link href="static/css/chunk-360c43ba.c306629d.css" rel="prefetch"><link href="static/css/chunk-3e96bd8c.c306629d.css" rel="prefetch"><link href="static/css/chunk-4010637e.c306629d.css" rel="prefetch"><link href="static/css/chunk-42236473.c306629d.css" rel="prefetch"><link href="static/css/chunk-5bc3d75d.c306629d.css" rel="prefetch"><link href="static/css/chunk-6092f506.89936c18.css" rel="prefetch"><link href="static/css/chunk-873a42e2.1951fa25.css" rel="prefetch"><link href="static/css/chunk-a85d3c1e.c8588555.css" rel="prefetch"><link href="static/css/chunk-a9d03770.c306629d.css" rel="prefetch"><link href="static/css/chunk-bab2e2c4.c306629d.css" rel="prefetch"><link href="static/js/chunk-066bbd34.140534af.js" rel="prefetch"><link href="static/js/chunk-111f3671.2e5e24f5.js" rel="prefetch"><link href="static/js/chunk-157f9069.c7c81c3e.js" rel="prefetch"><link href="static/js/chunk-16f9edc1.378287d5.js" rel="prefetch"><link href="static/js/chunk-1c4df292.38da0410.js" rel="prefetch"><link href="static/js/chunk-2baa78ac.a199e373.js" rel="prefetch"><link href="static/js/chunk-2d0c138b.b700863a.js" rel="prefetch"><link href="static/js/chunk-2d221bd2.a1b5633d.js" rel="prefetch"><link href="static/js/chunk-2d2300ef.88e7351f.js" rel="prefetch"><link href="static/js/chunk-2d230fe7.042d38d1.js" rel="prefetch"><link href="static/js/chunk-360c43ba.17196737.js" rel="prefetch"><link href="static/js/chunk-3e96bd8c.93acee3f.js" rel="prefetch"><link href="static/js/chunk-4010637e.ada51c0e.js" rel="prefetch"><link href="static/js/chunk-42236473.f7640463.js" rel="prefetch"><link href="static/js/chunk-5bc3d75d.a7027944.js" rel="prefetch"><link href="static/js/chunk-5bc4738d.f9bf6802.js" rel="prefetch"><link href="static/js/chunk-6092f506.272010c0.js" rel="prefetch"><link href="static/js/chunk-75f11c77.575d12af.js" rel="prefetch"><link href="static/js/chunk-78234ca2.ec0d4de6.js" rel="prefetch"><link href="static/js/chunk-793f0082.ad135597.js" rel="prefetch"><link href="static/js/chunk-873a42e2.641597a8.js" rel="prefetch"><link href="static/js/chunk-a85d3c1e.c270d287.js" rel="prefetch"><link href="static/js/chunk-a9d03770.bd46b6bc.js" rel="prefetch"><link href="static/js/chunk-b1da6300.469ef5f8.js" rel="prefetch"><link href="static/js/chunk-bab2e2c4.546b2e9b.js" rel="prefetch"><link href="static/js/chunk-d0753fda.12ca9d22.js" rel="prefetch"><link href="static/css/chunk-vendors.ee57d822.css" rel="preload" as="style"><link href="static/css/index.b455b9ca.css" rel="preload" as="style"><link href="static/js/chunk-vendors.9dd0934b.js" rel="preload" as="script"><link href="static/js/index.d6d95467.js" rel="preload" as="script"><link href="static/css/chunk-vendors.ee57d822.css" rel="stylesheet"><link href="static/css/index.b455b9ca.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-demo doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.9dd0934b.js"></script><script src="static/js/index.d6d95467.js"></script></body></html> })()</script><link href="static/css/chunk-157f9069.c306629d.css" rel="prefetch"><link href="static/css/chunk-1c4df292.50289542.css" rel="prefetch"><link href="static/css/chunk-360c43ba.c306629d.css" rel="prefetch"><link href="static/css/chunk-366bd7fc.3ba9b835.css" rel="prefetch"><link href="static/css/chunk-3e96bd8c.c306629d.css" rel="prefetch"><link href="static/css/chunk-4010637e.c306629d.css" rel="prefetch"><link href="static/css/chunk-42236473.c306629d.css" rel="prefetch"><link href="static/css/chunk-6092f506.89936c18.css" rel="prefetch"><link href="static/css/chunk-873a42e2.1951fa25.css" rel="prefetch"><link href="static/css/chunk-a85d3c1e.c8588555.css" rel="prefetch"><link href="static/css/chunk-a9d03770.c306629d.css" rel="prefetch"><link href="static/css/chunk-bab2e2c4.c306629d.css" rel="prefetch"><link href="static/js/chunk-157f9069.c7c81c3e.js" rel="prefetch"><link href="static/js/chunk-1c4df292.38da0410.js" rel="prefetch"><link href="static/js/chunk-2d0c138b.b700863a.js" rel="prefetch"><link href="static/js/chunk-2d221bd2.574db207.js" rel="prefetch"><link href="static/js/chunk-2d2300ef.88e7351f.js" rel="prefetch"><link href="static/js/chunk-2d230fe7.042d38d1.js" rel="prefetch"><link href="static/js/chunk-360c43ba.17196737.js" rel="prefetch"><link href="static/js/chunk-366bd7fc.8686af5f.js" rel="prefetch"><link href="static/js/chunk-3e96bd8c.a256fc09.js" rel="prefetch"><link href="static/js/chunk-4010637e.ada51c0e.js" rel="prefetch"><link href="static/js/chunk-42236473.f7640463.js" rel="prefetch"><link href="static/js/chunk-5bc4738d.f9bf6802.js" rel="prefetch"><link href="static/js/chunk-6092f506.272010c0.js" rel="prefetch"><link href="static/js/chunk-75f11c77.575d12af.js" rel="prefetch"><link href="static/js/chunk-78234ca2.ec0d4de6.js" rel="prefetch"><link href="static/js/chunk-793f0082.ad135597.js" rel="prefetch"><link href="static/js/chunk-873a42e2.641597a8.js" rel="prefetch"><link href="static/js/chunk-a85d3c1e.c270d287.js" rel="prefetch"><link href="static/js/chunk-a9d03770.bd46b6bc.js" rel="prefetch"><link href="static/js/chunk-b1da6300.c32ca6a0.js" rel="prefetch"><link href="static/js/chunk-bab2e2c4.e26a6c73.js" rel="prefetch"><link href="static/js/chunk-d0753fda.12ca9d22.js" rel="prefetch"><link href="static/css/chunk-vendors.ee57d822.css" rel="preload" as="style"><link href="static/css/index.b455b9ca.css" rel="preload" as="style"><link href="static/js/chunk-vendors.9dd0934b.js" rel="preload" as="script"><link href="static/js/index.a03887ec.js" rel="preload" as="script"><link href="static/css/chunk-vendors.ee57d822.css" rel="stylesheet"><link href="static/css/index.b455b9ca.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-demo doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.9dd0934b.js"></script><script src="static/js/index.a03887ec.js"></script></body></html>

View File

@ -0,0 +1 @@
.dashboard-container[data-v-bc400e40]{padding:32px;background-color:#f0f2f5;position:relative}.dashboard-container .chart-wrapper[data-v-bc400e40]{background:#fff;padding:16px 16px 0;margin-bottom:32px}.dashboard-editor-container[data-v-bc400e40]{padding:32px;background-color:#f0f2f5;position:relative}.dashboard-editor-container .github-corner[data-v-bc400e40]{position:absolute;top:0;border:0;right:0}.dashboard-editor-container .chart-wrapper[data-v-bc400e40]{background:#fff;padding:16px 16px 0;margin-bottom:32px}@media (max-width:1024px){.chart-wrapper[data-v-bc400e40]{padding:8px}}.panel-group[data-v-bc400e40]{margin-top:18px}.panel-group .card-panel-col[data-v-bc400e40]{margin-bottom:32px}.panel-group .card-panel[data-v-bc400e40]{height:108px;cursor:pointer;font-size:12px;position:relative;overflow:hidden;color:#666;background:#fff;-webkit-box-shadow:4px 4px 40px rgba(0,0,0,.05);box-shadow:4px 4px 40px rgba(0,0,0,.05);border-color:rgba(0,0,0,.05)}.panel-group .card-panel:hover .card-panel-icon-wrapper[data-v-bc400e40]{color:#fff}.panel-group .card-panel:hover .icon-people[data-v-bc400e40]{background:#40c9c6}.panel-group .card-panel:hover .icon-message[data-v-bc400e40]{background:#36a3f7}.panel-group .card-panel:hover .icon-money[data-v-bc400e40]{background:#f4516c}.panel-group .card-panel:hover .icon-shopping[data-v-bc400e40]{background:#34bfa3}.panel-group .card-panel .icon-people[data-v-bc400e40]{color:#40c9c6}.panel-group .card-panel .icon-message[data-v-bc400e40]{color:#36a3f7}.panel-group .card-panel .icon-money[data-v-bc400e40]{color:#f4516c}.panel-group .card-panel .icon-shopping[data-v-bc400e40]{color:#34bfa3}.panel-group .card-panel .card-panel-icon-wrapper[data-v-bc400e40]{float:left;margin:14px 0 0 14px;padding:16px;-webkit-transition:all .38s ease-out;transition:all .38s ease-out;border-radius:6px}.panel-group .card-panel .card-panel-icon[data-v-bc400e40]{float:left;font-size:48px}.panel-group .card-panel .card-panel-description[data-v-bc400e40]{float:right;font-weight:700;margin:26px;margin-left:0}.panel-group .card-panel .card-panel-description .card-panel-text[data-v-bc400e40]{line-height:18px;color:rgba(0,0,0,.45);font-size:16px;margin-bottom:12px}.panel-group .card-panel .card-panel-description .card-panel-num[data-v-bc400e40]{font-size:20px}@media (max-width:550px){.card-panel-description[data-v-bc400e40]{display:none}.card-panel-icon-wrapper[data-v-bc400e40]{float:none!important;width:100%;height:100%;margin:0!important}.card-panel-icon-wrapper .svg-icon[data-v-bc400e40]{display:block;margin:14px auto!important;float:none!important}}.echarts-line[data-v-bc400e40]{background:#fff;padding:16px 16px 0;margin-bottom:32px}

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d221bd2"],{cc40:function(e,r,t){"use strict";t.r(r);var a=function(){var e=this,r=e.$createElement,t=e._self._c||r;return t("div",{staticClass:"app-container"},[t("el-form",{directives:[{name:"loading",rawName:"v-loading",value:e.formLoading,expression:"formLoading"}],ref:"form",attrs:{model:e.form,"label-width":"100px",rules:e.rules}},[t("el-form-item",{attrs:{label:"用户名:",prop:"userName",required:""}},[t("el-input",{model:{value:e.form.userName,callback:function(r){e.$set(e.form,"userName",r)},expression:"form.userName"}})],1),t("el-form-item",{attrs:{label:"密码:",required:""}},[t("el-input",{model:{value:e.form.password,callback:function(r){e.$set(e.form,"password",r)},expression:"form.password"}})],1),t("el-form-item",{attrs:{label:"真实姓名:",prop:"realName",required:""}},[t("el-input",{model:{value:e.form.realName,callback:function(r){e.$set(e.form,"realName",r)},expression:"form.realName"}})],1),t("el-form-item",{attrs:{label:"年龄:"}},[t("el-input",{model:{value:e.form.age,callback:function(r){e.$set(e.form,"age",r)},expression:"form.age"}})],1),t("el-form-item",{attrs:{label:"性别:"}},[t("el-select",{attrs:{placeholder:"性别",clearable:""},model:{value:e.form.sex,callback:function(r){e.$set(e.form,"sex",r)},expression:"form.sex"}},e._l(e.sexEnum,(function(e){return t("el-option",{key:e.key,attrs:{value:e.key,label:e.value}})})),1)],1),t("el-form-item",{attrs:{label:"出生日期:"}},[t("el-date-picker",{attrs:{type:"date","value-format":"yyyy-MM-dd",placeholder:"选择日期"},model:{value:e.form.birthDay,callback:function(r){e.$set(e.form,"birthDay",r)},expression:"form.birthDay"}})],1),t("el-form-item",{attrs:{label:"手机:"}},[t("el-input",{model:{value:e.form.phone,callback:function(r){e.$set(e.form,"phone",r)},expression:"form.phone"}})],1),t("el-form-item",{attrs:{label:"状态:",required:""}},[t("el-select",{attrs:{placeholder:"状态"},model:{value:e.form.status,callback:function(r){e.$set(e.form,"status",r)},expression:"form.status"}},e._l(e.statusEnum,(function(e){return t("el-option",{key:e.key,attrs:{value:e.key,label:e.value}})})),1)],1),t("el-form-item",[t("el-button",{attrs:{type:"primary"},on:{click:e.submitForm}},[e._v("提交")]),t("el-button",{on:{click:e.resetForm}},[e._v("重置")])],1)],1)],1)},l=[],s=t("5530"),o=t("2f62"),n=t("c24f"),u={data:function(){return{form:{id:null,userName:"",password:"",realName:"",role:1,status:1,age:"",sex:"",birthDay:null,phone:null,userLevel:"1"},formLoading:!1,rules:{userName:[{required:!0,message:"请输入用户名",trigger:"blur"}],realName:[{required:!0,message:"请输入真实姓名",trigger:"blur"}],userLevel:[{required:!0,message:"请选择年级",trigger:"change"}]}}},created:function(){var e=this.$route.query.id,r=this;e&&0!==parseInt(e)&&(r.formLoading=!0,n["a"].selectUser(e).then((function(e){r.form=e.response,r.formLoading=!1})))},methods:Object(s["a"])({submitForm:function(){var e=this,r=this;this.$refs.form.validate((function(t){if(!t)return!1;e.formLoading=!0,n["a"].createUser(e.form).then((function(e){1===e.code?(r.$message.success(e.message),r.delCurrentView(r).then((function(){r.$router.push("/user/student/list")}))):(r.$message.error(e.message),r.formLoading=!1)})).catch((function(e){r.formLoading=!1}))}))},resetForm:function(){this.$refs["form"].resetFields(),this.form={id:null,userName:"",password:"",realName:"",role:1,status:1,age:"",sex:"",birthDay:null,phone:null,userLevel:"1"}}},Object(o["b"])("tagsView",{delCurrentView:"delCurrentView"})),computed:Object(s["a"])(Object(s["a"])({},Object(o["c"])("enumItem",["enumFormat"])),Object(o["e"])("enumItem",{sexEnum:function(e){return e.user.sexEnum},roleEnum:function(e){return e.user.roleEnum},statusEnum:function(e){return e.user.statusEnum},levelEnum:function(e){return e.user.levelEnum}}))},m=u,i=t("2877"),f=Object(i["a"])(m,a,l,!1,null,null,null);r["default"]=f.exports}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long