diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
index 47a9abb..50eb58a 100644
--- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
+++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
@@ -32,9 +32,13 @@
 		5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; };
 		59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; };
 		9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; };
+		AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; };
+		AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; };
+		AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; };
 		AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB77206354220052415B /* MoralTableViewCell.swift */; };
 		AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB7920637F110052415B /* MoralViewController.swift */; };
 		ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */; };
+		ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3992064C44900A47D2C /* LineChartView.swift */; };
 		ADE33B312062202300BEA6E6 /* Macro.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE33B302062202300BEA6E6 /* Macro.swift */; };
 		BF388469205A4DE900A240EF /* StudentClassInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF388468205A4DE900A240EF /* StudentClassInfo.swift */; };
 		BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF38846B205A58F800A240EF /* YXMessageManager.swift */; };
@@ -169,9 +173,13 @@
 		5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = "<group>"; };
 		A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = "<group>"; };
+		AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = "<group>"; };
+		AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = "<group>"; };
 		AD65FB77206354220052415B /* MoralTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralTableViewCell.swift; sourceTree = "<group>"; };
 		AD65FB7920637F110052415B /* MoralViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralViewController.swift; sourceTree = "<group>"; };
 		ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDetailViewController.swift; sourceTree = "<group>"; };
+		ADAEA3992064C44900A47D2C /* LineChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChartView.swift; sourceTree = "<group>"; };
 		ADE33B302062202300BEA6E6 /* Macro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Macro.swift; sourceTree = "<group>"; };
 		BF388468205A4DE900A240EF /* StudentClassInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentClassInfo.swift; sourceTree = "<group>"; };
 		BF38846B205A58F800A240EF /* YXMessageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YXMessageManager.swift; sourceTree = "<group>"; };
@@ -501,6 +509,10 @@
 				BFEAAAA8205248AC0072FAAF /* TaskPresentationTableViewCell.swift */,
 				BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */,
 				AD65FB77206354220052415B /* MoralTableViewCell.swift */,
+				AD34D1192064C79D00989F8D /* MoralDetailCell.swift */,
+				AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */,
+				AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */,
+				ADAEA3992064C44900A47D2C /* LineChartView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -933,6 +945,7 @@
 				599364EF204E62E700C8B371 /* MyTableViewCell.swift in Sources */,
 				BFF9B7EB205772E100F39B3E /* GetBackPasswordViewController.swift in Sources */,
 				BFF9B7F22057A28900F39B3E /* TableEmptyView.swift in Sources */,
+				ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */,
 				BFBC06CA2063AE8900CCFAFF /* ZLaunchAdImageView.swift in Sources */,
 				BF406CE02057C708000A6681 /* OrderDetailCollectionViewCell.swift in Sources */,
 				BFBC06C52063AE8900CCFAFF /* ZLaunchAd.swift in Sources */,
@@ -952,6 +965,7 @@
 				AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */,
 				BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */,
 				BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */,
+				AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */,
 				BFCED888205280B700055373 /* MyViewController.swift in Sources */,
 				AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */,
 				BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */,
@@ -959,6 +973,7 @@
 				BFEAAAD820525D620072FAAF /* UILabel+LXLabel.m in Sources */,
 				59936527205231A500C8B371 /* BaseCityChooseSchoolViewController.swift in Sources */,
 				599364FB204E742000C8B371 /* ChannelSelectViewCollectionViewCell.swift in Sources */,
+				AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */,
 				BFBC06C82063AE8900CCFAFF /* ZLaunchAdCache.swift in Sources */,
 				BFF9B7F62057A4C900F39B3E /* ChildrenDetailViewController.swift in Sources */,
 				599364FF204E945600C8B371 /* BindingViewController.swift in Sources */,
@@ -968,6 +983,7 @@
 				BF406CDA2057BEB8000A6681 /* OrderDetailModel.swift in Sources */,
 				BFEAAAC6205257460072FAAF /* LXCalendarWeekView.m in Sources */,
 				590944E4205B8DB2004478B5 /* BindlingSuccessViewController.swift in Sources */,
+				AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */,
 				BFEAAAC2205257460072FAAF /* LXCalendarHearder.m in Sources */,
 				BFEAAAD920525D620072FAAF /* UIView+FTCornerdious.m in Sources */,
 			);
diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
index 51a860c..d073d4a 100644
--- a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>ParentAssistant.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 8092efa..4969d2f 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/report/View/BehaviorDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/BehaviorDetailCell.swift
new file mode 100644
index 0000000..9f8fbae
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/BehaviorDetailCell.swift
@@ -0,0 +1,24 @@
+//
+//  BehaviorDetailCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/23.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class BehaviorDetailCell: UITableViewCell {
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift
new file mode 100644
index 0000000..4183d80
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift
@@ -0,0 +1,43 @@
+//
+//  EducationDetailCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/23.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class EducationDetailCell: UITableViewCell {
+
+    @IBOutlet weak var lineChartView: UIView!
+    var customLineChart = LineChartView()
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        let rect = self.lineChartView.bounds
+        print(rect)
+        customLineChart = LineChartView.init(frame: rect)
+        
+        let arr1 = [4,4,2,1,3]
+        let arr2 = [2,1,4,4,5]
+        //65 105 190
+        //220 0 16
+        customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190))
+        customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16))
+        
+        
+        
+        self.lineChartView.addSubview(customLineChart)
+        
+        
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
new file mode 100644
index 0000000..2aff999
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
@@ -0,0 +1,143 @@
+//
+//  LineChartView.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/23.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class LineChartView: UIView {
+    
+    
+    //自定义横坐标
+    var customXLabArr = Array<String>()
+    
+    //默认横坐标
+    private var xLabArr = ["行为","文明","课堂","作业","礼仪"]
+    //设置纵坐标
+    private let yCount = 6
+    //横坐标个数
+    private let xCount = 5
+    //最大绩点分数
+    private let GPA = 5
+    //储存横纵坐标,画线用
+    private var xCenterArr = Array<CGFloat>()
+    private var yCenterArr = Array<CGFloat>()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        print("frame==\(frame)")
+     
+        if customXLabArr.count>0 {
+            xLabArr = customXLabArr
+        }
+        drawX()
+        drawY()
+    }
+    //设置纵坐标
+     private func drawY() {
+        let yHeight = (self.bounds.height-20)/CGFloat(yCount)
+        for index in 0..<yCount{
+            let yLab = UILabel.init(frame: CGRect.init(x: 10, y: CGFloat(index)*yHeight, width: 20, height: 20))
+            yLab.text = "\(GPA-index)"
+            yLab.font = UIFont.systemFont(ofSize: 14)
+            self.addSubview(yLab)
+            
+            let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: self.bounds.size.width-40, height: 0.5))
+            lineLab.backgroundColor = UIColor.lightGray
+            self.addSubview(lineLab)
+            
+            yCenterArr.append(yLab.frame.origin.y+10)
+        }
+    }
+    //设置横坐标
+    private func drawX() {
+        let xWidth = (self.bounds.width)/CGFloat(yCount)
+        for index in 0..<xCount {
+            let nameLab = UILabel.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-30, width: 40, height: 20))
+            nameLab.text = xLabArr[index]
+            nameLab.font = UIFont.systemFont(ofSize: 14)
+            nameLab.textColor = UIColor.gray
+            self.addSubview(nameLab)
+
+            xCenterArr.append(nameLab.frame.origin.x+20)
+        }
+    }
+    
+    //Mark: - 画折线
+     func drawLine(point:Array<Int>,color:UIColor){
+        
+        let pointArr = swichPoint(arr: point)
+        let drawLayer = DrawLayer()
+        drawLayer.xPointArr = xCenterArr
+        drawLayer.yPointArr = [yCenterArr[pointArr[0]],yCenterArr[pointArr[1]],yCenterArr[pointArr[2]],yCenterArr[pointArr[3]],yCenterArr[pointArr[4]]]
+        drawLayer.bounds = self.bounds
+        drawLayer.position = self.center
+        drawLayer.lineColor = color
+        drawLayer.setNeedsDisplay()
+        self.layer.addSublayer(drawLayer)
+    }
+    //MARK: - 画竖线
+    
+    //MARK: - 特定横坐标颜色,下划线
+    
+    //转换y坐标
+    func swichPoint(arr:Array<Int>)->Array<Int>{
+        var array = Array<Int>()
+        for index in 0..<arr.count {
+            let value = GPA - arr[index]
+            array.append(value)
+        }
+        return array
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    /*
+    // Only override draw() if you perform custom drawing.
+    // An empty implementation adversely affects performance during animation.
+    override func draw(_ rect: CGRect) {
+        // Drawing code
+    }
+    */
+
+}
+
+class DrawLayer: CALayer {
+    
+    var yPointArr = Array<CGFloat>()
+    var xPointArr = Array<CGFloat>()
+    var lineColor = UIColor()
+    
+    override func draw(in ctx: CGContext) {
+        
+        let context = ctx
+        //点
+        context.setFillColor(lineColor.cgColor)
+        
+        for i in 0..<xPointArr.count {
+            context.fillEllipse(in: CGRect.init(x: xPointArr[i]-5, y: yPointArr[i]-5, width: 10, height: 10))
+
+        }
+
+        //折线
+        context.setStrokeColor(lineColor.cgColor)
+        context.setLineWidth(1)
+        for i in 0..<xPointArr.count {
+            if i == 0 {
+                context.move(to: CGPoint.init(x: xPointArr[0] , y: yPointArr[0]))
+            }else{
+                context.addLine(to: CGPoint.init(x: xPointArr[i] , y: yPointArr[i]))
+            }
+        }
+        context.strokePath()
+    }
+    
+    
+}
+
+
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/MoralDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/MoralDetailCell.swift
new file mode 100644
index 0000000..a8c6367
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/MoralDetailCell.swift
@@ -0,0 +1,32 @@
+//
+//  MoralDetailCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/23.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class MoralDetailCell: UITableViewCell {
+
+    @IBOutlet weak var dateLab: UILabel!
+    @IBOutlet weak var pointLab: UILabel!
+    @IBOutlet weak var rankingLab: UILabel!
+    @IBOutlet weak var risingLab: UILabel!
+    @IBOutlet weak var risingRightLab: UILabel!
+    @IBOutlet weak var averageLab: UILabel!
+    @IBOutlet weak var averageRightLab: UILabel!
+    @IBOutlet weak var evaluationLab: UILabel!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
diff --git a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
index 97f6375..cedf420 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-
+import UIKit
 //全局变量
 
 let appDelegate = UIApplication.shared.delegate as! AppDelegate
