Merge remote-tracking branch 'origin/master' into referMaster

src/js/checkTaskList.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/checkTaskList.less");
 require('./modal.js');
 const { api, ywCheckApi } = require('./api.js')
-const { post, getCookie, getUrlArgObjectNew, emptyBox,  listenScroll,getScoreTabList } = require('./utils.js')
+const { post, getCookie, getLogoParam, emptyBox,  listenScroll,getScoreTabList } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCalenBlue = require("./../images/icon_calen_blue.png")
@@ -365,8 +365,8 @@ function bindScoreDetail() {
     });
 }
 function scoreDetail(obj) {
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${obj.id}&age=${obj.age}&name=${obj.name}&hid=${obj.hid}&code=${obj.code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${obj.id}&age=${obj.age}&name=${obj.name}&hid=${obj.hid}&code=${obj.code}`+logoParam)
 }
 //病历等级选择
 function bindLeveldSelect() {

src/js/dept/qcListCopyDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("@less/dept/qcListCopyDept.less");
 require('../modal.js');
 const {api} = require('../api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('@js/utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('@js/utils.js')
 require('../../resource/jquery-ui/jquery-ui.min.js');
 require('../../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("@images/icon_check.png")
@@ -527,8 +527,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/dept/qcListCopyUnqualifiedDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("@less/dept/qcListCopyUnqualifiedDept.less");
 require('../modal.js');
 const {api} = require('../api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker,focusMenuItem,listenScroll,exportTimeLimit} = require('../utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('../utils.js')
 require('../../resource/jquery-ui/jquery-ui.min.js');
 require('../../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("@images/icon_check.png")
@@ -448,8 +448,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/dept/qcListOutHospitalDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("@less/dept/qcListOutHospitalDept.less");
 require('../modal.js');
 const {api} = require('../api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('../utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('../utils.js')
 require('../../resource/jquery-ui/jquery-ui.min.js');
 require('../../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("@images/icon_check.png")
@@ -461,8 +461,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/dept/readmissionDept.js

@@ -7,7 +7,7 @@ const {
   getCookie,
   getUrlArgObjectNew,
   emptyBox,
-  setTitleTxt,
+    getLogoParam,
   setDatePicker,
   // focusMenuItem,
   getPickerDate,
@@ -317,9 +317,9 @@ function renderTab(data, hisId, activePage) {
 }
 
 function scoreDetail(id, age, hid, code, name) {
-    const hideLogo = getUrlArgObjectNew("hideLg");
+    const logoParam = getLogoParam();
   window.open(
-    `./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':'')
+    `./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam
   );
 }
 // 跳转至病人详情

src/js/dept/uccDeptDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("@less/dept/uccDeptDetail.less");
 require('../modal.js');
 const {api} = require('@js/api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('@js/utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('@js/utils.js')
 require('../../resource/jquery-ui/jquery-ui.min.js');
 require('../../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("@images/icon_check.png")
@@ -453,8 +453,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/index.js

@@ -8,6 +8,7 @@ const WarningIcon =  require("./../images/icon-Warning.png")
 const warnIcon = require("./../images/warn.png")
 const openEye = require("./../images/open-eye.png")
 const closeEye = require("./../images/close-eye.png")
+const adLogo = require("../images/adlogo.png")
 
 const {api} = require('./api.js')
 const {post,pageMap,delCookie,setCookie,setLocal,getCookie,focusMenuItem,getUrlArgObject} = require('./utils.js');
@@ -15,6 +16,7 @@ let userInfo={};
 let isPlacefile = getCookie('isPlacefile')||1
 let passwordComplexity = getCookie('passwordComplexity')
 const hideLogo = getUrlArgObject("hideLg");
+const otherLogo = getUrlArgObject("adLg");
 const modalDom = `
       <p class="tips"><img src=${WarningIcon} /><span>为确保账号安全，请及时修改初始密码</span></p>
       <div class="modalAction">
@@ -34,7 +36,14 @@ const psdChecker = `<div class="psd-checkbox">
 $(function () {
     //无logo演示隐藏logo
     if(hideLogo){
-        $(".copy-right,.logo img").hide();
+        $(".copy-right,.logo img").remove();
+        $(".menu-mini .logo").text("");
+    }
+    const otherLogo = getUrlArgObject("adLg");
+    if(otherLogo){
+        $(".logo img").attr("src",adLogo);
+        $(".menu-mini .logo").text("艾登");
+        $(".copy-right").remove();
     }
     hideDropdown();
   getOwnDept();
@@ -497,7 +506,9 @@ $(".login-out").click(function(){
   delCookie('accessToken')
   setCookie('behosDateStart','')
   setCookie('behosDateEnd','')
-  window.location.href = hideLogo?'/login.html?hideLg=true':'login.html';
+    const otherLogoPm = otherLogo?'?adLg=1':'';
+    const hideLogoPm = hideLogo?'?hideLg=1':'';
+  window.location.href = 'login.html'+otherLogoPm+hideLogoPm;
 })
 
 //时间获取

src/js/itemDefectDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/itemDefectDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker,getPickerDate,initScroll } = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker,getLogoParam,initScroll } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -267,8 +267,8 @@ function renderTab(data,hisId){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/login.js

@@ -8,8 +8,9 @@ const {api} = require('./api.js')
 const {post,setCookie,delCookie,getUrlArgObject} = require('../js/utils.js');
 const md5 = require('js-md5');
 const hideLogo = getUrlArgObject("hideLg");
+const otherLogo = getUrlArgObject("adLg");
 $(function(){
-  if(hideLogo){
+  if(hideLogo||otherLogo){
     $(".copy-right").text("");
   }
   delCookie('accessToken')
@@ -64,7 +65,9 @@ function sureLogin(){
       $.alerModal({"message":"登录成功",type:"tip",time:'1000',win:true});
       setTimeout(() => {
           cacheCheckDatas(data.data.selRoles);
-        window.location.href = hideLogo?'/index.html?hideLg=true':'index.html';
+         const otherLogoPm = otherLogo?'?adLg=1':'';
+         const hideLgPm=hideLogo?'?hideLg=1':'';
+        window.location.href = 'index.html'+hideLgPm+otherLogoPm;
       }, 600);
     }else{
       $(".divModal").remove()

src/js/qcList.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcList.less");
 require('./modal.js');
 const { api } = require('./api.js')
-const { post, getCookie,getLocal, getUrlArgObjectNew, emptyBox, downloadExportedData, expJson, initScroll, listenScroll, exportTimeLimit } = require('./utils.js')
+const { post, getCookie,getLocal, getUrlArgObjectNew, emptyBox, downloadExportedData, expJson, getLogoParam, listenScroll, exportTimeLimit } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck = require("./../images/icon_check.png")
@@ -374,8 +374,8 @@ function isTextCenter(name) {
 }
 
 function scoreDetail(id, age, hid, code, name) {
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId) {
     $('.patientNameSpan').on('click', function (e) {

src/js/qcListCopy.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListCopy.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -520,8 +520,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListCopyUnqualified.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListCopyUnqualified.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -451,8 +451,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDept.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -405,8 +405,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+logoParam)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListDeptYw.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDeptYw.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -418,8 +418,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+logoParam)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListDocteam.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDocteam.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -385,8 +385,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+logoParam)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListOutHospital.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListOutHospital.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -453,8 +453,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListPerson.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListPerson.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getUrlArgObject,getCookie,getLocal,getUrlArgObjectNew,emptyBox,expJson,listenScroll,downloadExportedData,exportTimeLimit} = require('./utils.js')
+const {post,getUrlArgObject,getCookie,getLocal,getUrlArgObjectNew,emptyBox,expJson,listenScroll,downloadExportedData,getLogoParam,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -405,8 +405,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`+logoParam)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){

src/js/qcListYw.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListYw.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -391,8 +391,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/qcScore.js

@@ -5,13 +5,20 @@ require('./modal.js');
 const {post,getUrlArgObject,setBoxHeight,getCookie,getLocal,initScroll} = require('./utils.js');
 const {api,ywCheckApi} = require('./api.js');
 let checkOk = require('./../images/checkOk.png')
+const adLogo = require("../images/adlogo.png")
 
 $(function(){
   const hideLogo = getUrlArgObject("hideLg");
   if(hideLogo){
-      $(".sub-menu .logo img,.copy-right").hide();
+      $(".sub-menu .logo img,.copy-right").remove();
       $(".menu-mini .logo").text("");
   }
+  const otherLogo = getUrlArgObject("adLg");
+  if(otherLogo){
+      $(".logo img").attr("src",adLogo);
+      $(".menu-mini .logo").text("艾登");
+      $(".copy-right").remove();
+  }
 //本页全局变量
   let global_flawData = {};    //缺陷数据
   let global_flawDataPay = {};    //缺陷数据

src/js/readmission.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/readmission.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const { post, getCookie, getUrlArgObjectNew, emptyBox, setTitleTxt, setDatePicker,focusMenuItem,getPickerDate,expJson,downloadExportedData,initScroll,listenScroll} = require('./utils.js')
+const { post, getCookie, getUrlArgObjectNew, emptyBox, setTitleTxt, setDatePicker,getLogoParam,getPickerDate,expJson,downloadExportedData,initScroll,listenScroll} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -244,8 +244,8 @@ function renderTab(data,hisId,activePage){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-  window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+  window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 // 跳转至病人详情
 function bindScoreDetail(hisId){

src/js/uccDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/uccDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,getLogoParam,focusMenuItem,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -439,8 +439,8 @@ function isTextCenter(name){
 }
 
 function scoreDetail(id,age,hid,code,name){
-    const hideLogo = window.parent.location.search.indexOf("hideLg=")>-1;
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+(hideLogo?'&hideLg=1':''))
+    const logoParam = getLogoParam();
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`+logoParam)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){

src/js/utils.js

@@ -551,7 +551,14 @@ function listenScroll(dom) {
     $('#datepickerQc2').trigger('blur');
   });
 }
-
+//获取隐藏/替换logo参数
+function getLogoParam() {
+    const otherLogo =  window.parent.location.search.indexOf("adLg=")>-1;
+    const hideLogo =  window.parent.location.search.indexOf("hideLg=")>-1;
+    const otherLogoPm = otherLogo ? '&adLg=1' : '';
+    const hideLogoPm = hideLogo ? '&hideLg=1' : '';
+    return otherLogoPm+hideLogoPm;
+}
 const explainTitle = {
   科室编码: 'deptId',
   科室: 'deptName',
@@ -603,5 +610,6 @@ module.exports = {
   initScroll,
   listenScroll,
   explainTitle,
-    getScoreTabList
+  getScoreTabList,
+  getLogoParam
 };