修改成长页面

Cao yang
1 parent 028d32ac
Showing 37 changed files with 1270 additions and 1153 deletions Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/MoralViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/ReportViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/SceneDetailViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/CalendarView.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/LineChartView.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.xib
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/TaskPresentationTableViewCell.swift
ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
@@ -42,6 +42,7 @@
 		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 */; };
+		ADC9AB72207C55CE00348EF1 /* GrowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC9AB71207C55CE00348EF1 /* GrowViewController.swift */; };
 		ADE33B312062202300BEA6E6 /* Macro.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE33B302062202300BEA6E6 /* Macro.swift */; };
 		ADF159612069E00000A9485D /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADF159602069E00000A9485D /* CalendarView.swift */; };
 		BF388469205A4DE900A240EF /* StudentClassInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF388468205A4DE900A240EF /* StudentClassInfo.swift */; };
@@ -188,6 +189,7 @@
 		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>"; };
+		ADC9AB71207C55CE00348EF1 /* GrowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowViewController.swift; sourceTree = "<group>"; };
 		ADE33B302062202300BEA6E6 /* Macro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Macro.swift; sourceTree = "<group>"; };
 		ADF159602069E00000A9485D /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
 		BF388468205A4DE900A240EF /* StudentClassInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentClassInfo.swift; sourceTree = "<group>"; };
@@ -375,7 +377,7 @@
 				BFEAAAA5205117DA0072FAAF /* main */,
 				599364DA204E62E700C8B371 /* evaluation */,
 				599364E0204E62E700C8B371 /* Information */,
-				599364E6204E62E700C8B371 /* report */,
+				599364E6204E62E700C8B371 /* Grow */,
 				599364E2204E62E700C8B371 /* my */,
 				599364FD204E941900C8B371 /* userCenter */,
 			);
