Merge branch 'main' of http://129.211.33.98:3210/hjq/aircraft-admin

src/views/analysis/orderAnalysis/index.vue

@@ -143,38 +143,41 @@
               <el-table
                 :data="orderList"
                 style="width: 100%"
+                :fit="true" 
+                :cell-style="{ textAlign: 'center' }"
                 v-loading="tableLoading"
                 stripe
                 border
                 @sort-change="handleSortChange"
+                
               >
                 <el-table-column 
                   prop="orderNo" 
                   label="订单编号" 
-                  width="180"
+                  min-width="180"
                   sortable
                 />
                 <el-table-column 
                   prop="orderInitiatorId" 
                   label="客户ID" 
-                  width="150"
+                  min-width="150"
                 />
                 <el-table-column 
                   prop="attractionId" 
                   label="景点ID" 
-                  width="120"
+                  min-width="120"
                 />
                 <el-table-column 
                   prop="amount" 
                   label="金额(元)" 
-                  width="120"
+                  min-width="120"
                   sortable
                   align="right"
                 />
                 <el-table-column 
                   prop="mainOrderStatus" 
                   label="状态" 
-                  width="120"
+                  min-width="120"
                   :filters="statusFilters"
                   :filter-method="filterStatus"
                 >
@@ -187,17 +190,17 @@
                 <el-table-column 
                   prop="orderCreateTime" 
                   label="下单时间" 
-                  width="180"
+                  min-width="180"
                   sortable
                 />
                 <el-table-column 
                   prop="orderFinishTime" 
                   label="完成时间" 
-                  width="180"
+                  min-width="180"
                 />
-                <el-table-column 
+                <!-- <el-table-column 
                   label="操作" 
-                  width="120"
+                  min-width="120"
                   fixed="right"
                 >
                   <template slot-scope="{ row }">
@@ -208,7 +211,7 @@
                       详情
                     </el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
               <div class="pagination-wrapper">
                 <div class="pagination-info">

src/views/analysis/taskAnalysis/index.vue

@@ -81,30 +81,32 @@
             <h3 class="section-title">任务详情列表</h3>
             <el-table
               :data="orderDetailList"
+              :fit="true" 
+              :cell-style="{ textAlign: 'center' }"
               border
               stripe
               class="task-detail-table"
               :header-cell-style="{background:'#f5f7fa', color:'#333'}"
             >
-              <el-table-column prop="id" label="ID" width="80" align="center" />
+              <el-table-column prop="id" label="ID" min-width="150"  />
-              <el-table-column prop="orderId" label="订单ID" width="100" align="center" />
+              <el-table-column prop="orderId" label="订单ID" min-width="150"  />
-              <el-table-column prop="deviceId" label="设备ID" width="150" align="center" show-overflow-tooltip />
+              <el-table-column prop="deviceId" label="设备ID" min-width="150"  show-overflow-tooltip />
-              <el-table-column prop="operatorId" label="操作员ID" width="120" align="center" />
+              <el-table-column prop="operatorId" label="操作员ID" min-width="80"  />
-              <el-table-column prop="createTime" label="创建时间" width="180" align="center" />
+              <el-table-column prop="createTime" label="创建时间" min-width="160"  />
-              <el-table-column prop="orderItemStatus" label="状态" width="120" align="center">
+              <el-table-column prop="orderItemStatus" label="状态" min-width="120" >
                 <template #default="{row}">
                   <el-tag :type="getStatusTagType(row.orderItemStatus)">
                     {{ getStatusText(row.orderItemStatus) }}
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="personCount" label="人数" width="100" align="center" />
+              <!-- <el-table-column prop="personCount" label="人数" min-width="100"  /> -->
-              <el-table-column prop="cargoWeight" label="货物重量(kg)" width="150" align="center" />
+              <el-table-column prop="cargoWeight" label="货物重量(kg)" min-width="80"  />
-              <el-table-column 
+              <!-- <el-table-column 
                   label="操作" 
-                  width="120"
+                  min-width="120"
                   fixed="right"
-                />
+                /> -->
             </el-table>
           </div>
         </div>