Merge remote-tracking branch 'origin/scale0414' into testNew

src/css/searchStaticList.less

@@ -3,8 +3,9 @@
 .staticListWrap {
   position: absolute;
   width: 100%;
-  height: 100%;
-  /*min-width: 900px;*/
+  min-height: 100%;
+  /*height: 100%;
+  min-width: 900px;*/
   padding: 60px 20px 20px;
   box-sizing: border-box;
   background-color: #DDE2E4;

src/js/staticInfo.js

@@ -160,7 +160,7 @@ function adjustHeight() {
 function adjustWidth() {
   var wt = window.innerWidth || document.documentElement.clientWidth;
   $(".titleH2").width(wt- 0.2*wt -33 - 200 - 17 - 40 -15 + 'px')
-  $("pre").width(wt- 0.2*wt - 200 + 'px')
+  $("pre").width(wt- 0.2*wt - 240 + 'px')
 }
 $(window).on('resize', function(){
   adjustHeight()

src/js/staticInfoOut.js

@@ -58,12 +58,12 @@ function getInfomation() {
       showLis=data
       for(let i = 0;i < showLis.length;i++){
         let tmp = showLis[i]
-        str+=`<li data-idx="${i}" title="${tmp.name}">${tmp.name}(${tmp.hisName})</li>`
+        str+=`<li data-idx="${i}" title="${tmp.name}(${tmp.hisName})">${tmp.name}(${tmp.hisName})</li>`
       }
       $(".showWhich ul").html(str);
         sName=showLis[selectedDrop].name+"("+showLis[selectedDrop].hisName+")";
       $(".showWhichSelect").html(sName).attr("title",sName)
-      showName = data[selectedDrop].name
+      showName = data[selectedDrop].name+"("+data[selectedDrop].hisName+")";
       showInfoSelect()
       showInfo(data[selectedDrop])
         renderTitleShow();
@@ -104,7 +104,7 @@ function showInfoSelect(){
     let name = $(this).html(),str=''
     selectedDrop=idx;
     selectedTab=0;
-    showName = showLis[idx].name;
+    showName = showLis[idx].name+"("+showLis[idx].hisName+")";
     showInfo(showLis[idx])
     renderTitleShow();
     $('.content .infos').scrollTop(0)