@@ -425,15 +427,17 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		599364E6204E62E700C8B371 /* report */ = {
+		599364E6204E62E700C8B371 /* Grow */ = {
 			isa = PBXGroup;
 			children = (
+				ADC9AB70207C558600348EF1 /* Model */,
+				ADC9AB71207C55CE00348EF1 /* GrowViewController.swift */,
 				599364E7204E62E700C8B371 /* ReportViewController.swift */,
 				AD65FB7920637F110052415B /* MoralViewController.swift */,
 				ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */,
 				BF3B829E2050CC7E002078EA /* View */,
 			);
-			path = report;
+			path = Grow;
 			sourceTree = "<group>";
 		};
 		599364F1204E632600C8B371 /* util */ = {
@@ -473,6 +477,13 @@
 			path = userCenter;
 			sourceTree = "<group>";
 		};
+		ADC9AB70207C558600348EF1 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		B605235D289EDBCA5C5AF2C5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -952,6 +963,7 @@
 				BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */,
 				BF67F3C020590A2F002FDC61 /* SwiftyJSON.swift in Sources */,
 				599364ED204E62E700C8B371 /* InformationViewController.swift in Sources */,
+				ADC9AB72207C55CE00348EF1 /* GrowViewController.swift in Sources */,
 				5980BF692061048A00F4A35E /* LZCityPickerView.m in Sources */,
 				BF388482205F5BC800A240EF /* MessageManager.swift in Sources */,
 				5980BF682061048A00F4A35E /* LZCityPickerController.m in Sources */,
@@ -0,0 +1,211 @@
+//
+//  GrowViewController.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/4/10.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class GrowViewController: UIViewController,UIScrollViewDelegate {
+
+    var ZJBNavH = 44.0
+    //MARK: - 标题数据
+    //标题
+    lazy var titleView = {() -> UIView in
+        let title = UIScrollView()
+        title.frame = CGRect(x:0,y:0,width:getScreenWidth(),height:44)
+        title.backgroundColor = Theme.topBarColor()
+        return title
+    }()
+    //MARK: - 内容数据
+    //内容
+    lazy var contentScrollView = {()->UIScrollView in
+        let scrollView = UIScrollView.init(frame: self.view.bounds)
+        scrollView.delegate = self
+        scrollView.isPagingEnabled = true
+        scrollView.showsHorizontalScrollIndicator = false
+        return scrollView
+    }()
+    //按钮数组
+    var titleBtnArr = Array<UIButton>()
+    //titleLine初始位置
+    var linePoint = CGPoint()
+    //按钮标题数据
+    var titleArr = Array<String>()
+    //按钮下面横线
+    lazy var titleLine = {()->CALayer in
+        let lineLay = CALayer.init()
+        lineLay.frame.size = CGSize.init(width: 50, height: 2)
+        lineLay.backgroundColor = UIColor.gray.cgColor
+        return lineLay
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        titleArr = ["应用","报告"]
+        //设置导航栏标题
+        self.navigationItem.titleView = titleView
+        self.view.addSubview(contentScrollView)
+        
+        setUpTitle()
+        setChildViewContent()
+        
+        //左按钮
+        let leftView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
+        let titleLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 40, height: 44))
+        if AccountManager.shared.isOnline() {
+            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
+                titleLab.text = "未绑定"
+            }else{
+                titleLab.text = AccountManager.shared.rawUserInfo!.contentData()["studentClass"][0]["studentName"].stringValue
+            }
+        }else{
+            titleLab.text = "未登录"
+        }
+        titleLab.font = UIFont.systemFont(ofSize: 15)
+        titleLab.textAlignment = .center
+        leftView.addSubview(titleLab)
+        
+        let imageView = UIImageView.init(frame: CGRect.init(x: 40, y: 11, width: 10, height: 22))
+        imageView.image = UIImage.init(named: "report_pull")
+        imageView.contentMode = .scaleAspectFit
+        leftView.addSubview(imageView)
+        
+//        leftView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
+        
+        let leftBtn = UIBarButtonItem.init(customView: leftView)
+        self.navigationItem.leftBarButtonItem = leftBtn
+        //右按钮
+        let rightView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
+        let titleRLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 40, height: 44))
+        titleRLab.text = "筛选"
+        titleRLab.font = UIFont.systemFont(ofSize: 15)
+        titleRLab.textAlignment = .center
+        rightView.addSubview(titleRLab)
+        
+        let imageRView = UIImageView.init(frame: CGRect.init(x: 40, y: 11, width: 10, height: 22))
+        imageRView.image = UIImage.init(named: "report_select")
+        imageRView.contentMode = .scaleAspectFit
+        rightView.addSubview(imageRView)
+        
+//        rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
+        let rightBtn = UIBarButtonItem.init(customView: rightView)
+        self.navigationItem.rightBarButtonItem = rightBtn
+        
+        setupNavigationBar()
+    }
+    
+    // MARK: - 设置顶部按钮
+    func setupNavigationBar(){
+        self.configTheme()
+    }
+    
+    private func setChildViewContent(){
+        
+        //添加子控制器
+        for _ in 0..<titleArr.count {
+            let vc = Story.instantiateViewControllerWithIdentifier("ReportViewController", storyName: "Main") as! ReportViewController
+            self.addChildViewController(vc)
+        }
+        //设置第一个控制器数据
+        let childVC = self.childViewControllers.first
+        childVC?.view.frame = self.view.bounds
+        self.contentScrollView.addSubview((childVC?.view)!)
+        //设置scrollview滑动范围
+        contentScrollView.contentSize = CGSize.init(width: getScreenWidth()*CGFloat(titleArr.count), height: 0)
+        
+    }
+    //MARK: - 设置标题
+    func setUpTitle(){
+        
+        let count = titleArr.count
+        var btnWidthArr = Array<CGFloat>()
+        for i in 0..<count {
+            
+            let btn = UIButton.init()
+            btn.setTitle(titleArr[i], for: .normal)
+            btn.titleLabel!.font = UIFont.systemFont(ofSize: 17)
+            btn.setTitleColor(UIColor.black, for: .normal)
+            btn.tag = i
+            btn.addTarget(self, action: #selector(clickTitleAction(btn:)), for:UIControlEvents.touchUpInside)
+            btn.frame.size = CGSize.init(width: 40, height: ZJBNavH)
+            
+            let widht = getScreenWidth()
+            btn.center = CGPoint.init(x: widht/4*(1+CGFloat(i))-16, y: CGFloat(ZJBNavH/2))
+            btnWidthArr.append(btn.frame.size.width)
+            
+            titleBtnArr.append(btn)
+            titleView.addSubview(btn)
+            if i == 0 {
+                //设置titleLine初始位置
+                titleLine.frame = CGRect.init(x: btn.frame.origin.x, y: btn.center.y+14, width: 40, height: 3)
+                linePoint = CGPoint.init(x: titleLine.frame.origin.x, y: titleLine.frame.origin.y)
+                //添加titleLine到导航
+                self.navigationItem.titleView?.layer.addSublayer(titleLine)
+            }
+        }
+    }
+    @objc func clickTitleAction(btn:UIButton){
+        //titleLine动画动作
+        let animal = CABasicAnimation.init(keyPath: "position")
+        animal.fromValue = NSValue.init(cgPoint: CGPoint.init(x: linePoint.x, y: linePoint.y))
+        animal.toValue = NSValue.init(cgPoint: CGPoint.init(x: btn.center.x, y: btn.center.y+14))
+        animal.isRemovedOnCompletion = false
+        animal.fillMode = kCAFillModeForwards
+        self.titleLine.add(animal, forKey: "move")
+        
+        //update
+        linePoint = CGPoint.init(x: btn.center.x, y: btn.center.y+14)
+        //联动contentScrollview
+        let index = CGFloat(btn.tag)
+        
+        if contentScrollView.contentSize.width>0 {
+            
+            let childVC = self.childViewControllers[btn.tag]
+            
+            if self.contentScrollView.subviews.contains(childVC.view){
+                //已有view,直接移动
+                //移动scrollview
+                contentScrollView.setContentOffset(CGPoint.init(x: index*getScreenWidth(), y: 0), animated: true)
+            }else{
+                //新加view,刷新数据
+                childVC.view.frame = CGRect.init(x: CGFloat(btn.tag)*getScreenWidth(), y: 0, width: getScreenWidth(),height: self.view.frame.size.height)
+                self.contentScrollView.addSubview(childVC.view)
+                //移动scrollview
+                contentScrollView.setContentOffset(CGPoint.init(x: index*getScreenWidth(), y: 0), animated: true)
+            }
+        }
+    }
+    //MARK: - ScrollView Delegate
+    func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
+        
+        if scrollView == contentScrollView {
+            let offsetX = scrollView.contentOffset.x
+            let index = Int(offsetX/getScreenWidth())
+            let btn = titleBtnArr[index]
+            
+            clickTitleAction(btn: btn)
+            
+        }
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destinationViewController.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
@@ -0,0 +1,106 @@
+//
+//  MoralViewController.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/22.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
+
+    @IBOutlet weak var tableView: UITableView!
+    var data = [String:JSON]()
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.title = "德育报告"
+        tableView.delegate = self
+        tableView.dataSource = self
+        
+        
+        downLoadDataFromNet()
+    }
+    
+    private func downLoadDataFromNet(){
+    
+        
+        let params = ["screenId":1,"startDate":"2018-03-08","endDate":"2018-04-08","classId":"70","schoolId":1] as [String : Any]
+    
+        HTTPServer.shared.getEvaluationSceneAnalysis(parameters: params as [String : AnyObject]) { (backData, error) in
+            
+            if error == nil && JSON.fromString(backData)!["status"].intValue == 1 {
+                
+                self.data = JSON.fromString(backData)!["data"].dictionaryValue
+                
+                if !self.data.isEmpty{
+                    print(self.data)
+                }
+            }
+        }
+    }
+    
+    
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 3
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        if section == 2 {
+            return 3
+        }else{
+            return 1
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        switch indexPath.section {
+        case 0:
+            return 240
+        case 1:
+            return 240
+        case 2:
+            return 70
+        default:
+            return 0
+        }
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        var cell = UITableViewCell.init()
+        switch indexPath.section {
+        case 0:
+            cell = tableView.dequeueReusableCell(withIdentifier: "moralDetail", for: indexPath)
+            return cell
+        case 1:
+            cell = tableView.dequeueReusableCell(withIdentifier: "educationDetail", for: indexPath)
+            return cell
+        case 2:
+            cell = tableView.dequeueReusableCell(withIdentifier: "behaviorDetail", for: indexPath)
+            return cell
+        default:
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 2 {
+            let scene = Story.instantiateViewControllerWithIdentifier("SceneDetailViewController", storyName: "Main") as! SceneDetailViewController
+            self.navigationController?.pushViewController(scene, animated: true)
+        }
+    }
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destinationViewController.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
@@ -0,0 +1,98 @@
+//
+//  ReportViewController.swift
+//  ParentAssistant
+//
+//  Created by 葛建军 on 2018/3/5.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class ReportViewController: UIViewController {
+    
+    @IBOutlet weak var reportTable: UITableView!
+    
+    //膜板
+    var keyWindow = UIWindow()
+    var backBotton = UIButton()
+    //日历
+    var calendar = CalendarView()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupDateView()
+    }
+  
+    // MARK: - 设置日期页面
+    func setupDateView(){
+        
+        let headView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: 60))
+        self.view.addSubview(headView)
+        
+        //添加手势
+        let recognizer = UISwipeGestureRecognizer.init(target: self, action: #selector(showView))
+        recognizer.direction = UISwipeGestureRecognizerDirection.down
+        headView.addGestureRecognizer(recognizer)
+        
+        calendar = CalendarView.init(frame: CGRect.init(x: 0, y: 30, width: screenWidth, height: 260))
+    }
+    
+    @objc func showView(){
+        keyWindow = UIApplication.shared.keyWindow!
+        let backBtn = UIButton.init(frame: CGRect.init(x: 0, y: calendar.frame.origin.y+260+22, width: screenWidth, height: screenHeight))
+        backBtn.backgroundColor = UIColor.black
+        backBtn.alpha = 0.4
+        
+        backBtn.addTarget(self, action: #selector(closeView(btn:)), for: UIControlEvents.allEvents)
+        reportTable.isUserInteractionEnabled = false
+        
+        keyWindow.addSubview(backBtn)
+        keyWindow.addSubview(calendar)
+        calendar.isHidden = false
+    }
+    @objc func closeView(btn:UIButton) {
+        
+        reportTable.isUserInteractionEnabled = true
+        UIView.animate(withDuration: 0.3) {
+            btn.removeFromSuperview()
+            self.calendar.isHidden = true
+        }
+    }
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+    }
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+    }
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+
+    }
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+
+
+}
+
+// MARK: - 作业报告列表
+extension ReportViewController: UITableViewDelegate,UITableViewDataSource{
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 5
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "MoralTableViewCell", for: indexPath) as! MoralTableViewCell
+            return cell
+        }else{
+            let cell = tableView.dequeueReusableCell(withIdentifier: "TaskPresentationTableViewCell", for: indexPath) as! TaskPresentationTableViewCell
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 280
+    }
+    
+}
@@ -0,0 +1,76 @@
+//
+//  SceneDetailViewController.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/22.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableViewDelegate {
+
+    @IBOutlet weak var sceneTableView: UITableView!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.title = "场景详情"
+        sceneTableView.delegate = self
+        sceneTableView.dataSource = self
+        // Do any additional setup after loading the view.
+    }
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 3
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 2 {
+            return 5
+        }
+        return 1
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+
+        switch indexPath.section {
+        case 0:
+            return 240
+        case 1:
+            return 250
+        case 2:
+            return 70
+        default:
+            return 0
+        }
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        var cell = UITableViewCell.init()
+        switch indexPath.section {
+        case 0:
+            cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) as! SceneTopCell
+            return cell
+        case 1:
+            cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) as! SceneMiddleCell
+            return cell
+        case 2:
+            cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) as! SceneDownCell
+            return cell
+        default:
+            return cell
+        }
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destinationViewController.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
@@ -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
+    }
+
+}
@@ -0,0 +1,72 @@
+//
+//  CalendarView.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/27.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource {
+
+    
+    var weekLab = ["日","一","二","三","四","五","六"]
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.drawCalendarView(frame: frame)
+    }
+    
+    func drawCalendarView(frame:CGRect) {
+        //TODO: 数据源待完成
+        let dayLab = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"]
+        weekLab.append(contentsOf: dayLab)
+         //设置layout
+        let flowlayout = UICollectionViewFlowLayout()
+        flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40)
+        flowlayout.minimumLineSpacing = 0
+        flowlayout.minimumInteritemSpacing = 0
+        flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0)
+        flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0)
+        flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0)
+        
+        let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout)
+        calendarView.delegate = self
+        calendarView.dataSource = self
+        calendarView.backgroundColor = UIColor.white
+        calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell")
+        self.addSubview(calendarView)
+    }
+    
+    //MARK: - Delegate
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return weekLab.count
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath)
+        let lab = UILabel.init(frame: cell.bounds)
+        lab.text = weekLab[indexPath.row]
+        lab.textAlignment = .center
+        cell.addSubview(lab)
+        return cell
+        
+    }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        print("点击了 第 \(weekLab[indexPath.row])")
+    }
+    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
+    }
+    */
+
+}
@@ -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)
+        customLineChart.drawUI(xLableArr: nil)
+        let arr1 = [4,4,2,1,3]
+        let arr2 = [2,1,4,4,5]
+
+        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
+    }
+
+}
@@ -0,0 +1,220 @@
+//
+//  LineChartView.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/23.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class LineChartView: UIView {
+    
+    //默认横坐标
+    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>()
+    //判断是否重复点击
+    private var btnTouch = 10
+    //虚线
+    private let lineLayer = CAShapeLayer()
+    //横坐标下划线
+    private let xMoveLayer = CAShapeLayer()
+    //纵坐标Lab数组
+    private var yMoveLaArr = Array<UILabel>()
+    //折线图数据数组
+    private var dateArr = Array<Array<Int>>()
+    //显示的数字
+    var yLabArray = Array<UILabel>()
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        print("frame==\(frame)")
+
+    }
+    func drawUI(xLableArr:Array<String>?){
+        
+        if  xLableArr != nil {
+            xLabArr = xLableArr!
+        }
+        drawX()
+        drawY()
+    }
+    //设置纵坐标
+     private func drawY() {
+
+        let yHeight = (self.bounds.height-60)/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.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
+            yLab.font = UIFont.systemFont(ofSize: 14)
+            self.addSubview(yLab)
+            
+            let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: screenWidth-60, height: 0.4))
+            lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
+            self.addSubview(lineLab)
+            
+            yMoveLaArr.append(yLab)
+            yCenterArr.append(yLab.frame.origin.y+10)
+        }
+    }
+    //设置横坐标
+    private func drawX() {
+        let xWidth = (screenWidth-20)/CGFloat(yCount)
+        for index in 0..<xCount {
+            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 25))
+            nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
+            nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
+            nameBtn.titleLabel!.textAlignment = .center
+            nameBtn.titleLabel!.font = UIFont.systemFont(ofSize: 13)
+//            nameBtn.backgroundColor = UIColor.orange
+            nameBtn.tag = index
+            self.addSubview(nameBtn)
+            
+            nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchUpInside)
+            
+            xCenterArr.append(nameBtn.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
+        self.layer.addSublayer(drawLayer)
+        drawLayer.setNeedsDisplay()
+        
+        dateArr.append(point)
+        
+    }
+    //MARK: - 点击横坐标
+    @objc func touchXAction(tap:UIButton){
+        
+        let index = tap.tag
+        
+        
+        if btnTouch != index {
+            
+            //竖虚线
+            lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
+            lineLayer.lineWidth = 1
+            let arr = [5,5]
+            lineLayer.lineDashPhase = 0
+            lineLayer.lineDashPattern = arr as [NSNumber]
+            self.layer.addSublayer(lineLayer)
+            
+            //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-60)/CGFloat(yCount)))
+            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: self.bounds.height-45))
+            movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-45))
+            xMoveLayer.path = movePath2
+            
+            if yLabArray.count == dateArr.count {
+                for label in yLabArray {
+                    label.removeFromSuperview()
+                }
+            }
+            yLabArray.removeAll()
+            //数字显示
+            for i in 0..<dateArr.count {
+                let arr = dateArr[i]
+                //y坐标数值
+                let y = arr[index]
+                let yLab = yMoveLaArr[GPA-y]
+                var rect = yLab.frame
+                rect.origin.x = xCenterArr[index]+10
+                
+                let newLab = UILabel()
+                newLab.text = yLab.text
+                newLab.textColor = yLab.textColor
+                newLab.font = yLab.font
+                newLab.frame = rect
+                self.addSubview(newLab)
+                yLabArray.append(newLab)
+            }
+        }else{
+            print(yLabArray)
+        }
+        btnTouch = index
+        
+        
+    }
+    //转换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.5)
+        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()
+    }
+    
+}
+
+
@@ -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
+    }
+
+}
@@ -0,0 +1,30 @@
+//
+//  MoralTableViewCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/22.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class MoralTableViewCell: UITableViewCell {
+
+    @IBOutlet weak var pointLab: UILabel!
+    @IBOutlet weak var todayReName: UILabel!
+    @IBOutlet weak var rankingLab: UILabel!
+    @IBOutlet weak var evaluateLab: UILabel!
+    @IBOutlet weak var rankStatusLab: UILabel!
+    @IBOutlet weak var reportDateLab: 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
+    }
+
+}
@@ -0,0 +1,21 @@
+//
+//  ReportDateCollectionViewCell.swift
+//  ParentAssistant
+//
+//  Created by 葛建军 on 2018/3/9.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+class ReportDateCollectionViewCell: UICollectionViewCell {
+    @IBOutlet var weekLabel: UILabel!
+    @IBOutlet var dateLabel: UILabel!
+    func setupWithDate(week:String,date:String){
+        weekLabel.text = week
+        dateLabel.text = date
+        
+        
+        
+    }
+
+}
@@ -0,0 +1,48 @@
+//
+//  ReportHeaderView.swift
+//  ParentAssistant
+//
+//  Created by 葛建军 on 2018/3/8.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class ReportHeaderView: UIView {
+    var delegate:ReportHeaderViewDelegate!
+    @IBOutlet var nameButton: UIButton!//学生名字按钮
+    @IBOutlet var dateButton: UIButton!//日期按钮
+    @IBOutlet var typeButton: UIButton!//筛选按钮
+    override func awakeFromNib() {
+        super.awakeFromNib()
+    }
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        nameButton.frame.origin = CGPoint(x: 15, y: 7)
+        dateButton.frame.origin = CGPoint(x: (getScreenWidth()-dateButton.frame.size.width)/2, y: 7)
+        typeButton.frame.origin = CGPoint(x: getScreenWidth()-typeButton.frame.size.width-30, y: 7)
+    }
+    //点击学生姓名按钮
+    @IBAction func changeStudentAction(_ sender: UIButton) {
+        delegate.selectStudentButton()
+    }
+    //点击日期按钮
+    @IBAction func changeDateAction(_ sender: UIButton) {
+        delegate.selectDateButton()
+    }
+    //点击筛选按钮
+    @IBAction func changeTypeAction(_ sender: UIButton) {
+        delegate.selectTypeButton()
+    }
+    
+}
+protocol ReportHeaderViewDelegate {
+    func selectStudentButton()
+    func selectDateButton()
+    func selectTypeButton()
+}
+extension ReportHeaderView {
+    class func titleView() -> ReportHeaderView {
+        return Bundle.main.loadNibNamed("ReportHeaderView", owner: nil, options: nil)?.first as! ReportHeaderView
+    }
+}
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clipsSubviews="YES" contentMode="scaleToFill" id="4WE-cx-977" customClass="ReportHeaderView" customModule="ParentAssistant" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="485" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W6e-VK-JCE">
+                    <rect key="frame" x="20" y="7" width="46" height="30"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <state key="normal" title="马伯骞">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="changeStudentAction:" destination="4WE-cx-977" eventType="touchUpInside" id="Dua-XZ-hMB"/>
+                    </connections>
+                </button>
+                <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Dq-Z9-eEM">
+                    <rect key="frame" x="434" y="7" width="31" height="30"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <state key="normal" title="筛选">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="changeTypeAction:" destination="4WE-cx-977" eventType="touchUpInside" id="XFz-ca-od2"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7xY-bD-L7w">
+                    <rect key="frame" x="191" y="7" width="102" height="30"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <state key="normal" title="12月29日">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="changeDateAction:" destination="4WE-cx-977" eventType="touchUpInside" id="pCF-3R-0zv"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="71B-FS-Ws9"/>
+            <connections>
+                <outlet property="dateButton" destination="7xY-bD-L7w" id="3zG-4z-eNW"/>
+                <outlet property="nameButton" destination="W6e-VK-JCE" id="XDD-iU-T0k"/>
+                <outlet property="typeButton" destination="5Dq-Z9-eEM" id="LAM-Dw-HAX"/>
+            </connections>
+            <point key="canvasLocation" x="156.5" y="93"/>
+        </view>
+    </objects>
+</document>
@@ -0,0 +1,30 @@
+//
+//  SceneDownCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/24.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class SceneDownCell: UITableViewCell {
+
+    @IBOutlet weak var evaluateLab: UILabel!
+    @IBOutlet weak var sceneLab: UILabel!
+    @IBOutlet weak var scoreLab: UILabel!
+    @IBOutlet weak var nameLab: UILabel!
+    @IBOutlet weak var classLab: UILabel!
+    @IBOutlet weak var dateLab: 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
+    }
+
+}
@@ -0,0 +1,44 @@
+//
+//  SceneMiddleCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/24.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class SceneMiddleCell: UITableViewCell {
+
+    @IBOutlet weak var lineChartView: UIView!
+    
+    var customLineChart = LineChartView()
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+        let rect = self.lineChartView.bounds
+        customLineChart = LineChartView.init(frame: rect)
+        let customXLabArr = ["03/12","03/13","03/14","03/15","03/16"]
+        
+        customLineChart.drawUI(xLableArr:customXLabArr)
+        
+        let arr1 = [5,4,5,5,5]
+        let arr2 = [4,4,2,1,3]
+        let arr3 = [3,3,4,3,4]
+        
+        
+        customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 129, G: 199, B: 132))
+        customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 92, G: 145, B: 230))
+        customLineChart.drawLine(point: arr3, color: UIColorWithRGB(R: 255, G: 213, B: 79))
+
+        self.lineChartView.addSubview(customLineChart)
+
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
@@ -0,0 +1,28 @@
+//
+//  SceneTopCell.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/24.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class SceneTopCell: UITableViewCell {
+
+    @IBOutlet weak var scoreLab: UILabel!       //得分
+    @IBOutlet weak var GPALab: UILabel!         //绩点
+    @IBOutlet weak var LevelLab: UILabel!       //等级
+    @IBOutlet weak var SuggestLab: UITextView!  //指导意见
+    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
+    }
+
+}
@@ -0,0 +1,82 @@
+//
+//  TaskPresentationTableViewCell.swift
+//  ParentAssistant
+//
+//  Created by 葛建军 on 2018/3/9.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+//func degreesToRadians(x:Double) -> CGFloat{
+//    return (CGFloat(Double.pi*(x)/180.0))
+//} //把角度转换成PI的方式
+//let PROGREESS_WIDTH = 160 //圆直径
+//let PROGRESS_LINE_WIDTH = 4 //弧线的宽度
+class TaskPresentationTableViewCell: UITableViewCell {
+
+    @IBOutlet var layerLabel: UILabel!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+        //可以画出上面所示的整个轨道。这个圆形是从-210度的角度到30度。
+//        let path = UIBezierPath(arcCenter: CGPoint(x: 40, y: 40), radius: CGFloat((PROGREESS_WIDTH-PROGRESS_LINE_WIDTH)/2), startAngle: degreesToRadians(x: -210), endAngle: degreesToRadians(x: 30), clockwise: true)
+        //画出一个完成的进度的背景轨道
+//        let trackLayer = CAShapeLayer()//创建一个track shape layer
+//        trackLayer.frame = self.layerLabel.bounds
+//        trackLayer.fillColor = UIColor.clear.cgColor
+//        trackLayer.strokeColor = UIColor.red.cgColor//指定path的渲染颜色
+//        trackLayer.opacity = 0.25 //背景同学你就甘心做背景吧，不要太明显了，透明度小一点
+//        trackLayer.lineCap = kCALineCapRound//指定线的边缘是圆的
+//        trackLayer.lineWidth = CGFloat(PROGRESS_LINE_WIDTH)//线的宽度
+//        trackLayer.path = path.cgPath //把path传递給layer，然后layer会处理相应的渲染，整个逻辑和CoreGraph是一致的。
+//
+//        self.layerLabel.layer.addSublayer(trackLayer)
+        //渐变进度条
+//        let progressLayer = CAShapeLayer()
+//        progressLayer.frame = self.layerLabel.bounds
+//        progressLayer.fillColor =  UIColor.clear.cgColor
+//        progressLayer.strokeColor  = UIColor.red.cgColor
+//        progressLayer.lineCap = kCALineCapRound;
+//        progressLayer.lineWidth = CGFloat(PROGRESS_LINE_WIDTH)
+//        progressLayer.path = path.cgPath
+//        progressLayer.strokeEnd = 50/100.0 //总进度
+//
+//        let gradientLayer = CALayer()
+//        let gradientLayer1 =  CAGradientLayer()
+//        gradientLayer1.frame = CGRect(x: 0, y: 0, width: self.layerLabel.frame.size.width/2, height: self.layerLabel.frame.size.height)
+//        gradientLayer1.colors = [UIColor.yellow.cgColor,UIColor.blue.cgColor]
+//        gradientLayer1.locations = [0.5,0.9,1]
+//        gradientLayer1.startPoint = CGPoint(x: 0.5, y: 1)
+//        gradientLayer1.endPoint = CGPoint(x: 0.5, y: 0)
+//        gradientLayer.addSublayer(gradientLayer1)
+//
+//        let gradientLayer2 =  CAGradientLayer()
+//        gradientLayer2.frame = CGRect(x: self.layerLabel.frame.size.width/2, y: 0, width: self.layerLabel.frame.size.width/2, height: self.layerLabel.frame.size.height)
+//        gradientLayer2.colors = [UIColor.blue.cgColor,UIColor.blue.cgColor]
+//        gradientLayer2.locations = [0.1,0.5,1]
+//        gradientLayer2.startPoint = CGPoint(x: 0.5, y: 0)
+//        gradientLayer2.endPoint = CGPoint(x: 0.5, y: 1)
+//        gradientLayer.addSublayer(gradientLayer2)
+//
+//        gradientLayer.mask = progressLayer//用progressLayer来截取渐变层
+//        self.layerLabel.layer.addSublayer(gradientLayer)
+    }
+    //进度条效果 CAShapeLayer有一个strokeEnd的属性，这个属性是从0到1的浮点类型，正好可以用表达百分比，而且这个属性是animatable，可以动态的表示进度的变化。
+    //    -(void)setPercent:(NSInteger)percent animated:(BOOL)animated
+    //    {
+    //    [CATransaction begin];
+    //    [CATransaction setDisableActions:!animated];
+    //    [CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]];
+    //    [CATransaction setAnimationDuration:MAIN_SCREEN_ANIMATION_TIME];
+    //    progressLayer.strokeEnd = percent/100.0;
+    //    [CATransaction commit];
+    //
+    //    _percent = percent;
+    //    }
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
@@ -1,105 +0,0 @@
-//
-//  MoralViewController.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/22.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
-
-    @IBOutlet weak var tableView: UITableView!
-    var data = Array<JSON>()
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.title = "德育报告"
-        tableView.delegate = self
-        tableView.dataSource = self
-        
-        
-        downLoadDataFromNet()
-    }
-    
-    private func downLoadDataFromNet(){
-    
-        
-        let params = ["screenId":1,"startDate":"2018-03-08","endDate":"2018-04-08","classId":"70","schoolId":1] as [String : Any]
-    
-        HTTPServer.shared.getEvaluationSceneAnalysis(parameters: params as [String : AnyObject]) { (backData, error) in
-            print(backData!)
-            if error == nil && JSON.fromString(backData)!["status"].intValue == 1 {
-                
-//                self.data = SceneEvaluate(j: JSON.fromString(backData)!.contentData())
-//                if self.data != nil{
-//                    print(self.data)
-//                }
-            }
-        }
-    }
-    
-    
-    
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return 3
-    }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        if section == 2 {
-            return 3
-        }else{
-            return 1
-        }
-    }
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        switch indexPath.section {
-        case 0:
-            return 240
-        case 1:
-            return 240
-        case 2:
-            return 70
-        default:
-            return 0
-        }
-    }
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        var cell = UITableViewCell.init()
-        switch indexPath.section {
-        case 0:
-            cell = tableView.dequeueReusableCell(withIdentifier: "moralDetail", for: indexPath)
-            return cell
-        case 1:
-            cell = tableView.dequeueReusableCell(withIdentifier: "educationDetail", for: indexPath)
-            return cell
-        case 2:
-            cell = tableView.dequeueReusableCell(withIdentifier: "behaviorDetail", for: indexPath)
-            return cell
-        default:
-            return cell
-        }
-    }
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if indexPath.section == 2 {
-            let scene = Story.instantiateViewControllerWithIdentifier("SceneDetailViewController", storyName: "Main") as! SceneDetailViewController
-            self.navigationController?.pushViewController(scene, animated: true)
-        }
-    }
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-    
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destinationViewController.
-        // Pass the selected object to the new view controller.
-    }
-    */
-
-}
@@ -1,223 +0,0 @@
-//
-//  ReportViewController.swift
-//  ParentAssistant
-//
-//  Created by 葛建军 on 2018/3/5.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class ReportViewController: UIViewController {
-    var titleView:ReportHeaderView!//navigationBar自定义view
-    @IBOutlet weak var reportTable: UITableView!
-    //空白页
-    var EmptyView: UIView!
-    
-    //膜板
-    var keyWindow = UIWindow()
-    var backBotton = UIButton()
-    //日历
-    var calendar = CalendarView()
-
-//    var dateAry:(weeks:[String],days:[String]) = ([],[])
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        //MARK: - 空白页面
-        EmptyView = UIView.init(frame: self.view.bounds)
-        EmptyView.backgroundColor = UIColor.white
-        self.EmptyView.isHidden = true
-        let imageV = UIImageView.init(frame: CGRect.init(x: 0, y: 80, width: screenWidth, height: screenWidth))
-        imageV.image = UIImage.init(named: "report_none_icon")
-        imageV.contentMode = UIViewContentMode.scaleAspectFit
-        EmptyView.addSubview(imageV)
-        self.view.addSubview(EmptyView)
-        let backImage = UIImage(named: "navigationBar_backgrounImage")
-        self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
-        if self.EmptyView.isHidden {
-            //设置顶部按钮
-            setupNavigationBar()
-            //设置日期页面
-            setupDateView()
-        }
-    }
-    // MARK: - 设置顶部按钮
-    func setupNavigationBar(){
-        self.configTheme()
-        setuptitleView()
-    }
-    func setuptitleView(){
-        
-        //左按钮
-        let leftView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 80, height: 44))
-        let titleLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 60, height: 44))
-        if AccountManager.shared.isOnline() {
-            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
-                titleLab.text = "未绑定"
-            }else{
-                titleLab.text = AccountManager.shared.rawUserInfo!.contentData()["studentClass"][0]["studentName"].stringValue
-            }
-        }else{
-            titleLab.text = "未登录"
-        }
-        leftView.addSubview(titleLab)
-        
-        let imageView = UIImageView.init(frame: CGRect.init(x: 60, y: 11, width: 20, height: 22))
-        imageView.image = UIImage.init(named: "report_pull")
-        imageView.contentMode = .scaleAspectFit
-        leftView.addSubview(imageView)
-        
-        leftView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
-        
-        let leftBtn = UIBarButtonItem.init(customView: leftView)
-        self.navigationItem.leftBarButtonItem = leftBtn
-        
-        //右按钮
-        let rightView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 80, height: 44))
-        let titleRLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
-        titleRLab.text = "筛选"
-        titleRLab.textAlignment = .right
-        rightView.addSubview(titleRLab)
-        
-        let imageRView = UIImageView.init(frame: CGRect.init(x: 60, y: 11, width: 20, height: 22))
-        imageRView.image = UIImage.init(named: "report_select")
-        imageRView.contentMode = .scaleAspectFit
-        rightView.addSubview(imageRView)
-        
-        rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
-        let rightBtn = UIBarButtonItem.init(customView: rightView)
-        self.navigationItem.rightBarButtonItem = rightBtn
-    
-    }
-    // MARK: - 设置日期页面
-    func setupDateView(){
-        
-        let headView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: 60))
-        self.view.addSubview(headView)
-        
-        //添加手势
-        let recognizer = UISwipeGestureRecognizer.init(target: self, action: #selector(showView))
-        recognizer.direction = UISwipeGestureRecognizerDirection.down
-        headView.addGestureRecognizer(recognizer)
-        
-        calendar = CalendarView.init(frame: CGRect.init(x: 0, y: 30, width: screenWidth, height: 260))
-    }
-    
-    @objc func showView(){
-        keyWindow = UIApplication.shared.keyWindow!
-        let backBtn = UIButton.init(frame: CGRect.init(x: 0, y: calendar.frame.origin.y+260+22, width: screenWidth, height: screenHeight))
-        backBtn.backgroundColor = UIColor.black
-        backBtn.alpha = 0.4
-        
-        backBtn.addTarget(self, action: #selector(closeView(btn:)), for: UIControlEvents.allEvents)
-        reportTable.isUserInteractionEnabled = false
-        
-        keyWindow.addSubview(backBtn)
-        keyWindow.addSubview(calendar)
-        calendar.isHidden = false
-    }
-    @objc func closeView(btn:UIButton) {
-        
-        reportTable.isUserInteractionEnabled = true
-        UIView.animate(withDuration: 0.3) {
-            btn.removeFromSuperview()
-            self.calendar.isHidden = true
-        }
-    }
-    
-    // MARK: - 页面将要显示时替换navigation的titleView
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-    }
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-    }
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        if titleView != nil {
-            titleView.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 44)
-        }
-    }
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-    }
-
-
-}
-// MARK: - 点击顶部titleView按钮的代理方法
-//extension ReportViewController: ReportHeaderViewDelegate{
-//    //点击孩子姓名
-//    func selectStudentButton() {
-//        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
-//        return
-//        //如果家长未绑定孩子
-//        if AccountManager.shared.isOnline() {
-//            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
-//                appDelegate.window!.makeToast("请先绑定孩子", duration: 1, position: CSToastPositionCenter)
-//            }else{
-//                //切换孩子
-//                let alert = UIAlertController(title: "切换孩子", message: "", preferredStyle: UIAlertControllerStyle.actionSheet)
-//                for item in AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue {
-//                    let action = UIAlertAction(title: item["studentName"].stringValue, style: UIAlertActionStyle.default, handler: { (action) in
-//                        //选择完孩子切换数据
-//                    })
-//                    alert.addAction(action)
-//                }
-//                self.present(alert, animated: true, completion: nil)
-//            }
-//        }else{
-//            appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
-//        }
-//    }
-//    //点击日期
-//    func selectDateButton() {
-//
-//        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
-//        return
-//    }
-//    //点击筛选
-//    func selectTypeButton() {
-//        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
-//        return
-//    }
-//}
-//// MARK: - 顶部展示日期
-//extension ReportViewController: UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout {
-//    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-//        return CGSize(width: getScreenWidth()/7, height: getScreenWidth()/7)
-//    }
-//    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-//        return 0
-//    }
-//
-//    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-//        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ReportDateCollectionViewCell", for: indexPath) as! ReportDateCollectionViewCell
-//        cell.setupWithDate(week: dateAry.weeks[indexPath.row], date: dateAry.days[indexPath.row])
-//        return cell
-//    }
-//
-//
-//}
-// MARK: - 作业报告列表
-extension ReportViewController: UITableViewDelegate,UITableViewDataSource{
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 5
-    }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        
-        if indexPath.row == 0 {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "MoralTableViewCell", for: indexPath) as! MoralTableViewCell
-            return cell
-        }else{
-            let cell = tableView.dequeueReusableCell(withIdentifier: "TaskPresentationTableViewCell", for: indexPath) as! TaskPresentationTableViewCell
-            return cell
-        }
-    }
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 280
-    }
-    
-}
@@ -1,76 +0,0 @@
-//
-//  SceneDetailViewController.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/22.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableViewDelegate {
-
-    @IBOutlet weak var sceneTableView: UITableView!
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.title = "场景详情"
-        sceneTableView.delegate = self
-        sceneTableView.dataSource = self
-        // Do any additional setup after loading the view.
-    }
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return 3
-    }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if section == 2 {
-            return 5
-        }
-        return 1
-    }
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-
-        switch indexPath.section {
-        case 0:
-            return 240
-        case 1:
-            return 250
-        case 2:
-            return 70
-        default:
-            return 0
-        }
-    }
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        var cell = UITableViewCell.init()
-        switch indexPath.section {
-        case 0:
-            cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) as! SceneTopCell
-            return cell
-        case 1:
-            cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) as! SceneMiddleCell
-            return cell
-        case 2:
-            cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) as! SceneDownCell
-            return cell
-        default:
-            return cell
-        }
-    }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-    
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destinationViewController.
-        // Pass the selected object to the new view controller.
-    }
-    */
-
-}
@@ -1,24 +0,0 @@
-//
-//  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
-    }
-
-}
@@ -1,72 +0,0 @@
-//
-//  CalendarView.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/27.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource {
-
-    
-    var weekLab = ["日","一","二","三","四","五","六"]
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        self.drawCalendarView(frame: frame)
-    }
-    
-    func drawCalendarView(frame:CGRect) {
-        //TODO: 数据源待完成
-        let dayLab = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"]
-        weekLab.append(contentsOf: dayLab)
-         //设置layout
-        let flowlayout = UICollectionViewFlowLayout()
-        flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40)
-        flowlayout.minimumLineSpacing = 0
-        flowlayout.minimumInteritemSpacing = 0
-        flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0)
-        flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0)
-        flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0)
-        
-        let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout)
-        calendarView.delegate = self
-        calendarView.dataSource = self
-        calendarView.backgroundColor = UIColor.white
-        calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell")
-        self.addSubview(calendarView)
-    }
-    
-    //MARK: - Delegate
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return weekLab.count
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath)
-        let lab = UILabel.init(frame: cell.bounds)
-        lab.text = weekLab[indexPath.row]
-        lab.textAlignment = .center
-        cell.addSubview(lab)
-        return cell
-        
-    }
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        print("点击了 第 \(weekLab[indexPath.row])")
-    }
-    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
-    }
-    */
-
-}
@@ -1,43 +0,0 @@
-//
-//  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)
-        customLineChart.drawUI(xLableArr: nil)
-        let arr1 = [4,4,2,1,3]
-        let arr2 = [2,1,4,4,5]
-
-        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
-    }
-
-}
@@ -1,220 +0,0 @@
-//
-//  LineChartView.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/23.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class LineChartView: UIView {
-    
-    //默认横坐标
-    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>()
-    //判断是否重复点击
-    private var btnTouch = 10
-    //虚线
-    private let lineLayer = CAShapeLayer()
-    //横坐标下划线
-    private let xMoveLayer = CAShapeLayer()
-    //纵坐标Lab数组
-    private var yMoveLaArr = Array<UILabel>()
-    //折线图数据数组
-    private var dateArr = Array<Array<Int>>()
-    //显示的数字
-    var yLabArray = Array<UILabel>()
-
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        print("frame==\(frame)")
-
-    }
-    func drawUI(xLableArr:Array<String>?){
-        
-        if  xLableArr != nil {
-            xLabArr = xLableArr!
-        }
-        drawX()
-        drawY()
-    }
-    //设置纵坐标
-     private func drawY() {
-
-        let yHeight = (self.bounds.height-60)/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.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
-            yLab.font = UIFont.systemFont(ofSize: 14)
-            self.addSubview(yLab)
-            
-            let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: screenWidth-60, height: 0.4))
-            lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
-            self.addSubview(lineLab)
-            
-            yMoveLaArr.append(yLab)
-            yCenterArr.append(yLab.frame.origin.y+10)
-        }
-    }
-    //设置横坐标
-    private func drawX() {
-        let xWidth = (screenWidth-20)/CGFloat(yCount)
-        for index in 0..<xCount {
-            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 25))
-            nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
-            nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
-            nameBtn.titleLabel!.textAlignment = .center
-            nameBtn.titleLabel!.font = UIFont.systemFont(ofSize: 13)
-//            nameBtn.backgroundColor = UIColor.orange
-            nameBtn.tag = index
-            self.addSubview(nameBtn)
-            
-            nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchUpInside)
-            
-            xCenterArr.append(nameBtn.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
-        self.layer.addSublayer(drawLayer)
-        drawLayer.setNeedsDisplay()
-        
-        dateArr.append(point)
-        
-    }
-    //MARK: - 点击横坐标
-    @objc func touchXAction(tap:UIButton){
-        
-        let index = tap.tag
-        
-        
-        if btnTouch != index {
-            
-            //竖虚线
-            lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
-            lineLayer.lineWidth = 1
-            let arr = [5,5]
-            lineLayer.lineDashPhase = 0
-            lineLayer.lineDashPattern = arr as [NSNumber]
-            self.layer.addSublayer(lineLayer)
-            
-            //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-60)/CGFloat(yCount)))
-            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: self.bounds.height-45))
-            movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-45))
-            xMoveLayer.path = movePath2
-            
-            if yLabArray.count == dateArr.count {
-                for label in yLabArray {
-                    label.removeFromSuperview()
-                }
-            }
-            yLabArray.removeAll()
-            //数字显示
-            for i in 0..<dateArr.count {
-                let arr = dateArr[i]
-                //y坐标数值
-                let y = arr[index]
-                let yLab = yMoveLaArr[GPA-y]
-                var rect = yLab.frame
-                rect.origin.x = xCenterArr[index]+10
-                
-                let newLab = UILabel()
-                newLab.text = yLab.text
-                newLab.textColor = yLab.textColor
-                newLab.font = yLab.font
-                newLab.frame = rect
-                self.addSubview(newLab)
-                yLabArray.append(newLab)
-            }
-        }else{
-            print(yLabArray)
-        }
-        btnTouch = index
-        
-        
-    }
-    //转换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.5)
-        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()
-    }
-    
-}
-
-
@@ -1,32 +0,0 @@
-//
-//  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
-    }
-
-}
@@ -1,30 +0,0 @@
-//
-//  MoralTableViewCell.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/22.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class MoralTableViewCell: UITableViewCell {
-
-    @IBOutlet weak var pointLab: UILabel!
-    @IBOutlet weak var todayReName: UILabel!
-    @IBOutlet weak var rankingLab: UILabel!
-    @IBOutlet weak var evaluateLab: UILabel!
-    @IBOutlet weak var rankStatusLab: UILabel!
-    @IBOutlet weak var reportDateLab: 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
-    }
-
-}
@@ -1,21 +0,0 @@
-//
-//  ReportDateCollectionViewCell.swift
-//  ParentAssistant
-//
-//  Created by 葛建军 on 2018/3/9.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-class ReportDateCollectionViewCell: UICollectionViewCell {
-    @IBOutlet var weekLabel: UILabel!
-    @IBOutlet var dateLabel: UILabel!
-    func setupWithDate(week:String,date:String){
-        weekLabel.text = week
-        dateLabel.text = date
-        
-        
-        
-    }
-
-}
@@ -1,48 +0,0 @@
-//
-//  ReportHeaderView.swift
-//  ParentAssistant
-//
-//  Created by 葛建军 on 2018/3/8.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class ReportHeaderView: UIView {
-    var delegate:ReportHeaderViewDelegate!
-    @IBOutlet var nameButton: UIButton!//学生名字按钮
-    @IBOutlet var dateButton: UIButton!//日期按钮
-    @IBOutlet var typeButton: UIButton!//筛选按钮
-    override func awakeFromNib() {
-        super.awakeFromNib()
-    }
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        nameButton.frame.origin = CGPoint(x: 15, y: 7)
-        dateButton.frame.origin = CGPoint(x: (getScreenWidth()-dateButton.frame.size.width)/2, y: 7)
-        typeButton.frame.origin = CGPoint(x: getScreenWidth()-typeButton.frame.size.width-30, y: 7)
-    }
-    //点击学生姓名按钮
-    @IBAction func changeStudentAction(_ sender: UIButton) {
-        delegate.selectStudentButton()
-    }
-    //点击日期按钮
-    @IBAction func changeDateAction(_ sender: UIButton) {
-        delegate.selectDateButton()
-    }
-    //点击筛选按钮
-    @IBAction func changeTypeAction(_ sender: UIButton) {
-        delegate.selectTypeButton()
-    }
-    
-}
-protocol ReportHeaderViewDelegate {
-    func selectStudentButton()
-    func selectDateButton()
-    func selectTypeButton()
-}
-extension ReportHeaderView {
-    class func titleView() -> ReportHeaderView {
-        return Bundle.main.loadNibNamed("ReportHeaderView", owner: nil, options: nil)?.first as! ReportHeaderView
-    }
-}
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view clipsSubviews="YES" contentMode="scaleToFill" id="4WE-cx-977" customClass="ReportHeaderView" customModule="ParentAssistant" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="485" height="44"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W6e-VK-JCE">
-                    <rect key="frame" x="20" y="7" width="46" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <state key="normal" title="马伯骞">
-                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <connections>
-                        <action selector="changeStudentAction:" destination="4WE-cx-977" eventType="touchUpInside" id="Dua-XZ-hMB"/>
-                    </connections>
-                </button>
-                <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Dq-Z9-eEM">
-                    <rect key="frame" x="434" y="7" width="31" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <state key="normal" title="筛选">
-                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <connections>
-                        <action selector="changeTypeAction:" destination="4WE-cx-977" eventType="touchUpInside" id="XFz-ca-od2"/>
-                    </connections>
-                </button>
-                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7xY-bD-L7w">
-                    <rect key="frame" x="191" y="7" width="102" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <state key="normal" title="12月29日">
-                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <connections>
-                        <action selector="changeDateAction:" destination="4WE-cx-977" eventType="touchUpInside" id="pCF-3R-0zv"/>
-                    </connections>
-                </button>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="71B-FS-Ws9"/>
-            <connections>
-                <outlet property="dateButton" destination="7xY-bD-L7w" id="3zG-4z-eNW"/>
-                <outlet property="nameButton" destination="W6e-VK-JCE" id="XDD-iU-T0k"/>
-                <outlet property="typeButton" destination="5Dq-Z9-eEM" id="LAM-Dw-HAX"/>
-            </connections>
-            <point key="canvasLocation" x="156.5" y="93"/>
-        </view>
-    </objects>
-</document>
@@ -1,30 +0,0 @@
-//
-//  SceneDownCell.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/24.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class SceneDownCell: UITableViewCell {
-
-    @IBOutlet weak var evaluateLab: UILabel!
-    @IBOutlet weak var sceneLab: UILabel!
-    @IBOutlet weak var scoreLab: UILabel!
-    @IBOutlet weak var nameLab: UILabel!
-    @IBOutlet weak var classLab: UILabel!
-    @IBOutlet weak var dateLab: 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
-    }
-
-}
@@ -1,44 +0,0 @@
-//
-//  SceneMiddleCell.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/24.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class SceneMiddleCell: UITableViewCell {
-
-    @IBOutlet weak var lineChartView: UIView!
-    
-    var customLineChart = LineChartView()
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        // Initialization code
-        let rect = self.lineChartView.bounds
-        customLineChart = LineChartView.init(frame: rect)
-        let customXLabArr = ["03/12","03/13","03/14","03/15","03/16"]
-        
-        customLineChart.drawUI(xLableArr:customXLabArr)
-        
-        let arr1 = [5,4,5,5,5]
-        let arr2 = [4,4,2,1,3]
-        let arr3 = [3,3,4,3,4]
-        
-        
-        customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 129, G: 199, B: 132))
-        customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 92, G: 145, B: 230))
-        customLineChart.drawLine(point: arr3, color: UIColorWithRGB(R: 255, G: 213, B: 79))
-
-        self.lineChartView.addSubview(customLineChart)
-
-    }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
-    }
-
-}
@@ -1,28 +0,0 @@
-//
-//  SceneTopCell.swift
-//  ParentAssistant
-//
-//  Created by Cao yang on 2018/3/24.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-
-class SceneTopCell: UITableViewCell {
-
-    @IBOutlet weak var scoreLab: UILabel!       //得分
-    @IBOutlet weak var GPALab: UILabel!         //绩点
-    @IBOutlet weak var LevelLab: UILabel!       //等级
-    @IBOutlet weak var SuggestLab: UITextView!  //指导意见
-    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
-    }
-
-}
@@ -1,82 +0,0 @@
-//
-//  TaskPresentationTableViewCell.swift
-//  ParentAssistant
-//
-//  Created by 葛建军 on 2018/3/9.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-//func degreesToRadians(x:Double) -> CGFloat{
-//    return (CGFloat(Double.pi*(x)/180.0))
-//} //把角度转换成PI的方式
-//let PROGREESS_WIDTH = 160 //圆直径
-//let PROGRESS_LINE_WIDTH = 4 //弧线的宽度
-class TaskPresentationTableViewCell: UITableViewCell {
-
-    @IBOutlet var layerLabel: UILabel!
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        // Initialization code
-        //可以画出上面所示的整个轨道。这个圆形是从-210度的角度到30度。
-//        let path = UIBezierPath(arcCenter: CGPoint(x: 40, y: 40), radius: CGFloat((PROGREESS_WIDTH-PROGRESS_LINE_WIDTH)/2), startAngle: degreesToRadians(x: -210), endAngle: degreesToRadians(x: 30), clockwise: true)
-        //画出一个完成的进度的背景轨道
-//        let trackLayer = CAShapeLayer()//创建一个track shape layer
-//        trackLayer.frame = self.layerLabel.bounds
-//        trackLayer.fillColor = UIColor.clear.cgColor
-//        trackLayer.strokeColor = UIColor.red.cgColor//指定path的渲染颜色
-//        trackLayer.opacity = 0.25 //背景同学你就甘心做背景吧，不要太明显了，透明度小一点
-//        trackLayer.lineCap = kCALineCapRound//指定线的边缘是圆的
-//        trackLayer.lineWidth = CGFloat(PROGRESS_LINE_WIDTH)//线的宽度
-//        trackLayer.path = path.cgPath //把path传递給layer，然后layer会处理相应的渲染，整个逻辑和CoreGraph是一致的。
-//
-//        self.layerLabel.layer.addSublayer(trackLayer)
-        //渐变进度条
-//        let progressLayer = CAShapeLayer()
-//        progressLayer.frame = self.layerLabel.bounds
-//        progressLayer.fillColor =  UIColor.clear.cgColor
-//        progressLayer.strokeColor  = UIColor.red.cgColor
-//        progressLayer.lineCap = kCALineCapRound;
-//        progressLayer.lineWidth = CGFloat(PROGRESS_LINE_WIDTH)
-//        progressLayer.path = path.cgPath
-//        progressLayer.strokeEnd = 50/100.0 //总进度
-//
-//        let gradientLayer = CALayer()
-//        let gradientLayer1 =  CAGradientLayer()
-//        gradientLayer1.frame = CGRect(x: 0, y: 0, width: self.layerLabel.frame.size.width/2, height: self.layerLabel.frame.size.height)
-//        gradientLayer1.colors = [UIColor.yellow.cgColor,UIColor.blue.cgColor]
-//        gradientLayer1.locations = [0.5,0.9,1]
-//        gradientLayer1.startPoint = CGPoint(x: 0.5, y: 1)
-//        gradientLayer1.endPoint = CGPoint(x: 0.5, y: 0)
-//        gradientLayer.addSublayer(gradientLayer1)
-//
-//        let gradientLayer2 =  CAGradientLayer()
-//        gradientLayer2.frame = CGRect(x: self.layerLabel.frame.size.width/2, y: 0, width: self.layerLabel.frame.size.width/2, height: self.layerLabel.frame.size.height)
-//        gradientLayer2.colors = [UIColor.blue.cgColor,UIColor.blue.cgColor]
-//        gradientLayer2.locations = [0.1,0.5,1]
-//        gradientLayer2.startPoint = CGPoint(x: 0.5, y: 0)
-//        gradientLayer2.endPoint = CGPoint(x: 0.5, y: 1)
-//        gradientLayer.addSublayer(gradientLayer2)
-//
-//        gradientLayer.mask = progressLayer//用progressLayer来截取渐变层
-//        self.layerLabel.layer.addSublayer(gradientLayer)
-    }
-    //进度条效果 CAShapeLayer有一个strokeEnd的属性，这个属性是从0到1的浮点类型，正好可以用表达百分比，而且这个属性是animatable，可以动态的表示进度的变化。
-    //    -(void)setPercent:(NSInteger)percent animated:(BOOL)animated
-    //    {
-    //    [CATransaction begin];
-    //    [CATransaction setDisableActions:!animated];
-    //    [CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]];
-    //    [CATransaction setAnimationDuration:MAIN_SCREEN_ANIMATION_TIME];
-    //    progressLayer.strokeEnd = percent/100.0;
-    //    [CATransaction commit];
-    //
-    //    _percent = percent;
-    //    }
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
-    }
-
-}
@@ -72,7 +72,7 @@ let URL_PARENTSERVICE_GETADS=&quot;/api/ParentService/GetAds&quot;      //嘀
 //MARK: 遠
 /// 敺瑁雿祕
