Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
regManage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqinghua
regManage
Commits
9cccddc7
Commit
9cccddc7
authored
Dec 05, 2019
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
de43a066
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
31 additions
and
24 deletions
+31
-24
config.xml
config.xml
+1
-1
network_security_config.xml
resources/android/xml/network_security_config.xml
+2
-2
app.constants.ts
src/app/app.constants.ts
+2
-2
auth.interceptor.ts
src/core/auth.interceptor.ts
+2
-2
my-supervise.html
src/pages/mine/my-supervise/my-supervise.html
+8
-2
my-supervise.ts
src/pages/mine/my-supervise/my-supervise.ts
+5
-2
my-verify.ts
src/pages/mine/my-verify/my-verify.ts
+5
-2
operation.html
src/pages/mine/operation/operation.html
+1
-9
operation.ts
src/pages/mine/operation/operation.ts
+5
-2
No files found.
config.xml
View file @
9cccddc7
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<preference
name=
"android-windowSoftInputMode"
value=
"adjustPan|stateHidden"
/>
<preference
name=
"android-windowSoftInputMode"
value=
"adjustPan|stateHidden"
/>
<platform
name=
"android"
>
<platform
name=
"android"
>
<edit-config
file=
"app/src/main/AndroidManifest.xml"
mode=
"merge"
target=
"/manifest/application"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<edit-config
file=
"app/src/main/AndroidManifest.xml"
mode=
"merge"
target=
"/manifest/application"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<application
android:networkSecurityConfig=
"@xml/network_security_config"
android:usesCleartextTraffic=
"true"
/>
<application
android:networkSecurityConfig=
"@xml/network_security_config"
android:usesCleartextTraffic=
"true"
/>
</edit-config>
</edit-config>
<resource-file
src=
"resources/android/xml/network_security_config.xml"
target=
"app/src/main/res/xml/network_security_config.xml"
/>
<resource-file
src=
"resources/android/xml/network_security_config.xml"
target=
"app/src/main/res/xml/network_security_config.xml"
/>
<allow-intent
href=
"market:*"
/>
<allow-intent
href=
"market:*"
/>
...
...
resources/android/xml/network_security_config.xml
View file @
9cccddc7
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<domain-config
cleartextTrafficPermitted=
"true"
>
<domain
includeSubdomains=
"true"
>
localhost
</domain>
</domain-config>
</network-security-config>
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config
cleartextTrafficPermitted=
"true"
/>
</network-security-config>
\ No newline at end of file
\ No newline at end of file
...
...
src/app/app.constants.ts
View file @
9cccddc7
import
*
as
Mock
from
'mockjs'
;
export
const
SERVER_API_URL
=
'/shfrdj'
;
Mock
.
setup
(
{
timeout
:
50
,
}
);
export
const
institutionalNature
=
[
{
label
:
'挂牌机构'
,
value
:
'8'
},
{
label
:
'内设机构'
,
value
:
'7'
},
{
label
:
'派驻机关'
,
value
:
'6'
},
{
label
:
'派出机构'
,
value
:
'5'
},
{
label
:
'分支机构'
,
value
:
'4'
},
{
label
:
'临时机构'
,
value
:
'3'
},
{
label
:
'议事协调机构'
,
value
:
'2'
},
{
label
:
'挂靠机构'
,
value
:
'1'
},
]
import
*
as
Mock
from
'mockjs'
;
// export const SERVER_API_URL = '/shfrdj'; export const SERVER_API_URL = 'http://61.152.117.206/shfrdj'; Mock.setup( { timeout:50, } ); export const institutionalNature = [ {label:'挂牌机构',value:'8'}, {label:'内设机构',value:'7'}, {label:'派驻机关',value:'6'}, {label:'派出机构',value:'5'}, {label:'分支机构',value:'4'}, {label:'临时机构',value:'3'}, {label:'议事协调机构',value:'2'}, {label:'挂靠机构',value:'1'}, ]
\ No newline at end of file
\ No newline at end of file
...
...
src/core/auth.interceptor.ts
View file @
9cccddc7
import
{
AlertController
,
App
,
Events
}
from
'ionic-angular'
;
import
{
HttpEvent
,
HttpHandler
,
HttpInterceptor
,
HttpRequest
,
HttpResponse
}
from
'@angular/common/http'
;
import
{
Injectable
}
from
'@angular/core'
;
import
{
Storage
}
from
'@ionic/storage'
;
import
{
Observable
}
from
'rxjs'
;
import
{
_throw
}
from
'rxjs/observable/throw'
;
import
{
CommonService
}
from
"./common.service"
;
import
{
GlobalData
}
from
"./GlobleData"
;
/** * http拦截器 增加token信息 */
@
Injectable
()
export
class
InterceptorProvider
implements
HttpInterceptor
{
constructor
(
private
storage
:
Storage
,
private
alertCtrl
:
AlertController
,
private
events
:
Events
,
private
commonSer
:
CommonService
,
private
app
:
App
,
private
globle
:
GlobalData
)
{
}
// Intercepts all HTTP requests! intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { const data = this.storage.get(''); return Observable.fromPromise(data) .mergeMap(data => { let clonedReq = this.addToken(request, data); return next.handle(clonedReq).do(res => { if (res instanceof HttpResponse) { this.message(res.body); } }, (error) => { let msg = error.message; this.message(error); // Pass the error to the caller of the function return _throw(error); }, () => { }) }); } // Adds the token to your headers if it exists private addToken(request: HttpRequest<any>, token: any) { let body; if (request.method == "POST") { body = Object.assign(request.body, {}); if (this.globle.token) { body = Object.assign(body, {"token": this.globle.token}); } if (this.globle.userObj && this.globle.userObj.userid) { body = Object.assign(body, {"userid": this.globle.userObj.userid}); } } if (token) { let clone: HttpRequest<any>; if (request.method == "POST") { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, body: body }); } else { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, }); } return clone; } return request; } message(data) { if (data.code) { let code = data.code; if (code == "401") { this.commonSer.toast("登录已过期"); this.storage.clear(); this.events.publish('toLogin'); } else if (code == "-1") { let alert = this.alertCtrl.create({ title: "错误", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } if (code == 500) { let alert = this.alertCtrl.create({ title: "错误", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } } } }
import
{
AlertController
,
App
,
Events
}
from
'ionic-angular'
;
import
{
HttpEvent
,
HttpHandler
,
HttpInterceptor
,
HttpRequest
,
HttpResponse
}
from
'@angular/common/http'
;
import
{
Injectable
}
from
'@angular/core'
;
import
{
Storage
}
from
'@ionic/storage'
;
import
{
Observable
}
from
'rxjs'
;
import
{
_throw
}
from
'rxjs/observable/throw'
;
import
{
CommonService
}
from
"./common.service"
;
import
{
GlobalData
}
from
"./GlobleData"
;
/** * http拦截器 增加token信息 */
@
Injectable
()
export
class
InterceptorProvider
implements
HttpInterceptor
{
constructor
(
private
storage
:
Storage
,
private
alertCtrl
:
AlertController
,
private
events
:
Events
,
private
commonSer
:
CommonService
,
private
app
:
App
,
private
globle
:
GlobalData
)
{
}
// Intercepts all HTTP requests! intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { const data = this.storage.get(''); return Observable.fromPromise(data) .mergeMap(data => { let clonedReq = this.addToken(request, data); return next.handle(clonedReq).do(res => { if (res instanceof HttpResponse) { this.message(res.body); } }, (error) => { let msg = error.message; this.errorMessage(error); // Pass the error to the caller of the function return _throw(error); }, () => { }) }); } // Adds the token to your headers if it exists private addToken(request: HttpRequest<any>, token: any) { let body; if (request.method == "POST") { body = Object.assign(request.body, {}); if (this.globle.token) { body = Object.assign(body, {"token": this.globle.token}); } if (this.globle.userObj && this.globle.userObj.userid) { body = Object.assign(body, {"userid": this.globle.userObj.userid}); } } if (token) { let clone: HttpRequest<any>; if (request.method == "POST") { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, body: body }); } else { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, }); } return clone; } return request; } //code message message(data) { if (data.code) { let code = data.code; if (code == "401") { this.commonSer.toast("登录已过期"); this.storage.clear(); this.events.publish('toLogin'); } else if (code == "-1") { let alert = this.alertCtrl.create({ title: "错误", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } if (code == 500) { let alert = this.alertCtrl.create({ title: "错误", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } } } //error message errorMessage(data) { if (data.status) { let code = data.status; if (code != 200) { const error = JSON.parse(data.error); let alert = this.alertCtrl.create({ title: "错误", message: `${data.error.errorMsg},错误码:${code}。`, buttons: ['确定'] }); alert.present(); } } } }
\ No newline at end of file
\ No newline at end of file
...
...
src/pages/mine/my-supervise/my-supervise.html
View file @
9cccddc7
...
@@ -9,12 +9,18 @@
...
@@ -9,12 +9,18 @@
<div
class=
"item"
*
ngFor=
"let item of dbList"
>
<div
class=
"item"
*
ngFor=
"let item of dbList"
>
<p>
<p>
<span
class=
"left"
>
操作:
</span>
<span
class=
"left"
>
操作:
</span>
<span
class=
"right"
>
{{item.title}}
</span>
<span
class=
"right"
>
<ng-container
*
ngIf=
"item.status == '1'"
>
受理
</ng-container>
<ng-container
*
ngIf=
"item.status == '2'"
>
审核
</ng-container>
<ng-container
*
ngIf=
"item.status == '3'"
>
审批
</ng-container>
<ng-container
*
ngIf=
"item.status == '4'"
>
办证
</ng-container>
<ng-container
*
ngIf=
"item.status == '5'"
>
发证
</ng-container>
</span>
<span
float-end
>
{{item.time}}
</span>
<span
float-end
>
{{item.time}}
</span>
</p>
</p>
<p>
<p>
<span
class=
"left"
>
事项:
</span>
<span
class=
"left"
>
事项:
</span>
<span
class=
"right"
>
{{item.
unitMc
}}
</span>
<span
class=
"right"
>
{{item.
title
}}
</span>
</p>
</p>
<p>
<p>
<span
class=
"left"
>
意见:
</span>
<span
class=
"left"
>
意见:
</span>
...
...
src/pages/mine/my-supervise/my-supervise.ts
View file @
9cccddc7
import
{
Component
}
from
'@angular/core'
;
import
{
Component
}
from
'@angular/core'
;
import
{
IonicPage
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
{
IonicPage
,
LoadingController
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
{
MineService
}
from
"../mine.service"
;
import
{
MineService
}
from
"../mine.service"
;
@
Component
({
@
Component
({
...
@@ -10,7 +10,7 @@ export class MySupervisePage {
...
@@ -10,7 +10,7 @@ export class MySupervisePage {
dbList
=
[];
dbList
=
[];
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
private
mine
:
MineService
)
{
private
mine
:
MineService
,
private
loadCtrl
:
LoadingController
)
{
}
}
ionViewDidLoad
()
{
ionViewDidLoad
()
{
...
@@ -18,6 +18,8 @@ export class MySupervisePage {
...
@@ -18,6 +18,8 @@ export class MySupervisePage {
}
}
getList
()
{
getList
()
{
const
load
=
this
.
loadCtrl
.
create
();
load
.
present
();
const
data
=
{
const
data
=
{
page
:
1
,
page
:
1
,
limit
:
"1000"
,
limit
:
"1000"
,
...
@@ -25,6 +27,7 @@ export class MySupervisePage {
...
@@ -25,6 +27,7 @@ export class MySupervisePage {
};
};
this
.
mine
.
dblog
(
data
).
subscribe
(
this
.
mine
.
dblog
(
data
).
subscribe
(
(
res
)
=>
{
(
res
)
=>
{
load
.
dismiss
();
if
(
res
.
code
==
"0"
){
if
(
res
.
code
==
"0"
){
this
.
dbList
=
res
.
page
.
list
.
log
;
this
.
dbList
=
res
.
page
.
list
.
log
;
}
}
...
...
src/pages/mine/my-verify/my-verify.ts
View file @
9cccddc7
import
{
Component
}
from
'@angular/core'
;
import
{
Component
}
from
'@angular/core'
;
import
{
IonicPage
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
{
IonicPage
,
LoadingController
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
{
MineService
}
from
"../mine.service"
;
import
{
MineService
}
from
"../mine.service"
;
...
@@ -11,7 +11,7 @@ export class MyVerifyPage {
...
@@ -11,7 +11,7 @@ export class MyVerifyPage {
dbList
=
[];
dbList
=
[];
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
private
mine
:
MineService
)
{
private
mine
:
MineService
,
private
loadCtrl
:
LoadingController
)
{
}
}
ionViewDidLoad
()
{
ionViewDidLoad
()
{
...
@@ -19,6 +19,8 @@ export class MyVerifyPage {
...
@@ -19,6 +19,8 @@ export class MyVerifyPage {
}
}
getList
()
{
getList
()
{
const
load
=
this
.
loadCtrl
.
create
();
load
.
present
();
const
data
=
{
const
data
=
{
page
:
2
,
page
:
2
,
limit
:
"1000"
,
limit
:
"1000"
,
...
@@ -26,6 +28,7 @@ export class MyVerifyPage {
...
@@ -26,6 +28,7 @@ export class MyVerifyPage {
};
};
this
.
mine
.
dblog
(
data
).
subscribe
(
this
.
mine
.
dblog
(
data
).
subscribe
(
(
res
)
=>
{
(
res
)
=>
{
load
.
dismiss
();
if
(
res
.
code
==
"0"
){
if
(
res
.
code
==
"0"
){
this
.
dbList
=
res
.
page
.
list
.
log
;
this
.
dbList
=
res
.
page
.
list
.
log
;
}
}
...
...
src/pages/mine/operation/operation.html
View file @
9cccddc7
...
@@ -9,16 +9,8 @@
...
@@ -9,16 +9,8 @@
<div
class=
"item"
*
ngFor=
"let item of dbList"
>
<div
class=
"item"
*
ngFor=
"let item of dbList"
>
<p>
<p>
<span
class=
"left"
>
操作:
</span>
<span
class=
"left"
>
操作:
</span>
<span
class=
"right"
>
{{item.title}}
</span>
<span
float-end
>
{{item.time}}
</span>
</p>
<p>
<span
class=
"left"
>
事项:
</span>
<span
class=
"right"
>
{{item.unitMc}}
</span>
</p>
<p>
<span
class=
"left"
>
意见:
</span>
<span
class=
"right"
>
{{item.content}}
</span>
<span
class=
"right"
>
{{item.content}}
</span>
<span
float-end
>
{{item.time}}
</span>
</p>
</p>
</div>
</div>
</div>
</div>
...
...
src/pages/mine/operation/operation.ts
View file @
9cccddc7
import
{
Component
}
from
'@angular/core'
;
import
{
Component
}
from
'@angular/core'
;
import
{
IonicPage
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
{
IonicPage
,
LoadingController
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
*
as
Mock
from
"mockjs"
;
import
*
as
Mock
from
"mockjs"
;
import
{
MineService
}
from
"../mine.service"
;
import
{
MineService
}
from
"../mine.service"
;
...
@@ -12,7 +12,7 @@ export class OperationPage {
...
@@ -12,7 +12,7 @@ export class OperationPage {
dbList
=
[];
dbList
=
[];
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
private
mine
:
MineService
)
{
private
mine
:
MineService
,
private
loadCtrl
:
LoadingController
)
{
}
}
ionViewDidLoad
()
{
ionViewDidLoad
()
{
...
@@ -20,6 +20,8 @@ export class OperationPage {
...
@@ -20,6 +20,8 @@ export class OperationPage {
}
}
getList
()
{
getList
()
{
const
load
=
this
.
loadCtrl
.
create
();
load
.
present
();
const
data
=
{
const
data
=
{
page
:
1
,
page
:
1
,
limit
:
"1000"
,
limit
:
"1000"
,
...
@@ -27,6 +29,7 @@ export class OperationPage {
...
@@ -27,6 +29,7 @@ export class OperationPage {
};
};
this
.
mine
.
dblog
(
data
).
subscribe
(
this
.
mine
.
dblog
(
data
).
subscribe
(
(
res
)
=>
{
(
res
)
=>
{
load
.
dismiss
();
if
(
res
.
code
==
"0"
)
{
if
(
res
.
code
==
"0"
)
{
this
.
dbList
=
res
.
page
.
list
.
log
;
this
.
dbList
=
res
.
page
.
list
.
log
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment