Merge branch 'dynamicScale0609' into testNew

src/css/informationOut.less

@@ -224,12 +224,10 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   left: -10px;
   border-radius: 0;
   border: none;
-  background-color: #F5F6F7;
   background: url('../images/icon_current.png');
   background-repeat: no-repeat;
   background-position-x: center;
   background-position-y: center;
-  background-size: 18px 9px;
 }
   .disCopy {
     -webkit-touch-callout: none;

src/js/informationOut.js

@@ -531,10 +531,10 @@ function renderTab(detailList, scale) {
     $(".tabList").append(`<span class="tab" data-module="notice" data-title="` + noticeName + `">注意事项</span>`)
     //$(".tabBox .title").html(noticeName);
   }
-  // if (scale || getUrlArgObject('gauge') == 'gauge' || getUrlArgObject('type') == 8) {
-  //   $(".tabList").append(`<span class="tab" data-module="scale" data-title="` + showName + `">评估内容</span>`)
-  //   //$(".tabBox .title").html(noticeName);
-  // }
+  if (scale || getUrlArgObject('gauge') == 'gauge' || getUrlArgObject('type') == 8) {
+    $(".tabList").append(`<span class="tab" data-module="scale" data-title="` + showName + `">评估内容</span>`)
+    //$(".tabBox .title").html(noticeName);
+  }
   let defaultModuleName
   if ((getUrlArgObject('page') && getUrlArgObject('page') == 1 && scale && detailList['静态知识']) || getUrlArgObject('scale') == 'scale') {
     $(".tabList .tab").eq(1).addClass("activeTab")

src/js/promise.js

@@ -344,11 +344,13 @@ const Toast = function (msg, duration,type) {
   var m = document.createElement('div');
   if(type == 'warn'){
     m.innerHTML = '<div style="margin:auto"><img class="warn" style="margin-right:14px;float:left" src="./../images/icon-warning.png" /><span>'+msg+'</span></div>'
+    m.style.cssText = "margin:auto;width:250px;vertical-align:middle;padding:25px 14px;height: 30px;color: #fff;line-height: 30px;text-align: center;border-radius: 8px;position: absolute;top: 0;left: 0;right:0;bottom:0;z-index: 999999;background: #333;font-size: 16px;";
   }else if(type == 'success'){
-    m.innerHTML = '<div style="margin:auto"><img class="warn" style="width:32px;margin-right:14px;float:left" src="./../images/icon-success.png" /><span>' + msg +'</span></div>'
+    m.innerHTML = '<div style="margin:auto;width:120px"><img class="warn" style="width:32px;margin-right:14px;float:left" src="./../images/icon-success.png" /><span>' + msg +'</span></div>'
+    m.style.cssText = "margin:auto;width:120px;vertical-align:middle;padding:25px 14px;height: 30px;color: #fff;line-height: 30px;text-align: center;border-radius: 8px;position: absolute;top: 0;left: 0;right:0;bottom:0;z-index: 999999;background: #333;font-size: 16px;";
   }
   
-  m.style.cssText = "display:flex;vertical-align:middle;padding:25px 14px;height: 30px;color: #fff;line-height: 30px;text-align: center;border-radius: 8px;position: fixed;top: 50%;left: 50%;transform: translate(-50%, -50%);z-index: 999999;background: #333;font-size: 16px;";
+  
   $('.warn').css('margin-top','10px')
   document.body.appendChild(m);
   setTimeout(function () {

src/js/staticInfo.js

@@ -322,7 +322,7 @@ function copy(name) {
   $(".copy").click(function () {
     var texts = document.getElementById("result_title").innerText;
     if (texts == '') {
-      Toast('结果为空,无法复制', 500, 'warn')
+      Toast('温馨提示：结果为空,无法复制', 500, 'warn')
       return
     }
     var inputs = document.getElementById("inputs");
@@ -393,14 +393,15 @@ function getResult(pushInfo, textType) {
         for (var i = 0; i < pushInfo.length; i++) {
           if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && !tmp) {
             result = pushInfo[i].result + '(' + num + '分' + ')'
-            proposal = pushInfo[i].pushInfo
+            proposal = pushInfo[i].pushInfo + '；' + proposals.join("；");
             break
           } else if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && tmp) {
-            result = pushInfo[i].result + '(' + num + '分' + ')' + ';' + tmp
-            proposal = pushInfo[i].pushInfo
+            result = pushInfo[i].result + '(' + num + '分' + ')' + '；' + tmp
+            proposal = pushInfo[i].pushInfo + '；' + proposals.join("；");
             break
           } else {
             result = tmp
+            proposal = proposals.join("；");
           }
         }
       } else {
@@ -466,10 +467,10 @@ function renderTab(detailList, scale) {
     $(".tabList").append(`<span class="tab" data-module="notice" data-title="` + noticeName + `">注意事项</span>`)
     //$(".tabBox .title").html(noticeName);
   }
-  // if (scale || getUrlArgObject('gauge') == 'gauge' || getUrlArgObject('type') == 8) {
-  //   $(".tabList").append(`<span class="tab" data-module="scale" data-title="` + showName + `">评估内容</span>`)
-  //   //$(".tabBox .title").html(noticeName);
-  // }
+  if (scale || getUrlArgObject('gauge') == 'gauge' || getUrlArgObject('type') == 8) {
+    $(".tabList").append(`<span class="tab" data-module="scale" data-title="` + showName + `">评估内容</span>`)
+    //$(".tabBox .title").html(noticeName);
+  }
   let defaultModuleName
   if (getUrlArgObject('page') && getUrlArgObject('page') == 1 && scale && detailList['静态知识']) {
     $(".tabList .tab").eq(1).addClass("activeTab")