Skip to content

P
party-build-cloud
Commit 41a2ec16 authored by wangqinghua's avatar wangqinghua
Browse files
Options

跨域代理

路由配置
parent aa06e6a7
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 143 deletions
src/app/tabs/home/home.page.html
View file @ 41a2ec16
<ion-header> <ion-header>
<ion-toolbar > <ion-toolbar >
<ion-button>
<img class="logo" src="./assets/logo.png"> <img class="logo" src="./assets/logo.png">
</ion-button>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
......
src/app/tabs/home/home.page.ts
View file @ 41a2ec16
...@@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core'; ...@@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core';
}) })
export class HomePage implements OnInit { export class HomePage implements OnInit {
constructor() { } constructor(
) { }
ngOnInit() { ngOnInit() {
} }
......
src/app/tabs/mine/mine.page.html
View file @ 41a2ec16
<ion-header> <ion-header>
<ion-toolbar > <ion-toolbar>
<ion-button> <img class="logo" src="./assets/logo.png">
<img class="logo" src="./assets/logo.png"> <span class="span-end" slot="end">
</ion-button> <ion-icon name="mail"></ion-icon>
<ion-button slot="end"> <span class="num">2</span>
<ion-icon name="mail"></ion-icon> </span>
<span class="num">2</span>
</ion-button>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
......
src/app/tabs/mine/mine.page.scss
View file @ 41a2ec16
ion-button{ ion-toolbar{
position: relative; .span-end{
ion-icon{ position: relative;
font-size: 2.5rem; ion-icon{
} font-size: 2.5rem;
.num{ color: #ffffff;
position: absolute; margin-right: 1rem;
top: 3px; }
right: 11px; .num{
background-color: #fff; position: absolute;
padding: 1px 5px; top: 0px;
color: #e12724; right: 6px;
font-size: .8rem; background-color: #fff;
border-radius: 100px; padding: 1px 5px;
color: #e12724;
font-size: .8rem;
border-radius: 100px;
}
} }
} }
ion-content{
font-size: 16px;
}
.mine-box{ .mine-box{
border: 1px solid #fee7e7; border: 1px solid #fee7e7;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
......
src/app/tabs/serve/serve.page.html
View file @ 41a2ec16
<ion-header> <ion-header>
<ion-toolbar > <ion-toolbar>
<ion-button> <img class="logo" src="./assets/logo.png">
<img class="logo" src="./assets/logo.png"> <span class="span-end" slot="end">
</ion-button> <ion-icon name="mail"></ion-icon>
<ion-button slot="end"> <span class="num">2</span>
<ion-icon name="mail"></ion-icon> </span>
<span class="num">2</span> </ion-toolbar>
</ion-button>
</ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div style="height: 160px"> <div style="height: 160px">
<ion-slides [options]="slideOpts" pager="true" loop="true" autoplay="2000" speed="1500"> <ion-slides [options]="slideOpts" pager="true" loop="true" autoplay="2000" speed="1500">
<ion-slide style="height:160px;width: 100%;position: relative" *ngFor="let item of slidersItems"> <ion-slide style="height:160px;width: 100%;position: relative" *ngFor="let item of slidersItems">
<img src="{{picture+item.pictureId}}" class="slide-image" (click)="go(item)"> <img src="{{picture+item.pictureId}}" class="slide-image" (click)="go(item)">
<p class="slides-title">{{item.title}}</p> <p class="slides-title">{{item.title}}</p>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</div> </div>
<div class="item3" style="padding-top: 0px;"> <div class="item3" style="padding-top: 0px;">
<div class="item3-2" style="background-color:#f8f8f8;" (click)="gotoNotice()"> <div class="item3-2" style="background-color:#f8f8f8;" (click)="gotoNotice()">
<div class="card3" style="width: 15%;"> <div class="card3" style="width: 15%;">
<span *ngIf="hasNew.message == 1" class="img-tips"></span> <span *ngIf="hasNew.message == 1" class="img-tips"></span>
<img src="./assets/serve/icon-mail.png" > <img src="./assets/serve/icon-mail.png">
</div> </div>
<div class="card3" style="width: 75%;"> <div class="card3" style="width: 75%;">
<div class="card3-item" *ngFor="let item of noticeList;"> <div class="card3-item" *ngFor="let item of noticeList;">
<span *ngIf="noticeTips > 0" class="tips"></span> <span *ngIf="noticeTips > 0" class="tips"></span>
<span class="color-996">{{item.title}}</span> <span class="color-996">{{item.title}}</span>
{{item.content}} {{item.content}}
</div>
</div>
<div class="card3" style="width: 10%;color: #999999;font-size: 1.6rem">
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
</div>
</div> </div>
</div>
<div class="card3" style="width: 10%;color: #999999;font-size: 1.6rem">
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
</div>
</div> </div>
</div>
<div class="item2" style="padding: 0px;"> <div class="item2" style="padding: 0px;">
<div class="item2-2"> <p class="myApp">我的应用</p>
<div class="card" (click)="goTo('ActivityListPage')"> <div class="item2-2">
<img src="./assets/serve/icon-bm.png" alt=""> <div class="card" (click)="goTo('ActivityListPage')">
<label class="label2-2">活动报名</label> <img src="./assets/serve/icon-bm.png" alt="">
<img class="new-logo" *ngIf="hasNew.activity==1" src="./assets/imgs/new.png"> <label class="label2-2">活动报名</label>
</div> <img class="new-logo" *ngIf="hasNew.activity==1" src="./assets/imgs/new.png">
<div class="card" (click)="goTo('AnnouncementPage')"> </div>
<img src="./assets/serve/icon-tz.png" alt=""> <div class="card" (click)="goTo('AnnouncementPage')">
<label class="label2-2">通知公告</label> <img src="./assets/serve/icon-tz.png" alt="">
<img class="new-logo" *ngIf="hasNew.notice==1" src="./assets/imgs/new.png"> <label class="label2-2">通知公告</label>
</div> <img class="new-logo" *ngIf="hasNew.notice==1" src="./assets/imgs/new.png">
<div class="card" (click)="goOutGoingReportAboutAll()"> </div>
<img src="./assets/serve/icon-lhbb.png" alt=""> <div class="card" (click)="goOutGoingReportAboutAll()">
<label class="label2-2">离沪报备</label> <img src="./assets/serve/icon-lhbb.png" alt="">
<img class="new-logo" *ngIf="hasNew.premanager==1" src="./assets/imgs/new.png"> <label class="label2-2">离沪报备</label>
</div> <img class="new-logo" *ngIf="hasNew.premanager==1" src="./assets/imgs/new.png">
<div class="card" (click)="goTo('DutyPage')"> </div>
<img src="./assets/serve/icon-zb.png" alt=""> <div class="card" (click)="goTo('DutyPage')">
<label class="label2-2">值班情况</label> <img src="./assets/serve/icon-zb.png" alt="">
</div> <label class="label2-2">值班情况</label>
<ng-container *ngIf="role == 2 || role == 1 || role == 3"> </div>
<div class="card" (click)="goTo('ActivityTrackPage')"> <ng-container *ngIf="role == 2 || role == 1 || role == 3">
<img src="./assets/serve/icon-hdgz.png" alt=""> <div class="card" (click)="goTo('ActivityTrackPage')">
<label class="label2-2">活动跟踪</label> <img src="./assets/serve/icon-hdgz.png" alt="">
</div> <label class="label2-2">活动跟踪</label>
<div class="card" (click)="goTo('ReportTrackPage')"> </div>
<img src="./assets/serve/icon-bbgz.png" alt=""> <div class="card" (click)="goTo('ReportTrackPage')">
<label class="label2-2">报备跟踪</label> <img src="./assets/serve/icon-bbgz.png" alt="">
<label class="label2-2">报备跟踪</label>
</div>
</ng-container>
<div class="card" (click)="goTo('SurveryPage')">
<img src="./assets/serve/icon-wjtc.png" alt="">
<label class="label2-2 more2-2">问卷调查</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/serve/icon-xxcs.png" alt="">
<label class="label2-2 more2-2 main-color">学习测试</label>
<img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
</div>
<ng-container *ngIf="role == 3">
<div class="card" (click)="goTo('LearnManagePage')">
<img src="./assets/serve/icon-ccgl.png" alt="">
<label class="label2-2 more2-2">测试管理</label>
</div>
</ng-container>
<div class="card" (click)="goTo('MoreAppPage')">
<img src="./assets/serve/icon-more.png" alt="">
<label class="label2-2 more2-2">更多应用</label>
</div>
</div> </div>
</ng-container>
<div class="card" (click)="goTo('SurveryPage')">
<img src="./assets/serve/icon-wjtc.png" alt="">
<label class="label2-2 more2-2">问卷调查</label>
</div>
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/serve/icon-xxcs.png" alt="">
<label class="label2-2 more2-2 main-color">学习测试</label>
<img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
</div>
<ng-container *ngIf="role == 3">
<div class="card" (click)="goTo('LearnManagePage')">
<img src="./assets/serve/icon-ccgl.png" alt="">
<label class="label2-2 more2-2">测试管理</label>
</div>
</ng-container>
<div class="card" (click)="goTo('MoreAppPage')">
<img src="./assets/serve/icon-more.png" alt="">
<label class="label2-2 more2-2">更多应用</label>
</div>
</div> </div>
</div> <div class="calen-tab">
<div class="calen-tab"> 日程表:<span class="calen1">休息日</span> <span class="calen2">参加活动</span>
日程表:<span class="calen1">休息日</span> <span class="calen2">参加活动</span> <span class="calen3">值班</span><span class="calen4">离沪</span>
<span class="calen3">值班</span><span class="calen4">离沪</span> </div>
</div> <ion-calendar #calendar>
<ion-calendar #calendar>
</ion-calendar> </ion-calendar>
</ion-content> </ion-content>
src/app/tabs/serve/serve.page.scss
View file @ 41a2ec16
ion-button{ ion-toolbar{
position: relative; .span-end{
ion-icon{ position: relative;
font-size: 2.5rem; ion-icon{
} font-size: 2.5rem;
.num{ color: #ffffff;
position: absolute; margin-right: 1rem;
top: 3px; }
right: 11px; .num{
background-color: #fff; position: absolute;
padding: 1px 5px; top: 0px;
color: #e12724; right: 6px;
font-size: .8rem; background-color: #fff;
border-radius: 100px; padding: 1px 5px;
color: #e12724;
font-size: .8rem;
border-radius: 100px;
}
} }
} }
...@@ -371,4 +375,9 @@ ion-calendar-month .primary .dayOff1.today p{ ...@@ -371,4 +375,9 @@ ion-calendar-month .primary .dayOff1.today p{
} }
button[disabled]{ button[disabled]{
opacity: 1; opacity: 1;
}
.myApp{
background: #fff;
padding: 10px;
font-size: 1.3rem;
} }
\ No newline at end of file
src/app/tabs/serve/serve.page.ts
View file @ 41a2ec16
...@@ -14,7 +14,7 @@ import {Router} from "@angular/router"; ...@@ -14,7 +14,7 @@ import {Router} from "@angular/router";
templateUrl: './serve.page.html', templateUrl: './serve.page.html',
styleUrls: ['./serve.page.scss'], styleUrls: ['./serve.page.scss'],
}) })
export class ServePage implements OnInit { export class ServePage {
slideOpts = { slideOpts = {
initialSlide: 1, initialSlide: 1,
...@@ -65,15 +65,12 @@ export class ServePage implements OnInit { ...@@ -65,15 +65,12 @@ export class ServePage implements OnInit {
} }
ngOnInit(): void {
this.appService.ObserverHttpGet("/wisdomgroup/modules/message/findAllActivityForAppWithXQ", null).subscribe((res: Response) => {
// this.noticeList = res.json().slice(0, 2);
}, error => {
this.commonSer.alert('系统错误！');
});
}
ionViewDidEnter() { ionViewDidEnter() {
this.tabsSer.findAllActivityForAppWithXQ().subscribe(
(res)=>{
this.noticeList = res.slice(0, 2);
}
)
//获取权限 //获取权限
this.getRole(); this.getRole();
//获取消息数量 //获取消息数量
...@@ -85,11 +82,13 @@ export class ServePage implements OnInit { ...@@ -85,11 +82,13 @@ export class ServePage implements OnInit {
ionViewWillEnter() { ionViewWillEnter() {
this.slidersItems = []; this.slidersItems = [];
this.getHasNew(); this.getHasNew();
//初始化日期 //轮播图
this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => { this.tabsSer.getBanner().subscribe(
// this.slidersItems = res.json(); (res)=>{
}, error => { this.slidersItems = res;
}) console.log(this.slidersItems)
}
)
} }
......
src/app/tabs/tabs.service.ts
View file @ 41a2ec16
...@@ -13,10 +13,20 @@ export class TabsService{ ...@@ -13,10 +13,20 @@ export class TabsService{
private https:Http, //该请求不转json private https:Http, //该请求不转json
){} ){}
//登录
loginpost(data): Observable<any>{ loginpost(data): Observable<any>{
return this.http.post(environment.domain+'/wisdomgroup/app/loginpost?'+this.commonSer.toQuery(data),null) return this.http.post(environment.domain+'/wisdomgroup/app/loginpost?'+this.commonSer.toQuery(data),null)
} }
//获取消息
findAllActivityForAppWithXQ(): Observable<any>{
return this.http.get(environment.domain+'/wisdomgroup/modules/message/findAllActivityForAppWithXQ')
}
getBanner(): Observable<any>{
return this.http.get(environment.domain+'/wisdomgroup/modules/common/file/getBanner')
}
//获取权限 //获取权限
getRoles(): Observable<any>{ getRoles(): Observable<any>{
return this.http.get(environment.domain +'/wisdomgroup/app/getRoles', ); return this.http.get(environment.domain +'/wisdomgroup/app/getRoles', );
......
src/theme/app.scss
View file @ 41a2ec16
...@@ -20,7 +20,8 @@ th, td /* table elements 表格元素 */ { ...@@ -20,7 +20,8 @@ th, td /* table elements 表格元素 */ {
padding: 0; padding: 0;
} }
.logo{ .logo{
height: 3rem; height: 2.5rem;
margin-left: 1rem;
} }
.space{ .space{
height: .5rem; height: .5rem;
......
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