merge():合并冲突

src/views/Home/PanelIndex.js

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