Merge branch 'blockingData' into dev

src/views/blockingData/blockingDataScreen/components/ModuleBrigadeOne.vue

@@ -255,13 +255,30 @@ const horizontalBarChartOption = (data, color) => ({
 })
 
 const barLineChartOption = (xAxisData, barData, lineData) => ({
-  grid: { left: '10%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  grid: { left: '10%', top: '15%', right: '10%', bottom: '15%', containLabel: true },
   tooltip: {
     trigger: 'axis',
     axisPointer: { type: 'cross' }
   },
   xAxis: { type: 'category', data: xAxisData, axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
-  yAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
+  yAxis: [
+    {
+      type: 'value',
+      name: '行李数',
+      position: 'left',
+      axisLine: { lineStyle: { color: '#3b82f6' } },
+      axisLabel: { fontSize: 10, color: '#3b82f6' },
+      splitLine: { lineStyle: { color: '#eee' } }
+    },
+    {
+      type: 'value',
+      name: '查堵件数',
+      position: 'right',
+      axisLine: { lineStyle: { color: '#ec4899' } },
+      axisLabel: { fontSize: 10, color: '#ec4899' },
+      splitLine: { show: false }
+    }
+  ],
   legend: {
     data: ['平均过检行李数', '平均查堵件数'],
     top: '0%',
@@ -271,6 +288,7 @@ const barLineChartOption = (xAxisData, barData, lineData) => ({
     {
       name: '平均过检行李数',
       type: 'bar',
+      yAxisIndex: 0,
       data: barData,
       itemStyle: { color: '#3b82f6' },
       barWidth: 20,
@@ -279,6 +297,7 @@ const barLineChartOption = (xAxisData, barData, lineData) => ({
     {
       name: '平均查堵件数',
       type: 'line',
+      yAxisIndex: 1,
       smooth: true,
       symbol: 'circle',
       symbolSize: 6,

src/views/blockingData/missedInspectionList/index.vue

@@ -112,15 +112,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="航站楼" prop="terminalId">
-              <el-select v-model="form.terminalId" placeholder="请选择航站楼" filterable style="width: 100%">
-                <el-option v-for="item in channelOptions" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
             <el-form-item label="被回查人" prop="reviewedUserId">
               <el-select v-model="form.reviewedUserId" placeholder="请选择被回查人" filterable style="width: 100%"
                 @change="handleReviewedUserChange">
@@ -128,20 +119,31 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="航站楼" prop="terminalId">
+              <el-select v-model="form.terminalId" placeholder="请选择航站楼" filterable style="width: 100%">
+                <el-option v-for="item in channelOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="回查日期" prop="reviewDate">
               <el-date-picker v-model="form.reviewDate" type="date" placeholder="选择回查日期" value-format="YYYY-MM-DD"
                 style="width: 100%" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="漏检时间" prop="missCheckTime">
               <el-date-picker v-model="form.missCheckTime" type="datetime" placeholder="请选择漏检时间"
                 value-format="YYYY-MM-DD HH:mm" style="width: 100%" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="漏检时间段" prop="missCheckTimePeriod">
               <el-select v-model="form.missCheckTimePeriod" placeholder="请选择漏检时间段" filterable style="width: 100%">
@@ -150,8 +152,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="上岗位置" prop="channelId">
               <el-select v-model="form.channelId" placeholder="请选择上岗位置" filterable style="width: 100%">
@@ -159,6 +159,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="漏检物品" prop="missCheckItem">
               <el-tree-select v-model="form.missCheckItem" :data="missCheckItemOptions"
@@ -166,9 +169,6 @@
                 value-key="name" placeholder="请选择漏检物品" check-strictly style="width: 100%" />
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="分管主管" prop="supervisorId">
               <el-select v-model="form.supervisorId" placeholder="请选择分管主管" filterable style="width: 100%">
@@ -177,6 +177,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="代管主管" prop="actingSupervisorId">
               <el-select v-model="form.actingSupervisorId" placeholder="请选择代管主管" filterable style="width: 100%">
@@ -185,9 +188,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="分管班组长" prop="teamLeaderId">
               <el-select v-model="form.teamLeaderId" placeholder="请选择分管班组长" filterable style="width: 100%">
@@ -196,6 +196,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="物品位置" prop="itemLocation">
               <el-select v-model="form.itemLocation" placeholder="请选择物品位置" filterable style="width: 100%">
@@ -204,9 +207,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="简单/难" prop="difficultyLevel">
               <el-select v-model="form.difficultyLevel" placeholder="请选择简单/难" filterable style="width: 100%">
@@ -215,6 +215,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="回查人" prop="reviewUserId">
               <el-select v-model="form.reviewUserId" placeholder="请选择回查人" filterable style="width: 100%">
@@ -222,9 +225,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="判别类型" prop="discriminationType">
               <el-select v-model="form.discriminationType" placeholder="请选择判别类型" filterable style="width: 100%">
@@ -233,6 +233,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="是否追回" prop="isRecovered">
               <el-select v-model="form.isRecovered" placeholder="请选择是否追回" filterable style="width: 100%">
@@ -241,9 +244,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="开机年限" prop="machineOperatingYears">
               <el-select v-model="form.machineOperatingYears" placeholder="请选择开机年限" filterable style="width: 100%">
@@ -252,6 +252,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="证书级别" prop="certificateLevel">
               <el-select v-model="form.certificateLevel" placeholder="请输入证书级别" filterable style="width: 100%">
@@ -261,9 +264,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="人员性别" prop="gender">
               <el-select v-model="form.gender" placeholder="请选择人员性别" filterable style="width: 100%">
@@ -272,6 +272,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="漏检原因分类" prop="missCheckReasonCategory">
               <el-select v-model="form.missCheckReasonCategory" placeholder="请选择漏检原因分类" filterable style="width: 100%">
@@ -280,9 +283,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="月考成绩" prop="monthlyAssessment">
               <el-select v-model="form.monthlyAssessment" placeholder="请选择月考成绩" filterable style="width: 100%">
@@ -291,6 +291,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="本月自测有无漏检" prop="selfTestHasMissCheck">
               <el-input-number v-model="form.selfTestHasMissCheck" :min="0" :precision="0" placeholder="请输入0-2的整数"
@@ -311,8 +314,8 @@
     <!-- 导入对话框 -->
     <el-dialog title="导入" v-model="upload.open" width="500px" append-to-body>
       <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
-        :data="upload.data" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
-        :auto-upload="false" drag>
+        :data="upload.data" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess" :auto-upload="false" drag>
         <el-icon class="el-icon--upload"><upload-filled /></el-icon>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <template #tip>
@@ -395,7 +398,7 @@ const form = reactive({})
 // 表单校验
 const rules = {
   brigadeId: [{ required: true, message: '大队不能为空', trigger: 'change' }],
-  terminalId: [{ required: true, message: '航站楼不能为空', trigger: 'change' }],
+  // terminalId: [{ required: true, message: '航站楼不能为空', trigger: 'change' }],
   reviewedUserId: [{ required: true, message: '被回查人不能为空', trigger: 'change' }],
   reviewDate: [{ required: true, message: '回查日期不能为空', trigger: 'change' }],
   missCheckTime: [{ required: true, message: '漏检时间不能为空', trigger: 'change' }],
@@ -553,8 +556,8 @@ function reset() {
   Object.assign(form, {
     id: null,
     brigadeId: null,
-    terminalId: null,
-    terminalName: null,
+    // terminalId: null,
+    // terminalName: null,
     reviewedUserId: null,
     reviewDate: null,
     missCheckTime: null,
@@ -633,11 +636,11 @@ function submitForm() {
       }
 
       // 处理航站楼ID和名称映射
-      if (form.terminalId) {
-      
-        const area = channelOptions.value.find(item => item.id === form.terminalId)
-        form.terminalName = area ? area.name : null
-      }
+      // if (form.terminalId) {
+
+      //   const area = channelOptions.value.find(item => item.id === form.terminalId)
+      //   form.terminalName = area ? area.name : null
+      // }
 
       // 处理被回查人ID和名称映射
       if (form.reviewedUserId) {
@@ -647,7 +650,7 @@ function submitForm() {
 
       // 处理上岗位置ID和名称映射
       if (form.channelId) {
-      
+
         const channel = areaOptions.value.find(item => item.id === form.channelId)
         form.channelName = channel ? channel.name : null
       }
@@ -660,7 +663,7 @@ function submitForm() {
 
       // 处理代管主管ID和名称映射
       if (form.actingSupervisorId) {
-      
+
         const actingSupervisor = supervisorOptions.value.find(item => item.value === form.actingSupervisorId)
         form.actingSupervisorName = actingSupervisor ? actingSupervisor.label : null
       }