From 0eb6efa8a031c620a4c709a0f8359c25d182c5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 4 Aug 2022 18:07:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=85=A8=E5=B8=82=E5=B9=B3=E5=9D=87?= =?UTF-8?q?=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/testItemCityScore.js | 44 + src/api/system/testItems.js | 44 + src/views/system/parentInfo/index.vue | 2 +- src/views/system/studentInfo/index.vue | 23 +- src/views/system/testItemCityScore/index.vue | 642 +++++++++++++++ src/views/system/testItems/index.vue | 799 +++++++++++++++++++ 6 files changed, 1551 insertions(+), 3 deletions(-) create mode 100644 src/api/system/testItemCityScore.js create mode 100644 src/api/system/testItems.js create mode 100644 src/views/system/testItemCityScore/index.vue create mode 100644 src/views/system/testItems/index.vue diff --git a/src/api/system/testItemCityScore.js b/src/api/system/testItemCityScore.js new file mode 100644 index 0000000..897068f --- /dev/null +++ b/src/api/system/testItemCityScore.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询全市平均成绩列表 +export function listTestItemCityScore(query) { + return request({ + url: '/system/testItemCityScore/list', + method: 'get', + params: query + }) +} + +// 查询全市平均成绩详细 +export function getTestItemCityScore(id) { + return request({ + url: '/system/testItemCityScore/' + id, + method: 'get' + }) +} + +// 新增全市平均成绩 +export function addTestItemCityScore(data) { + return request({ + url: '/system/testItemCityScore/add', + method: 'post', + data: data + }) +} + +// 修改全市平均成绩 +export function updateTestItemCityScore(data) { + return request({ + url: '/system/testItemCityScore', + method: 'put', + data: data + }) +} + +// 删除全市平均成绩 +export function delTestItemCityScore(id) { + return request({ + url: '/system/testItemCityScore/' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/api/system/testItems.js b/src/api/system/testItems.js new file mode 100644 index 0000000..955fe3b --- /dev/null +++ b/src/api/system/testItems.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询测试项目列表 +export function listTestItems(query) { + return request({ + url: '/system/testItems/list', + method: 'get', + params: query + }) +} + +// 查询测试项目详细 +export function getTestItems(id) { + return request({ + url: '/system/testItems/' + id, + method: 'get' + }) +} + +// 新增测试项目 +export function addTestItems(data) { + return request({ + url: '/system/testItems/add', + method: 'post', + data: data + }) +} + +// 修改测试项目 +export function updateTestItems(data) { + return request({ + url: '/system/testItems/edit', + method: 'post', + data: data + }) +} + +// 删除测试项目 +export function delTestItems(id) { + return request({ + url: '/system/testItems/' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/views/system/parentInfo/index.vue b/src/views/system/parentInfo/index.vue index e13e005..d5b5ba3 100644 --- a/src/views/system/parentInfo/index.vue +++ b/src/views/system/parentInfo/index.vue @@ -316,7 +316,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm('是否确认删除家长信息编号为"' + ids + '"的数据项？') + .confirm("是否确认删除该家长信息吗？") .then(function () { return delParentInfo(ids); }) diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue index 423767e..c55b939 100644 --- a/src/views/system/studentInfo/index.vue +++ b/src/views/system/studentInfo/index.vue @@ -444,6 +444,7 @@ title="选择所属班级" :visible.sync="innerVisible" append-to-body + :before-close="cancel3" >
确 定 - 取 消 + 取 消
@@ -836,6 +838,14 @@ export default { this.getList(); }, methods: { + cancel2() { + this.innerVisible3 = false; + this.addparentlist = { + parentName: "", + parentSex: "", + phone: "", + }; + }, //查看父母 seepraent(row) { this.reset(); @@ -925,6 +935,11 @@ export default { console.log(res); this.getList(); this.innerVisible3 = false; + this.addparentlist = { + parentName: "", + parentSex: "", + phone: "", + }; }); }, //家长搜索 @@ -1272,6 +1287,10 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, + cancel3() { + this.resetQuery(); + this.innerVisible = false; + }, /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); @@ -1354,7 +1373,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm('是否确认删除学生信息编号为"' + ids + '"的数据项？') + .confirm('是否确认删除该学生信息吗？') .then(function () { return delStudentInfo(ids); }) diff --git a/src/views/system/testItemCityScore/index.vue b/src/views/system/testItemCityScore/index.vue new file mode 100644 index 0000000..2e0ebb6 --- /dev/null +++ b/src/views/system/testItemCityScore/index.vue @@ -0,0 +1,642 @@ + + + diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue new file mode 100644 index 0000000..38aeb3a --- /dev/null +++ b/src/views/system/testItems/index.vue @@ -0,0 +1,799 @@ + + + From 1c25b9f84cb2393086729c8de9e8aa16d57039f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Tue, 9 Aug 2022 11:38:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=A8=E5=B8=82=E5=B9=B3=E5=9D=87=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/kindergartenInfo.js | 10 +- src/api/system/teacherInfo.js | 53 + src/api/system/testItemCityScore.js | 4 +- src/views/system/area/index.vue | 1 - src/views/system/kindergartenInfo/index.vue | 49 +- src/views/system/role/index.vue | 405 ++++--- src/views/system/teacherInfo/index.vue | 1061 ++++++++++++++++++ src/views/system/testItemCityScore/index.vue | 175 ++- src/views/system/user/index.vue | 572 +++++++--- 9 files changed, 2025 insertions(+), 305 deletions(-) create mode 100644 src/api/system/teacherInfo.js create mode 100644 src/views/system/teacherInfo/index.vue 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 @@