-let URL_POST_EVALUATION_ANALYSIS = "/api/EvaluationLabel/GetStatisticalAnalysis"
+let URL_POST_EVALUATION_ANALYSIS = "/api/EvaluationLabel/Getstatisticsanalytical"
 /// 敺瑁霂行
 let URL_POST_EVALUATION_ANALYSIS_DETAILS = "/api/EvaluationLabel/GetSceneAnalysisDetails"
@@ -527,16 +527,34 @@
             </objects>
             <point key="canvasLocation" x="54" y="117"/>
         </scene>
+        <!--Grow View Controller-->
+        <scene sceneID="36g-8r-oze">
+            <objects>
+                <viewController id="K2D-OC-DRl" customClass="GrowViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="dfc-6f-RU1">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <viewLayoutGuide key="safeArea" id="xWd-cd-ncW"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="9Fp-i1-vxh">
+                        <nil key="title"/>
+                    </navigationItem>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Pvf-SL-AwW" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1660" y="399"/>
+        </scene>
         <!--报告-->
         <scene sceneID="YFU-9r-YrN">
             <objects>
-                <viewController title="报告" id="oqH-t7-mJp" customClass="ReportViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ReportViewController" title="报告" id="oqH-t7-mJp" customClass="ReportViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5aI-3l-uAy">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EEs-Ae-t7U">
-                                <rect key="frame" x="0.0" y="134" width="375" height="484"/>
+                                <rect key="frame" x="0.0" y="90" width="375" height="577"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
@@ -769,14 +787,14 @@
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/>
                     </view>
