Commit 388c05ed authored by liujiangnan's avatar liujiangnan

feat: 学习成果处理

parent 75f031e8
......@@ -2771,7 +2771,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "0fwdpxJaVJBLmTVogSL8Wc"
"_id": "02XM7QpsdPF7ilQ+OHR4um"
},
{
"__type__": "cc.Label",
......@@ -2804,7 +2804,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "3ftypXeDNLlZC2KMfLBDGf"
"_id": "50Iwm7ZPFOX7HR7IgQdtTt"
},
{
"__type__": "cc.PrivateNode",
......@@ -2867,7 +2867,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d2uDwiMJRE36V2FDNhEQ6E"
"_id": "a8ok8TXZZPLI9XH0sSurOZ"
},
{
"__type__": "cc.Label",
......@@ -2900,7 +2900,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f8U5dxplhCH50Cqxn2r+kg"
"_id": "35WO6bNmtJdIn7YlhfnaH4"
},
{
"__type__": "cc.PrivateNode",
......@@ -2963,7 +2963,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "458xe1xjNHy5e+o2b3aPs1"
"_id": "05JWzJiHRBK4+vMKuUcR9Q"
},
{
"__type__": "cc.Label",
......@@ -2996,7 +2996,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "54amL/D0pCN4XaS/jPpqvN"
"_id": "49rj/JEbxKpqX/m91lkLa1"
},
{
"__type__": "cc.PrivateNode",
......@@ -3059,7 +3059,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "a5AHNAraJKmoWxNt+1xCTr"
"_id": "b5Ub3OZlNN07RZ97gXIOFM"
},
{
"__type__": "cc.Label",
......@@ -3092,7 +3092,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "61NwyS4kpELqIog77++0Ew"
"_id": "66hhvfRENLb5Rf2oqN9Ju4"
},
{
"__type__": "cc.PrivateNode",
......@@ -3155,7 +3155,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "907OsFEAxJ5YKIqRH9TEaD"
"_id": "58+JEx6FdKZbGAgtQPwfSW"
},
{
"__type__": "cc.Label",
......@@ -3188,7 +3188,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "40clAC0ZNM5J0IJUd5o6ri"
"_id": "4ftm5DfmxN45Wncy3WzLUK"
},
{
"__type__": "cc.RichText",
......@@ -6369,7 +6369,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "2fKnoLQp9NYqOBsksugFl4"
"_id": "edMu7vy7JCirCJFM4tNbMq"
},
{
"__type__": "cc.Label",
......@@ -6402,7 +6402,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "31Upb5lhBC2Yb0sSCri4HH"
"_id": "9fcbwCPwFFnZGc35s1eicC"
},
{
"__type__": "cc.PrivateNode",
......@@ -6465,7 +6465,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "56ZoYbiv5G1q3f4gRvbEGF"
"_id": "40JhhWXwtMyIC5UPKSSfGl"
},
{
"__type__": "cc.Label",
......@@ -6498,7 +6498,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "a5VEApOw1JALJ0AzqHzUDD"
"_id": "6eRPl1IOFNvY5SLXxJTrQc"
},
{
"__type__": "cc.PrivateNode",
......@@ -6561,7 +6561,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "deoeaV8PhOxbYP0A9n4jzK"
"_id": "4bM8A6VJ5BS7BZifETSQGY"
},
{
"__type__": "cc.Label",
......@@ -6594,7 +6594,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "8aJG1Mk6ZM6o3q8tF1RfxO"
"_id": "82bQ/fA/VGZa7gXMMRZ8m2"
},
{
"__type__": "cc.RichText",
......@@ -7073,7 +7073,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "15jRF9iQ5D8betPe5XpTfC"
"_id": "0c8FkRoGVPYqeMfOzuVwBq"
},
{
"__type__": "cc.Label",
......@@ -7106,7 +7106,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "1d9lHJgfdGPpi3bOsHNLgV"
"_id": "f9L7IPEJ5FAb4lrjete0Um"
},
{
"__type__": "cc.PrivateNode",
......@@ -7169,7 +7169,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "cbIZL4a1tEKYSRDXO22fn5"
"_id": "db4ZY0jdlJxp+PT4HY5BO7"
},
{
"__type__": "cc.Label",
......@@ -7202,7 +7202,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "26BvLArA1NAJsHCLafKnwq"
"_id": "b3s6AS/qFE7pEml/53mesh"
},
{
"__type__": "cc.PrivateNode",
......@@ -7265,7 +7265,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "76QFhtYq5HLoQiBmk7cg30"
"_id": "b1XRXwuzNGF531iVRfCXgy"
},
{
"__type__": "cc.Label",
......@@ -7298,7 +7298,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "d3d1kYVitFV5IBL6IQ5gZL"
"_id": "5cDbW7LW9It693rFuBtjd4"
},
{
"__type__": "cc.RichText",
......@@ -7588,7 +7588,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d84PXAkGBGm5xX7m4tfT1x"
"_id": "220knRMlhGbIK3yv1HYMus"
},
{
"__type__": "cc.Label",
......@@ -7621,7 +7621,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "103tWsn3BJW62T++rHxiVS"
"_id": "7akOd7dOFGNLbYYjpyWNTL"
},
{
"__type__": "cc.PrivateNode",
......@@ -7684,7 +7684,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "21VmIyLbpInI1g0fTuwayE"
"_id": "1bch1VdGBNS54y3RvDIUzg"
},
{
"__type__": "cc.Label",
......@@ -7717,7 +7717,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "cb6/MQJXlCjqXsjPHaT++U"
"_id": "68Y62bczNBlLsd/s1QSjiH"
},
{
"__type__": "cc.PrivateNode",
......@@ -7780,7 +7780,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "feW0viNZhPh6vrTjAWCuQL"
"_id": "3ejheu3TxFl701Yp1eDoBJ"
},
{
"__type__": "cc.Label",
......@@ -7813,7 +7813,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "48WBQ4CW1MHb0BZ04bRpVs"
"_id": "27NMYpyEJNM44WKPjXFsZK"
},
{
"__type__": "cc.RichText",
......@@ -9238,7 +9238,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "b63jswrCxKjK6wyH8YYu/9"
"_id": "94b5KhyJ1Ks4zqfhJGw06H"
},
{
"__type__": "cc.Label",
......@@ -9271,7 +9271,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "5bTy2vI+lG/LN5EWQh2eGh"
"_id": "4aEzphsoRLcZsZ8H0rFVGq"
},
{
"__type__": "cc.PrivateNode",
......@@ -9334,7 +9334,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "61IApzDphE14ivCfYtxE4v"
"_id": "b1vxU7SK1DV5R93J9x9gXc"
},
{
"__type__": "cc.Label",
......@@ -9367,7 +9367,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "27AnPB3mxM87IGpv6S1UYW"
"_id": "3dZOpsP/hCQbMw6DKsum3q"
},
{
"__type__": "cc.PrivateNode",
......@@ -9430,7 +9430,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "feKddVG41JUI3QxH32gr3V"
"_id": "57x8u7i+NJtoMUSN4+hYpa"
},
{
"__type__": "cc.Label",
......@@ -9463,7 +9463,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f91eo5NQBMCY/Z/3fZo41k"
"_id": "2a2MmAZuNM5rwHzUrCmNoR"
},
{
"__type__": "cc.PrivateNode",
......@@ -9526,7 +9526,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "c3ezXetJBBqpbrJcGm70B3"
"_id": "4caMc7foVCR5VIqJJ6qe7S"
},
{
"__type__": "cc.Label",
......@@ -9559,7 +9559,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "42xDo/4J1EpLaA2DcvmQ4B"
"_id": "77V0369txBF5307d66uFJT"
},
{
"__type__": "cc.PrivateNode",
......@@ -9622,7 +9622,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "92oFm3G0NPopFPitieKT/c"
"_id": "3br83ni6pPabHCw6uONZxo"
},
{
"__type__": "cc.Label",
......@@ -9655,7 +9655,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "646j97NnNNrpZnHTBZvh0z"
"_id": "1eNdAxR2JMKKEbyNGrGHWG"
},
{
"__type__": "cc.PrivateNode",
......@@ -9718,7 +9718,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "3fmCocifBAFp769GDh8MA4"
"_id": "bdPVaQNTxE5oa9/rZbd7N5"
},
{
"__type__": "cc.Label",
......@@ -9751,7 +9751,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "0by1OoLx9ANK7W7R3V6M9U"
"_id": "a2pBNi+6lMaq+pW7wckpfT"
},
{
"__type__": "cc.PrivateNode",
......@@ -9814,7 +9814,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "32x5jv2RhLJYV3pL9C9Dlg"
"_id": "09vwAvq5ZMYJyVmcKKMB8M"
},
{
"__type__": "cc.Label",
......@@ -9847,7 +9847,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "c9v/bh44BEMZSlEp5PT4FC"
"_id": "abCx9aEPZFp4RPnE/wEM9X"
},
{
"__type__": "cc.RichText",
......@@ -12593,7 +12593,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "412KNqaihNH56Cg680Qkc+"
"_id": "8dPR7qbYZKVJmZsY6HPHwA"
},
{
"__type__": "cc.Label",
......@@ -12626,7 +12626,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "e5eXJBwgpKzZYhw+Gsgutk"
"_id": "65ky7mpqlG+bf6PBAQvZuN"
},
{
"__type__": "cc.PrivateNode",
......@@ -12689,7 +12689,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "93ryTc3jZCIrRH+qremq9e"
"_id": "38FPif8OhM7qMPdxeFUR3J"
},
{
"__type__": "cc.Label",
......@@ -12722,7 +12722,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "4cr5gyZVlL4YbEEwjpD6bB"
"_id": "95YLEn5C9B+6dZqSP/Qxc1"
},
{
"__type__": "cc.PrivateNode",
......@@ -12785,7 +12785,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "2b6V2OnyxMCKFvmj5xPgDJ"
"_id": "ffLjCTjXNPbIZlheoh0x7o"
},
{
"__type__": "cc.Label",
......@@ -12818,7 +12818,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "b67IXCzcFG5IXOEGz6YjQC"
"_id": "420fxVOjROJqiGl4Y5lq/P"
},
{
"__type__": "cc.RichText",
......
......@@ -287,7 +287,14 @@ export default class NewClass extends cc.Component {
cc.find("Canvas/reportdetail/view/content/userdetail_scollpage/learnshow/itembg/recordbg/recordcount").getComponent(cc.Label).string = recordcount;
cc.find("Canvas/reportdetail/view/content/userdetail_scollpage/learnshow/itembg/learnbg/learntime").getComponent(cc.Label).string = learntimes;
const resultNode = cc.find("Canvas/reportdetail/view/content/userdetail_scollpage/learnresult/itembg");
const resultPage = cc.find("Canvas/reportdetail/view/content/userdetail_scollpage/learnresult");
const resultNode = cc.find("itembg", resultPage);
if (!kn_letters && !kn_words && !kn_sentences && !OP05 && !OP_06_3) {
// 没有可以展示的学习成果
resultPage.active = false;
return;
}
if (kn_letters) {
cc.find("letter_title", resultNode).active = true;
......@@ -433,12 +440,12 @@ export default class NewClass extends cc.Component {
qpyNode.active = true;
} else {
qpyNode.active = false;
cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage/learnresult/itembg/pyx_tittle`).active = false;
}
// 设置页面高度
setTimeout(() => {
const learnresult = cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage/learnresult`);
const pageHight = cc.find(`itembg`, learnresult).height + Math.abs(learnresult.y);
const pageHight = cc.find(`itembg`, resultPage).height + Math.abs(resultPage.y);
cc.find(`Canvas/reportdetail/view/content`).height = pageHight + 100;
cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage`).height = pageHight + 100;
}, 1000);
......
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