浏览代码

Merge branch 'orderBug' into test

zhangxc 5 年之前
父节点
当前提交
31c43df953
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      src/html/mukuaiControl.html
  2. 2 2
      src/js/mukuaiControl.js
  3. 1 1
      src/js/utils.js

+ 1 - 1
src/html/mukuaiControl.html

@@ -50,7 +50,7 @@
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">模块名称</th>
-                    <th class="moduleScore desc" style="width: 105px;" code="percentStr">缺陷占比</th>
+                    <th class="moduleScore desc" style="width: 105px;" code="percent">缺陷占比</th>
                 </thead>
                 <tbody class="tbody">
     

+ 2 - 2
src/js/mukuaiControl.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percentStr'],startDateParam="", endDateParam=""   
+let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percent'],startDateParam="", endDateParam=""   
 
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -42,7 +42,7 @@ $(function(){
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name=nameTemp = ""
         data_asc=[],
-        data_desc=['percentStr']
+        data_desc=['percent']
         $("th[code]").removeClass("asc desc");
         $(".moduleScore").addClass("desc")
         $(".patientNumInp").val("")

+ 1 - 1
src/js/utils.js

@@ -285,7 +285,7 @@ function focusMenuItem(code){
 function emptyBox(name,showNum){
   let showNumer = showNum || 18
   let str = `<tr><td colspan="${showNumer}" style="text-align: center;color: #aaa">
-  <img style="margin-top:50px;width:100px;" src="${require('../images/empty1.png')}" />
+  <img style="margin-top:50px;width:140px;" src="${require('../images/empty1.png')}" />
   <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">${name||'暂无数据~'}</p>
   </td></tr>`
   return str