智慧农业大数据平台
xiebin
2022-08-08 c3a64a9ebfbd8528444fee1ce4ce068a1dc557a6
农场物联网设备接口修改,增加在线离线判断展示
2 files modified
74 ■■■■ changed files
src/api/equipment/equipment.js 11 ●●●●● patch | view | raw | blame | history
src/views/farm/index.vue 63 ●●●●● patch | view | raw | blame | history
src/api/equipment/equipment.js
@@ -45,3 +45,14 @@
        }
    })
}
// 根据农场id获取设备列表 监控和监测在同一个集合
export const queryEquipmentList = (params) => {
    return request({
        url: 'http://dev.jxpskj.com:8030/pyh-station/stationAndVideo/queryEquipmentList',
        method: 'get',
        params: {
            ...params
        }
    })
}
src/views/farm/index.vue
@@ -143,36 +143,55 @@
            </div>
            <div v-show="zydksb =='sb'" class="lists-box sb">
                <!-- 视频监控数据 -->
                <div v-for="(item, index) in equipmentList.vidList"
                     :key="'vidList'+index"
                     class="lists-item"
                     @click="goToJkDetail(item)">
                    <div class="title">
                        <img src="/img/icon/jk.png" alt />
                        {{item.name}}
                    </div>
                    <div class="type on" v-if="item.onLine == 0">在线</div>
                    <div class="type off" v-else>离线</div>
                </div>
                <!-- 监测设备数据 -->
                <div
                    v-for="(item, index) in equipmentList.staList"
                    :key="'staList' + index"
                    class="lists-item"
                    @click="goToDetail(item)"
                        v-for="(item, index) in equipmentList"
                        :key="'equipmentList' + index"
                        class="lists-item"
                        @click="item.dictTypeNum == 0?goToJkDetail(item
                        ):goToDetail(item)"
                >
                    <div class="title">
                        <img v-if="item.dictTypeNum == 1" src="/img/icon/qx.png" alt />
                        <img v-if="item.dictTypeNum == 0" src="/img/icon/jk.png" alt />
                        <img v-else-if="item.dictTypeNum == 1" src="/img/icon/qx.png" alt />
                        <img v-else-if="item.dictTypeNum == 2" src="/img/icon/qx.png" alt />
                        <img v-else-if="item.dictTypeNum == 3" src="/img/icon/sz.png" alt />
                        <img v-else-if="item.dictTypeNum == 4" src="/img/icon/tr.png" alt />
                        <img v-else src="/img/icon/qx.png" alt />
                        {{item.name}}
                    </div>
                    <div class="type on" v-if="item.onLine == 0">在线</div>
                    <div class="type on" v-if="item.status">在线</div>
                    <div class="type off" v-else>离线</div>
                </div>
                <!-- 视频监控数据 -->
<!--                <div v-for="(item, index) in equipmentList.vidList"-->
<!--                     :key="'vidList'+index"-->
<!--                     class="lists-item"-->
<!--                     @click="goToJkDetail(item)">-->
<!--                    <div class="title">-->
<!--                        <img src="/img/icon/jk.png" alt />-->
<!--                        {{item.name}}-->
<!--                    </div>-->
<!--                    <div class="type on" v-if="item.onLine == 0">在线</div>-->
<!--                    <div class="type off" v-else>离线</div>-->
<!--                </div>-->
                <!-- 监测设备数据 -->
<!--                <div-->
<!--                    v-for="(item, index) in equipmentList.staList"-->
<!--                    :key="'staList' + index"-->
<!--                    class="lists-item"-->
<!--                    @click="goToDetail(item)"-->
<!--                >-->
<!--                    <div class="title">-->
<!--                        <img v-if="item.dictTypeNum == 1" src="/img/icon/qx.png" alt />-->
<!--                        <img v-else-if="item.dictTypeNum == 2" src="/img/icon/qx.png" alt />-->
<!--                        <img v-else-if="item.dictTypeNum == 3" src="/img/icon/sz.png" alt />-->
<!--                        <img v-else-if="item.dictTypeNum == 4" src="/img/icon/tr.png" alt />-->
<!--                        <img v-else src="/img/icon/qx.png" alt />-->
<!--                        {{item.name}}-->
<!--                    </div>-->
<!--                    <div class="type on" v-if="item.onLine == 0">在线</div>-->
<!--                    <div class="type off" v-else>离线</div>-->
<!--                </div>-->
            </div>
        </div>
@@ -492,7 +511,7 @@
    getFarmPlantList
} from '@/api/farm/farmingrecord'
import dateUtils from '@/utils/dateUtils'
import { getStationAndVideoList, getStationDateByStcd } from '@/api/equipment/equipment'
import { getStationDateByStcd, queryEquipmentList } from '@/api/equipment/equipment'
export default {
    data () {
@@ -666,9 +685,9 @@
        },
        getStationAndVideo () {
            var that = this
            getStationAndVideoList({ type: 'ALL', farmId: this.currentDetails.id }).then((res) => {
            queryEquipmentList({ type: 'ALL', farmId: this.currentDetails.id }).then((res) => {
                if (JSON.stringify(res.data) != '{}' && res.data.data) {
                    that.equipmentList = res.data.data
                    that.equipmentList = res.data.data.equipmentList
                }
            })
        },