From 760d08ec455f8e4ad06c4816acabe6394ff5c113 Mon Sep 17 00:00:00 2001 From: 100011797 <2642441182@qq.com> Date: Wed, 12 Jul 2023 11:58:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/media/Cascade/Channel/BindChannel/index.vue | 3 ++- src/views/media/Cascade/Channel/index.vue | 2 ++ src/views/media/Cascade/Save/index.vue | 8 ++++++++ src/views/media/Device/Channel/index.vue | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/media/Cascade/Channel/BindChannel/index.vue b/src/views/media/Cascade/Channel/BindChannel/index.vue index 45f2c3e3..7c273fd6 100644 --- a/src/views/media/Cascade/Channel/BindChannel/index.vue +++ b/src/views/media/Cascade/Channel/BindChannel/index.vue @@ -22,7 +22,7 @@ :columns="columns" :request="CascadeApi.queryChannelList" :defaultParams="{ - sorts: [{ name: 'name', order: 'desc' }], + sorts: [{ name: 'deviceName', order: 'asc' }, { name: 'name', order: 'asc' }], terms: [ { column: 'id', @@ -145,6 +145,7 @@ const columns = [ dataIndex: 'status', key: 'status', scopedSlots: true, + width: 150, search: { type: 'select', options: [ diff --git a/src/views/media/Cascade/Channel/index.vue b/src/views/media/Cascade/Channel/index.vue index 970460fe..e9a76559 100644 --- a/src/views/media/Cascade/Channel/index.vue +++ b/src/views/media/Cascade/Channel/index.vue @@ -215,6 +215,7 @@ const columns = [ dataIndex: 'status', key: 'status', scopedSlots: true, + width: 150, search: { type: 'select', options: [ @@ -229,6 +230,7 @@ const columns = [ { title: '操作', key: 'action', + width: 100, scopedSlots: true, }, ]; diff --git a/src/views/media/Cascade/Save/index.vue b/src/views/media/Cascade/Save/index.vue index afdd92ab..013b7da1 100644 --- a/src/views/media/Cascade/Save/index.vue +++ b/src/views/media/Cascade/Save/index.vue @@ -428,6 +428,10 @@ required: true, message: '请输入心跳周期', }, + { + pattern: /^[1-9]\d*$/, + message: '请输入1~10000的整数', + } ]" > Date: Wed, 12 Jul 2023 13:49:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/media/DashBoard/components/Card.vue | 4 ++-- src/views/media/DashBoard/index.vue | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/media/DashBoard/components/Card.vue b/src/views/media/DashBoard/components/Card.vue index 9045d532..69ffb783 100644 --- a/src/views/media/DashBoard/components/Card.vue +++ b/src/views/media/DashBoard/components/Card.vue @@ -65,7 +65,7 @@ const createChart = () => { left: maxY > 100000 ? 90 : 50, right: '5%', top: '5%', - bottom: '5%', + bottom: '10%', }, tooltip: { trigger: 'axis', @@ -199,7 +199,7 @@ watch( .chart, .no-data { width: 100%; - min-height: calc(100vh - 430px); + min-height: calc(100vh - 450px); } .no-data { display: flex; diff --git a/src/views/media/DashBoard/index.vue b/src/views/media/DashBoard/index.vue index 2ce4afe7..180fecfb 100644 --- a/src/views/media/DashBoard/index.vue +++ b/src/views/media/DashBoard/index.vue @@ -35,11 +35,13 @@ /> - + + + From 84c743ac23895c685c0551b29ab65e3a4c8dad41 Mon Sep 17 00:00:00 2001 From: 100011797 <2642441182@qq.com> Date: Wed, 12 Jul 2023 15:43:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DuerOS/Detail/command/index.vue | 56 ++++++++++--------- .../Detail/Running/Property/Detail/Charts.vue | 2 +- src/views/media/Device/Channel/Save.vue | 4 +- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/src/views/Northbound/DuerOS/Detail/command/index.vue b/src/views/Northbound/DuerOS/Detail/command/index.vue index 126b970e..85f5fe83 100644 --- a/src/views/Northbound/DuerOS/Detail/command/index.vue +++ b/src/views/Northbound/DuerOS/Detail/command/index.vue @@ -123,7 +123,7 @@ placeholder="请选择功能" v-model:value="modelRef.message.functionId" show-search - @change="funcChange" + @change="(e) => funcChange(e)" > { }; const onTypeChange = () => { - modelRef.message = { - properties: undefined, - functionId: undefined, - inputs: [], - value: undefined, - }; + // 需要记住之前的选择, 所以注释了该代码 + // modelRef.message = { + // properties: undefined, + // functionId: undefined, + // inputs: [], + // value: undefined, + // }; +}; + +const funcChange = (val: string, _inputs?: any[]) => { + if (val) { + const arr = + props.metadata?.functions.find((item: any) => item.id === val) + ?.inputs || []; + const list = arr.map((item: any) => { + const _item = _inputs?.find(i => i.id === item.id) + return { + id: item.id, + name: item.name, + value: undefined, + valueType: item?.valueType?.type, + ..._item, + required: item?.expands?.required + }; + }); + modelRef.message.inputs = list; + } }; watch( @@ -232,6 +253,9 @@ watch( if (newVal?.message?.properties) { onPropertyChange(newVal?.message?.properties, true); } + if (newVal?.message?.functionId) { + funcChange(newVal?.message?.functionId, newVal?.message?.inputs); + } } }, { @@ -239,24 +263,6 @@ watch( }, ); -const funcChange = (val: string) => { - if (val) { - const arr = - props.metadata?.functions.find((item: any) => item.id === val) - ?.inputs || []; - const list = arr.map((item: any) => { - return { - id: item.id, - name: item.name, - value: undefined, - valueType: item?.valueType?.type, - required: item?.expands?.required - }; - }); - modelRef.message.inputs = list; - } -}; - const saveBtn = () => new Promise((resolve) => { formRef.value diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue index 6b7f6571..88bd55db 100644 --- a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue +++ b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue @@ -72,7 +72,7 @@ const queryChartsAggList = async () => { { property: prop.data.id, alias: prop.data.id, - agg: agg.value, + agg: _type.value ? agg.value : 'COUNT', }, ], query: { diff --git a/src/views/media/Device/Channel/Save.vue b/src/views/media/Device/Channel/Save.vue index 82b7e95a..67165d94 100644 --- a/src/views/media/Device/Channel/Save.vue +++ b/src/views/media/Device/Channel/Save.vue @@ -302,8 +302,8 @@ const handleSubmit = () => { }; } const res = formData.value.id - ? await ChannelApi.update(formData.value.id, extraFormData) - : await ChannelApi.save(extraFormData); + ? await ChannelApi.update(formData.value.id, extraFormData).finally(() => {loading.value = false;}) + : await ChannelApi.save(extraFormData).finally(() => {loading.value = false;}); if (res.success) { onlyMessage('操作成功'); _vis.value = false;