diff --git a/src/api/system/Personalstatistics.js b/src/api/system/Personalstatistics.js new file mode 100644 index 0000000..d1f740f --- /dev/null +++ b/src/api/system/Personalstatistics.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 查询 +export function appletPersonCount(pageNum, pageSize, parentInfoId, classId, startDate, endDate) { + return request({ + url: `/system/appLogManage/appletPersonCount?pageNum=${pageNum}&pageSize=${pageSize}&parentInfoId=${parentInfoId}&classId=${classId}&startDate=${startDate}&endDate=${endDate}`, + method: 'get', + }) +} \ No newline at end of file diff --git a/src/api/system/StatisticsArea.js b/src/api/system/StatisticsArea.js new file mode 100644 index 0000000..95103d5 --- /dev/null +++ b/src/api/system/StatisticsArea.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 查询 +export function countyStatistic(pageNum, pageSize, areaId, startDate, endDate) { + return request({ + url: `/system/appLogManage/countyStatistic?pageNum=${pageNum}&pageSize=${pageSize}&areaId=${areaId}&startDate=${startDate}&endDate=${endDate}`, + method: 'post' + }) +} \ No newline at end of file diff --git a/src/api/system/StatisticsParent.js b/src/api/system/StatisticsParent.js new file mode 100644 index 0000000..afa8982 --- /dev/null +++ b/src/api/system/StatisticsParent.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 查询 +export function clockStatistics(pageNum, pageSize, parentInfoId, classId, startDate, endDate) { + return request({ + url: `/system/appLogManage/clockStatistics?pageNum=${pageNum}&pageSize=${pageSize}&parentInfoId=${parentInfoId}&classId=${classId}&startDate=${startDate}&endDate=${endDate}`, + method: 'post', + }) +} \ No newline at end of file diff --git a/src/api/system/Statisticspark.js b/src/api/system/Statisticspark.js new file mode 100644 index 0000000..8aa476f --- /dev/null +++ b/src/api/system/Statisticspark.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 查询 +export function appletKindergartenCount(pageNum, pageSize, areaCode, kindergartenId, startDate, endDate) { + return request({ + url: `/system/appLogManage/appletKindergartenCount?pageNum=${pageNum}&pageSize=${pageSize}&areaCode=${areaCode}&kindergartenId=${kindergartenId}&startDate=${startDate}&endDate=${endDate}`, + method: 'get', + }) +} \ No newline at end of file diff --git a/src/views/assembly/classe.vue b/src/views/assembly/classe.vue index fe9939c..62a65bc 100644 --- a/src/views/assembly/classe.vue +++ b/src/views/assembly/classe.vue @@ -5,22 +5,10 @@ {{ className }} - {{ className }} + {{ className }} @@ -32,12 +20,14 @@ :before-close="classcancel" > - - + + @@ -90,10 +80,12 @@ + + diff --git a/src/views/system/StatisticsArea/index.vue b/src/views/system/StatisticsArea/index.vue new file mode 100644 index 0000000..e9218d8 --- /dev/null +++ b/src/views/system/StatisticsArea/index.vue @@ -0,0 +1,176 @@ + + + + diff --git a/src/views/system/StatisticsParent/index.vue b/src/views/system/StatisticsParent/index.vue new file mode 100644 index 0000000..30670c2 --- /dev/null +++ b/src/views/system/StatisticsParent/index.vue @@ -0,0 +1,531 @@ + + + + diff --git a/src/views/system/Statisticspark/index.vue b/src/views/system/Statisticspark/index.vue new file mode 100644 index 0000000..67db573 --- /dev/null +++ b/src/views/system/Statisticspark/index.vue @@ -0,0 +1,213 @@ + + + + diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue index 4af083a..0449905 100644 --- a/src/views/system/classinfo/index.vue +++ b/src/views/system/classinfo/index.vue @@ -43,16 +43,8 @@ /> - 搜索 - 重置 + 搜索 + 重置 @@ -65,8 +57,7 @@ size="mini" @click="handleAdd" v-hasPermi="['system:classinfo:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 - + --> + - + - + @@ -371,11 +275,11 @@ import { getClassinfo, delClassinfo, addClassinfo, - updateClassinfo, + updateClassinfo } from "@/api/system/classinfo"; import { listKindergartenInfo, - tKindergartenInfo, + tKindergartenInfo } from "@/api/system/kindergartenInfo"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -387,10 +291,9 @@ export default { var checkMobile = (rule, value, cb) => { var str = String(value); // 验证手机号的正则表达式 - const regMobile = - /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/ - // /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; - // /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/; + const regMobile = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/; + // /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; + // /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/; const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/; const isTel = reg.test(value); if (str.length == 11) { @@ -440,14 +343,14 @@ export default { kindergartenId: null, className: null, classType: null, - entranceDateStr: null, + entranceDateStr: null }, queryParams2: { pageNum: 1, - pageSize: 100, + pageSize: 1000, kindergartenId: null, className: null, - classType: null, + classType: null }, time: "", // 表单参数 @@ -459,22 +362,22 @@ export default { required: true, validator: checkMobile, trigger: "blur", - message: "", - }, + message: "" + } ], kindergartenId: [{ required: true, message: "请选择所属幼儿园" }], className: [ - { required: true, message: "请输入班级名称", trigger: "blur" }, + { required: true, message: "请输入班级名称", trigger: "blur" } ], classType: [{ required: true, message: "请选择幼儿园类型" }], classTeacher: [ - { required: true, message: "请输入班主任姓名", trigger: "blur" }, + { required: true, message: "请输入班主任姓名", trigger: "blur" } ], entranceDateStr: [ - { required: true, message: "请选择日期", trigger: "change" }, - ], - }, + { required: true, message: "请选择日期", trigger: "change" } + ] + } }; }, created() { @@ -494,7 +397,7 @@ export default { return { kindergartenId: node.id, label: node.kindergartenName, - children: node.children, + children: node.children }; }, //信息表ID @@ -503,16 +406,16 @@ export default { getList() { this.loading = true; - listKindergartenInfo(this.queryParams2).then((response) => { + listKindergartenInfo(this.queryParams2).then(response => { this.kindergartenInfoList = response.rows; this.total2 = response.total; }); - listClassinfo(this.queryParams).then((response) => { + listClassinfo(this.queryParams).then(response => { this.classinfoList = response.rows; this.total = response.total; this.loading = false; }); - tKindergartenInfo(this.ClassType).then((res) => { + tKindergartenInfo(this.ClassType).then(res => { this.dictValue1 = res.data[0].dictValue; this.dictValue2 = res.data[1].dictValue; this.dictValue3 = res.data[2].dictValue; @@ -535,7 +438,7 @@ export default { classTeacher: null, entranceDateStr: "", phone: undefined, - kindergartenName: null, + kindergartenName: null }; this.resetForm("form"); @@ -543,14 +446,14 @@ export default { /** 搜索按钮操作 */ handleQuery2() { this.queryParams2.pageNum = 1; - listKindergartenInfo(this.queryParams2).then((response) => { + listKindergartenInfo(this.queryParams2).then(response => { this.kindergartenInfoList = response.rows; this.total2 = response.total; }); }, handleQuery() { this.queryParams.pageNum = 1; - listClassinfo(this.queryParams).then((response) => { + listClassinfo(this.queryParams).then(response => { this.classinfoList = response.rows; }); }, @@ -561,21 +464,21 @@ export default { pageSize: 10, kindergartenId: null, className: null, - classType: null, + classType: null }; this.queryParams2 = { pageNum: 1, pageSize: 10, kindergartenId: null, className: null, - classType: null, + classType: null }; this.handleQuery(); this.handleQuery2(); }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.id); + this.ids = selection.map(item => item.id); this.single = selection.length !== 1; this.multiple = !selection.length; }, @@ -592,7 +495,7 @@ export default { this.kindergartenid2 = row.kindergartenId; this.reset(); const id = row.id || this.ids; - getClassinfo(id).then((response) => { + getClassinfo(id).then(response => { response.data.phone = Number(response.data.phone); this.form = response.data; this.kindergartenName = this.form.kindergartenName; @@ -602,16 +505,16 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { - updateClassinfo(this.form).then((response) => { + updateClassinfo(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - addClassinfo(this.form).then((response) => { + addClassinfo(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); @@ -626,7 +529,7 @@ export default { const ids = row.id || this.ids; this.$modal .confirm("是否确认删除数据？") - .then(function () { + .then(function() { return delClassinfo(ids); }) .then(() => { @@ -634,7 +537,7 @@ export default { this.$modal.msgSuccess("删除成功"); }) .catch(() => {}); - }, + } /** 导出按钮操作 */ // handleExport() { // this.download( @@ -645,6 +548,6 @@ export default { // `classinfo_${new Date().getTime()}.xlsx` // ); // }, - }, + } };