soc统计

src/api/pms/qhse/index.ts

@@ -396,8 +396,11 @@ export const IotSocSummaryApi = {
     return await request.download({ url: `/rq/iot-soc-summary/safety-card/download/${id}` })
   },
   // 统计
-  getSocSummaryStatistics: async (id) => {
-    return await request.get({ url: `/rq/iot-soc-summary/stat?deptId=${id}` })
+  // getSocSummaryStatistics: async (id) => {
+  //   return await request.get({ url: `/rq/iot-soc-summary/stat?deptId=${id}` })
+  // }
+  getSocSummaryStatistics: async (params) => {
+    return await request.get({ url: `/rq/iot-soc-summary/stat`, params })
   }
 }
 

src/views/pms/qhse/socSummary/index.vue

@@ -25,14 +25,14 @@
           :model="queryParams"
           ref="queryFormRef"
           :inline="true"
-          label-width="68px">
+          label-width="auto">
           <el-form-item label="姓名" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="请输入姓名"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-240px" />
+              class="!w-120px" />
           </el-form-item>
 
           <el-form-item label="队伍名称" prop="deptName">
@@ -41,7 +41,18 @@
               placeholder="请输入队伍名称"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-240px" />
+              class="!w-120px" />
+          </el-form-item>
+
+          <el-form-item label="观察日期" prop="observationDate">
+            <el-date-picker
+              v-model="queryParams.observationDate"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+              class="!w-160px" />
           </el-form-item>
           <el-form-item>
             <el-button @click="handleQuery"
@@ -233,6 +244,7 @@ const handleDeptNodeClick = async (row) => {
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
+  getStatic()
 }
 
 /** 重置按钮操作 */
@@ -380,11 +392,20 @@ const socChartOption = computed<EChartsOption>(() => {
 
 async function getStatic() {
   if (queryParams.deptId) {
-    const res = await IotSocSummaryApi.getSocSummaryStatistics(queryParams.deptId)
+    const res = await IotSocSummaryApi.getSocSummaryStatistics({
+      deptId: queryParams.deptId,
+      // 日期
+      observationDate: queryParams.observationDate
+    })
     child.value = res.child
     totalData.value = res.total
   } else {
-    const res = await IotSocSummaryApi.getSocSummaryStatistics(userStore.user.deptId)
+    queryParams.deptId = userStore.user.deptId
+    const res = await IotSocSummaryApi.getSocSummaryStatistics({
+      deptId: queryParams.deptId,
+      // 日期
+      observationDate: queryParams.observationDate
+    })
     child.value = res.child
     totalData.value = res.total
   }