joylink
/
xian-ncc-da-client
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop

This commit is contained in:
joylink_fanyuhong 2024-11-18 16:59:55 +08:00
parent 539e8b7d01 1cd4cb815c
commit 09b6dcbb19
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layouts/MainLayout.vue
View File

@ -119,7 +119,7 @@
</q-scroll-area>
</q-page-container>
</q-layout>
<commonAlarm v-if="route.path.includes('alarmRecord')" />
<commonAlarm v-if="route.path.includes('alarmInfo')" />
</template>
<script setup lang="ts">

37
src/pages/EmergencyResponseManage.vue
View File

@ -338,24 +338,27 @@ function handleSelectFaultType() {
let allType = '';
searchOptionsFaultType.value = [{ label: '全部', value: '' }];
for (let i = 0; i < allOptionsFaultType.length; i++) {
allOptionsFaultType[i].fts.forEach((item) => {
if (
(tab.value == 'GUIDE' &&
item.faultType.includes('FAULT_EMERGENCY_GUIDE')) ||
(tab.value == 'SERVICE' &&
item.faultType.includes('FAULT_EXIT_SERVICE'))
) {
searchOptionsFaultType.value.push({
label: item.typeName,
value: item.faultType,
});
if (allType == '') {
allType = item.faultType;
} else {
allType = allType + ',' + item.faultType;
if (allOptionsFaultType[i].lineId == filter.lineId) {
allOptionsFaultType[i].fts.forEach((item) => {
if (
(tab.value == 'GUIDE' &&
item.faultType.includes('FAULT_EMERGENCY_GUIDE')) ||
(tab.value == 'SERVICE' &&
item.faultType.includes('FAULT_EXIT_SERVICE'))
) {
searchOptionsFaultType.value.push({
label: item.typeName,
value: item.faultType,
});
if (allType == '') {
allType = item.faultType;
} else {
allType = allType + ',' + item.faultType;
}
}
}
});
});
break;
}
}
filter.faultType = allType;
searchOptionsFaultType.value[0].value = allType;