@@ -16,3 +16,4 @@ let screenWidth = UIScreen.main.bounds.size.width
 let screenHeight = UIScreen.main.bounds.size.height
 
 
+
diff --git a/ParentAssistant/ParentAssistant/Classes/util/utils.swift b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
index 7a8e48e..d89785f 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/utils.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
@@ -360,6 +360,9 @@ func UIColorFromRGB(_ rgbValue: UInt) -> UIColor {
         alpha: CGFloat(1.0)
     )
 }
+func UIColorWithRGB(R:CGFloat,G:CGFloat,B:CGFloat)-> UIColor {
+    return UIColor.init(red: R/255.0, green: G/255.0, blue: B/255.0, alpha: 1)
+}
 func getCurrentDate()->String{
     let dateFormat=DateFormatter()
     dateFormat.dateFormat="M月d日"
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
index fd15f93..9020646 100644
--- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
@@ -837,7 +837,7 @@
                                 <rect key="frame" x="0.0" y="64" width="375" height="544"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="moralDetail" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="moralDetail" rowHeight="280" id="edU-Xp-UQN">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="moralDetail" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="moralDetail" rowHeight="280" id="edU-Xp-UQN" customClass="MoralDetailCell" customModule="ParentAssistant" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="280"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="edU-Xp-UQN" id="jbp-VT-wz9">
@@ -845,96 +845,64 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NuA-yM-hGe">
-                                                    <rect key="frame" x="10" y="10" width="355" height="269.5"/>
+                                                    <rect key="frame" x="10" y="10" width="355" height="270"/>
                                                     <subviews>
                                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="EcR-iO-zzH">
-                                                            <rect key="frame" x="0.0" y="0.0" width="355" height="269.5"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="355" height="270"/>
                                                             <color key="backgroundColor" red="0.22575283050537109" green="0.73064249753952026" blue="0.92262524366378784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         </imageView>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="德育得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kJr-OQ-uJV">
-                                                            <rect key="frame" x="10" y="20" width="150" height="20"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="width" constant="150" id="ehO-8n-FwU"/>
-                                                                <constraint firstAttribute="height" constant="20" id="pYD-aW-6Bk"/>
-                                                            </constraints>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="德育得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kJr-OQ-uJV">
+                                                            <rect key="frame" x="40" y="20" width="66" height="20"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.051375745996832825" green="0.16511302134149486" blue="0.45782439720812185" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.3分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pPw-dt-Xzf">
-                                                            <rect key="frame" x="10" y="60" width="150" height="40"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="40" id="ecz-CY-03C"/>
-                                                                <constraint firstAttribute="width" constant="150" id="phe-N0-aq1"/>
-                                                            </constraints>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.3分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pPw-dt-Xzf">
+                                                            <rect key="frame" x="31.5" y="50" width="83" height="40"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="33"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKn-CP-eGk">
-                                                            <rect key="frame" x="195" y="60" width="150" height="40"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="40" id="OVL-Dm-D0P"/>
-                                                                <constraint firstAttribute="width" constant="150" id="nQl-2f-7Gr"/>
-                                                            </constraints>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKn-CP-eGk">
+                                                            <rect key="frame" x="222.5" y="50" width="100" height="40"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="33"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同期上升1.1分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hkb-po-YgG">
-                                                            <rect key="frame" x="10" y="130" width="150" height="20"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="width" constant="150" id="PSD-YN-C3a"/>
-                                                                <constraint firstAttribute="height" constant="20" id="ZOa-PU-3Kb"/>
-                                                            </constraints>
+                                                            <rect key="frame" x="23" y="110" width="100" height="20"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同期上升5名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="loz-6S-4SZ">
-                                                            <rect key="frame" x="195" y="130" width="150" height="20"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="20" id="EYX-fX-sIC"/>
-                                                                <constraint firstAttribute="width" constant="150" id="H2n-Eb-L5g"/>
-                                                            </constraints>
+                                                            <rect key="frame" x="226.5" y="110" width="92" height="20"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年03月03号" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HhW-z2-zvL">
-                                                            <rect key="frame" x="195" y="20" width="150" height="20"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="20" id="MyS-ul-F5h"/>
-                                                                <constraint firstAttribute="width" constant="150" id="hWE-h6-b8M"/>
-                                                            </constraints>
+                                                            <rect key="frame" x="210" y="20" width="125" height="20"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.04378364389881239" green="0.14071327995740801" blue="0.3901689403553299" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高于平均分1.1分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fxg-5d-gP4">
-                                                            <rect key="frame" x="10" y="155" width="150" height="20"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="width" constant="150" id="FeR-Ix-FqW"/>
-                                                                <constraint firstAttribute="height" constant="20" id="GTU-T7-oLp"/>
-                                                            </constraints>
+                                                            <rect key="frame" x="22" y="140" width="102" height="17"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高于平均排名1.1名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKB-Hn-Ran">
-                                                            <rect key="frame" x="195" y="155" width="150" height="20"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="20" id="lfE-0K-A9n"/>
-                                                                <constraint firstAttribute="width" constant="150" id="oeR-dB-6G7"/>
-                                                            </constraints>
+                                                            <rect key="frame" x="214.5" y="140" width="116" height="17"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="哎哟不错哦,德育评价打败了33%的同学!注意行为规范将更上一层楼" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6hf-ET-tXW">
-                                                            <rect key="frame" x="25" y="200" width="305" height="40"/>
+                                                            <rect key="frame" x="20" y="197" width="315" height="40"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="40" id="4an-We-6oF"/>
+                                                                <constraint firstAttribute="height" constant="40" id="psR-HE-T23"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.09198654443025589" green="0.17189717292785645" blue="0.63014686107635498" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -943,29 +911,29 @@
                                                     </subviews>
                                                     <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="trailing" secondItem="6hf-ET-tXW" secondAttribute="trailing" constant="25" id="3ik-Ae-MBR"/>
-                                                        <constraint firstItem="6hf-ET-tXW" firstAttribute="top" secondItem="Fxg-5d-gP4" secondAttribute="bottom" constant="25" id="3kK-BI-E7G"/>
-                                                        <constraint firstItem="6hf-ET-tXW" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="25" id="61S-HQ-Lix"/>
-                                                        <constraint firstAttribute="trailing" secondItem="HhW-z2-zvL" secondAttribute="trailing" constant="10" id="6Xn-wl-fPU"/>
-                                                        <constraint firstAttribute="bottom" secondItem="EcR-iO-zzH" secondAttribute="bottom" id="GlV-P3-AYa"/>
-                                                        <constraint firstAttribute="trailing" secondItem="loz-6S-4SZ" secondAttribute="trailing" constant="10" id="KnQ-zl-nh0"/>
-                                                        <constraint firstItem="Fxg-5d-gP4" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="10" id="MQL-ow-v7B"/>
-                                                        <constraint firstAttribute="trailing" secondItem="XKn-CP-eGk" secondAttribute="trailing" constant="10" id="OVT-BE-qZU"/>
-                                                        <constraint firstItem="kJr-OQ-uJV" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="20" id="SVF-97-3ty"/>
-                                                        <constraint firstAttribute="trailing" secondItem="cKB-Hn-Ran" secondAttribute="trailing" constant="10" id="Tqe-wB-7Ks"/>
-                                                        <constraint firstItem="loz-6S-4SZ" firstAttribute="top" secondItem="XKn-CP-eGk" secondAttribute="bottom" constant="30" id="UY4-Mp-GY1"/>
-                                                        <constraint firstItem="pPw-dt-Xzf" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="10" id="WRZ-Sg-8Io"/>
-                                                        <constraint firstItem="XKn-CP-eGk" firstAttribute="top" secondItem="HhW-z2-zvL" secondAttribute="bottom" constant="20" id="XHI-iQ-hS6"/>
-                                                        <constraint firstItem="Fxg-5d-gP4" firstAttribute="top" secondItem="hkb-po-YgG" secondAttribute="bottom" constant="5" id="bPx-MS-bTs"/>
-                                                        <constraint firstAttribute="trailing" secondItem="EcR-iO-zzH" secondAttribute="trailing" id="o9W-f1-P8e"/>
-                                                        <constraint firstItem="EcR-iO-zzH" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" id="pPG-PU-KdZ"/>
-                                                        <constraint firstItem="cKB-Hn-Ran" firstAttribute="top" secondItem="loz-6S-4SZ" secondAttribute="bottom" constant="5" id="stC-Nx-eCo"/>
-                                                        <constraint firstItem="HhW-z2-zvL" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="20" id="tFo-Gh-mJI"/>
-                                                        <constraint firstItem="kJr-OQ-uJV" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="10" id="taH-71-uDr"/>
-                                                        <constraint firstItem="hkb-po-YgG" firstAttribute="top" secondItem="pPw-dt-Xzf" secondAttribute="bottom" constant="30" id="uZE-jY-V01"/>
-                                                        <constraint firstItem="pPw-dt-Xzf" firstAttribute="top" secondItem="kJr-OQ-uJV" secondAttribute="bottom" constant="20" id="wND-7I-9QN"/>
-                                                        <constraint firstItem="hkb-po-YgG" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="10" id="y3J-WD-A7Y"/>
-                                                        <constraint firstItem="EcR-iO-zzH" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" id="z7e-OZ-Z85"/>
+                                                        <constraint firstAttribute="trailing" secondItem="6hf-ET-tXW" secondAttribute="trailing" constant="20" id="2Tj-Ve-WtW"/>
+                                                        <constraint firstItem="kJr-OQ-uJV" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="20" id="502-cT-UfL"/>
+                                                        <constraint firstItem="pPw-dt-Xzf" firstAttribute="centerX" secondItem="kJr-OQ-uJV" secondAttribute="centerX" id="AzG-TO-CG2"/>
+                                                        <constraint firstItem="cKB-Hn-Ran" firstAttribute="top" secondItem="loz-6S-4SZ" secondAttribute="bottom" constant="10" id="BDo-p2-BtV"/>
+                                                        <constraint firstItem="XKn-CP-eGk" firstAttribute="top" secondItem="HhW-z2-zvL" secondAttribute="bottom" constant="10" id="BGy-UG-tlR"/>
+                                                        <constraint firstItem="EcR-iO-zzH" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" id="KHa-7w-P6J"/>
+                                                        <constraint firstItem="cKB-Hn-Ran" firstAttribute="centerX" secondItem="XKn-CP-eGk" secondAttribute="centerX" id="Pi8-gc-a9g"/>
+                                                        <constraint firstItem="HhW-z2-zvL" firstAttribute="trailing" secondItem="NuA-yM-hGe" secondAttribute="trailing" constant="-20" id="SlW-1a-fii"/>
+                                                        <constraint firstItem="loz-6S-4SZ" firstAttribute="top" secondItem="XKn-CP-eGk" secondAttribute="bottom" constant="20" id="Wyn-HL-kAX"/>
+                                                        <constraint firstItem="Fxg-5d-gP4" firstAttribute="centerX" secondItem="pPw-dt-Xzf" secondAttribute="centerX" id="XJq-vE-dEe"/>
+                                                        <constraint firstItem="pPw-dt-Xzf" firstAttribute="top" secondItem="kJr-OQ-uJV" secondAttribute="bottom" constant="10" id="Zq8-G2-nmf"/>
+                                                        <constraint firstAttribute="bottom" secondItem="EcR-iO-zzH" secondAttribute="bottom" id="bD2-Ic-8FB"/>
+                                                        <constraint firstItem="XKn-CP-eGk" firstAttribute="centerX" secondItem="HhW-z2-zvL" secondAttribute="centerX" id="cJf-Oy-8XW"/>
+                                                        <constraint firstItem="6hf-ET-tXW" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="20" id="chf-Pk-BRe"/>
+                                                        <constraint firstItem="Fxg-5d-gP4" firstAttribute="top" secondItem="hkb-po-YgG" secondAttribute="bottom" constant="10" id="eD6-Pf-fxG"/>
+                                                        <constraint firstItem="hkb-po-YgG" firstAttribute="centerX" secondItem="pPw-dt-Xzf" secondAttribute="centerX" id="eDy-jJ-L7w"/>
+                                                        <constraint firstItem="EcR-iO-zzH" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" id="gmn-23-uqR"/>
+                                                        <constraint firstAttribute="trailing" secondItem="EcR-iO-zzH" secondAttribute="trailing" id="jgC-VC-Bdn"/>
+                                                        <constraint firstItem="kJr-OQ-uJV" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="40" id="mO7-dF-5MB"/>
+                                                        <constraint firstItem="hkb-po-YgG" firstAttribute="top" secondItem="pPw-dt-Xzf" secondAttribute="bottom" constant="20" id="obS-hd-z9K"/>
+                                                        <constraint firstItem="6hf-ET-tXW" firstAttribute="top" secondItem="Fxg-5d-gP4" secondAttribute="bottom" constant="40" id="q0U-qj-DJO"/>
+                                                        <constraint firstItem="HhW-z2-zvL" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="20" id="q7J-cI-IMF"/>
+                                                        <constraint firstItem="loz-6S-4SZ" firstAttribute="centerX" secondItem="XKn-CP-eGk" secondAttribute="centerX" id="yfa-jP-3Zs"/>
                                                     </constraints>
                                                     <userDefinedRuntimeAttributes>
                                                         <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -983,8 +951,18 @@
                                                 <constraint firstAttribute="trailing" secondItem="NuA-yM-hGe" secondAttribute="trailing" constant="10" id="yoB-4L-JH6"/>
                                             </constraints>
                                         </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="averageLab" destination="Fxg-5d-gP4" id="PFD-GF-Iz9"/>
+                                            <outlet property="averageRightLab" destination="cKB-Hn-Ran" id="kVz-qO-3MA"/>
+                                            <outlet property="dateLab" destination="HhW-z2-zvL" id="0hV-UV-IFc"/>
+                                            <outlet property="evaluationLab" destination="6hf-ET-tXW" id="gJ4-6w-ie9"/>
+                                            <outlet property="pointLab" destination="pPw-dt-Xzf" id="Mi5-Rt-pXT"/>
+                                            <outlet property="rankingLab" destination="XKn-CP-eGk" id="Okq-ba-4fm"/>
+                                            <outlet property="risingLab" destination="hkb-po-YgG" id="c3d-Us-Dr0"/>
+                                            <outlet property="risingRightLab" destination="loz-6S-4SZ" id="CMk-Ho-lDv"/>
+                                        </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="educationDetail" rowHeight="280" id="cT9-nd-Syd">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="educationDetail" rowHeight="280" id="cT9-nd-Syd" customClass="EducationDetailCell" customModule="ParentAssistant" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="308" width="375" height="280"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cT9-nd-Syd" id="GQz-Gg-SDo">
@@ -998,20 +976,18 @@
                                                             <rect key="frame" x="50" y="15" width="255" height="44"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hB5-yY-cds">
-                                                                    <rect key="frame" x="36" y="0.0" width="40" height="44"/>
+                                                                    <rect key="frame" x="36" y="0.0" width="35" height="44"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="44" id="ba9-GG-6DC"/>
-                                                                        <constraint firstAttribute="width" constant="40" id="gas-Ds-v8t"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昨日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbT-TJ-Rlx">
-                                                                    <rect key="frame" x="205" y="0.0" width="40" height="44"/>
+                                                                    <rect key="frame" x="210" y="0.0" width="35" height="44"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="44" id="0Qq-BR-OZ6"/>
-                                                                        <constraint firstAttribute="width" constant="40" id="7OQ-uj-VsT"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                     <nil key="textColor"/>
@@ -1019,7 +995,7 @@
                                                                 </label>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2l-9v-6mj">
                                                                     <rect key="frame" x="10" y="14" width="16" height="16"/>
-                                                                    <color key="backgroundColor" red="0.12355335801839828" green="0.57626670598983765" blue="0.94167101383209229" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <color key="backgroundColor" red="0.25490196078431371" green="0.41176470588235292" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="16" id="7Uu-Sj-DgF"/>
                                                                         <constraint firstAttribute="height" constant="16" id="ZLo-3g-2uU"/>
@@ -1032,8 +1008,8 @@
                                                                     </userDefinedRuntimeAttributes>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="woJ-aK-qdt">
-                                                                    <rect key="frame" x="179" y="14" width="16" height="16"/>
-                                                                    <color key="backgroundColor" red="0.96772700548171997" green="0.051271520555019379" blue="0.24591821432113647" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <rect key="frame" x="184" y="14" width="16" height="16"/>
+                                                                    <color key="backgroundColor" red="0.86274509803921573" green="0.0" blue="0.062745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="16" id="KqF-Oh-IfA"/>
                                                                         <constraint firstAttribute="height" constant="16" id="YHQ-d0-qVM"/>
@@ -1057,28 +1033,22 @@
                                                                 <constraint firstItem="g2l-9v-6mj" firstAttribute="leading" secondItem="BAf-AK-gLj" secondAttribute="leading" constant="10" id="fWJ-vl-IYK"/>
                                                                 <constraint firstItem="woJ-aK-qdt" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="top" constant="14" id="ipM-hU-2vL"/>
                                                                 <constraint firstItem="hB5-yY-cds" firstAttribute="leading" secondItem="g2l-9v-6mj" secondAttribute="trailing" constant="10" id="k53-ly-Ddj"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hB5-yY-cds" secondAttribute="trailing" constant="20" symbolic="YES" id="nbQ-l7-6mG"/>
                                                             </constraints>
                                                         </view>
-                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3tc-50-XKr">
-                                                            <rect key="frame" x="10" y="74" width="335" height="175.5"/>
+                                                        <view contentMode="scaleToFill" restorationIdentifier="moralLineChart" translatesAutoresizingMaskIntoConstraints="NO" id="3tc-50-XKr">
+                                                            <rect key="frame" x="0.0" y="59" width="355" height="210.5"/>
                                                         </view>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="test001" translatesAutoresizingMaskIntoConstraints="NO" id="O2Z-FA-5ZF">
-                                                            <rect key="frame" x="10" y="59" width="335" height="210.5"/>
-                                                        </imageView>
                                                     </subviews>
                                                     <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="trailing" secondItem="O2Z-FA-5ZF" secondAttribute="trailing" constant="10" id="DPu-FE-JAV"/>
                                                         <constraint firstItem="BAf-AK-gLj" firstAttribute="top" secondItem="vXo-Fa-6Hr" secondAttribute="top" constant="15" id="EdB-30-jd8"/>
                                                         <constraint firstItem="BAf-AK-gLj" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" constant="50" id="Foc-Ql-7UA"/>
-                                                        <constraint firstItem="3tc-50-XKr" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" constant="10" id="LKH-Xf-sSi"/>
+                                                        <constraint firstItem="3tc-50-XKr" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" id="LKH-Xf-sSi"/>
                                                         <constraint firstAttribute="trailing" secondItem="BAf-AK-gLj" secondAttribute="trailing" constant="50" id="NKu-wo-SUP"/>
-                                                        <constraint firstItem="O2Z-FA-5ZF" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" constant="10" id="Wh4-Qh-X9L"/>
-                                                        <constraint firstAttribute="trailing" secondItem="3tc-50-XKr" secondAttribute="trailing" constant="10" id="bjx-CV-I0v"/>
-                                                        <constraint firstAttribute="bottom" secondItem="3tc-50-XKr" secondAttribute="bottom" constant="20" id="f0z-WO-LfT"/>
-                                                        <constraint firstItem="3tc-50-XKr" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="bottom" constant="15" id="jZe-ix-tAh"/>
-                                                        <constraint firstAttribute="bottom" secondItem="O2Z-FA-5ZF" secondAttribute="bottom" id="p19-s9-iKS"/>
-                                                        <constraint firstItem="O2Z-FA-5ZF" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="bottom" id="swb-4Y-nCM"/>
+                                                        <constraint firstAttribute="trailing" secondItem="3tc-50-XKr" secondAttribute="trailing" id="bjx-CV-I0v"/>
+                                                        <constraint firstAttribute="bottom" secondItem="3tc-50-XKr" secondAttribute="bottom" id="f0z-WO-LfT"/>
+                                                        <constraint firstItem="3tc-50-XKr" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="bottom" id="jZe-ix-tAh"/>
                                                     </constraints>
                                                     <userDefinedRuntimeAttributes>
                                                         <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -1096,8 +1066,11 @@
                                                 <constraint firstAttribute="trailing" secondItem="vXo-Fa-6Hr" secondAttribute="trailing" constant="10" id="w6L-OF-ikb"/>
                                             </constraints>
                                         </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="lineChartView" destination="3tc-50-XKr" id="3V4-XW-IX3"/>
+                                        </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="behaviorDetail" rowHeight="100" id="LSs-xC-on7">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="behaviorDetail" rowHeight="100" id="LSs-xC-on7" customClass="BehaviorDetailCell" customModule="ParentAssistant" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="588" width="375" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LSs-xC-on7" id="g4b-AE-z0B">
@@ -1108,19 +1081,17 @@
                                                     <rect key="frame" x="10" y="10" width="355" height="89.5"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绩点: 4.3 增长1.1分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOj-hC-AHs">
-                                                            <rect key="frame" x="10" y="40" width="150" height="20"/>
+                                                            <rect key="frame" x="10" y="40" width="143.5" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="20" id="3zD-IC-3oi"/>
-                                                                <constraint firstAttribute="width" constant="150" id="PiM-cg-aJj"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dcR-3E-z4e">
-                                                            <rect key="frame" x="305" y="10" width="40" height="30"/>
+                                                            <rect key="frame" x="323" y="10" width="22" height="30"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="40" id="oo5-nm-jVN"/>
                                                                 <constraint firstAttribute="height" constant="30" id="yIL-7E-thg"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="20"/>
@@ -1128,9 +1099,8 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="排名:第三名 增长1名" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pKi-l3-fED">
-                                                            <rect key="frame" x="180" y="40" width="160" height="20"/>
+                                                            <rect key="frame" x="180" y="40" width="155.5" height="20"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="160" id="UOX-Yq-UNc"/>
                                                                 <constraint firstAttribute="height" constant="20" id="wAx-AC-wB7"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -1138,9 +1108,8 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="行为规范" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i3X-WD-17R">
-                                                            <rect key="frame" x="10" y="10" width="100" height="20"/>
+                                                            <rect key="frame" x="10" y="10" width="77.5" height="20"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="100" id="K6t-dE-Yqh"/>
                                                                 <constraint firstAttribute="height" constant="20" id="tkD-27-2zS"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="19"/>
@@ -1150,10 +1119,13 @@
                                                     </subviews>
                                                     <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
+                                                        <constraint firstItem="dcR-3E-z4e" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="20" symbolic="YES" id="5IH-UD-w2m"/>
                                                         <constraint firstItem="HOj-hC-AHs" firstAttribute="leading" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="10" id="95i-QX-Y3F"/>
                                                         <constraint firstAttribute="trailing" secondItem="dcR-3E-z4e" secondAttribute="trailing" constant="10" id="Cd3-4P-wa1"/>
+                                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="i3X-WD-17R" secondAttribute="trailing" constant="20" symbolic="YES" id="D15-ex-oBf"/>
                                                         <constraint firstItem="dcR-3E-z4e" firstAttribute="top" secondItem="3Qp-zh-xwy" secondAttribute="top" constant="10" id="EaB-NF-flN"/>
-                                                        <constraint firstItem="pKi-l3-fED" firstAttribute="leading" secondItem="HOj-hC-AHs" secondAttribute="trailing" constant="20" id="NTX-lO-8rF"/>
+                                                        <constraint firstAttribute="trailing" secondItem="pKi-l3-fED" secondAttribute="trailing" constant="19.5" id="IQP-7C-QZV"/>
+                                                        <constraint firstItem="pKi-l3-fED" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="HOj-hC-AHs" secondAttribute="trailing" symbolic="YES" id="NTX-lO-8rF"/>
                                                         <constraint firstItem="i3X-WD-17R" firstAttribute="leading" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="10" id="WQn-HK-HqW"/>
                                                         <constraint firstItem="HOj-hC-AHs" firstAttribute="top" secondItem="i3X-WD-17R" secondAttribute="bottom" constant="10" id="fQp-g2-GfI"/>
                                                         <constraint firstItem="pKi-l3-fED" firstAttribute="top" secondItem="dcR-3E-z4e" secondAttribute="bottom" id="l3K-LN-KQt"/>
@@ -1374,7 +1346,7 @@
                                                                 </label>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FzF-1s-QFR">
                                                                     <rect key="frame" x="10" y="12" width="16" height="16"/>
-                                                                    <color key="backgroundColor" red="0.016804177310000001" green="0.19835099580000001" blue="1" alpha="0.58256635273972601" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <color key="backgroundColor" red="0.25490196078431371" green="0.41176470588235292" blue="0.74509803921568629" alpha="0.58256635273972601" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="16" id="0ev-7O-rKb"/>
                                                                         <constraint firstAttribute="width" constant="16" id="7gn-h0-yAb"/>
@@ -2180,7 +2152,6 @@
         <image name="navigationBar_backgrounImage" width="375" height="139"/>
         <image name="report_bar_icon" width="22" height="20"/>
         <image name="report_bar_icon_select" width="22" height="20"/>
-        <image name="test001" width="540" height="278"/>
         <image name="test002" width="216" height="282"/>
         <image name="test003" width="732" height="388"/>
     </resources>
diff --git a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
index d1b4da5..1e7f9aa 100644
--- a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Alamofire.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>DZNEmptyDataSet.xcscheme</key>
 		<dict>
--
libgit2 0.21.0