Skip to content

T
traffic-front
Commit 2cae0400 authored by chase's avatar chase
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents e0661de9 17f35ac7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 106 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/EquityServiceImpl.java
View file @ 2cae0400
...@@ -24,7 +24,7 @@ import static pwc.taxtech.atms.common.CommonConstants.CommonFail; ...@@ -24,7 +24,7 @@ import static pwc.taxtech.atms.common.CommonConstants.CommonFail;
import static pwc.taxtech.atms.common.CommonConstants.SystemError; import static pwc.taxtech.atms.common.CommonConstants.SystemError;
@Service @Service
public class EquityServiceImpl extends BaseService{ public class EquityServiceImpl extends BaseService {
@Autowired @Autowired
private OperationLogServiceImpl operationLogServiceImpl; private OperationLogServiceImpl operationLogServiceImpl;
...@@ -59,35 +59,35 @@ public class EquityServiceImpl extends BaseService{ ...@@ -59,35 +59,35 @@ public class EquityServiceImpl extends BaseService{
} }
public OperationResultDto<Object> insertAll(List<EquityInfoDto> equityInfoDtos) { public OperationResultDto<Object> insertAll(List<EquityInfoDto> equityInfoDtos) {
try{ try {
// todo opt insertAll // todo opt insertAll
if(equityInfoDtos.get(0).getId()==null){ if (equityInfoDtos.get(0).getId() == null) {
equityInfoDtos.get(0).setId(idService.nextId()); equityInfoDtos.get(0).setId(idService.nextId());
equityInfoDtos.get(0).seteNum(1); equityInfoDtos.get(0).seteNum(1);
} }
for (EquityInfoDto equityInfoDto : equityInfoDtos) { for (EquityInfoDto equityInfoDto : equityInfoDtos) {
EquityInformation equityInformation = new EquityInformation(); EquityInformation equityInformation = new EquityInformation();
BeanUtils.copyProperties(equityInfoDto,equityInformation); BeanUtils.copyProperties(equityInfoDto, equityInformation);
equityInformationMapper.insert(equityInformation); equityInformationMapper.insert(equityInformation);
} }
AddOrgEquityLog(OperationAction.New.value(),LogMessage.AddOrganizationEquity,equityInfoDtos.get(0).getOrganizationId(),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.New.value(), LogMessage.AddOrganizationEquity, equityInfoDtos.get(0).getOrganizationId(), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
}catch (Exception e){ } catch (Exception e) {
logger.error(String.format("写入全部股东信息异常:%s", e.getMessage())); logger.error(String.format("写入全部股东信息异常:%s", e.getMessage()));
return new OperationResultDto(false, CommonFail + SystemError); return new OperationResultDto(false, CommonFail + SystemError);
} }
} }
public OperationResultDto<Object> update(EquityInfoDto equityInfoDto) { public OperationResultDto<Object> update(EquityInfoDto equityInfoDto) {
try{ try {
EquityInformation equityInformation = new EquityInformation(); EquityInformation equityInformation = new EquityInformation();
BeanUtils.copyProperties(equityInfoDto,equityInformation); BeanUtils.copyProperties(equityInfoDto, equityInformation);
EquityInformationExample example = new EquityInformationExample(); EquityInformationExample example = new EquityInformationExample();
example.createCriteria().andIdEqualTo(equityInformation.getId()).andENumEqualTo(equityInformation.geteNum()); example.createCriteria().andIdEqualTo(equityInformation.getId()).andENumEqualTo(equityInformation.geteNum());
equityInformationMapper.updateByExampleSelective(equityInformation,example); equityInformationMapper.updateByExampleSelective(equityInformation, example);
AddOrgEquityLog(OperationAction.Update.value(),LogMessage.UpdateOrganizationEquity,equityInfoDto.getOrganizationId(),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Update.value(), LogMessage.UpdateOrganizationEquity, equityInfoDto.getOrganizationId(), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
}catch (Exception e){ } catch (Exception e) {
logger.error(String.format("更新股东信息异常:%s", e.getMessage())); logger.error(String.format("更新股东信息异常:%s", e.getMessage()));
return new OperationResultDto(false, CommonFail + SystemError); return new OperationResultDto(false, CommonFail + SystemError);
} }
...@@ -104,7 +104,7 @@ public class EquityServiceImpl extends BaseService{ ...@@ -104,7 +104,7 @@ public class EquityServiceImpl extends BaseService{
if (delRes > 0) { if (delRes > 0) {
refreshEquityList(id); refreshEquityList(id);
} }
AddOrgEquityLog(OperationAction.Delete.value(),LogMessage.DeleteOrganizationEquity,String.valueOf(id),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Delete.value(), LogMessage.DeleteOrganizationEquity, String.valueOf(id), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
} catch (Exception e) { } catch (Exception e) {
logger.error(String.format("删除股东信息异常:%s", e.getMessage())); logger.error(String.format("删除股东信息异常:%s", e.getMessage()));
...@@ -116,8 +116,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -116,8 +116,9 @@ public class EquityServiceImpl extends BaseService{
* 17/01/2019 15:51 * 17/01/2019 15:51
* 变更当前股权信息时，刷新股权信息的序号 * 变更当前股权信息时，刷新股权信息的序号
* [id] * [id]
* @author Gary J Li *
* @return * @return
* @author Gary J Li
*/ */
private void refreshEquityList(Long id) { private void refreshEquityList(Long id) {
EquityInformationExample exampleForENumUp = new EquityInformationExample(); EquityInformationExample exampleForENumUp = new EquityInformationExample();
...@@ -128,9 +129,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -128,9 +129,9 @@ public class EquityServiceImpl extends BaseService{
return; return;
} }
List<EquityInformation> resList = new ArrayList<>(); List<EquityInformation> resList = new ArrayList<>();
int i =1; int i = 1;
for (EquityInformation record : equityInformations) { for (EquityInformation record : equityInformations) {
if(record.geteNum()!=i){ if (record.geteNum() != i) {
record.seteNum(i); record.seteNum(i);
} }
resList.add(record); resList.add(record);
...@@ -149,18 +150,19 @@ public class EquityServiceImpl extends BaseService{ ...@@ -149,18 +150,19 @@ public class EquityServiceImpl extends BaseService{
/** /**
* 17/01/2019 20:18 股权变更 * 17/01/2019 20:18 股权变更
* 1、根据id（原始）查出旧数据 equity_infomation * 1、根据id（原始）查出旧数据 equity_infomation
* 2、旧数据插入历史表 equity_infomation_history * 2、旧数据插入历史表 equity_infomation_history
* 3、equityInfoDtos 生成新id、createTime、updateTime 插入equity_infomation * 3、equityInfoDtos 生成新id、createTime、updateTime 插入equity_infomation
* 4、根据id（原始）删除旧数据 equity_infomation * 4、根据id（原始）删除旧数据 equity_infomation
* 5、记录日志 id（原始） * 5、记录日志 id（原始）
* * <p>
* remark: * remark:
* 1、无股权记录时，为初始变更只进行3、5 * 1、无股权记录时，为初始变更只进行3、5
* 2、// todo 事务过长并发时，可能出现问题 * 2、// todo 事务过长并发时，可能出现问题
* [equityInfoDtos] * [equityInfoDtos]
* @author Gary J Li *
* @return OperationResultDto<Object> * @return OperationResultDto<Object>
* @author Gary J Li
*/ */
public OperationResultDto<Object> change(String orgName, String comment, List<EquityInfoDto> equityInfoDtos) { public OperationResultDto<Object> change(String orgName, String comment, List<EquityInfoDto> equityInfoDtos) {
...@@ -195,8 +197,8 @@ public class EquityServiceImpl extends BaseService{ ...@@ -195,8 +197,8 @@ public class EquityServiceImpl extends BaseService{
newData.setId(newId); newData.setId(newId);
newData.seteNum(i); newData.seteNum(i);
float investRadio = 0L; float investRadio = 0L;
if(CommonUtil.hasDigit(org.getRegistrationCapital())&&null!=newData.getInvestmentAmount()){ if (CommonUtil.hasDigit(org.getRegistrationCapital()) && null != newData.getInvestmentAmount()) {
investRadio = (float)newData.getInvestmentAmount()/(float)CommonUtil.getNum(org.getRegistrationCapital()); investRadio = (float) newData.getInvestmentAmount() / (float) CommonUtil.getNum(org.getRegistrationCapital());
} }
newData.setInvestmentRadio(investRadio); newData.setInvestmentRadio(investRadio);
newData.setOrganizationId(orgId); newData.setOrganizationId(orgId);
...@@ -237,7 +239,7 @@ public class EquityServiceImpl extends BaseService{ ...@@ -237,7 +239,7 @@ public class EquityServiceImpl extends BaseService{
opLog.setLogType(OperateLogType.OperationLogEquity.value()); opLog.setLogType(OperateLogType.OperationLogEquity.value());
opLog.setEquityLog(true); opLog.setEquityLog(true);
operationLogService.addOperationLog(opLog); operationLogService.addOperationLog(opLog);
AddOrgEquityLog(OperationAction.Update.value(),LogMessage.ChangeOrganizationEquity,orgName,OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Update.value(), LogMessage.ChangeOrganizationEquity, orgName, OperationModule.Equity.value());
return new OperationResultDto(true, "变更成功!", oldId); return new OperationResultDto(true, "变更成功!", oldId);
} }
...@@ -245,8 +247,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -245,8 +247,9 @@ public class EquityServiceImpl extends BaseService{
* 18/01/2019 14:03 * 18/01/2019 14:03
* 根据id查询出所有日志，时间排序 * 根据id查询出所有日志，时间排序
* [ids] * [ids]
* @author Gary J Li *
* @return List<OperationLogBasicData> * @return List<OperationLogBasicData>
* @author Gary J Li
*/ */
public List<OperationLogBasicData> getChangeLogByOrgName(String orgName) { public List<OperationLogBasicData> getChangeLogByOrgName(String orgName) {
List<OperationLogBasicData> logListByIds = null; List<OperationLogBasicData> logListByIds = null;
...@@ -268,8 +271,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -268,8 +271,9 @@ public class EquityServiceImpl extends BaseService{
* 5、根据oldId删除操作日志 operation_log_equity * 5、根据oldId删除操作日志 operation_log_equity
* remark : 最初的记录撤销变更仅做3、5 * remark : 最初的记录撤销变更仅做3、5
* [id] * [id]
* @author Gary J Li *
* @return OperationResultDto<Object> * @return OperationResultDto<Object>
* @author Gary J Li
*/ */
public OperationResultDto<Object> cancelChange(Long oldId, Long newId) { public OperationResultDto<Object> cancelChange(Long oldId, Long newId) {
if (null != oldId) { if (null != oldId) {
...@@ -308,7 +312,7 @@ public class EquityServiceImpl extends BaseService{ ...@@ -308,7 +312,7 @@ public class EquityServiceImpl extends BaseService{
logger.warn(String.format("撤销变更-3 表operation_log_equity 删除操作日志异常.id: [ %s ]", oldId)); logger.warn(String.format("撤销变更-3 表operation_log_equity 删除操作日志异常.id: [ %s ]", oldId));
throw new ApplicationException("撤销变更-5 删除操作日志异常"); throw new ApplicationException("撤销变更-5 删除操作日志异常");
} }
AddOrgEquityLog(OperationAction.Update.value(),LogMessage.CancelChangeUpdateOrganizationEquity,String.valueOf(newId),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Update.value(), LogMessage.CancelChangeUpdateOrganizationEquity, String.valueOf(newId), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -356,10 +360,11 @@ public class EquityServiceImpl extends BaseService{ ...@@ -356,10 +360,11 @@ public class EquityServiceImpl extends BaseService{
* 25/01/2019 14:39 * 25/01/2019 14:39
* [增删改查，操作描述，操作对象，操作模块] 更新、删除需补充oldData、newData * [增删改查，操作描述，操作对象，操作模块] 更新、删除需补充oldData、newData
* [actionValue, content, object, module] * [actionValue, content, object, module]
* @author Gary J Li *
* @return * @return
* @author Gary J Li
*/ */
private void AddOrgEquityLog(int actionValue,String content,String object,Integer module) { private void AddOrgEquityLog(int actionValue, String content, String object, Integer module) {
OperationLogDto opLog = new OperationLogDto(); OperationLogDto opLog = new OperationLogDto();
opLog.setAction(actionValue); opLog.setAction(actionValue);
opLog.setOperationContent(content); opLog.setOperationContent(content);
......
atms-orangeheap/src/components/Panel.vue
View file @ 2cae0400
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
export default { export default {
data: () => ({ data: () => ({
chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax', chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
tableauApiUrl: require('../assets/tableaujs.js'), tableauApiUrl: require('../assets/tableaujs.js'),
// tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js', // tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js',
drawer: null, drawer: null,
......
atms-web/src/main/resources/conf.properties
View file @ 2cae0400
...@@ -24,6 +24,7 @@ longi_api_gl_balance=${longi_api_gl_balance} ...@@ -24,6 +24,7 @@ longi_api_gl_balance=${longi_api_gl_balance}
#tableau config #tableau config
tableau_get_ticket=${tableau_get_ticket}
tableau_tax_category_unreturned_tax=${tableau_tax_category_unreturned_tax} tableau_tax_category_unreturned_tax=${tableau_tax_category_unreturned_tax}
tableau_district_unreturned_tax=${tableau_district_unreturned_tax} tableau_district_unreturned_tax=${tableau_district_unreturned_tax}
......
atms-web/src/main/resources/conf_profile_dev.properties
View file @ 2cae0400
...@@ -23,51 +23,53 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi ...@@ -23,51 +23,53 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区未返还税金 #地区未返还税金
tableau_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#未返还/返还后税金比较 #未返还/返还后税金比较
tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#费用分析 #费用分析
tableau_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区利润总额 / 亏损额 #地区利润总额 / 亏损额
tableau_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#公司利润总额 / 亏损额 #公司利润总额 / 亏损额
tableau_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#司机 / 员工人数 #司机 / 员工人数
tableau_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#档案归档情况 #档案归档情况
tableau_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税全球概覧 #国际税全球概覧
tableau_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税业务数据 #国际税业务数据
tableau_global_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#墨西哥税务分析 #墨西哥税务分析
tableau_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#澳洲税务分析 #澳洲税务分析
tableau_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#巴西税务分析 #巴西税务分析
tableau_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#其他税务分析 #其他税务分析
tableau_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no #tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
#tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no #tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
......
atms-web/src/main/resources/conf_profile_pub.properties
View file @ 2cae0400
...@@ -21,48 +21,49 @@ longi_api_basic_pwd= ...@@ -21,48 +21,49 @@ longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区未返还税金 #地区未返还税金
tableau_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#未返还/返还后税金比较 #未返还/返还后税金比较
tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#费用分析 #费用分析
tableau_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区利润总额 / 亏损额 #地区利润总额 / 亏损额
tableau_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#公司利润总额 / 亏损额 #公司利润总额 / 亏损额
tableau_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#司机 / 员工人数 #司机 / 员工人数
tableau_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#档案归档情况 #档案归档情况
tableau_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税全球概覧 #国际税全球概覧
tableau_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税业务数据 #国际税业务数据
tableau_global_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#墨西哥税务分析 #墨西哥税务分析
tableau_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#澳洲税务分析 #澳洲税务分析
tableau_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#巴西税务分析 #巴西税务分析
tableau_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#其他税务分析 #其他税务分析
tableau_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
atms-web/src/main/resources/conf_profile_staging.properties
View file @ 2cae0400
...@@ -22,48 +22,49 @@ longi_api_basic_pwd= ...@@ -22,48 +22,49 @@ longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区未返还税金 #地区未返还税金
tableau_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#未返还/返还后税金比较 #未返还/返还后税金比较
tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#费用分析 #费用分析
tableau_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区利润总额 / 亏损额 #地区利润总额 / 亏损额
tableau_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#公司利润总额 / 亏损额 #公司利润总额 / 亏损额
tableau_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#司机 / 员工人数 #司机 / 员工人数
tableau_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#档案归档情况 #档案归档情况
tableau_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税全球概覧 #国际税全球概覧
tableau_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税业务数据 #国际税业务数据
tableau_global_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#墨西哥税务分析 #墨西哥税务分析
tableau_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#澳洲税务分析 #澳洲税务分析
tableau_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#巴西税务分析 #巴西税务分析
tableau_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#其他税务分析 #其他税务分析
tableau_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
atms-web/src/main/resources/conf_profile_uat.properties
View file @ 2cae0400
...@@ -21,48 +21,49 @@ longi_api_basic_pwd= ...@@ -21,48 +21,49 @@ longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区未返还税金 #地区未返还税金
tableau_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#未返还/返还后税金比较 #未返还/返还后税金比较
tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#费用分析 #费用分析
tableau_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区利润总额 / 亏损额 #地区利润总额 / 亏损额
tableau_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#公司利润总额 / 亏损额 #公司利润总额 / 亏损额
tableau_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#司机 / 员工人数 #司机 / 员工人数
tableau_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#档案归档情况 #档案归档情况
tableau_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税全球概覧 #国际税全球概覧
tableau_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税业务数据 #国际税业务数据
tableau_global_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#墨西哥税务分析 #墨西哥税务分析
tableau_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#澳洲税务分析 #澳洲税务分析
tableau_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#巴西税务分析 #巴西税务分析
tableau_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#其他税务分析 #其他税务分析
tableau_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 2cae0400
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
"CertificateType": "证件类型", "CertificateType": "证件类型",
"IdNum": "证件号码", "IdNum": "证件号码",
"InvestmentAmount": "投资金额", "InvestmentAmount": "投资金额",
"InvestmentCurrency": "投资金额币种", "InvestmentCurrency": "投资币种",
"InvestmentRadio": "投资比例", "InvestmentRadio": "投资比例",
"PayableShareholderName": "实缴投资方信息", "PayableShareholderName": "实缴投资方信息",
"PayableShareholderIdNum": "证件编号", "PayableShareholderIdNum": "证件编号",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 2cae0400
...@@ -296,13 +296,13 @@ ...@@ -296,13 +296,13 @@
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "investmentAmount", dataField: "investmentCurrency",
caption: $translate.instant('InvestmentAmount'), caption: $translate.instant('InvestmentCurrency'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "investmentCurrency", dataField: "investmentAmount",
caption: $translate.instant('InvestmentCurrency'), caption: $translate.instant('InvestmentAmount'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
...@@ -317,17 +317,18 @@ ...@@ -317,17 +317,18 @@
}, },
{ {
dataField: "payableShareholderIdNum", dataField: "payableShareholderIdNum",
visible : false,
caption: $translate.instant('PayableShareholderIdNum'), caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "payableCapitalContributionAmount", dataField: "payableCapitalContributionCurrency",
caption: $translate.instant('PayableCapitalContributionAmount'), caption: $translate.instant('PayableCapitalContributionCurrency'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "payableCapitalContributionCurrency", dataField: "payableCapitalContributionAmount",
caption: $translate.instant('PayableCapitalContributionCurrency'), caption: $translate.instant('PayableCapitalContributionAmount'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
...@@ -598,6 +599,7 @@ ...@@ -598,6 +599,7 @@
}, },
{ {
dataField: "payableShareholderIdNum", dataField: "payableShareholderIdNum",
visible : false,
caption: $translate.instant('PayableShareholderIdNum'), caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
......
atms-web/src/main/webapp/orangeweb/index.html
View file @ 2cae0400
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.2a94701c.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.2a94701c.js></script></body></html> <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.7e09d0db.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.7e09d0db.js></script></body></html>
\ No newline at end of file \ No newline at end of file
atms-web/src/test/draft.properties
View file @ 2cae0400
...@@ -80,3 +80,47 @@ ...@@ -80,3 +80,47 @@
# #
##税种未返还税金
#tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##地区未返还税金
#tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##未返还/返还后税金比较
#tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##费用分析
#tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##地区利润总额 / 亏损额
#tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##公司利润总额 / 亏损额
#tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##司机 / 员工人数
#tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##业务线GMV及补贴统计
#tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##档案归档情况
#tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##国际税全球概覧
#tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##国际税业务数据
#tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##墨西哥税务分析
#tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##澳洲税务分析
#tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##巴西税务分析
#tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#
##其他税务分析
#tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment