Преглед на файлове

默认选中去掉只给提示

Luolei преди 6 години
родител
ревизия
11c5aa4b6a
променени са 7 файла, в които са добавени 95 реда и са изтрити 87 реда
  1. 1 7
      src/css/index.less
  2. 13 0
      src/css/popup.less
  3. 1 1
      src/html/index.html
  4. 39 41
      src/index.js
  5. 6 6
      src/js/indexDom.js
  6. 18 15
      src/js/scale.js
  7. 17 17
      src/page.js

+ 1 - 7
src/css/index.less

@@ -3,8 +3,6 @@
 .iframeWrap {
   margin: 10px auto 50px;
   padding: 20px;
-  overflow: auto;
-  max-width: 400px;
   .conditionHintPub {
     border: 1px solid #F2F2F2;
     margin-bottom: 15px;
@@ -233,11 +231,6 @@
     padding-right: 5px;
   }
 }
-.commonTreat {
-  .slideup {
-    top: -20px;
-  }
-}
 .pushEmpty {
   color: #ADADAD;
 }
@@ -291,6 +284,7 @@
   bottom: 0;
   background-color: #ececec;
   left: 0;
+  z-index: 9999;
   a {
     display: block;
   }

+ 13 - 0
src/css/popup.less

@@ -3,6 +3,7 @@
 .popupModal {
   position: absolute;
   top: 24px;
+  margin-bottom: 50px;
   left: 0;
   width: 100%;
   background: #FFFFFF;
@@ -56,6 +57,14 @@
         float: left;
         background: url('../images/sex1.png') center center no-repeat;
       }
