diff --git a/src/components/JIndicators/index.vue b/src/components/JIndicators/index.vue index 6d2c744d..bcde768e 100644 --- a/src/components/JIndicators/index.vue +++ b/src/components/JIndicators/index.vue @@ -2,36 +2,36 @@
- + 范围 - +
diff --git a/src/components/Metadata/ArrayParam/index.vue b/src/components/Metadata/ArrayParam/index.vue index 53410132..aaf336bd 100644 --- a/src/components/Metadata/ArrayParam/index.vue +++ b/src/components/Metadata/ArrayParam/index.vue @@ -1,5 +1,5 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/Northbound/DuerOS/Detail/index.vue b/src/views/Northbound/DuerOS/Detail/index.vue index f9273b01..36894c24 100644 --- a/src/views/Northbound/DuerOS/Detail/index.vue +++ b/src/views/Northbound/DuerOS/Detail/index.vue @@ -51,7 +51,6 @@ placeholder="请选择产品" v-model:value="modelRef.id" show-search - :filter-option="filterOption" @change="productChange" > + + + {{ i.name }} + + + { actionActiveKey.value = _key; }; -const filterOption = (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; -}; - const addItem = () => { actionActiveKey.value.push(String(modelRef.actionMappings.length)); modelRef.actionMappings.push({ @@ -636,8 +624,9 @@ const saveBtn = async () => { .then(async (data: any) => { if (tasks.every((item) => item) && data) { loading.value = true; - const resp = await savePatch(data); - loading.value = false; + const resp = await savePatch(data).finally(() => { + loading.value = false; + }) if (resp.status === 200) { message.success('操作成功!'); formRef.value.resetFields(); diff --git a/src/views/device/Instance/Detail/Function/components/Advance.vue b/src/views/device/Instance/Detail/Function/components/Advance.vue index 00b9d43b..d892abeb 100644 --- a/src/views/device/Instance/Detail/Function/components/Advance.vue +++ b/src/views/device/Instance/Detail/Function/components/Advance.vue @@ -1,13 +1,13 @@ diff --git a/src/views/device/Instance/Detail/Function/components/Simple.vue b/src/views/device/Instance/Detail/Function/components/Simple.vue index ba00bdac..f3bb39ad 100644 --- a/src/views/device/Instance/Detail/Function/components/Simple.vue +++ b/src/views/device/Instance/Detail/Function/components/Simple.vue @@ -1,21 +1,21 @@ - - + +
- - + 执行 - - + 清空 - - + +
- - +
+
执行结果:
{{ func.executeResult }} - - - - +
+ + + diff --git a/src/views/device/Instance/Detail/Function/index.vue b/src/views/device/Instance/Detail/Function/index.vue index bc9cb53d..86b995fd 100644 --- a/src/views/device/Instance/Detail/Function/index.vue +++ b/src/views/device/Instance/Detail/Function/index.vue @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue index 5911b0f5..bd509f35 100644 --- a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue +++ b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue @@ -1,48 +1,54 @@ \ No newline at end of file + \ No newline at end of file diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue index cddd46ec..6e00e771 100644 --- a/src/views/device/components/Metadata/Cat/index.vue +++ b/src/views/device/components/Metadata/Cat/index.vue @@ -1,13 +1,13 @@ diff --git a/src/views/media/SplitScreen/index.vue b/src/views/media/SplitScreen/index.vue index 16a2d15c..2974adc2 100644 --- a/src/views/media/SplitScreen/index.vue +++ b/src/views/media/SplitScreen/index.vue @@ -1,6 +1,6 @@ diff --git a/src/views/media/SplitScreen/tree.vue b/src/views/media/SplitScreen/tree.vue index 79d84e52..86398634 100644 --- a/src/views/media/SplitScreen/tree.vue +++ b/src/views/media/SplitScreen/tree.vue @@ -1,6 +1,6 @@ - + diff --git a/src/views/notice/Config/Debug/index.vue b/src/views/notice/Config/Debug/index.vue index 3a74c7fc..8e9bc41f 100644 --- a/src/views/notice/Config/Debug/index.vue +++ b/src/views/notice/Config/Debug/index.vue @@ -1,5 +1,5 @@ - - - - + + + + + p.sorts = sorts; + return queryProductList(p); +}; + +const handleClick = (detail: any) => { + emit('update:rowKey', detail.id); + emit('update:detail', detail); + emit('change', detail); +}; + \ No newline at end of file +} + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue new file mode 100644 index 00000000..6ba31ca4 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue @@ -0,0 +1,64 @@ + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue new file mode 100644 index 00000000..df605d47 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue @@ -0,0 +1,215 @@ + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue new file mode 100644 index 00000000..ef3237fb --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue new file mode 100644 index 00000000..4d4c245a --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue @@ -0,0 +1,206 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue b/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue new file mode 100644 index 00000000..34e7f304 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue index 89582ec0..42cc28bb 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue @@ -1,14 +1,354 @@ - \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/index.vue index 91f0afd6..19cd10a2 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/index.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/index.vue @@ -1,6 +1,13 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/typings.d.ts b/src/views/rule-engine/Scene/Save/action/Device/typings.d.ts index eeed8153..83e28ec0 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/typings.d.ts +++ b/src/views/rule-engine/Scene/Save/action/Device/typings.d.ts @@ -2,12 +2,12 @@ import { ProductItem } from '@/views/device/Product/typings'; import { ActionsDeviceProps } from '../../../typings'; type DeviceModelType = { - steps: { - key: string; - title: string; - content: React.ReactNode; - }[]; - current: number; + // steps: { + // key: string; + // title: string; + // content: React.ReactNode; + // }[]; + // current: number; productId: string; deviceId: string; productDetail: ProductItem | any; diff --git a/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue b/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue index 545bcf04..48708ad5 100644 --- a/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue +++ b/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue @@ -1,7 +1,7 @@