Merge remote-tracking branch 'origin/test' into test

src/js/console.js

@@ -75,11 +75,11 @@ function getDetails(){
         $(".container",parent.document).removeClass("console-cont");
     })
     $(".defect .partTitlePub").click(function(){//from 1 console / 2  deptConsole
-        $(parent.document).find("#contentIframe").attr("src","mukuai.html?from=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","mukuaiControl.html?from=1&dateType="+dateType)
         $(".container",parent.document).removeClass("console-cont");
     })
     $(".circleB .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","tiaomu.html?from=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","tiaomuControl.html?from=1&dateType="+dateType)
         $(".container",parent.document).removeClass("console-cont");
     })
 }

src/js/deptScoreDetail.js

@@ -47,6 +47,7 @@ function getDeptList(){
     if(deptList.length<=0)return
     $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     deptIdTemp = deptList[0].deptName
+    deptId = deptList[0].deptName
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`

src/js/partDetail.js

@@ -48,6 +48,7 @@ function getDeptList(){
     if(deptList.length<=0)return
     $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     deptIdTemp = deptList[0].deptName
+    deptId = deptList[0].deptName
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`