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

fix: bug#10817

This commit is contained in:
leiqiaochu 2023-03-23 18:17:11 +08:00
parent 7c7a585c43
commit cb035bce38
3 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/device/product.ts
View File

@ -48,7 +48,7 @@ export const category = (data: any) => server.post('/device/category/_tree', dat
/** /**
* 获取网关类型 * 获取网关类型
*/ */
export const getProviders = () => server.get('/gateway/device/providers') export const getProviders = (terms?:any) => server.get('/gateway/device/providers',terms)
/** /**
* 查询所属部门 * 查询所属部门

35
src/views/device/Product/Detail/DeviceAccess/index.vue
View File

@ -418,6 +418,8 @@ import { marked } from 'marked';
import type { TableColumnType } from 'ant-design-vue'; import type { TableColumnType } from 'ant-design-vue';
import { useMenuStore } from '@/store/menu'; import { useMenuStore } from '@/store/menu';
import _ from 'lodash'; import _ from 'lodash';
import encodeQuery from '@/utils/encodeQuery';
const tableRef = ref(); const tableRef = ref();
const formRef = ref(); const formRef = ref();
const menuStore = useMenuStore(); const menuStore = useMenuStore();
@ -501,14 +503,15 @@ const query = reactive({
return new Promise((res) => { return new Promise((res) => {
getProviders().then((resp: any) => { getProviders().then((resp: any) => {
listData.value = []; listData.value = [];
console.log(description.value);
if (isNoCommunity) { if (isNoCommunity) {
listData.value = (resp?.result || []).map( (resp?.result || []).map((item: any) => {
(item: any) => ({ if (item.id != 'plugin_gateway') {
label: item.name, listData.value.push({
value: item.id, label: item.name,
}), value: item.id,
); });
}
});
} else { } else {
listData.value = (resp?.result || []) listData.value = (resp?.result || [])
.filter((i: any) => .filter((i: any) =>
@ -568,17 +571,7 @@ const query = reactive({
}); });
const param = ref<Record<string, any>>({ const param = ref<Record<string, any>>({
pageSize: 4, pageSize: 4,
terms: [ terms: [],
{
terms: [
{
column: 'channel',
termType: 'nin',
value: 'plugin',
},
],
},
],
}); });
const queryParams = ref<Record<string, any>>({}); const queryParams = ref<Record<string, any>>({});
/** /**
@ -1085,10 +1078,10 @@ nextTick(() => {
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 12px;
} }
.changeBtn{ .changeBtn {
margin: 0 0 0 20px; margin: 0 0 0 20px;
color: #315EFB; color: #315efb;
background: #ffffff; background: #ffffff;
border: 1px solid #315EFB border: 1px solid #315efb;
} }
</style> </style>

14
src/views/device/Product/index.vue
View File

@ -447,12 +447,14 @@ const query = reactive({
listData.value = []; listData.value = [];
// const list = () => { // const list = () => {
if (isNoCommunity) { if (isNoCommunity) {
listData.value = (resp?.result || []).map( (resp?.result || []).map((item: any) => {
(item: any) => ({ if (item.id != 'plugin_gateway') {
label: item.name, listData.value.push({
value: item.id, label: item.name,
}), value: item.id,
); });
}
});
} else { } else {
listData.value = (resp?.result || []) listData.value = (resp?.result || [])
.filter((i: any) => .filter((i: any) =>