Merge branch 'master' into 'master'

添加报表查询时间显示

See merge request lighter/vue-intergration-platform!30

src/components/operate-monitoring/ReportFirstPage.vue

@@ -3,10 +3,10 @@
         <template #header>
             <div style="text-align: center">
                 统计日期:
-                <!-- <span v-if="reportFirst.kssj" style="color: #fc6c34;">
-                        {{ reportFirst.kssj }} 至 {{ reportFirst.jssj }}
-                    </span> -->
-                <span style="color: #fc6c34;">当前</span>
+                <span v-if="kssj1" style="color: #fc6c34;">
+                    {{ kssj1 }} 至 {{ jssj1 }}
+                </span>
+                <span v-else style="color: #fc6c34;">当前</span>
                 统计机构名称：<span style="color: #fc6c34;">长沙泰和医院</span>
                 指标名称: <span style="color: #fc6c34;">{{ reportInfo1.reportName }}</span>
                 统计结果描述: <span style="color: #fc6c34;">{{ reportInfo1.overview }}{{ reportInfo1.unit }}</span>
@@ -28,7 +28,8 @@
         fullscreen destroy-on-close>
         <ReportSecondPage :reportSecond="reportSecond" />
     </el-dialog>
-    <el-dialog v-else :title="titleChart" v-model="patientDrawer" width="80%" height="80%" top="40px" draggable destroy-on-close>
+    <el-dialog v-else :title="titleChart" v-model="patientDrawer" width="80%" height="80%" top="40px" draggable
+        destroy-on-close>
         <ReportPatientPage :reportPatient="reportPatient" />
     </el-dialog>
 </template>
@@ -65,11 +66,15 @@ const param1 = ref({})
 
 const x1Name = ref('')
 const y1Name = ref('')
+const kssj1 = ref('')
+const jssj1 = ref('')
 
 reportData.value = props.reportFirst.data
 reportInfo1.value = props.reportFirst.row
 tableData.value = props.reportFirst.tableInfo
 param1.value = props.reportFirst.params
+kssj1.value = props.reportFirst.kssj
+jssj1.value = props.reportFirst.jssj
 
 const showFirstPst = () => {
     let barTitle = reportInfo1.value.reportName
@@ -119,6 +124,8 @@ const reportSecondInfo = (row) => {
             titleChart.value = res.title
             sndDrawer.value = true
             reportSecond.value.row = reportInfo1.value
+            reportSecond.value.kssj = kssj1.value
+            reportSecond.value.jssj = jssj1.value
             reportSecond.value.params = clone(params)
         })
     }

src/components/operate-monitoring/ReportSecondPage.vue

@@ -3,17 +3,16 @@
         <template #header>
             <div style="text-align: center">
                 统计日期:
-                <!-- <span v-if="reportFirst.kssj" style="color: #fc6c34;">
-                        {{ reportFirst.kssj }} 至 {{ reportFirst.jssj }}
-                    </span> -->
-                <span style="color: #fc6c34;">当前</span>
+                <span v-if="kssj2" style="color: #fc6c34;">
+                    {{ kssj2 }} 至 {{ jssj2 }}
+                </span>
+                <span v-else style="color: #fc6c34;">当前</span>
                 统计机构名称：<span style="color: #fc6c34;">长沙泰和医院</span>
                 指标名称: <span style="color: #fc6c34;">{{ reportInfo2.reportName }}</span>
                 统计结果描述: <span style="color: #fc6c34;">{{ reportInfo2.overview }}{{ reportInfo2.unit }}</span>
-                <span style="color: #3742fa;">&nbsp;{{ reportInfo2.fstName }}: </span>
+                其中<span style="color: #3742fa;">&nbsp;{{ reportInfo2.fstName }}: </span>
                 <span style="color: #fc6c34;">{{ reportInfo2.fstValue }}{{ reportInfo2.unit }}</span>
             </div>
-            <el-button type="primary" style="margin-left: 10px;">返回</el-button>
         </template>
         <template #aside>
             <el-table :data="reportData" :height="tableHeight" highlight-current-row row-key="childKey" stripe border
@@ -68,11 +67,15 @@ const param2 = ref({})
 
 const x2Name = ref('')
 const y2Name = ref('')
+const kssj2 = ref('')
+const jssj2 = ref('')
 
 reportData.value = props.reportSecond.data
 reportInfo2.value = props.reportSecond.row
 tableData.value = props.reportSecond.tableInfo
 param2.value = props.reportSecond.params
+kssj2.value = props.reportSecond.kssj
+jssj2.value = props.reportSecond.jssj
 
 const showSecondPst = () => {
     let barTitle = reportInfo2.value.reportName
@@ -122,6 +125,8 @@ const reportThirdInfo = (row) => {
             titleChart.value = res.title
             thirdDrawer.value = true
             reportThird.value.row = reportInfo2.value
+            reportThird.value.kssj = kssj2.value
+            reportThird.value.jssj = jssj2.value
             reportThird.value.params = clone(params)
         })
     }

src/components/operate-monitoring/ReportThirdPage.vue

@@ -3,14 +3,14 @@
         <template #header>
             <div style="text-align: center">
                 统计日期:
-                <!-- <span v-if="reportFirst.kssj" style="color: #fc6c34;">
-                        {{ reportFirst.kssj }} 至 {{ reportFirst.jssj }}
-                    </span> -->
-                <span style="color: #fc6c34;">当前</span>
+                <span v-if="kssj3" style="color: #fc6c34;">
+                    {{ kssj3 }} 至 {{ jssj3 }}
+                </span>
+                <span v-else style="color: #fc6c34;">当前</span>
                 统计机构名称：<span style="color: #fc6c34;">长沙泰和医院</span>
                 指标名称: <span style="color: #fc6c34;">{{ reportInfo3.reportName }}</span>
                 统计结果描述: <span style="color: #fc6c34;">{{ reportInfo3.overview }}{{ reportInfo3.unit }}</span>
-                <span style="color: #3742fa;">&nbsp;{{ reportInfo3.fstName }}: </span>
+                其中<span style="color: #3742fa;">&nbsp;{{ reportInfo3.fstName }}: </span>
                 <span style="color: #fc6c34;">{{ reportInfo3.fstValue }}{{ reportInfo3.unit }}</span>
                 <span style="color: #3742fa;">&nbsp;{{ reportInfo3.sndName }}: </span>
                 <span style="color: #fc6c34;">{{ reportInfo3.sndValue }}{{ reportInfo3.unit }}</span>
@@ -61,10 +61,15 @@ const tableData = ref({})
 
 const x3Name = ref('')
 const y3Name = ref('')
+const kssj3 = ref('')
+const jssj3 = ref('')
 
 reportData.value = props.reportThird.data
 reportInfo3.value = props.reportThird.row
+kssj3.value = props.reportSecond.kssj
+jssj3.value = props.reportSecond.jssj
 tableData.value = props.reportThird.tableInfo
+
 const showSecondPst = () => {
     let barTitle = reportInfo3.value.reportName
     let yAxisName = '单位：' + reportInfo3.value.unit

src/views/operate-monitoring/OperateMonitoringDate.vue

@@ -118,6 +118,8 @@ const reportFirstInfo = (row) => {
         titleChart.value = res.title
         fstDrawer.value = true
         reportFirst.value.row = row
+        reportFirst.value.kssj = kssj.value
+        reportFirst.value.jssj = jssj.value
         reportFirst.value.params = clone(params)
     })
 }