大屏接口对接

zengh

2022-07-05 195ee89625e49456aa3658c19110c6c8dbe2b769

大屏接口对接

 package-lock.json

@@ -1945,6 +1945,63 @@
          "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
          "dev": true
        },
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.2",
          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "ssri": {
          "version": "8.0.1",
          "resolved": "https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1621364647836&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1952,6 +2009,28 @@
          "dev": true,
          "requires": {
            "minipass": "^3.1.1"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        },
        "vue-loader-v16": {
          "version": "npm:vue-loader@16.8.3",
          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
          "dev": true,
          "optional": true,
          "requires": {
            "chalk": "^4.1.0",
            "hash-sum": "^2.0.0",
            "loader-utils": "^2.0.0"
          }
        }
      }
@@ -12944,87 +13023,6 @@
          "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-1.0.2.tgz",
          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
          "dev": true
        }
      }
    },
    "vue-loader-v16": {
      "version": "npm:vue-loader@16.8.3",
      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
      "dev": true,
      "optional": true,
      "requires": {
        "chalk": "^4.1.0",
        "hash-sum": "^2.0.0",
        "loader-utils": "^2.0.0"
      },
      "dependencies": {
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.2",
          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        }
      }
    },

 public/DS-Digital.zip

Binary files differ

 src/api/farm/farmingrecord.js

@@ -105,3 +105,33 @@
        }
    })
}

export const statisticsStockAndYield = (params) => {
    return request({
        url: '/farmProductStock/statisticsStockAndYield',
        method: 'get',
        params: {
            ...params
        }
    })
}

export const pageCount = (params) => {
    return request({
        url: '/farmPlant/pageCount',
        method: 'get',
        params: {
            ...params
        }
    })
}

export const pageCountNz = (params) => {
    return request({
        url: '/stock/stock/page',
        method: 'get',
        params: {
            ...params
        }
    })
}

 src/router/axios.js

