KPI数据统计
This commit is contained in:
Binary file not shown.
@@ -462,8 +462,8 @@
|
|||||||
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
|
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "58"
|
startingLineNumber = "59"
|
||||||
endingLineNumber = "58"
|
endingLineNumber = "59"
|
||||||
landmarkName = "init()"
|
landmarkName = "init()"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -2974,8 +2974,8 @@
|
|||||||
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
|
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "61"
|
startingLineNumber = "62"
|
||||||
endingLineNumber = "61"
|
endingLineNumber = "62"
|
||||||
landmarkName = "init()"
|
landmarkName = "init()"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ open class WebViewTool : NSObject {
|
|||||||
case docmentDetail = "详情"
|
case docmentDetail = "详情"
|
||||||
case docmentList = "文档资料"
|
case docmentList = "文档资料"
|
||||||
case newTrainingList = "新人培训"
|
case newTrainingList = "新人培训"
|
||||||
|
case kpiIndex = "KPI数据统计"
|
||||||
}
|
}
|
||||||
|
|
||||||
public override init() {
|
public override init() {
|
||||||
@@ -124,6 +125,9 @@ open class WebViewTool : NSObject {
|
|||||||
case .newTrainingList:
|
case .newTrainingList:
|
||||||
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? ""),screenEdgePanGestureRecognizerEnable: false)
|
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? ""),screenEdgePanGestureRecognizerEnable: false)
|
||||||
break
|
break
|
||||||
|
case .kpiIndex:
|
||||||
|
vc = WebViewController(showNavBar:true, title: WebViewNameEnum.kpiIndex.rawValue, url: "\((h5Models?.kpiIndex)!)?token=\((USER.token)!)"+(appending ?? ""))
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if let vc {
|
if let vc {
|
||||||
|
|||||||
@@ -259,6 +259,7 @@ public class DispatchAppH5UrlDataModel : Decodable {
|
|||||||
var trainDocment : String
|
var trainDocment : String
|
||||||
var docmentList : String
|
var docmentList : String
|
||||||
var newTrainingList : String
|
var newTrainingList : String
|
||||||
|
var kpiIndex : String
|
||||||
}
|
}
|
||||||
|
|
||||||
public class VersionCheckDataModel : Decodable {
|
public class VersionCheckDataModel : Decodable {
|
||||||
|
|||||||
@@ -83,6 +83,13 @@ extension MineController {
|
|||||||
})
|
})
|
||||||
.disposed(by: disposeBag)
|
.disposed(by: disposeBag)
|
||||||
|
|
||||||
|
mineView.shujutongjiGes.rx.event
|
||||||
|
.observe(on: MainScheduler.instance)
|
||||||
|
.subscribe(onNext: { _ in
|
||||||
|
WEBTOOL.open(name: .kpiIndex, appending: nil)
|
||||||
|
})
|
||||||
|
.disposed(by: disposeBag)
|
||||||
|
|
||||||
mineView.gongdanduizhangGes.rx.event
|
mineView.gongdanduizhangGes.rx.event
|
||||||
.observe(on: MainScheduler.instance)
|
.observe(on: MainScheduler.instance)
|
||||||
.subscribe(onNext: { _ in
|
.subscribe(onNext: { _ in
|
||||||
@@ -172,6 +179,7 @@ open class MineController : ZDViewController {
|
|||||||
mineView.driverInfoView.titleLabel.text = "司机管理"
|
mineView.driverInfoView.titleLabel.text = "司机管理"
|
||||||
mineView.driverInfoView.imageView.image = UIImage(named: "mine_info_driver")
|
mineView.driverInfoView.imageView.image = UIImage(named: "mine_info_driver")
|
||||||
|
|
||||||
|
mineView.shujutongji.titleLabel.text = "KPI数据统计"
|
||||||
mineView.gongdanduizhang.titleLabel.text = "工单对账"
|
mineView.gongdanduizhang.titleLabel.text = "工单对账"
|
||||||
mineView.kaipiaotongzhi.titleLabel.text = "开票通知"
|
mineView.kaipiaotongzhi.titleLabel.text = "开票通知"
|
||||||
mineView.luqiaofeibaoxiao.titleLabel.text = "路桥费报销"
|
mineView.luqiaofeibaoxiao.titleLabel.text = "路桥费报销"
|
||||||
@@ -214,9 +222,12 @@ open class MineView : DDView {
|
|||||||
public let driverInfoView : MineInfoView
|
public let driverInfoView : MineInfoView
|
||||||
public let infoRadiusView : DDView
|
public let infoRadiusView : DDView
|
||||||
public let infoRadiusSeparate : DDImageView
|
public let infoRadiusSeparate : DDImageView
|
||||||
|
public let statisticsRadiusView : DDView
|
||||||
public let orderRadiusView : DDView
|
public let orderRadiusView : DDView
|
||||||
public let materialRadiusView : DDView
|
public let materialRadiusView : DDView
|
||||||
public let settingsRadiusView : DDView
|
public let settingsRadiusView : DDView
|
||||||
|
public let shujutongjiGes : UITapGestureRecognizer
|
||||||
|
public let shujutongji : MineCell
|
||||||
public let gongdanduizhangGes : UITapGestureRecognizer
|
public let gongdanduizhangGes : UITapGestureRecognizer
|
||||||
public let gongdanduizhang : MineCell
|
public let gongdanduizhang : MineCell
|
||||||
public let kaipiaotongzhiGes : UITapGestureRecognizer
|
public let kaipiaotongzhiGes : UITapGestureRecognizer
|
||||||
@@ -245,9 +256,12 @@ open class MineView : DDView {
|
|||||||
driverInfoGes = UITapGestureRecognizer()
|
driverInfoGes = UITapGestureRecognizer()
|
||||||
infoRadiusView = DDView()
|
infoRadiusView = DDView()
|
||||||
infoRadiusSeparate = DDImageView(image: UIImage(named: "mine_info_separate"))
|
infoRadiusSeparate = DDImageView(image: UIImage(named: "mine_info_separate"))
|
||||||
|
statisticsRadiusView = DDView()
|
||||||
orderRadiusView = DDView()
|
orderRadiusView = DDView()
|
||||||
materialRadiusView = DDView()
|
materialRadiusView = DDView()
|
||||||
settingsRadiusView = DDView()
|
settingsRadiusView = DDView()
|
||||||
|
shujutongjiGes = UITapGestureRecognizer()
|
||||||
|
shujutongji = MineCell()
|
||||||
gongdanduizhangGes = UITapGestureRecognizer()
|
gongdanduizhangGes = UITapGestureRecognizer()
|
||||||
gongdanduizhang = MineCell()
|
gongdanduizhang = MineCell()
|
||||||
luqiaofeibaoxiaoGes = UITapGestureRecognizer()
|
luqiaofeibaoxiaoGes = UITapGestureRecognizer()
|
||||||
@@ -284,6 +298,9 @@ open class MineView : DDView {
|
|||||||
driverInfoView.addGestureRecognizer(driverInfoGes)
|
driverInfoView.addGestureRecognizer(driverInfoGes)
|
||||||
infoRadiusView.addSubview(driverInfoView)
|
infoRadiusView.addSubview(driverInfoView)
|
||||||
scrollContentView.addSubview(infoRadiusSeparate)
|
scrollContentView.addSubview(infoRadiusSeparate)
|
||||||
|
statisticsRadiusView.backgroundColor = .hex("FFFFFF")
|
||||||
|
statisticsRadiusView.layer.cornerRadius = auto(6)
|
||||||
|
scrollContentView.addSubview(statisticsRadiusView)
|
||||||
orderRadiusView.backgroundColor = .hex("FFFFFF")
|
orderRadiusView.backgroundColor = .hex("FFFFFF")
|
||||||
orderRadiusView.layer.cornerRadius = auto(6)
|
orderRadiusView.layer.cornerRadius = auto(6)
|
||||||
scrollContentView.addSubview(orderRadiusView)
|
scrollContentView.addSubview(orderRadiusView)
|
||||||
@@ -293,6 +310,9 @@ open class MineView : DDView {
|
|||||||
settingsRadiusView.backgroundColor = .hex("FFFFFF")
|
settingsRadiusView.backgroundColor = .hex("FFFFFF")
|
||||||
settingsRadiusView.layer.cornerRadius = auto(6)
|
settingsRadiusView.layer.cornerRadius = auto(6)
|
||||||
scrollContentView.addSubview(settingsRadiusView)
|
scrollContentView.addSubview(settingsRadiusView)
|
||||||
|
shujutongji.addGestureRecognizer(shujutongjiGes)
|
||||||
|
shujutongji.line.isHidden = true
|
||||||
|
statisticsRadiusView.addSubview(shujutongji)
|
||||||
gongdanduizhang.addGestureRecognizer(gongdanduizhangGes)
|
gongdanduizhang.addGestureRecognizer(gongdanduizhangGes)
|
||||||
orderRadiusView.addSubview(gongdanduizhang)
|
orderRadiusView.addSubview(gongdanduizhang)
|
||||||
kaipiaotongzhi.line.isHidden = true
|
kaipiaotongzhi.line.isHidden = true
|
||||||
@@ -366,10 +386,17 @@ open class MineView : DDView {
|
|||||||
make.centerY.equalToSuperview()
|
make.centerY.equalToSuperview()
|
||||||
}
|
}
|
||||||
|
|
||||||
orderRadiusView.snp.makeConstraints { make in
|
statisticsRadiusView.snp.makeConstraints { make in
|
||||||
make.top.equalTo(infoRadiusView.snp.bottom).offset(auto(10))
|
make.top.equalTo(infoRadiusView.snp.bottom).offset(auto(10))
|
||||||
make.width.equalTo(infoRadiusView)
|
make.width.equalTo(infoRadiusView)
|
||||||
make.centerX.equalToSuperview()
|
make.centerX.equalToSuperview()
|
||||||
|
make.height.equalTo(auto(55))
|
||||||
|
}
|
||||||
|
|
||||||
|
orderRadiusView.snp.makeConstraints { make in
|
||||||
|
make.top.equalTo(statisticsRadiusView.snp.bottom).offset(auto(10))
|
||||||
|
make.width.equalTo(infoRadiusView)
|
||||||
|
make.centerX.equalToSuperview()
|
||||||
make.height.equalTo(auto(110))
|
make.height.equalTo(auto(110))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -387,6 +414,11 @@ open class MineView : DDView {
|
|||||||
make.height.equalTo(auto(110))
|
make.height.equalTo(auto(110))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shujutongji.snp.makeConstraints { make in
|
||||||
|
make.left.right.top.equalToSuperview()
|
||||||
|
make.height.equalTo(auto(55))
|
||||||
|
}
|
||||||
|
|
||||||
gongdanduizhang.snp.makeConstraints { make in
|
gongdanduizhang.snp.makeConstraints { make in
|
||||||
make.left.right.top.equalToSuperview()
|
make.left.right.top.equalToSuperview()
|
||||||
make.height.equalTo(auto(55))
|
make.height.equalTo(auto(55))
|
||||||
|
|||||||
@@ -5,17 +5,17 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000172">
|
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000178">
|
||||||
|
|
||||||
</testcase>
|
</testcase>
|
||||||
|
|
||||||
|
|
||||||
<testcase classname="fastlane.lanes" name="1: gym" time="84.896894">
|
<testcase classname="fastlane.lanes" name="1: gym" time="87.302316">
|
||||||
|
|
||||||
</testcase>
|
</testcase>
|
||||||
|
|
||||||
|
|
||||||
<testcase classname="fastlane.lanes" name="2: pgyer" time="12.224653">
|
<testcase classname="fastlane.lanes" name="2: pgyer" time="12.123037">
|
||||||
|
|
||||||
</testcase>
|
</testcase>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user