diff --git a/littleApp_child/packageA/pages/graph/graph.js b/littleApp_child/packageA/pages/graph/graph.js
index 51f23aa..f840319 100644
--- a/littleApp_child/packageA/pages/graph/graph.js
+++ b/littleApp_child/packageA/pages/graph/graph.js
@@ -484,7 +484,8 @@ Page({
hospitalId: "",
ec: {
onInit: initChart
- }
+ },
+ tableList: []
},
onLoad: function (options) {
if (options.id) {
@@ -503,9 +504,22 @@ Page({
let that = this
networkUtil._get('/baby/queryBabyCurve/'+this.data.id, {},function (res) {
const data = res.data.data
+ that.setData({
+ tableList: data.tables
+ })
const option = drawPrintChart(data);
chart.setOption(option);
})
+ },
+ showImage(e) {
+ let imgUrl = e.currentTarget.dataset.src;
+ // wx.previewImage({
+ // urls: [imgUrl], //需要预览的图片http链接列表,注意是数组
+ // current: '', // 当前显示图片的http链接,默认是第一个
+ // success: function (res) { },
+ // fail: function (res) { },
+ // complete: function (res) { },
+ // })
}
})
diff --git a/littleApp_child/packageA/pages/graph/graph.wxml b/littleApp_child/packageA/pages/graph/graph.wxml
index 4c71be0..7863ca2 100644
--- a/littleApp_child/packageA/pages/graph/graph.wxml
+++ b/littleApp_child/packageA/pages/graph/graph.wxml
@@ -4,11 +4,24 @@
身长体重曲线图
+
+
+ 时间(月龄)
+ 身长(cm)
+ 体重(kg)
+
+
+
+ {{item.time}}
+ {{item.height===null?'':item.height}}
+ {{item.weight===null?'':item.weight}}
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/littleApp_child/packageA/pages/graph/graph.wxss b/littleApp_child/packageA/pages/graph/graph.wxss
index 2b956ee..753f2d4 100644
--- a/littleApp_child/packageA/pages/graph/graph.wxss
+++ b/littleApp_child/packageA/pages/graph/graph.wxss
@@ -4,23 +4,50 @@
height: 100vh;
overflow-y: auto;
}
-.echarts-box{
+
+.echarts-box {
width: 100%;
height: 50vh;
}
-.echarts-box .title{
+
+.echarts-box .title {
width: 100%;
text-align: center;
}
+
.echarts-box ec-canvas {
width: 100%;
height: 100%;
}
-.images-box{
- margin-top: 30px;
+
+.images-box {
+ margin-top: 5px;
width: 100%;
height: auto;
}
-.images-box image{
+
+.images-box image {
width: 100%;
}
+
+.table-box{
+ margin-top: 30px;
+ width: 92%;
+ height: auto;
+ padding: 4%;
+ background: white;
+ text-align: center;
+}
+.table-line{
+ width: 99%;
+ display: -webkit-box;
+ border-left: 1px solid #000000;
+}
+.table-line.top-line{
+ border-top: 1px solid #000000;
+}
+.table-txt{
+ width: 33.1%;
+ border-right: 1px solid #000000;
+ border-bottom: 1px solid #000000;
+}