diff --git a/src/api/iot/thingmodel/index.ts b/src/api/iot/thingmodel/index.ts index bcf9e0707..fb9492675 100644 --- a/src/api/iot/thingmodel/index.ts +++ b/src/api/iot/thingmodel/index.ts @@ -215,8 +215,8 @@ export const ThingModelFormRules = { identifier: [ { required: true, message: '标识符不能为空', trigger: 'blur' }, { - pattern: /^[a-zA-Z0-9_]{1,50}$/, - message: '支持大小写字母、数字和下划线,不超过 50 个字符', + pattern: /^[a-zA-Z][a-zA-Z0-9_]{0,31}$/, + message: '支持大小写字母、数字和下划线,必须以字母开头,不超过 32 个字符', trigger: 'blur' }, { diff --git a/src/api/mes/pro/andon/config/index.ts b/src/api/mes/pro/andon/config/index.ts index 0851b8219..000c62c27 100644 --- a/src/api/mes/pro/andon/config/index.ts +++ b/src/api/mes/pro/andon/config/index.ts @@ -6,6 +6,7 @@ export interface ProAndonConfigVO { reason: string // 呼叫原因 level: number // 级别 handlerRoleId: number // 处置人角色编号 + handlerRoleName: string // 处置人角色名称 handlerUserId: number // 处置人编号 handlerUserNickname: string // 处置人昵称 remark: string // 备注 diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 184d95c4f..7d616fc9c 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -116,7 +116,8 @@ const toggleClick = () => { :row="{ label: item.label }" - >{{ item.label }} + > + {{ item.label }} @@ -130,9 +131,7 @@ const toggleClick = () => { - {{ - item.mappedField ? data[item.mappedField] : data[item.field] - }} + {{ item.mappedField ? data[item.mappedField] : data[item.field] }} diff --git a/src/components/DiyEditor/components/ComponentContainer.vue b/src/components/DiyEditor/components/ComponentContainer.vue index 485672244..6f2d87c30 100644 --- a/src/components/DiyEditor/components/ComponentContainer.vue +++ b/src/components/DiyEditor/components/ComponentContainer.vue @@ -165,8 +165,8 @@ $toolbar-position: -55px; width: 80px; height: 25px; font-size: 12px; - color: #6a6a6a; line-height: 25px; + color: #6a6a6a; text-align: center; background: #fff; box-shadow: diff --git a/src/components/DiyEditor/components/ComponentLibrary.vue b/src/components/DiyEditor/components/ComponentLibrary.vue index 06f231285..8fb924cd8 100644 --- a/src/components/DiyEditor/components/ComponentLibrary.vue +++ b/src/components/DiyEditor/components/ComponentLibrary.vue @@ -94,9 +94,9 @@ const handleCloneComponent = (component: DiyComponent) => { diff --git a/src/components/DiyEditor/components/mobile/HotZone/property.vue b/src/components/DiyEditor/components/mobile/HotZone/property.vue index 65892f857..7c4d49bfa 100644 --- a/src/components/DiyEditor/components/mobile/HotZone/property.vue +++ b/src/components/DiyEditor/components/mobile/HotZone/property.vue @@ -42,22 +42,22 @@ const handleOpenEditDialog = () => { diff --git a/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue b/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue index fc6d71820..6a86b716b 100644 --- a/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue +++ b/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue @@ -39,7 +39,7 @@ - + @@ -103,13 +103,16 @@ watch( .el-carousel__indicator { padding-top: 0; padding-bottom: 0; + .el-carousel__button { --el-carousel-indicator-height: 6px; --el-carousel-indicator-width: 6px; --el-carousel-indicator-out-color: #ff6000; + border-radius: 6px; } } + .el-carousel__indicator.is-active { .el-carousel__button { --el-carousel-indicator-width: 12px; diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue index 6c671d3f2..7d632df86 100644 --- a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue +++ b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue @@ -93,8 +93,8 @@ defineOptions({ name: 'NavigationBarCellProperty' }) const props = withDefaults( defineProps<{ - modelValue: NavigationBarCellProperty[] - isMp: boolean + modelValue?: NavigationBarCellProperty[] + isMp?: boolean }>(), { modelValue: () => [], diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue index 104c6002a..905b68fee 100644 --- a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue +++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue @@ -67,10 +67,10 @@ const getSearchProp = computed(() => (cell: NavigationBarCellProperty) => { .navigation-bar { display: flex; height: 50px; + padding: 0 6px; background: #fff; justify-content: space-between; align-items: center; - padding: 0 6px; /* 左边 */ .left { diff --git a/src/components/DiyEditor/components/mobile/ProductCard/index.vue b/src/components/DiyEditor/components/mobile/ProductCard/index.vue index 93f6e0745..28bdbe02f 100644 --- a/src/components/DiyEditor/components/mobile/ProductCard/index.vue +++ b/src/components/DiyEditor/components/mobile/ProductCard/index.vue @@ -77,7 +77,8 @@ v-if="property.fields.marketPrice.show && spu.marketPrice" class="ml-4px text-10px line-through" :style="{ color: property.fields.marketPrice.color }" - >¥{{ fenToYuan(spu.marketPrice) }} + > + ¥{{ fenToYuan(spu.marketPrice) }}
diff --git a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue index d41bf1c1e..55b1cf1ac 100644 --- a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue @@ -74,8 +74,9 @@ v-if="property.fields.marketPrice.show && spu.marketPrice" class="ml-4px text-10px line-through" :style="{ color: property.fields.marketPrice.color }" - >¥{{ fenToYuan(spu.marketPrice) }} + ¥{{ fenToYuan(spu.marketPrice) }} +
diff --git a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue index 3d34a3d4c..15f74d8ea 100644 --- a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue @@ -74,8 +74,9 @@ v-if="property.fields.marketPrice.show && spu.marketPrice" class="ml-4px text-10px line-through" :style="{ color: property.fields.marketPrice.color }" - >¥{{ fenToYuan(spu.marketPrice) }} + ¥{{ fenToYuan(spu.marketPrice) }} +
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue index fa23a4d0f..48052061c 100644 --- a/src/components/DiyEditor/index.vue +++ b/src/components/DiyEditor/index.vue @@ -583,12 +583,12 @@ $toolbar-height: 42px; gap: 8px; :deep(.el-tag) { - box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1); border: none; + box-shadow: 0 2px 8px 0 rgb(0 0 0 / 10%); .el-tag__content { - width: 100%; display: flex; + width: 100%; align-items: center; justify-content: flex-start; diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 3acc10ab0..e1a80dc28 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -27,7 +27,6 @@ const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('form') export default defineComponent({ - // eslint-disable-next-line vue/no-reserved-component-names name: 'Form', props: { // 生成Form的布局结构数组 diff --git a/src/components/FormCreate/src/components/IframeComponent.vue b/src/components/FormCreate/src/components/IframeComponent.vue index 3fd74c4dd..8bc0cb2e4 100644 --- a/src/components/FormCreate/src/components/IframeComponent.vue +++ b/src/components/FormCreate/src/components/IframeComponent.vue @@ -55,7 +55,6 @@ const displayUrl = computed(() => props.url || props.modelValue || '') // 显示 const showPreview = computed(() => { return displayUrl.value && isUrl(displayUrl.value) }) // 是否显示预览 - diff --git a/src/components/Infotip/src/Infotip.vue b/src/components/Infotip/src/Infotip.vue index 0afd69287..c93bb6d52 100644 --- a/src/components/Infotip/src/Infotip.vue +++ b/src/components/Infotip/src/Infotip.vue @@ -14,7 +14,6 @@ defineProps({ title: propTypes.string.def(''), schema: { type: Array as PropType>, - required: true, default: () => [] }, showIndex: propTypes.bool.def(true), diff --git a/src/components/InputWithColor/index.vue b/src/components/InputWithColor/index.vue index 1311a5594..96afa1a3a 100644 --- a/src/components/InputWithColor/index.vue +++ b/src/components/InputWithColor/index.vue @@ -26,6 +26,7 @@ const { modelValue, color } = useVModels(props, emit) diff --git a/src/views/ai/chat/index/components/role/RoleRepository.vue b/src/views/ai/chat/index/components/role/RoleRepository.vue index 04113731f..807be587b 100644 --- a/src/views/ai/chat/index/components/role/RoleRepository.vue +++ b/src/views/ai/chat/index/components/role/RoleRepository.vue @@ -228,8 +228,8 @@ onMounted(async () => { } .el-tabs__header { - margin: 0 !important; padding: 0 !important; + margin: 0 !important; } .el-tabs__nav-wrap { @@ -241,6 +241,6 @@ onMounted(async () => { } .el-tab-pane { - padding: 8px 0 0 0 !important; + padding: 8px 0 0 !important; } diff --git a/src/views/ai/knowledge/segment/index.vue b/src/views/ai/knowledge/segment/index.vue index e2f8a67f3..6a88b4746 100644 --- a/src/views/ai/knowledge/segment/index.vue +++ b/src/views/ai/knowledge/segment/index.vue @@ -57,16 +57,16 @@ class="content-expand" style=" padding: 10px 20px; - white-space: pre-wrap; line-height: 1.5; + white-space: pre-wrap; background-color: #f9f9f9; - border-radius: 4px; border-left: 3px solid #409eff; + border-radius: 4px; " >
完整内容:
diff --git a/src/views/ai/mindmap/index/components/Right.vue b/src/views/ai/mindmap/index/components/Right.vue index b1d04de49..0ab72d741 100644 --- a/src/views/ai/mindmap/index/components/Right.vue +++ b/src/views/ai/mindmap/index/components/Right.vue @@ -143,11 +143,12 @@ defineExpose({ 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/music/index/index.vue b/src/views/ai/music/index/index.vue index 413792a7f..da9dc0c1b 100644 --- a/src/views/ai/music/index/index.vue +++ b/src/views/ai/music/index/index.vue @@ -1,9 +1,9 @@ @@ -13,14 +13,14 @@ import List from './list/index.vue' defineOptions({ name: 'Index' }) -const listRef = ref void}>>(null) +const listRef = ref void }>>(null) /* *@Description: 拿到左侧配置信息调用右侧音乐生成的方法 *@MethodAuthor: xiaohong *@Date: 2024-07-19 11:13:38 -*/ -function generateMusic (args: {formData: Recordable}) { - unref(listRef)?.generateMusic(args.formData) + */ +function generateMusic(args: { formData: Recordable }) { + unref(listRef)?.generateMusic(args.formData) } diff --git a/src/views/ai/music/index/list/audioBar/index.vue b/src/views/ai/music/index/list/audioBar/index.vue index db7f76734..ca1ab1bf1 100644 --- a/src/views/ai/music/index/list/audioBar/index.vue +++ b/src/views/ai/music/index/list/audioBar/index.vue @@ -1,34 +1,55 @@ @@ -42,17 +63,17 @@ defineOptions({ name: 'Index' }) const currentSong = inject('currentSong', {}) const audioRef = ref>(null) - // 音频相关属性https://www.runoob.com/tags/ref-av-dom.html +// 音频相关属性https://www.runoob.com/tags/ref-av-dom.html const audioProps = reactive({ autoplay: true, paused: false, currentTime: '00:00', duration: '00:00', - muted: false, - volume: 50, + muted: false, + volume: 50 }) -function toggleStatus (type: string) { +function toggleStatus(type: string) { audioProps[type] = !audioProps[type] if (type === 'paused' && audioRef.value) { if (audioProps[type]) { @@ -64,7 +85,7 @@ function toggleStatus (type: string) { } // 更新播放位置 -function audioTimeUpdate (args) { +function audioTimeUpdate(args) { audioProps.currentTime = formatPast(new Date(args.timeStamp), 'mm:ss') } diff --git a/src/views/ai/music/index/list/index.vue b/src/views/ai/music/index/list/index.vue index 6c33f565a..d21834b58 100644 --- a/src/views/ai/music/index/list/index.vue +++ b/src/views/ai/music/index/list/index.vue @@ -6,26 +6,26 @@ - + - + - + - + - +
- + @@ -36,7 +36,6 @@ import audioBar from './audioBar/index.vue' defineOptions({ name: 'Index' }) - const currentType = ref('mine') // loading 状态 const loading = ref(false) @@ -52,9 +51,9 @@ provide('currentSong', currentSong) *@Description: 调接口生成音乐列表 *@MethodAuthor: xiaohong *@Date: 2024-06-27 17:06:44 -*/ -function generateMusic (formData: Recordable) { - console.log(formData); + */ +function generateMusic(formData: Recordable) { + console.log(formData) loading.value = true setTimeout(() => { mySongList.value = Array.from({ length: 20 }, (_, index) => { @@ -63,7 +62,8 @@ function generateMusic (formData: Recordable) { audioUrl: '', videoUrl: '', title: '我走后' + index, - imageUrl: 'https://www.carsmp3.com/data/attachment/forum/201909/19/091020q5kgre20fidreqyt.jpg', + imageUrl: + 'https://www.carsmp3.com/data/attachment/forum/201909/19/091020q5kgre20fidreqyt.jpg', desc: 'Metal, symphony, film soundtrack, grand, majesticMetal, dtrack, grand, majestic', date: '2024年04月30日 14:02:57', lyric: `
大江东去,浪淘尽,千古风流人物。 @@ -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 @@ 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 }} 运行中 +
停机 {{ summary.machineryStop }} @@ -177,12 +177,12 @@ const handleNavigate = (name: string) => {