Merge branch 'master' of http://192.168.0.105:10010/r/zhny-dsjdp

shuishen

2022-08-10 b9ffd276b4fa8ca1918f486e70d7e4d0d04d9d9f

 src/views/home/index.vue

@@ -334,19 +334,26 @@
            </template>
            <template slot="public-box-content">
                <div class="market-title">
                    <el-select placeholder="请选择农场"></el-select>
                    <el-select v-model="farm.id" placeholder="请选择农场" @change="scFarmChange">
                        <el-option
                                v-for="item in farmNumArray"
                                :key="item.id"
                                :label="item.farmName"
                                :value="item.id">
                        </el-option>
                    </el-select>
                    <div class="date">
                        <el-date-picker
                            v-model="value1"
                            type="daterange"
                            v-model="scSelectTime"
                            type="daterange" value-format="yyyy-MM-dd"
                            range-separator="至"
                            start-placeholder="开始时间"
                            end-placeholder="结束时间"
                        ></el-date-picker>
                    </div>
                    <div class="query-button">
                        <el-button type="primary" icon="el-icon-search">查询</el-button>
                        <el-button type="info" icon="el-icon-refresh-right">重置</el-button>
                        <el-button type="primary" icon="el-icon-search" @click="searchMarketDistrict">查询</el-button>
                        <el-button type="info" icon="el-icon-refresh-right" @click="scltReset">重置</el-button>
                    </div>
                </div>

@@ -522,6 +529,10 @@
<script>
// eslint-disable-next-line no-unused-vars
import {
    getStationAndVideoCount,
    getStationAndVideoList
} from '@/api/equipment/equipment'
import {
    getFarmingCount,
    getFarmingStatis,
    pagePalnt,
@@ -531,9 +542,7 @@
    selectMarketDistrict,
    getFarmList,
    getLandList,
    getFarmingRecordList,
    getStationAndVideoCount,
    getStationAndVideoList
    getFarmingRecordList
} from '@/api/farm/farmingrecord'
// eslint-disable-next-line no-unused-vars
import { selectXCount } from '@/api/land/land'
@@ -559,6 +568,10 @@
            salaNumY: [],
            // 市场流通
            marketDistrict: [],
            farm: {},
            scSelectTime: '',
            scStartTime: '',
            scEndTime: '',
            ncListShow: false,
            jkListShow: false,
            jcListShow: false,
@@ -1037,6 +1050,20 @@
                that.marketDistrict = res.data.data
            })
        },
        // 市场流通条件筛选
        searchMarketDistrict () {
            var that = this
            var params = {}
            params.farmId = this.farm.id
            if (that.scSelectTime) {
                params.startTime = that.scSelectTime[0]
                params.endTime = that.scSelectTime[1]
            }
            selectMarketDistrict(Object.assign(params)).then((res) => {
                that.marketDistrict = res.data.data
                this.setMarketChart('marketChartQx')
            })
        },
        // 统计今年和去年的销售总额
        selctSaletZ () {
            var that = this
@@ -1330,6 +1357,13 @@
                    })
                }
            })
        },
        scFarmChange (data) {
            this.farm.id = data
        },
        scltReset () {
            this.farm.id = ''
            this.scSelectTime = ''
        }
    }
}
@@ -1982,6 +2016,7 @@
                white-space: nowrap;
                overflow: hidden;
                text-overflow: ellipsis;
                cursor: pointer;
            }

            .box:hover {
@@ -2005,6 +2040,7 @@
        font-size: 14px;
        color: #6de9f3;
        box-sizing: border-box;
        cursor: pointer;

        .icon {
            width: 24px;