大江东去,浪淘尽,千古风流人物。
@@ -85,8 +85,8 @@ function generateMusic (formData: Recordable) {
*@Description: 设置当前播放的音乐
*@MethodAuthor: xiaohong
*@Date: 2024-07-19 11:22:33
-*/
-function setCurrentSong (music: Recordable) {
+ */
+function setCurrentSong(music: Recordable) {
currentSong.value = music
}
@@ -95,11 +95,11 @@ defineExpose({
})
-
diff --git a/src/views/ai/write/index/components/Right.vue b/src/views/ai/write/index/components/Right.vue
index 1eb66a077..223ebbf20 100644
--- a/src/views/ai/write/index/components/Right.vue
+++ b/src/views/ai/write/index/components/Right.vue
@@ -110,11 +110,12 @@ watch(copied, (val) => {
flex-direction: column;
:deep(.el-card__body) {
+ @extend .hide-scroll-bar;
+
+ padding: 0;
+ overflow-y: auto;
box-sizing: border-box;
flex-grow: 1;
- overflow-y: auto;
- padding: 0;
- @extend .hide-scroll-bar;
}
}
diff --git a/src/views/ai/write/index/components/Tag.vue b/src/views/ai/write/index/components/Tag.vue
index 8c0ad795a..5b8c8f92a 100644
--- a/src/views/ai/write/index/components/Tag.vue
+++ b/src/views/ai/write/index/components/Tag.vue
@@ -16,7 +16,7 @@
diff --git a/src/views/mall/promotion/kefu/components/message/ProductItem.vue b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
index 1ec313e4e..685bbe22e 100644
--- a/src/views/mall/promotion/kefu/components/message/ProductItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
@@ -68,21 +68,21 @@ const openDetail = (spuId: number) => {
diff --git a/src/views/mall/promotion/point/components/PointShowcase.vue b/src/views/mall/promotion/point/components/PointShowcase.vue
index 82e490c59..a849ef204 100644
--- a/src/views/mall/promotion/point/components/PointShowcase.vue
+++ b/src/views/mall/promotion/point/components/PointShowcase.vue
@@ -132,11 +132,11 @@ const emitActivityChange = () => {
display: flex;
width: 60px;
height: 60px;
+ cursor: pointer;
border: 1px dashed var(--el-border-color-darker);
border-radius: 8px;
align-items: center;
justify-content: center;
- cursor: pointer;
}
.spu-pic {
diff --git a/src/views/mall/promotion/rewardActivity/index.vue b/src/views/mall/promotion/rewardActivity/index.vue
index 544420e17..260aa7e8c 100644
--- a/src/views/mall/promotion/rewardActivity/index.vue
+++ b/src/views/mall/promotion/rewardActivity/index.vue
@@ -71,7 +71,7 @@
-
+
diff --git a/src/views/mall/promotion/seckill/components/SeckillShowcase.vue b/src/views/mall/promotion/seckill/components/SeckillShowcase.vue
index a924e8caa..1ca7d5f99 100644
--- a/src/views/mall/promotion/seckill/components/SeckillShowcase.vue
+++ b/src/views/mall/promotion/seckill/components/SeckillShowcase.vue
@@ -134,11 +134,11 @@ const emitActivityChange = () => {
display: flex;
width: 60px;
height: 60px;
+ cursor: pointer;
border: 1px dashed var(--el-border-color-darker);
border-radius: 8px;
align-items: center;
justify-content: center;
- cursor: pointer;
}
.spu-pic {
diff --git a/src/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue b/src/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue
index 57cdcbd52..45a67e0aa 100644
--- a/src/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue
+++ b/src/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue
@@ -50,8 +50,8 @@
- {{ userInfo.bindUser?.nickname }}
+
+ {{ userInfo.bindUser?.nickname }}
有
diff --git a/src/views/mall/trade/order/detail/index.vue b/src/views/mall/trade/order/detail/index.vue
index 592d2c8cf..cc3b00676 100644
--- a/src/views/mall/trade/order/detail/index.vue
+++ b/src/views/mall/trade/order/detail/index.vue
@@ -339,7 +339,9 @@ onMounted(async () => {
}
} else if (formData.value.deliveryType === DeliveryTypeEnum.PICK_UP.type) {
if (formData.value.pickUpStoreId) {
- pickUpStore.value = await DeliveryPickUpStoreApi.getDeliveryPickUpStore(formData.value.pickUpStoreId)
+ pickUpStore.value = await DeliveryPickUpStoreApi.getDeliveryPickUpStore(
+ formData.value.pickUpStoreId
+ )
}
}
})
@@ -394,11 +396,11 @@ onMounted(async () => {
.el-timeline-right-content {
display: flex;
- align-items: center;
min-height: 30px;
padding: 10px;
- border-radius: var(--el-card-border-radius);
background-color: var(--app-content-bg-color);
+ border-radius: var(--el-card-border-radius);
+ align-items: center;
&::before {
position: absolute;
diff --git a/src/views/mes/cal/calendar/CalendarDateCell.vue b/src/views/mes/cal/calendar/CalendarDateCell.vue
index 664eab115..b32d88b21 100644
--- a/src/views/mes/cal/calendar/CalendarDateCell.vue
+++ b/src/views/mes/cal/calendar/CalendarDateCell.vue
@@ -111,14 +111,14 @@ const hasFestivalDay = computed(() => {
diff --git a/src/views/mes/cal/calendar/CalendarLegend.vue b/src/views/mes/cal/calendar/CalendarLegend.vue
index bd602d33c..800a1c56e 100644
--- a/src/views/mes/cal/calendar/CalendarLegend.vue
+++ b/src/views/mes/cal/calendar/CalendarLegend.vue
@@ -22,9 +22,9 @@
= 周末
- 休
+
+ 休
+
= 节假日(不显示排班)
diff --git a/src/views/mes/cal/plan/CalPlanTeamList.vue b/src/views/mes/cal/plan/CalPlanTeamList.vue
index abcaa5b1b..4fbb8e706 100644
--- a/src/views/mes/cal/plan/CalPlanTeamList.vue
+++ b/src/views/mes/cal/plan/CalPlanTeamList.vue
@@ -203,9 +203,9 @@ watch(
.member-card-header {
display: flex;
- align-items: center;
- font-weight: 600;
font-size: 14px;
+ font-weight: 600;
+ align-items: center;
}
.member-empty-tip {
diff --git a/src/views/mes/cal/team/components/CalTeamSelectDialog.vue b/src/views/mes/cal/team/components/CalTeamSelectDialog.vue
index b9d10304e..33af78d05 100644
--- a/src/views/mes/cal/team/components/CalTeamSelectDialog.vue
+++ b/src/views/mes/cal/team/components/CalTeamSelectDialog.vue
@@ -32,12 +32,8 @@
/>
- 搜索
- 重置
+ 搜索
+ 重置
diff --git a/src/views/mes/dv/checkplan/CheckPlanForm.vue b/src/views/mes/dv/checkplan/CheckPlanForm.vue
index a50277d32..250055772 100644
--- a/src/views/mes/dv/checkplan/CheckPlanForm.vue
+++ b/src/views/mes/dv/checkplan/CheckPlanForm.vue
@@ -107,9 +107,9 @@
- 确 定
+
+ 确 定
+
{{ isDetail ? '关 闭' : '取 消' }}
diff --git a/src/views/mes/home/HomeKpiCards.vue b/src/views/mes/home/HomeKpiCards.vue
index cedd2ee56..e07547d81 100644
--- a/src/views/mes/home/HomeKpiCards.vue
+++ b/src/views/mes/home/HomeKpiCards.vue
@@ -127,9 +127,9 @@
:duration="1500"
class="text-28px font-700 leading-[1.2] color-[#7c3aed]"
/>
-
/ {{ summary.machineryTotal }} 运行中
+
+ / {{ summary.machineryTotal }} 运行中
+