diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index 1506c00..195e92e 100644
Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 9f14611..61fe1c2 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -1226,8 +1226,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "52"
- endingLineNumber = "52"
+ startingLineNumber = "54"
+ endingLineNumber = "54"
landmarkName = "init()"
landmarkType = "7">
@@ -2547,8 +2547,8 @@
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "27"
- endingLineNumber = "27"
+ startingLineNumber = "29"
+ endingLineNumber = "29"
landmarkName = "open(userInfo:)"
landmarkType = "7">
@@ -2649,5 +2649,37 @@
+
+
+
+
+
+
+
+
diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift
index 2cfc575..c79a847 100644
--- a/OrderScheduling/Common/WebView/WebViewTool.swift
+++ b/OrderScheduling/Common/WebView/WebViewTool.swift
@@ -29,6 +29,8 @@ open class WebViewTool : NSObject {
case reporting = "报备"
case supplySettlement = "补结算单"
case workOrderDetail = "工单详情"
+ case trainDocment = "培训文档"
+ case docmentList = "文档资料"
}
public override init() {
@@ -95,6 +97,12 @@ open class WebViewTool : NSObject {
case .workOrderDetail:
vc = WebViewController(title: WebViewNameEnum.workOrderDetail.rawValue, url: "\((h5Models?.workOrderDetail)!)?token=\((USER.token)!)"+(appending ?? ""))
break
+ case .trainDocment:
+ vc = WebViewController(showNavBar:false, title: WebViewNameEnum.trainDocment.rawValue, url: "\((h5Models?.trainDocment)!)?token=\((USER.token)!)"+(appending ?? ""))
+ break
+ case .docmentList:
+ vc = WebViewController(showNavBar:false, title: WebViewNameEnum.docmentList.rawValue, url: "\((h5Models?.docmentList)!)?token=\((USER.token)!)"+(appending ?? ""))
+ break
}
if let vc {
diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift
index 57a76ae..e8aa3f7 100644
--- a/OrderScheduling/HttpResponseModel/ResponseModel.swift
+++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift
@@ -242,6 +242,8 @@ public class DispatchAppH5UrlDataModel : Decodable {
var reporting : String
var supplySettlement : String
var workOrderDetail : String
+ var trainDocment : String
+ var docmentList : String
}
public class VersionCheckDataModel : Decodable {
diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift
index fa1489b..c37ee11 100644
--- a/OrderScheduling/Mine/ViewController/MineController.swift
+++ b/OrderScheduling/Mine/ViewController/MineController.swift
@@ -100,15 +100,14 @@ extension MineController {
mineView.wendangziliaoGes.rx.event
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
-
-
+ WEBTOOL.open(name: .docmentList, appending: nil)
})
.disposed(by: disposeBag)
mineView.peixunwendangGes.rx.event
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
-
+ WEBTOOL.open(name: .trainDocment, appending: nil)
})
.disposed(by: disposeBag)
diff --git a/OrderScheduling/Rescue/View/AcceptOrderTool.swift b/OrderScheduling/Rescue/View/AcceptOrderTool.swift
index 4b11d5e..c796df2 100644
--- a/OrderScheduling/Rescue/View/AcceptOrderTool.swift
+++ b/OrderScheduling/Rescue/View/AcceptOrderTool.swift
@@ -24,7 +24,12 @@ open class AcceptOrderTool : NSObject {
.subscribe(onNext: {
ENTRY.dismiss(name: acceptOrderViewEntry) {
let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? MainTabBarController
+ let currentNav = tabBarVc?.selectedViewController as? UINavigationController
+ currentNav?.popToRootViewController(animated: false)
tabBarVc?.selectedIndex = 0
+ let nav = tabBarVc?.children.first as? UINavigationController
+ let vc = nav?.children.first as? RescueController
+ vc?.categoryView.selectItem(at: 0)
}
}).disposed(by: disposeBag)
ENTRY.showAcceptOrderEntry(view: acceptOrderView,name: acceptOrderViewEntry)
diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift
index b4f1685..6fa0dcc 100644
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -790,7 +790,7 @@ extension RescuePendingDispatchController : UICollectionViewDelegate, UICollecti
// MARK: 救援中
class RescueController : ZDViewController {
- private let categoryView = JXCategoryTitleView()
+ public let categoryView = JXCategoryTitleView()
private lazy var categoryContainerView = JXCategoryListContainerView(type: .scrollView, delegate: self)
private let messageTapGes = UITapGestureRecognizer()
private let messageView = MessageView()