From e4c7bca105e64c047fbcd6bbb53ff5d32b0c5fd6 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 10 Jun 2025 14:19:29 +0800
Subject: [PATCH] feat:日历去掉今日
---
src/views/tickets/orderLog.vue | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 38f11de..32d0141 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -176,14 +176,13 @@
>审核</el-button
>
</template>
- <template
- v-if="
+ <!-- v-if="
(userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) &&
row.status == 1
- "
- >
+ " -->
+ <template v-if="row.status == 1">
<!--待审核状态-->
- <el-button type="text" icon="el-icon-warning" @click="orderLogRecall(row.id)"
+ <el-button type="text" icon="el-icon-warning" @click="orderLogRecall(row.id)"
>撤回</el-button
>
</template>
@@ -382,16 +381,8 @@
{{ record.user_name }}
</span>
<span
- style="
- position: absolute;
- left: 80%;
- top: 50%;
- transform: translateY(-50%);
- width: 100px;
- margin-left: 4px;
- color: #666;
- font-size: 12px;
- "
+ class="step-timer "
+
>
{{ record.interval_time_str }}
</span>
@@ -567,16 +558,8 @@
{{ record.user_name }}
</span>
<span
- style="
- position: absolute;
- left: 80%;
- top: 50%;
- transform: translateY(-50%);
- width: 100px;
- margin-left: 4px;
- color: #666;
- font-size: 12px;
- "
+ class="step-timer "
+
>
{{ record.interval_time_str }}
</span>
@@ -1206,6 +1189,20 @@
this.detailVisible = true;
+ // 更新航线列表，追加 wayline_file_region_vo 数据
+ if (data.wayline_file_region_vo) {
+ const newWayline = data.wayline_file_region_vo;
+
+ // 检查是否已经存在于 this.wayLineList 中
+ const isDuplicate = this.wayLineList.some(
+ (item) => item.wayline_id === newWayline.wayline_id
+ );
+
+ if (!isDuplicate) {
+ this.wayLineList.push(newWayline);
+ }
+ }
+
this.initMapLine(data.device_map_infos);
},
async handleCheckDetail(row) {
@@ -1214,7 +1211,20 @@
this.form = {
...data,
};
+ // 更新航线列表，追加 wayline_file_region_vo 数据
+ // 更新航线列表，追加 wayline_file_region_vo 数据
+ if (data.wayline_file_region_vo) {
+ const newWayline = data.wayline_file_region_vo;
+ // 检查是否已经存在于 this.wayLineList 中
+ const isDuplicate = this.wayLineList.some(
+ (item) => item.wayline_id === newWayline.wayline_id
+ );
+
+ if (!isDuplicate) {
+ this.wayLineList.push(newWayline);
+ }
+ }
// 更新机巢列表
this.device_sns = data.device_list;
this.detailVisibleCopy = true;
@@ -1396,8 +1406,29 @@
},
};
</script>
-<style></style>
+
<style lang="scss" scoped>
+ :deep(){
+ .avue-crud__body{
+ .el-form{
+ height: 625px;
+ overflow: auto;
+ }
+ }
+ }
+:deep(.el-pagination .el-select ){
+width: 128px !important;
+}
+.step-timer {
+ position: absolute;
+ left: 80%;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 100px;
+ margin-left: 4px;
+ color: #666;
+ font-size: 12px;
+}
:deep(.el-textarea__inner) {
padding: 8px 12px;
}
@@ -1560,7 +1591,7 @@
& > ::v-deep(.el-button) {
flex: 1;
max-width: 44px;
-
+ margin-right: 10px;
&:nth-child(4n) {
margin-left: 0;
}
--
Gitblit v1.9.3