-                    <navigationItem key="navigationItem" title="报告" id="dVv-mJ-714"/>
+                    <navigationItem key="navigationItem" id="dVv-mJ-714"/>
                     <connections>
                         <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="AdY-P5-857" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1597.5999999999999" y="409.7451274362819"/>
+            <point key="canvasLocation" x="2463" y="399"/>
         </scene>
         <!--Moral View Controller-->
         <scene sceneID="gZ8-jD-xe5">
@@ -787,7 +805,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="BRJ-Oe-fwH">
-                                <rect key="frame" x="0.0" y="64" width="375" height="544"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="637"/>
                                 <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" customClass="MoralDetailCell" customModule="ParentAssistant" customModuleProvider="target">
@@ -1089,7 +1107,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dWZ-wh-hFd" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2357.5999999999999" y="409.7451274362819"/>
+            <point key="canvasLocation" x="3182" y="410"/>
         </scene>
         <!--场景详情-->
         <scene sceneID="UoQ-sj-mPR">
@@ -1442,7 +1460,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="msC-eZ-quK" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3093.5999999999999" y="409.7451274362819"/>
+            <point key="canvasLocation" x="3826" y="410"/>
         </scene>
         <!--My View Controller-->
         <scene sceneID="Mnt-Vb-tkB">
