|
@@ -298,37 +298,37 @@
|
|
|
});
|
|
|
if (deviceType.value == 'safetymonitor') {
|
|
|
// 如果是安全监控的数据时需要过滤常见设备数据,根据设定的常用安全监控字典去匹配
|
|
|
- let dictCodes = getDictItemsByCode('safetynormal');
|
|
|
- console.log(dictCodes,'111-----------')
|
|
|
- const searchForm = formData.getFieldsValue();
|
|
|
-
|
|
|
- if (searchForm && searchForm['dataTypeName'] && dictCodes && dictCodes.length > 0) {
|
|
|
- console.log(searchForm,'000---------')
|
|
|
- const tempData = [];
|
|
|
- const tempData1 = [];
|
|
|
- for (let i = 0; i < dataArr.length; i++) {
|
|
|
- const item = dataArr[i];
|
|
|
- let flag = false;
|
|
|
- for (let i = 0; i < dictCodes.length; i++) {
|
|
|
- const dict = dictCodes[i];
|
|
|
- if (dict['value'] == item['dataTypeName']) {
|
|
|
- flag = true;
|
|
|
- }
|
|
|
- }
|
|
|
- if (flag) {
|
|
|
- tempData.push(item);
|
|
|
- } else {
|
|
|
- tempData1.push(item);
|
|
|
- }
|
|
|
- }
|
|
|
- if (sysOrgCode == 'zjtzqctmk' || hasPermission('btn:noGb')) {
|
|
|
- dataSource.value = [...tempData, ...tempData1];
|
|
|
- } else {
|
|
|
- dataSource.value = [...tempData];
|
|
|
- }
|
|
|
- } else {
|
|
|
- dataSource.value = dataArr;
|
|
|
- }
|
|
|
+ // let dictCodes = getDictItemsByCode('safetynormal');
|
|
|
+ // console.log(dictCodes,'111-----------')
|
|
|
+ // const searchForm = formData.getFieldsValue();
|
|
|
+ dataSource.value = dataArr;
|
|
|
+ // if (searchForm && searchForm['dataTypeName'] && dictCodes && dictCodes.length > 0) {
|
|
|
+ // console.log(searchForm,'000---------')
|
|
|
+ // const tempData = [];
|
|
|
+ // const tempData1 = [];
|
|
|
+ // for (let i = 0; i < dataArr.length; i++) {
|
|
|
+ // const item = dataArr[i];
|
|
|
+ // let flag = false;
|
|
|
+ // for (let i = 0; i < dictCodes.length; i++) {
|
|
|
+ // const dict = dictCodes[i];
|
|
|
+ // if (dict['value'] == item['dataTypeName']) {
|
|
|
+ // flag = true;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (flag) {
|
|
|
+ // tempData.push(item);
|
|
|
+ // } else {
|
|
|
+ // tempData1.push(item);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (sysOrgCode == 'zjtzqctmk' || hasPermission('btn:noGb')) {
|
|
|
+ // dataSource.value = [...tempData, ...tempData1];
|
|
|
+ // } else {
|
|
|
+ // dataSource.value = [...tempData];
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // dataSource.value = dataArr;
|
|
|
+ // }
|
|
|
} else {
|
|
|
dataSource.value = dataArr;
|
|
|
}
|