Commit 5822aab5 authored by 刘明珠's avatar 刘明珠

Merge branch 'integrateFirst' of http://114.115.168.181/lushihao/zxtb_to_ssfwpt into integrateFirst

parents a367758b 7f931ed2
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</script> </script>
</body> </body>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script> <script type="text/javascript" src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script> <script type="text/javascript" src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script src="/web/onlineReport/static/biz/amend_grid.js?v=1.0"></script> <script src="/web/onlineReport/static/biz/amend_grid.js?v=1.0"></script>
<script> <script>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script src="/web/onlineReport/static/biz/cancellation_grid.js?v=1.0"></script> <script src="/web/onlineReport/static/biz/cancellation_grid.js?v=1.0"></script>
<script> <script>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script> <script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script>
<script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script> <script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<!-- 生成的资源文件 --> <!-- 生成的资源文件 -->
<!-- TODO 此处需要将路径调整为对应引用的地址--> <!-- TODO 此处需要将路径调整为对应引用的地址-->
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script src="/web/onlineReport/static/biz/declare_grid.js?v=1.0"></script> <script src="/web/onlineReport/static/biz/declare_grid.js?v=1.0"></script>
<script> <script>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<script src="/web/onlineReport/static/js/jquery.min.js"></script> <script src="/web/onlineReport/static/js/jquery.min.js"></script>
<!-- 工程文件 --> <!-- 工程文件 -->
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script> <script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script>
<script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script> <script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<link href="/web/onlineReport/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" /> <link href="/web/onlineReport/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" />
<script src="/web/onlineReport/static/js/jquery.min.js"></script> <script src="/web/onlineReport/static/js/jquery.min.js"></script>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<!-- 工程文件 --> <!-- 工程文件 -->
<script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script> <script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</div> </div>
</body> </body>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script> <script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script> <script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">")
</script> </script>
<script src="/web/onlineReport/static/biz/overdue_grid.js?v=1.0"></script> <script src="/web/onlineReport/static/biz/overdue_grid.js?v=1.0"></script>
<script> <script>
......
...@@ -318,6 +318,7 @@ function initPage(companyInfo) { ...@@ -318,6 +318,7 @@ function initPage(companyInfo) {
durationOfTaxEnd = tool.formatDate(companyInfo.sbqz); durationOfTaxEnd = tool.formatDate(companyInfo.sbqz);
$("#durationOfTaxStart").attr("value", tool.formatDate(companyInfo.sbqq)); $("#durationOfTaxStart").attr("value", tool.formatDate(companyInfo.sbqq));
$("#durationOfTaxEnd").attr("value", tool.formatDate(companyInfo.sbqz)); $("#durationOfTaxEnd").attr("value", tool.formatDate(companyInfo.sbqz));
pagingDataFun(companyInfo.gzTaxInfos,1,initPagingNum); newData = companyInfo.gzTaxInfos
pagingDataFun(newData,1,initPagingNum);
return {} return {}
} }
\ No newline at end of file
...@@ -13,8 +13,10 @@ function getUrlParam (name) { ...@@ -13,8 +13,10 @@ function getUrlParam (name) {
} }
// 公共配置 // 公共配置
var config = { var config = {
// webUrl:"http://sbjs.tjsat.gov.cn:8088/web/onlineReport/jsp/", // webUrl:"http://sbjs.tjsat.gov.cn:18001/web/onlineReport/jsp/", // 测试环境/生产环境
webUrl:"http://localhost:8088/web/onlineReport/jsp/", webUrl:"http://localhost:8088/web/onlineReport/jsp/", // 开发环境
url:"",// 开发环境配置跨域设置 url:"",// 开发环境配置跨域设置 // 开发环境
// url:"",// 开发环境配置跨域设置 // 开发环境// 测试环境/生产环境
spreadUrl:"sbjs.tjsat.gov.cn:18001",// 注册地址
} }
...@@ -84,6 +84,11 @@ function initPage(companyInfo) { ...@@ -84,6 +84,11 @@ function initPage(companyInfo) {
}, },
jsonReady: ddt, jsonReady: ddt,
callback: function(data, node) { callback: function(data, node) {
console.log(data);
if(data.sbzt=="Y"){
myAlert("提示", "当前申报表已经申报", "确定")
return false;
}
if (data.sourceFlag=="ssfwpt_sbzj") { if (data.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = { window.mlistener = {
selectRowData: {}, selectRowData: {},
......
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
* @Date 19:43 2020/6/12
* @Param
* @return
**/
function getUrlParam (name) {
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
var r = window.location.search.substr(1).match(reg);
if (r != null) return decodeURIComponent(r[2]);
return null;
}
// 公共配置
var config = {
// webUrl:"http://sbjs.tjsat.gov.cn:18001/web/onlineReport/jsp/", // 测试环境/生产环境
webUrl:"http://localhost:8088/web/onlineReport/jsp/", // 开发环境
url:"",// 开发环境配置跨域设置 // 开发环境
// url:"",// 开发环境配置跨域设置 // 开发环境// 测试环境/生产环境
spreadUrl:"sbjs.tjsat.gov.cn:18001",// 注册地址
}
...@@ -37,10 +37,8 @@ window.onload = function () { ...@@ -37,10 +37,8 @@ window.onload = function () {
getIEVersion(); getIEVersion();
var url = window.location.host; var url = window.location.host;
//把sbjs.tjsat.gov.cn:18080,替换成 sbjs.tjsat.gov.cn:8088 //把sbjs.tjsat.gov.cn:18080,替换成 sbjs.tjsat.gov.cn:8088
if("sbjs.tjsat.gov.cn:8088" == url){ if(config.spreadUrl == url){
GC.Spread.Sheets.LicenseKey = "sbjs.tjsat.gov.cn,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR"; GC.Spread.Sheets.LicenseKey = "sbjs.tjsat.gov.cn,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR";
}else if("192.168.105.153:8088" == url){
GC.Spread.Sheets.LicenseKey = "192.168.105.153:8088,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR";
}else{ }else{
GC.Spread.Sheets.LicenseKey = "etax.tianjin.chinatax.gov.cn,498254719314719#B0WY39GZUNVZFpUQtZXVxFTRzYkQFtEbvVHRvgDb03yNXljc6R4KqtiTrFUYCF6RhdFTPhTOzpmeCRne7ZXRWVWV9MlUo34NlFDTVp6dyt4TVV7c8pERk94Uml4Y0JDcrsyYyFWbNVzcwsGRslndxw6Yy54SiJDVVZnajZVRXpmTnVVMGJGZ42GRolTSPpkea9mNxITT5YmapRHSN3iZrYWYDhXav3GOnd5LLBXYrd4badlcxwWbElFWzgmZsdWU4JVaYV6bmdWYudDVhR7KhJEOhJnQw4EbKxEdvk4NiZTWmpnN7cVY9tmd9VGZEdzSZZTai9UO8BTYqVkbppWSiojITJCLiYDOEZ4MDJzMiojIIJCL8YzN7MzN8kjM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI5MDM4kDMgMjM7ATOxAjMiojI4J7QiwiIuNmL636ZugXY4Fmbph6Yu8Waq9WYpRnL8FGdlJiOiMXbEJCLig1jlzahlDZmpnInmDoimH9pnnKplnatm19tl1ZpnXKtmnKplLiOiEmTDJCLikTM7QTMzkTM7QTNygTO4IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPBJGc9IFVrJFNwQDZ0tWUKpmS9kHUmZmN6YzZwcFeahEaNNWWmRmMTdVRFxWNRZTcwQzSpt4dthTNHhUbxATNj9Gdp3kNs3mcXZUZDFVQTt6aJJUO6diSM9"; GC.Spread.Sheets.LicenseKey = "etax.tianjin.chinatax.gov.cn,498254719314719#B0WY39GZUNVZFpUQtZXVxFTRzYkQFtEbvVHRvgDb03yNXljc6R4KqtiTrFUYCF6RhdFTPhTOzpmeCRne7ZXRWVWV9MlUo34NlFDTVp6dyt4TVV7c8pERk94Uml4Y0JDcrsyYyFWbNVzcwsGRslndxw6Yy54SiJDVVZnajZVRXpmTnVVMGJGZ42GRolTSPpkea9mNxITT5YmapRHSN3iZrYWYDhXav3GOnd5LLBXYrd4badlcxwWbElFWzgmZsdWU4JVaYV6bmdWYudDVhR7KhJEOhJnQw4EbKxEdvk4NiZTWmpnN7cVY9tmd9VGZEdzSZZTai9UO8BTYqVkbppWSiojITJCLiYDOEZ4MDJzMiojIIJCL8YzN7MzN8kjM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI5MDM4kDMgMjM7ATOxAjMiojI4J7QiwiIuNmL636ZugXY4Fmbph6Yu8Waq9WYpRnL8FGdlJiOiMXbEJCLig1jlzahlDZmpnInmDoimH9pnnKplnatm19tl1ZpnXKtmnKplLiOiEmTDJCLikTM7QTMzkTM7QTNygTO4IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPBJGc9IFVrJFNwQDZ0tWUKpmS9kHUmZmN6YzZwcFeahEaNNWWmRmMTdVRFxWNRZTcwQzSpt4dthTNHhUbxATNj9Gdp3kNs3mcXZUZDFVQTt6aJJUO6diSM9";
} }
......
...@@ -253,7 +253,7 @@ function dateProcessing(type) { ...@@ -253,7 +253,7 @@ function dateProcessing(type) {
//封装等待框 调用方式:showLoading();hideLoading(); //封装等待框 调用方式:showLoading();hideLoading();
(function ($) { (function ($) {
var renderHtml = function renderHtml() { var renderHtml = function renderHtml() {
var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #000000;opacity:0.4;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading1.gif" /></div></div>'; var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading2.gif" /></div></div>';
$("body").append(_html); $("body").append(_html);
}; };
renderHtml(); renderHtml();
......
...@@ -44,7 +44,7 @@ window.onload = function () { ...@@ -44,7 +44,7 @@ window.onload = function () {
getIEVersion(); getIEVersion();
localStorage.removeItem("isZcfxFlag"); localStorage.removeItem("isZcfxFlag");
var url = window.location.host; var url = window.location.host;
if("sbjs.tjsat.gov.cn:18080" == url){ if(config.spreadUrl == url){
GC.Spread.Sheets.LicenseKey = "sbjs.tjsat.gov.cn,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR"; GC.Spread.Sheets.LicenseKey = "sbjs.tjsat.gov.cn,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR";
}else{ }else{
GC.Spread.Sheets.LicenseKey = "etax.tianjin.chinatax.gov.cn,498254719314719#B0WY39GZUNVZFpUQtZXVxFTRzYkQFtEbvVHRvgDb03yNXljc6R4KqtiTrFUYCF6RhdFTPhTOzpmeCRne7ZXRWVWV9MlUo34NlFDTVp6dyt4TVV7c8pERk94Uml4Y0JDcrsyYyFWbNVzcwsGRslndxw6Yy54SiJDVVZnajZVRXpmTnVVMGJGZ42GRolTSPpkea9mNxITT5YmapRHSN3iZrYWYDhXav3GOnd5LLBXYrd4badlcxwWbElFWzgmZsdWU4JVaYV6bmdWYudDVhR7KhJEOhJnQw4EbKxEdvk4NiZTWmpnN7cVY9tmd9VGZEdzSZZTai9UO8BTYqVkbppWSiojITJCLiYDOEZ4MDJzMiojIIJCL8YzN7MzN8kjM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI5MDM4kDMgMjM7ATOxAjMiojI4J7QiwiIuNmL636ZugXY4Fmbph6Yu8Waq9WYpRnL8FGdlJiOiMXbEJCLig1jlzahlDZmpnInmDoimH9pnnKplnatm19tl1ZpnXKtmnKplLiOiEmTDJCLikTM7QTMzkTM7QTNygTO4IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPBJGc9IFVrJFNwQDZ0tWUKpmS9kHUmZmN6YzZwcFeahEaNNWWmRmMTdVRFxWNRZTcwQzSpt4dthTNHhUbxATNj9Gdp3kNs3mcXZUZDFVQTt6aJJUO6diSM9"; GC.Spread.Sheets.LicenseKey = "etax.tianjin.chinatax.gov.cn,498254719314719#B0WY39GZUNVZFpUQtZXVxFTRzYkQFtEbvVHRvgDb03yNXljc6R4KqtiTrFUYCF6RhdFTPhTOzpmeCRne7ZXRWVWV9MlUo34NlFDTVp6dyt4TVV7c8pERk94Uml4Y0JDcrsyYyFWbNVzcwsGRslndxw6Yy54SiJDVVZnajZVRXpmTnVVMGJGZ42GRolTSPpkea9mNxITT5YmapRHSN3iZrYWYDhXav3GOnd5LLBXYrd4badlcxwWbElFWzgmZsdWU4JVaYV6bmdWYudDVhR7KhJEOhJnQw4EbKxEdvk4NiZTWmpnN7cVY9tmd9VGZEdzSZZTai9UO8BTYqVkbppWSiojITJCLiYDOEZ4MDJzMiojIIJCL8YzN7MzN8kjM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI5MDM4kDMgMjM7ATOxAjMiojI4J7QiwiIuNmL636ZugXY4Fmbph6Yu8Waq9WYpRnL8FGdlJiOiMXbEJCLig1jlzahlDZmpnInmDoimH9pnnKplnatm19tl1ZpnXKtmnKplLiOiEmTDJCLikTM7QTMzkTM7QTNygTO4IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPBJGc9IFVrJFNwQDZ0tWUKpmS9kHUmZmN6YzZwcFeahEaNNWWmRmMTdVRFxWNRZTcwQzSpt4dthTNHhUbxATNj9Gdp3kNs3mcXZUZDFVQTt6aJJUO6diSM9";
......
...@@ -237,7 +237,7 @@ function dateProcessing(type) { ...@@ -237,7 +237,7 @@ function dateProcessing(type) {
//封装等待框 调用方式:showLoading();hideLoading(); //封装等待框 调用方式:showLoading();hideLoading();
(function ($) { (function ($) {
var renderHtml = function renderHtml() { var renderHtml = function renderHtml() {
var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #000000;opacity:0.4;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading1.gif" /></div></div>'; var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #000000;opacity:0.4;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading2.gif" /></div></div>';
$("body").append(_html); $("body").append(_html);
}; };
renderHtml(); renderHtml();
......
...@@ -45,7 +45,7 @@ var jwList = []; ...@@ -45,7 +45,7 @@ var jwList = [];
window.onload = function () { window.onload = function () {
getIEVersion(); getIEVersion();
var url = window.location.host; var url = window.location.host;
if("sbjs.tjsat.gov.cn:18080" == url){ if(config.spreadUrl == url){
GC.Spread.Sheets.LicenseKey = "sbjs.tjsat.gov.cn,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR"; GC.Spread.Sheets.LicenseKey = "sbjs.tjsat.gov.cn,736922629637688#B0LBLdFREewVjRiZFNIdmWjtUWldkRhVWa9oFMLNlTwg4UUVTNjtUW0RXcwR5R6EnTIZTRNpXUBB7L0RWciRmaUlnUwQlTLFlYiNkMSFWaxI7bBBzc0VHOFF5M9pXSoRkQPhmZlRUewMncNBXSXZVTV36dSJVS0tEb5lnWI5mNxNzMwYEU7cnMRRUc6xmYF3GakpWYwckVF3mSsJWYlRlb6U6cZpFTGVzYhN7cjx6LphTQOFVSPxUdZVTU5pEeNhDZutmQPZFT6FEdONmc926YCl4drAlNx3Ud8o5LOhGOjJzaPJ4YUtmbx8maiJiOiMlIsIyMDdTRwYER4IiOigkIsEjN6ETO8EzM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIxQDO4gDMggTMyEDOxAjMiojI4J7QiwiIuNmL636ZuQXYzpGduMnaiNnI0IyctRkIsICnCeOqZa+r+SuI0ISYONkIsICO8YzNzYTOyYjMykjNzcjI0ICZJJCL3V6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXdOBVZwEVZ9V5V7dnTllFSVpHVYd5UZl6a6tUQ6hUQX36NTFVNKhHNC5USDlVOJBVWlJWRq3ERqJDWth7TyMmVnV7QjZWWzNXcxokewYTeBhXOFZnVBhWStt6SsB7TTJkUV3UTGlHSNRWR";
}else{ }else{
GC.Spread.Sheets.LicenseKey = "etax.tianjin.chinatax.gov.cn,498254719314719#B0WY39GZUNVZFpUQtZXVxFTRzYkQFtEbvVHRvgDb03yNXljc6R4KqtiTrFUYCF6RhdFTPhTOzpmeCRne7ZXRWVWV9MlUo34NlFDTVp6dyt4TVV7c8pERk94Uml4Y0JDcrsyYyFWbNVzcwsGRslndxw6Yy54SiJDVVZnajZVRXpmTnVVMGJGZ42GRolTSPpkea9mNxITT5YmapRHSN3iZrYWYDhXav3GOnd5LLBXYrd4badlcxwWbElFWzgmZsdWU4JVaYV6bmdWYudDVhR7KhJEOhJnQw4EbKxEdvk4NiZTWmpnN7cVY9tmd9VGZEdzSZZTai9UO8BTYqVkbppWSiojITJCLiYDOEZ4MDJzMiojIIJCL8YzN7MzN8kjM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI5MDM4kDMgMjM7ATOxAjMiojI4J7QiwiIuNmL636ZugXY4Fmbph6Yu8Waq9WYpRnL8FGdlJiOiMXbEJCLig1jlzahlDZmpnInmDoimH9pnnKplnatm19tl1ZpnXKtmnKplLiOiEmTDJCLikTM7QTMzkTM7QTNygTO4IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPBJGc9IFVrJFNwQDZ0tWUKpmS9kHUmZmN6YzZwcFeahEaNNWWmRmMTdVRFxWNRZTcwQzSpt4dthTNHhUbxATNj9Gdp3kNs3mcXZUZDFVQTt6aJJUO6diSM9"; GC.Spread.Sheets.LicenseKey = "etax.tianjin.chinatax.gov.cn,498254719314719#B0WY39GZUNVZFpUQtZXVxFTRzYkQFtEbvVHRvgDb03yNXljc6R4KqtiTrFUYCF6RhdFTPhTOzpmeCRne7ZXRWVWV9MlUo34NlFDTVp6dyt4TVV7c8pERk94Uml4Y0JDcrsyYyFWbNVzcwsGRslndxw6Yy54SiJDVVZnajZVRXpmTnVVMGJGZ42GRolTSPpkea9mNxITT5YmapRHSN3iZrYWYDhXav3GOnd5LLBXYrd4badlcxwWbElFWzgmZsdWU4JVaYV6bmdWYudDVhR7KhJEOhJnQw4EbKxEdvk4NiZTWmpnN7cVY9tmd9VGZEdzSZZTai9UO8BTYqVkbppWSiojITJCLiYDOEZ4MDJzMiojIIJCL8YzN7MzN8kjM0IicfJye35XX3JSSGljQiojIDJCLiITMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI5MDM4kDMgMjM7ATOxAjMiojI4J7QiwiIuNmL636ZugXY4Fmbph6Yu8Waq9WYpRnL8FGdlJiOiMXbEJCLig1jlzahlDZmpnInmDoimH9pnnKplnatm19tl1ZpnXKtmnKplLiOiEmTDJCLikTM7QTMzkTM7QTNygTO4IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPBJGc9IFVrJFNwQDZ0tWUKpmS9kHUmZmN6YzZwcFeahEaNNWWmRmMTdVRFxWNRZTcwQzSpt4dthTNHhUbxATNj9Gdp3kNs3mcXZUZDFVQTt6aJJUO6diSM9";
......
...@@ -238,7 +238,7 @@ function dateProcessing(type) { ...@@ -238,7 +238,7 @@ function dateProcessing(type) {
//封装等待框 调用方式:showLoading();hideLoading(); //封装等待框 调用方式:showLoading();hideLoading();
(function ($) { (function ($) {
var renderHtml = function renderHtml() { var renderHtml = function renderHtml() {
var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #000000;opacity:0.4;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading1.gif" /></div></div>'; var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #000000;opacity:0.4;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading2.gif" /></div></div>';
$("body").append(_html); $("body").append(_html);
}; };
renderHtml(); renderHtml();
......
...@@ -45,7 +45,7 @@ function getIEVersion() { ...@@ -45,7 +45,7 @@ function getIEVersion() {
//封装等待框 //封装等待框
(function($) { (function($) {
var renderHtml = function() { var renderHtml = function() {
var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #f5f5f5;opacity:0.5;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading1.gif" /></div></div>'; var _html = '<div id="loadingDiv" style="display: none; cursor:progress;"><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #f5f5f5;opacity:0.5;z-index: 9999991;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%; z-index: 9999999;text-align:center;"><img id="showloading" src="/web/onlineReport/static/tools/images/loading2.gif" /></div></div>';
$("body").append(_html); $("body").append(_html);
} }
renderHtml(); renderHtml();
...@@ -1191,7 +1191,7 @@ var JSTOOL = function() { ...@@ -1191,7 +1191,7 @@ var JSTOOL = function() {
function init() { function init() {
var $loading = $("<div></div>"); var $loading = $("<div></div>");
$loading.addClass("table-body-loading"); $loading.addClass("table-body-loading");
$loading.html("<div> <img src='/web/onlineReport/static/tools/images/loading.gif' alt=''/><div>"); $loading.html("<div> <img src='/web/onlineReport/static/tools/images/loading2.gif' alt=''/><div>");
var html = "<div class='table-responsive' style='width:" + tableObj.containerWidth + "'>" + var html = "<div class='table-responsive' style='width:" + tableObj.containerWidth + "'>" +
"<div class='table-header-container' style='height:44px;'>" "<div class='table-header-container' style='height:44px;'>"
......
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