|
|
@@ -299,8 +299,11 @@
|
|
|
if (deviceType.value == 'safetymonitor') {
|
|
|
// 如果是安全监控的数据时需要过滤常见设备数据，根据设定的常用安全监控字典去匹配
|
|
|
let dictCodes = getDictItemsByCode('safetynormal');
|
|
|
+ console.log(dictCodes,'111-----------')
|
|
|
const searchForm = formData.getFieldsValue();
|
|
|
- if (searchForm && !searchForm['dataTypeName'] && dictCodes && dictCodes.length > 0) {
|
|
|
+
|
|
|
+ if (searchForm && searchForm['dataTypeName'] && dictCodes && dictCodes.length > 0) {
|
|
|
+ console.log(searchForm,'000---------')
|
|
|
const tempData = [];
|
|
|
const tempData1 = [];
|
|
|
for (let i = 0; i < dataArr.length; i++) {
|
