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

guanqb

2022-08-31 f1715d795ae488fba341078e182c631e564f6781

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

 src/api/farm/farmingrecord.js

@@ -53,6 +53,17 @@
    })
}

// 获取种植记录(秧苗)
export const getFarmPlantYMList = (params) => {
    return request({
        url: '/farmPlant/getFarmPlantYMList',
        method: 'get',
        params: {
            ...params
        }
    })
}

export const remove = (ids) => {
    return request({
        url: '/farmingRecord/remove',

 src/views/equipment/index.vue

@@ -43,7 +43,7 @@
            <div class="current-wrapper">
                <div class="video-boxs">
                    <div class="header">
                        <img src="/img/icon/video-logo.png" alt /> 视频监控
                        <img src="../../../public/img/icon/video-logo.png" alt /> 视频监控
                    </div>

                    <div class="body">
@@ -68,7 +68,7 @@

                <div class="equipment-boxs">
                    <div class="header">
                        <img src="/img/icon/equipment-logo.png" alt />物联网设备
                        <img src="../../../public/img/icon/equipment-logo.png" alt />物联网设备
                    </div>

                    <div class="body">
@@ -88,7 +88,7 @@
                            <div v-for="(item, index) in stationData.weatherList" :key="index">
                                <div class="top">
                                    <div class="l">
                                        <img src="/img/icon/wd-icon.png" alt />
                                        <img src="../../../public/img/icon/wd-icon.png" alt />
                                        <span>{{item.name}}</span>
                                    </div>

@@ -114,7 +114,7 @@
                            <div v-for="(item, index) in stationData.soliList" :key="index">
                                <div class="top">
                                    <div class="l">
                                        <img src="/img/icon/wd-icon.png" alt />
                                        <img src="../../../public/img/icon/wd-icon.png" alt />
                                        <span>{{item.name}}</span>
                                    </div>

@@ -140,7 +140,7 @@
                            <div v-for="(item, index) in stationData.airList" :key="index">
                                <div class="top">
                                    <div class="l">
                                        <img src="/img/icon/wd-icon.png" alt />
                                        <img src="../../../public/img/icon/wd-icon.png" alt />
                                        <span>{{item.name}}</span>
                                    </div>

@@ -166,7 +166,7 @@
                            <div v-for="(item, index) in stationData.waterList" :key="index">
                                <div class="top">
                                    <div class="l">
                                        <img src="/img/icon/wd-icon.png" alt />
                                        <img src="../../../public/img/icon/wd-icon.png" alt />
                                        <span>{{item.name}}</span>
                                    </div>

@@ -207,7 +207,7 @@
                <img
                    @click="echartsBosShow = false"
                    class="close"
                    src="/img/icon/echarts-close.png"
                    src="../../../public/img/icon/echarts-close.png"
                    alt
                />
                <div id="EchartsBox"></div>
@@ -804,7 +804,7 @@
                            align-items: center;
                            width: 338px;
                            height: 118px;
                            background: url(/img/icon/monitor-bg.png) no-repeat;
                            background: url(../../../public/img/icon/monitor-bg.png) no-repeat;
                            background-size: 100% 100%;

                            .top {

 src/views/farm/index.vue

@@ -127,6 +127,17 @@
                        <span>{{item.landUnit == 0 ? '亩' : item.landUnit == 1 ? '分' : '平方米'}}</span>
                    </div>
                </div>

                <div v-for="(item, index) in farmPlantYMList" :key="'farmPlantYMList'+index">
                    <div class="title">
                        <img :src="item.url" alt />
                        {{item.strainName}}
                    </div>
                    <div class="num-unit">
                        {{item.area}}
                        <span>{{item.landUnit == 0 ? '亩' : item.landUnit == 1 ? '分' : '平方米'}}</span>
                    </div>
                </div>
            </div>

            <div v-show="zydksb == 'dk'" class="lists-box dk">
@@ -316,7 +327,7 @@
                            <div class="title">{{item.strainName}}</div>
                            <div
                                class="time"
                            >{{item.createTime}} {{item.plantingWay == 0 ? '移摘' : item.plantingWay == 1 ? '直播' : '秧苗'}}</div>
                            >{{item.createTime}} {{item.plantingWay == 0 ? '移栽' : item.plantingWay == 1 ? '直播' : '秧苗'}}</div>
                        </div>
                    </div>
                </div>
@@ -545,7 +556,8 @@
import {
    getLandList,
    getFarmingRecordList,
    getFarmPlantList
    getFarmPlantList,
    getFarmPlantYMList
} from '@/api/farm/farmingrecord'
import dateUtils from '@/utils/dateUtils'
import { getStationDateByStcd, queryEquipmentList } from '@/api/equipment/equipment'
@@ -565,6 +577,7 @@
            sourceList: [],
            farmRecordList: [],
            farmPlantList: [],
            farmPlantYMList:[],
            plotLists: [],
            // 溯源码编号
            sourceCode: '',
@@ -601,6 +614,7 @@
            this.getSourceList({ code: '' })
            this.getFarmingRecordList()
            this.getFarmPlantList()
            this.getFarmPlantYMList()
            this.getLandList()
            this.getStationAndVideo()
        })
@@ -633,10 +647,18 @@
            this.currentClickPlot = params
            this.plotDetailsPlantList = []
            this.plotDetailsRecordList = []
            getFarmPlantList({ farmId: this.currentDetails.id, landId: params.id }).then(res => {
            getFarmPlantList({ farmId: this.currentDetails.id, landId: params.id,status:1 }).then(res => {
                this.plotDetailsPlantList = res.data.data
            })

                getFarmPlantYMList({ farmId: this.currentDetails.id, landId: params.id,status:1  }).then(res => {
                    // res.data.data.forEach((e)=>{
                    //     e.strainName = e.strainName+"("+"秧苗"+")"
                    // })
                    res.data.data.forEach((e)=>{
                        this.plotDetailsPlantList.push(e)
                    })
                })
            })
            getFarmingRecordList({ farmId: this.currentDetails.id, landId: params.id }).then(res => {
                this.plotDetailsRecordList = res.data.data
            })
@@ -704,6 +726,14 @@
            })
        },

        getFarmPlantYMList(){
            getFarmPlantYMList({ farmId: this.currentDetails.id, status: 1 }).then(res => {
                res.data.data.forEach((e)=>{
                    e.strainName = e.strainName+"("+"秧苗"+")"
                })
                this.farmPlantYMList = res.data.data
            })
        },
        getLandList () {
            getLandList({ farmId: this.currentDetails.id }).then(res => {
                res.data.data.forEach(item => {