Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

src/components/AssessResult/ChartItem/index.jsx

@@ -3,6 +3,7 @@ import style from "../index.less";
 import { Radio} from '@commonComp';
 import echarts from 'echarts';
 import config from "@config";
+import 'zrender/lib/svg/svg';
 /**
  * 来源于后台数据
  * 图表类型
@@ -130,7 +131,7 @@ class Chart extends Component{
     const xAxis = getXAxisArr(type);
     const id = endDate?'chart'+endDate+index:'chart'+index;
     let series = [],names=[],inx=-1;
-    let myChart = echarts.init(document.getElementById(id));
+    let myChart = echarts.init(document.getElementById(id) ,null, {renderer: 'svg'});
 
     const interval = {
       week:24,

src/components/AssessResult/ScaleItem/index.jsx

@@ -32,7 +32,6 @@ class ScaleItem extends Component {
     this.showOption = this.showOption.bind(this);
     this.closeOption = this.closeOption.bind(this);
     this.closeFormula = this.closeFormula.bind(this);
-    this.onPrint = this.onPrint.bind(this);
     this.handleInputformula =this.handleInputformula.bind(this);
   }
   showOption(id){
@@ -98,7 +97,7 @@ class ScaleItem extends Component {
     })
   }
   calcuFormula(j, v, i) { //计算公式计算
-    const { calcuFormula } = this.props;
+    const { calcuFormula ,chronicPushItems} = this.props;
     const {formulaId,formulaData} = this.state;
     const it =formulaData&&formulaData[formulaId];
     let allHasInfo = true
@@ -129,7 +128,8 @@ class ScaleItem extends Component {
         pIndex: j,
         ppIndex: i,
       }
-      calcuFormula(param)
+      // calcuFormula(param)
+      calcuFormula({param,chronicPushItems})
     } else {  //不是所有值都填过了
       Notify.info('请填写计算公式内容')
     }
@@ -261,15 +261,6 @@ class ScaleItem extends Component {
       return this.getDetailItems(it,i);
     });
   }
-  onPrint() {
-    let dom = this.state.showTable?$("#printcontent"):$("#AssistResult");
-    dom.jqprint({
-      debug: false,
-      importCSS: true,
-      printContainer: true,
-      operaSupport: false,
-    });
-  }
   handleInput(e){
     const text = e.target.value;
     this.setState({

src/components/AssessResult/index.jsx

@@ -74,7 +74,7 @@ class AssessResult extends Component {
     isAssessConfirm&&handleSave(this.state,readyKeepHistory());
   }
   handoutTypes(item,i){
-    const {getIndexData,indexData,timeTypes,wholeAssessData,closeAssess,showScaleFn,calcuFormula,isRecommend} =this.props;
+    const {getIndexData,indexData,timeTypes,wholeAssessData,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems} =this.props;
     const {chooseSelecteds,wholeAssessItems,wholeAssessText,chartTimeTypes,wholeResults} = this.state;
     const chartData = indexData;
     const name = item.regionName+"：";
@@ -92,7 +92,8 @@ class AssessResult extends Component {
                           showScaleFn={showScaleFn}
                           calcuFormula={calcuFormula}
                           isRecommend={isRecommend}
-                          closeAssess={closeAssess}></ScaleItem>;
+                          closeAssess={closeAssess}
+                          chronicPushItems={chronicPushItems}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name}
                            data={list}

src/components/AssessResult/index.less

@@ -163,6 +163,9 @@
   white-space: pre;
   *white-space: pre;
   *word-wrap: break-word;
+  border: 1px solid #bfbfbf;
+  border-radius: 4px;
+  padding: 5px;
 }
 @media print {
   .printShow,.textareaStatic {

src/components/ChronicInfo/index.jsx

@@ -74,16 +74,16 @@ class ChronicInfo extends React.Component{
       printContainer: true,
       operaSupport: false,
     });
-    setTimeout(() => {//把生成的图片和iframe删掉
-      let imgLis = document.querySelectorAll('.canvasImg')
-      let iframe = document.getElementsByTagName('iframe')
-      for(let i = 0;i < imgLis.length;i++){
-        imgLis[i].remove()
-      }
-      for(let i = 0;i < iframe.length;i++){
-        iframe[i].remove()
-      }
-    }, 500);
+    // setTimeout(() => {//把生成的图片和iframe删掉
+    //   let imgLis = document.querySelectorAll('.canvasImg')
+    //   let iframe = document.getElementsByTagName('iframe')
+    //   for(let i = 0;i < imgLis.length;i++){
+    //     imgLis[i].remove()
+    //   }
+    //   for(let i = 0;i < iframe.length;i++){
+    //     iframe[i].remove()
+    //   }
+    // }, 500);
   }
   
   showTableList(id){//量表按钮

src/containers/AssessResult.js

@@ -35,6 +35,7 @@ function mapStateToProps(state) {
     wholeAssessText:assessResult.wholeAssessText,     //整体评估补充说明
     scaleInfo: state.pushMessage.scaleInfo,//量表内容
     scaleUpdate:state.pushMessage.scaleUpdate,
+    chronicPushItems: state.pushMessage.chronicPushItems, //慢病右侧推送
   }
 }
 

src/utils/jqprint.js

@@ -34,18 +34,19 @@ import $ from 'jquery';
         });
       }
     }
-    var canvasLis = $(this).find('canvas');//页面有canvas需要转换为图片
-    if (!canvasLis) {
-      return
-    } else {
-      $("img").remove('.canvasImg')//删除已添加的图片避免多张图片重叠
-      for (var k = 0; k < canvasLis.length; k++) {
-        var context = canvasLis[k];
-        var canvasSrc = context.toDataURL();
-        let canvasImg = "<img class='canvasImg' src='" + canvasSrc + "'>"
-        $(canvasLis[k]).parent().append(canvasImg)
-      }
-    }
+    // var canvasLis = $(this).find('canvas');//页面有canvas需要转换为图片
+    // if (!canvasLis) {
+    //   return
+    // } else {
+    //   $("img").remove('.canvasImg')//删除已添加的图片避免多张图片重叠
+    //   for (var k = 0; k < canvasLis.length; k++) {
+    //     var canvas = canvasLis[k];
+
+    //     var canvasSrc = canvas.toDataURL();
+    //     let canvasImg = "<img class='canvasImg' src='" + canvasSrc + "'>"
+    //     $(canvasLis[k]).parent().append(canvasImg)
+    //   }
+    // }
 
     if (opt.printContainer) { doc.write($element.outer()); }
     else { $element.each(function () { doc.write($(this).html()); }); }