Merge branch 'runData' into dev

src/views/runData/dailyRunData/index.vue

@@ -53,11 +53,11 @@
       <el-table-column label="一楼" align="center" prop="floor1CenterStaff" />
       <el-table-column label="负一楼" align="center" prop="floorB1WestStaff" />
       <el-table-column label="国内货站" align="center" prop="domesticCargo" />
-      <el-table-column label="道口" align="center" prop="domesticGate" />
+      <el-table-column label="国内道口" align="center" prop="domesticGate" />
       <el-table-column label="南侧车检" align="center" prop="southVehicleCheck" />
       <el-table-column label="防爆" align="center" prop="domesticBomb" />
       <el-table-column label="国际货站" align="center" prop="intlCargo" />
-      <el-table-column label="道口" align="center" prop="intlGate" />
+      <el-table-column label="国际道口" align="center" prop="intlGate" />
       <el-table-column label="北侧车检" align="center" prop="northVehicleCheck" />
       <el-table-column label="防爆" align="center" prop="intlBomb" />
       <el-table-column label="操作" width="180px" align="center" class-name="small-padding fixed-width">
@@ -134,8 +134,8 @@
             <el-form-item label="国内货站" prop="domesticCargo">
               <el-input-number :precision="0" v-model="form.domesticCargo" :min="0" placeholder="请输入国内货站数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="道口" prop="domesticGate">
-              <el-input-number :precision="0" v-model="form.domesticGate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
+            <el-form-item label="国内道口" prop="domesticGate">
+              <el-input-number :precision="0" v-model="form.domesticGate" :min="0" placeholder="请输入国内道口数据" style="width: 100%" />
             </el-form-item>
             <el-form-item label="南侧车检" prop="southVehicleCheck">
               <el-input-number :precision="0" v-model="form.southVehicleCheck" :min="0" placeholder="请输入南侧车检数据"
@@ -147,8 +147,8 @@
             <el-form-item label="国际货站" prop="intlCargo">
               <el-input-number :precision="0" v-model="form.intlCargo" :min="0" placeholder="请输入国际货站数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="道口" prop="intlGate">
-              <el-input-number :precision="0" v-model="form.intlGate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
+            <el-form-item label="国际道口" prop="intlGate">
+              <el-input-number :precision="0" v-model="form.intlGate" :min="0" placeholder="请输入国际道口数据" style="width: 100%" />
             </el-form-item>
             <el-form-item label="北侧车检" prop="northVehicleCheck">
               <el-input-number :precision="0" v-model="form.northVehicleCheck" :min="0" placeholder="请输入北侧车检数据"
