0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#11154

This commit is contained in:
leiqiaochu 2023-03-28 20:30:36 +08:00
parent d8f19671c2
commit 5fabc8272f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/device/Product/Detail/index.vue
View File

@ -77,6 +77,7 @@
type="primary" type="primary"
:popConfirm="{ :popConfirm="{
title: `确定应用配置?`, title: `确定应用配置?`,
placement: 'bottomRight',
onConfirm: handleDeploy, onConfirm: handleDeploy,
}" }"
:disabled="productStore.current?.state === 0" :disabled="productStore.current?.state === 0"
@ -111,16 +112,16 @@ import {
getProtocolDetail, getProtocolDetail,
} from '@/api/device/product'; } from '@/api/device/product';
import { message } from 'jetlinks-ui-components'; import { message } from 'jetlinks-ui-components';
import { getImage, handleParamsToString } from '@/utils/comm' import { getImage, handleParamsToString } from '@/utils/comm';
import encodeQuery from '@/utils/encodeQuery'; import encodeQuery from '@/utils/encodeQuery';
import { useMenuStore } from '@/store/menu'; import { useMenuStore } from '@/store/menu';
import {useRouterParams} from "@/utils/hooks/useParams"; import { useRouterParams } from '@/utils/hooks/useParams';
const menuStory = useMenuStore(); const menuStory = useMenuStore();
const route = useRoute(); const route = useRoute();
const checked = ref<boolean>(true); const checked = ref<boolean>(true);
const productStore = useProductStore(); const productStore = useProductStore();
const routerParams = useRouterParams() const routerParams = useRouterParams();
const searchParams = ref({ const searchParams = ref({
terms1: [ terms1: [
{ {

2
src/views/rule-engine/Alarm/Configuration/Save/index.vue
View File

@ -3,7 +3,7 @@
<j-card> <j-card>
<j-tabs :activeKey="activeKey" @change="changeTabs"> <j-tabs :activeKey="activeKey" @change="changeTabs">
<j-tab-pane key="1" tab="基础配置"> <j-tab-pane key="1" tab="基础配置">
<Base /> <Base v-if="activeKey === '1'" />
</j-tab-pane> </j-tab-pane>
<j-tab-pane key="2" tab="关联场景联动"> <j-tab-pane key="2" tab="关联场景联动">
<Scene></Scene> <Scene></Scene>