diff --git a/custom/public/rotation3D/rotation3D.css b/custom/public/rotation3D/rotation3D.css index 032096b48..b161708a1 100755 --- a/custom/public/rotation3D/rotation3D.css +++ b/custom/public/rotation3D/rotation3D.css @@ -29,7 +29,7 @@ } .rotation3D__item .scale{ position: absolute; top: 0; width: 100%; height: 100%; } .rotation3D__item .cont{ position: relative; z-index: 2; } -.rotation3D__item .cont .iconfont { font-size: 28px; margin-top: 30px; margin-bottom: 96px; display: block; } +.rotation3D__item .cont .iconfont { font-size: 28px; margin-top: 30px; margin-bottom: 96px; display: block; height: 35px;} .rotation3D__item .cont p{ color: #101010; } .itemList .rotation3D__item .cont p::after{ font-size: 12px; @@ -40,6 +40,7 @@ margin-top: 60px; color: #101010; } +/* .itemList .rotation3D__item:nth-child(1) .cont p::after{ content: "鹏城云脑一号"; } @@ -73,7 +74,7 @@ .itemList .rotation3D__item:nth-child(11) .cont p::after{ content: "国家超级计算济南中心"; } - +*/ .rotation3D__item.blue{ color: #01e9fc; } .rotation3D__item.green{ color: #b4b3ca; } .rotation3D__item.yellow{ color: #ffd200; } @@ -139,6 +140,7 @@ position: absolute; font-size: 12px; color: #888; + white-space: nowrap; transform: rotate(180deg)scale(0.80); } diff --git a/public/home/home.js b/public/home/home.js index 95ea3da4c..d1733208b 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -119,7 +119,7 @@ document.onreadystatechange = function () { continue; } } - refresh3DInfo(record); + //refresh3DInfo(record); var recordPrefix = getMsg(record); if(record.OpType == "6" || record.OpType == "10" || record.OpType == "12" || record.OpType == "13"){ html += recordPrefix + actionName; @@ -211,16 +211,18 @@ function getTaskLink(record){ function refresh3DInfo(record){ if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){ //cloudbrain one - var lines = $('.rotation3D__line'); + //var lines = $('.rotation3D__line'); var span = $('.rotation3D__line').find("span")[0]; //console.log(span); - span.innerText =record.RefName; + if(span != null){ + span.innerText =record.RefName; + } //$('.rotation3D__line').find("span").eq(0).text(record.RefName) //console.log("cloudbrain one line length=" + lines.length); //lines[0].find("span").text(record.RefName); }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ //cloudbrain two - var lines = $('.rotation3D__line'); + //var lines = $('.rotation3D__line'); //console.log("cloudbrain two line length=" + lines.length); var span = $('.rotation3D__line').find("span")[1]; //console.log(span); diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 802854716..dd3fee8e5 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -51,10 +51,65 @@ {{end}} diff --git a/templates/home.tmpl b/templates/home.tmpl index 36210d336..c1f563d27 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -94,12 +94,6 @@
-