Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
ReactWeb5
CivManage
Commits
3f732e45
Commit
3f732e45
authored
Jan 22, 2024
by
田翔
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 去除打印
parent
6c094dbc
Pipeline
#84505
waiting for manual action with stages
Changes
19
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
31 additions
and
105 deletions
+31
-105
index.jsx
src/components/BaseTable/SearchBar/index.jsx
+0
-2
RightContent.jsx
src/components/GlobalHeader/RightContent.jsx
+0
-4
index.jsx
src/components/MapScope/index.jsx
+10
-18
context.jsx
src/components/Upload/context.jsx
+0
-1
changeAdd.jsx
src/pages/bsmanager/base/standingBook/changeAdd.jsx
+0
-1
standingBook.jsx
src/pages/bsmanager/base/standingBook/standingBook.jsx
+0
-4
fieldEditor.jsx
...s/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
+0
-0
filedConfig.jsx
...s/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx
+2
-4
AddFlowsModal.jsx
src/pages/bsmanager/workOrder/incident/AddFlowsModal.jsx
+1
-12
AddModal.jsx
src/pages/bsmanager/workOrder/incident/AddModal.jsx
+12
-16
ChangeAddFlows.jsx
src/pages/bsmanager/workOrder/incident/ChangeAddFlows.jsx
+1
-2
incident.jsx
src/pages/bsmanager/workOrder/incident/incident.jsx
+0
-26
DatabaseInitialization.jsx
...atabase/databaseInitialization/DatabaseInitialization.jsx
+0
-1
EditTemplate.jsx
...enter/baseFrameContainer/drawBoardManage/EditTemplate.jsx
+5
-7
AddProjectModal.jsx
...ormCenter/gis/schemeConfig/TileConfig/AddProjectModal.jsx
+0
-1
IotConfig.jsx
src/pages/platformCenter/hostmanager/IotConfig/IotConfig.jsx
+0
-1
AddModal.jsx
src/pages/platformCenter/hostmanager/gateWay/AddModal.jsx
+0
-1
Integrate.jsx
src/pages/platformCenter/integratedLogin/Integrate.jsx
+0
-3
authority.js
src/utils/authority.js
+0
-1
No files found.
src/components/BaseTable/SearchBar/index.jsx
View file @
3f732e45
...
@@ -5,11 +5,9 @@ const SearchBar = props => {
...
@@ -5,11 +5,9 @@ const SearchBar = props => {
const
{
items
,
buttons
,
onCommit
,
formProps
}
=
props
;
const
{
items
,
buttons
,
onCommit
,
formProps
}
=
props
;
const
[
form
,
setForm
]
=
useState
(
null
);
const
[
form
,
setForm
]
=
useState
(
null
);
const
getForm
=
f
=>
{
const
getForm
=
f
=>
{
console
.
log
(
f
);
setForm
(
f
);
setForm
(
f
);
};
};
const
handleFinish
=
values
=>
{
const
handleFinish
=
values
=>
{
console
.
log
(
values
,
'value'
);
onCommit
(
values
);
onCommit
(
values
);
};
};
useEffect
(()
=>
{
useEffect
(()
=>
{
...
...
src/components/GlobalHeader/RightContent.jsx
View file @
3f732e45
...
@@ -48,12 +48,8 @@ const GlobalHeaderRight = props => {
...
@@ -48,12 +48,8 @@ const GlobalHeaderRight = props => {
let
className
=
styles
.
right
;
let
className
=
styles
.
right
;
const
value
=
useContext
(
RouteContext
);
const
value
=
useContext
(
RouteContext
);
useEffect
(()
=>
{
useEffect
(()
=>
{
// console.log(pathname, props.routes, props.history, 'location');
// console.log(flattenRoutes(props.routes), 'flate');
let
list
=
getBreadcrumbs
();
let
list
=
getBreadcrumbs
();
// console.log(list, 'list');
setBreadCrumbsRoutes
(
list
);
setBreadCrumbsRoutes
(
list
);
// console.log(value.breadcrumb.routes, 'value');
setDosRouter
(
pathname
);
setDosRouter
(
pathname
);
},
[
pathname
]);
},
[
pathname
]);
...
...
src/components/MapScope/index.jsx
View file @
3f732e45
...
@@ -19,15 +19,11 @@ const MapScope = props => {
...
@@ -19,15 +19,11 @@ const MapScope = props => {
const
mapID
=
useRef
();
const
mapID
=
useRef
();
const
mouseToolID
=
useRef
();
const
mouseToolID
=
useRef
();
useEffect
(()
=>
{
useEffect
(()
=>
{
console
.
log
(
document
.
getElementById
(
mapId
),
'进入组件'
);
setAreaName
([]);
setAreaName
([]);
if
(
document
.
getElementById
(
mapId
))
{
if
(
document
.
getElementById
(
mapId
))
{
console
.
log
(
mapID
,
'底图参数'
);
if
(
!
mapID
.
current
)
{
if
(
!
mapID
.
current
)
{
// 1.加载底图
// 1.加载底图
console
.
log
(
mapId
,
'底图33333'
);
let
m
=
new
window
.
AMap
.
Map
(
mapId
);
let
m
=
new
window
.
AMap
.
Map
(
mapId
);
console
.
log
(
m
,
'底图'
);
mapID
.
current
=
m
;
mapID
.
current
=
m
;
// 2.加载管网配置
// 2.加载管网配置
if
(
!
extent
)
{
if
(
!
extent
)
{
...
@@ -61,9 +57,8 @@ const MapScope = props => {
...
@@ -61,9 +57,8 @@ const MapScope = props => {
console
.
log
(
'params'
,
params
);
console
.
log
(
'params'
,
params
);
const
wmsOption
=
{
const
wmsOption
=
{
tileSize
:
512
,
tileSize
:
512
,
url
:
`
${
location
.
origin
}
/Cityinterface/rest/services/MapServer.svc/
${
url
:
`
${
location
.
origin
}
/Cityinterface/rest/services/MapServer.svc/
${
pipenetCofig
.
servicename
pipenetCofig
.
servicename
}
/GeoServerProxy/wms`
,
}
/GeoServerProxy/wms`
,
blend
:
false
,
blend
:
false
,
params
:
params
,
params
:
params
,
zooms
:
[
2
,
20
],
zooms
:
[
2
,
20
],
...
@@ -87,7 +82,7 @@ const MapScope = props => {
...
@@ -87,7 +82,7 @@ const MapScope = props => {
console
.
log
(
extent
,
'extent'
);
console
.
log
(
extent
,
'extent'
);
extent
&&
mapID
.
current
.
setCenter
(
exetent2AmapPoint
(
extent
));
extent
&&
mapID
.
current
.
setCenter
(
exetent2AmapPoint
(
extent
));
// distinct && onCascderChange([distinct]);
// distinct && onCascderChange([distinct]);
window
.
AMap
.
plugin
(
'AMap.DistrictSearch'
,
function
()
{
window
.
AMap
.
plugin
(
'AMap.DistrictSearch'
,
function
()
{
let
districtSearch
=
new
AMap
.
DistrictSearch
({
let
districtSearch
=
new
AMap
.
DistrictSearch
({
// 关键字对应的行政区级别,country表示国家
// 关键字对应的行政区级别,country表示国家
level
:
'country'
,
level
:
'country'
,
...
@@ -96,27 +91,24 @@ const MapScope = props => {
...
@@ -96,27 +91,24 @@ const MapScope = props => {
});
});
// 搜索所有省/直辖市信息
// 搜索所有省/直辖市信息
districtSearch
.
search
(
'中国'
,
function
(
status
,
result
)
{
districtSearch
.
search
(
'中国'
,
function
(
status
,
result
)
{
// 查询成功时,result即为对应的行政区信息
// 查询成功时,result即为对应的行政区信息
console
.
log
(
result
,
'行政区划信息'
);
setOptions
(
result
.
districtList
[
0
].
districtList
);
setOptions
(
result
.
districtList
[
0
].
districtList
);
});
});
});
});
}
}
},
[
props
]);
},
[
props
]);
const
resetmap
=
()
=>
{};
const
resetmap
=
()
=>
{
};
const
getInitConfig
=
()
=>
{};
const
getInitConfig
=
()
=>
{
};
const
onSubmit
=
()
=>
{
const
onSubmit
=
()
=>
{
console
.
log
(
currentExtent
);
console
.
log
(
currentAreaName
);
confirmModal
&&
confirmModal
(
currentExtent
,
currentAreaName
,
flag
);
confirmModal
&&
confirmModal
(
currentExtent
,
currentAreaName
,
flag
);
let
mouseTool
=
mouseToolID
.
current
;
let
mouseTool
=
mouseToolID
.
current
;
mouseTool
.
close
(
true
);
mouseTool
.
close
(
true
);
let
map
=
mapID
.
current
;
let
map
=
mapID
.
current
;
map
.
clearMap
();
map
.
clearMap
();
};
};
const
handleSearch
=
()
=>
{};
const
handleSearch
=
()
=>
{
};
const
onTangleClick
=
()
=>
{
const
onTangleClick
=
()
=>
{
// if(!mouseTool){
// if(!mouseTool){
// let tool = new AMap.MouseTool(map)
// let tool = new AMap.MouseTool(map)
...
@@ -131,7 +123,7 @@ const MapScope = props => {
...
@@ -131,7 +123,7 @@ const MapScope = props => {
// 同Polygon的Option设置
// 同Polygon的Option设置
});
});
console
.
log
(
mouseTool
,
'进入选择范围'
);
console
.
log
(
mouseTool
,
'进入选择范围'
);
mouseTool
.
on
(
'draw'
,
function
(
event
)
{
mouseTool
.
on
(
'draw'
,
function
(
event
)
{
mouseTool
.
close
(
false
);
mouseTool
.
close
(
false
);
// console.log(event.obj.getBounds(),"矩形对象")
// console.log(event.obj.getBounds(),"矩形对象")
let
bounds
=
event
.
obj
.
getBounds
();
let
bounds
=
event
.
obj
.
getBounds
();
...
@@ -153,7 +145,7 @@ const MapScope = props => {
...
@@ -153,7 +145,7 @@ const MapScope = props => {
'3'
:
'district'
,
'3'
:
'district'
,
};
};
let
level
=
dic
[
value
.
length
.
toString
];
let
level
=
dic
[
value
.
length
.
toString
];
AMap
.
plugin
(
'AMap.DistrictSearch'
,
function
()
{
AMap
.
plugin
(
'AMap.DistrictSearch'
,
function
()
{
// 创建行政区查询对象
// 创建行政区查询对象
let
district
=
new
AMap
.
DistrictSearch
({
let
district
=
new
AMap
.
DistrictSearch
({
// 返回行政区边界坐标等具体信息
// 返回行政区边界坐标等具体信息
...
@@ -162,7 +154,7 @@ const MapScope = props => {
...
@@ -162,7 +154,7 @@ const MapScope = props => {
level
:
level
,
level
:
level
,
});
});
district
.
search
(
`
${
value
[
value
.
length
-
1
]}
`
,
function
(
status
,
result
)
{
district
.
search
(
`
${
value
[
value
.
length
-
1
]}
`
,
function
(
status
,
result
)
{
// 获取朝阳区的边界信息
// 获取朝阳区的边界信息
let
bounds
=
result
.
districtList
[
0
].
boundaries
;
let
bounds
=
result
.
districtList
[
0
].
boundaries
;
...
...
src/components/Upload/context.jsx
View file @
3f732e45
...
@@ -27,7 +27,6 @@ const PictureWallProvider = props => {
...
@@ -27,7 +27,6 @@ const PictureWallProvider = props => {
}
}
});
});
setImgBed
(
arr
);
setImgBed
(
arr
);
console
.
log
(
data
,
arr
,
'666666666666666666666'
);
}
}
})
})
.
catch
(
err
=>
{
.
catch
(
err
=>
{
...
...
src/pages/bsmanager/base/standingBook/changeAdd.jsx
View file @
3f732e45
...
@@ -168,7 +168,6 @@ const AddModal = props => {
...
@@ -168,7 +168,6 @@ const AddModal = props => {
},
[
visible
]);
},
[
visible
]);
const
dragCallBack
=
arr
=>
{
const
dragCallBack
=
arr
=>
{
console
.
log
(
arr
);
if
(
arr
&&
!
isFirst
)
{
if
(
arr
&&
!
isFirst
)
{
setSelectData
(
arr
);
setSelectData
(
arr
);
}
}
...
...
src/pages/bsmanager/base/standingBook/standingBook.jsx
View file @
3f732e45
...
@@ -254,7 +254,6 @@ const StandingBook = props => {
...
@@ -254,7 +254,6 @@ const StandingBook = props => {
newArr
.
push
(
item
);
newArr
.
push
(
item
);
dataList
.
push
(
item
);
dataList
.
push
(
item
);
});
});
console
.
log
(
arr
);
arr
.
全部
=
res
.
data
.
root
;
arr
.
全部
=
res
.
data
.
root
;
setAllData
(
arr
);
setAllData
(
arr
);
setShowSearchStyle
(
false
);
setShowSearchStyle
(
false
);
...
@@ -274,7 +273,6 @@ const StandingBook = props => {
...
@@ -274,7 +273,6 @@ const StandingBook = props => {
});
});
},
[
flag
]);
},
[
flag
]);
const
formateArrDataA
=
(
initialArr
,
name
)
=>
{
const
formateArrDataA
=
(
initialArr
,
name
)
=>
{
console
.
log
(
initialArr
);
console
.
log
(
name
);
console
.
log
(
name
);
// 判定传参是否符合规则
// 判定传参是否符合规则
if
(
!
(
initialArr
instanceof
Array
))
{
if
(
!
(
initialArr
instanceof
Array
))
{
...
@@ -357,11 +355,9 @@ const StandingBook = props => {
...
@@ -357,11 +355,9 @@ const StandingBook = props => {
});
});
}
}
}
}
console
.
log
(
aa
);
// const maxOrder = aa.reduce((pre, cur) => (pre.order > cur.order ? pre.order : cur.order));
// const maxOrder = aa.reduce((pre, cur) => (pre.order > cur.order ? pre.order : cur.order));
// setMaxLength(maxOrder + 1);
// setMaxLength(maxOrder + 1);
let
arr
=
formateArrDataA
(
aa
,
'type'
);
let
arr
=
formateArrDataA
(
aa
,
'type'
);
console
.
log
(
arr
);
setShowSearchStyle
(
true
);
setShowSearchStyle
(
true
);
// setAllData(arr);
// setAllData(arr);
setSearchData
(
arr
);
setSearchData
(
arr
);
...
...
src/pages/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
View file @
3f732e45
This diff is collapsed.
Click to expand it.
src/pages/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx
View file @
3f732e45
...
@@ -35,7 +35,7 @@ import {
...
@@ -35,7 +35,7 @@ import {
loadUnattachedTables
,
loadUnattachedTables
,
LoadLedgers
,
LoadLedgers
,
}
from
'@/services/tablemanager/tablemanager'
;
}
from
'@/services/tablemanager/tablemanager'
;
import
{
FormDesigner
}
from
'panda-xform'
;
//
import { FormDesigner } from 'panda-xform';
import
{
useHistory
}
from
'react-router-dom'
;
import
{
useHistory
}
from
'react-router-dom'
;
import
FieldEditor
from
'./fieldEditor'
;
import
FieldEditor
from
'./fieldEditor'
;
import
AffiliateAdd
from
'../components/Field/affiliateAdd'
;
import
AffiliateAdd
from
'../components/Field/affiliateAdd'
;
...
@@ -184,8 +184,6 @@ const AddModal = props => {
...
@@ -184,8 +184,6 @@ const AddModal = props => {
relationForm
:
{},
relationForm
:
{},
};
};
setTablesSchema
(
tablesSchema
);
setTablesSchema
(
tablesSchema
);
console
.
log
(
arr
);
console
.
log
(
newArr
);
console
.
log
(
newArr
);
setKeepTreeFirst
(
bb
);
setKeepTreeFirst
(
bb
);
setTreeData
(
aa
);
setTreeData
(
aa
);
...
@@ -556,7 +554,7 @@ const AddModal = props => {
...
@@ -556,7 +554,7 @@ const AddModal = props => {
{
/* <Spin tip="loading..." spinning={treeLoading}> */
}
{
/* <Spin tip="loading..." spinning={treeLoading}> */
}
<
div
className=
{
styles
.
containerBox
}
>
<
div
className=
{
styles
.
containerBox
}
>
<
div
style=
{
{
width
:
'100%'
,
height
:
'calc(100% - 63px)'
,
padding
:
'10px'
}
}
>
<
div
style=
{
{
width
:
'100%'
,
height
:
'calc(100% - 63px)'
,
padding
:
'10px'
}
}
>
{
formObj
&&
<
FormDesigner
ref=
{
formRef
}
tableName=
{
formObj
}
/>
}
{
/* {formObj && <FormDesigner ref={formRef} tableName={formObj} />} */
}
</
div
>
</
div
>
</
div
>
</
div
>
{
/* </Spin> */
}
{
/* </Spin> */
}
...
...
src/pages/bsmanager/workOrder/incident/AddFlowsModal.jsx
View file @
3f732e45
...
@@ -37,7 +37,7 @@ const { Option } = Select;
...
@@ -37,7 +37,7 @@ const { Option } = Select;
const
{
TextArea
}
=
Input
;
const
{
TextArea
}
=
Input
;
const
AddFlowsModal
=
props
=>
{
const
AddFlowsModal
=
props
=>
{
const
{
const
{
callBackSubmit
=
()
=>
{},
callBackSubmit
=
()
=>
{
},
type
,
type
,
visible
,
visible
,
onClose
,
onClose
,
...
@@ -148,22 +148,15 @@ const AddFlowsModal = props => {
...
@@ -148,22 +148,15 @@ const AddFlowsModal = props => {
let a2;
let a2;
let a3 = [];
let a3 = [];
initialArr.data.map(i => {
initialArr.data.map(i => {
// console.log(i.groupType)
a2 = i.groupType;
a2 = i.groupType;
// console.log(a2)
// console.log(i.root)
a1 = i.root;
a1 = i.root;
a1.map(j => {
a1.map(j => {
j.group = a2;
j.group = a2;
// console.log(j)
});
});
aa.push(i.root);
aa.push(i.root);
});
});
// console.log(aa)
aa.map(p => {
aa.map(p => {
// console.log(p)
p.map(o => {
p.map(o => {
// console.log(o)
a3.push(o);
a3.push(o);
});
});
});
});
...
@@ -210,9 +203,6 @@ const AddFlowsModal = props => {
...
@@ -210,9 +203,6 @@ const AddFlowsModal = props => {
callBackSubmit();
callBackSubmit();
// setLoading(true);
// setLoading(true);
let aa = form.getFieldsValue().FlowName;
let aa = form.getFieldsValue().FlowName;
console.log(aa);
console.log(inputValue);
console.log(strr);
if (type == '
add
') {
if (type == '
add
') {
let index = aa.lastIndexOf('
\\
');
let index = aa.lastIndexOf('
\\
');
aa = aa.substring(index + 1, aa.length);
aa = aa.substring(index + 1, aa.length);
...
@@ -340,7 +330,6 @@ const AddFlowsModal = props => {
...
@@ -340,7 +330,6 @@ const AddFlowsModal = props => {
const groupArr = (initialArr, name) => {
const groupArr = (initialArr, name) => {
let list = {};
let list = {};
console.log(initialArr);
initialArr.data.map(i => {
initialArr.data.map(i => {
console.log(i);
console.log(i);
let ar = [];
let ar = [];
...
...
src/pages/bsmanager/workOrder/incident/AddModal.jsx
View file @
3f732e45
...
@@ -71,7 +71,7 @@ import eventChooseImg from '@/assets/images/workOptions/事件选中.png';
...
@@ -71,7 +71,7 @@ import eventChooseImg from '@/assets/images/workOptions/事件选中.png';
const
{
Option
}
=
Select
;
const
{
Option
}
=
Select
;
const
AddModal
=
props
=>
{
const
AddModal
=
props
=>
{
const
{
const
{
callBackSubmit
=
()
=>
{},
callBackSubmit
=
()
=>
{
},
visible
,
visible
,
type
,
type
,
formObj
,
formObj
,
...
@@ -1012,8 +1012,6 @@ const AddModal = props => {
...
@@ -1012,8 +1012,6 @@ const AddModal = props => {
nameArr
.
push
(
initialArr
[
i
][
`
${
name
}
`
]);
nameArr
.
push
(
initialArr
[
i
][
`
${
name
}
`
]);
}
}
}
}
console
.
log
(
nameArr
);
console
.
log
(
initialArr
);
//新建一个包含多个list的结果对象
//新建一个包含多个list的结果对象
let
tempObj
=
{};
let
tempObj
=
{};
let
aa
=
[];
let
aa
=
[];
...
@@ -1033,7 +1031,6 @@ const AddModal = props => {
...
@@ -1033,7 +1031,6 @@ const AddModal = props => {
}
}
}
}
console
.
log
(
aa
);
// tempObj.内置字段 = aa;
// tempObj.内置字段 = aa;
for
(
let
key
in
tempObj
)
{
for
(
let
key
in
tempObj
)
{
let
arr
=
[];
let
arr
=
[];
...
@@ -1073,7 +1070,6 @@ const AddModal = props => {
...
@@ -1073,7 +1070,6 @@ const AddModal = props => {
};
};
// const formateArrDataA1 = (initialArr, name) => {
// const formateArrDataA1 = (initialArr, name) => {
// console.log(initialArr);
// let aa = [];
// let aa = [];
// let a1 = [];
// let a1 = [];
// let a2;
// let a2;
...
@@ -1418,7 +1414,7 @@ const AddModal = props => {
...
@@ -1418,7 +1414,7 @@ const AddModal = props => {
</
Button
>
</
Button
>
</
Space
>
</
Space
>
}
}
// confirmLoading={loading}
// confirmLoading={loading}
>
>
<
Spin
tip=
"loading..."
spinning=
{
modalLoading
}
>
<
Spin
tip=
"loading..."
spinning=
{
modalLoading
}
>
{
modalLoading
?
null
:
(
{
modalLoading
?
null
:
(
...
@@ -1597,10 +1593,10 @@ const AddModal = props => {
...
@@ -1597,10 +1593,10 @@ const AddModal = props => {
>
>
{
treeData
{
treeData
?
treeData
.
map
((
item
,
index
)
=>
(
?
treeData
.
map
((
item
,
index
)
=>
(
<
Option
key=
{
index
}
value=
{
item
}
>
<
Option
key=
{
index
}
value=
{
item
}
>
{
item
}
{
item
}
</
Option
>
</
Option
>
))
))
:
''
}
:
''
}
</
Select
>
</
Select
>
</
Item
>
</
Item
>
...
@@ -1626,10 +1622,10 @@ const AddModal = props => {
...
@@ -1626,10 +1622,10 @@ const AddModal = props => {
>
>
{
standingTable
{
standingTable
?
standingTable
.
map
((
item
,
index
)
=>
(
?
standingTable
.
map
((
item
,
index
)
=>
(
<
Option
key=
{
index
}
value=
{
item
.
text
}
>
<
Option
key=
{
index
}
value=
{
item
.
text
}
>
{
item
.
text
}
{
item
.
text
}
</
Option
>
</
Option
>
))
))
:
''
}
:
''
}
</
Select
>
</
Select
>
</
Item
>
</
Item
>
...
@@ -1977,8 +1973,8 @@ const AddModal = props => {
...
@@ -1977,8 +1973,8 @@ const AddModal = props => {
内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用
内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用
</
div
>
</
div
>
}
}
// title="标准使用,使用标准工单系统,可通过勾选 前端/手持,来控制是否展示事件的填报入口,勾选即展示;
// title="标准使用,使用标准工单系统,可通过勾选 前端/手持,来控制是否展示事件的填报入口,勾选即展示;
// 内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用。"
// 内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用。"
>
>
<
InfoCircleOutlined
<
InfoCircleOutlined
style=
{
{
style=
{
{
...
...
src/pages/bsmanager/workOrder/incident/ChangeAddFlows.jsx
View file @
3f732e45
...
@@ -10,7 +10,7 @@ import styles from './incident.less';
...
@@ -10,7 +10,7 @@ import styles from './incident.less';
const
CheckboxGroup
=
Checkbox
.
Group
;
const
CheckboxGroup
=
Checkbox
.
Group
;
const
{
TabPane
}
=
Tabs
;
const
{
TabPane
}
=
Tabs
;
const
ChangeAddFlows
=
props
=>
{
const
ChangeAddFlows
=
props
=>
{
const
{
callBackSubmit
=
()
=>
{},
pickItem
,
visible
,
filed11
,
newCheckedList
}
=
props
;
const
{
callBackSubmit
=
()
=>
{
},
pickItem
,
visible
,
filed11
,
newCheckedList
}
=
props
;
const
[
value
,
setValue
]
=
useState
(
''
);
const
[
value
,
setValue
]
=
useState
(
''
);
const
[
checkValue
,
setCheckValue
]
=
useState
([]);
const
[
checkValue
,
setCheckValue
]
=
useState
([]);
const
[
title
,
setTitle
]
=
useState
([]);
const
[
title
,
setTitle
]
=
useState
([]);
...
@@ -271,7 +271,6 @@ const ChangeAddFlows = props => {
...
@@ -271,7 +271,6 @@ const ChangeAddFlows = props => {
},
[
filed1
]);
},
[
filed1
]);
const
formateArrDataA1
=
(
initialArr
,
name
)
=>
{
const
formateArrDataA1
=
(
initialArr
,
name
)
=>
{
console
.
log
(
initialArr
);
let
aa
=
[];
let
aa
=
[];
let
a1
=
[];
let
a1
=
[];
let
a2
;
let
a2
;
...
...
src/pages/bsmanager/workOrder/incident/incident.jsx
View file @
3f732e45
...
@@ -335,11 +335,9 @@ const incident = () => {
...
@@ -335,11 +335,9 @@ const incident = () => {
}).
then
(
res
=>
{
}).
then
(
res
=>
{
setTreeLoading
(
false
);
setTreeLoading
(
false
);
if
(
res
.
code
===
0
)
{
if
(
res
.
code
===
0
)
{
console
.
log
(
res
.
data
);
setKeepIdValue
(
res
.
data
);
setKeepIdValue
(
res
.
data
);
// setMaxLength(res.data.root.length + 1)
// setMaxLength(res.data.root.length + 1)
let
arr
=
formateArrDataA
(
res
.
data
,
'businessType'
);
let
arr
=
formateArrDataA
(
res
.
data
,
'businessType'
);
console
.
log
(
arr
);
let
newArr
=
[];
let
newArr
=
[];
let
newapp
=
[];
let
newapp
=
[];
let
newabb
=
[];
let
newabb
=
[];
...
@@ -348,39 +346,25 @@ const incident = () => {
...
@@ -348,39 +346,25 @@ const incident = () => {
Object
.
keys
(
arr
).
map
((
item
,
index
)
=>
{
Object
.
keys
(
arr
).
map
((
item
,
index
)
=>
{
newArr
.
push
(
item
);
newArr
.
push
(
item
);
});
});
console
.
log
(
arr
);
Object
.
values
(
arr
).
map
((
item
,
index
)
=>
{
Object
.
values
(
arr
).
map
((
item
,
index
)
=>
{
newapp
.
push
(
item
);
newapp
.
push
(
item
);
});
});
console
.
log
(
newapp
);
newapp
.
map
((
item
,
index
)
=>
{
newapp
.
map
((
item
,
index
)
=>
{
console
.
log
(
item
);
item
.
map
((
item1
,
index
)
=>
{
item
.
map
((
item1
,
index
)
=>
{
newabb
.
push
(
item1
.
root
);
newabb
.
push
(
item1
.
root
);
console
.
log
(
item1
.
root
);
});
});
});
});
console
.
log
(
newabb
);
newabb
.
map
((
item
,
index
)
=>
{
newabb
.
map
((
item
,
index
)
=>
{
console
.
log
(
item
);
aa
.
push
(
item
);
aa
.
push
(
item
);
});
});
console
.
log
(
aa
);
aa
.
map
((
item
,
index
)
=>
{
aa
.
map
((
item
,
index
)
=>
{
console
.
log
(
item
);
item
.
map
((
item1
,
index
)
=>
{
item
.
map
((
item1
,
index
)
=>
{
console
.
log
(
item1
);
zz
.
push
({
...
item1
});
zz
.
push
({
...
item1
});
});
});
});
});
console
.
log
(
zz
);
let
arrr
=
formateArrDataA
(
zz
,
'businessType'
);
let
arrr
=
formateArrDataA
(
zz
,
'businessType'
);
console
.
log
(
arrr
);
setTableData
(
arrr
);
setTableData
(
arrr
);
console
.
log
(
history
.
location
.
state
);
if
(
history
.
location
.
state
)
{
if
(
history
.
location
.
state
)
{
console
.
log
(
history
);
console
.
log
(
history
.
location
.
state
.
rember
);
setPickItem
(
newArr
[
history
.
location
.
state
.
rember
]);
setPickItem
(
newArr
[
history
.
location
.
state
.
rember
]);
setRember
(
history
.
location
.
state
.
rember
);
setRember
(
history
.
location
.
state
.
rember
);
setRember1
(
newArr
[
history
.
location
.
state
.
rember
]);
setRember1
(
newArr
[
history
.
location
.
state
.
rember
]);
...
@@ -388,9 +372,6 @@ const incident = () => {
...
@@ -388,9 +372,6 @@ const incident = () => {
setPickItem
(
newArr
[
rember
]);
setPickItem
(
newArr
[
rember
]);
setRember1
(
newArr
[
0
]);
setRember1
(
newArr
[
0
]);
}
}
console
.
log
(
rember
);
console
.
log
(
newArr
[
rember
]);
console
.
log
(
newArr
,
'newArr'
);
if
(
!
newArr
[
rember
])
{
if
(
!
newArr
[
rember
])
{
setRember
(
0
);
setRember
(
0
);
setPickItem
(
newArr
[
0
]);
setPickItem
(
newArr
[
0
]);
...
@@ -454,8 +435,6 @@ const incident = () => {
...
@@ -454,8 +435,6 @@ const incident = () => {
});
});
};
};
const
formateArrDataA
=
(
initialArr
,
name
)
=>
{
const
formateArrDataA
=
(
initialArr
,
name
)
=>
{
console
.
log
(
initialArr
);
console
.
log
(
name
);
// 判定传参是否符合规则
// 判定传参是否符合规则
if
(
!
(
initialArr
instanceof
Array
))
{
if
(
!
(
initialArr
instanceof
Array
))
{
return
'请传入正确格式的数组'
;
return
'请传入正确格式的数组'
;
...
@@ -524,9 +503,6 @@ const incident = () => {
...
@@ -524,9 +503,6 @@ const incident = () => {
};
};
const
sort
=
()
=>
{
const
sort
=
()
=>
{
setSortVisible
(
true
);
setSortVisible
(
true
);
console
.
log
(
tableData
);
console
.
log
(
pickItem
);
console
.
log
(
tableData
[
pickItem
]);
setSortData
(
tableData
[
pickItem
]);
setSortData
(
tableData
[
pickItem
]);
};
};
...
@@ -550,7 +526,6 @@ const incident = () => {
...
@@ -550,7 +526,6 @@ const incident = () => {
const
onOK
=
prop
=>
{
const
onOK
=
prop
=>
{
setSortVisible
(
false
);
setSortVisible
(
false
);
let
aa
=
prop
.
str
.
toString
();
let
aa
=
prop
.
str
.
toString
();
console
.
log
(
aa
);
CM_Event_ReOrder
(
aa
).
then
(
res
=>
{
CM_Event_ReOrder
(
aa
).
then
(
res
=>
{
if
(
res
.
msg
===
'Ok'
)
{
if
(
res
.
msg
===
'Ok'
)
{
notification
.
success
({
notification
.
success
({
...
@@ -576,7 +551,6 @@ const incident = () => {
...
@@ -576,7 +551,6 @@ const incident = () => {
const
editOk
=
()
=>
{
const
editOk
=
()
=>
{
let
aa
=
addForm
.
getFieldsValue
().
newBusinessType
;
let
aa
=
addForm
.
getFieldsValue
().
newBusinessType
;
console
.
log
(
aa
);
CM_Event_EditBusinessType
({
CM_Event_EditBusinessType
({
oldBusinessType
:
pickItem
,
oldBusinessType
:
pickItem
,
newBusinessType
:
aa
,
newBusinessType
:
aa
,
...
...
src/pages/database/databaseInitialization/DatabaseInitialization.jsx
View file @
3f732e45
...
@@ -396,7 +396,6 @@ const DatabaseInitialization = props => {
...
@@ -396,7 +396,6 @@ const DatabaseInitialization = props => {
setProduct
(
arr
);
setProduct
(
arr
);
setKeepValue
(
arr
);
setKeepValue
(
arr
);
}
}
console
.
log
(
aa
);
let
newArr
=
Array
.
from
(
new
Set
(
aa
));
let
newArr
=
Array
.
from
(
new
Set
(
aa
));
setKeepStatus
(
gg
);
setKeepStatus
(
gg
);
console
.
log
(
newArr
);
console
.
log
(
newArr
);
...
...
src/pages/platformCenter/baseFrameContainer/drawBoardManage/EditTemplate.jsx
View file @
3f732e45
...
@@ -16,7 +16,7 @@ import {
...
@@ -16,7 +16,7 @@ import {
import
{
SaveUpload
,
UpdateModelInfo
}
from
'@/services/drawBoardManage/api'
;
import
{
SaveUpload
,
UpdateModelInfo
}
from
'@/services/drawBoardManage/api'
;
const
EditTemplate
=
props
=>
{
const
EditTemplate
=
props
=>
{
const
{
visible
,
treeData
,
obj
,
pickItem
,
callBackSubmit
=
()
=>
{},
onCancel
}
=
props
;
const
{
visible
,
treeData
,
obj
,
pickItem
,
callBackSubmit
=
()
=>
{
},
onCancel
}
=
props
;
const
[
addTemplateForm
]
=
Form
.
useForm
();
const
[
addTemplateForm
]
=
Form
.
useForm
();
const
[
selectValue
,
setSelectValue
]
=
useState
(
''
);
const
[
selectValue
,
setSelectValue
]
=
useState
(
''
);
const
[
file
,
setFile
]
=
useState
(
''
);
const
[
file
,
setFile
]
=
useState
(
''
);
...
@@ -58,8 +58,6 @@ const EditTemplate = props => {
...
@@ -58,8 +58,6 @@ const EditTemplate = props => {
let aa = {};
let aa = {};
aa.width = addTemplateForm.getFieldsValue().imageWidth.toString();
aa.width = addTemplateForm.getFieldsValue().imageWidth.toString();
aa.height = addTemplateForm.getFieldsValue().imageHeight.toString();
aa.height = addTemplateForm.getFieldsValue().imageHeight.toString();
console.log(aa);
console.log(file);
const formData = new FormData();
const formData = new FormData();
formData.append('
ModelName
', addTemplateForm.getFieldsValue().ModelFile);
formData.append('
ModelName
', addTemplateForm.getFieldsValue().ModelFile);
formData.append('
ModelType
', obj.ModelTypeName);
formData.append('
ModelType
', obj.ModelTypeName);
...
@@ -149,10 +147,10 @@ const EditTemplate = props => {
...
@@ -149,10 +147,10 @@ const EditTemplate = props => {
>
>
{treeData
{treeData
? treeData.map((item, index) => (
? treeData.map((item, index) => (
<Option key={item.id} value={item.name}>
<Option key={item.id} value={item.name}>
{item.name}
{item.name}
</Option>
</Option>
))
))
: ''}
: ''}
</Select>
</Select>
</Form.Item>
</Form.Item>
...
...
src/pages/platformCenter/gis/schemeConfig/TileConfig/AddProjectModal.jsx
View file @
3f732e45
...
@@ -160,7 +160,6 @@ const AddProjectModal = props => {
...
@@ -160,7 +160,6 @@ const AddProjectModal = props => {
// 添加瓦片
// 添加瓦片
const
addTile
=
()
=>
{
const
addTile
=
()
=>
{
let
aa
=
cardData
.
find
(
i
=>
i
.
schemename
==
formObj
.
schemename
);
let
aa
=
cardData
.
find
(
i
=>
i
.
schemename
==
formObj
.
schemename
);
console
.
log
(
aa
);
let
arrNew
=
[];
let
arrNew
=
[];
aa
.
baseMapDetail
.
map
(
i
=>
{
aa
.
baseMapDetail
.
map
(
i
=>
{
arrNew
.
push
(
i
.
zoom
);
arrNew
.
push
(
i
.
zoom
);
...
...
src/pages/platformCenter/hostmanager/IotConfig/IotConfig.jsx
View file @
3f732e45
...
@@ -319,7 +319,6 @@ const IotConfig = props => {
...
@@ -319,7 +319,6 @@ const IotConfig = props => {
const
PingIot1
=
()
=>
{
const
PingIot1
=
()
=>
{
setLoading
(
true
);
setLoading
(
true
);
let
aa
=
form
.
getFieldsValue
().
IotAddress
;
let
aa
=
form
.
getFieldsValue
().
IotAddress
;
console
.
log
(
aa
);
PingIOTPlatform
({
PingIOTPlatform
({
ip
:
aa
,
ip
:
aa
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
...
src/pages/platformCenter/hostmanager/gateWay/AddModal.jsx
View file @
3f732e45
...
@@ -197,7 +197,6 @@ const AddModal = props => {
...
@@ -197,7 +197,6 @@ const AddModal = props => {
{
{
validator
:
(
rule
,
value
)
=>
{
validator
:
(
rule
,
value
)
=>
{
let
aa
=
form
.
getFieldValue
().
UpstreamPathTemplate
;
let
aa
=
form
.
getFieldValue
().
UpstreamPathTemplate
;
console
.
log
(
aa
);
console
.
log
(
aa
.
indexOf
(
'/PandaCore/GateWay'
));
console
.
log
(
aa
.
indexOf
(
'/PandaCore/GateWay'
));
if
(
!
aa
.
startsWith
(
'/'
))
{
if
(
!
aa
.
startsWith
(
'/'
))
{
return
Promise
.
reject
(
'必须以/开头'
);
return
Promise
.
reject
(
'必须以/开头'
);
...
...
src/pages/platformCenter/integratedLogin/Integrate.jsx
View file @
3f732e45
...
@@ -418,10 +418,7 @@ const Integrate = () => {
...
@@ -418,10 +418,7 @@ const Integrate = () => {
}
}
});
});
}
}
console
.
log
(
aa
);
setKeepSystemName
(
aa
);
setKeepSystemName
(
aa
);
console
.
log
(
resnew
.
data
);
console
.
log
(
resnew
.
data
,
'resnew.dataresnew.dataresnew.data'
);
setTableData
(
resnew
.
data
);
setTableData
(
resnew
.
data
);
}
else
{
}
else
{
notification
.
error
({
notification
.
error
({
...
...
src/utils/authority.js
View file @
3f732e45
...
@@ -24,7 +24,6 @@ const getQueryVariable = name => {
...
@@ -24,7 +24,6 @@ const getQueryVariable = name => {
return
result
!=
null
?
result
[
2
]
:
''
;
return
result
!=
null
?
result
[
2
]
:
''
;
};
};
console
.
log
(
getAuthority
(),
'getAuthority()'
);
let
Authorized
=
RenderAuthorize
(
getAuthority
());
let
Authorized
=
RenderAuthorize
(
getAuthority
());
// Reload the rights component
// Reload the rights component
...
...
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