@@ -1982,11 +2000,11 @@
             </objects>
             <point key="canvasLocation" x="913" y="-272"/>
         </scene>
-        <!--报告-->
+        <!--成长-->
         <scene sceneID="ZBd-hB-qdB">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Yrp-0h-ncC" customClass="MainViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="报告" image="report_bar_icon" selectedImage="report_bar_icon_select" id="b8X-9h-Lep"/>
+                    <tabBarItem key="tabBarItem" title="成长" image="report_bar_icon" selectedImage="report_bar_icon_select" id="b8X-9h-Lep"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="uLq-9a-RVg">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -1997,7 +2015,7 @@
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
-                        <segue destination="oqH-t7-mJp" kind="relationship" relationship="rootViewController" id="1yc-lt-bJX"/>
+                        <segue destination="K2D-OC-DRl" kind="relationship" relationship="rootViewController" id="TDx-4W-K3j"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tga-hk-GVT" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -0,0 +1,211 @@		@@ -0,0 +1,211 @@
	1	+//
	2	+// GrowViewController.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/4/10.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class GrowViewController: UIViewController,UIScrollViewDelegate {
	12	+
	13	+ var ZJBNavH = 44.0
	14	+ //MARK: - 标题数据
	15	+ //标题
	16	+ lazy var titleView = {() -> UIView in
	17	+ let title = UIScrollView()
	18	+ title.frame = CGRect(x:0,y:0,width:getScreenWidth(),height:44)
	19	+ title.backgroundColor = Theme.topBarColor()
	20	+ return title
	21	+ }()
	22	+ //MARK: - 内容数据
	23	+ //内容
	24	+ lazy var contentScrollView = {()->UIScrollView in
	25	+ let scrollView = UIScrollView.init(frame: self.view.bounds)
	26	+ scrollView.delegate = self
	27	+ scrollView.isPagingEnabled = true
	28	+ scrollView.showsHorizontalScrollIndicator = false
	29	+ return scrollView
	30	+ }()
	31	+ //按钮数组
	32	+ var titleBtnArr = Array<UIButton>()
	33	+ //titleLine初始位置
	34	+ var linePoint = CGPoint()
	35	+ //按钮标题数据
	36	+ var titleArr = Array<String>()
	37	+ //按钮下面横线
	38	+ lazy var titleLine = {()->CALayer in
	39	+ let lineLay = CALayer.init()
	40	+ lineLay.frame.size = CGSize.init(width: 50, height: 2)
	41	+ lineLay.backgroundColor = UIColor.gray.cgColor
	42	+ return lineLay
	43	+ }()
	44	+
	45	+ override func viewDidLoad() {
	46	+ super.viewDidLoad()
	47	+
	48	+ titleArr = ["应用","报告"]
	49	+ //设置导航栏标题
	50	+ self.navigationItem.titleView = titleView
	51	+ self.view.addSubview(contentScrollView)
	52	+
	53	+ setUpTitle()
	54	+ setChildViewContent()
	55	+
	56	+ //左按钮
	57	+ let leftView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
	58	+ let titleLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 40, height: 44))
	59	+ if AccountManager.shared.isOnline() {
	60	+ if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
	61	+ titleLab.text = "未绑定"
	62	+ }else{
	63	+ titleLab.text = AccountManager.shared.rawUserInfo!.contentData()["studentClass"][0]["studentName"].stringValue
	64	+ }
	65	+ }else{
	66	+ titleLab.text = "未登录"
	67	+ }
	68	+ titleLab.font = UIFont.systemFont(ofSize: 15)
	69	+ titleLab.textAlignment = .center
	70	+ leftView.addSubview(titleLab)
	71	+
	72	+ let imageView = UIImageView.init(frame: CGRect.init(x: 40, y: 11, width: 10, height: 22))
	73	+ imageView.image = UIImage.init(named: "report_pull")
	74	+ imageView.contentMode = .scaleAspectFit
	75	+ leftView.addSubview(imageView)
	76	+
	77	+// leftView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
	78	+
	79	+ let leftBtn = UIBarButtonItem.init(customView: leftView)
	80	+ self.navigationItem.leftBarButtonItem = leftBtn
	81	+ //右按钮
	82	+ let rightView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
	83	+ let titleRLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 40, height: 44))
	84	+ titleRLab.text = "筛选"
	85	+ titleRLab.font = UIFont.systemFont(ofSize: 15)
	86	+ titleRLab.textAlignment = .center
	87	+ rightView.addSubview(titleRLab)
	88	+
	89	+ let imageRView = UIImageView.init(frame: CGRect.init(x: 40, y: 11, width: 10, height: 22))
	90	+ imageRView.image = UIImage.init(named: "report_select")
	91	+ imageRView.contentMode = .scaleAspectFit
	92	+ rightView.addSubview(imageRView)
	93	+
	94	+// rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
	95	+ let rightBtn = UIBarButtonItem.init(customView: rightView)
	96	+ self.navigationItem.rightBarButtonItem = rightBtn
	97	+
	98	+ setupNavigationBar()
	99	+ }
	100	+
	101	+ // MARK: - 设置顶部按钮
	102	+ func setupNavigationBar(){
	103	+ self.configTheme()
	104	+ }
	105	+
	106	+ private func setChildViewContent(){
	107	+
	108	+ //添加子控制器
	109	+ for _ in 0..<titleArr.count {
	110	+ let vc = Story.instantiateViewControllerWithIdentifier("ReportViewController", storyName: "Main") as! ReportViewController
	111	+ self.addChildViewController(vc)
	112	+ }
	113	+ //设置第一个控制器数据
	114	+ let childVC = self.childViewControllers.first
	115	+ childVC?.view.frame = self.view.bounds
	116	+ self.contentScrollView.addSubview((childVC?.view)!)
	117	+ //设置scrollview滑动范围
	118	+ contentScrollView.contentSize = CGSize.init(width: getScreenWidth()*CGFloat(titleArr.count), height: 0)
	119	+
	120	+ }
	121	+ //MARK: - 设置标题
	122	+ func setUpTitle(){
	123	+
	124	+ let count = titleArr.count
	125	+ var btnWidthArr = Array<CGFloat>()
	126	+ for i in 0..<count {
	127	+
	128	+ let btn = UIButton.init()
	129	+ btn.setTitle(titleArr[i], for: .normal)
	130	+ btn.titleLabel!.font = UIFont.systemFont(ofSize: 17)
	131	+ btn.setTitleColor(UIColor.black, for: .normal)
	132	+ btn.tag = i
	133	+ btn.addTarget(self, action: #selector(clickTitleAction(btn:)), for:UIControlEvents.touchUpInside)
	134	+ btn.frame.size = CGSize.init(width: 40, height: ZJBNavH)
	135	+
	136	+ let widht = getScreenWidth()
	137	+ btn.center = CGPoint.init(x: widht/4*(1+CGFloat(i))-16, y: CGFloat(ZJBNavH/2))
	138	+ btnWidthArr.append(btn.frame.size.width)
	139	+
	140	+ titleBtnArr.append(btn)
	141	+ titleView.addSubview(btn)
	142	+ if i == 0 {
	143	+ //设置titleLine初始位置
	144	+ titleLine.frame = CGRect.init(x: btn.frame.origin.x, y: btn.center.y+14, width: 40, height: 3)
	145	+ linePoint = CGPoint.init(x: titleLine.frame.origin.x, y: titleLine.frame.origin.y)
	146	+ //添加titleLine到导航
	147	+ self.navigationItem.titleView?.layer.addSublayer(titleLine)
	148	+ }
	149	+ }
	150	+ }
	151	+ @objc func clickTitleAction(btn:UIButton){
	152	+ //titleLine动画动作
	153	+ let animal = CABasicAnimation.init(keyPath: "position")
	154	+ animal.fromValue = NSValue.init(cgPoint: CGPoint.init(x: linePoint.x, y: linePoint.y))
	155	+ animal.toValue = NSValue.init(cgPoint: CGPoint.init(x: btn.center.x, y: btn.center.y+14))
	156	+ animal.isRemovedOnCompletion = false
	157	+ animal.fillMode = kCAFillModeForwards
	158	+ self.titleLine.add(animal, forKey: "move")
	159	+
	160	+ //update
	161	+ linePoint = CGPoint.init(x: btn.center.x, y: btn.center.y+14)
	162	+ //联动contentScrollview
	163	+ let index = CGFloat(btn.tag)
	164	+
	165	+ if contentScrollView.contentSize.width>0 {
	166	+
	167	+ let childVC = self.childViewControllers[btn.tag]
	168	+
	169	+ if self.contentScrollView.subviews.contains(childVC.view){
	170	+ //已有view,直接移动
	171	+ //移动scrollview
	172	+ contentScrollView.setContentOffset(CGPoint.init(x: index*getScreenWidth(), y: 0), animated: true)
	173	+ }else{
	174	+ //新加view,刷新数据
	175	+ childVC.view.frame = CGRect.init(x: CGFloat(btn.tag)*getScreenWidth(), y: 0, width: getScreenWidth(),height: self.view.frame.size.height)
	176	+ self.contentScrollView.addSubview(childVC.view)
	177	+ //移动scrollview
	178	+ contentScrollView.setContentOffset(CGPoint.init(x: index*getScreenWidth(), y: 0), animated: true)
	179	+ }
	180	+ }
	181	+ }
	182	+ //MARK: - ScrollView Delegate
	183	+ func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
	184	+
	185	+ if scrollView == contentScrollView {
	186	+ let offsetX = scrollView.contentOffset.x
	187	+ let index = Int(offsetX/getScreenWidth())
	188	+ let btn = titleBtnArr[index]
	189	+
	190	+ clickTitleAction(btn: btn)
	191	+
	192	+ }
	193	+ }
	194	+
	195	+ override func didReceiveMemoryWarning() {
	196	+ super.didReceiveMemoryWarning()
	197	+ // Dispose of any resources that can be recreated.
	198	+ }
	199	+
	200	+
	201	+ /*
	202	+ // MARK: - Navigation
	203	+
	204	+ // In a storyboard-based application, you will often want to do a little preparation before navigation
	205	+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
	206	+ // Get the new view controller using segue.destinationViewController.
	207	+ // Pass the selected object to the new view controller.
	208	+ }
	209	+ */
	210	+
	211	+}
