Merge branch 'master' of http://173.18.12.196:3000/front/icssDService

src/js/cdss.js

@@ -25,10 +25,13 @@ require('./../images/t2.png')
 require('./../images/t3.png')
 require('./../images/go.png')
 require('./../images/g1.png')
+<<<<<<< HEAD
 require('./../images/xhg1.png')
 require('./../images/xhg2.png')
 require('./../images/xhg3.png')
 require('./../images/xhg4.png')
+=======
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
 // require('./popupEdit.js');
 
 let infoImg = require('./../images/icon_info.png')
@@ -38,10 +41,14 @@ let iconArrowDown = require('./../images/icon_arrow_down.png')
 let iconMark = require('./../images/icon_mark.png')
 let warnImg = require('./../images/icon_warning.png')
 let warnImgWhite = require('./../images/icon_waring_white.png')
+<<<<<<< HEAD
 let xhg1img = require('./../images/xhg1.png')
 let xhg2img = require('./../images/xhg2.png')
 let xhg3img = require('./../images/xhg3.png')
 let xhg4img = require('./../images/xhg4.png')
+=======
+
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
 
 const $ = require("jquery");
 const { post, config, getUrlArgObject, openNewWin, titleConfig } = require('./promise.js');
@@ -274,6 +281,7 @@ function renderPage(pageSet) {
     return;
   }
   if (hasAuxiliary) {
+    console.log(hasAuxiliary);
     $('.empty-box').hide();
     $(".loading").show();
     renderModuleWrapper(planDetail)
@@ -307,9 +315,15 @@ function renderPushData() {
       let pacsPush = result.pacs || []
       let symptomPush = result.symptom || []
       let checkupPush = result.vital || []
+<<<<<<< HEAD
       let medicinesPush = result.medicine || []
       let casesPush = result.classicCase || []
       //let casesPush = ['111', '222', '333'] || []//经典病历
+=======
+      let medicinesPush = result.medicines || []
+      //let casesPush = result.cases || [] //经典病历
+      let casesPush = ['111', '222', '333']
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
       let operationsPush = result.operations || []
       let treatPush = result.treat && result.treat[0] || {}
       let nursePush = result.nurse || []
@@ -321,9 +335,14 @@ function renderPushData() {
       let checkupNum = $(".moduleItem.vital").attr("data-num") || 5
       let symptomNum = $(".moduleItem.symptom").attr("data-num") || 5
       let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
+      let casesNum = $(".moduleItem.classiccase").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
       let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
+<<<<<<< HEAD
       let casesNum = $(".moduleItem.classiccase").attr("data-num") || 5//经典病历
+=======
+
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
       renderLis(lisPush, lisNum)
       renderScale(scalePush, scaleNum)
       renderPacs(pacsPush, pacsNum)
@@ -331,6 +350,7 @@ function renderPushData() {
       renderSymptomPush(symptomPush, symptomNum)
       renderDiag(diagPush)
       renderMedicinesPush(medicinesPush, medicinesNum)
+      renderCasesPush(casesPush, casesNum)//经典病历
       renderOperationPush(operationsPush, operationsNum)
       rendergeneraTreatPush(generaTreatPush)
       renderNurse(nursePush, nurseNum)
@@ -350,7 +370,11 @@ function adjustHei() {
 //这段代码通过遍历给定的 list 数组，并根据预定义的 pushCode 数组以及项目的 status 属性，判断是否存在需要推送的项目。它返回一个布尔值，用于表示是否需要执行推送操作
 function isNeedPush(list) {
   let pass = false;
+<<<<<<< HEAD
   let pushCode = ['critical', "diag", "lis", "pacs", "symptom", "vital", "treat", "medicines", 'evaluation', 'general', 'medicine', 'operation', 'nurse', 'classiccase']
+=======
+  let pushCode = ['critical', "diag", "lis", "pacs", "symptom", "vital", "treat", "medicines", 'evaluation', 'general', 'medicine', 'operation', 'nurse', 'classiccase']//修改
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
   for (let i = 0; i < list.length; i++) {
     if (pushCode.indexOf(list[i].code) > -1) {
       if (list[i].status == "1") {
@@ -358,6 +382,7 @@ function isNeedPush(list) {
       }
     }
   }
+  console.log(pass);
   return pass;
 }
 function isNeedwriteStandardPush(list) {
@@ -608,6 +633,7 @@ function rendergeneraTreatPush(list) {
 }
 function renderMedicinesPush(obj, showNum) {
   $(".moduleItem.medicine").append(titleStr('drugPush'))
+<<<<<<< HEAD
   let showNum1 = showNum || 5
   let keys = Object.keys(obj);
   let str1 = "";
@@ -630,6 +656,9 @@ function changeMedicine() {
   $(".showMoreMedicine").on("click", function () {
     // 显示所有文本
     $(this).prev().css("max-height", "none");
+=======
+  console.log($(".moduleItem.medicine").length);
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
 
     // 隐藏下拉按钮
     $(this).hide();
@@ -662,9 +691,25 @@ function renderCasesPush(list, showNum) {
 
 }
 
+<<<<<<< HEAD
 function renderOperationPush(list, showNum) {
   $(".moduleItem.operation").append(titleStr('operationPush'))
   console.log($(".moduleItem.operation").length);
+=======
+function renderCasesPush(list, showNum) {
+  $(".moduleItem.classiccase").append(titleStr('classicPush'))
+  console.log($(".moduleItem.classiccase").length);
+  if (list.length > 0 && $(".moduleItem.classiccase").length > 0) {
+    moduleNum++
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
+    $(".moduleItem.classiccase").append(shortStr).append(longStr)
+    $(".moduleItem.classiccase").css("display", "block")
+  }
+
+}
+function renderOperationPush(list, showNum) {
+  $(".moduleItem.operation").append(titleStr('operationPush'))
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
   if (list.length > 0 && $(".moduleItem.operation").length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, showNum)
@@ -684,6 +729,8 @@ function renderItemWrapper(list, showNum, name) {
     }
     longStr += renderPushItem(list[i], name, i, list.length)
   }
+  console.log(shortStr);
+
   if (showNum1 >= list.length) {
     return {
       shortStr: `<div class="shortBox">${shortStr}</div>`,

webpack.config.js

@@ -4,12 +4,17 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
+<<<<<<< HEAD
 
 
 
 //const proxyHost = "http://173.18.12.192:6060";
 const proxyHost = 'http://172.16.8.60:6060';
 
+=======
+//const proxyHost = "http://173.18.12.192:6060";
+const proxyHost = 'http://172.16.8.60:6060';
+>>>>>>> bcc6bf9d940153112681730de63a6b6a7536e4e4
 module.exports = {
   entry: {
     //index: path.resolve(__dirname, 'src/js', 'index.js'),