@@ -12,8 +12,8 @@
//   console.log(window.location);
//   console.log(url);
// }, 3000);
window.$apiUrls = 'http://182.106.212.58:8013/api'
// window.$apiUrls = 'http://192.168.0.109:82'
// window.$apiUrls = 'http://182.106.212.58:8013/api'
window.$apiUrls = 'http://localhost:89'
const service = axios.create({
    //   baseURL: 'http://192.168.0.107:83',


 src/views/manage/index.vue

@@ -15,47 +15,47 @@
            <div class="t">
                <statistics-num
                    :className="'td'"
                    :totalRegion="545.01"
                        :totalRegion="znum"
                    :imgUrl="'/img/icon/mj.png'"
                    :unit="'亩'"
                    :title="'土地面积'"
                    :subOneTitle="'使用面积'"
                    :subOneNum="545.01"
                        :subOneNum="landsnum"
                    :subTwoTitle="'未使用面积'"
                    :subTwoNum="0"
                        :subTwoNum="landwnum"
                ></statistics-num>
                <statistics-num
                    :className="'kc'"
                    :totalRegion="652"
                        :totalRegion="stockTj"
                    :imgUrl="'/img/icon/kc.png'"
                    :unit="'公斤'"
                    :title="'库存数量'"
                    :subOneTitle="'农产品'"
                    :subOneNum="652"
                        :subOneNum="stockNCP"
                    :subTwoTitle="'加工产品'"
                    :subTwoNum="0"
                        :subTwoNum="stockJG"
                ></statistics-num>
                <statistics-num
                    :className="'nz'"
                    :totalRegion="198"
                        :totalRegion="jnStock"
                    :imgUrl="'/img/icon/syl.png'"
                    :unit="'公斤'"
                    :title="'农资年使用量'"
                    :subOneTitle="'去年使用'"
                    :subOneNum="232"
                        :subOneNum="qnStock"
                    :subTwoTitle="'本月使用'"
                    :subTwoNum="0"
                        :subTwoNum="byStock"
                ></statistics-num>
                <statistics-num
                    :className="'cl'"
                    :totalRegion="6256"
                        :totalRegion="yieldTj"
                    :imgUrl="'/img/icon/ncl.png'"
                    :unit="'公斤'"
                    :title="'年产量'"
                    :subOneTitle="'农产品'"
                    :subOneNum="4500"
                        :subOneNum="yieldNCP"
                    :subTwoTitle="'加工产品'"
                    :subTwoNum="1756"
                        :subTwoNum="yieldJG"
                ></statistics-num>
                <statistics-num
                    :className="'lt'"
@@ -120,28 +120,28 @@
                    </div>
                    <date-select></date-select>
                    <div v-if="nzOrNcp == 'ncp'" class="lists-box">
                        <div>
                            <div>1</div>
                            <div>水稻</div>
                            <div>545.01亩</div>
                        <div v-for="(item,index) in ncptr" :key="index" >
                            <div>{{index + 1}}</div>
                            <div>{{item.strainName}}</div>
                            <div>{{item.area}}亩</div>
                        </div>
                        <div>
                            <div>2</div>
                            <div>玉米</div>
                            <div>75.12亩</div>
                        </div>
                        <!--                        <div>-->
                        <!--                            <div>2</div>-->
                        <!--                            <div>玉米</div>-->
                        <!--                            <div>75.12亩</div>-->
                        <!--                        </div>-->
                    </div>
                    <div v-if="nzOrNcp == 'nz'" class="lists-box">
                        <div>
                            <div>1</div>
                            <div>有机肥料</div>
                            <div>120公斤</div>
                        <div v-for="(item,index) in nztr" :key="index" >
                            <div>{{index + 1}}</div>
                            <div>{{item.agrname}}</div>
                            <div>{{item.cnum}}公斤</div>
                        </div>
                        <div>
                            <div>2</div>
                            <div>复合肥料</div>
                            <div>68公斤</div>
                        </div>
<!--                        <div>-->
<!--                            <div>2</div>-->
<!--                            <div>复合肥料</div>-->
<!--                            <div>68公斤</div>-->
<!--                        </div>-->
                    </div>
                </div>
                <div class="trp-ncp">
@@ -265,7 +265,7 @@
<script>
import { selectXCount } from '@/api/land/land'
// eslint-disable-next-line no-unused-vars
import { page, getStockCount, pagePalnt } from '@/api/farm/farmingrecord'
    import { page, getStockCount, pagePalnt, statisticsStockAndYield, pageCount,pageCountNz } from '@/api/farm/farmingrecord'

export default {
    data () {
@@ -277,6 +277,21 @@
            qnStock: 0,
            byStock: 0,
            farmPlanList: [],
                // 库存数量统计
                stockTj: 0,
                // 农产品数量统计
                stockNCP: 0,
                // 加工产品数量统计
                stockJG: 0,
                // 年产量统计
                yieldTj: 0,
                // 农产品年产量统计
                yieldNCP: 0,
                // 加工产品年产量统计
                yieldJG: 0,
                // 农产品投入
                ncptr: [],
                nztr: [],
            nzOrNcp: 'ncp',
            trpOrNcp: 'trp'
        }
@@ -285,10 +300,15 @@
        this.selectXCount()
        this.getStockCount()
        this.page()
            // 年产量与库存数量
            this.statisticsStockAndYield()
            // 农产品投入
            this.pageCount()
            // 农资投入
            this.pageCountNz()
    },
    mounted () {
        this.initBar('TaskNumEcharts')
        this.initTrpBar('TrpEcharts')
        // this.initNcpBar('NcpEcharts')
        this.initClSyBar('ClSyEcharts')
    },
@@ -406,7 +426,13 @@
            const that = this
            const chartDom = document.getElementById(dom)
            const myChart = this.$echarts.init(chartDom)

                var nztrData = this.nztr
                var nztrX = []
                var nztrY = []
                for (let i = 0; i < nztrData.length; i++) {
                    nztrX.push(nztrData[i].agrname)
                    nztrY.push(nztrData[i].cnum)
                }
            const option = {
                grid: {
                    top: '14%',
@@ -417,10 +443,7 @@
                },
                xAxis: {
                    type: 'category',
                    data: [
                        '有机肥料',
                        '复合肥料'
                    ],
                        data: nztrX,
                    axisLine: {
                        lineStyle: {
                            color: 'rgba(153,153,153,.4)'
@@ -463,7 +486,7 @@
                    {
                        type: 'bar',
                        barWidth: 32,
                        data: [500, 60],
                            data: nztrY,
                        label: {
                            show: true,
                            position: 'top',
@@ -751,9 +774,9 @@
            var that = this
            var deptId = '1123598813738675201'
            selectXCount(deptId).then((res) => {
                that.landsnum = res.data.data.snum
                that.landwnum = res.data.data.wnum
                that.znum = res.data.data.num
                    that.landsnum = res.data.data.snum.toFixed(0)
                    that.landwnum = res.data.data.wnum.toFixed(0)
                    that.znum = res.data.data.num.toFixed(0)
            })
        },
        // 农资使用概况
@@ -761,22 +784,58 @@
            var that = this
            var deptId = '1123598813738675201'
            getStockCount(deptId).then((res) => {
                that.jnStock = res.data.data.jn
                that.qnStock = res.data.data.qn
                that.byStock = res.data.data.by
                    that.jnStock = res.data.data.jn.toFixed(0)
                    that.qnStock = res.data.data.qn.toFixed(0)
                    that.byStock = res.data.data.by.toFixed(0)
            })
        },
        // 农事记录
        page () {
            var params = {
            }
                var params = {}
            params.tenantId = '000000'
            params.deptId = '1123598813738675201'
            page(1, 10, Object.assign(params)).then((res) => {
                this.farmPlanList = res.data.data.records
            })
        }
            },
            // 大屏经营概况库存数量与年产量
            statisticsStockAndYield () {
                var params = {}
                params.tenantId = '000000'
                params.deptId = '1123598813738675201'
                params.year = '2022'
                statisticsStockAndYield(Object.assign(params)).then((res) => {
                    this.stockNCP = res.data.data.sum
                    this.stockJG = res.data.data.jgsum
                    this.stockTj = res.data.data.jgsum + res.data.data.sum

                    this.yieldNCP = res.data.data.ncpNcl
                    this.yieldJG = res.data.data.jgNcl
                    this.yieldTj = res.data.data.ncpNcl + res.data.data.jgNcl
                })
            },
            // 农产品投入
            pageCount () {
                var params = {}
                params.tenantId = '000000'
                params.deptId = '1123598813738675201'
                params.year = '2022'
                pageCount(Object.assign(params)).then((res) => {
                    this.ncptr = res.data.data
                })
            },
            // 农资投入
            pageCountNz () {
                var params = {}
                params.codes = '000000'
                params.deptId = '1123598813738675201'
                params.year = '2022'
                pageCountNz(Object.assign(params)).then((res) => {
                    this.nztr = res.data.data.records
                    // 投入品监管图表
                    this.initTrpBar('TrpEcharts')
                })
            }
    }
}
</script>