@@ -0,0 +1,106 @@		@@ -0,0 +1,106 @@
	1	+//
	2	+// MoralViewController.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/22.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
	12	+
	13	+ @IBOutlet weak var tableView: UITableView!
	14	+ var data = [String:JSON]()
	15	+ override func viewDidLoad() {
	16	+ super.viewDidLoad()
	17	+ self.title = "德育报告"
	18	+ tableView.delegate = self
	19	+ tableView.dataSource = self
	20	+
	21	+
	22	+ downLoadDataFromNet()
	23	+ }
	24	+
	25	+ private func downLoadDataFromNet(){
	26	+
	27	+
	28	+ let params = ["screenId":1,"startDate":"2018-03-08","endDate":"2018-04-08","classId":"70","schoolId":1] as [String : Any]
	29	+
	30	+ HTTPServer.shared.getEvaluationSceneAnalysis(parameters: params as [String : AnyObject]) { (backData, error) in
	31	+
	32	+ if error == nil && JSON.fromString(backData)!["status"].intValue == 1 {
	33	+
	34	+ self.data = JSON.fromString(backData)!["data"].dictionaryValue
	35	+
	36	+ if !self.data.isEmpty{
	37	+ print(self.data)
	38	+ }
	39	+ }
	40	+ }
	41	+ }
	42	+
	43	+
	44	+
	45	+ func numberOfSections(in tableView: UITableView) -> Int {
	46	+ return 3
	47	+ }
	48	+ func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
	49	+
	50	+ if section == 2 {
	51	+ return 3
	52	+ }else{
	53	+ return 1
	54	+ }
	55	+ }
	56	+ func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
	57	+ switch indexPath.section {
	58	+ case 0:
	59	+ return 240
	60	+ case 1:
	61	+ return 240
	62	+ case 2:
	63	+ return 70
	64	+ default:
	65	+ return 0
	66	+ }
	67	+ }
	68	+ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
	69	+ var cell = UITableViewCell.init()
	70	+ switch indexPath.section {
	71	+ case 0:
	72	+ cell = tableView.dequeueReusableCell(withIdentifier: "moralDetail", for: indexPath)
	73	+ return cell
	74	+ case 1:
	75	+ cell = tableView.dequeueReusableCell(withIdentifier: "educationDetail", for: indexPath)
	76	+ return cell
	77	+ case 2:
	78	+ cell = tableView.dequeueReusableCell(withIdentifier: "behaviorDetail", for: indexPath)
	79	+ return cell
	80	+ default:
	81	+ return cell
	82	+ }
	83	+ }
	84	+ func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
	85	+ if indexPath.section == 2 {
	86	+ let scene = Story.instantiateViewControllerWithIdentifier("SceneDetailViewController", storyName: "Main") as! SceneDetailViewController
	87	+ self.navigationController?.pushViewController(scene, animated: true)
	88	+ }
	89	+ }
	90	+ override func didReceiveMemoryWarning() {
	91	+ super.didReceiveMemoryWarning()
	92	+ // Dispose of any resources that can be recreated.
	93	+ }
	94	+
	95	+
	96	+ /*
	97	+ // MARK: - Navigation
	98	+
	99	+ // In a storyboard-based application, you will often want to do a little preparation before navigation
	100	+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
	101	+ // Get the new view controller using segue.destinationViewController.
	102	+ // Pass the selected object to the new view controller.
	103	+ }
	104	+ */
	105	+
	106	+}
