Explorar o código

1. 修复需风量刷新页面加载不出来的问题

hongrunxia hai 3 meses
pai
achega
28b4bbc22a

+ 2 - 2
src/router/routes/basic.ts

@@ -99,8 +99,8 @@ export const QIANKUN_ROUTE: AppRouteRecordRaw = {
     },
     {
       path: '/micro-need-air/:path(.*)*',
-      name: QIANKUN_ROUTE_NAME,
-      component: LAYOUT,
+      name: 'micro-need-air',
+      component: () => import('/@/components/vent/micro/needAir.vue'),
       meta: {
         title: '需风量分析系统',
         hideBreadcrumb: true,

+ 5 - 4
src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -350,11 +350,11 @@
                     <a-tag
                       v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '1'"
                       color="#FF0000">点位异常</a-tag>
+                    <template v-if="column.dataIndex === 'ndoortype'">
+                      <span>{{ render.renderDictText(record.ndoortype, 'ndoortype') }}</span>
+                    </template>
                     <template v-if="column.dataIndex === 'doorUse'">
-                      <span v-if="record.doorUse == 1" color="default">行车风门</span>
-                      <span v-else-if="record.doorUse == 2">行人风门</span>
-                      <span v-else-if="record.doorUse == 3">短路风门</span>
-                      <span v-else-if="record.doorUse == 4">行车/短路风门</span>
+                      <span>{{ render.renderDictText(record.doorUse, 'doorUse') }}</span>
                     </template>
                   </template>
                   <template v-else-if="deviceType.startsWith('windrect')">
@@ -483,6 +483,7 @@ import { SvgIcon } from '/@/components/Icon';
 import { getActions } from '/@/qiankun/state';
 import { useRouter } from 'vue-router';
 import { setDivHeight } from '/@/utils/event';
+import { render } from '/@/utils/common/renderUtils';
 import {
   majorColumns,
   haveSysDetailArr,

+ 4 - 4
src/views/vent/monitorManager/gateMonitor/index.vue

@@ -47,7 +47,7 @@
       <!-- 控制模式 -->
       <div class="top-right row" v-if="hasPermission('btn:remote')">
         <!--  -->
-        <div class="vent-flex-m row" v-if="selectData.contrlMod == 'loopCtrl'">
+        <div class="vent-flex-m row" v-if="selectData.contrlMod == 'loopCtrl' && modelList.length > 0">
           <div class="control-title">控制模式:</div>
           <a-radio-group v-model:value="selectData.autoRoManual">
             <template v-for="(item, index) in modelList" :key="index">
@@ -57,7 +57,7 @@
           <div class="button-box" @click="playAnimation(7)">切换模式</div>
         </div>
         <!-- 控制指令是多个,每个状态需要下发单独的指令 -->
-        <div class="vent-flex-m row" v-else-if="selectData.contrlMod == 'codeCtrl'">
+        <div class="vent-flex-m row" v-else-if="selectData.contrlMod == 'codeCtrl' && modelList.length > 0">
           <div class="control-title">控制模式:</div>
           <a-radio-group v-model:value="selectData.autoRoManual">
             <template v-for="(item, index) in modelList" :key="index">
@@ -67,14 +67,14 @@
           <div class="button-box" v-for="(item, index) in modelList" @click="playAnimation(7, item.value)" :key="index">{{ item.text }}</div>
         </div>
         <!-- 济南嘉鸿远程、就地、自动控制,自动切换,点位为true就是选中状态 -->
-        <div class="vent-flex-m row" v-else-if="selectData.contrlMod == 'jnjhCtrl'">
+        <div class="vent-flex-m row" v-else-if="selectData.contrlMod == 'jnjhCtrl' && modelList.length > 0">
           <div class="control-title">控制模式:</div>
           <a-radio v-model:checked="selectData['autoRoManual']" :disabled="true">远程</a-radio>
           <a-radio v-model:checked="selectData['autoRoManual1']" :disabled="true">自动</a-radio>
           <a-radio v-model:checked="selectData['autoRoManual2']" :disabled="true">手动</a-radio>
           <div class="button-box" @click="playAnimation(7)">模式切换</div>
         </div>
-        <div class="vent-flex-m row" v-else>
+        <div class="vent-flex-m row" v-else-if="modelList.length > 0">
           <div class="control-title">控制模式:</div>
           <a-radio-group v-model:value="selectData.autoRoManual">
             <template v-for="(item, index) in modelList" :key="index">