lishenfeng
/
mcfxkh-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge():合并冲突

lsf-dev
李神峰 2025-05-22 16:07:33 +08:00
parent 49f5b677c0
commit b663553592
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/Home/PanelIndex.js
View File

@ -44,12 +44,10 @@ import Whclqd from './panels/Whwtqd'
import SzSta from './panels/SzSta' import SzSta from './panels/SzSta'
import Szqytj from './panels/Szqytj' import Szqytj from './panels/Szqytj'
import Szwtqytj from './panels/Szwtqytj' import Szwtqytj from './panels/Szwtqytj'
<<<<<<< HEAD
import Spjc from './panels/Spjc' import Spjc from './panels/Spjc'
import Skgl from './panels/Skgl' import Skgl from './panels/Skgl'
import Fxdd from './panels/Fxdd' import Fxdd from './panels/Fxdd'
=======
import GqSta from './panels/GqSta' import GqSta from './panels/GqSta'
import Gqyssqs from './panels/Gqyqs' import Gqyssqs from './panels/Gqyqs'
import Gqbl from './panels/Gqbl' import Gqbl from './panels/Gqbl'
@ -58,7 +56,6 @@ import Gqycqd from './panels/Gqycqd'
import Gqdb from './panels/Gqdb' import Gqdb from './panels/Gqdb'
import Szzdd from './panels/Szzdd' import Szzdd from './panels/Szzdd'
import Yyfa from './panels/Yyfa' import Yyfa from './panels/Yyfa'
>>>>>>> lsf-dev
export default function PanelIndex({ name, style, ...params }) { export default function PanelIndex({ name, style, ...params }) {
if (name === '天气') { if (name === '天气') {
@ -151,14 +148,12 @@ export default function PanelIndex({ name, style, ...params }) {
return <Szqytj style={style}/> return <Szqytj style={style}/>
}else if (name === '本月水政巡查问题统计') { }else if (name === '本月水政巡查问题统计') {
return <Szwtqytj style={style}/> return <Szwtqytj style={style}/>
<<<<<<< HEAD
} else if (name === '视频监测') { } else if (name === '视频监测') {
return <Spjc style={style} /> return <Spjc style={style} />
} else if (name === '水库管理') { } else if (name === '水库管理') {
return <Skgl style={style} /> return <Skgl style={style} />
} else if (name === '防汛调度') { } else if (name === '防汛调度') {
return <Fxdd style={style} /> return <Fxdd style={style} />
=======
}else if (name === '灌区统计') { }else if (name === '灌区统计') {
return <GqSta style={style}/> return <GqSta style={style}/>
}else if (name === '月用水趋势') { }else if (name === '月用水趋势') {
@ -175,7 +170,6 @@ export default function PanelIndex({ name, style, ...params }) {
return <Szzdd style={style} /> return <Szzdd style={style} />
}else if (name == '预演方案') { }else if (name == '预演方案') {
return <Yyfa style={style} /> return <Yyfa style={style} />
>>>>>>> lsf-dev
} }
return ( return (
<PanelBox style={style} title={name} color="red"> <PanelBox style={style} title={name} color="red">