lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lishenfeng:f8931a95188b816a18a4fde85f63d422fe0c6215
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:qzc-dev-demo
lishenfeng:lsf-dev
..
compare: lishenfeng:f4b6f8d48d37e6225dc9128a6555b2db70eed690
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:qzc-dev-demo
lishenfeng:lsf-dev

No commits in common. "f8931a95188b816a18a4fde85f63d422fe0c6215" and "f4b6f8d48d37e6225dc9128a6555b2db70eed690" have entirely different histories.
f8931a9518 ... f4b6f8d48d

11 changed files with 26 additions and 321 deletions
Show Stats Expand all files Collapse all files

118
src/components/DashboardLayout/style.less
View File

@ -301,121 +301,3 @@ background-color: #ecf2f9 !important;
.nonebox .ant-card-body { .nonebox .ant-card-body {
padding: 5px 20px !important; padding: 5px 20px !important;
} }
.ant-radio-button-wrapper{
height:28px;
line-height:26px;
border: 1px solid #0893FF !important;
color:#0893FF;
&.ant-radio-button-wrapper-checked{
color: #fff !important;
}
.ant-radio-button-checked{
background:#0893FF;
border-color:#0893FF !important;
}
}
.normalModalStyle{
width: 100%;
// min-height: 600px;
background-color: #fff;
.ant-card-body{
.ant-table-thead{
.ant-table-cell{
background-color: #e2edfd !important;
}
}
}
.normalModalStyle_title{
height: 40px;
background-color: #f7f7f7;
border-radius: 10px 10px 0 0 ;
display: flex;
align-items: center;
color: #007afd;
font-size: 16px;
font-weight: 500;
margin-bottom: 10px;
.normalModalStyle_title_icon{
margin: 0 10px 0 15px;
width: 5px;
height: 16px;
background: #3477f5;
}
.normalModalStyle_title_cancel{
margin-right: 15px;
flex: 1;
display: flex;
flex-direction: row-reverse;
}
}
}
.home_modal{
.ant-modal-content{
border-radius: 10px;
}
}
.homeModal1{
// .ant-radio-button-wrapper:not(:first-child)::before{
// background-color: red;
// }
display: flex;
flex-direction: column;
.homeModal1_content{
height: 504px;
display: flex;
padding: 5px 20px 20px 20px;
.homeModal1_content_lf{
width: 40%;
height: 100%;
}
.homeModal1_content_rf{
width: 60%;
height: 100%;
}
}
}
.homeModal2{
display: flex;
flex-direction: column;
.homeModal2_content{
height: 504px;
display: flex;
padding: 5px 20px 20px 20px;
}
}
.colorTable{
.ant-table-thead{
th{
height: 40px !important;
background-color: #e2edfd !important;
}
}
.ant-table-tbody{
.ant-table-measure-row{
td{
padding: 0 !important;
}
}
tr:nth-child(odd) {
td{
background-color: #f5f8fe !important;
}
}
}
}

31
src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js
View File

