Skip to content

P
party-build-cloud
Commit 678fca8b authored by wangqinghua's avatar wangqinghua
Browse files
Options

update icon

parent 83485004
Hide whitespace changes
Inline Side-by-side
Showing with 236 additions and 200 deletions
platforms/android/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml deleted 100644 → 0
View file @ 83485004
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr format="reference" name="coordinatorLayoutStyle"/>
<color name="notification_action_color_filter">#ffffffff</color>
<color name="notification_icon_bg_color">#ff9e9e9e</color>
<color name="notification_material_background_media_default_color">#ff424242</color>
<color name="primary_text_default_material_dark">#ffffffff</color>
<color name="ripple_material_light">#1f000000</color>
<color name="secondary_text_default_material_dark">#b3ffffff</color>
<color name="secondary_text_default_material_light">#8a000000</color>
<declare-styleable name="CoordinatorLayout"><attr format="reference" name="keylines"/><attr format="color|reference" name="statusBarBackground"/></declare-styleable>
<declare-styleable name="CoordinatorLayout_Layout"><attr name="android:layout_gravity"/><attr format="string" name="layout_behavior"/><attr format="reference" name="layout_anchor"/><attr format="integer" name="layout_keyline"/><attr name="layout_anchorGravity">
<flag name="top" value="0x30"/>
<flag name="bottom" value="0x50"/>
<flag name="left" value="0x03"/>
<flag name="right" value="0x05"/>
<flag name="center_vertical" value="0x10"/>
<flag name="fill_vertical" value="0x70"/>
<flag name="center_horizontal" value="0x01"/>
<flag name="fill_horizontal" value="0x07"/>
<flag name="center" value="0x11"/>
<flag name="fill" value="0x77"/>
<flag name="clip_vertical" value="0x80"/>
<flag name="clip_horizontal" value="0x08"/>
<flag name="start" value="0x00800003"/>
<flag name="end" value="0x00800005"/>
</attr><attr format="enum" name="layout_insetEdge">
<enum name="none" value="0x0"/>
<enum name="top" value="0x30"/>
<enum name="bottom" value="0x50"/>
<enum name="left" value="0x03"/>
<enum name="right" value="0x05"/>
<enum name="start" value="0x00800003"/>
<enum name="end" value="0x00800005"/>
</attr><attr name="layout_dodgeInsetEdges">
<flag name="none" value="0x0"/>
<flag name="top" value="0x30"/>
<flag name="bottom" value="0x50"/>
<flag name="left" value="0x03"/>
<flag name="right" value="0x05"/>
<flag name="start" value="0x00800003"/>
<flag name="end" value="0x00800005"/>
<flag name="all" value="0x77"/>
</attr></declare-styleable>
<declare-styleable name="FontFamily"><attr format="string" name="fontProviderAuthority"/><attr format="string" name="fontProviderPackage"/><attr format="string" name="fontProviderQuery"/><attr format="reference" name="fontProviderCerts"/><attr name="fontProviderFetchStrategy">
<enum name="blocking" value="0"/>
<enum name="async" value="1"/>
</attr><attr format="integer" name="fontProviderFetchTimeout">
<enum name="forever" value="-1"/>
</attr></declare-styleable>
<declare-styleable name="FontFamilyFont"><attr name="fontStyle">
<enum name="normal" value="0"/>
<enum name="italic" value="1"/>
</attr><attr format="reference" name="font"/><attr format="integer" name="fontWeight"/><attr name="android:fontStyle"/><attr name="android:font"/><attr name="android:fontWeight"/></declare-styleable>
<dimen name="compat_button_inset_horizontal_material">4dp</dimen>
<dimen name="compat_button_inset_vertical_material">6dp</dimen>
<dimen name="compat_button_padding_horizontal_material">8dp</dimen>
<dimen name="compat_button_padding_vertical_material">4dp</dimen>
<dimen name="compat_control_corner_material">2dp</dimen>
<dimen name="notification_action_icon_size">32dp</dimen>
<dimen name="notification_action_text_size">13sp</dimen>
<dimen name="notification_big_circle_margin">12dp</dimen>
<dimen name="notification_content_margin_start">8dp</dimen>
<dimen name="notification_large_icon_height">64dp</dimen>
<dimen name="notification_large_icon_width">64dp</dimen>
<dimen name="notification_main_column_padding_top">10dp</dimen>
<dimen name="notification_media_narrow_margin">@dimen/notification_content_margin_start</dimen>
<dimen name="notification_right_icon_size">16dp</dimen>
<dimen name="notification_right_side_padding_top">2dp</dimen>
<dimen name="notification_small_icon_background_padding">3dp</dimen>
<dimen name="notification_small_icon_size_as_large">24dp</dimen>
<dimen name="notification_subtext_size">13sp</dimen>
<dimen name="notification_top_pad">10dp</dimen>
<dimen name="notification_top_pad_large_text">5dp</dimen>
<drawable name="notification_template_icon_bg">#3333B5E5</drawable>
<drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
<item name="line1" type="id"/>
<item name="line3" type="id"/>
<item name="tag_transition_group" type="id"/>
<item name="text" type="id"/>
<item name="text2" type="id"/>
<item name="title" type="id"/>
<integer name="cancel_button_image_alpha">127</integer>
<integer name="status_bar_notification_info_maxnum">999</integer>
<string name="activity_name">@string/launcher_name</string>
<string name="app_name">部机关党建云</string>
<string name="launcher_name">@string/app_name</string>
<string name="status_bar_notification_info_overflow">999+</string>
<style name="TextAppearance.Compat.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
<style name="TextAppearance.Compat.Notification.Info">
<item name="android:textSize">12sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Compat.Notification.Info.Media"/>
<style name="TextAppearance.Compat.Notification.Line2" parent="TextAppearance.Compat.Notification.Info"/>
<style name="TextAppearance.Compat.Notification.Line2.Media" parent="TextAppearance.Compat.Notification.Info.Media"/>
<style name="TextAppearance.Compat.Notification.Media"/>
<style name="TextAppearance.Compat.Notification.Time">
<item name="android:textSize">12sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Compat.Notification.Time.Media"/>
<style name="TextAppearance.Compat.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"/>
<style name="TextAppearance.Compat.Notification.Title.Media"/>
<style name="Widget.Compat.NotificationActionContainer" parent=""/>
<style name="Widget.Compat.NotificationActionText" parent=""/>
<style name="Widget.Support.CoordinatorLayout" parent="android:Widget">
<item name="statusBarBackground">#000000</item>
</style>
</resources>
\ No newline at end of file
platforms/android/app/build/outputs/apk/debug/output.json
View file @ 678fca8b
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40307},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40309},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/outputs/logs/manifest-merger-debug-report.txt
View file @ 678fca8b
......@@ -22,10 +22,10 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:14:127-180
manifest
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
MERGED from [me.leolin:ShortcutBadger:1.1.21] /Users/ben/.gradle/caches/transforms-1/files-1.1/ShortcutBadger-1.1.21.aar/d9e66a40bdbdd0ac562039721fd48b4a/AndroidManifest.xml:2:1-52:12
MERGED from [com.android.support:support-v4:27.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.0.aar/2e7787ee4aa5277e591774453a6f2139/AndroidManifest.xml:17:1-22:12
MERGED from [:CordovaLib] /Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/build/intermediates/manifests/full/debug/AndroidManifest.xml:20:1-27:12
......@@ -38,9 +38,9 @@ MERGED from [android.arch.lifecycle:runtime:1.1.0] /Users/ben/.gradle/caches/tra
MERGED from [android.arch.lifecycle:livedata-core:1.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.0.aar/b202af8a773e22d7a62a3ef6eb93a86e/AndroidManifest.xml:17:1-22:12
MERGED from [android.arch.lifecycle:viewmodel:1.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.0.aar/1edfaaf4fc3eb7166424068e24c0e7ad/AndroidManifest.xml:17:1-22:12
MERGED from [android.arch.core:runtime:1.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/fcf3d41d76daa1e08b0ab9c51d31565d/AndroidManifest.xml:17:1-22:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
package
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-136
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
......@@ -177,6 +177,12 @@ uses-permission#android.permission.BLUETOOTH
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:28:5-68
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:28:22-65
uses-feature#android.hardware.telephony
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:29:5-88
android:required
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:29:61-85
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:29:19-60
meta-data#android.support.FILE_PROVIDER_PATHS
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:12:13-114
android:resource
......
src/components/components.module.ts
View file @ 678fca8b
......@@ -9,6 +9,7 @@ import {VideoiComponent} from './videoi/videoi';
import {SidebarComponent} from './sidebar/sidebar';
import {FilterComponent} from './filter/filter';
import {SpcesComponent} from './spces/spces';
import {PersonMulComponent} from './person-mul/person-mul';
@NgModule({
declarations: [
......@@ -21,6 +22,7 @@ import {SpcesComponent} from './spces/spces';
SidebarComponent,
FilterComponent,
SpcesComponent,
PersonMulComponent,
],
imports: [
IonicPageModule,
......@@ -35,6 +37,7 @@ import {SpcesComponent} from './spces/spces';
SidebarComponent,
FilterComponent,
SpcesComponent,
PersonMulComponent,
],
providers: [
SlideListComponent,
......@@ -42,7 +45,8 @@ import {SpcesComponent} from './spces/spces';
CommentComponent,
SwiperComponent,
FilterComponent,
SpcesComponent
SpcesComponent,
PersonMulComponent,
],
entryComponents: [
ReplyComponent,
......@@ -50,6 +54,7 @@ import {SpcesComponent} from './spces/spces';
SwiperComponent,
FilterComponent,
SpcesComponent,
PersonMulComponent,
]
})
export class ComponentsModule {
......
src/pages/contact/person-list/person-list.html
View file @ 678fca8b
......@@ -39,10 +39,7 @@
<div class="contact-organization">{{item?.orgname}}</div>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
</ion-content>
src/pages/contact/person-list/person-list.ts
View file @ 678fca8b
......@@ -24,7 +24,7 @@ export class PersonListPage {
const data = {
name: this.name,
pageNumber: 1,
pageSize: 100,
pageSize: 1000,
};
this.appService.ObserverHttpNoForm('/wisdomgroup/app/getUserByName', data)
.subscribe((res) => {
......
src/pages/serve-pages/meet-room/room-apply/room-apply.html
View file @ 678fca8b
<ion-header>
<ion-navbar>
<ion-title>roomApply</ion-title>
</ion-navbar>
<ion-navbar>
<ion-title>会议室申请</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<div>
<ion-item>
<ion-label class="main-color">会议类型</ion-label>
<ion-select [(ngModel)]="obj.meetingType" cancelText="取消" okText="确定">
<ion-option *ngFor="let type of meetTypeList" [value]="type.id">{{type.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="main-color">会议室</ion-label>
<ion-select [(ngModel)]="obj.roomId" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-option *ngFor="let item of roomList" [value]="item.id">{{item.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="main-color">申请处室</ion-label>
<ion-select [(ngModel)]="obj.orgId" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-option *ngFor="let item of orgList" [value]="item.id">{{item.groupName}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="main-color">开始时间</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD" pickerFormat="YYYY MM DD"
[(ngModel)]="obj.startTime"></ion-datetime>
</ion-item>
<ion-item>
<ion-label class="main-color">参会人数</ion-label>
<ion-input [(ngModel)]="obj.number" type="text" maxlength="20"></ion-input>
</ion-item>
</div>
<button class="submit-btn submit" (click)="submit()">提交</button>
<ion-content style="padding: 6px;">
<div>
<ion-item>
<ion-label class="item-left">会议类型:</ion-label>
<ion-select [(ngModel)]="obj.meetingType" cancelText="取消" okText="确定" placeholder="请选择">
<ion-option *ngFor="let type of meetTypeList" [value]="type.id">{{type.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="item-left">会议室:</ion-label>
<ion-select [(ngModel)]="obj.room" (ngModelChange)="roomMax = '会议室可容纳'+ $event.accommodation +'人' " cancelText="取消" okText="确定" placeholder="请选择">
<ion-option *ngFor="let item of roomList" [value]="item">{{item.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="item-left">申请处室:</ion-label>
<ion-select [(ngModel)]="obj.org" cancelText="取消" okText="确定" placeholder="请选择">
<ion-option *ngFor="let item of orgList" [value]="item">{{item.name}}</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label class="item-left">开始时间:</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
pickerFormat="YYYY MM DD HH mm" placeholder="请选择"
[(ngModel)]="obj.startTime"></ion-datetime>
</ion-item>
<div class="item-box">
<div class="left">部领导:</div>
<div class="right">
<span *ngFor="let item of leaderList;let index = i " class="tag"
(click)="chooseLeader(item,index)"
[ngClass]="obj.orgLeader.indexOf(item.id) > -1 ? 'selectLead':''">
{{item.userName}}
</span>
</div>
</div>
<ion-item>
<ion-label class="item-left">参会人数:</ion-label>
<ion-input [(ngModel)]="obj.number" type="text" maxlength="20"
[placeholder]="roomMax"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">参会人员:
</div>
<div class="right">
<button color="danger" ion-button small (click)="choose()">选择</button>
<div class="div-tag">
<span *ngFor="let item of personList;let i = index">
{{item.name}}
<ion-icon (click)="removePerson(i)" name="close"></ion-icon>
</span>
</div>
</div>
</div>
<div class="item-box">
<div class="left">备注:</div>
<div class="right">
<ion-textarea [(ngModel)]="obj.remark"></ion-textarea>
</div>
</div>
</div>
<button class="submit-btn submit" (click)="submit()">提交</button>
</ion-content>
src/pages/serve-pages/meet-room/room-apply/room-apply.scss
View file @ 678fca8b
page-room-apply {
.item-left {
text-align: right;
width: 20%;
font-weight: bold;
font-size: 1.4rem;
flex: none;
}
.item-ios.item-block .item-inner {
border-bottom: 0.55px solid #eeeeee;
}
ion-datetime, ion-select {
width: 80%;
max-width: 80%;
text-align: right;
font-size: 1.4rem;
}
ion-input input {
text-align: right;
font-size: 1.4rem;
}
.item-box {
display: flex;
border-bottom: 0.55px solid #eeeeee;
.left {
text-align: right;
width: 20%;
font-weight: bold;
font-size: 1.4rem;
margin: 11px 8px 11px 0;
}
.right {
width: 80%;
padding: 11px 8px 11px 16px;
.div-tag {
padding: 10px 0;
span {
display: inline-block;
margin-right: 10px;
white-space: initial;
border: 1px solid #eee;
padding: 2px 5px;
font-size: 1rem;
margin-bottom: 5px;
border-radius: 4px;
ion-icon {
margin-left: 3px;
color: #666666;
font-size: 1rem;
}
}
}
button {
margin: 0;
}
ion-textarea {
padding: 6px;
height: 100px;
border: 1px solid #ddd;
}
.tag {
border: 1px solid #ccc;
margin: 0 5px 10px 0;
display: inline-block;
padding: 4px 20px;
border-radius: 4px;
font-size: 1.2rem;
}
span.selectLead {
background-color: #fdf8f2;
border: 1px solid #e42417;
color: #e42417;
}
}
}
}
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ 678fca8b
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {ServeService} from "../../serve.service";
import {FilterComponent} from "../../../../components/filter/filter";
import {PersonMulComponent} from "../../../../components/person-mul/person-mul";
@Component({
selector: 'page-room-apply',
......@@ -10,13 +12,11 @@ export class RoomApplyPage {
obj = {
meetingType: '',
roomId: '',
roomName: '',
orgId: '',
orgName: '',
room: null,
org: null,
startTime: '',
endTime: '',
orgLeader: '',
orgLeader: [],
remark: '',
participant: '',
number: ''
......@@ -33,15 +33,18 @@ export class RoomApplyPage {
orgList = [];
leaderList = [];
personList = [];
roomMax = ''; //会议室最大人数
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService) {
private serveSer: ServeService, public modalCtrl: ModalController) {
}
ionViewDidLoad() {
this.getList();
}
//会议室列表，部领导列表，
//会议室列表，部领导列表，处室列表
getList() {
this.serveSer.getLeaders().subscribe(
(res) => {
......@@ -52,11 +55,60 @@ export class RoomApplyPage {
(res) => {
this.roomList = res.data;
}
);
const data = {order: 0};
this.serveSer.getAllOrganization(data).subscribe(
(res) => {
this.orgList = res;
}
)
}
submit() {
//选择部领导
chooseLeader(item, index) {
if (this.obj.orgLeader.indexOf(item.id) > -1) {
this.obj.orgLeader.splice(index, 1);
}else{
this.obj.orgLeader.push(item.id);
}
}
//选择人员
choose() {
let modal = this.modalCtrl.create(PersonMulComponent, {
enterAnimation: 'modal-scale-enter',
leaveAnimation: 'modal-scale-leave'
});
modal.onDidDismiss(data => {
if (data) {
this.personList = data;
}
});
modal.present();
}
//移除人员
removePerson(index) {
console.log(index);
this.personList.splice(index, 1);
}
submit() {
const data = {
meetingType: this.obj.meetingType,
roomId: this.obj.room.id,
orgId: this.obj.org.id,
orgName: this.obj.org.name,
startTime: new Date(this.obj.startTime).getTime(),
endTime: new Date(this.obj.endTime).getTime(),
orgLeader: this.obj.orgLeader.join(','),
remark: this.obj.remark,
participant: this.personList.map(e => {
return e.id
}).join(','),
number: this.obj.number,
};
console.log(data);
}
}
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