提交代码

src/xt_pages/Dialysisanalysis/otherIndicators/otheralone.vue → src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsone.vue

@@ -83,9 +83,9 @@
           <div style="padding-left:10px;flex:1;width:0;">
             <div class="tableTitle">指标趋势<span style="font-weight:normal">&nbsp;&nbsp;（当前患者: {{patient_name}}）</span></div>
             <div>
-              <line-chart :options="chart"
-                          v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
-              <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>
+              <line-chart :options="chart"></line-chart>
+              <!--              <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>-->
+              <!--              <line-chart></line-chart>-->
 
             </div>
             <div class="tableTitle">统计表</div>
@@ -93,32 +93,25 @@
               <el-table ref="table" :data="tableData" v-loading="loading" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column label="姓名" align="center">
                   <template slot-scope="scope">
+                    {{scope.row.name}}
                   </template>
                 </el-table-column>
 
                 <el-table-column width="100" label="检查日期" align="center">
                   <template slot-scope="scope">
+                    {{getTime(scope.row.inspect_date)}}
+
                   </template>
                 </el-table-column>
 
-                <el-table-column width="100" label="甲状旁腺激素分析" align="center">
+                <el-table-column width="100" label="血红蛋白" align="center">
                   <template slot-scope="scope">
+                    {{scope.row.value}}
                   </template>
                 </el-table-column>
               </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"
-              ></el-pagination>
+
             </div>
           </div>
         </el-container>
@@ -130,7 +123,6 @@
 
 <script>
 import echarts from 'echarts'
-// import LineChart from '../../qcd/components/LineChart'
 import {  uParseTime } from '@/utils/tools'
 import { getCurrentOrgPatients } from '@/api/common/common'
 import {
@@ -139,9 +131,11 @@ import {
 import { PostSearch } from '@/api/patient'
 import { getDataConfig } from '@/utils/data'
 import { GetPersonQCStatistisData } from '../../../api/qcd'
+import LineChart from '../../qcd/components/LineChart.vue'
 
 export default {
   components: {
+    LineChart
   },
   data() {
     return {
@@ -365,25 +359,19 @@ export default {
       for (let i = 0; i < this.tableData.length; i++) {
         let order = this.tableData[i]
         let name = order.name
-        let item_name = order.item_name
-        let count = order.count
-        let price = order.price.toFixed(2)
-        let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
-        let total = order.total.toFixed(2)
+        let value = order.value
+        let inspect_date = order.inspect_date
 
         let obj = {
-          '患者姓名': name,
-          '项目名称': item_name,
-          '数量': count,
-          '单价': price,
-          '费用': pay_sumamt,
-          '费用总额': total
+          '姓名': name,
+          '数值': value,
+          '日期': inspect_date,
         }
         list.push(obj)
       }
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
-        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const tHeader = ['姓名', '数值', '日期']
+        const filterVal = ['姓名', '数值', '日期']
         const data = this.formatJson(filterVal, list)
         excel.export_json_to_excel1({
           header: tHeader,
@@ -480,7 +468,7 @@ export default {
       if(val == "" || val == undefined){
         return ""
       }else {
-        return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+        return uParseTime(val, '{y}-{m}-{d}')
       }
     },
     GetInspectionCheckIndexTableData(params) {
@@ -493,7 +481,12 @@ export default {
             this.loading = false
             this.tableData = []
             for (let i = 0; i < resp.data.inspections.length; i++) {
-              this.tableData.push(resp.data.inspections[i])
+              let obj = {
+                name:resp.data.patient.name,
+                value:resp.data.inspections[i].inspect_value,
+                inspect_date:resp.data.inspections[i].inspect_date
+              }
+              this.tableData.push(obj)
             }
             this.total = resp.data.total
 
@@ -515,10 +508,14 @@ export default {
         .then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
+            console.log(resp.data.inspections)
             for (let i = 0; i < resp.data.inspections.length; i++) {
               this.chart.xAxis.data.push(this.getTime(resp.data.inspections[i].inspect_date))
               this.chart.series[0].data.push(resp.data.inspections[i].inspect_value)
             }
+            console.log(this.chart.xAxis.data)
+            console.log( this.chart.series[0].data)
+
             this.getArrLength(this.chart.xAxis.data,1)
           } else {
 
@@ -610,8 +607,8 @@ export default {
     this.query.patient_id = 0
     this.query.end_time = year + '-' + month + '-' + day
     this.query.start_time = year + '-' + last_month + '-' + day
-    this.query.project_id = 20
-    this.query.item_id = 171
+    this.query.project_id = 1
+    this.query.item_id = 17
     this.getCurrentOrgPatients()
 
     // this.GetPersonQCStatistisData()