Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -669,10 +669,46 @@
               this.assessmentBeforeDislysis.dry_weight = this.lastPredialysisEvaluation.dry_weight
             }
           }
+          if (this.lastPredialysisEvaluation != null) {
+            this.$set(
+              this.assessmentBeforeDislysis,
+              'additional_weight',
+              this.lastPredialysisEvaluation['additional_weight'].toString()
+            )
+
+            this.$set(
+              this.assessmentBeforeDislysis,
+              'internal_fistula',
+              this.lastPredialysisEvaluation['internal_fistula']
+            )
+            this.$set(
+              this.assessmentBeforeDislysis,
+              'internal_fistula_skin',
+              this.lastPredialysisEvaluation['internal_fistula_skin']
+            )
+            this.$set(
+              this.assessmentBeforeDislysis,
+              'blood_access_part_id',
+              this.lastPredialysisEvaluation['blood_access_part_id']
+            )
+            this.$set(
+              this.assessmentBeforeDislysis,
+              'blood_access_part_opera_id',
+              this.lastPredialysisEvaluation['blood_access_part_opera_id']
+            )
+          }
+
         } else {
           this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
         }
+
+
+
+
+
+
+
       },
       hide() {
         this.isVisibility = false

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -239,9 +239,9 @@
                     }
 
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                      { offset: 0, color: colorList[0] },
+                      {offset: 0, color: colorList[index][0]},
                       // { offset: 0.5, color: colorList[index][1] },
-                      { offset: 1, color: colorList[1] }
+                      {offset: 1, color: colorList[index][1]}
                     ])
                   },
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形

src/xt_pages/user/patients.vue

@@ -765,6 +765,7 @@
 
       },
       handleSuccess({ results, header }) {
+        console.log(results)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')