Skip to content

Commit

Permalink
chore: typo
Browse files Browse the repository at this point in the history
  • Loading branch information
LynnL4 committed Sep 14, 2023
1 parent 052f22f commit f08432f
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/components/navbar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
v-else
type="primary"
:loading="loading"
:disabled="deviceStore.deviceStatus === DeviceStatus.Burning"
:disabled="deviceStore.deviceStatus === DeviceStatus.Flashing"
@click="handleConnect"
>{{ $t('workplace.device.btn.connect') }}</a-button
>
Expand Down Expand Up @@ -287,8 +287,8 @@
}
.focus {
background-color: #165dff;
color: #fff;
background-color: #165dff;
}
.trigger-btn,
Expand Down
2 changes: 1 addition & 1 deletion src/senseCraft/serial.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class Serial extends Device {
// 如果当前在esp连接,需要断开
if (
(this.deviceStore.deviceStatus === DeviceStatus.EspConnected ||
this.deviceStore.deviceStatus === DeviceStatus.Burning) &&
this.deviceStore.deviceStatus === DeviceStatus.Flashing) &&
this.transport
) {
await this.transport.disconnect();
Expand Down
2 changes: 1 addition & 1 deletion src/senseCraft/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export enum DeviceStatus {
UnConnected = 0, // 设备串口未连接
SerialConnected = 1, // 串口连接状态,可以下发指令
EspConnected = 2, // esp连接状态,可以烧录固件和模型
Burning = 3, // 烧录状态,不能做别的操作
Flashing = 3, // 烧录状态,不能做别的操作
}

export interface Bin {
Expand Down
14 changes: 7 additions & 7 deletions src/views/firmware/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<div class="list-item-content">
<div class="list-item-address">
<a-input
:style="{ width: '150px' }"
v-model="item.address"
:style="{ width: '150px' }"
:placeholder="$t('workplace.firmware.address')"
allow-clear
/>
Expand Down Expand Up @@ -193,9 +193,9 @@
}
let result;
deviceStore.setDeviceStatus(DeviceStatus.Burning);
deviceStore.setDeviceStatus(DeviceStatus.Flashing);
try {
loadingTip.value = 'Burning';
loadingTip.value = 'Flashing';
const flashOptions: FlashOptions = {
fileArray,
flashSize: 'keep',
Expand Down Expand Up @@ -279,8 +279,8 @@

<style lang="less">
.arco-list-medium .arco-list-content-wrapper .arco-list-header {
background-color: var(--color-neutral-2);
padding: 6px 20px;
background-color: var(--color-neutral-2);
}
</style>

Expand Down Expand Up @@ -311,8 +311,8 @@
.list-item-content {
display: flex;
justify-content: space-between;
align-items: center;
justify-content: space-between;
}
.list-item-address {
Expand All @@ -327,10 +327,10 @@
}
.bottom {
height: 60px;
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
height: 60px;
margin-top: 30px;
.burn-btn {
Expand Down
34 changes: 17 additions & 17 deletions src/views/setup/process/components/device.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
},
]"
:onclick="() => handleSelectedModel(index)"
:virtualIndex="index"
:virtual-index="index"
>
<div>
<div class="carousel-item">
Expand Down Expand Up @@ -363,9 +363,9 @@
}
let result;
deviceStore.setDeviceStatus(DeviceStatus.Burning);
deviceStore.setDeviceStatus(DeviceStatus.Flashing);
try {
loadingTip.value = 'Burning';
loadingTip.value = 'Flashing';
const flashOptions: FlashOptions = {
fileArray,
flashSize: 'keep',
Expand Down Expand Up @@ -591,16 +591,16 @@
}
.models-item-title {
margin-top: 30px;
display: flex;
justify-content: space-between;
align-items: center;
justify-content: space-between;
margin-top: 30px;
}
.item-card-bottom {
flex: 1;
border-top-left-radius: 0;
border-top-right-radius: 0;
flex: 1;
}
.slidePrevClass {
Expand All @@ -611,15 +611,15 @@
width: 40vw;
margin: 30px auto;
padding: 0 45px;
--swiper-navigation-size: 26px;
// --swiper-navigation-color: #fff;
.carousel-item-wrapper {
flex-shrink: 0;
// width: 150px;
// height: 150px;
border: 1px solid var(--color-neutral-3);
border-radius: var(--border-radius-small);
flex-shrink: 0;
cursor: pointer;
}
Expand All @@ -640,12 +640,12 @@
}
.carousel-item-name {
height: 35px;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
height: 35px;
margin: 0 5px;
text-align: center;
}
.carousel-item-selected {
Expand All @@ -657,22 +657,22 @@
.custom-model-wrapper {
width: 150px;
height: 150px;
margin-left: 45px;
border: 1px solid var(--color-neutral-3);
border-radius: var(--border-radius-small);
margin-left: 45px;
.custom-model-image {
width: 100%;
height: 75%;
}
.custom-model-name {
height: 25%;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
height: 25%;
margin: 0 5px;
text-align: center;
}
}
Expand All @@ -682,10 +682,10 @@
}
.bottom {
height: 60px;
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
height: 60px;
}
.grid-left {
Expand Down

0 comments on commit f08432f

Please sign in to comment.