1.4.7

src/css/deptScoreDetailControl.less

@@ -4,7 +4,11 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
+    .partTitle {
+        border-bottom: 10px #EFF1F6 solid;
+        height: 54px;
+    }
 }
 .deptScoreDetailControl {
     // background-color: #fff;
@@ -35,12 +39,14 @@
         padding: 0 0 0 15px;
         border-bottom: 1px solid #E2E5EF;
         font-size: 16px;
-        font-weight: bold   ;
+        font-weight: bold;
         letter-spacing: 1px;
     }
     .main-body{
         .main-body-com;
         min-width: 1250px;
+        border: 0;
+        border-left: 10px #EFF1F6 solid;
         // box-sizing: border-box;
         /*width: 100%;*/
     }
@@ -83,7 +89,12 @@
             width: 50px;
             cursor: pointer;
         }
-        
+        .updownimg {
+            width: 9px;
+            margin-left: 5px;
+            position: relative;
+            top: 1px;
+        }
     }
     .tabFoot{
         height: 40px;

src/html/partDetailControl.html

@@ -54,6 +54,7 @@
                         <th class="beHospitalId textCenter" code="entryNum">缺陷总数</th>
                         <th class="beHospitalId textCenter" code="secondLevelNum">不合格数</th>
                         <th class="beHospitalId textCenter" code="firstLevelPercent">合格率</th>
+                        <th class="beHospitalId textCenter" code="firstLevelNum">合格数</th>
                         <th class="beHospitalId textCenter" code="emptyNum">空项数</th>
                         <th class="beHospitalId textCenter" code="emptyPercent">完整率</th>
                         <th class="beHospitalId textCenter" code="errorNum">错误数</th>

src/js/console.js

@@ -1219,8 +1219,9 @@ function barChartPay(dataX,dataY){
     $(window).resize(function(){
         myCharts.resize()
     });
+    
     option = {
-        color: ['#37C4FC'],
+        color: ['#37C4FC', '#F2637B'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -1237,33 +1238,30 @@ function barChartPay(dataX,dataY){
         xAxis: [
             {
                 type: 'category',
-                data: dataX,
-                axisTick: {
-                    alignWithLabel: true
+                axisTick: {show: false,alignWithLabel: true},
+                axisLine: {//x轴
+                    lineStyle:{
+                        color:'#4A5D8E'
+                    }
                 },
                 axisLabel: {//x轴刻度
                     textStyle: {
                         color: '#E9EBEF'
                     },
                     rotate:45,
-                    formatter: function (value) {
-                        //x轴的文字改为竖版显示
+                    formatter: function (value) {//x轴的文字改为竖版显示
                         if(value.length>7){
                             return value.slice(0,7)+'...'
                         }
                         return value;
-                     }
+                        }
                 },
-                axisLine: {//x轴
-                    lineStyle:{
-                        color:'#4A5D8E'
-                    }
-                }
+                data: ['2012', '2013', '2014', '2015', '2016']
             }
         ],
         yAxis: [
             {
-                type: 'value',
+                type: 'value',        
                 axisLine: {//y轴
                     show: false
                 },
@@ -1281,29 +1279,128 @@ function barChartPay(dataX,dataY){
                     }
                 }
             }
-            
         ],
-        title:[{
-            text: dataX.length>0?'分数':'',
-            top: 15,
-            left: 10,
-            textStyle: {
-                fontSize: 14,
-                color:'#E9EBEF',
-                fontWeight: 400
-            }
-        }],
         series: [
             {
-                name: '质控平均分',
+                name: 'Forest',
                 type: 'bar',
-                barWidth: '23%',
-                data: dataY
+                barGap: 0,
+                barWidth: '10%',
+                data: [320, 332, 301, 334, 390]
+            },
+            {
+                name: 'Steppe',
+                type: 'bar',
+                barWidth: '10%',
+                data: [220, 182, 191, 234, 290]
             }
         ]
     };
     myCharts.setOption(option);
 }
+// function barChartPay(dataX,dataY){
+//     if(dataX.length==0&&dataY.length==0){
+//         $("#barChartPay,.innerOuter").css("display","none")
+//         picEmptyData('.barChartPayEmptys')
+//         return
+//     }else{
+//         if(getCookie("hospital") == "台州市立"){
+//             $(".innerOuter").css("display","block")
+//         }else{
+//             $(".innerOuter").css("display","none")
+//         }
+//         $("#barChartPay").css("display","block")
+//         $(".barChartPayEmptys").css("display","none")
+//     }
+//     var myCharts = echarts.init(document.getElementById('barChartPay'));
+//     $(window).resize(function(){
+//         myCharts.resize()
+//     });
+//     option = {
+//         color: ['#37C4FC'],
+//         tooltip: {
+//             trigger: 'axis',
+//             position: 'right',
+//             axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+//                 type: 'line'        // 默认为直线，可选为：'line' | 'shadow'
+//             }
+//         },
+//         grid: {
+//             left: '3%',
+//             right: '4%',
+//             bottom: '3%',
+//             containLabel: true
+//         },
+//         xAxis: [
+//             {
+//                 type: 'category',
+//                 data: dataX,
+//                 axisTick: {
+//                     alignWithLabel: true
+//                 },
+//                 axisLabel: {//x轴刻度
+//                     textStyle: {
+//                         color: '#E9EBEF'
+//                     },
+//                     rotate:45,
+//                     formatter: function (value) {
+//                         //x轴的文字改为竖版显示
+//                         if(value.length>7){
+//                             return value.slice(0,7)+'...'
+//                         }
+//                         return value;
+//                      }
+//                 },
+//                 axisLine: {//x轴
+//                     lineStyle:{
+//                         color:'#4A5D8E'
+//                     }
+//                 }
+//             }
+//         ],
+//         yAxis: [
+//             {
+//                 type: 'value',
+//                 axisLine: {//y轴
+//                     show: false
+//                 },
+//                 axisTick: {
+//                     show: false
+//                 },
+//                 axisLabel: {//y轴刻度
+//                     textStyle: {
+//                         color: '#E9EBEF'
+//                     }
+//                 },
+//                 splitLine:{//分割线
+//                     lineStyle:{
+//                         color:'#344876'
+//                     }
+//                 }
+//             }
+            
+//         ],
+//         title:[{
+//             text: dataX.length>0?'分数':'',
+//             top: 15,
+//             left: 10,
+//             textStyle: {
+//                 fontSize: 14,
+//                 color:'#E9EBEF',
+//                 fontWeight: 400
+//             }
+//         }],
+//         series: [
+//             {
+//                 name: '质控平均分',
+//                 type: 'bar',
+//                 barWidth: '23%',
+//                 data: dataY
+//             }
+//         ]
+//     };
+//     myCharts.setOption(option);
+// }
 //柱状图住院日期
 function barChartLevel(dataX,dataY){
     // console.log(dataX,dataY,7887878787)

src/js/deptScoreDetailControl.js

@@ -12,6 +12,8 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
+const jiantou_up = require("./../images/jiantou_up.png")
+const jiantou_down = require("./../images/jiantou_down.png")
 let isPlacefile = getCookie('isPlacefile')||1
 
 listenScroll()
@@ -67,8 +69,7 @@ $(".abnormalClear").click(function(){
     getTabData(1)
 })
 
-$(".partTitle a").click(function(){
-    //初始菜单选中
+$(".partTitle a").click(function(){//初始菜单选中
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
     $(".container",parent.document).addClass("console-cont");
 })
@@ -207,14 +208,23 @@ function renderTab(data,hisId,activePage){
         ${hospital=='台州市立'?'<th class="beHospitalId textCenter">科室系统</th>':null}
         <th class="beHospitalId textCenter">科室名称</th>
         <th class="beHospitalId textCenter ${data_asc == 'entryNum'?'asc':data_desc == 'entryNum'?'desc':''}" code="entryNum">缺陷总数</th>
+        <th class="beHospitalId textCenter ${data_asc == 'averageValue'?'asc':data_desc == 'averageValue'?'desc':''}" code="averageValue">同比总数</th>
         <th class="beHospitalId textCenter ${data_asc == 'averageValue'?'asc':data_desc == 'averageValue'?'desc':''}" code="averageValue">质控平均分</th>
+        <th class="beHospitalId textCenter ${data_asc == 'averageValue'?'asc':data_desc == 'averageValue'?'desc':''}" code="averageValue">同比平均分</th>
         <th class="beHospitalId textCenter ${data_asc == 'mrNum'?'asc':data_desc == 'mrNum'?'desc':''}" code="mrNum">质控病历数</th>
+        <th class="beHospitalId textCenter ${data_asc == 'mrNum'?'asc':data_desc == 'mrNum'?'desc':''}" code="mrNum">同比质控数</th>
         <th class="beHospitalId textCenter ${data_asc == 'firstLevelNum'?'asc':data_desc == 'firstLevelNum'?'desc':''}" code="firstLevelNum">甲级病历数</th>
+        <th class="beHospitalId textCenter ${data_asc == 'firstLevelNum'?'asc':data_desc == 'firstLevelNum'?'desc':''}" code="firstLevelNum">同比甲级数</th>
         <th class="beHospitalId textCenter ${data_asc == 'secondLevelNum'?'asc':data_desc == 'secondLevelNum'?'desc':''}" code="secondLevelNum">乙级病历数</th>
+        <th class="beHospitalId textCenter ${data_asc == 'secondLevelNum'?'asc':data_desc == 'secondLevelNum'?'desc':''}" code="secondLevelNum">同比乙级数</th>
         <th class="beHospitalId textCenter ${data_asc == 'thirdLevelNum'?'asc':data_desc == 'thirdLevelNum'?'desc':''}" code="thirdLevelNum">丙级病历数</th>
+        <th class="beHospitalId textCenter ${data_asc == 'thirdLevelNum'?'asc':data_desc == 'thirdLevelNum'?'desc':''}" code="thirdLevelNum">同比丙级数</th>
         <th class="beHospitalId textCenter ${data_asc == 'firstLevelPercentStr'?'asc':data_desc == 'firstLevelPercentStr'?'desc':''}" code="firstLevelPercentStr">甲级率</th>
+        <th class="beHospitalId textCenter ${data_asc == 'firstLevelPercentStr'?'asc':data_desc == 'firstLevelPercentStr'?'desc':''}" code="firstLevelPercentStr">同比甲级率</th>
         <th class="beHospitalId textCenter ${data_asc == 'secondLevelPercentStr'?'asc':data_desc == 'secondLevelPercentStr'?'desc':''}" code="secondLevelPercentStr">乙级率</th>
+        <th class="beHospitalId textCenter ${data_asc == 'secondLevelPercentStr'?'asc':data_desc == 'secondLevelPercentStr'?'desc':''}" code="secondLevelPercentStr">同比乙级率</th>
         <th class="beHospitalId textCenter ${data_asc == 'thirdLevelPercentStr'?'asc':data_desc == 'thirdLevelPercentStr'?'desc':''}" code="thirdLevelPercentStr">丙级率</th>
+        <th class="beHospitalId textCenter ${data_asc == 'thirdLevelPercentStr'?'asc':data_desc == 'thirdLevelPercentStr'?'desc':''}" code="thirdLevelPercentStr">同比丙级率</th>
         </thead>`
     for(let i = 0; i <data.length; i++){
         const item = data[i]
@@ -223,14 +233,23 @@ function renderTab(data,hisId,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 ${hospital=='台州市立'?('<td >'+(item.deptClass?(item.deptClass+'系统'):"-")+'</td>'):''}
                 <td >${item.deptName || "-"}</td>
-                <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">${item.entryNum || "-"}</td>
+                <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">${item.entryNum || "-"}<img class="updownimg" src="${jiantou_down}"/></td>
+                <td class="goHomeDetailQuexian" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">${item.entryNum || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
+                <td >${item.averageValue || "-"}</td>
+                <td >${item.mrNum || "-"}</td>
                 <td >${item.mrNum || "-"}</td>
                 <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">${item.firstLevelNum+'' || "-"}</td>
+                <td  class="goHomeDetailB" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">${item.firstLevelNum+'' || "-"}</td>
                 <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="乙">${item.secondLevelNum+'' || "-"}</td>
+                <td  class="goHomeDetailB" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="乙">${item.secondLevelNum+'' || "-"}</td>
                 <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="丙">${item.thirdLevelNum+'' || "-"}</td>
+                <td  class="goHomeDetailB" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="丙">${item.thirdLevelNum+'' || "-"}</td>
+                <td >${item.firstLevelPercentStr || "-"}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
                 <td >${item.secondLevelPercentStr || "-"}</td>
+                <td >${item.secondLevelPercentStr || "-"}</td>
+                <td >${item.thirdLevelPercentStr || "-"}</td>
                 <td >${item.thirdLevelPercentStr || "-"}</td>
             </tr>
         `

src/js/partDetailControl.js

@@ -181,6 +181,7 @@ function renderTab(data,hisId,activePage){
                 <td class="goHomeDetail" data-ruleType="" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
                 <td class="goHomeDetail1" data-dept="${item.deptName || ""}">${item.secondLevelNum}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
+                <td class="goHomeDetail1" data-dept="${item.deptName || ""}">${item.firstLevelNum}</td>
                 <td class="goHomeDetail" data-ruleType="1" data-dept="${item.deptName || ""}">${item.emptyNum+'' || "-"}</td>
                 <td >${item.emptyPercentStr+'' || "-"}</td>
                 <td class="goHomeDetail" data-ruleType="2" data-dept="${item.deptName || ""}">${item.errorNum+'' || "-"}</td>