HD_wangm 4 mesiacov pred
rodič
commit
70e5c8ca66

+ 14 - 51
pages/index/index.uvue

@@ -152,9 +152,9 @@
 	// 		console.log(res)
 	// 	});
 	// };
-	
+
 	const tabbar = [1,1,1,1]
-	
+
     // 用户名
     const userName = ref<string>('用户')
 
@@ -708,56 +708,19 @@
 	.db-view{
 		display: flex;
 		flex-direction: row;
-		justify-content: space-between; // 或 space-around
+		justify-content: flex-start; // 或 space-around
+		// justify-content: space-around; /* 自动分配间距,避免挤压 */
 		align-items: center;
 		padding: 0 20rpx; // 可选:避免贴边
 
-		// .db-box{
-		// 	background-color: #fff;
-		// 	width:200rpx;
-		// 	height: 200rpx;
-		// 	justify-content: center;
-		// 	align-items: center;
-		// 	margin-left: 28rpx;
-		// 	border-radius: 5px;
-		// 	.db-text{
-		// 		margin-top: 10rpx;
-		// 		font-size:10px;
-		// 	}
-		// 	.db-center-1{
-		// 		justify-content: center;
-		// 		align-items: center;
-		// 		background-color: #DBEAFE;
-		// 		border-radius: 200px;
-		// 		width:100rpx;
-		// 		height:100rpx;
-		// 		position: relative;
-		// 	}
-		// 	.db-center-2{
-		// 		justify-content: center;
-		// 		align-items: center;
-		// 		background-color: #DCFCE7;
-		// 		border-radius: 200px;
-		// 		width:100rpx;
-		// 		height:100rpx;
-		// 		position: relative;
-		// 	}
-		// 	.db-center-3{
-		// 		justify-content: center;
-		// 		align-items: center;
-		// 		background-color: #F3E8FF;
-		// 		border-radius: 200px;
-		// 		width:100rpx;
-		// 		height:100rpx;
-		// 	}
-		// }
 		.db-box {
 			background-color: #fff;
+			width: 216rpx; 
 			// 删除固定宽高 ↓
-			// width: 200rpx;
+			// max-width: 300rpx;
 			// height: 200rpx;
-		
-			flex: 1;                // ✅ 关键:平均分空间
+
+			// flex: 1;                // ✅ 关键:平均分空间
 			display: flex;
 			flex-direction: column; // 垂直排列:图标在上,文字在下
 			justify-content: center;
@@ -765,13 +728,13 @@
 			margin: 0 10rpx;        // 左右间距(替代原来的 margin-left)
 			border-radius: 5px;
 			padding: 30rpx 10rpx;   // 可选:增加内边距使内容不拥挤
-		
+
 			.db-text {
 				margin-top: 16rpx;   // 图标与文字间距
 				font-size: 24rpx;    // 建议用 rpx,10px 太小了
 				color: #333;
 			}
-		
+
 			.db-center-1,
 			.db-center-2,
 			.db-center-3 {
@@ -780,10 +743,10 @@
 				align-items: center;
 				width: 100rpx;
 				height: 100rpx;
-				border-radius: 50rpx; 
+				border-radius: 50rpx;
 				position: relative;
 			}
-		
+
 			.db-center-1 { background-color: #DBEAFE; }
 			.db-center-2 { background-color: #DCFCE7; }
 			.db-center-3 { background-color: #F3E8FF; }
@@ -807,7 +770,7 @@
 		justify-content: center; // 水平居中
 		align-items: center;     // 垂直居中
 		box-sizing: border-box;  // 确保 padding 不影响整体尺寸
-		padding: 0 12rpx; 
+		padding: 0 12rpx;
 		.count {
 			// line-height: 40rpx;
 			font-size: 26rpx;
@@ -816,7 +779,7 @@
 		}
 
 	}
-	
+
 
 	.list-item {
 		margin: 0 30rpx 24rpx 30rpx;

+ 8 - 1
pages/order/index.uvue

@@ -53,7 +53,8 @@
                     <view class="item-container">
                         <view class="item-header">
 							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
-							<text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
+							<text class="status-tag" :class="getStatusClass(item)" >{{ getWorkOrderStatus(item) }}</text>
+							<!-- <view class="status-view" :class="getStatusClass(item)"><text class="status-tag" :class="getStatusClass(item)" >{{ getWorkOrderStatus(item) }}</text></view> -->
                         </view>
 						<view class="info-row">
 							<view class="info-label">
@@ -844,6 +845,7 @@ const statusConfig: StatusItem[] = [
   align-items: flex-start;
   margin-bottom: 16rpx;
   justify-content: space-between; /* 主轴两端对齐 */
+  min-height: 55rpx;
 
   .item-title {
     font-size: 30rpx;
@@ -882,6 +884,10 @@ const statusConfig: StatusItem[] = [
   color: #666;
 }
 
+.status-view {
+	border: 1rpx solid;
+	border-radius: 20rpx;
+}
 .status-tag {
 	padding: 8rpx 20rpx;
 	border-radius: 20rpx;
@@ -890,6 +896,7 @@ const statusConfig: StatusItem[] = [
 	// margin-left: 50rpx;
 	// justify-content: flex-end;
 	border: 1rpx solid;
+	
 }
 
 /* 待接单 */

+ 1 - 0
pages/order/overdue.uvue

@@ -549,6 +549,7 @@ import {checkPermi} from '../../utils/storage'
   align-items: flex-start;
   margin-bottom: 16rpx;
   justify-content: space-between;
+  min-height: 55rpx;
 
   .item-title {
     font-size: 30rpx;

+ 1 - 0
pages/order/pendingOrder.uvue

@@ -680,6 +680,7 @@ import {checkPermi, getUserInfo} from '../../utils/storage'
 	  align-items: flex-start;
 	  margin-bottom: 16rpx;
 	  justify-content: space-between;
+	  min-height: 55rpx;
 
 	  .item-title {
 		font-size: 30rpx;

+ 36 - 26
pages/score/index.uvue

@@ -69,27 +69,33 @@
       <view class="stats-header">
         <text class="stats-title">{{ monthTitle }}月度工分</text>
         <view class="month-filters">
-          <text
-            class="month-filter"
-            :class="{ 'month-filter-sel': selectedMonth === 'prev' }"
-            @click="changeMonth('prev')"
-          >
-            上月
-          </text>
-          <text
-            class="month-filter"
-            :class="{ 'month-filter-sel': selectedMonth === 'current' }"
-            @click="changeMonth('current')"
-          >
-            本月
-          </text>
-          <text
-            class="month-filter"
-            :class="{ 'month-filter-sel': selectedMonth === 'custom' }"
-            @click="showCustomDatePicker"
-          >
-            自定义
-          </text>
+			<view class="month-tab">
+			  <text
+				class="month-filter"
+				:class="{ 'month-filter-sel': selectedMonth === 'prev' }"
+				@click="changeMonth('prev')"
+			  >
+				上月
+			  </text>
+			</view>
+			<view class="month-tab">
+			  <text
+				class="month-filter"
+				:class="{ 'month-filter-sel': selectedMonth === 'current' }"
+				@click="changeMonth('current')"
+			  >
+				本月
+			  </text>
+		  </view>
+		  <view class="month-tab">
+			  <text
+				class="month-filter"
+				:class="{ 'month-filter-sel': selectedMonth === 'custom' }"
+				@click="showCustomDatePicker"
+			  >
+				自定义
+			  </text>
+		  </view>
         </view>
       </view>
 
@@ -931,16 +937,20 @@
 .month-filters {
   flex-direction: row;
   justify-content: flex-end;
+  display: flex;
+}
+
+.month-tab {
+	white-space: nowrap;
+	margin: 0 8rpx;
+	border-radius: 24rpx;
+	background-color: #f2f3f5;
 }
 
 .month-filter {
-  padding: 6rpx 14rpx;
-  margin-left: 12rpx;
+  padding: 6rpx 12rpx;
   font-size: 24rpx;
-  border-radius: 24rpx;
-  background-color: #f2f3f5;
   color: #666;
-  white-space: nowrap;
 }
 
 .month-filter-sel {

+ 23 - 13
pages/worktime/index.uvue

@@ -48,13 +48,16 @@
       <view class="stats-header">
         <text class="stats-title">{{ timeRangeTitle }}工时统计</text>
         <view class="time-filters">
-          <text
-            class="time-filter"
-            :class="{ 'time-filter-sel': timeRange === 'week' }"
-            @click="changeTimeRange('week')"
-          >
-            本周
-          </text>
+			<view class="time-tab">
+			  <text
+				class="time-filter"
+				:class="{ 'time-filter-sel': timeRange === 'week' }"
+				@click="changeTimeRange('week')"
+			  >
+				本周
+			  </text>
+		  </view>
+		  <view class="time-tab">
           <text
             class="time-filter"
             :class="{ 'time-filter-sel': timeRange === 'month' }"
@@ -62,6 +65,8 @@
           >
             本月
           </text>
+		  </view>
+		  <view class="time-tab">
           <text
             class="time-filter"
             :class="{ 'time-filter-sel': timeRange === 'custom' }"
@@ -69,6 +74,7 @@
           >
             自定义
           </text>
+		  </view>
         </view>
       </view>
 
@@ -897,7 +903,7 @@ onBeforeUnmount(() => {
   flex: 1;
 
   .status-txt {
-    padding: 8px 10px;
+    padding: 8px 14px;
     text-align: center;
     margin-right: 12rpx;
     border-radius: 36rpx;
@@ -937,14 +943,18 @@ onBeforeUnmount(() => {
   justify-content: flex-end;
 }
 
-.time-filter {
-  padding: 6rpx 14rpx;
-  margin-left: 12rpx;
-  font-size: 24rpx;
+.time-tab {
+  white-space: nowrap;
+  margin: 0 8rpx;
   border-radius: 24rpx;
   background-color: #f2f3f5;
+}
+
+.time-filter {
+  padding: 6rpx 12rpx;
+  // margin-left: 12rpx;
+  font-size: 24rpx;
   color: #666;
-  white-space: nowrap;
 }
 
 .time-filter-sel {