+      span {
+        display: inline-block;
+        height: 28px;
+        line-height: 28px;
+      }
+      a {
+        color: @colorBlue;
+      }
     }
     .radioCheckSec {
       i {
@@ -74,11 +83,15 @@
       position: relative;
       padding-left: 98px;
       padding-right: 20px;
+      float: none;
       .caculateLis {
         li {
           float: left;
           padding-left: 0;
           margin: 0;
+          a {
+            color: @colorBlue;
+          }
         }
       }
       .modalMaintltle {

+ 1 - 1
src/html/index.html

@@ -54,7 +54,7 @@
       <li class="conditionHintPub conditionHintMay">
         <h4 href="javascript:void(0);"><i></i>疑似诊断</h4>
         <div class="conditionMain">
-          <ul>
+          <ul class="clearfix">
             <li class="pushEmpty">暂无推荐</li>
           </ul>
         </div>

+ 39 - 41
src/index.js

@@ -4,49 +4,49 @@ import './css/popup.less';
 import './js/popup';
 import {post,config,getUrlArgObject} from './js/promise.js';
 import {bqtsFun,ybzlFun,cyywFun,knzdFun,jtFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun} from './js/indexDom';
-var msg= {
-	age: 28,
-  diag: "急性胰腺炎",
-  diseaseId: 280,
-  featureType: "1,4,5,6,7,8,22",
-  lis: [
-    {
-      detailName: "HGB*3/HCT",
-      maxValue: "",
-      minValue: "",
-      name: "血常规",
-      otherValue: "",
-      source: "0",
-      time: "2019-05-07 17:11",
-      uniqueName: "血常规-HGB*3/HCT",
-      units: "",
-      value: "4"
-    }
-  ],
-  other: "无高血压",
-  pacs: "腹部B超:无异常, 报告日期:2019-05-07",
-  sex: 1,
-  symptom: "恶心呕吐腰痛", //胸痛,背痛,恶心,呕吐     //恶心呕吐腰痛   //牙周袋形成
-  vital: "血压左上肢13/12mmHg",
-}
-// var msg = {
-//   age: getUrlArgObject('age'),
+//地址栏参数 ?age=99&lisJson=&diseaseId=&diagJson=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg
+
+// var msg= {
+// 	age: 28,
+//   diag: "急性胰腺炎",
 //   diseaseId: 280,
-//   sex: getUrlArgObject('sex') == '男'?1:getUrlArgObject('sex') == '女'?2:3,
-//   symptom: getUrlArgObject('symptomJson'),
-//   vital: getUrlArgObject('vitalJson'),
-//   lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-//   pacs: getUrlArgObject('pacsJson'),
-//   diag: getUrlArgObject('diagJson'),
-//   featureType: "1,4,5,6,7,22",
-//   other: getUrlArgObject('otherJson')+getUrlArgObject('pastJson'),
-// }//推送相关信息
+//   featureType: "1,4,5,6,7,8,22",
+//   lis: [
+//     {
+//       detailName: "HGB*3/HCT",
+//       maxValue: "",
+//       minValue: "",
+//       name: "血常规",
+//       otherValue: "",
+//       source: "0",
+//       time: "2019-05-07 17:11",
+//       uniqueName: "血常规-HGB*3/HCT",
+//       units: "",
+//       value: "4"
+//     }
+//   ],
+//   other: "无高血压",
+//   pacs: "腹部B超:无异常, 报告日期:2019-05-07",
+//   sex: 1,
+//   symptom: "恶心呕吐腰痛", //胸痛,背痛,恶心,呕吐     //恶心呕吐腰痛   //牙周袋形成
+//   vital: "血压左上肢13/12mmHg",
+// }
+var msg = {
+  age: getUrlArgObject('age'),
+  diseaseId: getUrlArgObject('diseaseId') || 21773,
+  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+  symptom: getUrlArgObject('symptomJson'),
+  vital: getUrlArgObject('vitalJson'),
+  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+  pacs: getUrlArgObject('pacsJson'),
+  diag: getUrlArgObject('diagJson'),
+  featureType: "1,4,5,6,7,8,22",
+  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+}//推送相关信息
 
 window.msg = msg
 window.pushMessage = {}
 
-// let lisTmp = JSON.parse(getUrlArgObject('lisJson'))
-
 
 post(config.pushInner,msg).then((res)=>{
   var data = res.data
@@ -86,9 +86,7 @@ post(config.pushInner,msg).then((res)=>{
     }
     if(result.pacs.length > 0 && result.lab.length > 0){
       $(".conditionHintAssistLis").css({
-        "border-top":"1px solid #D1D1D1",
-        // "margin-top":"5px",
-        // "padding-top":"5px"
+        "border-top":"1px solid #D1D1D1"
       })
     }
     if(result.lab && result.lab.length > 0){//化验

+ 6 - 6
src/js/indexDom.js

@@ -6,7 +6,7 @@ function bqtsFun(data){//病情提示
     for(var m = 0;m < tmpBq.details.length;m++){
       var tmpBqDetail = tmpBq.details[m]
       if(tmpBqDetail.type == 1){
-        tmpBqDetailStr+='<a target="_blank" href="scale.html?featureType=21&sex='+msg.sex+'&lis='+msg.lis+'&diag='+msg.diag+'&scaleName='+tmpBqDetail.content.name+'&age='+msg.age+'&scaleId='+tmpBqDetail.content.id+'" class="illnessTable">'+tmpBqDetail.content.name+'</a>'
+        tmpBqDetailStr+="<a target='_blank' href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>"+tmpBqDetail.content.name+"</a>"
       }
       if(tmpBqDetail.type == 2){
         var deepDetailName = '<div class="modalTitle">'+tmpBqDetail.content.name+'<i class="closeModal"></i></div>'
@@ -21,7 +21,7 @@ function bqtsFun(data){//病情提示
             let tooDeepDetailStr = ''
             for(var f = 0;f<deepDetail.details.length;f++){
               var tooDeepDetail = deepDetail.details[f]
-              tooDeepDetailStr+='<li data-select="'+(tooDeepDetail.state == 1?"select":"")+'" class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'"><i></i>'+tooDeepDetail.detailName+'</li>'
+              tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
             }
             deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>'+
               '<ul class="clearfix caculateLis">'+
@@ -57,7 +57,7 @@ function bqtsFun(data){//病情提示
         var deepDetailStr = ''
         for(var n = 0;n < tmpBqDetail.content.details.length;n++){
           var deepDetail = tmpBqDetail.content.details[n]
-          deepDetailStr+='<li data-select="'+(deepDetail.state == 1?"select":"")+'" class="radioChecks '+(deepDetail.state == 1?'radioCheckSec':'')+'"><i></i>'+deepDetail.detailName+'</li>'
+          deepDetailStr+='<li class="radioChecks"><i></i><span>'+deepDetail.detailName+'</span>'+(deepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
         }
         tmpBqDetailStr+='<div class="mayResult">可能结果:<span class="mayResultSelect"><span class="makesureResult">请选择</span><i class="sanjiao"></i>'+
           '<div class="popupModal">'+
@@ -78,11 +78,11 @@ function bqtsFun(data){//病情提示
     if(tmpBqStr != '' || tmpBqDetailStr != ''){
       $(".conditionHintTipsNull").css("display","none")
     }
-    $(".conditionHintTips").append('<div class="conditionMain">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
+    $(".conditionHintTips").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
   }
 }
 function ybzlFun(data){//一般治疗
-  $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗</p><p class="commonTreat">'+data+'</p></div>')
+  $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗</p><p class="commonTreat clearfix">'+data+'</p></div>')
   var commonTreatHeight = $(".commonTreat").height()
   if(commonTreatHeight > 25){
     $(".commonTreat").addClass('medicinePartLimitHeight').append('<span class="slideDown">更多 <i></i></span>')
@@ -108,7 +108,7 @@ function cyywFun(data){//常用药物
         // strPart += '<span class="'+(tmpPart.forbidden == 2?'medicine medicineDis':'medicine')+'" title="点击该名称可看详细说明"><a href="drugInfo.html?type=8&position=5&questionId='+tmpPart.id+'"></a>'+tmpPart.medicitionName+'</span><span class="'+(tmpPart.forbidden == 2?'medicineWaringDis':'medicineWaring')+'">'+(tmpPart.forbidden == 1?'慎用':tmpPart.forbidden == 2?'禁用':'')+'</span>,使用率'+tmpPart.rate+((j == tmpVal.medicitionsList.length-1)?' ;':', ')
       }
     }
-    $(".treatMedicine").append('<p class="medicinePart">'+str+strPart+'</p>')
+    $(".treatMedicine").append('<p class="medicinePart clearfix">'+str+strPart+'</p>')
   }
   $(".treatMedicine").prepend('<p class="treatPlan">常用药物治疗</p>')
   var treatList = $(".treatMedicine").find(".medicinePart")

+ 18 - 15
src/js/scale.js

@@ -1,4 +1,6 @@
 const qs = require('qs');
+import {post,config,getUrlArgObject} from './promise.js';
+
 $(function(){
     // 从地址栏获取参数,请求量表内容
     function GetQueryString(name){     
@@ -14,21 +16,21 @@ $(function(){
     var urlParam = parseUrlParams(); //参数
     // 用GetQueryString方法从地址栏获取参数,暂时写死
     var params = {
-    //   "age": parseInt(urlParam.age) || 28,
-    //   "featureType": urlParam.featureType ||'21',
-    //   "scaleId": urlParam.scaleId ||40744,
-    //   "scaleName": urlParam.scaleName || "密西根糖尿病周围神经病评分(MDNS)",
-    //   "sex": parseInt(urlParam.sex) || 1,
-    //   "diag": urlParam.diag || "肺结核(复诊); ",
-    //   "lis":    JSON.parse(urlParam.lis) || []
+      "age": getUrlArgObject('age') || 28,
+      "featureType": getUrlArgObject('featureType') ||'21',
+      "scaleId": getUrlArgObject('scaleId') ||40744,
+      "scaleName": getUrlArgObject('scaleName') || "密西根糖尿病周围神经病评分(MDNS)",
+      "sex": getUrlArgObject('sex') || 1,
+      "diag": getUrlArgObject('diag') || "肺结核(复诊); ",
+      "lis": getUrlArgObject('lis')?JSON.parse(getUrlArgObject('lis')) : []
 
-      "age": 28,
-      "featureType": '21',
-      "scaleId": id,
-      "scaleName": name,
-      "sex": 1,
-      "diag": "肺结核(复诊); ",
-      "lis":  []
+      // "age": 28,
+      // "featureType": '21',
+      // "scaleId": id,
+      // "scaleName": name,
+      // "sex": 1,
+      // "diag": "肺结核(复诊); ",
+      // "lis":  []
     
     }
     if(id){
@@ -41,7 +43,7 @@ $(function(){
         success:function(res){ 
           if(res.code==0){
             scaleInfo = res.data.scale;
-            // console.log('量表数据为:',scaleInfo);
+            console.log('量表数据为:',scaleInfo);
             for (var i = 0; i < scaleInfo.length; i++) {
                 if( scaleInfo[i].type == 1) {
                     var scaleList = JSON.parse(scaleInfo[i].content)
@@ -99,6 +101,7 @@ $(function(){
   })
 
 function renderCalcu(scaleList) {
+  console.log(scaleList)
     $("h1").html(scaleList.scaleName);
     var str = ''
     for(var j = 0; j < scaleList.group.length; j++) {

+ 17 - 17
src/page.js

@@ -1,19 +1,19 @@
 import './css/page.css'
 
-var lis = [{detailName: "HGB*3/HCT",maxValue: "",minValue: "",name: "血常规",otherValue: "",source: "0",time: "2019-05-07 17:11",uniqueName: "血常规-HGB*3/HCT",units: "",value: "4"}]
-// var lis = [
-//   {
-//     detailName: "HGB*3/HCT",
-//     maxValue: "",
-//     minValue: "",
-//     name: "血常规",
-//     otherValue: "",
-//     source: "0",
-//     time: "2019-05-07 17:11",
-//     uniqueName: "血常规-HGB*3/HCT",
-//     units: "",
-//     value: "4"
-//   }
-// ]
-$(".iframeContainer").attr("src",'index.html?age=99&&lisJson='+JSON.stringify(lis)+'&diagJson=急性胰腺炎&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg')
-// $(".iframeContainer").attr("src",'index.html?age=99&&lis=[{detailName: "HGB*3/HCT",maxValue: "",minValue: "",name: "血常规",otherValue: "",source: "0",time: "2019-05-07 17:11",uniqueName: "血常规-HGB*3/HCT",units: "",value: "4"}]')
+// var lis = [{detailName: "HGB*3/HCT",maxValue: "",minValue: "",name: "血常规",otherValue: "",source: "0",time: "2019-05-07 17:11",uniqueName: "血常规-HGB*3/HCT",units: "",value: "4"}]
+var lis = [
+  {
+    detailName: "HGB*3/HCT",
+    maxValue: "",
+    minValue: "",
+    name: "血常规",
+    otherValue: "",
+    source: "0",
+    time: "2019-05-07 17:11",
+    uniqueName: "血常规-HGB*3/HCT",
+    units: "",
+    value: "4"
+  }
+]
+$(".iframeContainer").attr("src",'index.html?age=99&lisJson='+JSON.stringify(lis)+'&diagJson=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg')
+// $(".iframeContainer").attr("src",'index.html?age=99&lisJson=[{detailName: "HGB*3/HCT",maxValue: "",minValue: "",name: "血常规",otherValue: "",source: "0",time: "2019-05-07 17:11",uniqueName: "血常规-HGB*3/HCT",units: "",value: "4"}]&diagJson=急性胰腺炎&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg')