v1.4.7

src/js/console.js

@@ -322,12 +322,13 @@ function getAverageScoreLis(){
         let data = res.data;
         if(data.code == 0){
             let result1 = (hospital=="台州市立"?data.data:data.data['各科室质控平均分'])||[]
-            let dataX1=[],dataY1=[]
+            let dataX1=[],dataY1=[],dataY2=[]
             for(let i = 0;i < result1.length;i++){
                 dataX1.push(result1[i].name)
                 dataY1.push(result1[i].averageValue)
+                dataY2.push(result1[i].lastYearAverageValue)
             }
-            barChartPay(dataX1,dataY1)
+            barChartPay(dataX1,dataY1,dataY2)
         }
     })
 }
@@ -1201,7 +1202,8 @@ function lineChartHome(dataX,dataY){
     myCharts.setOption(option); 
 }
 //柱状图住院费用
-function barChartPay(dataX,dataY){
+function barChartPay(dataX,dataY,dataY2){
+    console.log(dataX,dataY,dataY2,77777777)
     if(dataX.length==0&&dataY.length==0){
         $("#barChartPay,.innerOuter").css("display","none")
         picEmptyData('.barChartPayEmptys')
@@ -1256,7 +1258,7 @@ function barChartPay(dataX,dataY){
                         return value;
                         }
                 },
-                data: ['2012', '2013', '2014', '2015', '2016']
+                data: dataX
             }
         ],
         yAxis: [
@@ -1280,19 +1282,29 @@ function barChartPay(dataX,dataY){
                 }
             }
         ],
+        title:[{
+            text: dataX.length>0?'分数':'',
+            top: 15,
+            left: 10,
+            textStyle: {
+                fontSize: 14,
+                color:'#E9EBEF',
+                fontWeight: 400
+            }
+        }],
         series: [
             {
-                name: 'Forest',
+                name: '环比',
                 type: 'bar',
                 barGap: 0,
-                barWidth: '10%',
-                data: [320, 332, 301, 334, 390]
+                barWidth: '15%',
+                data: dataY
             },
             {
-                name: 'Steppe',
+                name: '同比',
                 type: 'bar',
-                barWidth: '10%',
-                data: [220, 182, 191, 234, 290]
+                barWidth: '15%',
+                data: dataY2
             }
         ]
     };

src/js/deptScoreDetailControl.js

@@ -233,24 +233,55 @@ 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 || "-"}<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>
+                <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">
+                    ${item.entryNum || "-"}
+                    ${item.entrySameNum<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.entrySameNum>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td class="goHomeDetailQuexian" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">${item.sameNum}</td>
+                <td >
+                ${item.averageValue || "-"}
+                ${item.avSameValue<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.avSameValue>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td >${item.sameAvgValue}</td>
+                <td >
+                ${item.mrNum || "-"}
+                ${item.mrSameNum<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.mrSameNum>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td >${item.sameMrNum}</td>
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">
+                ${item.firstLevelNum+'' || "-"}
+                ${item.firSameLevelNum<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.firSameLevelNum>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td  class="goHomeDetailB" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">
+                ${item.sameFirstLevelNum+'' || "-"}
+                </td>
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="乙">
+                ${item.secondLevelNum+'' || "-"}
+                ${item.secSameLevelNum<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.secSameLevelNum>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td  class="goHomeDetailB" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="乙">
+                ${item.sameSecondLevelNum+'' || "-"}
+                </td>
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="丙">
+                ${item.thirdLevelNum+'' || "-"}
+                ${item.thiSameLevelNum<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.thiSameLevelNum>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td  class="goHomeDetailB" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="丙">${item.sameThirdLevelNum+'' || "-"}</td>
+                <td >
+                ${item.firstLevelPercentStr || "-"}
+                ${item.firSameLevelPercent<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.firSameLevelPercent>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td >${item.sameFirstLevelPercent}</td>
+                <td >
+                ${item.secondLevelPercentStr || "-"}
+                ${item.secSameLevelPercent<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.secSameLevelPercent>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td >${item.sameSecondLevelPercent}</td>
+                <td >
+                ${item.thirdLevelPercentStr || "-"}
+                ${item.thiSameLevelPercent<0?'<img class="updownimg" src="'+jiantou_down+'"/>':item.thiSameLevelPercent>0?'<img class="updownimg" src="'+jiantou_up+'"/>':''}
+                </td>
+                <td >${item.sameThirdLevelPercent}</td>
             </tr>
         `
     }

src/js/partDetailControl.js

@@ -179,9 +179,9 @@ function renderTab(data,hisId,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td >${item.deptName || "-"}</td>
                 <td class="goHomeDetail" data-ruleType="" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
-                <td class="goHomeDetail1" data-dept="${item.deptName || ""}">${item.secondLevelNum}</td>
+                <td class="goHomeDetail1" data-dept="${item.deptName || ""}" data-title="不合格数">${item.secondLevelNum}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
-                <td class="goHomeDetail1" data-dept="${item.deptName || ""}">${item.firstLevelNum}</td>
+                <td class="goHomeDetail1" data-dept="${item.deptName || ""}" data-title="合格数">${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>
@@ -204,10 +204,11 @@ function renderTab(data,hisId,activePage){
     $(".goHomeDetail1").click(function () {
         let index = $(this).parent().attr("data-index")
         let deptName = $(this).attr("data-dept")
+        let titleName = $(this).attr("data-title")
         // let ruleType = $(this).attr("data-ruleType")
         let deptId = data[index].deptId
         // $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
-        $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualified.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" +  "&startDate=" + startDateParam + "&endDate=" + endDateParam )
+        $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualified.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" +  "&startDate=" + startDateParam + "&endDate=" + endDateParam+"&titleName="+titleName )
 
     })
     // initScroll("partDetailControl","YX",1)

src/js/qcListCopyUnqualified.js

@@ -38,6 +38,7 @@ let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||"";
 let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
+let titleName = getUrlArgObjectNew("titleName", srcUrl) || '';
 
 let currentPage;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -168,6 +169,7 @@ function getTabData(activePage){
         chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
         mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
         mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
+        titleName:titleName
     }
     if (from == 9) {
         if (deptName ==="全部"){

src/js/utils.js

@@ -3,7 +3,7 @@ const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
 require('./scrollBar.js');
-const baseUrl = "http://192.168.2.241:5858"
+const baseUrl = "http://192.168.2.236:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',

webpack.config.js

@@ -6,8 +6,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-// const proxyHost = "http://192.168.2.236:5858";
-const proxyHost = "http://192.168.2.241:5858";
+const proxyHost = "http://192.168.2.236:5858";
+// const proxyHost = "http://192.168.2.241:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢
 // const proxyHost = "http://192.168.3.113:5858";//王峰
 module.exports = {