Merge branch 'blockingData' into dev

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

@@ -6,8 +6,11 @@
           <div class="stat-card-inner">
             <div class="stat-left">
               <div class="stat-label">查堵总数</div>
-              <div class="stat-value">{{ statValue || 0 }}</div>
-              <div class="stat-unit">起</div>
+              <div class="stat-content">
+                <div class="stat-value">{{ statValue || 0 }}</div>
+                <div class="stat-unit">起</div>
+              </div>
+
             </div>
           </div>
         </div>
@@ -20,7 +23,7 @@
           <div ref="chart2" class="echarts"></div>
         </div>
       </div>
-      
+
       <div class="chart-row">
         <div class="chart-item">
           <div class="chart-title">两楼查堵数（包含行检）</div>
@@ -31,7 +34,7 @@
           <div ref="chart4" class="echarts"></div>
         </div>
       </div>
-      
+
       <div class="chart-row">
         <div class="chart-item">
           <div class="chart-title">两楼每日查堵万分率</div>
@@ -145,9 +148,11 @@ const fetchData = async () => {
     }
 
     if (blockedRes.value?.data) {
+      const terminal = processedParams?.terminal || '';
+
       const blockedData = [
-        { name: 'T1', value: blockedRes.value.data.t1BlockedCount || 0 },
-        { name: 'T2', value: blockedRes.value.data.t2BlockedCount || 0 }
+        ...(terminal.includes('T1') || terminal.includes('整体') || !terminal ? [{ name: 'T1', value: blockedRes.value.data.t1BlockedCount || 0 }] : []),
+        ...(terminal.includes('T2') || terminal.includes('整体') || !terminal ? [{ name: 'T2', value: blockedRes.value.data.t2BlockedCount || 0 }] : [])
       ]
       setOption3(horizontalBarChartOption(blockedData, '#3b82f6'))
       const total = blockedRes.value.data.totalBlockedCount || 0
@@ -178,8 +183,8 @@ const fetchData = async () => {
     if (itemRes.value?.data) {
       const colors = ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#10b981', '#f59e0b', '#ef4444']
       const itemData = itemRes.value.data.map((item, index) => ({
-        name: item.missCheckItem ,
-        value: item.count 
+        name: item.missCheckItem,
+        value: item.count
       }))
       setOption6(pieChartOption(itemData, colors))
     }
@@ -212,7 +217,7 @@ const multiLineChartOption = (xAxisData, series) => ({
   },
   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' } } },
-  legend: { 
+  legend: {
     data: series.map(s => s.name),
     top: '0%',
     textStyle: { fontSize: 10 }
@@ -240,10 +245,10 @@ const horizontalBarChartOption = (data, color) => ({
   },
   xAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
   yAxis: { type: 'category', data: data.map(d => d.name), axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
-  series: [{ 
-    type: 'bar', 
-    data: data.map(d => d.value), 
-    itemStyle: { color: color }, 
+  series: [{
+    type: 'bar',
+    data: data.map(d => d.value),
+    itemStyle: { color: color },
     barWidth: 15,
     label: { show: true, position: 'right', fontSize: 10, color: color }
   }]
@@ -257,7 +262,7 @@ const barLineChartOption = (xAxisData, barData, lineData) => ({
   },
   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' } } },
-  legend: { 
+  legend: {
     data: ['平均过检行李数', '平均查堵件数'],
     top: '0%',
     textStyle: { fontSize: 10 }
@@ -287,7 +292,7 @@ const barLineChartOption = (xAxisData, barData, lineData) => ({
 
 const pieChartOption = (data, colors) => ({
   color: colors,
-  legend: { 
+  legend: {
     show: true,
     textStyle: { fontSize: 10 }
   },
@@ -303,7 +308,7 @@ const pieChartOption = (data, colors) => ({
 
 onMounted(() => {
   fetchData()
-  
+
 })
 </script>
 
@@ -324,11 +329,6 @@ onMounted(() => {
 
 .stat-card {
   flex: 1;
-  background: #fff;
-  border-radius: 6px;
-  padding: 15px;
-  border: 1px solid #eee;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   min-height: 120px;
 }
 
@@ -336,21 +336,38 @@ onMounted(() => {
   display: flex;
   height: 100%;
   align-items: center;
-  justify-content: center;
+  gap: 10px;
 }
 
 .stat-left {
+  background: #fff;
+  border-radius: 6px;
+  border: 1px solid #eee;
+  padding: 15px;
+  height: 100%;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  flex: 1;
   display: flex;
-  flex-direction: column;
   align-items: center;
+  flex-direction: column;
+
+  padding-right: 15px;
 }
 
 .stat-label {
-  font-size: 14px;
-  color: #666;
+  width: 100%;
+  font-size: 17px;
+  color: black;
   margin-bottom: 8px;
 }
 
+.stat-content {
+  margin-top: 25%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
 .stat-value {
   font-size: 48px;
   font-weight: bold;
@@ -393,11 +410,11 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 300px;
+  min-height: 400px;
 }
 
 .chart-title {
- font-size: 17px;
+  font-size: 17px;
   color: black;
   margin-bottom: 5px;
   text-align: left;

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

@@ -106,7 +106,7 @@ const ringChartOption = (data, colors) => ({
   },
   series: [{
     type: 'pie',
-    radius: ['40%', '65%'],
+    radius: ['35%', '45%'],
     center: ['50%', '55%'],
     data: data,
     label: {
@@ -151,7 +151,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 300px;
+  min-height: 400px;
 }
 
 .chart-title {

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

@@ -3,6 +3,26 @@
     <div class="module-brigade-content">
       <div class="chart-row">
         <div class="chart-item">
+          <div class="chart-title">查堵-困难图像数</div>
+          <div class="number-display">
+            <div class="number-value">{{ difficultValue || 0 }}</div>
+            <div class="number-unit">幅</div>
+          </div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵-简单图像数</div>
+          <div class="number-display">
+            <div class="number-value">{{ simpleValue || 0 }}</div>
+            <div class="number-unit">幅</div>
+          </div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵物品位置</div>
+          <div ref="chart7" class="echarts"></div>
+        </div>
+      </div>
+      <div class="chart-row">
+        <div class="chart-item">
           <div class="chart-title">查堵-主管排行榜</div>
           <rank-list :rank-data="rankData1" title="查堵-主管排行榜" header-label="排名" header-name="分管主管" header-count="计数" />
         </div>
@@ -31,26 +51,7 @@
         </div>
       </div>
 
-      <div class="chart-row">
-        <div class="chart-item">
-          <div class="chart-title">查堵物品位置</div>
-          <div ref="chart7" class="echarts"></div>
-        </div>
-        <div class="chart-item">
-          <div class="chart-title">查堵-困难图像数</div>
-          <div class="number-display">
-            <div class="number-value">{{ difficultValue || 0 }}</div>
-            <div class="number-unit">幅</div>
-          </div>
-        </div>
-        <div class="chart-item">
-          <div class="chart-title">查堵-简单图像数</div>
-          <div class="number-display">
-            <div class="number-value">{{ simpleValue || 0 }}</div>
-            <div class="number-unit">幅</div>
-          </div>
-        </div>
-      </div>
+
 
       <div class="chart-row">
         <div class="chart-item">

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

@@ -399,7 +399,7 @@ onMounted(() => {
   padding: 15px;
   border: 1px solid #eee;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
-  min-height: 350px;
+  min-height: 400px;  /* 400px */
   height: 100%;
 }
 
@@ -413,7 +413,7 @@ onMounted(() => {
 .echarts {
   flex: 1;
   width: 100%;
-  min-height: 300px;
-  height: 300px;
+  min-height: 400px;  /* 400px */
+  height: 400px;
 }
 </style>

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

@@ -1409,7 +1409,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 300px;
+  min-height: 400px;
 }
 
 .chart-row.full-width .chart-item {

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

@@ -147,7 +147,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 350px;
+  min-height: 400px;  /* 400px */
   height: 100%;
 }
 
@@ -161,7 +161,7 @@ onMounted(() => {
 .echarts {
   flex: 1;
   width: 100%;
-  min-height: 300px;
-  height: 300px;
+  min-height: 400px;  /* 400px */
+  height: 400px;
 }
 </style>

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

@@ -322,7 +322,7 @@ const pieOption = (data, colors, isRing = false) => ({
   },
   series: [{
     type: 'pie',
-    radius: isRing ? ['50%', '70%'] : '60%',
+    radius: isRing ? ['40%', '50%'] : '60%',
     center: ['50%', '55%'],
     data: data,
     label: {
@@ -395,7 +395,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 300px;
+  min-height: 400px;  
 }
 
 .chart-title {

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

@@ -96,7 +96,7 @@ const getItemClass = (rank, index) => {
 <style lang="less" scoped>
 .rank-list-container {
   width: 100%;
-  height: 300px; /* 固定高度 */
+  height: 400px; /* 固定高度 */
   background: #fff;
   border-radius: 8px;
   border: 1px solid #e5e7eb;

src/views/blockingData/blockingDataScreen/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="blocking-data-screen">
     <div class="screen-header">
-      <div class="header-title">盛世鹰眸质控系统【查堵】（安检站）</div>
+      <div class="header-title">盛世鹰眸质控系统【查堵】</div>
     </div>
 
     <div class="filter-section">

src/views/blockingData/missedInspectionList/index.vue

@@ -236,8 +236,8 @@
           <el-col :span="12">
             <el-form-item label="是否追回" prop="isRecovered">
               <el-select v-model="form.isRecovered" placeholder="请选择是否追回" filterable style="width: 100%">
-                <el-option label="是" value="1" />
-                <el-option label="否" value="0" />
+                <el-option label="是" :value="1" />
+                <el-option label="否" :value="0" />
               </el-select>
             </el-form-item>
           </el-col>