6 年前 · 5c9d17e539
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
 
																     "copy-webpack-plugin": "^4.5.1",
															
 
																     "cross-env": "^5.1.4",
															
 
																     "css-loader": "^0.28.10",
															
 
																+    "echarts": "^4.2.1",
															
 
																     "es3ify-webpack-plugin": "0.0.1",
															
 
																     "eventsource-polyfill": "^0.9.6",
															
 
																     "express": "^4.16.2",
															
@@ -62,6 +63,7 @@
 
																     "anujs": "1.4.8",
															
 
																     "axios": "^0.18.0",
															
 
																     "babel-polyfill": "6.26.0",
															
 
																+    "echarts": "^4.2.1",
															
 
																     "jquery": "1.12.4",
															
 
																     "koa-body": "^4.0.4",
															
 
																     "koa-router": "^7.4.0",
															
--- a/src/common/components/ComplexModal/index.jsx
+++ b/src/common/components/ComplexModal/index.jsx
@@ -0,0 +1,41 @@
 
																+import React, { Component } from "react";
															
 
																+import ReactDom from "react-dom";
															
 
																+import style from "./index.less";
															
 
																+import Notify from '@commonComp/Notify';
															
 
																+import close from '@common/images/icon_close.png';
															
 
																+/**
															
 
																+ * title:标题
															
 
																+ * children：弹窗内容
															
 
																+ * onClose:弹窗关闭事件
															
 
																+ * shadeClose:点蒙层关闭，默认true
															
 
																+ *footer:固定在弹窗底部的内容如确定按钮
															
 
																+ *icon:标题前的图标
															
 
																+ *width:弹窗的宽度
															
 
																+ *height:弹窗的高度
															
 
																+ * **/
															
 
																+
															
 
																+class ComplexModal extends Component {
															
 
																+  constructor(props) {
															
 
																+    super(props)
															
 
																+  }
															
 
																+  render() {
															
 
																+    const { onclose,title,children,footer,shadeClose,icon,width,height} = this.props;
															
 
																+    const marginLeft = width? -parseInt(width)/2 : '';
															
 
																+    const marginTop = height? -parseInt(height)/2: '';
															
 
																+    const domNode = document.getElementById('root');
															
 
																+    return ReactDom.createPortal(<div className={style['container']}>
															
 
																+      <div className={style['shade']} onClick={shadeClose===false?'':onclose}></div>
															
 
																+      <div className={style['modal']} style = {{width: width?width:'auto', marginLeft:marginLeft, height:height?height:'auto', marginTop:marginTop}}>
															
 
																+        <div className={style['close']}>
															
 
																+          {icon?<img src={icon} />:''}
															
 
																+          {title}
															
 
																+          <img src={close} onClick={onclose} className={style['closeIcon']} />
															
 
																+        </div>
															
 
																+        <div className={style["content"]} style = {{width: width?width:'auto'}}>{children}</div>
															
 
																+        <div className={style['footer']} style = {{width: width?width:'auto'}}>{footer}</div>
															
 
																+      </div>
															
 
																+    </div>,domNode);
															
 
																+  }
															
 
																+}
															
 
																+
															
 
																+export default ComplexModal;
															
--- a/src/common/components/ComplexModal/index.less
+++ b/src/common/components/ComplexModal/index.less
@@ -0,0 +1,71 @@
 
																+.container {
															
 
																+  position: relative;
															
 
																+  z-index: 2000;
															
 
																+  .content{
															
 
																+    overflow: auto;
															
 
																+    position: fixed;
															
 
																+    // bottom: 130px;
															
 
																+    // top: 110px;
															
 
																+    // width: 820px;
															
 
																+  }
															
 
																+  .footer{
															
 
																+    // width: 820px;
															
 
																+    position: fixed;
															
 
																+    bottom:80px;
															
 
																+    text-align: right;
															
 
																+  }
															
 
																+  .shade {
															
 
																+    position: fixed;
															
 
																+    left: 0;
															
 
																+    top: 0;
															
 
																+    right: 0;
															
 
																+    bottom: 0;
															
 
																+    background-color: #000;
															
 
																+    opacity: 0.6;
															
 
																+    filter:alpha(opacity=60);
															
 
																+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
															
 
																+  }
															
 
																+  .modal {
															
 
																+    // width: 820px;
															
 
																+    background: #fff;
															
 
																+    position: fixed;
															
 
																+    left: 50%;
															
 
																+    top: 50%;
															
 
																+    // margin-left: -410px;
															
 
																+    // top: 65px;
															
 
																+    // bottom: 65px;
															
 
																+  }
															
 
																+  .close {
															
 
																+    padding:  15px 15px 15px 20px;
															
 
																+    border-bottom: 1px solid #EAEDF1;
															
 
																+    background: #e5eefe;
															
 
																+    img{
															
 
																+      vertical-align: text-top;
															
 
																+    }
															
 
																+    .closeIcon{
															
 
																+      float:right;
															
 
																+      cursor: pointer;
															
 
																+      margin-top: -5px;
															
 
																+    }
															
 
																+  }
															
 
																+  .button {
															
 
																+    position: fixed;
															
 
																+    bottom: 75px;
															
 
																+    left: 50%;
															
 
																+    margin-left: 280px;
															
 
																+    span{
															
 
																+      display: inline-block;
															
 
																+      width: 80px;
															
 
																+      height: 34px;
															
 
																+      background: #3B9ED0;
															
 
																+      font-size: 14px;
															
 
																+      color: #FFFFFF;
															
 
																+      font-size: 14px;
															
 
																+      text-align: center;
															
 
																+      line-height: 34px;
															
 
																+      border-radius: 4px;
															
 
																+      cursor: pointer;
															
 
																+    }
															
 
																+  }
															
 
																+}
															
 
																+
															
