From 3ebc280a250cf45a33cb54fc89b8dcbd34ce9156 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Mon, 30 Nov 2020 10:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=80=83=E5=8B=A4=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/dashboard/LineChart.vue | 180 ++++++++++-------- ruoyi-ui/src/views/index.vue | 22 ++- ruoyi-ui/vue.config.js | 4 +- .../ruoyi/project/system/domain/ByClass.java | 24 +++ .../src/main/resources/application-druid.yml | 3 + .../mybatis/system/ByClassMapper.xml | 4 + 6 files changed, 152 insertions(+), 85 deletions(-) diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/ruoyi-ui/src/views/dashboard/LineChart.vue index 4e30a3701..73e77d3e3 100644 --- a/ruoyi-ui/src/views/dashboard/LineChart.vue +++ b/ruoyi-ui/src/views/dashboard/LineChart.vue @@ -1,135 +1,161 @@ diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 2c866c9d7..468322bf2 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -13,11 +13,16 @@
- +
- + + +
+ +
+ @@ -49,6 +54,7 @@ import RaddarChart from "./dashboard/RaddarChart"; import PieChart from "./dashboard/PieChart"; import BarChart from "./dashboard/BarChart"; +import LineChart from "./dashboard/LineChart"; //import { getSchoolCalendars } from "@/api/benyi/schoolcalendar"; //备用进行班级园历显示操作import { getSchoolCalendarsClass } from "@/api/benyi/schoolcalendarclass"; @@ -58,14 +64,16 @@ export default { components: { RaddarChart, PieChart, - BarChart + BarChart, + LineChart, }, data() { return { calendarData: [], value: new Date(), // 查询参数 - queryParams: {} + queryParams: {}, + // lineChartData: lineChartData.newVisitis, }; }, created() { @@ -78,7 +86,10 @@ export default { // this.calendarData = response.calendarData; // }); // } - } + // handleSetLineChartData(type) { + // this.lineChartData = lineChartData[type]; + // }, + }, }; @@ -88,7 +99,6 @@ export default { background-color: rgb(240, 242, 245); position: relative; - .el-card.is-always-shadow { box-shadow: none; border: 0; diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 70dff57cd..b14adb873 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -33,8 +33,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://localhost:8083`, - target: `http://120.53.14.147:9990/`, + target: `http://localhost:8083`, + //target: `http://120.53.14.147:9990/`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByClass.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByClass.java index d6c1ef660..104605466 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByClass.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByClass.java @@ -110,6 +110,12 @@ public class ByClass extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createtime; + /*** + * 幼儿总数 + */ + private Long childcount; + private Long childcheckincount; + public String getMonth() { return month; } @@ -529,6 +535,22 @@ public class ByClass extends BaseEntity { return createtime; } + public Long getChildcount() { + return childcount; + } + + public void setChildcount(Long childcount) { + this.childcount = childcount; + } + + public Long getChildcheckincount() { + return childcheckincount; + } + + public void setChildcheckincount(Long childcheckincount) { + this.childcheckincount = childcheckincount; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -548,6 +570,8 @@ public class ByClass extends BaseEntity { .append("zljsxm", getZljsxm()) .append("isdel", getIsdel()) .append("createtime", getCreatetime()) + .append("childcount", getChildcount()) + .append("childcheckincount", getChildcheckincount()) .append("month", getMonth()) .append("day1", getDay1()) .append("day2", getDay2()) diff --git a/ruoyi/src/main/resources/application-druid.yml b/ruoyi/src/main/resources/application-druid.yml index a64e11535..99eca15eb 100644 --- a/ruoyi/src/main/resources/application-druid.yml +++ b/ruoyi/src/main/resources/application-druid.yml @@ -9,6 +9,9 @@ spring: url: jdbc:mysql://120.53.14.147:3306/benyi-vue-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: tsbz2020! +# url: jdbc:mysql://192.144.133.123:3306/benyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: msd5Ysql$%123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml b/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml index 806dcb732..d05ef97e0 100644 --- a/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml @@ -19,6 +19,8 @@ + + @@ -61,6 +63,8 @@ zbjs, (select nick_name from sys_user where sys_user.user_id=zbjs) zbjsxm, pbjs, (select nick_name from sys_user where sys_user.user_id=pbjs) pbjsxm, zljs, (select nick_name from sys_user where sys_user.user_id=zljs) zljsxm, + (select count(*) from by_child WHERE by_child.classid=d.bjbh) childcount, + (select count(*) from by_child_checkin_detail WHERE by_child_checkin_detail.classid=d.bjbh and type='01' and date_format(by_child_checkin_detail.create_time,'%Y-%m-%d')=date_format(sysdate(),'%Y-%m-%d')) childcheckincount, isdel, createtime from by_class d