Merge branch 'test' of http://192.168.2.236:10080/zhouna/icssDService into test

src/html/drugInfo.html

@@ -135,7 +135,6 @@
         </div>
     </div>
 </div>
-<!-- <script src="./js/jquery-1.9.1.min.js"></script>
-<script src="./js/information.js"></script> -->
+<script src="./../js/information.js"></script>
 </body>
 </html>

src/js/disclaimer.js

@@ -1,10 +1,9 @@
-import {post} from './promise.js';
+import {post, config} from './promise.js';
 
 (function(){
     getDisclaimer();
     function getDisclaimer() {
-        var url ='http://192.168.2.236:5050/api/icss/disclaimerInformation/getDisclaimerInformations';
-        post(url, '').then((res) => {
+        post(config.disclaimer, '').then((res) => {
             const data = res.data.data;
             $("h1").html(data[2].title);
             $(".content").html(data[2].description);

src/js/drugInfo.js

@@ -1,71 +0,0 @@
-import {post, imageUrlPrefix,getUrlArgObject, throttle} from './promise.js';
-(function(){
-    getInfomation();
-    function getInfomation(){
-        var infoUrl ='http://192.168.2.236:5050/api/icss/introduceInfo/getByQuestionId'
-      
-        var param = {
-            "type":  getUrlArgObject('type'),
-            "questionId":  getUrlArgObject('questionId'),
-            "position": getUrlArgObject('position')
-        };
-        post(infoUrl, param).then((res) => {
-            const data = res.data.data
-            var str='',anchors='',item='';
-            if(!data){
-                $("h1").html("暂时没有数据");
-                $(".anchors").css("display", "none");
-                return;
-            }
-            var list  = data.introduceDetailList;
-            $("h1").html(data.tagName);
-            for(var i=0;i<list.length;i++) {
-                item = list[i];
-                item.content = item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)
-                anchors = '<li><i></i><a href="#' + item.id +
-                    '">' + item.title + '</a></li><li class="anchor-line"></li>';
-                str = '<div class="title"><h2 id="' + item.id +
-                    '">' + '【'+ item.title + '】'+
-                    '</h2></div>' +
-                    '<div class="contentBox">' + item.content + '<div>';
-                $(".infos").append(str);
-                $(".anchors ul").append(anchors);
-            }
-            addLinkClickEvent();
-            adjustHeight();
-
-            function addScrollEvent() {
-                var scrollTop = $('.infos').scrollTop()
-                var divHeight = 0;
-                for (var i = 0; i < list.length; i++) {
-                    divHeight = divHeight + parseInt($('#' + list[i].id).css('height')) + parseInt($('#' + list[i].id).parent().next().css('height')) +40
-                    if(divHeight > scrollTop) {
-                        var anchor = 2*i
-
-                        $('.anchors ul').children().eq(anchor).addClass('active').siblings().removeClass('active')
-                        return
-                    }
-                }
-            }
-            $(".infos").scroll(throttle(addScrollEvent,200))
-
-        })
-
-
-    }
-
-
-    function addLinkClickEvent(){
-        $("li:first").addClass("active");
-        $("li>a").on("click",function(){
-            $(".active").removeClass('active');
-            $(this).parent().addClass("active");
-        });
-    }
-
-    function adjustHeight(){
-        var ht = window.innerHeight;
-        $(".content").height(ht-145+"px");
-    }
-
-})();

src/js/information.js

@@ -1,10 +1,9 @@
-import {post, throttle, imageUrlPrefix, getUrlArgObject} from './promise.js';
+import {post, throttle, imageUrlPrefix, config, getUrlArgObject} from './promise.js';
 (function(){
     getInfomation();
     function getInfomation(){
         // var infoUrl ="http://" + window.location.host+'/icss-web/kl/introduce/get_by_itemidAndType';
         // var infoUrl ="http://" + window.location.host+'/api/icss/introduceInfo/getByQuestionId';
-        var infoUrl ='http://192.168.2.236:5050/api/icss/introduceInfo/getByQuestionId'
        
         var param = {
             "type":  getUrlArgObject('type'),
@@ -12,7 +11,7 @@ import {post, throttle, imageUrlPrefix, getUrlArgObject} from './promise.js';
             "position": getUrlArgObject('position')
         };
 
-        post(infoUrl, param).then((res) => {
+        post(config.information, param).then((res) => {
 
             const data = res.data.data
             console.log(res) 
@@ -31,10 +30,15 @@ import {post, throttle, imageUrlPrefix, getUrlArgObject} from './promise.js';
                 anchors = '<li><i></i><a href="#' + item.id +
                     '">' + item.title + '</a></li><li class="anchor-line"></li>';
                 str = '<div class="title"><h2 id="' + item.id +
-                    '">' + item.title +
-                    '</h2></div>' +
-                    '<div>' + item.content + '<div>';
-                if(i != list.length-1) {
+                    '">'
+                if(getUrlArgObject('type') == 8) {
+                    str += '【'+ item.title + '】'
+                } else {
+                    str +=  item.title 
+                }
+                str += '</h2></div>' +
+                '<div>' + item.content + '<div>';
+                if(i != list.length-1 && getUrlArgObject('type') != 8) {
                     str +=  '<div class="line"></div>'
                 }
                 $(".infos").append(str);

src/js/promise.js

@@ -2,7 +2,9 @@ const qs = require('qs');
 import '@babel/polyfill'
 const config = {
   pushInner:'/api/icss/push/pushInner',
-  calculate:'/api/icss/calc/calculate'
+  calculate:'/api/icss/calc/calculate',
+  disclaimer: '/api/icss/disclaimerInformation/getDisclaimerInformations',
+  information: '/api/icss/introduceInfo/getByQuestionId',
 }
 const imageUrlPrefix = 'http://192.168.2.241:82';
 const getUrlArgObject = (parm) => {  

src/js/scale.js

@@ -1,37 +1,32 @@
-import {post,getUrlArgObject} from './promise.js';
+import {post,config, getUrlArgObject} from './promise.js';
 
 $(function(){
-    // 从地址栏获取参数，请求量表内容
-    function GetQueryString(name){     
-      var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");     
-      var r = window.location.search.substr(1).match(reg);     
-      if(r!=null)return  unescape(r[2]); return null;
-    }
+    
 
     var scaleInfo;
-    var id = GetQueryString('id') || 40743;
-    var name = GetQueryString('name') || "危重病人APACHEII评分表";
-    var url = "http://192.168.2.236:5050/api/icss/push/pushInner";
     // 用GetQueryString方法从地址栏获取参数，暂时写死
     var params = {
       "age": getUrlArgObject('age') || 28,
       "featureType": getUrlArgObject('featureType') ||'21',
       "scaleId": getUrlArgObject('scaleId') ||40744,
-      "scaleName": getUrlArgObject('scaleName') || "密西根糖尿病周围神经病评分（MDNS）",
+      "scaleName": getUrlArgObject('scaleName') || '密西根糖尿病周围神经病评分（MDNS）',
       "sex": getUrlArgObject('sex') || 1,
-      "diag": getUrlArgObject('diag') || "肺结核(复诊); ",
-      "lis": getUrlArgObject('lis')?JSON.parse(getUrlArgObject('lis')) : []
+      "diag": getUrlArgObject('diag') || '肺结核(复诊);' ,
+      "lis": getUrlArgObject('lis')?JSON.parse(getUrlArgObject('lis')) : [],
+      "symptom": getUrlArgObject('symptom') || '',
+      "other": getUrlArgObject('other') || '',
+      "pacs": getUrlArgObject('pacs') || '',
+      "vital": getUrlArgObject('vital') || ''
     }
 
-    if(id){
-        post(url, params).then((res) => {
+    if(getUrlArgObject('scaleId')){
+        post(config.pushInner, params).then((res) => {
             const data = res.data.data
             if(res.data.code==0){
                 scaleInfo = data.scale;
                 for (var i = 0; i < scaleInfo.length; i++) {
                     if( scaleInfo[i].type == 1) {
                         var scaleList = JSON.parse(scaleInfo[i].content)
-                        console.log('scaleList', scaleList)
                         renderCalcu(scaleList)
                     } else {
                         $('.content').append(scaleInfo[i].content)
@@ -87,7 +82,6 @@ $(function(){
   })
 
 function renderCalcu(scaleList) {
-  console.log(scaleList)
     $("h1").html(scaleList.scaleName);
     var str = ''
     for(var j = 0; j < scaleList.group.length; j++) {
@@ -101,7 +95,7 @@ function renderCalcu(scaleList) {
                         str2 += ' checked="checked"'
                     }
                     str2 += ' />'+'<label for="'+ j + x + y + z+'">' + scaleList.group[j].rows[x].row[y].details[z].detailName + '('+scaleList.group[j].rows[x].row[y].details[z].score +')'+'</label>'
-                    if (scaleList.group[j].rows[x].row[y].name+scaleList.group[j].rows[x].row[y].details[z].state == 1) {
+                    if (scaleList.group[j].rows[x].row[y].details[z].state == 1) {
                         str2 += '<span class="groupRowRecommend">智能推荐</span>'
                     }
                     str2 += '</span>'

webpack.config.js

@@ -10,7 +10,6 @@ module.exports = {
     index: path.resolve(__dirname, 'src', 'index.js'),
     page: path.resolve(__dirname, 'src', 'page.js'),
     information: path.resolve(__dirname, 'src/js', 'information.js'),
-    drugInfo: path.resolve(__dirname, 'src/js', 'drugInfo.js'),
     disclaimer: path.resolve(__dirname, 'src/js', 'disclaimer.js'),
     scale: path.resolve(__dirname, 'src/js', 'scale.js'),
     vendor: 'lodash', // 多个页面所需的公共库文件，防止重复打包带入