diff --git a/src/api/system/kindergartenInfo.js b/src/api/system/kindergartenInfo.js index a8d88bc..a01fb92 100644 --- a/src/api/system/kindergartenInfo.js +++ b/src/api/system/kindergartenInfo.js @@ -2,8 +2,6 @@ import request from '@/utils/request' //类型 - - export function tKindergartenInfo(data) { return request({ url: '/system/dict/data/type/' + data, @@ -11,6 +9,14 @@ export function tKindergartenInfo(data) { }) } +//查询园长 +export function getUserInfoList(query) { + return request({ + url: '/system/user/getUserInfoList', + method: 'get', + params: query + }) +} // 查询幼儿园信息管理列表 export function listKindergartenInfo(query) { diff --git a/src/api/system/teacherInfo.js b/src/api/system/teacherInfo.js new file mode 100644 index 0000000..89d7edc --- /dev/null +++ b/src/api/system/teacherInfo.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询教师信息管理列表 +export function listTeacherInfo(query) { + return request({ + url: '/system/teacherInfo/list', + method: 'get', + params: query + }) +} + +//教师绑定的班级 +export function getClassInfo(query) { + return request({ + url: '/system/teacherInfo/getClassInfo', + method: 'get', + params: query + }) +} + +// 查询教师信息管理详细 +export function getTeacherInfo(id) { + return request({ + url: '/system/teacherInfo/' + id, + method: 'get' + }) +} + +// 新增教师信息管理 +export function addTeacherInfo(data) { + return request({ + url: '/system/teacherInfo/add', + method: 'post', + data: data + }) +} + +// 修改教师信息管理 +export function updateTeacherInfo(data) { + return request({ + url: '/system/teacherInfo/edit', + method: 'post', + data: data + }) +} + +// 删除教师信息管理 +export function delTeacherInfo(id) { + return request({ + url: '/system/teacherInfo/' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/api/system/testItemCityScore.js b/src/api/system/testItemCityScore.js index 897068f..b98d2ee 100644 --- a/src/api/system/testItemCityScore.js +++ b/src/api/system/testItemCityScore.js @@ -29,8 +29,8 @@ export function addTestItemCityScore(data) { // 修改全市平均成绩 export function updateTestItemCityScore(data) { return request({ - url: '/system/testItemCityScore', - method: 'put', + url: 'system/testItemCityScore/edit', + method: 'POST', data: data }) } diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index c5342f1..ac0f28c 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -127,7 +127,6 @@ - diff --git a/src/views/system/kindergartenInfo/index.vue b/src/views/system/kindergartenInfo/index.vue index 841dfc4..2268470 100644 --- a/src/views/system/kindergartenInfo/index.vue +++ b/src/views/system/kindergartenInfo/index.vue @@ -6,7 +6,7 @@ size="small" :inline="true" v-show="showSearch" - label-width="90px" + label-width="85px" > + + + + + + - + + @@ -215,7 +231,22 @@ 私有 - + + + + + + @@ -243,6 +274,7 @@ import { delKindergartenInfo, addKindergartenInfo, updateKindergartenInfo, + getUserInfoList, } from "@/api/system/kindergartenInfo"; import { list } from "@/api/system/info.js"; import Treeselect from "@riophae/vue-treeselect"; @@ -278,6 +310,8 @@ export default { total: 0, // 幼儿园信息管理表格数据 kindergartenInfoList: [], + //园长数组 + getUserInfoLists: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -332,6 +366,9 @@ export default { message: "请输入正确的手机号", }, ], + principalId: [ + { required: true, message: "请选择园长", trigger: "blur" }, + ], kindergartenType: [{ required: true, message: "请选择幼儿园类型" }], kindergartenAddress: [ { required: true, message: "请输入幼儿园地址", trigger: "blur" }, @@ -372,6 +409,10 @@ export default { /** 查询幼儿园信息管理列表 */ getList() { this.loading = true; + getUserInfoList({ roleKey: "enchou" }).then((res) => { + this.getUserInfoLists = res.data; + console.log(this.getUserInfoLists); + }); list(this.info).then((response) => { this.infolist = this.handleTree(response.data); this.infolist2 = response.data; @@ -402,6 +443,7 @@ export default { kindergartenAddress: null, kindergartenType: undefined, phone: "", + principalId: "", contacts: null, }; this.resetForm("form"); @@ -452,6 +494,7 @@ export default { }, /** 提交按钮 */ submitForm() { + console.log(this.form); this.$refs["form"].validate((valid) => { if (valid) { if (this.form.id != null) { diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 9d34963..10f3edc 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -1,6 +1,12 @@