@ -1,26 +1,10 @@
export default function drpOption(data,yjData) { export default function drpOption(data) {
console.log("data",data); console.log("data",data);
const maxVal = 0//Math.max(...data.map(obj => obj.drp)) const maxVal = 0//Math.max(...data.map(obj => obj.drp))
const max1 = Math.max(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) const max1 = Math.max(...data.map(obj => obj.value))
const min1 = Math.min(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) const min1 = Math.min(...data.map(obj => obj.value))
const max2 = Math.max(...data.map(obj => obj.rz)) const max2 = Math.max(...data.map(obj => obj.rz))
const min2 = Math.min(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz))
const yj = yjData?.map((item,index)=>{
return {
yAxisIndex: 0,
name: item.yjName,
type: 'line',
color: item.color,
lineStyle: {
type: "dashed",
width: 1,
},
data: data.map(o => item.value),
symbol: 'none', // 设置标记点为'none'，即去掉圆点
smooth: 0.5
}
})
return { return {
tooltip: { tooltip: {
@ -101,8 +85,8 @@ export default function drpOption(data,yjData) {
axisTick: { axisTick: {
show: false, show: false,
}, },
min: Math.floor(min1*0.8), min: Math.floor(max1*0.8),
max: Math.ceil(max1*1.2), max: Math.floor(min1*1.2),
}, },
// { // {
// // gridIndex: 1, // // gridIndex: 1,
@ -136,8 +120,8 @@ export default function drpOption(data,yjData) {
// axisTick: { // axisTick: {
// show: false, // show: false,
// }, // },
// min: Math.floor(min2*0.8), // min: Math.floor(max2*0.8),
// max: Math.ceil(max2*1.2), // max: Math.floor(min2*1.2),
// } // }
], ],
series: [ series: [
@ -154,7 +138,6 @@ export default function drpOption(data,yjData) {
symbol: 'none', // 设置标记点为'none'，即去掉圆点 symbol: 'none', // 设置标记点为'none'，即去掉圆点
smooth: 0.5 smooth: 0.5
}, },
...yj
// { // {
// // xAxisIndex: 1, // // xAxisIndex: 1,
// yAxisIndex: 1, // yAxisIndex: 1,

41
src/views/Home/MapCtrl/Pops/ShenLiu/index.js
View File

@ -12,8 +12,7 @@ import drpOption from './drpOption';
function ShenLiu({ id, data, dispatch, onCancel }) { function ShenLiu({ id, data, dispatch, onCancel }) {
console.log(data); console.log(data);
const [ tableData, setTableData ] = useState([]) const [ tableData, setTableData ] = useState([])
const [ yjData, setYjData ] = useState([]) const option = useMemo(() => drpOption(tableData), [tableData])
const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData])
const width = 780; const width = 780;
const closePop = () => { const closePop = () => {
@ -39,45 +38,7 @@ function ShenLiu({ id, data, dispatch, onCancel }) {
setTableData(data) setTableData(data)
} }
const getYjData = async(stationCode)=>{
const params = {
"pageSo": {
"pageSize": 10,
"pageNumber": 1
},
"stationCode": stationCode
}
const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params)
if(code!==200){
return
}
const linshi = []
records?.map((item)=>{
if(item.status===0){
return
}
if(item.valueOne||0){
linshi.push({
yjName:item.level ===1?'黄色预警':'红色预警',
value:item.valueOne,
color:item.level ===1?'#f1bf42':'red'
})
}
if(item.valueTwo||0){
linshi.push({
yjName:item.level ===1?'黄色预警':'红色预警',
value:item.valueTwo,
color:item.level ===1?'#f1bf42':'red'
})
}
})
debugger
setYjData(linshi)
}
useEffect(()=>{ useEffect(()=>{
getYjData(data.stationCode)
getData([moment().add(-1,'months'),moment()],data.stationCode) getData([moment().add(-1,'months'),moment()],data.stationCode)
},[]) },[])

2
src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js
View File

@ -23,7 +23,7 @@ const ToolBar = ({search, defaultParams}) => {
<Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}> <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
<Form.Item label="时间段" name="tms"> <Form.Item label="时间段" name="tms">
<RangePicker <RangePicker
allowClear={false} allowClear
defaultValue={[moment().add(-1,'months'),moment()]} defaultValue={[moment().add(-1,'months'),moment()]}
onChange={(e)=>{ onChange={(e)=>{
form.setFieldValue('cysd',null) form.setFieldValue('cysd',null)

31
src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
View File

@ -1,26 +1,10 @@
export default function drpOption(data,yjData) { export default function drpOption(data) {
console.log("data",data); console.log("data",data);
const maxVal = 0//Math.max(...data.map(obj => obj.drp)) const maxVal = 0//Math.max(...data.map(obj => obj.drp))
const max1 = Math.max(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) const max1 = Math.max(...data.map(obj => obj.value))
const min1 = Math.min(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) const min1 = Math.min(...data.map(obj => obj.value))
const max2 = Math.max(...data.map(obj => obj.rz)) const max2 = Math.max(...data.map(obj => obj.rz))
const min2 = Math.min(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz))
const yj = yjData?.map((item,index)=>{
return {
yAxisIndex: 0,
name: item.yjName,
type: 'line',
color: item.color,
lineStyle: {
type: "dashed",
width: 1,
},
data: data.map(o => item.value),
symbol: 'none', // 设置标记点为'none'，即去掉圆点
smooth: 0.5
}
})
return { return {
tooltip: { tooltip: {
@ -101,8 +85,8 @@ export default function drpOption(data,yjData) {
axisTick: { axisTick: {
show: false, show: false,
}, },
min: Math.floor(min1*0.8), min: Math.floor(max1*0.8),
max: Math.ceil(max1*1.2), max: Math.floor(min1*1.2),
}, },
{ {
// gridIndex: 1, // gridIndex: 1,
@ -136,8 +120,8 @@ export default function drpOption(data,yjData) {
axisTick: { axisTick: {
show: false, show: false,
}, },
min: Math.floor(min2*0.8), min: Math.floor(max2*0.8),
max: Math.ceil(max2*1.2), max: Math.floor(min2*1.2),
} }
], ],
series: [ series: [
@ -167,7 +151,6 @@ export default function drpOption(data,yjData) {
symbol: 'none', // 设置标记点为'none'，即去掉圆点 symbol: 'none', // 设置标记点为'none'，即去掉圆点
smooth: 0.5 smooth: 0.5
}, },
...yj
] ]
}; };
} }

42
src/views/Home/MapCtrl/Pops/ShenYa/index.js
View File

@ -10,11 +10,10 @@ import TableData from './TableData'
import drpOption from './drpOption'; import drpOption from './drpOption';
function ShenYa({ id, data, dispatch, onCancel }) { function ShenYa({ id, data, dispatch, onCancel }) {
console.log('SY',data); console.log(data);
const [ tableData, setTableData ] = useState([]) const [ tableData, setTableData ] = useState([])
const [ yjData, setYjData ] = useState([])
const [ tabVal, setTabVal ] = useState('1') const [ tabVal, setTabVal ] = useState('1')
const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData]) const option = useMemo(() => drpOption(tableData), [tableData])
const width = 780; const width = 780;
const closePop = () => { const closePop = () => {
@ -41,44 +40,7 @@ function ShenYa({ id, data, dispatch, onCancel }) {
setTableData(data) setTableData(data)
} }
const getYjData = async(stationCode)=>{
const params = {
"pageSo": {
"pageSize": 10,
"pageNumber": 1
},
"stationCode": stationCode
}
const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params)
if(code!==200){
return
}
const linshi = []
records?.map((item)=>{
if(item.status===0){
return
}
if(item.valueOne||0){
linshi.push({
yjName:item.level ===1?'黄色预警':'红色预警',
value:item.valueOne,
color:item.level ===1?'#f1bf42':'red'
})
}
if(item.valueTwo||0){
linshi.push({
yjName:item.level ===1?'黄色预警':'红色预警',
value:item.valueTwo,
color:item.level ===1?'#f1bf42':'red'
})
}
})
setYjData(linshi)
}
useEffect(()=>{ useEffect(()=>{
getYjData(data.stationCode)
getData([moment().add(-1,'months'),moment()],data.stationCode) getData([moment().add(-1,'months'),moment()],data.stationCode)
},[]) },[])

2
src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js
View File

@ -17,7 +17,7 @@ const ToolBar = ({search, setTabVal}) => {
<Form className='toolbarBox' layout="inline" onFinish={onFinish}> <Form className='toolbarBox' layout="inline" onFinish={onFinish}>
<Form.Item label="时间段" name="imgName"> <Form.Item label="时间段" name="imgName">
<RangePicker <RangePicker
allowClear={false} allowClear
defaultValue={[moment().add(-1,'months'),moment()]} defaultValue={[moment().add(-1,'months'),moment()]}
onChange={onFinish} onChange={onFinish}
style={{ width: "300px" }} style={{ width: "300px" }}

32
src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js
View File

@ -1,31 +1,10 @@
export default function drpOption(data,yjData) { export default function drpOption(data) {
console.log("data",data); console.log("data",data);
const maxVal = 0//Math.max(...data.map(obj => obj.drp)) const maxVal = 0//Math.max(...data.map(obj => obj.drp))
// const max1 = Math.max(...data.map(obj => obj.x)) const max1 = Math.max(...data.map(obj => obj.x))
const max1 = Math.max(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)]) const min1 = Math.min(...data.map(obj => obj.x))
const min1 = Math.min(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
// const min1 = Math.min(...data.map(obj => obj.x))
const max2 = Math.max(...data.map(obj => obj.rz)) const max2 = Math.max(...data.map(obj => obj.rz))
const min2 = Math.min(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz))
const yj = yjData?.map((item,index)=>{
return {
yAxisIndex: 0,
name: item.yjName,
type: 'line',
color: item.color,
lineStyle: {
type: "dashed",
width: 1,
},
data: data.map(o => item.value),
symbol: 'none', // 设置标记点为'none'，即去掉圆点
smooth: 0.5
}
})
return { return {
tooltip: { tooltip: {
@ -106,8 +85,8 @@ export default function drpOption(data,yjData) {
axisTick: { axisTick: {
show: false, show: false,
}, },
max: Math.floor(max1*1.2)||100,
min: Math.floor(min1*0.8)||0, min: Math.floor(min1*0.8)||0,
max: Math.ceil(max1*1.2)||100,
}, },
{ {
// gridIndex: 1, // gridIndex: 1,
@ -141,8 +120,8 @@ export default function drpOption(data,yjData) {
axisTick: { axisTick: {
show: false, show: false,
}, },
max: Math.floor(max2*1.2),
min: Math.floor(min2*0.8), min: Math.floor(min2*0.8),
max: Math.ceil(max2*1.2),
} }
], ],
series: [ series: [
@ -198,7 +177,6 @@ export default function drpOption(data,yjData) {
symbol: 'none', // 设置标记点为'none'，即去掉圆点 symbol: 'none', // 设置标记点为'none'，即去掉圆点
smooth: 0.5 smooth: 0.5
}, },
...yj
] ]
}; };
} }

41
src/views/Home/MapCtrl/Pops/WeiYi/index.js
View File

@ -12,10 +12,8 @@ import drpOption from './drpOption';
function ShenYa({ id, data, dispatch, onCancel }) { function ShenYa({ id, data, dispatch, onCancel }) {
console.log(data); console.log(data);
const [ tableData, setTableData ] = useState([]) const [ tableData, setTableData ] = useState([])
const [ yjData, setYjData ] = useState([])
const [ tabVal, setTabVal ] = useState('1') const [ tabVal, setTabVal ] = useState('1')
// const option = useMemo(() => drpOption(tableData), [tableData]) const option = useMemo(() => drpOption(tableData), [tableData])
const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData])
const width = 780; const width = 780;
const closePop = () => { const closePop = () => {
@ -42,44 +40,7 @@ function ShenYa({ id, data, dispatch, onCancel }) {
setTableData(data) setTableData(data)
} }
const getYjData = async(stationCode)=>{
const params = {
"pageSo": {
"pageSize": 10,
"pageNumber": 1
},
"stationCode": stationCode
}
const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params)
if(code!==200){
return
}
const linshi = []
records?.map((item)=>{
if(item.status===0){
return
}
if(item.valueOne||0){
linshi.push({
yjName:item.level ===1?'黄色预警':'红色预警',
value:item.valueOne,
color:item.level ===1?'#f1bf42':'red'
})
}
if(item.valueTwo||0){
linshi.push({
yjName:item.level ===1?'黄色预警':'红色预警',
value:item.valueTwo,
color:item.level ===1?'#f1bf42':'red'
})
}
})
setYjData(linshi)
}
useEffect(()=>{ useEffect(()=>{
getYjData(data.stationCode)
getData([moment().add(-1,'months'),moment()],data.stationCode) getData([moment().add(-1,'months'),moment()],data.stationCode)
},[]) },[])

2
src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js
View File

@ -17,7 +17,7 @@ const ToolBar = ({search, setTabVal}) => {
<Form className='toolbarBox' layout="inline" onFinish={onFinish}> <Form className='toolbarBox' layout="inline" onFinish={onFinish}>
<Form.Item label="时间段" name="imgName"> <Form.Item label="时间段" name="imgName">
<RangePicker <RangePicker
allowClear={false} allowClear
defaultValue={[moment().add(-1,'months'),moment()]} defaultValue={[moment().add(-1,'months'),moment()]}
onChange={onFinish} onChange={onFinish}
style={{ width: "300px" }} style={{ width: "300px" }}

5
src/views/gcaqjc/bzt/index.less
View File

@ -185,11 +185,6 @@
top: 594px; top: 594px;
} }
.gcaqjc_bzt_sl_SL02{
left: 679px;
top: 594px;
}
.gcaqjc_bzt_wy_WY-G100{ .gcaqjc_bzt_wy_WY-G100{
left: 394px; left: 394px;
top: 376px; top: 376px;