Skip to content

Commit

Permalink
Merge pull request #256 from mmagi/feat_bot
Browse files Browse the repository at this point in the history
fix: fix known bugs in feat_bot
  • Loading branch information
ZhouYixun authored Jun 7, 2023
2 parents 3cd48ee + 1f92306 commit ebbde60
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
3 changes: 2 additions & 1 deletion src/components/TestSuiteUpdate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ const testSuite = ref({
projectId: route.params.projectId,
devices: [],
testCases: [],
alertRobotIds: null,
});
const deviceData = ref([]);
const deviceDataBack = ref([]);
Expand Down Expand Up @@ -139,7 +140,6 @@ const removeFromPublic = (e) => {
const getSource = () => {
getDevice();
getTestCaseList();
getAlertRobots();
};
const emit = defineEmits(['flush']);
const summit = () => {
Expand Down Expand Up @@ -186,6 +186,7 @@ onMounted(() => {
if (props.suiteId !== 0) {
getSuiteInfo(props.suiteId);
}
getAlertRobots();
});
</script>

Expand Down
27 changes: 15 additions & 12 deletions src/views/Devices.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ const openHub = () => {
};
watch(dialogAgent, (newValue, oldValue) => {
if (!newValue) {
agent.value = {
id: 0,
name: '',
highTemp: 45,
highTempTime: 15,
robotSecret: '',
robotToken: '',
agent.value = {
id: 0,
name: '',
highTemp: 45,
highTempTime: 15,
robotSecret: '',
robotToken: '',
robotType: 1,
};
}
Expand Down Expand Up @@ -1012,12 +1012,15 @@ onUnmounted(() => {
<span style="margin-left: 10px">min</span>
</el-form-item>
<el-form-item prop="alertRobotIds" :label="$t('agent.ui.alertRobotIds')">
<span>{{ $t('agent.ui.defaultAlertRobotIds') }}</span>
<el-switch
v-model="agent.alertRobotIds"
<el-checkbox
:label="$t('agent.ui.defaultAlertRobotIds')"
:checked="agent.alertRobotIds == null"
class="mb-2"
:inactive-value="[]"
:active-value="null"
@change="
(auto) => {
agent.alertRobotIds = auto ? null : [];
}
"
/>
<template v-if="agent.alertRobotIds != null">
<el-select
Expand Down

0 comments on commit ebbde60

Please sign in to comment.