Browse Source

Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

tags/PMS_Frontend_v1.0.6-develop
xingjx 1 year ago
parent
commit
cde0c0a9e4
  1. 16
      src/pages/FinancialMgm/FinancialReport/BookReport/index.scss
  2. 8
      src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
  3. 10
      src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss
  4. 8
      src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss
  5. 8
      src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/index.scss
  6. 8
      src/pages/FinancialMgm/FinancialReport/PayChannelStat/index.scss
  7. 7
      src/pages/FinancialMgm/FinancialReport/PaySummaryReport/index.scss
  8. 8
      src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss
  9. 29
      src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
  10. 81
      src/pages/SystemMgm/OrgnizationMgm/loadable.jsx

16
src/pages/FinancialMgm/FinancialReport/BookReport/index.scss

@ -118,7 +118,7 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
@ -131,14 +131,14 @@ $color-primary : var(--color-primary);
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -277,7 +277,7 @@ $color-primary : var(--color-primary);
right: 21px;
top: 202px;
padding: 10px 8px;
z-index: 1;
z-index: 12;
.colsa {
color: #3AA9FF;
@ -355,8 +355,8 @@ $color-primary : var(--color-primary);
.selectcolBookReport {
width: 160px;
height: 470px;
width: 180px;
height: 340px;
.tirl {
font-size: 16px;
@ -372,3 +372,7 @@ $color-primary : var(--color-primary);
font-size: 14px;
color: $color-text;
}
.ldads {
height: 380px;
}

8
src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx

@ -321,7 +321,13 @@ function BookReport() {
const SelectCol = (numb) => {
return (
<div className="selectcolBookReport">
<div
className={
FormData.type == 1
? "selectcolBookReport"
: "selectcolBookReport ldads"
}
>
<p className="tirl">隐藏列</p>
{col.map((ele) => {
if (ele.children) {

10
src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss

@ -84,27 +84,27 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
.labs {
width: 120px;
text-align: right;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
margin-right: 10px;
}
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -359,7 +359,7 @@ $color-primary : var(--color-primary);
right: 21px;
top: 277px;
padding: 10px 8px;
z-index: 1;
z-index: 12;
.colsa {
color: #3AA9FF;

8
src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss

@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -232,7 +232,7 @@ $color-primary : var(--color-primary);
position: fixed;
right: 21px;
top: 202px;
z-index: 1;
z-index: 12;
padding: 10px 8px;
.colsa {

8
src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/index.scss

@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -358,7 +358,7 @@ $color-primary : var(--color-primary);
right: 21px;
top: 277px;
padding: 10px 8px;
z-index: 1;
z-index: 12;
.colsa {
color: #3AA9FF;

8
src/pages/FinancialMgm/FinancialReport/PayChannelStat/index.scss

@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -216,7 +216,7 @@ $color-primary : var(--color-primary);
right: 21px;
top: 421px;
padding: 10px 8px;
z-index: 1;
z-index: 12;
.colsa {
color: #3AA9FF;

7
src/pages/FinancialMgm/FinancialReport/PaySummaryReport/index.scss

@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -259,6 +259,7 @@ $color-primary : var(--color-primary);
right: 21px;
top: 277px;
padding: 10px 8px;
z-index: 12;
.colsa {
color: #3AA9FF;

8
src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss

@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
.daf {
margin-left: 4px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
}
}
@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
.inputs {
flex: 1;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
.inputst {
// flex: 228px;
// border: 1px solid var(--color-table-border-bottom-color);
// border: 1px solid var(--color-table-border-bottom-color);
border-radius: 4px;
overflow: hidden;
}
@ -196,7 +196,7 @@ $color-primary : var(--color-primary);
position: fixed;
right: 21px;
top: 167px;
z-index: 1;
z-index: 12;
padding: 10px 8px;
.colsa {

29
src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx

@ -45,6 +45,7 @@ function Fence(props) {
road_name: '',//
operator: -1,//
export: false,
road_id: '',//
pn: 1,
length: Number(pageSizeOptions[0]), //
}
@ -60,6 +61,7 @@ function Fence(props) {
password: "",
port: "",
road_name: "",
road_id: "",
type: "",
user_name: "",
video_port: ""
@ -128,6 +130,9 @@ function Fence(props) {
}
const handleEdit = (item) => {
setEditStatus(true)
getRoadById(item.operator_id).then((data) => {
setRoadData(data)
})
form.setFieldsValue({
...item
})
@ -524,23 +529,23 @@ function Fence(props) {
</Form.Item>
</Col>
<Col span={12}>
{/* <Form.Item
label={"所属商户"}
name={"operator"}
rules={[{ required: true, message: '所属商户不能为空' }]}
<Form.Item
label={""}
name={"id"}
hidden
>
<Input/>
</Form.Item> */}
</Form.Item>
<Form.Item
label={"设备类型"}
name={"id"}
name={"type"}
rules={[{ required: true, message: '设备类型不能为空' }]}
>
<Select
ref={roadSelectRef}
placeholder="请选择"
value={form.device_id}
onChange={(v) => console.log(v)}
value={form.type}
onChange={(v) => form.setFieldValue('type', v)}
options={deviceTypeData}
/>
</Form.Item>
@ -571,14 +576,14 @@ function Fence(props) {
<Col span={12}>
<Form.Item
label={"所属路段"}
name={"road_name"}
name={"road_id"}
rules={[{ required: true, message: '所属路段不能为空' }]}
>
<Select
ref={roadSelectRef}
placeholder="请选择"
className="road-selector"
value={form.road_name}
value={form.road_id}
onChange={handleRoadChange}
options={roadData}
/>
@ -619,11 +624,11 @@ function Fence(props) {
value={form.network_mode}
options={[
{
value: "固网",
value: "1",
label: "固网"
},
{
value: '无线网络',
value: '2',
label: "无线网络"
}
]}

81
src/pages/SystemMgm/OrgnizationMgm/loadable.jsx

@ -5,6 +5,8 @@ import ajax from "@/services"
import "./index.scss";
const isDev = window.location.href.indexOf('localhost') > -1
let testTemp = []
function OrgnizationMgm() {
const [editStatus, setEditStatus] = useState(false)
@ -52,8 +54,8 @@ function OrgnizationMgm() {
})
}
const getRoleTree = () => {
ajax.getOrgRoleNodeList().then((e) => {
const getRoleTree = (id) => {
ajax.getOrgRoleNodeList({id: id}).then((e) => {
if (e.status == 20000) {
setRoleTree(e.data)
}
@ -63,8 +65,10 @@ function OrgnizationMgm() {
const getOrgTree = () => {
ajax.getOrgTree().then((e) => {
if (e.status == 20000) {
setOrgTree(e.data)
handleTreeClick(undefined, {node: e.data[0]})
testTemp = e.data
recursionTree(testTemp)
setOrgTree(testTemp)
handleTreeClick(undefined, {node: testTemp[0]})
}
})
}
@ -166,15 +170,28 @@ function OrgnizationMgm() {
}
const handleTreeClick = (e, {node}) => {
//
if (node.level > 2) {
setActiveOrg({})
message.error('不允许配置')
return
}
getRoleTree(node.id)
let ids = node.ids.split("-").filter(item => item != "undefined")
ids.push(node.id)
ajaxGetOrgDetail(node.id).then((data) => {
setActiveOrg({
id: node.id,
ids: ids,
key: node.key,
name: node.name,
level: node.level,
img_url: node.img_url,
control_area: node.control_area,
...data
...data,
role_auth: data.role_auth ? data.role_auth.map((id) => Number(id)) : []
})
baseForm.setFieldsValue({
platform: data.platform,
@ -183,7 +200,7 @@ function OrgnizationMgm() {
img_url: data.img_url
})
setImgUrl(data.img_url)
setRoleCheckedKeys(data.role_auth)
setRoleCheckedKeys(data.role_auth ? data.role_auth.map((id) => Number(id)) : [])
}).catch(err => {
message.error(err)
})
@ -220,12 +237,22 @@ function OrgnizationMgm() {
}
const recursionTree = (treeData, pid) => {
treeData.map((item) => {
item.ids += '-' + pid
if (item.children) {
recursionTree(item.children, item.id)
}
return item
})
}
const handleAreaTreeChange = (checkedKeys) => {
baseForm.setFieldValue('control_area', checkedKeys.join(','))
}
const handleRoleTreeChange = (checkedKeys) => {
const handleRoleTreeChange = (checkedKeys, _) => {
setRoleCheckedKeys(checkedKeys)
}
@ -249,7 +276,8 @@ function OrgnizationMgm() {
const handleConfirm = () => {
ajaxOrgDetailSave(Object.assign({}, baseForm.getFieldsValue(), {
id: activeOrg.id,
role: roleCheckedKeys.join(',')
role: roleCheckedKeys.join(','),
control_area: baseForm.getFieldValue('control_area').join(',')
})).then((msg) => {
message.success(msg)
setEditStatus(false)
@ -345,7 +373,7 @@ function OrgnizationMgm() {
</Upload>
</Form.Item>
{
activeOrg.level > 2 ? <>
activeOrg.level > 1 ? <>
<Form.Item label="管辖范围" name="control_type">
<Select disabled={!editStatus}>
<Option value={1}>按区管理</Option>
@ -371,7 +399,7 @@ function OrgnizationMgm() {
</div>
),
},
activeOrg.level > 2 ? {
activeOrg.level > 1 ? {
label: `功能配置`,
key: '2',
children: (
@ -381,10 +409,9 @@ function OrgnizationMgm() {
<Tree
disabled={!editStatus}
checkable
defaultCheckedKeys={roleCheckedKeys || []}
treeData={roleTree}
onCheck={handleRoleTreeChange}
// checkedKeys={roleCheckedKeys}
checkedKeys={roleCheckedKeys}
fieldNames={{
title: 'name',
key: 'id'
@ -395,12 +422,12 @@ function OrgnizationMgm() {
),
} : undefined
]
}, [JSON.stringify(activeOrg), editStatus, imgUrl])
}, [JSON.stringify(activeOrg), editStatus, imgUrl, roleCheckedKeys])
useEffect(() => {
getOrgTree()
getAreaTree()
getRoleTree()
// getRoleTree()
}, [])
const treeTitleRender = ({name, children, level, pid, id, virtually_code, lng_lat, code}) => {
@ -437,18 +464,22 @@ function OrgnizationMgm() {
<Tabs
defaultActiveKey="1"
onChange={(v) => setTabActive(v)}
items={tabRender}
items={Object.keys(activeOrg).length ? (activeOrg.level < 3 ? tabRender : null) : null }
/>
<div className="form-confirm">
{
!editStatus ? (
<Button type="primary" className="yisa-btn" onClick={() => handleEdit()}>编辑</Button>
) : <>
<Button type="primary" className="yisa-btn" onClick={() => handleConfirm()}>确认</Button>
<Button type="ghost" className="yisa-btn" onClick={() => handleCancel()}>取消</Button>
</>
}
</div>
{
Object.keys(activeOrg).length ? (
<div className="form-confirm">
{
!editStatus ? (
<Button type="primary" className="yisa-btn" onClick={() => handleEdit()}>编辑</Button>
) : <>
<Button type="primary" className="yisa-btn" onClick={() => handleConfirm()}>确认</Button>
<Button type="ghost" className="yisa-btn" onClick={() => handleCancel()}>取消</Button>
</>
}
</div>
) : null
}
</div>
</div>
<Modal

Loading…
Cancel
Save