@@ -301,8 +301,8 @@ const data = reactive({
       { type: "integer", message: "国内货站数据必须为整数", trigger: "blur" }
     ],
     domesticGate: [
-      { required: true, message: "道口数据不能为空", trigger: "blur" },
-      { type: "integer", message: "道口数据必须为整数", trigger: "blur" }
+      { required: true, message: "国内道口数据不能为空", trigger: "blur" },
+      { type: "integer", message: "国内道口数据必须为整数", trigger: "blur" }
     ],
     southVehicleCheck: [
       { required: true, message: "南侧车检数据不能为空", trigger: "blur" },
@@ -317,8 +317,8 @@ const data = reactive({
       { type: "integer", message: "国际货站数据必须为整数", trigger: "blur" }
     ],
     intlGate: [
-      { required: true, message: "道口数据不能为空", trigger: "blur" },
-      { type: "integer", message: "道口数据必须为整数", trigger: "blur" }
+      { required: true, message: "国际道口数据不能为空", trigger: "blur" },
+      { type: "integer", message: "国际道口数据必须为整数", trigger: "blur" }
     ],
     northVehicleCheck: [
       { required: true, message: "北侧车检数据不能为空", trigger: "blur" },
@@ -389,6 +389,7 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
+  queryParams.value.recordDate = null
   proxy.resetForm("queryRef")
   handleQuery()
 }

src/views/runData/discouragePowerBanksData/index.vue

@@ -7,17 +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>
@@ -96,16 +90,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 +293,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('-')
-  }
-  listDiscouragePowerBanksData(params).then(response => {
+  listDiscouragePowerBanksData(queryParams.value).then(response => {
     discouragePowerBanksDataList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -378,12 +363,7 @@ function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
   getDiscouragePowerBanksData(_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 = "修改劝阻充电宝数据"
   })
@@ -393,19 +373,14 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["discouragePowerBanksDataRef"].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) {
-        updateDiscouragePowerBanksData(submitData).then(response => {
+      if (form.value.id != null) {
+        updateDiscouragePowerBanksData(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addDiscouragePowerBanksData(submitData).then(response => {
+        addDiscouragePowerBanksData(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()

src/views/runData/runScreen/index.vue

@@ -477,7 +477,7 @@ function initCharts() {
     seizePieChartInstance = echarts.init(seizePieChart.value)
     const seizureData = seizureCategoryData.value || []
     seizePieChartInstance.setOption({
-      tooltip: { trigger: 'item' },
+      tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
       legend: { orient: 'vertical', right: 10, top: 'center' },
       series: [{
         name: '查获数据',
@@ -491,6 +491,9 @@ function initCharts() {
             shadowOffsetX: 0,
             shadowColor: 'rgba(0, 0, 0, 0.5)'
           }
+        },
+        label: {
+          formatter: '{b}: {c} ({d}%)'
         }
       }]
     })
@@ -508,7 +511,12 @@ function initCharts() {
         const item = brigadeData.find(d => d.shift === shift && d.brigade === brigade)
         return item ? item.grandTotal : 0
       }),
-      type: 'bar'
+      type: 'bar',
+      label: {
+        show: true,
+        position: 'top',
+        formatter: '{c}'
+      }
     }))
     teamSeizeBarChartInstance.setOption({
       tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
@@ -534,7 +542,12 @@ function initCharts() {
         const item = brigadeData.find(d => d.shift === shift && d.brigade === brigade)
         return item ? item.t1Total : 0
       }),
-      type: 'bar'
+      type: 'bar',
+      label: {
+        show: true,
+        position: 'top',
+        formatter: '{c}'
+      }
     }))
     t1TeamBarChartInstance.setOption({
       tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
@@ -560,7 +573,12 @@ function initCharts() {
         const item = brigadeData.find(d => d.shift === shift && d.brigade === brigade)
         return item ? item.t2Total : 0
       }),
-      type: 'bar'
+      type: 'bar',
+      label: {
+        show: true,
+        position: 'top',
+        formatter: '{c}'
+      }
     }))
     t2TeamBarChartInstance.setOption({
       tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
@@ -590,7 +608,7 @@ function initCharts() {
     ].filter(item => item.value > 0)
     
     powerBankPieChartInstance.setOption({
-      tooltip: { trigger: 'item' },
+      tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
       legend: { orient: 'vertical', right: 10, top: 'center' },
       series: [{
         name: '不合格充电宝',
@@ -604,6 +622,9 @@ function initCharts() {
             shadowOffsetX: 0,
             shadowColor: 'rgba(0, 0, 0, 0.5)'
           }
+        },
+        label: {
+          formatter: '{b}: {c} ({d}%)'
         }
       }]
     })
@@ -620,7 +641,7 @@ function initCharts() {
     ].filter(item => item.value > 0)
     
     waitingAreaPieChartInstance.setOption({
-      tooltip: { trigger: 'item' },
+      tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
       legend: { orient: 'vertical', right: 10, top: 'center' },
       series: [{
         name: '禁限带物品',
@@ -634,6 +655,9 @@ function initCharts() {
             shadowOffsetX: 0,
             shadowColor: 'rgba(0, 0, 0, 0.5)'
           }
+        },
+        label: {
+          formatter: '{b}: {c} ({d}%)'
         }
       }]
     })

src/views/runData/seizeData/index.vue

@@ -8,7 +8,7 @@
       </el-form-item>
       <el-form-item label="班次" prop="shift">
         <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
-          <el-option v-for="item in shiftOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in shiftOptions" :key="item.value" :label="item.label" :value="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="当班大队" prop="brigade">
@@ -81,7 +81,9 @@
       <el-table-column label="T2其他" align="center" prop="t2Other" />
       <el-table-column label="T2总数" align="center" prop="t2Total" />
       
-      <el-table-column label="T1总数+T2总数" align="center" prop="total" />
+      <el-table-column label="T1总数+T2总数" align="center" prop="grandTotal" >
+        
+      </el-table-column>
       
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">  
         <template #default="scope">
@@ -229,8 +231,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="T1总数+T2总数" prop="total">
-              <el-input v-model="form.total" placeholder="自动计算" readonly style="width: 100%" />
+            <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>
@@ -276,6 +278,7 @@ import { listDept } from '@/api/system/dept'
 import { getToken } from '@/utils/auth'
 
 const { proxy } = getCurrentInstance()
+const { shift } = proxy.useDict('shift')
 
 const seizeDataList = ref([])
 const open = ref(false)
@@ -288,10 +291,7 @@ const total = ref(0)
 const title = ref("")
 
 // 班次字典
-const shiftOptions = [
-  { value: '早班', label: '早班' },
-  { value: '晚班', label: '晚班' }
-]
+const shiftOptions = shift
 
 // 大队选项
 const brigadeOptions = ref([])
@@ -486,7 +486,7 @@ function reset() {
     t2Illegal: null,
     t2Other: null,
     t2Total: null,
-    total: null
+    grandTotal: null
   }
   proxy.resetForm("seizeDataRef")
 }