--- a/src/common/components/Radio/index.less
+++ b/src/common/components/Radio/index.less
@@ -1,7 +1,7 @@
 
																 .radio{
															
 
																-  width: 120px;
															
 
																-  height: 44px;
															
 
																-  line-height: 44px;
															
 
																+  max-width: 120px;
															
 
																+  height: 35px;
															
 
																+  line-height: 35px;
															
 
																   cursor: pointer;
															
 
																   img{
															
 
																     vertical-align: middle;
															
--- a/src/common/components/Textarea/index.jsx
+++ b/src/common/components/Textarea/index.jsx
@@ -19,7 +19,6 @@ class Textarea extends Component {
 
																     this.handleFocus = this.handleFocus.bind(this);
															
 
																     //this.handleBlur = this.handleBlur.bind(this);
															
 
																     this.handleKeydown = this.handleKeydown.bind(this);
															
 
																-    this.handleKeydown = this.handleKeydown.bind(this);
															
 
																   }
															
 
																   handleFocus(){            //初始显示props中的值，focus已经显示输入的值，避免值更新闪烁
															
 
																     const {handleFocus,fuzhen,handleInput,isChronic} = this.props;
															
@@ -102,14 +101,6 @@ class Textarea extends Component {
 
																       },this);
															
 
																     }
															
 
																   }
															
 
																-  handleKeydown(e){
															
 
																-    const {boxMark} = this.props;
															
 
																-    const ev = e||window.event;
															
 
																-    if(+boxMark==1){
															
 
																-      //禁止回车事件
															
 
																-      if(ev.keyCode==13){return false;}
															
 
																-    }
															
 
																-  }
															
 
																   render() {
															
 
																     const { title } = this.props;
															
 
																     return (
															
@@ -121,7 +112,6 @@ class Textarea extends Component {
 
																              ref={this.$dom}
															
 
																              contentEditable={true}
															
 
																              onInput={this.handleInput}
															
 
																-             onBlur={this.handleBlur}
															
 
																              onkeydown={this.handleKeydown}>
															
 
																         </div>
															
 
																       </div>
															
--- a/src/common/components/index.js
+++ b/src/common/components/index.js
@@ -20,6 +20,7 @@ import EditableSpan from "./EditableSpan";
 
																 import Textarea from "./Textarea";
															
 
																 import NumberUnitPan from "./NumberUnitPan";
															
 
																 import Add from "./Add";
															
 
																+import ComplexModal from "./ComplexModal";
															
 
																 module.exports = {
															
 
																     Banner,
															
@@ -43,5 +44,6 @@ module.exports = {
 
																     EditableSpan,
															
 
																     Textarea,
															
 
																     NumberUnitPan,
															
 
																-    Add
															
 
																+    Add,
															
 
																+    ComplexModal
															
 
																 };
															
--- a/src/common/images/all-table.png
+++ b/src/common/images/all-table.png
--- a/src/common/images/check.png
+++ b/src/common/images/check.png
--- a/src/common/images/delete.png
+++ b/src/common/images/delete.png
--- a/src/common/images/manage.png
+++ b/src/common/images/manage.png
--- a/src/common/images/table.png
+++ b/src/common/images/table.png
--- a/src/common/images/筛选表.png
+++ b/src/common/images/筛选表.png
--- a/src/components/AssessResult/ChartItem/index.jsx
+++ b/src/components/AssessResult/ChartItem/index.jsx
@@ -0,0 +1,51 @@
 
																+import React, { Component } from "react";
															
 
																+import style from "../index.less";
															
 
																+import { Radio} from '@commonComp';
															
 
																+import echarts from 'echarts';
															
 
																+
															
 
																+class ChartItem extends Component {
															
 
																+  constructor(props) {
															
 
																+    super(props);
															
 
																+    this.drawChart = this.drawChart.bind(this);
															
 
																+
															
 
																+  }
															
 
																+  drawChart(id){
															
 
																+    var myChart = echarts.init(document.getElementById(id));
															
 
																+
															
 
																+    // 指定图表的配置项和数据
															
 
																+    var option = {
															
 
																+      tooltip: {},
															
 
																+      legend: {
															
 
																+        data:['销量']
															
 
																+      },
															
 
																+      xAxis: {
															
 
																+        data: ["衬衫","羊毛衫","雪纺衫","裤子","高跟鞋","袜子"]
															
 
																+      },
															
 
																+      yAxis: {},
															
 
																+      series: [{
															
 
																+        name: '销量',
															
 
																+        type: 'line',
															
 
																+        data: [5, 20, 36, 10, 10, 20]
															
 
																+      }]
															
 
																+    };
															
 
																+
															
 
																+    // 使用刚指定的配置项和数据显示图表。
															
 
																+    myChart.setOption(option);
															
 
																+  }
															
 
																+  componentDidMount(){
															
 
																+    this.drawChart('chart1');
															
 
																+    this.drawChart('chart2');
															
 
																+  }
															
 
																+  render() {
															
 
																+    const {title,data  } = this.props;
															
 
																+    return <div className={style['assess-item']}>
															
 
																+      <h2>{title}</h2>
															
 
																+      <div className={style['item-content']}>
															
 
																+        <div className={style["chart-box"]} id={'chart1'}></div>
															
 
																+        <div className={style["chart-box"]} id={'chart2'}></div>
															
 
																+      </div>
															
 
																+    </div>;
															
 
																+  }
															
 
																+}
															
 
																+
															
 
																+export default ChartItem;
															
--- a/src/components/AssessResult/RadioItem/index.jsx
+++ b/src/components/AssessResult/RadioItem/index.jsx
@@ -0,0 +1,41 @@
 
																+import React, { Component } from "react";
															
 
																+import style from "../index.less";
															
 
																+import { Radio} from '@commonComp';
															
 
																+
															
 
																+class RadioItem extends Component {
															
 
																+  constructor(props) {
															
 
																+    super(props)
															
 
																+  }
															
 
																+  render() {
															
 
																+    const {title,data  } = this.props;
															
 
																+    return <div className={style['assess-item']}>
															
 
																+        <h2>{title}</h2>
															
 
																+        <div className={style['item-content']}>
															
 
																+          <ul>
															
 
																+            <li>
															
 
																+              <span>血压控制情况：</span>
															
 
																+              <div className={style['row']}>
															
 
																+                <Radio name='正常' handleClick={null} isSelect={true}></Radio>
															
 
																+                <Radio name='一级' handleClick={null} isSelect={false}></Radio>
															
 
																+              </div>
															
 
																+              <div className={style["recommend"]}>
															
 
																+                推荐选择：正常
															
 
																+              </div>
															
 
																+            </li>
															
 
																+            <li>
															
 
																+              <span>BMI控制情况：</span>
															
 
																+              <div className={style['row']}>
															
 
																+                <Radio name='正常' handleClick={null} isSelect={true}></Radio>
															
 
																+                <Radio name='一级' handleClick={null} isSelect={false}></Radio>
															
 
																+              </div>
															
 
																+              <div className={style["recommend"]}>
															
 
																+                推荐选择：正常
															
 
																+              </div>
															
 
																+            </li>
															
 
																+          </ul>
															
 
																+        </div>
															
 
																+      </div>;
															
 
																+  }
															
 
																+}
															
 
																+
															
 
																+export default RadioItem;
															
--- a/src/components/AssessResult/ScaleItem/index.jsx
+++ b/src/components/AssessResult/ScaleItem/index.jsx
@@ -0,0 +1,38 @@
 
																+import React, { Component } from "react";
															
 
																+import style from "../index.less";
															
 
																+import deleteIcon from '@common/images/delete.png';
															
 
																+
															
 
																+class ScaleItem extends Component {
															
 
																+  constructor(props) {
															
 
																+    super(props)
															
 
																+  }
															
 
																+  render() {
															
 
																+    const {title,data  } = this.props;
															
 
																+    return <div className={style['assess-item']}>
															
 
																+      <h2>{title}</h2>
															
 
																+      <div className={style['item-content']}>
															
 
																+        <ul>
															
 
																+          <li>
															
 
																+            <span>糖尿病周围神经病变：</span>
															
 
																+            <div className={style['row']}>
															
 
																+              正常
															
 
																+            </div>
															
 
																+            <div className={style["recommend"]}>
															
 
																+              <img src={deleteIcon} />
															
 
																+            </div>
															
 
																+          </li>
															
 
																+          <li>
															
 
																+            <span>肾功能不全：</span>
															
 
																+            <div className={style['row']}>
															
 
																+            </div>
															
 
																+            <div className={style["recommend"]}>
															
 
																+              <img src={deleteIcon} />
															
 
																+            </div>
															
 
																+          </li>
															
 
																+        </ul>
															
 
																+      </div>
															
 
																+    </div>;
															
 
																+  }
															
 
																+}
															
 
																+
															
 
																+export default ScaleItem;
															
--- a/src/components/AssessResult/index.jsx
+++ b/src/components/AssessResult/index.jsx
@@ -1,13 +1,24 @@
 
																 import React, { Component } from "react";
															
 
																 import style from "./index.less";
															
 
																+import { Radio} from '@commonComp';
															
 
																+import Notify from '@commonComp/Notify';
															
 
																+import RadioItem from "./RadioItem";
															
 
																+import ScaleItem from "./ScaleItem";
															
 
																+import ChartItem from "./ChartItem";
															
 
																-class AssessResult extends Component{
															
 
																-  constructor(props){
															
 
																-    super(props);
															
 
																-  }
															
 
																-  render(){
															
 
																-    return <div className={style['container']}>
															
 
																-    </div>
															
 
																+class AssessResult extends Component {
															
 
																+  constructor(props) {
															
 
																+    super(props)
															
 
																+  }
															
 
																+  render() {
															
 
																+    const { onClose } = this.props;
															
 
																+    return <div className={style['assess-cont']}>
															
 
																+      <RadioItem title='疗效评估：' data={[]}></RadioItem>
															
 
																+      <ScaleItem title='整体评估：' data={[]}></ScaleItem>
															
 
																+      <ChartItem title='血糖控制情况：' data={[]}></ChartItem>
															
 
																+    </div>;
															
 
																   }
															
 
																-}
															
 
																+}
															
 
																+
															
 
																+export default AssessResult;
															
--- a/src/components/AssessResult/index.less
+++ b/src/components/AssessResult/index.less
@@ -0,0 +1,34 @@
 
																+.assess-cont{
															
 
																+  padding: 15px;
															
 
																+}
															
 
																+.assess-item{
															
 
																+  h2{
															
 
																+    line-height: 40px;
															
 
																+    background: #e5eefe;
															
 
																+    padding: 0 15px;
															
 
																+    font-weight: bold;
															
 
																+  }
															
 
																+  .item-content{
															
 
																+    margin-top: 10px;
															
 
																+    padding: 0 15px;
															
 
																+  }
															
 
																+  li {
															
 
																+    line-height: 35px;
															
 
																+    .row{
															
 
																+      display: inline-block;
															
 
																+    }
															
 
																+    .recommend{
															
 
																+      max-width: 200px;
															
 
																+      float: right;
															
 
																+      color: #929292;
															
 
																+    }
															
 
																+  }
															
 
																+  .chart-box{
															
 
																+    display: inline-block;
															
 
																+    width: 49%;
															
 
																+    height: 225px;
															
 
																+  }
															
 
																+  .chart-box:nth-child(odd){
															
 
																+    margin-right: 2%;
															
 
																+  }
															
 
																+}
															
--- a/src/components/ChronicInfo/index.jsx
+++ b/src/components/ChronicInfo/index.jsx
--- a/src/components/ChronicInfo/index.less
+++ b/src/components/ChronicInfo/index.less
@@ -0,0 +1,205 @@
 
																+.tips{
															
 
																+  border:1px solid #EAEDF1;
															
 
																+  .tips-title,h1{
															
 
																+    font-size: 14px;
															
 
																+    color: #000;
															
 
																+    padding: 8px 15px;
															
 
																+    background: #EAF7FA;
															
 
																+    font-weight: bold;
															
 
																+    img {
															
 
																+      float:left;
															
 
																+      margin-top: 0px;
															
 
																+      margin-right: 5px;
															
 
																+    }
															
 
																+  }
															
 
																+  .tips-title{
															
 
																+    .tips-name{
															
 
																+      width: 255px;
															
 
																+      display: inline-block;
															
 
																+    }
															
 
																+    h2{
															
 
																+      display: inline-block;
															
 
																+    }
															
 
																+    .tips-btn{
															
 
																+      display: inline-block;
															
 
																+      float: right;
															
 
																+    }
															
 
																+    .redTips{
															
 
																+      display: inline-block;
															
 
																+      font-size: 12px;
															
 
																+      -webkit-transform:scale(0.9);
															
 
																+      color: red;
															
 
																+      font-weight: normal;
															
 
																+      white-space: nowrap;
															
 
																+    }
															
 
																+    .tipsDetails {
															
 
																+      display: inline-block;
															
 
																+      font-weight: normal;
															
 
																+      width: 42px;
															
 
																+      height: 20px;
															
 
																+      border: 1px solid #262626;
															
 
																+      border-radius: 4px;
															
 
																+      text-align: center;
															
 
																+      font-size: 12px;
															
 
																+      // color: #3B9ED0;
															
 
																+      color: #262626;
															
 
																+      line-height: 18px;
															
 
																+      margin: 0 0 -2px 10px;
															
 
																+      cursor: pointer;
															
 
																+      }
															
 
																+    }
															
 
																+    .chronic{
															
 
																+      background: rgba(242,150,91,0.1);
															
 
																+    }
															
 
																+    .content{
															
 
																+      font-size: 14px;
															
 
																+      padding:6px 15px;
															
 
																+      .list{
															
 
																+        border-bottom: 1px solid #EAEDF1;
															
 
																+        padding-bottom: 10px;
															
 
																+        position: relative;
															
 
																+        .infoPic{
															
 
																+          vertical-align: middle;
															
 
																+          margin: 0 5px;
															
 
																+        }
															
 
																+        >p{
															
 
																+          margin-top: 10px;
															
 
																+        }
															
 
																+        .listName{
															
 
																+          color:#3B9ED0;
															
 
																+        }
															
 
																+        .listResult{
															
 
																+          float: right;
															
 
																+          color: #000012;
															
 
																+          i{
															
 
																+            color: #F98F24;
															
 
																+          }
															
 
																+          img{
															
 
																+            vertical-align: middle;
															
 
																+          }
															
 
																+        }
															
 
																+        .infoBox{
															
 
																+          position: absolute;
															
 
																+          top:27px;
															
 
																+          width: 388px;
															
 
																+          background: #fff;
															
 
																+          z-index: 66;
															
 
																+          border: 1px solid #EAEDF1;
															
 
																+          box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
															
 
																+          .infoTitle{
															
 
																+            height: 40px;
															
 
																+            line-height: 40px;
															
 
																+            padding-left: 18px;
															
 
																+            // border-bottom: 1px solid #EAEDF1;
															
 
																+            background: #DFEAFE;
															
 
																+            img{
															
 
																+              vertical-align: text-top;
															
 
																+            }
															
 
																+            .closeIcon{
															
 
																+              // vertical-align: middle;
															
 
																+              float: right;
															
 
																+            }
															
 
																+          }
															
 
																+          .infoCon{
															
 
																+            padding: 15px 26px 25px;
															
 
																+          }
															
 
																+        }
															
 
																+      }
															
 
																+      .mainList{
															
 
																+        .listBtn{
															
 
																+          display: inline-block;
															
 
																+          width: 96px;
															
 
																+          height: 26px;
															
 
																+          line-height: 26px;
															
 
																+          text-align: center;
															
 
																+          border: 1px solid #EAEDF1;
															
 
																+          border-radius: 4px;
															
 
																+        }
															
 
																+        .listResult{
															
 
																+          line-height: 26px;
															
 
																+          i{
															
 
																+            cursor: pointer;
															
 
																+          }
															
 
																+        }
															
 
																+        .mainBox{
															
 
																+          top: 65px;
															
 
																+          .infoOption{
															
 
																+            padding: 20px 0;
															
 
																+          }
															
 
																+          .infoConBtn{
															
 
																+            text-align: right;
															
 
																+            border-top: 1px solid #EAEDF1;
															
 
																+            padding-top: 10px;
															
 
																+            span{
															
 
																+              color:#3B9ED0;
															
 
																+              display: inline-block;
															
 
																+              width: 66px;
															
 
																+              height: 32px;
															
 
																+              line-height: 32px;
															
 
																+              text-align: center;
															
 
																+              border: 1px solid #3B9ED0;
															
 
																+              border-radius: 4px;
															
 
																+            }
															
 
																+          }
															
 
																+        }
															
 
																+      }
															
 
																+      .list:last-child{
															
 
																+        border-bottom:none;
															
 
																+      }
															
 
																+    }
															
 
																+  }
															
 
																+  .toast-title{
															
 
																+    position: absolute;
															
 
																+    top: 17px;
															
 
																+    font-size: 16px;
															
 
																+      // border-bottom: 1px solid #666;
															
 
																+      width: 87%;
															
 
																+      height: 25px;
															
 
																+    }
															
 
																+    .toast-cont{
															
 
																+      line-height: 24px;
															
 
																+      font-size: 14px;
															
 
																+      // margin-top: 15px;
															
 
																+      height: 222px;
															
 
																+      overflow-y: auto;
															
 
																+      padding: 10px 0 0 10px;
															
 
																+      li{
															
 
																+        margin-top: 10px;
															
 
																+        cursor: pointer;
															
 
																+      }
															
 
																+    }
															
 
																+    .footer{
															
 
																+      .print{
															
 
																+        width: 111px;
															
 
																+        height: 34px;
															
 
																+        line-height: 34px;
															
 
																+        outline: none;
															
 
																+        border-radius: 4px;
															
 
																+        /*color: #3B9ED0;*/
															
 
																+        border: 0 none;
															
 
																+        cursor: pointer;
															
 
																+        background: #fff;
															
 
																+        margin-right: 20px;
															
 
																+        img{
															
 
																+          width: 20px;
															
 
																+          vertical-align: middle;
															
 
																+          margin-right: 4px;
															
 
																+        }
															
 
																+      }
															
 
																+      .okBtn{
															
 
																+        width: 80px;
															
 
																+        height: 34px;
															
 
																+        line-height: 32px;
															
 
																+        text-align: center;
															
 
																+        outline: none;
															
 
																+        border-radius: 4px;
															
 
																+        cursor: pointer;
															
 
																+        border: 1px solid #3B9ED0;
															
 
																+        box-sizing: border-box;
															
 
																+        margin-left: 20px;
															
 
																+        background: #3B9ED0;
															
 
																+        color: #fff;
															
 
																+        float: right;
															
 
																+        margin-right: 20px;
															
 
																+      }
															
 
																+    }
															
--- a/src/components/DiagnosticList/index.jsx
+++ b/src/components/DiagnosticList/index.jsx
@@ -109,7 +109,8 @@ class DiagnosticList extends Component {
 
																         // store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
															
 
																         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
															
 
																-        store.dispatch(billing())
															
 
																+        // store.dispatch(billing())
															
 
																+        this.props.getBilling();
															
 
																         this.setState({
															
 
																             activeHistory: -1
															
 
																         })
															
--- a/src/components/EMRContainer/index.jsx
+++ b/src/components/EMRContainer/index.jsx
@@ -29,8 +29,10 @@ class EMRContainer extends Component {
 
																         windowEventHandler('resize', ()=>{
															
 
																           const height = getWindowInnerHeight() - 175;
															
 
																           const width = getWindowInnerWidth() - 480;
															
 
																-          this.$cont.current.style.height = height + "px";
															
 
																-          this.$cont.current.style.width = width + "px";
															
 
																+          if(this.$cont.current){
															
 
																+            this.$cont.current.style.height = height + "px";
															
 
																+            this.$cont.current.style.width = width + "px";
															
 
																+          }
															
 
																         });
															
 
																     }
															
 
																     render() {
															
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
--- a/src/components/PushItems/index.less
+++ b/src/components/PushItems/index.less
@@ -304,9 +304,13 @@
 
																             height: 40px;
															
 
																             line-height: 40px;
															
 
																             padding-left: 18px;
															
 
																-            border-bottom: 1px solid #EAEDF1;
															
 
																+            // border-bottom: 1px solid #EAEDF1;
															
 
																+            background: #DFEAFE;
															
 
																             img{
															
 
																-              vertical-align: middle;
															
 
																+              vertical-align: text-top;
															
 
																+            }
															
 
																+            .closeIcon{
															
 
																+              // vertical-align: middle;
															
 
																               float: right;
															
 
																             }
															
 
																           }
															
@@ -495,50 +499,44 @@
 
																   // margin-top: 15px;
															
 
																   height: 222px;
															
 
																   overflow-y: auto;
															
 
																-  border-top: 1px solid #979797;
															
 
																   padding: 10px 0 0 10px;
															
 
																   li{
															
 
																     margin-top: 10px;
															
 
																     cursor: pointer;
															
 
																   }
															
 
																 }
															
 
																-.tableBox{
															
 
																-  // max-height: 700px;
															
 
																-  height: 690px;
															
 
																-  border-top: 1px solid #979797;
															
 
																-  overflow-y: auto;
															
 
																-  h1{
															
 
																-    font-size: 16px;
															
 
																-    font-weight: bold;
															
 
																-    margin: 20px 0;
															
 
																-    text-align: center;
															
 
																-  }
															
 
																-}
															
 
																-.table{
															
 
																-  width: 100%;
															
 
																-  margin: 10px 0 10px;
															
 
																-  tr{
															
 
																-    border-bottom: 1px solid #979797;
															
 
																-    td{
															
 
																+.footer{
															
 
																+  .print{
															
 
																+    width: 111px;
															
 
																+    height: 34px;
															
 
																+    line-height: 34px;
															
 
																+    outline: none;
															
 
																+    border-radius: 4px;
															
 
																+    /*color: #3B9ED0;*/
															
 
																+    border: 0 none;
															
 
																+    cursor: pointer;
															
 
																+    background: #fff;
															
 
																+    margin-right: 20px;
															
 
																+    img{
															
 
																+      width: 20px;
															
 
																       vertical-align: middle;
															
 
																-      padding: 7px 0;
															
 
																+      margin-right: 4px;
															
 
																     }
															
 
																   }
															
 
																-}
															
 
																-.tableBtn{
															
 
																-    // position: absolute;
															
 
																-    text-align: right;
															
 
																-    color:#000;
															
 
																-    padding: 15px 10px 0 0;
															
 
																-    .confirmBtn{
															
 
																-      display: inline-block;
															
 
																-      color:#fff;
															
 
																-      width: 80px;
															
 
																-      height: 32px;
															
 
																-      line-height: 32px;
															
 
																-      border-radius: 4px;
															
 
																-      background: #3B9ED0;
															
 
																-      margin-left: 25px;
															
 
																-      text-align: center;
															
 
																-    }
															
 
																+  .okBtn{
															
 
																+    width: 80px;
															
 
																+    height: 34px;
															
 
																+    line-height: 32px;
															
 
																+    text-align: center;
															
 
																+    outline: none;
															
 
																+    border-radius: 4px;
															
 
																+    cursor: pointer;
															
 
																+    border: 1px solid #3B9ED0;
															
 
																+    box-sizing: border-box;
															
 
																+    margin-left: 20px;
															
 
																+    background: #3B9ED0;
															
 
																+    color: #fff;
															
 
																+    float: right;
															
 
																+    margin-right: 20px;
															
 
																   }
															
 
																+}
															
--- a/src/components/ScaleTable/index.jsx
+++ b/src/components/ScaleTable/index.jsx
@@ -0,0 +1,54 @@
 
																+import React from 'react';
															
 
																+import style from './index.less';
															
 
																+import mocks from '../../mock/chronicTable.js'
															
 
																+
															
 
																+// 量表 具体信息页面
															
 
																+class ScaleTable extends React.Component{
															
 
																+  constructor(props){
															
 
																+    super(props);
															
 
																+  }
															
 
																+
															
 
																+  render(){
															
 
																+    return <div className={style['tableBox']}>
															
 
																+            <h1>密西根糖尿病神经筛查表（MDNS）</h1>
															
 
																+            <p>MDNS可与MNSI联合应用以确定是否存在周围神经病变，在一段时间内对患者进行评分可以评估疾病的进展情况。</p>
															
 
																+            <table className={style['table']}>
															
 
																+              <thead>
															
 
																+                <tr>
															
 
																+                  {mocks.data.title.map((v,i)=>{
															
 
																+                    return <td>{v.name}</td>
															
 
																+                  })}  
															
 
																+                </tr>
															
 
																+              </thead>
															
 
																+              <tbody>
															
 
																+                {mocks.data.details.map((v,i)=>{
															
 
																+                    return <tr>
															
 
																+                    <td>{v.name}</td>
															
 
																+                    <td>
															
 
																+                      {v.details.map((it,index)=>{
															
 
																+                        return <td style={{display:'block'}}>{it.detailName}</td>
															
 
																+                      })}
															
 
																+                    </td>
															
 
																+                    <td></td>
															
 
																+                    <td></td>
															
 
																+                    </tr>
															
 
																+                  })} 
															
 
																+              </tbody>
															
 
																+            </table>
															
 
																+            <div>
															
 
																+              <p>
															
 
																+                1. 计算方法：<br/>
															
 
																+              感觉损伤得分=左右两侧感觉检查项目的分数之和
															
 
																+              肌力得分=左右两侧肌力检查项目的分数之和
															
 
																+              反射得分=左右两侧反射检查项目的分数之和
															
 
																+              体格检查得分=感觉损伤得分+肌力得分+反射得分
															
 
																+              </p>
															
 
																+              <p>
															
 
																+                2. 临床体格检查部分：<br/>
															
 
																+              最低得分0  最高得分46， 分数越高，周围神经病越重
															
 
																+              </p>
															
 
																+            </div>
															
 
																+          </div>
															
 
																+  }
															
 
																+}
															
 
																+export default ScaleTable;
															
--- a/src/components/ScaleTable/index.less
+++ b/src/components/ScaleTable/index.less
@@ -0,0 +1,40 @@
 
																+.tableBox{
															
 
																+  // max-height: 700px;
															
 
																+  height: 690px;
															
 
																+  overflow-y: auto;
															
 
																+  padding: 15px;
															
 
																+  h1{
															
 
																+    font-size: 16px;
															
 
																+    font-weight: bold;
															
 
																+    margin: 20px 0;
															
 
																+    text-align: center;
															
 
																+  }
															
 
																+}
															
 
																+.table{
															
 
																+  width: 100%;
															
 
																+  margin: 10px 0 10px;
															
 
																+  tr{
															
 
																+    border-bottom: 1px solid #979797;
															
 
																+    td{
															
 
																+      vertical-align: middle;
															
 
																+      padding: 7px 0;
															
 
																+    }
															
 
																+  }
															
 
																+}
															
 
																+/* .tableBtn{
															
 
																+  // position: absolute;
															
 
																+  text-align: right;
															
 
																+  color:#000;
															
 
																+  padding: 15px 10px 0 0;
															
 
																+  .confirmBtn{
															
 
																+    display: inline-block;
															
 
																+    color:#fff;
															
 
																+    width: 80px;
															
 
																+    height: 32px;
															
 
																+    line-height: 32px;
															
 
																+    border-radius: 4px;
															
 
																+    background: #3B9ED0;
															
 
																+    margin-left: 25px;
															
 
																+    text-align: center;
															
 
																+  }
															
 
																+} */
															
--- a/src/containers/ChronicInfo.js
+++ b/src/containers/ChronicInfo.js
@@ -0,0 +1,28 @@
 
																+import {connect} from 'react-redux';
															
 
																+import ChronicInfo from '../components/ChronicInfo';
															
 
																+import {SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
															
 
																+import {getTableList} from '../store/async-actions/pushMessage';
															
 
																+
															
 
																+function mapStateToProps(state){
															
 
																+  return{
															
 
																+    chronicMagItem: state.diagnosticList.chronicMagItem,
															
 
																+    questionId: state.diagnosticList.clickDiag,
															
 
																+    tableList: state.pushMessage.tableList,
															
 
																+    showList: state.pushMessage.showList,
															
 
																+  }
															
 
																+}
															
 
																+
															
 
																+function mapDispatchToProps(dispatch){
															
 
																+  return {
															
 
																+    getTableList(id){
															
 
																+      dispatch(getTableList(id))
															
 
																+      dispatch({type:SHOW_TABLE_LIST})
															
 
																+    },
															
 
																+    hideList(){
															
 
																+      dispatch({type:HIDE_TABLE_LIST})
															
 
																+    }
															
 
																+  }
															
 
																+}
															
 
																+
															
 
																+const ChronicInfoContainer = connect(mapStateToProps,mapDispatchToProps)(ChronicInfo);
															
 
																+export default ChronicInfoContainer;
															
--- a/src/containers/PushItemsContainer.js
+++ b/src/containers/PushItemsContainer.js
@@ -1,9 +1,9 @@
 
																 import React from 'react';
															
 
																 import {connect} from 'react-redux';
															
 
																 import PushItems from '../components/PushItems'
															
 
																-import {CHANGE_ASSAY, CHANGE_CHECK, ADD_BILLING, SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS,SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
															
 
																+import {CHANGE_ASSAY, CHANGE_CHECK, ADD_BILLING, SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS} from '@store/types/pushMessage';
															
 
																 import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR } from '@store/types/diagnosticList';
															
 
																-import {billing, getTips, getTipsDetails,getTableList} from '../store/async-actions/pushMessage';
															
 
																+import {billing, getTips, getTipsDetails} from '../store/async-actions/pushMessage';
															
 
																 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
															
 
																 function mapStateToProps(state) {
															
@@ -59,13 +59,6 @@ function mapDispatchToProps(dispatch) {
 
																             dispatch({
															
 
																                 type: HIDE_TIPS_DETAILS
															
 
																             })
															
 
																-        },
															
 
																-        getTableList(id){
															
 
																-            dispatch(getTableList(id))
															
 
																-            dispatch({type:SHOW_TABLE_LIST})
															
 
																-        },
															
 
																-        hideList(){
															
 
																-            dispatch({type:HIDE_TABLE_LIST})
															
 
																         }
															
 
																     }
															
 
																 }
															
--- a/src/store/async-actions/fetchModules.js
+++ b/src/store/async-actions/fetchModules.js
@@ -15,7 +15,8 @@ const api={
 
																   getOtherHisRecord: '/inquiryInfo/getLastOther',
															
 
																   getBigPush:'/push/pushInner',
															
 
																   saveMode:'/doctorPageMode/saveDoctorPageModes',
															
 
																-  getSymptomFeature:'/feature/getSymptomFeature'
															
 
																+  getSymptomFeature:'/feature/getSymptomFeature',
															
 
																+  getAssess:'http://192.168.3.1:5050/api/icss/evaluationModuleMapping/getEvaluationModules'
															
 
																 };
															
 
																 export const getFeature = (item)=>{
															
--- a/src/utils/ajax.js
+++ b/src/utils/ajax.js
@@ -67,7 +67,7 @@ const json=(url,data)=>{
 
																   //兼容ie8,axios在ie8下content-type设置不成功且会把headers置为null
															
 
																   return axios({
															
 
																     method:'post',
															
 
																-    url:qhost+url,
															
 
																+    url:url.indexOf('http:')!=-1?url:qhost+url,
															
 
																     data
															
 
																   });/*new Promise((resolve,reject)=>{
															
 
																     $.ajax({