Commit 6fb4b693 authored by yating.lin's avatar yating.lin

修改牛舍详情页tab跳转问题

parent 4bcc395d
......@@ -18,11 +18,11 @@ const routes: Routes = [
path: '',
component: EnvDetailPage,
// children: [
// {path:'fan', component: EnvFanPage},
// {path:'shower', component: EnvShowerPage},
// {path:'light', component: EnvLightPage},
// {path:'waterchannel', component: EnvWaterchannelPage},
// {path: '', redirectTo: 'fan',pathMatch:'prefix'},
// {path: 'fan', component: EnvFanPage},
// {path: 'shower', component: EnvShowerPage},
// {path: 'light', component: EnvLightPage},
// {path: 'waterchannel', component: EnvWaterchannelPage},
// {path: '', redirectTo: 'fan', pathMatch: 'prefix'},
// ]
}
];
......
......@@ -150,6 +150,13 @@ export class EnvDetailPage implements OnInit {
setInHouseInfo(inHouse) {
if (inHouse === undefined || inHouse === null ||
inHouse.inHouse === undefined || inHouse.inHouse === null) {
this.item.inHouse = {
inHouse: 0,
inHouseState: false,
inHouseName: '离舍',
fieldDeviceNo: '',
fieldDeviceType: '',
};
this.item.inHouse.inHouseName = '离舍';
this.item.inHouse.inHouseState = false;
......@@ -238,7 +245,7 @@ export class EnvDetailPage implements OnInit {
stateName = '在舍';
break;
default:
stateName = '';
stateName = '离舍';
break;
}
return stateName;
......
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {RouterModule, Routes} from '@angular/router';
import { IonicModule } from '@ionic/angular';
import {IonicModule} from '@ionic/angular';
import { TabsPage } from './tabs.page';
import {TabsPage} from './tabs.page';
import {EnvHomePage} from '../env-home/env-home.page';
import {EnvAnalPage} from '../env-anal/env-anal.page';
import {EnvDetailPage} from '../env-detail/env-detail.page';
import {EnvAlarmPage} from '../env-alarm/env-alarm.page';
import {EnvCfgPage} from '../env-cfg/env-cfg.page';
import {KanbanComponent} from '../../components/kanban/kanban.component';
import {AppModule} from '../../app.module';
import {WtModule} from '../../components/wt/wt.module';
import {EnvFanPage} from '../env-fan/env-fan.page';
import {EnvShowerPage} from '../env-shower/env-shower.page';
import {EnvLightPage} from '../env-light/env-light.page';
import {EnvWaterchannelPage} from '../env-waterchannel/env-waterchannel.page';
import {NgxEchartsModule} from 'ngx-echarts';
import {NgxDatatableModule} from '@swimlane/ngx-datatable';
import {EnvAnalPageModule} from '../env-anal/env-anal.module';
const routes: Routes = [
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment