Skip to content

Commit

Permalink
Merge pull request #174 from SonicCloudOrg/dev
Browse files Browse the repository at this point in the history
适配logo
  • Loading branch information
ZhouYixun authored Jul 1, 2022
2 parents 5efb806 + 07d9b98 commit 4bf6637
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 4 deletions.
Binary file added src/assets/img/HMD Global.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Teclast.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/DeviceDes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down
3 changes: 3 additions & 0 deletions src/components/ProjectUpdate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down
3 changes: 3 additions & 0 deletions src/components/PublicStepUpdate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down
3 changes: 3 additions & 0 deletions src/components/TestCaseUpdate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down
3 changes: 3 additions & 0 deletions src/components/TestSuiteUpdate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down
11 changes: 9 additions & 2 deletions src/views/Devices.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ const manufacturer = ref([
"motorola",
"asus",
"Lenovo",
"HMD Global",
"Teclast"
]);
const statusList = ref([
{
Expand Down Expand Up @@ -349,6 +351,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down Expand Up @@ -757,8 +762,10 @@ watch(drawer, (newVal, oldVal) => {
>
<template #default>
<div>当设备温度≥<span style="color: #409EFF">高温值</span>时(仅安卓),会通知机器人告警。</div>
<div>当<span style="color: #E6A23C">高温超时</span>时间内温度持续≥<span style="color: #409EFF">高温值</span>时(仅安卓),会通知机器人并<span
style="color: #F56C6C">关机</span>。</div>
<div>当<span style="color: #E6A23C">高温超时</span>时间内温度持续≥<span
style="color: #409EFF">高温值</span>时(仅安卓),会通知机器人并<span
style="color: #F56C6C">关机</span>。
</div>
</template>
</el-alert>
<el-form-item
Expand Down
5 changes: 4 additions & 1 deletion src/views/RemoteEmulator/AndroidRemote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,10 @@ const removeCase = () => {
const getImg = (name) => {
let result;
if (name === 'meizu') {
name = 'Meizu';
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['../../assets/img/' + name + '.jpg'].default;
Expand Down
5 changes: 4 additions & 1 deletion src/views/RemoteEmulator/IOSRemote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,10 @@ const removeCase = () => {
const getImg = (name) => {
let result;
if (name === 'meizu') {
name = 'Meizu';
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['../../assets/img/' + name + '.jpg'].default;
Expand Down
3 changes: 3 additions & 0 deletions src/views/StepListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ const getImg = (name) => {
if (name === 'meizu') {
name = 'Meizu'
}
if (name === 'LENOVO') {
name = 'Lenovo'
}
try {
result = img['./../assets/img/' + name + '.jpg'].default
} catch {
Expand Down

0 comments on commit 4bf6637

Please sign in to comment.