修改

src/html/informationOut.html

@@ -47,6 +47,16 @@
       </div>
     </div>
   </div>
+  <div class=" container disCopy clinicalGuideline">
+    <div class="content">
+      <div class="infos"></div>
+      <div class="anchors">
+        <div class="a-circle"></div>
+        <ul></ul>
+        <div class="a-circle a-circle-2"></div>
+      </div>
+    </div>
+  </div>
   <div class=" container disCopy notice">
     <div class="content">
       <div class="infos"></div>

webpack.config.js

@@ -4,7 +4,12 @@ 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://173.18.12.192:6060";
+const proxyHost = 'http://172.16.8.60:6060';
+>>>>>>> bcc6bf9d (修改)
 module.exports = {
   entry: {
     //index: path.resolve(__dirname, 'src/js', 'index.js'),
@@ -19,11 +24,11 @@ module.exports = {
     cdssHorizontal: path.resolve(__dirname, 'src/js', 'cdssHorizontal.js'),
     smartAlert: path.resolve(__dirname, 'src/js', 'smartAlert.js'),
     caseWriteStandard: path.resolve(__dirname, 'src/js', 'caseWriteStandard.js'),
-    generalTreat:path.resolve(__dirname, 'src/js', 'generalTreat.js'),
-    cdssPlan:path.resolve(__dirname, 'src/js', 'cdssPlan.js'),
-    homeStatic:path.resolve(__dirname, 'src/js', 'homeStatic.js'),
-    searchStaticList:path.resolve(__dirname, 'src/js', 'searchStaticList.js'),
-    staticInfo:path.resolve(__dirname, 'src/js', 'staticInfo.js'),
+    generalTreat: path.resolve(__dirname, 'src/js', 'generalTreat.js'),
+    cdssPlan: path.resolve(__dirname, 'src/js', 'cdssPlan.js'),
+    homeStatic: path.resolve(__dirname, 'src/js', 'homeStatic.js'),
+    searchStaticList: path.resolve(__dirname, 'src/js', 'searchStaticList.js'),
+    staticInfo: path.resolve(__dirname, 'src/js', 'staticInfo.js'),
     //staticInfoOut:path.resolve(__dirname, 'src/js', 'informationOut.js'),
     vendor: 'lodash'// 多个页面所需的公共库文件，防止重复打包带入
   },
@@ -343,10 +348,10 @@ module.exports = {
     },
     hot: true,
     // openPage:'index.html?age=28&tipsName=血常规&tipsType=12&diseaseId=280&lisJson=&diagJson=急性胰腺炎&diseaseName=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001',
-    openPage:'homeStatic.html?mrId=200821362618001909&hospitalId=1&planCode=plan_default',
+    openPage: 'homeStatic.html?mrId=200821362618001909&hospitalId=1&planCode=plan_default',
     disableHostCheck: true
   },
   stats: { children: false },
 
- 
+
 }