|
@@ -1101,7 +1101,7 @@ const getDataSource = async () => {
|
|
|
data = Object.assign(data, readData);
|
|
|
dataSource.value.push(data);
|
|
|
IdList.value.push({
|
|
|
- deviceId: data.deviceId,
|
|
|
+ deviceId: data.deviceID,
|
|
|
strname: data.strname,
|
|
|
});
|
|
|
});
|
|
@@ -1122,7 +1122,8 @@ const getDataSource = async () => {
|
|
|
}
|
|
|
}
|
|
|
await getPointData();
|
|
|
- if (requestLock.value && sysOrgCode === 'hnjtymhmk') {
|
|
|
+ // && sysOrgCode === 'hnjtymhmk'
|
|
|
+ if (requestLock.value) {
|
|
|
getFaultDiagnosisList(IdList.value);
|
|
|
}
|
|
|
return selectData;
|
|
@@ -1803,6 +1804,7 @@ function goOutLink(type: string) {
|
|
|
}
|
|
|
function getFaultDiagnosisList(data) {
|
|
|
const idParams = data.map((item) => item.deviceId);
|
|
|
+ console.log('idParams', idParams);
|
|
|
getFaultDiagnosis(idParams).then((res) => {
|
|
|
const mergeById = (arr1, arr2) => {
|
|
|
const map = new Map(arr2.map((item) => [String(item.deviceId), item]));
|
|
@@ -1813,8 +1815,8 @@ function getFaultDiagnosisList(data) {
|
|
|
};
|
|
|
if (res.length > 0 && data.length > 0) {
|
|
|
warnList.value = mergeById(res, data);
|
|
|
+ modalWarnIsShow.value = true;
|
|
|
}
|
|
|
- modalWarnIsShow.value = true;
|
|
|
requestLock.value = false;
|
|
|
});
|
|
|
}
|
|
@@ -1903,8 +1905,8 @@ onUnmounted(() => {
|
|
|
width: auto;
|
|
|
}
|
|
|
.faultreason {
|
|
|
- height: 30px;
|
|
|
- line-height: 30px;
|
|
|
+ height: 50px;
|
|
|
+ line-height: 50px;
|
|
|
background: url('/@/assets/images/vent/fault3.png') no-repeat;
|
|
|
background-size: 100% 100%;
|
|
|
width: auto;
|
|
@@ -1918,6 +1920,7 @@ onUnmounted(() => {
|
|
|
font-size: 12px;
|
|
|
color: #32d9e7;
|
|
|
float: right;
|
|
|
+ white-space: normal;
|
|
|
}
|
|
|
}
|
|
|
|