Merge branch 'master' of http://114.55.171.231:3000/lxd/ECG

src/api/tblist/ecganalysisparas/index.ts

@@ -82,7 +82,7 @@ export const EcganalysisparasApi = {
       return await request.get({ url: `/tblist/ecganalysisparas/list?regId=${regId}&orgId=${orgId}` })
     },
     // 获取开始和结束时间的心电分析数据记录
-    getDateStaAndEndData: async (orgId:String,startDate:String,endDate:String) => {
-      return await request.get({ url: `/tblist/ecganalysisparas/getDateStaAndEndData?orgId=${orgId}&TimeSta=${startDate}&TimeEnd=${endDate}` })
+    getDateStaAndEndData: async (doctorName:String,startDate:String,endDate:String) => {
+      return await request.get({ url: `/tblist/ecganalysisparas/getDateStaAndEndData?doctorName=${doctorName}&TimeSta=${startDate}&TimeEnd=${endDate}` })
     },
 }

src/views/ECG/ECGStat/statdiagnosis.vue

@@ -3,7 +3,7 @@
     <div class="demo-date-picker">
       <div class="block">
         <el-date-picker
-          v-model="value"
+          v-model="Date_value"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -32,7 +32,7 @@ import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
 const Profilevo = ref<ProfileVO>({} as ProfileVO) //当前登录人信息
 const endDate = new Date()
 const startDate = new Date(endDate.getTime() - 7 * 24 * 3600 * 1000)
-const value = ref<[Date, Date]>([startDate, endDate])
+const Date_value = ref<[Date, Date]>([startDate, endDate])
 const getlogininfo = async () => {
   Profilevo.value = await getUserProfile()
 }
@@ -44,12 +44,12 @@ const defaultTime = ref<[Date, Date]>([
 
 // 修改日期限制函数
 const disabledDate = (time: Date) => {
-  if (value.value && value.value[0]) {
-    const start = value.value[0]
+  if (Date_value.value && Date_value.value[0]) {
+    const start = Date_value.value[0]
     const diff = 7 * 24 * 3600 * 1000
     
     // 如果是选择开始日期
-    if (!value.value[1]) {
+    if (!Date_value.value[1]) {
       const today = new Date()
       return time.getTime() > today.getTime()
     }
@@ -63,13 +63,13 @@ const disabledDate = (time: Date) => {
   return time.getTime() > today.getTime()
 }
 
-// 添加一个生成日期数组的函数
+// 修改生成日期数组的函数
 const generateDateArray = (startDate: Date, endDate: Date) => {
   const dates = []
   let currentDate = new Date(startDate)
 
   while (currentDate <= endDate) {
-    dates.push(currentDate.toLocaleDateString('zh-CN', { month: '2-digit', day: '2-digit' }))
+    dates.push(formatDate(currentDate))  // 使用 formatDate 函数格式化日期
     currentDate = new Date(currentDate.setDate(currentDate.getDate() + 1))
   }
   return dates
@@ -83,17 +83,17 @@ const cachedData = ref<any[]>([])
 
 // 修改 getdata 函数
 async function getdata() {
-  const startDate = `${formatDate(value.value[0])} 00:00:00`
-  const endDate = `${formatDate(value.value[1])} 23:59:59`
+  const startDate = `${formatDate(Date_value.value[0])} 00:00:00`
+  const endDate = `${formatDate(Date_value.value[1])} 23:59:59`
   
-  const data = await EcganalysisparasApi.getDateStaAndEndData(Profilevo.value.orgId, startDate, endDate)
+  const data = await EcganalysisparasApi.getDateStaAndEndData(Profilevo.value.doctorname, startDate, endDate)
   cachedData.value = data  // 保存数据
   updateChartWithData(data)
 }
 
 // 新增处理图表更新的方法
 const updateChartWithData = (data: any[]) => {
-  const dateArray = generateDateArray(value.value[0], value.value[1])
+  const dateArray = generateDateArray(Date_value.value[0], Date_value.value[1])
   const countArray = calculateDailyDiagnosisCounts(data, dateArray)
   
   const myChart = echarts.init(document.getElementById('main'))
@@ -102,7 +102,21 @@ const updateChartWithData = (data: any[]) => {
     xAxis: {
       data: dateArray
     },
-    yAxis: {},
+    yAxis: {
+      type: 'value',
+      name: '诊断数量',
+      minInterval: 1,  // 因为是计数，所以最小间隔设为1
+      min: 0,  // 从0开始比较合理
+      axisLabel: {
+        formatter: '{value}'
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: 'dashed'
+        }
+      }
+    },
     series: [
       {
         name: '诊断数量',
@@ -127,14 +141,22 @@ const handleDateChange = (val: [Date, Date]) => {
     const diff = val[1].getTime() - val[0].getTime()
     if (diff > 7 * 24 * 3600 * 1000) {
       // 如果选择范围超过7天，自动调整结束日期
-      value.value = [val[0], new Date(val[0].getTime() + 7 * 24 * 3600 * 1000 - 1)]
+      Date_value.value = [val[0], new Date(val[0].getTime() + 7 * 24 * 3600 * 1000 - 1)]
     }
 
-    updateChart() // 使用新的更新图表方法
+  
   }
 }
 
-// 添加新的统计方法
+// 修改日期格式化函数
+const formatDate = (date: Date) => {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
+// 修改统计方法中的日期格式化
 const calculateDailyDiagnosisCounts = (data: any[], dateArray: string[]) => {
   // 初始化计数对象
   const countMap = {}
@@ -145,32 +167,23 @@ const calculateDailyDiagnosisCounts = (data: any[], dateArray: string[]) => {
   // 统计每天的诊断数量
   data.forEach(item => {
     const date = new Date(item.doctorDiagTime)
-    const dateStr = date.toLocaleDateString('zh-CN', { month: '2-digit', day: '2-digit' })
+    const dateStr = formatDate(date)  // 使用相同的格式化函数
     if (countMap[dateStr] !== undefined) {
       countMap[dateStr]++
     }
   })
   
-  // 将统计结果转换为数组
   return dateArray.map(date => countMap[date])
 }
 
-// 修改日期格式化
-const formatDate = (date: Date) => {
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, '0')
-  const day = String(date.getDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
-
 // 修改 onMounted
 onMounted(() => {
   getlogininfo()
   // 设置默认时间范围为当前日期往前7天
   const endDate = new Date()
-  const startDate = new Date(endDate.getTime() - 7 * 24 * 3600 * 1000)
-  value.value = [startDate, endDate]
-  updateChart()
+  const startDate = new Date(endDate.getTime() - 6 * 24 * 3600 * 1000)
+  Date_value.value = [startDate, endDate]
+ 
 })
 </script>