报表：曲线图的modify

XFFruit/Macro/ICRAppMacro.h

@@ -32,7 +32,7 @@
 //********现场正式环境*********
  #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7380/cruiser-server/rest"
 
-
+ #define HTTP_REST_REPORT_BASE_URL  @"http://122.224.171.126:7380"
 // HTTP
 //#define HTTP_REST_API_BASE_URL          @"http://115.28.191.44:8080/IPatrol/rest"
 //10月23   122.224.171.126:7280

XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.m

@@ -141,17 +141,27 @@
 }
 #pragma mark- 请求webView
 - (void)loadWebViewFromServer{
+    ICRUserUtil *userU = [ICRUserUtil sharedInstance];
 #warning 测试
-    NSString *passgerUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_API_BASE_URL,PassengerWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
+    NSString *passgerUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_REPORT_BASE_URL,PassengerWebUrl,userU.orgId,self.dayType,self.compass.dataScope,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];
+//    NSString *priceUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_REPORT_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_REPORT_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_REPORT_BASE_URL,SaleWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.scopeType,self.compass.orgUuid];
+//    [self.rwebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:saleUrl]]];
+    
+    NSString *priceUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_REPORT_BASE_URL,PriceWebUrl,userU.orgId,self.dayType,self.compass.dataScope,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];
+    NSString *grossUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_REPORT_BASE_URL,GrossWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.compass.dataScope,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];
+    NSString *saleUrl = [NSString stringWithFormat:@"%@/%@?enterprise=%@&dateScopeType=%@&dateScope=%@&orgUuid=%@",HTTP_REST_REPORT_BASE_URL,SaleWebUrl,[ICRUserUtil sharedInstance].orgId,self.dayType,self.compass.dataScope,self.compass.orgUuid];
     [self.rwebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:saleUrl]]];
 }
 

XFFruit/ViewControllers/Report/Controllers/SearchReportViewController.m

@@ -205,6 +205,8 @@
     com.orgUuid = orgs.uuid;
     com.orgName = orgs.name;
     com.orgCode = orgs.code;
+    com.dataScope = [[NSDate date] localYMDString];
+    com.dataScopeType = @"day";
     rvc.compass = com;
     [self PushViewController:rvc animated:YES];
 }