Merge pull request '1' (#123) from pc-master into portal

Reviewed-on: #123
portal
xiaomeng 2024-03-05 05:24:20 +00:00
commit c83c32794a
2 changed files with 4 additions and 4 deletions

View File

@ -72,7 +72,7 @@ export default {
// history history // history history
{ name: '历史数据', router: 'historyData', index: 1, routerList: ['historyData'], img: require('../assets/image/header-img3.png') }, { name: '历史数据', router: 'historyData', index: 1, routerList: ['historyData'], img: require('../assets/image/header-img3.png') },
//dataAnalysis dataAnalysis //dataAnalysis dataAnalysis
{ name: '数据分析', router: '', index: 1, routerList: [''], img: require('../assets/image/header-img4.png') }, { name: '数据分析', router: 'dataAnalysis', index: 1, routerList: ['dataAnalysis'], img: require('../assets/image/header-img4.png') },
// { name: '', router: '', routerList: [], img: require('../assets/image/header-img5.png') }, // { name: '', router: '', routerList: [], img: require('../assets/image/header-img5.png') },
//systemManage systemManage //systemManage systemManage
{ name: '管理', router: '', routerList: [''], img: require('../assets/image/header-img6.png') }, { name: '管理', router: '', routerList: [''], img: require('../assets/image/header-img6.png') },

View File

@ -4,7 +4,7 @@
<div class="page-content"> <div class="page-content">
<div class="table-title"> <div class="table-title">
<img src="../../assets/image/analysis.png" alt="" /> <img src="../../assets/image/analysis.png" alt="" />
智慧水肥(数据分析) 数据分析
</div> </div>
<div class="search-flex"> <div class="search-flex">
@ -14,8 +14,8 @@
start-placeholder="开始日期" end-placeholder="结束日期"> start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<div class="input-btn"> <div class="input-btn">
<div class="btn green"> <div class="btn blue">
<img src="../../assets/image/irrigateSet1.png" alt="" />查询 查询
</div> </div>
</div> </div>