Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-convertor-view
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
station
amos-convertor-view
Commits
e4828903
Commit
e4828903
authored
Apr 27, 2020
by
xinglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除debugger
parent
f82468ac
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
21 additions
and
22 deletions
+21
-22
amos.config.js
amos.config.js
+5
-2
storageConsts.js
src/consts/storageConsts.js
+4
-0
urlConsts.js
src/consts/urlConsts.js
+4
-4
asyncView.js
src/routes/asyncView.js
+1
-1
view.js
src/routes/view.js
+1
-1
DifferentiateView.js
...iew/bizview/intelligentDifferentiate/DifferentiateView.js
+0
-1
PointSearch.js
src/view/bizview/point/PointSearch.js
+3
-5
PointStatistics.js
src/view/bizview/point/PointStatistics.js
+0
-1
NavList.js
src/view/common/header/NavList.js
+0
-1
MainFrameView.js
src/view/common/mainframe/MainFrameView.js
+1
-3
index.js
src/view/region/index.js
+2
-3
No files found.
amos.config.js
View file @
e4828903
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
Amos
.
config
=
{
Amos
.
config
=
{
// 普通http
// 普通http
httpURI
:
{
httpURI
:
{
// baseURI: 'http://172.16.3.41:8083/',
// baseURI: 'http://172.16.3.41:8083/',
baseURI
:
'http://172.16.3.41
:10005/'
,
baseURI
:
'http://172.16.11.36
:10005/'
,
//patrolURI: 'http://172.16.10.91:8082/',
//patrolURI: 'http://172.16.10.91:8082/',
// 安全模块api地址
// 安全模块api地址
securityBaseURI
:
'http://172.16.10.72:10005/'
,
securityBaseURI
:
'http://172.16.10.72:10005/'
,
...
@@ -128,4 +128,7 @@
...
@@ -128,4 +128,7 @@
window
.
useNative
=
true
;
window
.
useNative
=
true
;
window
.
BizPermissionType
=
25
;
//业务屏菜单权限类型
window
.
BizPermissionType
=
25
;
//业务屏菜单权限类型
window
.
V3DpermissionType
=
26
;
//3D屏菜单权限类型
window
.
V3DpermissionType
=
26
;
//3D屏菜单权限类型
window
.
appKey
=
'CONVERTER_STATION'
;
window
.
product
=
'CONVERTER_STATION_WEB'
;
window
.
dutyType
=
'normal'
;
//normal/bank
})();
})();
src/consts/storageConsts.js
View file @
e4828903
...
@@ -16,6 +16,10 @@ export const CONSTS = {
...
@@ -16,6 +16,10 @@ export const CONSTS = {
plan_detail
:
'plan_detail_onclick'
plan_detail
:
'plan_detail_onclick'
};
};
export
const
sessionConsts
=
{
systemMenu
:
'systemMenu'
};
const
getAll
=
function
(
consts
){
const
getAll
=
function
(
consts
){
return
Object
.
values
(
consts
)
||
[];
return
Object
.
values
(
consts
)
||
[];
};
};
...
...
src/consts/urlConsts.js
View file @
e4828903
...
@@ -33,17 +33,17 @@ export const secExtUrl = {
...
@@ -33,17 +33,17 @@ export const secExtUrl = {
opSearchMenusUrl
:
completePrefix
(
securityBaseURI
,
'permissionItem/searchPermission-tree?nodeName={nodeName}&type={type}'
),
opSearchMenusUrl
:
completePrefix
(
securityBaseURI
,
'permissionItem/searchPermission-tree?nodeName={nodeName}&type={type}'
),
// 根据父菜单 code 获取子菜单
// 根据父菜单 code 获取子菜单
opSearchBizMenusUrl
:
completePrefix
(
securityBaseURI
,
'permissionItem/searchSubmenuPermission/{code}'
),
opSearchBizMenusUrl
:
completePrefix
(
securityBaseURI
,
'permissionItem/searchSubmenuPermission/{code}'
),
menusRoutesUrl
:
completePrefix
(
b
aseURI
,
'privilege/v1/permission/tree/me?menuAgent=WEB&permissionType=MENU,SUBMENU&path='
),
menusRoutesUrl
:
completePrefix
(
securityB
aseURI
,
'privilege/v1/permission/tree/me?menuAgent=WEB&permissionType=MENU,SUBMENU&path='
),
// 获取厂区集合 get
// 获取厂区集合 get
regionListUrl
:
completePrefix
(
patrolURI
,
'api/group/queryAuthCompanyLeaves'
),
regionListUrl
:
completePrefix
(
patrolURI
,
'api/group/queryAuthCompanyLeaves'
),
//======================================新加
//======================================新加
// 获取当前系统所有菜单(新)
// 获取当前系统所有菜单(新)
systemMenusUrl
:
completePrefix
(
securityBaseURI
,
`privilege/
${
secExVerson
}
/permission/tree`
),
systemMenusUrl
:
completePrefix
(
securityBaseURI
,
`privilege/
${
secExVerson
}
/permission/tree`
),
// 获取当前登陆用户信息(新)
// 获取当前登陆用户信息(新)
currentUserUrl
:
completePrefix
(
securityBaseURI
,
`privilege/
${
secExVerson
}
/agencyuser/me`
),
currentUserUrl
:
completePrefix
(
securityBaseURI
,
`privilege/
${
secExVerson
}
/agencyuser/me`
),
// 登陆用户系统权限菜单-
// 登陆用户系统权限菜单-
permissionsMenusUrl
:
completePrefix
(
securityBaseURI
,
`privilege/
${
secExVerson
}
/permission/tree/role?roleSeq={roleSeq}`
),
permissionsMenusUrl
:
completePrefix
(
securityBaseURI
,
`privilege/
${
secExVerson
}
/permission/tree/role?roleSeq={roleSeq}`
),
loginOutUrl
:
completePrefix
(
baseURI
,
'privilege/v1/auth/token'
),
// 注销 delete
loginOutUrl
:
completePrefix
(
baseURI
,
'privilege/v1/auth/token'
),
// 注销 delete
...
...
src/routes/asyncView.js
View file @
e4828903
...
@@ -84,7 +84,7 @@ const Routes = {
...
@@ -84,7 +84,7 @@ const Routes = {
bizview
:
AsyncBusinessView
,
bizview
:
AsyncBusinessView
,
riskPoint
:
AsyncRiskPoint
,
riskPoint
:
AsyncRiskPoint
,
duty
info
:
AsyncDutyinfo
,
duty
Model
:
AsyncDutyinfo
,
fireequip
:
AsyncFireequip
,
fireequip
:
AsyncFireequip
,
personnel
:
AsyncPersonnel
,
personnel
:
AsyncPersonnel
,
patrolpoint
:
AsyncPatrol
,
patrolpoint
:
AsyncPatrol
,
...
...
src/routes/view.js
View file @
e4828903
...
@@ -70,7 +70,7 @@ const Routes = {
...
@@ -70,7 +70,7 @@ const Routes = {
'3dview'
:
PanoramicMonitor
,
'3dview'
:
PanoramicMonitor
,
bizview
:
BusinessView
,
bizview
:
BusinessView
,
riskpoint
:
RiskPoint
,
riskpoint
:
RiskPoint
,
duty
info
:
Dutyinfo
,
duty
Model
:
Dutyinfo
,
fireequip
:
Fireequip
,
fireequip
:
Fireequip
,
personnel
:
Personnel
,
personnel
:
Personnel
,
patrolpoint
:
Patrol
,
patrolpoint
:
Patrol
,
...
...
src/view/bizview/intelligentDifferentiate/DifferentiateView.js
View file @
e4828903
...
@@ -209,7 +209,6 @@ class DifferentiateView extends Component {
...
@@ -209,7 +209,6 @@ class DifferentiateView extends Component {
let
startTime
=
new
Date
(
searchParam
.
startTime
).
getTime
();
let
startTime
=
new
Date
(
searchParam
.
startTime
).
getTime
();
let
endTime
=
new
Date
(
searchParam
.
endTime
).
getTime
();
let
endTime
=
new
Date
(
searchParam
.
endTime
).
getTime
();
dataList
=
dataList
.
filter
(
item
=>
{
dataList
=
dataList
.
filter
(
item
=>
{
debugger
let
_time
=
new
Date
(
item
.
time
).
getTime
();
let
_time
=
new
Date
(
item
.
time
).
getTime
();
return
_time
>=
startTime
&&
_time
<=
endTime
;
return
_time
>=
startTime
&&
_time
<=
endTime
;
});
});
...
...
src/view/bizview/point/PointSearch.js
View file @
e4828903
...
@@ -78,28 +78,26 @@ class PointSearch extends Component {
...
@@ -78,28 +78,26 @@ class PointSearch extends Component {
}
}
onDeptChange
=
(
value
)
=>
{
onDeptChange
=
(
value
)
=>
{
debugger
if
(
value
===
undefined
){
if
(
value
===
undefined
){
let
{
searchParam
}
=
this
.
state
;
let
{
searchParam
}
=
this
.
state
;
delete
searchParam
[
'userId'
];
delete
searchParam
[
'userId'
];
this
.
setState
({
searchParam
,
userData
:
[]});
this
.
setState
({
searchParam
,
userData
:
[]});
Object
.
assign
(
searchParam
,{
pageNumber
:
0
,
pageSize
:
10
});
Object
.
assign
(
searchParam
,{
pageNumber
:
0
,
pageSize
:
10
});
this
.
setState
({
searchParam
});
this
.
setState
({
searchParam
});
searchParam
&&
this
.
props
.
setSearchParam
(
searchParam
);
searchParam
&&
this
.
props
.
setSearchParam
(
searchParam
);
}
else
{
}
else
{
this
.
queryUserByDept
(
value
);
this
.
queryUserByDept
(
value
);
}
}
}
}
queryUserByDept
=
deptId
=>
{
queryUserByDept
=
deptId
=>
{
queryUserByDeptIdAction
(
deptId
).
then
(
data
=>
{
queryUserByDeptIdAction
(
deptId
).
then
(
data
=>
{
debugger
let
userData
=
data
;
let
userData
=
data
;
this
.
setState
({
userData
:
userData
});
this
.
setState
({
userData
:
userData
});
});
});
...
...
src/view/bizview/point/PointStatistics.js
View file @
e4828903
...
@@ -52,7 +52,6 @@ class PointStatistics extends Component {
...
@@ -52,7 +52,6 @@ class PointStatistics extends Component {
getOptions
(
dataList
,
total
)
{
getOptions
(
dataList
,
total
)
{
// color: ['#FF0000', '#04cede', '#66cc00', '#ffcc00'],
// color: ['#FF0000', '#04cede', '#66cc00', '#ffcc00'],
let
{
colors
,
data
}
=
this
.
getColor
(
dataList
);
let
{
colors
,
data
}
=
this
.
getColor
(
dataList
);
debugger
;
return
{
return
{
color
:
colors
,
color
:
colors
,
series
:
[
series
:
[
...
...
src/view/common/header/NavList.js
View file @
e4828903
...
@@ -5,7 +5,6 @@ import { Nav, NavItem, IndexNavItem } from 'amos-framework';
...
@@ -5,7 +5,6 @@ import { Nav, NavItem, IndexNavItem } from 'amos-framework';
class
NavList
extends
Component
{
class
NavList
extends
Component
{
renderNavItem
=
()
=>
{
renderNavItem
=
()
=>
{
debugger
const
{
menus
=
[],
onMenuItemClick
}
=
this
.
props
;
const
{
menus
=
[],
onMenuItemClick
}
=
this
.
props
;
return
menus
.
map
((
es
,
index
)
=>
{
return
menus
.
map
((
es
,
index
)
=>
{
const
params
=
{
const
params
=
{
...
...
src/view/common/mainframe/MainFrameView.js
View file @
e4828903
...
@@ -82,7 +82,6 @@ class MainFrame extends Component {
...
@@ -82,7 +82,6 @@ class MainFrame extends Component {
}
}
onPermissionFetch
=
()
=>
{
onPermissionFetch
=
()
=>
{
debugger
const
{
onMenuLoadCompleted
}
=
this
.
props
;
const
{
onMenuLoadCompleted
}
=
this
.
props
;
let
role
=
lsTool
.
read
(
'selectedRole'
);
let
role
=
lsTool
.
read
(
'selectedRole'
);
getPermissionsMenus
(
role
).
then
((
menus
=
[])
=>
{
getPermissionsMenus
(
role
).
then
((
menus
=
[])
=>
{
...
@@ -90,7 +89,7 @@ class MainFrame extends Component {
...
@@ -90,7 +89,7 @@ class MainFrame extends Component {
isArray
(
menus
)
&&
menus
.
forEach
(
element
=>
{
isArray
(
menus
)
&&
menus
.
forEach
(
element
=>
{
if
(
element
.
permissionType
===
'MENU'
&&
element
.
path
===
'biz'
)
{
if
(
element
.
permissionType
===
'MENU'
&&
element
.
path
===
'biz'
)
{
userMenus
.
push
(
element
.
children
);
userMenus
.
push
(
element
.
children
);
}
}
// else if(element.permissionType === 'MENU' && element.path === 'main') {
// else if(element.permissionType === 'MENU' && element.path === 'main') {
// userMenus.push(element.children);
// userMenus.push(element.children);
// }
// }
...
@@ -121,7 +120,6 @@ class MainFrame extends Component {
...
@@ -121,7 +120,6 @@ class MainFrame extends Component {
}
}
filterMenusButton
=
(
menus
)
=>
{
filterMenusButton
=
(
menus
)
=>
{
debugger
return
menus
.
filter
(
return
menus
.
filter
(
menu
=>
{
menu
=>
{
if
(
menu
.
children
&&
menu
.
permissionType
===
'SUBMENU'
)
{
if
(
menu
.
children
&&
menu
.
permissionType
===
'SUBMENU'
)
{
...
...
src/view/region/index.js
View file @
e4828903
...
@@ -134,15 +134,14 @@ class RegionSelect extends Component {
...
@@ -134,15 +134,14 @@ class RegionSelect extends Component {
}
}
onClick
=
()
=>
{
onClick
=
()
=>
{
debugger
const
{
reginParams
}
=
this
.
state
;
const
{
reginParams
}
=
this
.
state
;
lsTool
.
remove
(
'selectedRole'
);
lsTool
.
remove
(
'selectedRole'
);
const
{
sequenceNbr
}
=
reginParams
.
role
||
{};
const
{
sequenceNbr
}
=
reginParams
.
role
||
{};
lsTool
.
write
(
'selectedRole'
,
sequenceNbr
);
lsTool
.
write
(
'selectedRole'
,
sequenceNbr
);
lsTool
.
write
(
'curCompanyName'
,
reginParams
.
company
.
companyName
);
lsTool
.
write
(
'curCompanyName'
,
reginParams
.
company
.
companyName
);
lsTool
.
write
(
'orgCode'
,
reginParams
.
department
.
orgCode
);
regionSelectAction
(
reginParams
).
then
(
regionSelectAction
(
reginParams
).
then
(
data
=>
{
data
=>
{
debugger
//1.打开3d屏
//1.打开3d屏
browserHistory
.
push
(
'/main/3dview'
);
browserHistory
.
push
(
'/main/3dview'
);
//2.通过配置,确定是否打开业务屏
//2.通过配置,确定是否打开业务屏
...
...
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