Skip to content

T
tl_estate
Commit d40bae2a authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 285ea72a 9c86f53a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 4 deletions
application/index/view/global/footer_tpl.html
View file @ d40bae2a
<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190806' charset='utf-8'></script> <script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=201908066' charset='utf-8'></script>
application/index/view/realtime/performanceContrast.html
View file @ d40bae2a
...@@ -73,7 +73,23 @@ ...@@ -73,7 +73,23 @@
.btn4{ .btn4{
width: 123px!important; width: 123px!important;
} }
/*加载图标*/
#main_loading_pic {
position: fixed;
top: 35%;
left: 25%;
width: 100px;
height: 100px;
margin-left: 50px;
margin-top: -150px;
overflow: hidden;
display: none;
}
</style> </style>
<!--加载图标-->
<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
...@@ -266,3 +282,8 @@ ...@@ -266,3 +282,8 @@
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--加载图标-->
<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div>
\ No newline at end of file
public/app/dist/index.html
View file @ d40bae2a
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.eaca28194c0fd013291b8a11e6c040cd.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.a25e7034de7012e8885f.js></script><script type=text/javascript src=./static/js/vendor.ca5321463e03f20621f6.js></script><script type=text/javascript src=./static/js/app.13e2dc8823e03d7d1e06.js></script></body></html> })(document, window);</script><link href=./static/css/app.eaca28194c0fd013291b8a11e6c040cd.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.e4c303eb949c30b84636.js></script><script type=text/javascript src=./static/js/vendor.ca5321463e03f20621f6.js></script><script type=text/javascript src=./static/js/app.69b24c649d91e65c626f.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/js/10.2d94cc4bac450a7e4362.js 0 → 100644
View file @ d40bae2a
This diff is collapsed.
public/app/dist/static/js/11.b8a7e75255f0c933e14c.js 0 → 100644
View file @ d40bae2a
This diff is collapsed.
public/app/dist/static/js/12.5a4da3caaba10369647a.js 0 → 100644
View file @ d40bae2a
This diff is collapsed.
public/app/dist/static/js/20.94d06ea6c9430cdefd36.js 0 → 100644
View file @ d40bae2a
This diff is collapsed.
public/app/dist/static/js/app.69b24c649d91e65c626f.js 0 → 100644
View file @ d40bae2a
This diff is collapsed.
public/app/dist/static/js/manifest.e4c303eb949c30b84636.js 0 → 100644
View file @ d40bae2a
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={44:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"fb1417db99e6f70a5aee",1:"74df5841e715513f7290",2:"7d42d73f65f9dfbe9487",3:"78112db49f5365a73b94",4:"7858c19b241848097d79",5:"4b7f2ab58185b97d9980",6:"e759a6e39ebb0359e009",7:"d90434518141428258bc",8:"129ae98069a9feeca09b",9:"92134a715365f7113c05",10:"2d94cc4bac450a7e4362",11:"b8a7e75255f0c933e14c",12:"5a4da3caaba10369647a",13:"1430c6f0fa1b8a874d08",14:"715a9349b912f3416bf5",15:"0c26706e69b5a3ddac43",16:"7bc21effc47e6f4d1994",17:"eb6a6544607a13d4f7f1",18:"bf3bffb5bf3b3861157a",19:"2cd532d9082db167eb7f",20:"94d06ea6c9430cdefd36",21:"e4bee6095c5b214c49c7",22:"67d404443b81adf7f0c9",23:"d6aa3a6d13242db03701",24:"1284a8d575545453ecb7",25:"6333113a29129a4196cc",26:"10fc17823c47ff7d0a35",27:"d46b0a4410a78f5de56a",28:"938246d183d10a1b7bcd",29:"6645845ef14274dc69fc",30:"d98455b96dfe09894a2e",31:"2655bb8cdecb484a5ba4",32:"69a95623ea764eac498f",33:"f222dd11902a1dde25ee",34:"47764104791900e66d55",35:"3e83afe8c02031bfe790",36:"f220253991f0fe83bf59",37:"b65c2e44556c53f8cba1",38:"da05bb4a9488bd8ddcdb",39:"17b67b1b9e0240d8bc07",40:"492c7f9c2e5eac202cfe",41:"7600206ac02bb827fcdf"}[e]+".js";var d=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
public/appnew/src/components/performanceContrast/performanceContrast.vue
View file @ d40bae2a
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
> >
</mt-datetime-picker> </mt-datetime-picker>
</div> </div>
<div class="loading-gif-block" v-show="isLoadFlag">正在加载...</div>
</div> </div>
</template> </template>
...@@ -89,12 +90,22 @@ ...@@ -89,12 +90,22 @@
type:1, type:1,
startDate: new Date('2019-01'), startDate: new Date('2019-01'),
dataList:[], dataList:[],
isLoadFlag:false,
} }
}, },
created() { created() {
let _this = this; let _this = this;
_this.birthday0 = _this.common.getMonthDate(1).substr(0,_this.common.getMonthDate(1).length-3); _this.birthday0 = _this.common.getMonthDate(1).substr(0,_this.common.getMonthDate(1).length-3);
_this.birthday1 = _this.common.getMonthDate(1).substr(0,_this.common.getMonthDate(1).length-3); _this.birthday1 = _this.common.getMonthDate(1).substr(0,_this.common.getMonthDate(1).length-3);
_this.common.duringRequest({
'urlStr': '/index/performanceStatistics',
startAction() {
_this.isLoadFlag = true;
},
endAction() {
_this.isLoadFlag = false;
}
});
_this.ajaxUl(); _this.ajaxUl();
}, },
......
public/resource/js/performanceContrast.js
View file @ d40bae2a
...@@ -144,6 +144,9 @@ define (['doT', 'text!temp/performanceContrast_template_tpl.html','ckfinder','ck ...@@ -144,6 +144,9 @@ define (['doT', 'text!temp/performanceContrast_template_tpl.html','ckfinder','ck
async: true, async: true,
data: params, data: params,
dataType: 'json', dataType: 'json',
beforeSend: function() {
$('#main_loading_pic').show();
},
success: function (data) { success: function (data) {
var temp = document.getElementById ('performanceContrast_list_tpl').innerHTML; var temp = document.getElementById ('performanceContrast_list_tpl').innerHTML;
var doTtmpl = doT.template (temp); var doTtmpl = doT.template (temp);
...@@ -155,7 +158,10 @@ define (['doT', 'text!temp/performanceContrast_template_tpl.html','ckfinder','ck ...@@ -155,7 +158,10 @@ define (['doT', 'text!temp/performanceContrast_template_tpl.html','ckfinder','ck
} },
complete: function(xhr, textStatus) {
$('#main_loading_pic').hide();
}
}); });
}, },
}; };
......
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