Bladeren bron

企业社区

wangchuanjin 9 jaren geleden
bovenliggende
commit
84a8f5687c

+ 3 - 1
core/src/web/staticres/js/entportrait.js

@@ -92,7 +92,7 @@ function initRelation(){
 					$(".entrelation").css("height","auto");
 				}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
 					relationNoData();
-				}else{
+				}else if(r.flag == true){
 					$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 					loadJS("/js/d3.v3.min.js",function(){
 						loadJS("/js/geometry.js",function(){
@@ -102,6 +102,8 @@ function initRelation(){
 							});
 						});
 					});
+				}else{
+					relationNoData();
 				}
 			},
 			error: function(){

+ 3 - 3
core/src/web/staticres/js/qfw.js

@@ -166,10 +166,10 @@ dateFormat.i18n = {
 };
 
 // For convenience...
-Date.prototype.Format = function (mask, utc) {
+Date.prototype.FormatEnhance = function (mask, utc) {
 	return dateFormat(this, mask, utc);
 };
-/*Date.prototype.Format = function (fmt) { //author: meizz 
+Date.prototype.Format = function (fmt) { //author: meizz 
     var o = {
         "M+": this.getMonth() + 1, //月份 
         "d+": this.getDate(), //日 
@@ -183,7 +183,7 @@ Date.prototype.Format = function (mask, utc) {
     for (var k in o)
     if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
     return fmt;
-}*/
+}
 //浏览器窗口大小变化重新加载
 window.onresize=webSiteInit;
 serializeObject = function(form) {

+ 2 - 2
core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -326,13 +326,13 @@
 					{{range $k,$v := .T.res.alterInfo}}
 						<li>
 							<div>
-								<div><script>document.write(new Date({{$v.AltDate}}).Format("yyyy-MM-dd hh:mm:ss"));</script></div>
+								<div><script>document.write(new Date({{$v.AltDate}}).FormatEnhance("yyyy-mm-dd HH:MM:ss"));</script></div>
 								<div>{{$v.AltItemName}}</div>
 								<div>变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}</div>
 								<a></a>
 							</div>
 							<div>
-								<div><script>document.write(new Date({{$v.AltDate}}).Format("yyyy-MM-dd hh:mm:ss"));</script></div>
+								<div><script>document.write(new Date({{$v.AltDate}}).FormatEnhance("yyyy-mm-dd HH:MM:ss"));</script></div>
 								<div>{{$v.AltItemName}}</div>
 								<div>变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}</div>
 								<a></a>