Commit 7d09a2a7 by 牛晓林

stable

parent c4a520f2
...@@ -4,7 +4,7 @@ import { DeviceProfileInfoComponent } from "./asset-material-manager/device-prof ...@@ -4,7 +4,7 @@ import { DeviceProfileInfoComponent } from "./asset-material-manager/device-prof
import { HouseProfileInfoComponent } from "./asset-material-manager/house-profile-info/house-profile-info.component"; import { HouseProfileInfoComponent } from "./asset-material-manager/house-profile-info/house-profile-info.component";
import { LandProfileInfoComponent } from "./asset-material-manager/land-profile-info/land-profile-info.component"; import { LandProfileInfoComponent } from "./asset-material-manager/land-profile-info/land-profile-info.component";
import { OtherInfoComponent } from "./asset-material-manager/other-info/other-info.component"; import { OtherInfoComponent } from "./asset-material-manager/other-info/other-info.component";
import { ShareModule } from "src/app/share";
import { GoodsContractComponent } from "./contract-manager/goods-contract/goods-contract.component"; import { GoodsContractComponent } from "./contract-manager/goods-contract/goods-contract.component";
import { DeviceContractComponent } from "./contract-manager/device-contract/device-contract.component"; import { DeviceContractComponent } from "./contract-manager/device-contract/device-contract.component";
import { MaintainContractComponent } from "./contract-manager/maintain-contract/maintain-contract.component"; import { MaintainContractComponent } from "./contract-manager/maintain-contract/maintain-contract.component";
...@@ -14,6 +14,7 @@ import { ProfileContractComponent } from "./contract-manager/profile-contract/pr ...@@ -14,6 +14,7 @@ import { ProfileContractComponent } from "./contract-manager/profile-contract/pr
import { VehicleContractComponent } from "./contract-manager/vehicle-contract/vehicle-contract.component"; import { VehicleContractComponent } from "./contract-manager/vehicle-contract/vehicle-contract.component";
import { HouseContractComponent } from "./contract-manager/house-contract/house-contract.component"; import { HouseContractComponent } from "./contract-manager/house-contract/house-contract.component";
import { ContractListTotalComponent } from "./contract-manager/contract-list-total/contract-list-total.component"; import { ContractListTotalComponent } from "./contract-manager/contract-list-total/contract-list-total.component";
import { SharedModule } from '@shared';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -31,6 +32,6 @@ import { ContractListTotalComponent } from "./contract-manager/contract-list-tot ...@@ -31,6 +32,6 @@ import { ContractListTotalComponent } from "./contract-manager/contract-list-tot
HouseContractComponent, HouseContractComponent,
ContractListTotalComponent ContractListTotalComponent
], ],
imports: [ShareModule, FileRoutingModule] imports: [SharedModule, FileRoutingModule]
}) })
export class FileModule {} export class FileModule {}
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { IdleSharedRoutingModule } from "./idle-shared-routing.module"; import { IdleSharedRoutingModule } from "./idle-shared-routing.module";
import { ShareListComponent } from "./share-list/share-list.component"; import { ShareListComponent } from "./share-list/share-list.component";
import { ShareModule } from "src/app/share"; import { SharedModule } from '@shared';
@NgModule({ @NgModule({
declarations: [ShareListComponent], declarations: [ShareListComponent],
imports: [ShareModule, IdleSharedRoutingModule] imports: [SharedModule, IdleSharedRoutingModule]
}) })
export class IdleSharedModule {} export class IdleSharedModule {}
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { IntangibleAssetsRoutingModule } from "./intangible-assets-routing.module"; import { IntangibleAssetsRoutingModule } from "./intangible-assets-routing.module";
import { ShareModule } from "src/app/share";
import { LandDefaultComponent } from "./land/default/default.component"; import { LandDefaultComponent } from "./land/default/default.component";
import { PatentDefaultComponent } from "./patent/default/default.component"; import { PatentDefaultComponent } from "./patent/default/default.component";
import { SoftwareDefaultComponent } from "./software/default/default.component"; import { SoftwareDefaultComponent } from "./software/default/default.component";
import { SharedModule } from '@shared';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -11,6 +11,6 @@ import { SoftwareDefaultComponent } from "./software/default/default.component"; ...@@ -11,6 +11,6 @@ import { SoftwareDefaultComponent } from "./software/default/default.component";
PatentDefaultComponent, PatentDefaultComponent,
SoftwareDefaultComponent SoftwareDefaultComponent
], ],
imports: [ShareModule, IntangibleAssetsRoutingModule] imports: [SharedModule, IntangibleAssetsRoutingModule]
}) })
export class IntangibleAssetsModule {} export class IntangibleAssetsModule {}
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { RevolvingMaterialRoutingModule } from "./revolving-material-routing.module"; import { RevolvingMaterialRoutingModule } from "./revolving-material-routing.module";
import { ShareModule } from "src/app/share";
// 周转材料 // 周转材料
import { StandComponent } from "./revolve/stand/stand.component"; import { StandComponent } from "./revolve/stand/stand.component";
...@@ -19,6 +19,7 @@ import { GoodsConsumeComponent } from "./warehouse/goods-consume/goods-consume.c ...@@ -19,6 +19,7 @@ import { GoodsConsumeComponent } from "./warehouse/goods-consume/goods-consume.c
import { ReceiveComponent } from "./consumable/receive/receive.component"; import { ReceiveComponent } from "./consumable/receive/receive.component";
import { ConsumeCheckRecordComponent } from "./consumable/check-record/check-record.component"; import { ConsumeCheckRecordComponent } from "./consumable/check-record/check-record.component";
import { ConsumeStandComponent } from "./consumable/stand/stand.component"; import { ConsumeStandComponent } from "./consumable/stand/stand.component";
import { SharedModule } from '@shared';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -35,6 +36,6 @@ import { ConsumeStandComponent } from "./consumable/stand/stand.component"; ...@@ -35,6 +36,6 @@ import { ConsumeStandComponent } from "./consumable/stand/stand.component";
ConsumeCheckRecordComponent, ConsumeCheckRecordComponent,
ConsumeStandComponent ConsumeStandComponent
], ],
imports: [ShareModule, RevolvingMaterialRoutingModule] imports: [SharedModule, RevolvingMaterialRoutingModule]
}) })
export class RevolvingMaterialModule {} export class RevolvingMaterialModule {}
...@@ -22,7 +22,7 @@ import { UserLockComponent } from './passport/lock/lock.component'; ...@@ -22,7 +22,7 @@ import { UserLockComponent } from './passport/lock/lock.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: "admin", path: "admin",
component: DefaultComponent, component: LayoutDefaultComponent,
children: [ children: [
// 数据分析与展示 // 数据分析与展示
{ {
......
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