@@ -0,0 +1,98 @@		@@ -0,0 +1,98 @@
	1	+//
	2	+// ReportViewController.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by 葛建军 on 2018/3/5.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class ReportViewController: UIViewController {
	12	+
	13	+ @IBOutlet weak var reportTable: UITableView!
	14	+
	15	+ //膜板
	16	+ var keyWindow = UIWindow()
	17	+ var backBotton = UIButton()
	18	+ //日历
	19	+ var calendar = CalendarView()
	20	+
	21	+ override func viewDidLoad() {
	22	+ super.viewDidLoad()
	23	+ setupDateView()
	24	+ }
	25	+
	26	+ // MARK: - 设置日期页面
	27	+ func setupDateView(){
	28	+
	29	+ let headView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: 60))
	30	+ self.view.addSubview(headView)
	31	+
	32	+ //添加手势
	33	+ let recognizer = UISwipeGestureRecognizer.init(target: self, action: #selector(showView))
	34	+ recognizer.direction = UISwipeGestureRecognizerDirection.down
	35	+ headView.addGestureRecognizer(recognizer)
	36	+
	37	+ calendar = CalendarView.init(frame: CGRect.init(x: 0, y: 30, width: screenWidth, height: 260))
	38	+ }
	39	+
	40	+ @objc func showView(){
	41	+ keyWindow = UIApplication.shared.keyWindow!
	42	+ let backBtn = UIButton.init(frame: CGRect.init(x: 0, y: calendar.frame.origin.y+260+22, width: screenWidth, height: screenHeight))
	43	+ backBtn.backgroundColor = UIColor.black
	44	+ backBtn.alpha = 0.4
	45	+
	46	+ backBtn.addTarget(self, action: #selector(closeView(btn:)), for: UIControlEvents.allEvents)
	47	+ reportTable.isUserInteractionEnabled = false
	48	+
	49	+ keyWindow.addSubview(backBtn)
	50	+ keyWindow.addSubview(calendar)
	51	+ calendar.isHidden = false
	52	+ }
	53	+ @objc func closeView(btn:UIButton) {
	54	+
	55	+ reportTable.isUserInteractionEnabled = true
	56	+ UIView.animate(withDuration: 0.3) {
	57	+ btn.removeFromSuperview()
	58	+ self.calendar.isHidden = true
	59	+ }
	60	+ }
	61	+ override func viewWillAppear(_ animated: Bool) {
	62	+ super.viewWillAppear(animated)
	63	+ }
	64	+ override func viewWillDisappear(_ animated: Bool) {
	65	+ super.viewWillDisappear(animated)
	66	+ }
	67	+ override func viewDidLayoutSubviews() {
	68	+ super.viewDidLayoutSubviews()
	69	+
	70	+ }
	71	+ override func didReceiveMemoryWarning() {
	72	+ super.didReceiveMemoryWarning()
	73	+ }
	74	+
	75	+
	76	+}
	77	+
	78	+// MARK: - 作业报告列表
	79	+extension ReportViewController: UITableViewDelegate,UITableViewDataSource{
	80	+ func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
	81	+ return 5
	82	+ }
	83	+
	84	+ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
	85	+
	86	+ if indexPath.row == 0 {
	87	+ let cell = tableView.dequeueReusableCell(withIdentifier: "MoralTableViewCell", for: indexPath) as! MoralTableViewCell
	88	+ return cell
	89	+ }else{
	90	+ let cell = tableView.dequeueReusableCell(withIdentifier: "TaskPresentationTableViewCell", for: indexPath) as! TaskPresentationTableViewCell
	91	+ return cell
	92	+ }
	93	+ }
	94	+ func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
	95	+ return 280
	96	+ }
	97	+
	98	+}
@@ -0,0 +1,76 @@		@@ -0,0 +1,76 @@
	1	+//
	2	+// SceneDetailViewController.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/22.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableViewDelegate {
	12	+
	13	+ @IBOutlet weak var sceneTableView: UITableView!
	14	+ override func viewDidLoad() {
	15	+ super.viewDidLoad()
	16	+ self.title = "场景详情"
	17	+ sceneTableView.delegate = self
	18	+ sceneTableView.dataSource = self
	19	+ // Do any additional setup after loading the view.
	20	+ }
	21	+ func numberOfSections(in tableView: UITableView) -> Int {
	22	+ return 3
	23	+ }
	24	+ func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
	25	+ if section == 2 {
	26	+ return 5
	27	+ }
	28	+ return 1
	29	+ }
	30	+ func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
	31	+
	32	+ switch indexPath.section {
	33	+ case 0:
	34	+ return 240
	35	+ case 1:
	36	+ return 250
	37	+ case 2:
	38	+ return 70
	39	+ default:
	40	+ return 0
	41	+ }
	42	+ }
	43	+ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
	44	+ var cell = UITableViewCell.init()
	45	+ switch indexPath.section {
	46	+ case 0:
	47	+ cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) as! SceneTopCell
	48	+ return cell
	49	+ case 1:
	50	+ cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) as! SceneMiddleCell
	51	+ return cell
	52	+ case 2:
	53	+ cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) as! SceneDownCell
	54	+ return cell
	55	+ default:
	56	+ return cell
	57	+ }
	58	+ }
	59	+
	60	+ override func didReceiveMemoryWarning() {
	61	+ super.didReceiveMemoryWarning()
	62	+ // Dispose of any resources that can be recreated.
	63	+ }
	64	+
	65	+
	66	+ /*
	67	+ // MARK: - Navigation
	68	+
	69	+ // In a storyboard-based application, you will often want to do a little preparation before navigation
	70	+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
	71	+ // Get the new view controller using segue.destinationViewController.
	72	+ // Pass the selected object to the new view controller.
	73	+ }
	74	+ */
	75	+
	76	+}
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+//
	2	+// BehaviorDetailCell.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/23.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class BehaviorDetailCell: UITableViewCell {
	12	+
	13	+ override func awakeFromNib() {
	14	+ super.awakeFromNib()
	15	+ // Initialization code
	16	+ }
	17	+
	18	+ override func setSelected(_ selected: Bool, animated: Bool) {
	19	+ super.setSelected(selected, animated: animated)
	20	+
	21	+ // Configure the view for the selected state
	22	+ }
	23	+
	24	+}
@@ -0,0 +1,72 @@		@@ -0,0 +1,72 @@
	1	+//
	2	+// CalendarView.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/27.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource {
	12	+
	13	+
	14	+ var weekLab = ["日","一","二","三","四","五","六"]
	15	+
	16	+ override init(frame: CGRect) {
	17	+ super.init(frame: frame)
	18	+ self.drawCalendarView(frame: frame)
	19	+ }
	20	+
	21	+ func drawCalendarView(frame:CGRect) {
	22	+ //TODO: 数据源待完成
	23	+ let dayLab = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"]
	24	+ weekLab.append(contentsOf: dayLab)
	25	+ //设置layout
	26	+ let flowlayout = UICollectionViewFlowLayout()
	27	+ flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40)
	28	+ flowlayout.minimumLineSpacing = 0
	29	+ flowlayout.minimumInteritemSpacing = 0
	30	+ flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0)
	31	+ flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0)
	32	+ flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0)
	33	+
	34	+ let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout)
	35	+ calendarView.delegate = self
	36	+ calendarView.dataSource = self
	37	+ calendarView.backgroundColor = UIColor.white
	38	+ calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell")
	39	+ self.addSubview(calendarView)
	40	+ }
	41	+
	42	+ //MARK: - Delegate
	43	+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
	44	+ return weekLab.count
	45	+ }
	46	+
	47	+ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
	48	+
	49	+ let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath)
	50	+ let lab = UILabel.init(frame: cell.bounds)
	51	+ lab.text = weekLab[indexPath.row]
	52	+ lab.textAlignment = .center
	53	+ cell.addSubview(lab)
	54	+ return cell
	55	+
	56	+ }
	57	+ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
	58	+ print("点击了第 \(weekLab[indexPath.row])")
	59	+ }
	60	+ required init?(coder aDecoder: NSCoder) {
	61	+ fatalError("init(coder:) has not been implemented")
	62	+ }
	63	+
	64	+ /*
	65	+ // Only override draw() if you perform custom drawing.
	66	+ // An empty implementation adversely affects performance during animation.
	67	+ override func draw(_ rect: CGRect) {
	68	+ // Drawing code
	69	+ }
	70	+ */
	71	+
	72	+}
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+//
	2	+// EducationDetailCell.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/23.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class EducationDetailCell: UITableViewCell {
	12	+
	13	+ @IBOutlet weak var lineChartView: UIView!
	14	+
	15	+ var customLineChart = LineChartView()
	16	+
	17	+ override func awakeFromNib() {
	18	+ super.awakeFromNib()
	19	+ let rect = self.lineChartView.bounds
	20	+ print(rect)
	21	+ customLineChart = LineChartView.init(frame: rect)
	22	+ customLineChart.drawUI(xLableArr: nil)
	23	+ let arr1 = [4,4,2,1,3]
	24	+ let arr2 = [2,1,4,4,5]
	25	+
	26	+ customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190))
	27	+ customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16))
	28	+
	29	+
	30	+
	31	+ self.lineChartView.addSubview(customLineChart)
	32	+
	33	+
	34	+ // Initialization code
	35	+ }
	36	+
	37	+ override func setSelected(_ selected: Bool, animated: Bool) {
	38	+ super.setSelected(selected, animated: animated)
	39	+
	40	+ // Configure the view for the selected state
	41	+ }
	42	+
	43	+}
@@ -0,0 +1,220 @@		@@ -0,0 +1,220 @@
	1	+//
	2	+// LineChartView.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/23.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class LineChartView: UIView {
	12	+
	13	+ //默认横坐标
	14	+ private var xLabArr = ["行为","文明","课堂","作业","礼仪"]
	15	+ //设置纵坐标
	16	+ private let yCount = 6
	17	+ //横坐标个数
	18	+ private let xCount = 5
	19	+ //最大绩点分数
	20	+ private let GPA = 5
	21	+ //储存横纵坐标,画线用
	22	+ private var xCenterArr = Array<CGFloat>()
	23	+ private var yCenterArr = Array<CGFloat>()
	24	+ //判断是否重复点击
	25	+ private var btnTouch = 10
	26	+ //虚线
	27	+ private let lineLayer = CAShapeLayer()
	28	+ //横坐标下划线
	29	+ private let xMoveLayer = CAShapeLayer()
	30	+ //纵坐标Lab数组
	31	+ private var yMoveLaArr = Array<UILabel>()
	32	+ //折线图数据数组
	33	+ private var dateArr = Array<Array<Int>>()
	34	+ //显示的数字
	35	+ var yLabArray = Array<UILabel>()
	36	+
	37	+ override init(frame: CGRect) {
	38	+ super.init(frame: frame)
	39	+ print("frame==\(frame)")
	40	+
	41	+ }
	42	+ func drawUI(xLableArr:Array<String>?){
	43	+
	44	+ if xLableArr != nil {
	45	+ xLabArr = xLableArr!
	46	+ }
	47	+ drawX()
	48	+ drawY()
	49	+ }
	50	+ //设置纵坐标
	51	+ private func drawY() {
	52	+
	53	+ let yHeight = (self.bounds.height-60)/CGFloat(yCount)
	54	+ for index in 0..<yCount{
	55	+ let yLab = UILabel.init(frame: CGRect.init(x: 10, y: CGFloat(index)*yHeight, width: 20, height: 20))
	56	+ yLab.text = "\(GPA-index)"
	57	+ yLab.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
	58	+ yLab.font = UIFont.systemFont(ofSize: 14)
	59	+ self.addSubview(yLab)
	60	+
	61	+ let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: screenWidth-60, height: 0.4))
	62	+ lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
	63	+ self.addSubview(lineLab)
	64	+
	65	+ yMoveLaArr.append(yLab)
	66	+ yCenterArr.append(yLab.frame.origin.y+10)
	67	+ }
	68	+ }
	69	+ //设置横坐标
	70	+ private func drawX() {
	71	+ let xWidth = (screenWidth-20)/CGFloat(yCount)
	72	+ for index in 0..<xCount {
	73	+ let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 25))
	74	+ nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
	75	+ nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
	76	+ nameBtn.titleLabel!.textAlignment = .center
	77	+ nameBtn.titleLabel!.font = UIFont.systemFont(ofSize: 13)
	78	+// nameBtn.backgroundColor = UIColor.orange
	79	+ nameBtn.tag = index
	80	+ self.addSubview(nameBtn)
	81	+
	82	+ nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchUpInside)
	83	+
	84	+ xCenterArr.append(nameBtn.frame.origin.x+20)
	85	+ }
	86	+ }
	87	+
	88	+ //MARK: - 画折线
	89	+ func drawLine(point:Array<Int>,color:UIColor){
	90	+
	91	+ let pointArr = swichPoint(arr: point)
	92	+
	93	+ let drawLayer = DrawLayer()
	94	+ drawLayer.xPointArr = xCenterArr
	95	+ drawLayer.yPointArr = [yCenterArr[pointArr[0]],yCenterArr[pointArr[1]],yCenterArr[pointArr[2]],yCenterArr[pointArr[3]],yCenterArr[pointArr[4]]]
	96	+ drawLayer.bounds = self.bounds
	97	+ drawLayer.position = self.center
	98	+ drawLayer.lineColor = color
	99	+ self.layer.addSublayer(drawLayer)
	100	+ drawLayer.setNeedsDisplay()
	101	+
	102	+ dateArr.append(point)
	103	+
	104	+ }
	105	+ //MARK: - 点击横坐标
	106	+ @objc func touchXAction(tap:UIButton){
	107	+
	108	+ let index = tap.tag
	109	+
	110	+
	111	+ if btnTouch != index {
	112	+
	113	+ //竖虚线
	114	+ lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
	115	+ lineLayer.lineWidth = 1
	116	+ let arr = [5,5]
	117	+ lineLayer.lineDashPhase = 0
	118	+ lineLayer.lineDashPattern = arr as [NSNumber]
	119	+ self.layer.addSublayer(lineLayer)
	120	+
	121	+ //X轴下划线
	122	+ let movePath = CGMutablePath()
	123	+ movePath.move(to: CGPoint.init(x: xCenterArr[index], y: yCenterArr[0]))
	124	+ movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+5*(self.bounds.height-60)/CGFloat(yCount)))
	125	+ lineLayer.path = movePath
	126	+
	127	+ xMoveLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
	128	+ xMoveLayer.lineWidth = 2
	129	+ self.layer.addSublayer(xMoveLayer)
	130	+ let movePath2 = CGMutablePath()
	131	+ movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: self.bounds.height-45))
	132	+ movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-45))
	133	+ xMoveLayer.path = movePath2
	134	+
	135	+ if yLabArray.count == dateArr.count {
	136	+ for label in yLabArray {
	137	+ label.removeFromSuperview()
	138	+ }
	139	+ }
	140	+ yLabArray.removeAll()
	141	+ //数字显示
	142	+ for i in 0..<dateArr.count {
	143	+ let arr = dateArr[i]
	144	+ //y坐标数值
	145	+ let y = arr[index]
	146	+ let yLab = yMoveLaArr[GPA-y]
	147	+ var rect = yLab.frame
	148	+ rect.origin.x = xCenterArr[index]+10
	149	+
	150	+ let newLab = UILabel()
	151	+ newLab.text = yLab.text
	152	+ newLab.textColor = yLab.textColor
	153	+ newLab.font = yLab.font
	154	+ newLab.frame = rect
	155	+ self.addSubview(newLab)
	156	+ yLabArray.append(newLab)
	157	+ }
	158	+ }else{
	159	+ print(yLabArray)
	160	+ }
	161	+ btnTouch = index
	162	+
	163	+
	164	+ }
	165	+ //转换y坐标
	166	+ func swichPoint(arr:Array<Int>)->Array<Int>{
	167	+ var array = Array<Int>()
	168	+ for index in 0..<arr.count {
	169	+ let value = GPA - arr[index]
	170	+ array.append(value)
	171	+ }
	172	+ return array
	173	+ }
	174	+
	175	+ required init?(coder aDecoder: NSCoder) {
	176	+ fatalError("init(coder:) has not been implemented")
	177	+ }
	178	+
	179	+ /*
	180	+ // Only override draw() if you perform custom drawing.
	181	+ // An empty implementation adversely affects performance during animation.
	182	+ override func draw(_ rect: CGRect) {
	183	+ // Drawing code
	184	+ }
	185	+ */
	186	+
	187	+}
	188	+
	189	+class DrawLayer: CALayer {
	190	+
	191	+ var yPointArr = Array<CGFloat>()
	192	+ var xPointArr = Array<CGFloat>()
	193	+ var lineColor = UIColor()
	194	+
	195	+ override func draw(in ctx: CGContext) {
	196	+
	197	+ let context = ctx
	198	+ //点
	199	+ context.setFillColor(lineColor.cgColor)
	200	+
	201	+ for i in 0..<xPointArr.count {
	202	+ context.fillEllipse(in: CGRect.init(x: xPointArr[i]-5, y: yPointArr[i]-5, width: 10, height: 10))
	203	+
	204	+ }
	205	+ //折线
	206	+ context.setStrokeColor(lineColor.cgColor)
	207	+ context.setLineWidth(1.5)
	208	+ for i in 0..<xPointArr.count {
	209	+ if i == 0 {
	210	+ context.move(to: CGPoint.init(x: xPointArr[0] , y: yPointArr[0]))
	211	+ }else{
	212	+ context.addLine(to: CGPoint.init(x: xPointArr[i] , y: yPointArr[i]))
	213	+ }
	214	+ }
	215	+ context.strokePath()
	216	+ }
	217	+
	218	+}
	219	+
	220	+
@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
	1	+//
	2	+// MoralDetailCell.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/23.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class MoralDetailCell: UITableViewCell {
	12	+
	13	+ @IBOutlet weak var dateLab: UILabel!
	14	+ @IBOutlet weak var pointLab: UILabel!
	15	+ @IBOutlet weak var rankingLab: UILabel!
	16	+ @IBOutlet weak var risingLab: UILabel!
	17	+ @IBOutlet weak var risingRightLab: UILabel!
	18	+ @IBOutlet weak var averageLab: UILabel!
	19	+ @IBOutlet weak var averageRightLab: UILabel!
	20	+ @IBOutlet weak var evaluationLab: UILabel!
	21	+ override func awakeFromNib() {
	22	+ super.awakeFromNib()
	23	+ // Initialization code
	24	+ }
	25	+
	26	+ override func setSelected(_ selected: Bool, animated: Bool) {
	27	+ super.setSelected(selected, animated: animated)
	28	+
	29	+ // Configure the view for the selected state
	30	+ }
	31	+
	32	+}
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+//
	2	+// MoralTableViewCell.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/22.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class MoralTableViewCell: UITableViewCell {
	12	+
	13	+ @IBOutlet weak var pointLab: UILabel!
	14	+ @IBOutlet weak var todayReName: UILabel!
	15	+ @IBOutlet weak var rankingLab: UILabel!
	16	+ @IBOutlet weak var evaluateLab: UILabel!
	17	+ @IBOutlet weak var rankStatusLab: UILabel!
	18	+ @IBOutlet weak var reportDateLab: UILabel!
	19	+ override func awakeFromNib() {
	20	+ super.awakeFromNib()
	21	+ // Initialization code
	22	+ }
	23	+
	24	+ override func setSelected(_ selected: Bool, animated: Bool) {
	25	+ super.setSelected(selected, animated: animated)
	26	+
	27	+ // Configure the view for the selected state
	28	+ }
	29	+
	30	+}