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

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

@@ -108,18 +108,18 @@
 
       </el-table>
 
-      <!--<el-pagination-->
-        <!--align="right"-->
-        <!--@size-change="handleSizeChange"-->
-        <!--@current-change="handleCurrentChange"-->
-        <!--:current-page="query.page"-->
-        <!--:page-sizes="[10, 20, 50, 100]"-->
-        <!--:page-size="10"-->
-        <!--background-->
-        <!--style="margin-top:20px;"-->
-        <!--layout="total, sizes, prev, pager, next, jumper"-->
-        <!--:total="total"-->
-      <!--&gt;</el-pagination>-->
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="query.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
     </div>
   </div>
 </template>

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -608,6 +608,8 @@
                 }
               }
 
+              console.log(this.options.series[0].data)
+
               //获取无法确定选项的颜色
               if (this.query.range_type == 2) {
                 //去重复