From 707ea6f3ba77213bb21c239936d39acf6cc337ef Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Jul 2022 16:57:09 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/base/footer.tmpl | 34 ++++++++++++++++++++++++++++++++++ templates/home.tmpl | 6 ------ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 802854716..375e63aa5 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -51,10 +51,40 @@ {{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 @@
-
From f794775e440500243ae04e315b7b4fc40dbacf46 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 09:18:29 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/rotation3D/rotation3D.css | 3 ++- templates/base/footer.tmpl | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/custom/public/rotation3D/rotation3D.css b/custom/public/rotation3D/rotation3D.css index 032096b48..9590cb45f 100755 --- a/custom/public/rotation3D/rotation3D.css +++ b/custom/public/rotation3D/rotation3D.css @@ -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; } diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 375e63aa5..b33fd1cb8 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -115,9 +115,15 @@ }, methods: {}, }); - var pArrays = $('.itemList').find("p"); - console.log(pArrays.length); + $(document).ready(function(){ + var pArrays = $('.itemList').find("p"); + console.log(pArrays.length); + for(var i=0;i {{end}} From 58a939313a869a13fe5d7e1b02ddab2485f20b8b Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 09:29:57 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/home.js | 8 +++++--- templates/base/footer.tmpl | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 95ea3da4c..74cfde9c8 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -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 b33fd1cb8..eb46db12b 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -121,7 +121,7 @@ for(var i=0;i From a4cdbabf49859c8b22d45945c643226c860d99d9 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 09:40:12 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/base/footer.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index eb46db12b..a15a2a766 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -121,7 +121,7 @@ for(var i=0;i From 54f58ca237605f854c333ad157103c607528d188 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 09:51:45 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/base/footer.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index a15a2a766..333f87471 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -73,6 +73,7 @@ tmp["name"]=json[i].name; tmp["type"]="green"; tmp["icon"]=""; + tmp["content"]=json[i].content; serverItemList.push(tmp); } } From 3623badba1f848da22f84bea9f3bc407956bc938 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 10:11:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/rotation3D/rotation3D.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/public/rotation3D/rotation3D.css b/custom/public/rotation3D/rotation3D.css index 9590cb45f..0628691e9 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; From 640e2b568ddd4dcbdcbdb2e6bb35531c5d55023f Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 10:46:00 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/home.js | 2 +- templates/base/footer.tmpl | 39 +++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 74cfde9c8..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; diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 333f87471..721743f46 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -51,7 +51,27 @@ {{end}} From a877b00e4ac6f43462f36653ffa85d5f66536858 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 11:00:24 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/rotation3D/rotation3D.css | 1 + 1 file changed, 1 insertion(+) diff --git a/custom/public/rotation3D/rotation3D.css b/custom/public/rotation3D/rotation3D.css index 0628691e9..b161708a1 100755 --- a/custom/public/rotation3D/rotation3D.css +++ b/custom/public/rotation3D/rotation3D.css @@ -140,6 +140,7 @@ position: absolute; font-size: 12px; color: #888; + white-space: nowrap; transform: rotate(180deg)scale(0.80); } From 8354fc5cf613e41382838410a533b221279be4ea Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Jul 2022 11:15:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/base/footer.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 721743f46..dd3fee8e5 100755 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -149,7 +149,7 @@ p.innerText=serverItemList[i].content; } - var lines=$('.rotation3D__line').find("span"); + var lines=$('.lineList').find("span"); console.log("lines length=" + lines.length); for(var i=0; i< lines.length;i++){