Merge branch 'dynamicScale0609' into testNew

src/css/cdss.less

@@ -577,4 +577,5 @@ body{
 .evaluationtitle:hover{
     text-decoration: underline;
     color: #0000FF;
+    cursor: pointer;
 }

src/css/cdssHorizontal.less

@@ -618,4 +618,5 @@
 .evaluationtitle:hover{
     text-decoration: underline;
     color: #0000FF;
+    cursor: pointer;
 }

src/css/staticInfo.less

@@ -264,16 +264,17 @@
   .tab{
     display: inline-block;
     padding: 5px 14px;
-    margin-right: 20px;
+    margin-right: 5px;
     background: #EEEEEE;
     cursor: pointer;
-    font-size: 16px;
+    font-size: 14px;
     color: #333333;
     border-radius: 6px 6px 0px 0px;
   }
   .activeTab{
     background: @staticMainColor;
     color: #fff;
+    font-size: 16px;
   }
   .ql-align-right{
     text-align: right;

src/js/cdss.js

@@ -182,10 +182,8 @@ function moreInfo() {
     openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}`)
   })
   $('.pushItemName').off("click").click(function () {
-    console.log(11)
     const name = $(this).parent().attr('data-name')
     const type = $(this).parent().attr('data-type')
-    console.log(name)
     openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}&page=1`)
   })
 }

src/js/staticInfo.js

@@ -121,7 +121,7 @@ function renderContentscale(list, contentWrapClassName, name) {
     var item = list[0].detailList[i];
     if (item.textType == 11) {
       item.content = item.content && item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix);
-      str = '<div class="infoBox scaleBox"><div class="title"> <h2 class="titleH2" id="' + contentWrapClassName + i +
+      str = '<div class="infoBox scaleBox" data-id="' + item.id + '"><div class="title"> <h2 class="titleH2" id="' + contentWrapClassName + i +
         '">'
       str += item.content
       str += '</h2></div>'
@@ -132,13 +132,14 @@ function renderContentscale(list, contentWrapClassName, name) {
         for (var k = 0; k < items.detailList.length; k++) {
           var it = items.detailList[k];
           it.content = it.content && it.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix);
-          str = '<div class="contentList"><div class="item-list">';
+          str = '<div class="contentList" data-id="' + it.parentId + '"><div class="item-list">';
           str += '<p class="item-title">' + it.content + '</p>'
           str += '<div class="item-content" data-id="' + it.id + '">'
           str += '</div></div></div>'
-          $(`.${contentWrapClassName} .infos .infos-box .infoWrapper .infoBox`).append(str);
+          $(".scale .infos .infos-box .infoWrapper .infoBox[data-id=" + it.parentId + "]").append(str);
           for (var l = 0; l < it.subList[0].detailList.length; l++) {
             var its = it.subList[0].detailList[l];
+            console.log(its.parentId)
             its.content = its.content && its.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix);
             str = '<div class="radio" name="scale' + its.parentId + '" value="' + its.score + '">';
             str += '<label><input class="radio_type" name="scale' + its.parentId + '" type="radio" value="' + its.score + '" />'
@@ -146,7 +147,7 @@ function renderContentscale(list, contentWrapClassName, name) {
             str += '<span class="num">' + '(' + its.score + ')' + '</span>'
             str += '</label>'
             str += `${item.match ? `<img class="recommend" src=${recommend} />` : `` }</div>`
-            $(".scale .infos .infos-box .infoWrapper .infoBox .contentList .item-content[data-id=" + its.parentId + "]").append(str);
+            $(".scale .infos .infos-box .infoWrapper .infoBox[data-id=" + it.parentId + "] .contentList .item-content[data-id=" + its.parentId + "]").append(str);
           }
         }
       }