报表Url修改

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -255,5 +255,13 @@
 #define ReportChainMinusImage                   @"downSale"
 //报表查看权
 #define Report_ACTION_Check                     @"500901"
+//报表
+#define SaleWebUrl      @"cruiser-web/chart/salesdatachart.thor"
+//毛利率
+#define GrossWebUrl     @"cruiser-web/chart/grossprofitdatachart.thor"
+//客流量
+#define PassengerWebUrl @"cruiser-web/chart/passengerdatachart.thor"
+//客单价
+#define PriceWebUrl     @"cruiser-web/chart/persalesdatachart.thor"
 
 #endif

XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.m

@@ -13,7 +13,6 @@
 #import "FinishTimeView.h"
 #import "QueryOrder.h"
 
-#define WebUrl @"cruiser-web/chart/salesdatachart.thor"
 
 @interface ReportDetailViewController ()<CustomSegViewDelegate,FinishTimeViewDelegate,UIWebViewDelegate>
 @property (nonatomic,strong)CustomSegView *segView;
@@ -143,13 +142,17 @@
 #pragma mark- 请求webView
 - (void)loadWebViewFromServer{
 #warning 测试
-    // NSString *url = http://218.244.151.129:7580/cruiser-web/chart/surveychart.thor?enterprise=1111&surveyUuid=2222
-    NSString *url = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_API_BASE_URL,WebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
-    CLog(@"==========%@",url);
-    [self.rpassgerWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-    [self.rpriceWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-    [self.rgrossWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-    [self.rwebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+    NSString *passgerUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_API_BASE_URL,PassengerWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
+    [self.rpassgerWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:passgerUrl]]];
+    
+    NSString *priceUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_API_BASE_URL,PriceWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
+    [self.rpriceWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:priceUrl]]];
+    
+    NSString *grossUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_API_BASE_URL,GrossWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
+    [self.rgrossWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:grossUrl]]];
+    
+    NSString *saleUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_API_BASE_URL,SaleWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
+    [self.rwebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:saleUrl]]];
 }