Merge branch 'runData' into dev

src/views/runData/collectWaitingAreaData/index.vue

@@ -7,9 +7,11 @@
           style="width: 200px" />
       </el-form-item>
       <el-form-item label="时间段" prop="timeSlot">
-        <el-time-picker v-model="queryParams.timeSlot" is-range range-separator="-" start-placeholder="开始时间"
-          end-placeholder="结束时间" value-format="HH:mm" format="HH:mm" placeholder="请选择时间段" clearable
-          style="width: 200px" />
+        <el-select v-model="queryParams.timeSlot" placeholder="请选择时间段" clearable style="width: 200px">
+          <el-option label="00:00-08:00" value="00:00-08:00" />
+          <el-option label="08:00-17:00" value="08:00-17:00" />
+          <el-option label="17:00-24:00" value="17:00-24:00" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -89,8 +91,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="时间段" prop="timeSlot">
-              <el-time-picker v-model="form.timeSlot" is-range range-separator="至" start-placeholder="开始时间"
-                end-placeholder="结束时间" value-format="HH:mm" format="HH:mm" placeholder="请选择时间段" style="width: 100%" />
+              <el-select v-model="form.timeSlot" placeholder="请选择时间段" style="width: 100%">
+                <el-option label="00:00-08:00" value="00:00-08:00" />
+                <el-option label="08:00-17:00" value="08:00-17:00" />
+                <el-option label="17:00-24:00" value="17:00-24:00" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -304,11 +309,7 @@ const { queryParams, form, rules } = toRefs(data)
 /** 查询候检区数据列表 */
 function getList() {
   loading.value = true
-  const params = { ...queryParams.value }
-  if (params.timeSlot && Array.isArray(params.timeSlot)) {
-    params.timeSlot = params.timeSlot.join('-')
-  }
-  listCollectWaitingAreaData(params).then(response => {
+  listCollectWaitingAreaData(queryParams.value).then(response => {
     collectWaitingAreaDataList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -379,12 +380,7 @@ function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
   getCollectWaitingAreaData(_id).then(response => {
-    const data = response.data
-    // 转换时间段字符串为数组格式
-    if (data.timeSlot && typeof data.timeSlot === 'string' && data.timeSlot.includes('-')) {
-      data.timeSlot = data.timeSlot.split('-')
-    }
-    form.value = data
+    form.value = response.data
     open.value = true
     title.value = "修改候检区数据"
   })
@@ -394,19 +390,14 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["collectWaitingAreaDataRef"].validate(valid => {
     if (valid) {
-      const submitData = { ...form.value }
-      // 转换时间段为字符串格式 08:00-17:00
-      if (submitData.timeSlot && Array.isArray(submitData.timeSlot)) {
-        submitData.timeSlot = submitData.timeSlot.join('-')
-      }
-      if (submitData.id != null) {
-        updateCollectWaitingAreaData(submitData).then(response => {
+      if (form.value.id != null) {
+        updateCollectWaitingAreaData(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addCollectWaitingAreaData(submitData).then(response => {
+        addCollectWaitingAreaData(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()

src/views/runData/runScreen/index.vue

@@ -2,7 +2,24 @@
   <div class="run-screen-container">
     <!-- 页面标题 -->
     <div class="page-title">
-      <h1>盛世鹰眸质控系统[生产运行]（安检站）</h1>
+      <h1>盛世鹰眸质控系统[生产运行]</h1>
+    </div>
+
+    <!-- 查询条件 -->
+    <div class="filter-container">
+      
+        <span style="margin-right: 10px;">日期</span>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="YYYY-MM-DD"
+          style="width: 250px;"
+          @change="handleDateChange"
+        />
+     
     </div>
 
     <!-- 模块一：运行数据 -->
@@ -169,8 +186,19 @@
 </template>
 
 <script setup name="RunScreen">
-import { ref, onMounted, onUnmounted, nextTick } from 'vue'
-import * as echarts from 'echarts'
+import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
+
+// 日期范围
+const currentYear = new Date().getFullYear()
+const defaultStartDate = `${currentYear}-01-01`
+const defaultEndDate = new Date().toISOString().split('T')[0]
+const dateRange = ref([defaultStartDate, defaultEndDate])
+const queryParams = reactive({
+  startDate: defaultStartDate,
+  endDate: defaultEndDate
+})
+
+// 图表引用
 import {
   getOperationSummary,
   getT1PassengerTrend,
@@ -229,9 +257,21 @@ const brigadeSeizureData = ref([])
 const powerBankData = ref({})
 const pendingConfiscateData = ref({})
 
+// 日期范围变化
+function handleDateChange(val) {
+  if (val && val.length === 2) {
+    queryParams.startDate = val[0]
+    queryParams.endDate = val[1]
+  } else {
+    queryParams.startDate = defaultStartDate
+    queryParams.endDate = defaultEndDate
+  }
+  loadData()
+}
+
 async function loadData() {
   try {
-    const query = {}
+    const query = { ...queryParams }
     
     const [
       summaryRes,
@@ -724,6 +764,16 @@ onUnmounted(() => {
   margin: 0;
 }
 
+.filter-container {
+  width: 100%;
+  background: #fff;
+  padding: 15px;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+
+
 .module-title-wrapper {
   text-align: center;
   width: 100%;

src/views/runData/seizeData/index.vue

@@ -170,13 +170,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="T1总数" prop="t1Total">
-              <el-input v-model="form.t1Total" placeholder="自动计算" readonly style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
         
         <!-- T2区域 -->
         <el-divider content-position="left">T2区域数据</el-divider>
@@ -224,18 +217,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="T2总数" prop="t2Total">
-              <el-input v-model="form.t2Total" placeholder="自动计算" readonly style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="T1总数+T2总数" prop="grandTotal">
-              <el-input v-model="form.grandTotal" placeholder="自动计算" readonly style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -410,30 +391,6 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 计算总数 */
-function calculateTotals() {
-  // 计算T1总数
-  const t1Fields = ['t1FireSource', 't1Knife', 't1PoliceWeapon', 't1Firework', 't1LiveAnimal', 
-                   't1Corrosive', 't1FakeId', 't1Explosive', 't1Tool', 't1GunAmmo', 
-                   't1Illegal', 't1Other']
-  const t1Total = t1Fields.reduce((sum, field) => {
-    return sum + (form.value[field] || 0)
-  }, 0)
-  form.value.t1Total = t1Total
-  
-  // 计算T2总数
-  const t2Fields = ['t2FireSource', 't2Knife', 't2PoliceWeapon', 't2Firework', 't2LiveAnimal', 
-                   't2Corrosive', 't2FakeId', 't2Explosive', 't2Tool', 't2GunAmmo', 
-                   't2Illegal', 't2Other']
-  const t2Total = t2Fields.reduce((sum, field) => {
-    return sum + (form.value[field] || 0)
-  }, 0)
-  form.value.t2Total = t2Total
-  
-  // 计算总总数
-  form.value.total = t1Total + t2Total
-}
-
 /** 查询查获数据列表 */
 function getList() {
   loading.value = true
@@ -471,7 +428,6 @@ function reset() {
     t1GunAmmo: null,
     t1Illegal: null,
     t1Other: null,
-    t1Total: null,
     // T2区域数据
     t2FireSource: null,
     t2Knife: null,
@@ -484,9 +440,7 @@ function reset() {
     t2Tool: null,
     t2GunAmmo: null,
     t2Illegal: null,
-    t2Other: null,
-    t2Total: null,
-    grandTotal: null
+    t2Other: null
   }
   proxy.resetForm("seizeDataRef")
 }
@@ -532,9 +486,6 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["seizeDataRef"].validate(valid => {
     if (valid) {
-      // 提交前重新计算总数
-      calculateTotals()
-      
       if (form.value.id != null) {
         updateSeizeData(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")