Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
This commit is contained in:
@@ -170,7 +170,9 @@
|
|||||||
{ title: '删除', key: 'deleteNode', func: (data) => deleteNode(data) },
|
{ title: '删除', key: 'deleteNode', func: (data) => deleteNode(data) },
|
||||||
];
|
];
|
||||||
const handleSelect = (key, record) => {
|
const handleSelect = (key, record) => {
|
||||||
console.log(record);
|
//清除选中行数据
|
||||||
|
tableRef.value?.nsTableRef.clearCheck();
|
||||||
|
tableCalRef.value?.nsTableRef.clearCheck();
|
||||||
const {
|
const {
|
||||||
node: { pointType, id, energyType },
|
node: { pointType, id, energyType },
|
||||||
} = record;
|
} = record;
|
||||||
|
@@ -141,11 +141,19 @@ export const tableConfig = (orgId) => {
|
|||||||
component: 'NsSelectApi',
|
component: 'NsSelectApi',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
placeholder: '请选择设备名称',
|
placeholder: '请选择设备名称',
|
||||||
api: device.dropArea,
|
api: (params) => {
|
||||||
|
return http.post(device.dropArea, params).then((res) => {
|
||||||
|
const result = res.data?.reduce((pre, cur) => {
|
||||||
|
!pre.includes(cur.deviceName) && pre.push(cur.deviceName);
|
||||||
|
return pre;
|
||||||
|
}, []);
|
||||||
|
return { data: result };
|
||||||
|
});
|
||||||
|
},
|
||||||
resultField: 'data',
|
resultField: 'data',
|
||||||
params: { orgId, filterField: 'DEVICE_NAME_FACTORY' },
|
params: { orgId, filterField: 'DEVICE_NAME_FACTORY' },
|
||||||
labelField: 'deviceName',
|
// labelField: 'deviceName',
|
||||||
valueField: 'deviceName',
|
// valueField: 'deviceName',
|
||||||
filterOption: (input: string, option: any) => {
|
filterOption: (input: string, option: any) => {
|
||||||
return option.deviceName.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
return option.deviceName.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
||||||
},
|
},
|
||||||
@@ -205,11 +213,19 @@ export const tableConfig = (orgId) => {
|
|||||||
component: 'NsSelectApi',
|
component: 'NsSelectApi',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
placeholder: '请选择设备厂商',
|
placeholder: '请选择设备厂商',
|
||||||
api: device.dropArea,
|
api: (params) => {
|
||||||
|
return http.post(device.dropArea, params).then((res) => {
|
||||||
|
const result = res.data?.reduce((pre, cur) => {
|
||||||
|
!pre.includes(cur.manufacturer) && pre.push(cur.manufacturer);
|
||||||
|
return pre;
|
||||||
|
}, []);
|
||||||
|
return { data: result };
|
||||||
|
});
|
||||||
|
},
|
||||||
resultField: 'data',
|
resultField: 'data',
|
||||||
params: { orgId, filterField: 'DEVICE_NAME_FACTORY' },
|
params: { orgId, filterField: 'DEVICE_NAME_FACTORY' },
|
||||||
labelField: 'manufacturer',
|
// labelField: 'manufacturer',
|
||||||
valueField: 'manufacturer',
|
// valueField: 'manufacturer',
|
||||||
filterOption: (input: string, option: any) => {
|
filterOption: (input: string, option: any) => {
|
||||||
return option.manufacturer.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
return option.manufacturer.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user