浏览代码

bug修改

Luolei 6 年之前
父节点
当前提交
557c47d112
共有 3 个文件被更改,包括 31 次插入11 次删除
  1. 3 2
      src/html/index.html
  2. 7 6
      src/index.js
  3. 21 3
      src/js/indexDom.js

+ 3 - 2
src/html/index.html

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

+ 7 - 6
src/index.js

@@ -3,7 +3,7 @@ import './css/reset.css';
 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';
+import {bqtsFun,ybzlFun,cyywFun,knzdFun,jtFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun,yszdFun} from './js/indexDom';
 //地址栏参数 ?age=99&lisJson=&diseaseId=&diagJson=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg
 
 // var msg= {
@@ -49,7 +49,6 @@ window.pushMessage = {}
 
 
 post(config.pushInner,msg).then((res)=>{
-  console.log('index')
   var data = res.data
   if(data.code == 0){
     var result = data.data;
@@ -69,12 +68,14 @@ post(config.pushInner,msg).then((res)=>{
     if(result.dis){
       var proB = result.dis['可能诊断'] || []//可能
       var proY = result.dis['确诊'] || []//确诊
-      var plusPro = proB.concat(proY)
       var proWaring = result.dis['警惕'] || []
-      knzdFun(plusPro)
-      jtFun(proWaring)
-      if(plusPro.length > 0 || proWaring.length > 0){
+      yszdFun(proY)//疑似
+      knzdFun(proB)//可能
+      jtFun(proWaring)//警惕
+      if(proY.length == 0){
         $(".conditionHintMay").css("display","none")
+      }else{
+        $(".conditionHintMayNull").css("display","none")
       }
     }
     if(result.symptom && result.symptom.length > 0){//推荐问诊症状

+ 21 - 3
src/js/indexDom.js

@@ -14,14 +14,18 @@ function bqtsFun(data){//病情提示
         var deepDetailResultStr = ''
         for(var n = 0;n < tmpBqDetail.content.details.length;n++){
           var deepDetail = tmpBqDetail.content.details[n]
-          if(deepDetail.controlType == 2){
+          if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
             deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"></li>'
           }
-          if(deepDetail.controlType == 1){
+          if(deepDetail.controlType == 0){
             let tooDeepDetailStr = ''
             for(var f = 0;f<deepDetail.details.length;f++){
               var tooDeepDetail = deepDetail.details[f]
-              tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
+              if(deepDetail.name == '性别'){
+                tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+              }else{
+                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">'+
@@ -152,6 +156,19 @@ function jtFun(data){
   $(".conditionHintWaringsLis").append(tmpStr)
   slideToggle($(".conditionHintWaringsLis"))  
 }
+function yszdFun(data){
+  var tmpStr = ''
+  for(var i = 0;i < data.length;i++){
+    $(".conditionHintMay").css("display","block")
+    if(data[i].id){
+      tmpStr+='<li class="infoMsgParent">'+data[i].name+'<a target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&questionId='+data[i].id+'"></a></li>'
+    }else{
+      tmpStr+='<li>'+data[i].name+'</li>'
+    }
+  }
+  $(".conditionHintMayLis").append(tmpStr)
+  slideToggle($(".conditionHintMayLis"))  
+}
 function tjwzFun(data){
   var tmpStr = ''
   for(var i = 0;i < data.length;i++){
@@ -207,4 +224,5 @@ export {
   tjtgFun,
   tjhyFun,
   tjfjFun,
+  yszdFun
 }