Browse Source

修改页面推送模式量表(2733)

zhangxc 5 years ago
parent
commit
2262c0775c
6 changed files with 25 additions and 25 deletions
  1. 6 3
      src/js/illness.js
  2. 5 3
      src/js/indexHorizontalDom.js
  3. 5 3
      src/js/indexVertDom.js
  4. 4 14
      src/js/scale.js
  5. 4 1
      src/js/staticSearch.js
  6. 1 1
      webpack.config.js

+ 6 - 3
src/js/illness.js

@@ -66,7 +66,8 @@ function bqtsFun(data){//病情提示
     for(var m = 0;m < tmpBq.details.length;m++){
       var tmpBqDetail = tmpBq.details[m]
       if(tmpBqDetail.type == 1){
-        tmpBqDetailStr+=tmpBqStr+ "<div target='_blank' data-scaleName="+tmpBqDetail.content.name+" href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diseaseName"+msg.diseaseName+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&symptom="+msg.symptom+"&other="+msg.other+"&pacs="+msg.pacs+"&vital="+msg.vital+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>【"+tmpBqDetail.content.name+"】</div>"+
+       
+        tmpBqDetailStr+=tmpBqStr+ "<div target='_blank' data-scaleName="+tmpBqDetail.content.name+"  class='illnessTable'>【"+tmpBqDetail.content.name+"】</div>"+
           '</div>';
       }
       if(tmpBqDetail.type == 2){
@@ -164,7 +165,9 @@ function bqtsFun(data){//病情提示
     openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
   })
   $(".illnessTable").on('click',function(){
-    const scaleName = $(this).attr('data-scaleName')
-    openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${scaleName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)
+    const msg1 = JSON.parse(JSON.stringify(msg))
+    msg1.scaleName = $(this).attr('data-scaleName')
+    msg1.featureType = 21
+    openNewWin(`scale.html?msg=${encodeURIComponent(JSON.stringify(msg1))}`)
   })
 }

+ 5 - 3
src/js/indexHorizontalDom.js

@@ -374,7 +374,7 @@ function renderRecommendConditTips(icon, className,title,data) {
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
+            tmpBqDetailStr+=`<span data-scaleName=${tmpBqDetail.content.name} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
           }
           if(tmpBqDetail.type == 4){
             // tmpBqDetailStr+=`<span class="sriticalinfo">&nbsp;${tmpBqDetail.content.name}(诊断要点)</span>`
@@ -391,8 +391,10 @@ function renderRecommendConditTips(icon, className,title,data) {
         openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
       })
       $('.alertModal .illnessTable').on('click', function(){
-        const infoMsgUrl = $(this).attr('data-url')
-        openNewWin(infoMsgUrl)
+        const msg1 = JSON.parse(JSON.stringify(msg))
+        msg1.scaleName = $(this).attr('data-scaleName')
+        msg1.featureType = 21
+        openNewWin(`scale.html?msg=${encodeURIComponent(JSON.stringify(msg1))}`)
       })
       $(".conditTipsbox").on('click',".more",function(){
         // openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${JSON.stringify(msg.lis)}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&diseaseName=${msg.diseaseName}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}&msg=${JSON.stringify(msg)}`)

+ 5 - 3
src/js/indexVertDom.js

@@ -314,7 +314,7 @@ function renderRecommendConditTips(className,title,data) {
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
+            tmpBqDetailStr+=`<span data-scaleName=${tmpBqDetail.content.name} class="illnessTable">${tmpBqDetail.content.name}</span>`
           }
           if(tmpBqDetail.type == 2){
             var deepDetailName = `<div class="modalTitle">${tmpBqDetail.content.name}<i class="closeModal"></i></div>`
@@ -422,8 +422,10 @@ function renderRecommendConditTips(className,title,data) {
         openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
       })
       $('.alertModal .illnessTable').on('click', function(){
-        const infoMsgUrl = $(this).attr('data-url')
-        openNewWin(infoMsgUrl)
+        const msg1 = JSON.parse(JSON.stringify(msg))
+        msg1.scaleName = $(this).attr('data-scaleName')
+        msg1.featureType = 21
+        openNewWin(`scale.html?msg=${encodeURIComponent(JSON.stringify(msg1))}`)
       })
       bindTipsEvent()
 }

+ 4 - 14
src/js/scale.js

@@ -8,20 +8,10 @@ let hasCalc = false;
 $(function () {
   var scaleInfo;
   // 用GetQueryString方法从地址栏获取参数,暂时写死
-  var params = {
-    "age": getUrlArgObject('age') || 28,
-    "featureType": getUrlArgObject('featureType') || '21',
-    "scaleName": getUrlArgObject('scaleName') || '密西根糖尿病周围神经病评分(MDNS)',
-    "sex": getUrlArgObject('sex') || 1,
-    "diag": getUrlArgObject('diag') || '肺结核(复诊);',
-    "lis": getUrlArgObject('lis') ? JSON.parse(getUrlArgObject('lis')) : [],
-    "symptom": getUrlArgObject('symptom') || '',
-    "other": getUrlArgObject('other') || '',
-    "pacs": getUrlArgObject('pacs') || '',
-    "vital": getUrlArgObject('vital') || ''
-  }
-
-  if (getUrlArgObject('scaleName')) {
+  
+  var msg = JSON.parse(getUrlArgObject('msg'))
+  var params =  msg
+  if (msg.scaleName) {
     post(config.pushScale, params).then((res) => {
       const data = res.data.data
       if (res.data.code == 0) {

+ 4 - 1
src/js/staticSearch.js

@@ -121,7 +121,10 @@ $(".staticSearchB ul").on("click","li",function(){
         openNewWin(`information.html?type=${sign}&position=0&name=${infoMsgName}&uname=${infoMsgUName}`)
     }else{
         let msg = JSON.parse(getUrlArgObject("msg"));
-        openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${infoMsgName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)
+        const msg1 = JSON.parse(JSON.stringify(msg))
+        msg1.scaleName = infoMsgName
+        msg1.featureType = 21
+        openNewWin(`scale.html?msg=${encodeURIComponent(JSON.stringify(msg1))}`)
     }
 })
 

+ 1 - 1
webpack.config.js

@@ -4,7 +4,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:5050";
+const proxyHost = "http://192.168.2.241:5050";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),