diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 65b15c8..832cc74 100644
Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift
index 3e91082..ba48b1d 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift
@@ -69,7 +69,7 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS
         case 0:
             return 240
         case 1:
-            return 280
+            return screenWidth*0.62
         case 2:
             return 70
         default:
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift
index 7c37332..a315cca 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift
@@ -45,7 +45,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV
         case 0:
             return 240
         case 1:
-            return 300
+            return screenWidth*0.62
         case 2:
             return 70
         default:
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift
index fc1e9d7..cc871ad 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift
@@ -16,7 +16,7 @@ class GrowCheckDownTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
     }
     
     func setCellData(model:StudentCardModel){
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift
index 9de7f44..d19d15a 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift
@@ -19,7 +19,7 @@ class ProgramVacateBodyTableViewCell: UITableViewCell {
     @IBOutlet weak var vacateResult: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift
index 4bfce70..5769a83 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift
@@ -15,7 +15,7 @@ class ProgramVacateTableViewCell: UITableViewCell {
     @IBOutlet weak var endTime: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift
index ab16d31..0917b77 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift
@@ -12,7 +12,7 @@ class BehaviorDetailCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift
index ba5c1f3..87cf454 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift
@@ -14,11 +14,10 @@ class EducationDetailCell: UITableViewCell {
     
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
-
-        let rect = CGRect.init(x: 10, y: 60, width: screenWidth-20, height: self.bounds.size.height-60)
-        customLineChart = LineChartView.init(frame: rect)
+        self.backgroundColor = backGroundColor
         
+        let rect = CGRect.init(x: 10, y: 60, width: screenWidth-20, height: screenWidth*0.62-60)
+        customLineChart = LineChartView.init(frame: rect)
         print("linechart frame = \(customLineChart.frame)")
         customLineChart.drawUI(xLableArr: nil)
         let arr1 = [4,4,2,1,3]
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift
index 635ec73..9bc645b 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift
@@ -12,7 +12,7 @@ class GrowSubjectCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift
index 040c139..b5431f4 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift
@@ -39,7 +39,8 @@ class LineChartView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         if !frame.isEmpty {
-            self.yCellHeight = self.bounds.size.height/(CGFloat(yCount)+1)
+            //留点空间放横坐标按钮
+            self.yCellHeight = (frame.size.height-30)/(CGFloat(yCount))
         }
     }
     func drawUI(xLableArr:Array<String>?){
@@ -61,7 +62,7 @@ class LineChartView: UIView {
             yLab.font = UIFont.systemFont(ofSize: 14)
             self.addSubview(yLab)
             
-            let lineLab = UILabel.init(frame: CGRect.init(x: 40, y: yLab.center.y, width: self.bounds.size.width-80, height: 0.4))
+            let lineLab = UILabel.init(frame: CGRect.init(x: 40, y: yLab.center.y, width: self.bounds.size.width-50, height: 0.4))
             lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
             self.addSubview(lineLab)
             
@@ -73,7 +74,7 @@ class LineChartView: UIView {
     private func drawX() {
         let xWidth = (self.bounds.size.width)/CGFloat(yCount)
         for index in 0..<xCount {
-            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: yCellHeight*6-10, width: 40, height: 30))
+            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: yCellHeight*CGFloat(yCount-1)+20, width: 40, height: 30))
             nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
             nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
             nameBtn.titleLabel!.textAlignment = .center
@@ -82,7 +83,7 @@ class LineChartView: UIView {
 //            nameBtn.backgroundColor = UIColor.orange
             self.addSubview(nameBtn)
             
-            nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchUpInside)
+            nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchDown)
             
             xCenterArr.append(nameBtn.frame.origin.x+20)
         }
@@ -123,15 +124,15 @@ class LineChartView: UIView {
             //X轴下划线
             let movePath = CGMutablePath()
             movePath.move(to: CGPoint.init(x: xCenterArr[index], y: yCenterArr[0]))
-            movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+5*(self.bounds.height/(CGFloat(yCount)+1))))
+            movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+CGFloat(yCount-1)*yCellHeight))
             lineLayer.path = movePath
             
             xMoveLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
             xMoveLayer.lineWidth = 2
             self.layer.addSublayer(xMoveLayer)
             let movePath2 = CGMutablePath()
-            movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: yCellHeight*6+20))
-            movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: yCellHeight*6+20))
+            movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: yCellHeight*CGFloat(yCount-1)+20+30))
+            movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: yCellHeight*CGFloat(yCount-1)+20+30))
             xMoveLayer.path = movePath2
             
             if yLabArray.count == dateArr.count {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralDetailCell.swift
index 8ec0f8b..6e6dd56 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralDetailCell.swift
@@ -20,7 +20,7 @@ class MoralDetailCell: UITableViewCell {
     @IBOutlet weak var evaluationLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift
index ae1eaee..5abdb42 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift
@@ -18,7 +18,7 @@ class MoralTableViewCell: UITableViewCell {
     @IBOutlet weak var reportDateLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift
index 86aabb6..453cc2c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift
@@ -18,7 +18,7 @@ class SceneDownCell: UITableViewCell {
     @IBOutlet weak var dateLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift
index ddfac92..2beaba1 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift
@@ -13,10 +13,10 @@ class SceneMiddleCell: UITableViewCell {
     var customLineChart = LineChartView()
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
-        let rect = CGRect.init(x: 0, y: 60, width: screenWidth-20, height: self.bounds.size.height-60)
+        let rect = CGRect.init(x: 20, y: 60, width: screenWidth-40, height: screenWidth*0.62-60)
         customLineChart = LineChartView.init(frame: rect)
         let customXLabArr = ["03/12","03/13","03/14","03/15","03/16"]
         
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift
index dcef1d5..e86b988 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift
@@ -16,7 +16,7 @@ class SceneTopCell: UITableViewCell {
     @IBOutlet weak var SuggestLab: UITextView!  //指导意见
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.backgroundColor = backgroundColor
+        self.backgroundColor = backGroundColor
 
         // Initialization code
     }
--
libgit2 0.21.0