fix: bug#10467

This commit is contained in:
leiqiaochu 2023-03-22 09:38:01 +08:00
parent 026d9dd914
commit 0aac4de410
2 changed files with 32 additions and 54 deletions

View File

@ -6,7 +6,7 @@
<div style="display: flex"> <div style="display: flex">
<h3>配置信息</h3> <h3>配置信息</h3>
<div style="margin: 0 0px 0 15px; color: #1d39c4"> <div style="margin: 0 0px 0 15px; color: #1d39c4">
<AIcon type="EditOutlined"/> <AIcon type="EditOutlined" @click="editConfig"/>
</div> </div>
</div> </div>
</template> </template>

View File

@ -36,10 +36,10 @@
<j-col flex="auto"> <j-col flex="auto">
<j-form-item name="id"> <j-form-item name="id">
<template #label> <template #label>
<span>ID</span>
<j-tooltip <j-tooltip
title="若不填写系统将自动生成唯一ID" title="若不填写系统将自动生成唯一ID"
> >
<span>ID</span>
<AIcon <AIcon
type="QuestionCircleOutlined" type="QuestionCircleOutlined"
style="margin-left: 2px" style="margin-left: 2px"
@ -77,56 +77,21 @@
</j-tree-select> </j-tree-select>
</j-form-item> </j-form-item>
<j-form-item label="设备类型" name="deviceType"> <j-form-item label="设备类型" name="deviceType">
<j-radio-group <j-card-select
v-model:value="form.deviceType" :value="form.deviceType"
style="width: 100%" :options="deviceList"
@change="changeValue" @change="changeDeviceType"
> >
<j-row :span="24" :gutter="10"> <template #title="item">
<j-col <span>{{ item.title }}</span>
:span="8" <a-tooltip :title="item"
v-for="item in deviceList" ><AIcon
:key="item.value" type="QuestionCircleOutlined"
> style="margin-left: 2px"
<div class="button-style"> />
<j-radio-button </a-tooltip>
:value="item.value" </template>
style="height: 100%; width: 100%" </j-card-select>
:disabled="disabled"
>
<div class="card-content">
<j-row :gutter="20">
<j-col :span="10">
<!-- 图片 -->
<div class="img-style">
<img :src="item.logo" />
</div>
</j-col>
<j-col :span="14">
<span class="card-style">
{{ item.label }}
</span>
</j-col>
</j-row>
<!-- 勾选 -->
<div
v-if="
form.deviceType ===
item.value
"
class="checked-icon"
>
<div>
<CheckOutlined />
</div>
</div>
</div>
</j-radio-button>
</div>
</j-col>
</j-row>
</j-radio-group>
</j-form-item> </j-form-item>
<j-form-item label="说明" name="description"> <j-form-item label="说明" name="description">
<j-textarea <j-textarea
@ -195,17 +160,20 @@ const deviceList = ref([
{ {
label: '直连设备', label: '直连设备',
value: 'device', value: 'device',
logo: getImage('/device-type-1.png'), iconUrl: getImage('/device-type-1.png'),
tooltip: '直连物联网平台的设备',
}, },
{ {
label: '网关子设备', label: '网关子设备',
value: 'childrenDevice', value: 'childrenDevice',
logo: getImage('/device-type-2.png'), iconUrl: getImage('/device-type-2.png'),
tooltip: '能挂载子设备与平台进行通信的设备',
}, },
{ {
label: '网关设备', label: '网关设备',
value: 'gateway', value: 'gateway',
logo: getImage('/device/device-type-3.png'), iconUrl: getImage('/device/device-type-3.png'),
tooltip: '作为网关的子设备,有网关代理连接到物联网平台',
}, },
]); ]);
@ -356,6 +324,12 @@ const submitData = () => {
} }
} else if (props.isAdd === 2) { } else if (props.isAdd === 2) {
// //
form.classifiedId
? form.classifiedId
: (form.classifiedId = ''); //
form.classifiedName
? form.classifiedName
: (form.classifiedName = '');
const res = await editProduct(form); const res = await editProduct(form);
if (res.status === 200) { if (res.status === 200) {
message.success('保存成功!'); message.success('保存成功!');
@ -372,6 +346,10 @@ const submitData = () => {
* 初始化 * 初始化
*/ */
queryProductTree(); queryProductTree();
const changeDeviceType = (value: Array<string>) => {
form.deviceType = value[0];
};
defineExpose({ defineExpose({
show: show, show: show,
}); });