From dde865a1bab3dc70fd711ca7de839f988a67dd60 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 08 Jul 2022 20:03:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny-dsjdp

---
 src/views/home/index.vue   |    8 
 package-lock.json          |   16 
 src/views/manage/index.vue | 2149 ++++++++++++++++++++++++++++-----------------------------
 3 files changed, 1,074 insertions(+), 1,099 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f97ceaa..e82edb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1947,7 +1947,7 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "optional": true,
@@ -1957,7 +1957,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "optional": true,
@@ -1968,7 +1968,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "optional": true,
@@ -1978,21 +1978,21 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "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.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "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.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
           "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
           "dev": true,
           "optional": true,
@@ -2013,7 +2013,7 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "optional": true,
@@ -2023,7 +2023,7 @@
         },
         "vue-loader-v16": {
           "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
           "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
           "dev": true,
           "optional": true,
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 39e93ab..5714e40 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -254,10 +254,10 @@
                 <div class="logo"></div>
                 <div class="title">123</div>
                 <img
-                    @click="farmProfiles = false"
-                    src="/img/icon/public-close.png"
-                    alt
-                    class="close"
+                        @click="farmProfiles = false"
+                        src="/img/icon/public-close.png"
+                        alt
+                        class="close"
                 />
             </template>
             <template slot="public-box-content">
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index 1d170a8..bd593a6 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -1,8 +1,8 @@
 /*
 * @Author: Morpheus
 * @Date: 2022-05-11 15:00:23
- * @Last Modified by: Morpheus
- * @Last Modified time: 2022-07-08 12:02:58
+* @Last Modified by: Morpheus
+* @Last Modified time: 2022-07-01 12:00:07
 * 经营主体监管
 */
 <template>
@@ -14,86 +14,86 @@
         <div class="main-content">
             <div class="t">
                 <statistics-num
-                    :className="'td'"
-                    :totalRegion="znum"
-                    :imgUrl="'/img/icon/mj.png'"
-                    :unit="'亩'"
-                    :title="'土地面积'"
-                    :subOneTitle="'使用面积'"
-                    :subOneNum="landsnum"
-                    :subTwoTitle="'未使用面积'"
-                    :subTwoNum="landwnum"
+                        :className="'td'"
+                        :totalRegion="znum"
+                        :imgUrl="'/img/icon/mj.png'"
+                        :unit="'亩'"
+                        :title="'土地面积'"
+                        :subOneTitle="'使用面积'"
+                        :subOneNum="landsnum"
+                        :subTwoTitle="'未使用面积'"
+                        :subTwoNum="landwnum"
                 ></statistics-num>
                 <statistics-num
-                    :className="'kc'"
-                    :totalRegion="stockTj"
-                    :imgUrl="'/img/icon/kc.png'"
-                    :unit="'公斤'"
-                    :title="'库存数量'"
-                    :subOneTitle="'农产品'"
-                    :subOneNum="stockNCP"
-                    :subTwoTitle="'加工产品'"
-                    :subTwoNum="stockJG"
+                        :className="'kc'"
+                        :totalRegion="stockTj"
+                        :imgUrl="'/img/icon/kc.png'"
+                        :unit="'公斤'"
+                        :title="'库存数量'"
+                        :subOneTitle="'农产品'"
+                        :subOneNum="stockNCP"
+                        :subTwoTitle="'加工产品'"
+                        :subTwoNum="stockJG"
                 ></statistics-num>
                 <statistics-num
-                    :className="'nz'"
-                    :totalRegion="jnStock"
-                    :imgUrl="'/img/icon/syl.png'"
-                    :unit="'公斤'"
-                    :title="'农资年使用量'"
-                    :subOneTitle="'去年使用'"
-                    :subOneNum="qnStock"
-                    :subTwoTitle="'本月使用'"
-                    :subTwoNum="byStock"
+                        :className="'nz'"
+                        :totalRegion="jnStock"
+                        :imgUrl="'/img/icon/syl.png'"
+                        :unit="'公斤'"
+                        :title="'农资年使用量'"
+                        :subOneTitle="'去年使用'"
+                        :subOneNum="qnStock"
+                        :subTwoTitle="'本月使用'"
+                        :subTwoNum="byStock"
                 ></statistics-num>
                 <statistics-num
-                    :className="'cl'"
-                    :totalRegion="yieldTj"
-                    :imgUrl="'/img/icon/ncl.png'"
-                    :unit="'公斤'"
-                    :title="'年产量'"
-                    :subOneTitle="'农产品'"
-                    :subOneNum="yieldNCP"
-                    :subTwoTitle="'加工产品'"
-                    :subTwoNum="yieldJG"
+                        :className="'cl'"
+                        :totalRegion="yieldTj"
+                        :imgUrl="'/img/icon/ncl.png'"
+                        :unit="'公斤'"
+                        :title="'年产量'"
+                        :subOneTitle="'农产品'"
+                        :subOneNum="yieldNCP"
+                        :subTwoTitle="'加工产品'"
+                        :subTwoNum="yieldJG"
                 ></statistics-num>
                 <statistics-num
-                    :className="'lt'"
-                    :totalRegion="salaNumBN"
-                    :imgUrl="'/img/icon/lt.png'"
-                    :unit="'公斤'"
-                    :title="'市场流通量'"
-                    :subOneTitle="'去年流通量'"
-                    :subOneNum="salaNumQN"
-                    :subTwoTitle="'本月流通量'"
-                    :subTwoNum="salaNumBY"
+                        :className="'lt'"
+                        :totalRegion="salaNumBN"
+                        :imgUrl="'/img/icon/lt.png'"
+                        :unit="'公斤'"
+                        :title="'市场流通量'"
+                        :subOneTitle="'去年流通量'"
+                        :subOneNum="salaNumQN"
+                        :subTwoTitle="'本月流通量'"
+                        :subTwoNum="salaNumBY"
                 ></statistics-num>
             </div>
             <div class="c">
                 <div class="time-box">
                     <time-box
-                        :imgUrl="'/img/icon/current.png'"
-                        :title="'溯源次数'"
-                        :currentNum="34"
-                        :subTitle="'昨日溯源次数对比'"
-                        :contrast="28"
-                        :upDown="'up'"
+                            :imgUrl="'/img/icon/current.png'"
+                            :title="'溯源次数'"
+                            :currentNum="34"
+                            :subTitle="'昨日溯源次数对比'"
+                            :contrast="28"
+                            :upDown="'up'"
                     ></time-box>
                     <time-box
-                        :imgUrl="'/img/icon/week.png'"
-                        :title="'溯源次数'"
-                        :currentNum="61"
-                        :subTitle="'上周溯源次数对比'"
-                        :contrast="36"
-                        :upDown="'up'"
+                            :imgUrl="'/img/icon/week.png'"
+                            :title="'溯源次数'"
+                            :currentNum="61"
+                            :subTitle="'上周溯源次数对比'"
+                            :contrast="36"
+                            :upDown="'up'"
                     ></time-box>
                     <time-box
-                        :imgUrl="'/img/icon/month.png'"
-                        :title="'溯源次数'"
-                        :currentNum="88"
-                        :subTitle="'上月溯源次数对比'"
-                        :contrast="96"
-                        :upDown="'down'"
+                            :imgUrl="'/img/icon/month.png'"
+                            :title="'溯源次数'"
+                            :currentNum="88"
+                            :subTitle="'上月溯源次数对比'"
+                            :contrast="96"
+                            :upDown="'down'"
                     ></time-box>
                 </div>
                 <div class="task-box">
@@ -120,7 +120,7 @@
                     </div>
                     <date-select></date-select>
                     <div v-if="nzOrNcp == 'ncp'" class="lists-box">
-                        <div v-for="(item,index) in ncptr" :key="index">
+                        <div v-for="(item,index) in ncptr" :key="index" >
                             <div>{{index + 1}}</div>
                             <div>{{item.strainName}}</div>
                             <div>{{item.area}}亩</div>
@@ -132,16 +132,16 @@
                         <!--                        </div>-->
                     </div>
                     <div v-if="nzOrNcp == 'nz'" class="lists-box">
-                        <div v-for="(item,index) in nztr" :key="index">
+                        <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">
@@ -161,7 +161,7 @@
 
                         <div class="more">
                             明细
-                            <img src="/img/icon/more.png" alt />
+                            <img src="/img/icon/more.png" alt/>
                         </div>
                     </div>
 
@@ -209,49 +209,21 @@
 
                         <div class="more">
                             更多
-                            <img src="/img/icon/more.png" alt />
+                            <img src="/img/icon/more.png" alt/>
                         </div>
                     </div>
 
                     <div class="lists-box">
-                        <div>
+                        <div  v-for="(item,index) in farminList" :key="index">
                             <div class="t-border"></div>
                             <div class="t-item">
-                                <div>施肥</div>
-                                <div>2022-06-31</div>
+                                <div>{{item.typeName}}</div>
+                                <div>{{item.time}}</div>
                             </div>
                             <div class="b-item">
                                 <div>水稻</div>
-                                <div>林术</div>
-                                <div>株良镇田南村5号地块</div>
-                            </div>
-                            <div class="b-border"></div>
-                        </div>
-
-                        <div>
-                            <div class="t-border"></div>
-                            <div class="t-item">
-                                <div>施肥</div>
-                                <div>2022-06-31</div>
-                            </div>
-                            <div class="b-item">
-                                <div>水稻</div>
-                                <div>王刚</div>
-                                <div>株良镇田南村3号地块</div>
-                            </div>
-                            <div class="b-border"></div>
-                        </div>
-
-                        <div>
-                            <div class="t-border"></div>
-                            <div class="t-item">
-                                <div>施肥</div>
-                                <div>2022-06-31</div>
-                            </div>
-                            <div class="b-item">
-                                <div>玉米</div>
-                                <div>李建国</div>
-                                <div>株良镇田南村1号地块</div>
+                                <div>管理员</div>
+                                <div>{{item.landName}}</div>
                             </div>
                             <div class="b-border"></div>
                         </div>
@@ -263,485 +235,118 @@
 </template>
 
 <script>
-import { selectXCount } from '@/api/land/land'
-// eslint-disable-next-line no-unused-vars
-import { page, getStockCount, pagePalnt, statisticsStockAndYield, pageCount, pageCountNz, selectMarketCirculate, countTaskNum, farmingRecords } from '@/api/farm/farmingrecord'
+    import { selectXCount } from '@/api/land/land'
+    // eslint-disable-next-line no-unused-vars
+    import { page, getStockCount, pagePalnt, statisticsStockAndYield, pageCount, pageCountNz, selectMarketCirculate, countTaskNum, farmingRecords } from '@/api/farm/farmingrecord'
 
-export default {
-    data () {
-        return {
-            landsnum: 0,
-            landwnum: 0,
-            znum: 0,
-            jnStock: 0,
-            qnStock: 0,
-            byStock: 0,
-            farmPlanList: [],
-            // 库存数量统计
-            stockTj: 0,
-            // 农产品数量统计
-            stockNCP: 0,
-            // 加工产品数量统计
-            stockJG: 0,
-            // 年产量统计
-            yieldTj: 0,
-            // 农产品年产量统计
-            yieldNCP: 0,
-            // 加工产品年产量统计
-            yieldJG: 0,
+    export default {
+        data () {
+            return {
+                landsnum: 0,
+                landwnum: 0,
+                znum: 0,
+                jnStock: 0,
+                qnStock: 0,
+                byStock: 0,
+                farmPlanList: [],
+                // 库存数量统计
+                stockTj: 0,
+                // 农产品数量统计
+                stockNCP: 0,
+                // 加工产品数量统计
+                stockJG: 0,
+                // 年产量统计
+                yieldTj: 0,
+                // 农产品年产量统计
+                yieldNCP: 0,
+                // 加工产品年产量统计
+                yieldJG: 0,
+                // 农产品投入
+                ncptr: [],
+                nztr: [],
+                // 统计市场流通/去年流通量/本月流通量
+                salaNumBN: [],
+                salaNumBY: [],
+                salaNumQN: [],
+                // 统计任务总数
+                taskNum: [],
+                // 农事记录
+                farminList: [],
+                nzOrNcp: 'ncp',
+                trpOrNcp: 'trp'
+            }
+        },
+        created () {
+            this.selectXCount()
+            this.getStockCount()
+            this.page()
+            // 年产量与库存数量
+            this.statisticsStockAndYield()
             // 农产品投入
-            ncptr: [],
-            nztr: [],
+            this.pageCount()
+            // 农资投入
+            this.pageCountNz()
             // 统计市场流通/去年流通量/本月流通量
-            salaNumBN: [],
-            salaNumBY: [],
-            salaNumQN: [],
+            this.selectMarketCirculate()
             // 统计任务总数
-            taskNum: [],
-            nzOrNcp: 'ncp',
-            trpOrNcp: 'trp'
-        }
-    },
-    created () {
-        this.selectXCount()
-        this.getStockCount()
-        this.page()
-        // 年产量与库存数量
-        this.statisticsStockAndYield()
-        // 农产品投入
-        this.pageCount()
-        // 农资投入
-        this.pageCountNz()
-        // 统计市场流通/去年流通量/本月流通量
-        this.selectMarketCirculate()
-        // 统计任务总数
-        this.countTaskNum()
-        // 农事操作
-        this.farmingRecords()
-    },
-    mounted () {
-        // this.initNcpBar('NcpEcharts')
-        this.initClSyBar('ClSyEcharts')
-    },
-    methods: {
-        initBar (dom) {
-            const that = this
-            const chartDom = document.getElementById(dom)
-            const myChart = this.$echarts.init(chartDom)
+            this.countTaskNum()
+            // 农事操作
+            this.farmingRecords()
+        },
+        mounted () {
+            // this.initNcpBar('NcpEcharts')
+            this.initClSyBar('ClSyEcharts')
+        },
+        methods: {
+            initBar (dom) {
+                const that = this
+                const chartDom = document.getElementById(dom)
+                const myChart = this.$echarts.init(chartDom)
 
-            var x = []
-            var y = []
-            for (let i = 0; i < that.taskNum.length; i++) {
-                x.push(that.taskNum[i].y)
-                y.push(that.taskNum[i].count)
-            }
+               var x = []
+               var y = []
+                for (let i = 0; i < that.taskNum.length; i++) {
+                    x.push(that.taskNum[i].y)
+                    y.push(that.taskNum[i].count)
+                }
 
-            const option = {
-                grid: {
-                    top: '14%',
-                    left: '2%',
-                    right: '2%',
-                    bottom: '2%',
-                    containLabel: true
-                },
-                xAxis: {
-                    type: 'category',
-                    data: x,
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(153,153,153,.4)'
-                        }
+                const option = {
+                    grid: {
+                        top: '14%',
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        containLabel: true
                     },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLabel: {
-                        color: 'rgba(255,255,255,.4)',
-                        rotate: 0
-                    }
-                },
-                yAxis: {
-                    max: 50,
-                    name: '(次)',
-                    nameTextStyle: {
-                        color: 'rgba(255,255,255,.4)'
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: '#657CA8'
-                        }
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(62,81,97, .5)',
-                            type: 'dashed'
-                        }
-                    },
-                    axisLabel: {
-                        color: 'rgba(255,255,255,.4)'
-                    }
-                },
-                series: [
-                    {
-                        type: 'bar',
-                        barWidth: 32,
-                        data: y,
-                        label: {
-                            show: true,
-                            position: 'top',
-                            textStyle: {
-                                color: 'rgba(255,255,255,.4)'
+                    xAxis: {
+                        type: 'category',
+                        data: x,
+                        axisLine: {
+                            lineStyle: {
+                                color: 'rgba(153,153,153,.4)'
                             }
                         },
-                        itemStyle: {
-                            normal: {
-                                color:
-
-                                    function (params) {
-                                        var colorList = [
-                                            ['#24A5DF', '#01E2D2'],
-                                            ['#E59438', '#FEF880 '],
-                                            ['#E34C4C', '#E6945E']
-                                        ]
-                                        var index = params.dataIndex
-                                        if (params.dataIndex >= colorList.length) {
-                                            index = params.dataIndex - colorList.length
-                                        }
-                                        return new that.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                                            {
-                                                offset: 0,
-                                                color: colorList[index][0]
-                                            },
-                                            {
-                                                offset: 0.5,
-                                                color: colorList[index][0]
-                                            },
-                                            {
-                                                offset: 1,
-                                                color: colorList[index][1]
-                                            }
-                                        ])
-                                    }
-
-                            }
-                        }
-                    }
-                ]
-            }
-
-            option && myChart.setOption(option)
-        },
-
-        initTrpBar (dom) {
-            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%',
-                    left: '2%',
-                    right: '2%',
-                    bottom: '2%',
-                    containLabel: true
-                },
-                xAxis: {
-                    type: 'category',
-                    data: nztrX,
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(153,153,153,.4)'
-                        }
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLabel: {
-                        color: 'rgba(255,255,255,.4)',
-                        rotate: 0
-                    }
-                },
-                yAxis: {
-                    max: 600,
-                    name: '(公斤)',
-                    nameTextStyle: {
-                        color: 'rgba(255,255,255,.4)'
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: '#657CA8'
-                        }
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(62,81,97, .5)',
-                            type: 'dashed'
-                        }
-                    },
-                    axisLabel: {
-                        color: 'rgba(255,255,255,.4)'
-                    }
-                },
-                series: [
-                    {
-                        type: 'bar',
-                        barWidth: 32,
-                        data: nztrY,
-                        label: {
-                            show: true,
-                            position: 'top',
-                            textStyle: {
-                                color: 'rgba(255,255,255,.4)'
-                            }
+                        axisTick: {
+                            show: false
                         },
-                        itemStyle: {
-                            normal: {
-                                color:
-
-                                    new that.$echarts.graphic.LinearGradient(
-                                        // 前四个参数用于配置渐变色的起止位置,这四个参数依次对应 右下左上 四个方位。也就是从右边开始顺时针方向。
-                                        // 通过修改前4个参数,可以实现不同的渐变方向
-                                        /* 第五个参数则是一个数组,用于配置颜色的渐变过程。
-                                          每项为一个对象,包含offset和color两个参数
-                                        */
-                                        0, 0, 0, 1, [{ // 代表渐变色从正上方开始
-                                            offset: 0, // offset范围是0~1,用于表示位置,0是指0%处的颜色
-                                            color: '#24A5DF'
-                                        }, // 柱图渐变色
-                                        {
-                                            offset: 1, // 指100%处的颜色
-                                            color: '#01E2D2'
-                                        }
-                                    ]
-                                    )
-
-                            }
-                        }
-                    }
-                ]
-            }
-
-            option && myChart.setOption(option)
-        },
-
-        initNcpBar (dom) {
-            const that = this
-            const chartDom = document.getElementById(dom)
-            const myChart = this.$echarts.init(chartDom)
-
-            const option = {
-                grid: {
-                    top: '14%',
-                    left: '2%',
-                    right: '2%',
-                    bottom: '2%',
-                    containLabel: true
-                },
-                xAxis: {
-                    type: 'category',
-                    data: [
-                        '有机肥料',
-                        '复合肥料'
-                    ],
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(153,153,153,.4)'
-                        }
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLabel: {
-                        color: 'rgba(255,255,255,.4)',
-                        rotate: 0
-                    }
-                },
-                yAxis: {
-                    max: 600,
-                    name: '(公斤)',
-                    nameTextStyle: {
-                        color: 'rgba(255,255,255,.4)'
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: '#657CA8'
-                        }
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(62,81,97, .5)',
-                            type: 'dashed'
-                        }
-                    },
-                    axisLabel: {
-                        color: 'rgba(255,255,255,.4)'
-                    }
-                },
-                series: [
-                    {
-                        type: 'bar',
-                        barWidth: 32,
-                        data: [500, 60],
-                        label: {
-                            show: true,
-                            position: 'top',
-                            textStyle: {
-                                color: 'rgba(255,255,255,.4)'
-                            }
-                        },
-                        itemStyle: {
-                            normal: {
-                                color:
-
-                                    new that.$echarts.graphic.LinearGradient(
-                                        // 前四个参数用于配置渐变色的起止位置,这四个参数依次对应 右下左上 四个方位。也就是从右边开始顺时针方向。
-                                        // 通过修改前4个参数,可以实现不同的渐变方向
-                                        /* 第五个参数则是一个数组,用于配置颜色的渐变过程。
-                                          每项为一个对象,包含offset和color两个参数
-                                        */
-                                        0, 0, 0, 1, [{ // 代表渐变色从正上方开始
-                                            offset: 0, // offset范围是0~1,用于表示位置,0是指0%处的颜色
-                                            color: '#24A5DF'
-                                        }, // 柱图渐变色
-                                        {
-                                            offset: 1, // 指100%处的颜色
-                                            color: '#01E2D2'
-                                        }
-                                    ]
-                                    )
-
-                            }
-                        }
-                    }
-                ]
-            }
-
-            option && myChart.setOption(option)
-        },
-
-        initClSyBar (dom) {
-            const chartDom = document.getElementById(dom)
-            const myChart = this.$echarts.init(chartDom)
-
-            var data = [
-                '01',
-                '02',
-                '03',
-                '04',
-                '05',
-                '06',
-                '07',
-                '08',
-                '09',
-                '10',
-                '11',
-                '12'
-            ]
-            var data1 = [
-                '180',
-                '320',
-                '400',
-                '200',
-                '110',
-                '180',
-                '0',
-                '0',
-                '0',
-                '0',
-                '0',
-                '0'
-            ]
-            var data2 = [
-                '0',
-                '0',
-                '0',
-                '260',
-                '0',
-                '230',
-                '0',
-                '0',
-                '0',
-                '0',
-                '0',
-                '0'
-            ]
-
-            const option = {
-                grid: {
-                    top: '10%',
-                    right: '0%',
-                    left: '0%',
-                    bottom: '0%',
-                    containLabel: true
-                },
-                tooltip: {
-                    trigger: 'axis',
-                    axisPointer: {
-                        type: 'shadow'
-                    }
-                },
-                legend: {
-                    left: 'center',
-                    data: ['加工产品', '农产品'],
-                    textStyle: {
-                        color: '#A9D1D7'
-                    }
-                },
-                xAxis: {
-                    data: data,
-                    axisLabel: {
-                        interval: 0,
-                        show: true,
-                        textStyle: {
-                            color: 'rgba(255,255,255,0.6)'
-                        }
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: '#697B89',
-                            width: 1
-                        }
-                    }
-                },
-                yAxis: [
-                    {
-                        min: 0,
-                        type: 'value',
                         axisLabel: {
-                            interval: 0,
-                            show: true,
-                            textStyle: {
-                                color: '#B4B5BE'
-                            }
+                            color: 'rgba(255,255,255,.4)',
+                            rotate: 0
+                        }
+                    },
+                    yAxis: {
+                        max: 50,
+                        name: '(次)',
+                        nameTextStyle: {
+                            color: 'rgba(255,255,255,.4)'
                         },
                         axisLine: {
-                            show: true,
                             lineStyle: {
-                                color: '#697B89',
-                                width: 1
+                                color: '#657CA8'
                             }
+                        },
+                        axisTick: {
+                            show: false
                         },
                         splitLine: {
                             show: true,
@@ -749,574 +354,944 @@
                                 color: 'rgba(62,81,97, .5)',
                                 type: 'dashed'
                             }
+                        },
+                        axisLabel: {
+                            color: 'rgba(255,255,255,.4)'
                         }
-                    }
-                ],
-                series: [
-                    {
-                        name: '加工产品',
-                        type: 'bar',
-                        barWidth: 14,
-                        silent: true,
-                        itemStyle: {
-                            normal: {
-                                color: '#E29646'
-                            }
-                        },
-                        data: data1
                     },
-                    {
-                        name: '农产品',
-                        type: 'bar',
-                        barWidth: 14,
-                        silent: true,
-                        itemStyle: {
-                            normal: {
-                                color: '#6AE081'
+                    series: [
+                        {
+                            type: 'bar',
+                            barWidth: 32,
+                            data: y,
+                            label: {
+                                show: true,
+                                position: 'top',
+                                textStyle: {
+                                    color: 'rgba(255,255,255,.4)'
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    color:
+
+                                        function (params) {
+                                            var colorList = [
+                                                ['#24A5DF', '#01E2D2'],
+                                                ['#E59438', '#FEF880 '],
+                                                ['#E34C4C', '#E6945E']
+                                            ]
+                                            var index = params.dataIndex
+                                            if (params.dataIndex >= colorList.length) {
+                                                index = params.dataIndex - colorList.length
+                                            }
+                                            return new that.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                                {
+                                                    offset: 0,
+                                                    color: colorList[index][0]
+                                                },
+                                                {
+                                                    offset: 0.5,
+                                                    color: colorList[index][0]
+                                                },
+                                                {
+                                                    offset: 1,
+                                                    color: colorList[index][1]
+                                                }
+                                            ])
+                                        }
+
+                                }
+                            }
+                        }
+                    ]
+                }
+
+                option && myChart.setOption(option)
+            },
+
+            initTrpBar (dom) {
+                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%',
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        containLabel: true
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: nztrX,
+                        axisLine: {
+                            lineStyle: {
+                                color: 'rgba(153,153,153,.4)'
                             }
                         },
-                        data: data2
-                    }
+                        axisTick: {
+                            show: false
+                        },
+                        axisLabel: {
+                            color: 'rgba(255,255,255,.4)',
+                            rotate: 0
+                        }
+                    },
+                    yAxis: {
+                        max: 600,
+                        name: '(公斤)',
+                        nameTextStyle: {
+                            color: 'rgba(255,255,255,.4)'
+                        },
+                        axisLine: {
+                            lineStyle: {
+                                color: '#657CA8'
+                            }
+                        },
+                        axisTick: {
+                            show: false
+                        },
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: 'rgba(62,81,97, .5)',
+                                type: 'dashed'
+                            }
+                        },
+                        axisLabel: {
+                            color: 'rgba(255,255,255,.4)'
+                        }
+                    },
+                    series: [
+                        {
+                            type: 'bar',
+                            barWidth: 32,
+                            data: nztrY,
+                            label: {
+                                show: true,
+                                position: 'top',
+                                textStyle: {
+                                    color: 'rgba(255,255,255,.4)'
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    color:
+
+                                        new that.$echarts.graphic.LinearGradient(
+                                            // 前四个参数用于配置渐变色的起止位置,这四个参数依次对应 右下左上 四个方位。也就是从右边开始顺时针方向。
+                                            // 通过修改前4个参数,可以实现不同的渐变方向
+                                            /* 第五个参数则是一个数组,用于配置颜色的渐变过程。
+                                              每项为一个对象,包含offset和color两个参数
+                                            */
+                                            0, 0, 0, 1, [{ // 代表渐变色从正上方开始
+                                                offset: 0, // offset范围是0~1,用于表示位置,0是指0%处的颜色
+                                                color: '#24A5DF'
+                                            }, // 柱图渐变色
+                                                {
+                                                    offset: 1, // 指100%处的颜色
+                                                    color: '#01E2D2'
+                                                }
+                                            ]
+                                        )
+
+                                }
+                            }
+                        }
+                    ]
+                }
+
+                option && myChart.setOption(option)
+            },
+
+            initNcpBar (dom) {
+                const that = this
+                const chartDom = document.getElementById(dom)
+                const myChart = this.$echarts.init(chartDom)
+
+                const option = {
+                    grid: {
+                        top: '14%',
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        containLabel: true
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: [
+                            '有机肥料',
+                            '复合肥料'
+                        ],
+                        axisLine: {
+                            lineStyle: {
+                                color: 'rgba(153,153,153,.4)'
+                            }
+                        },
+                        axisTick: {
+                            show: false
+                        },
+                        axisLabel: {
+                            color: 'rgba(255,255,255,.4)',
+                            rotate: 0
+                        }
+                    },
+                    yAxis: {
+                        max: 600,
+                        name: '(公斤)',
+                        nameTextStyle: {
+                            color: 'rgba(255,255,255,.4)'
+                        },
+                        axisLine: {
+                            lineStyle: {
+                                color: '#657CA8'
+                            }
+                        },
+                        axisTick: {
+                            show: false
+                        },
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: 'rgba(62,81,97, .5)',
+                                type: 'dashed'
+                            }
+                        },
+                        axisLabel: {
+                            color: 'rgba(255,255,255,.4)'
+                        }
+                    },
+                    series: [
+                        {
+                            type: 'bar',
+                            barWidth: 32,
+                            data: [500, 60],
+                            label: {
+                                show: true,
+                                position: 'top',
+                                textStyle: {
+                                    color: 'rgba(255,255,255,.4)'
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    color:
+
+                                        new that.$echarts.graphic.LinearGradient(
+                                            // 前四个参数用于配置渐变色的起止位置,这四个参数依次对应 右下左上 四个方位。也就是从右边开始顺时针方向。
+                                            // 通过修改前4个参数,可以实现不同的渐变方向
+                                            /* 第五个参数则是一个数组,用于配置颜色的渐变过程。
+                                              每项为一个对象,包含offset和color两个参数
+                                            */
+                                            0, 0, 0, 1, [{ // 代表渐变色从正上方开始
+                                                offset: 0, // offset范围是0~1,用于表示位置,0是指0%处的颜色
+                                                color: '#24A5DF'
+                                            }, // 柱图渐变色
+                                                {
+                                                    offset: 1, // 指100%处的颜色
+                                                    color: '#01E2D2'
+                                                }
+                                            ]
+                                        )
+
+                                }
+                            }
+                        }
+                    ]
+                }
+
+                option && myChart.setOption(option)
+            },
+
+            initClSyBar (dom) {
+                const chartDom = document.getElementById(dom)
+                const myChart = this.$echarts.init(chartDom)
+
+                var data = [
+                    '01',
+                    '02',
+                    '03',
+                    '04',
+                    '05',
+                    '06',
+                    '07',
+                    '08',
+                    '09',
+                    '10',
+                    '11',
+                    '12'
                 ]
+                var data1 = [
+                    '180',
+                    '320',
+                    '400',
+                    '200',
+                    '110',
+                    '180',
+                    '0',
+                    '0',
+                    '0',
+                    '0',
+                    '0',
+                    '0'
+                ]
+                var data2 = [
+                    '0',
+                    '0',
+                    '0',
+                    '260',
+                    '0',
+                    '230',
+                    '0',
+                    '0',
+                    '0',
+                    '0',
+                    '0',
+                    '0'
+                ]
+
+                const option = {
+                    grid: {
+                        top: '10%',
+                        right: '0%',
+                        left: '0%',
+                        bottom: '0%',
+                        containLabel: true
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        left: 'center',
+                        data: ['加工产品', '农产品'],
+                        textStyle: {
+                            color: '#A9D1D7'
+                        }
+                    },
+                    xAxis: {
+                        data: data,
+                        axisLabel: {
+                            interval: 0,
+                            show: true,
+                            textStyle: {
+                                color: 'rgba(255,255,255,0.6)'
+                            }
+                        },
+                        axisTick: {
+                            show: false
+                        },
+                        axisLine: {
+                            show: true,
+                            lineStyle: {
+                                color: '#697B89',
+                                width: 1
+                            }
+                        }
+                    },
+                    yAxis: [
+                        {
+                            min: 0,
+                            type: 'value',
+                            axisLabel: {
+                                interval: 0,
+                                show: true,
+                                textStyle: {
+                                    color: '#B4B5BE'
+                                }
+                            },
+                            axisLine: {
+                                show: true,
+                                lineStyle: {
+                                    color: '#697B89',
+                                    width: 1
+                                }
+                            },
+                            splitLine: {
+                                show: true,
+                                lineStyle: {
+                                    color: 'rgba(62,81,97, .5)',
+                                    type: 'dashed'
+                                }
+                            }
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '加工产品',
+                            type: 'bar',
+                            barWidth: 14,
+                            silent: true,
+                            itemStyle: {
+                                normal: {
+                                    color: '#E29646'
+                                }
+                            },
+                            data: data1
+                        },
+                        {
+                            name: '农产品',
+                            type: 'bar',
+                            barWidth: 14,
+                            silent: true,
+                            itemStyle: {
+                                normal: {
+                                    color: '#6AE081'
+                                }
+                            },
+                            data: data2
+                        }
+                    ]
+                }
+
+                option && myChart.setOption(option)
+            },
+            // 农场使用率
+            selectXCount () {
+                // eslint-disable-next-line no-unused-vars
+                var that = this
+                var deptId = '1123598813738675201'
+                selectXCount(deptId).then((res) => {
+                    that.landsnum = res.data.data.snum.toFixed(0)
+                    that.landwnum = res.data.data.wnum.toFixed(0)
+                    that.znum = res.data.data.num.toFixed(0)
+                })
+            },
+            // 农资使用概况
+            getStockCount () {
+                var that = this
+                var deptId = '1123598813738675201'
+                getStockCount(deptId).then((res) => {
+                    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 = {}
+                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')
+                })
+            },
+            // 统计市场流通/去年流通量/本月流通量
+            selectMarketCirculate () {
+                var params = {}
+                params.codes = '000000'
+                params.deptId = '1123598813738675201'
+                params.year = '2022'
+                selectMarketCirculate(Object.assign(params)).then((res) => {
+                    this.salaNumBN = res.data.data[0].num
+                    this.salaNumQN = res.data.data[1].num
+                    this.salaNumBY = res.data.data[2].num
+                })
+            },
+            // 统计任务总数
+            countTaskNum () {
+                var params = {}
+                params.codes = '000000'
+                params.deptId = '1123598813738675201'
+                params.year = '2022'
+                countTaskNum(Object.assign(params)).then((res) => {
+                    this.taskNum = res.data.data
+                    this.initBar('TaskNumEcharts')
+                })
+            },
+            // 农事记录
+            farmingRecords () {
+                var params = {}
+                params.tenantId = '000000'
+                params.deptId = '1123598813738675201'
+                params.current = '1'
+                params.size = '3'
+                farmingRecords(Object.assign(params)).then((res) => {
+                    this.farminList = res.data.data.records
+                })
             }
-
-            option && myChart.setOption(option)
-        },
-        // 农场使用率
-        selectXCount () {
-            // eslint-disable-next-line no-unused-vars
-            var that = this
-            var deptId = '1123598813738675201'
-            selectXCount(deptId).then((res) => {
-                that.landsnum = res.data.data.snum.toFixed(0)
-                that.landwnum = res.data.data.wnum.toFixed(0)
-                that.znum = res.data.data.num.toFixed(0)
-            })
-        },
-        // 农资使用概况
-        getStockCount () {
-            var that = this
-            var deptId = '1123598813738675201'
-            getStockCount(deptId).then((res) => {
-                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 = {}
-            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')
-            })
-        },
-        // 统计市场流通/去年流通量/本月流通量
-        selectMarketCirculate () {
-            var params = {}
-            params.codes = '000000'
-            params.deptId = '1123598813738675201'
-            params.year = '2022'
-            selectMarketCirculate(Object.assign(params)).then((res) => {
-                this.salaNumBN = res.data.data[0].num
-                this.salaNumQN = res.data.data[1].num
-                this.salaNumBY = res.data.data[2].num
-            })
-        },
-        // 统计任务总数
-        countTaskNum () {
-            var params = {}
-            params.codes = '000000'
-            params.deptId = '1123598813738675201'
-            params.year = '2022'
-            countTaskNum(Object.assign(params)).then((res) => {
-                this.taskNum = res.data.data
-                this.initBar('TaskNumEcharts')
-            })
-        },
-        // 农事记录
-        farmingRecords () {
-            var params = {}
-            params.codes = '000000'
-            params.deptId = '1123598813738675201'
-            params.year = '2022'
-            farmingRecords(Object.assign(params)).then((res) => {
-
-            })
         }
     }
-}
 </script>
 
 <style scoped lang="scss">
-.container {
-    padding: 20px;
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background: #08192e;
-    box-sizing: border-box;
+    .container {
+        padding: 20px;
+        position: relative;
+        width: 100%;
+        height: 100%;
+        background: #08192e;
+        box-sizing: border-box;
 
-    .toggle-plot {
-        text-align: left;
-        height: 36px;
-        line-height: 36px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #fff;
-    }
-
-    .main-content {
-        margin-top: 10px;
-        height: calc(100% - 46px);
-        display: flex;
-        flex-direction: column;
-
-        .t {
-            display: flex;
-            justify-content: space-between;
-
-            & > div:first-child {
-                margin-left: 0;
-            }
+        .toggle-plot {
+            text-align: left;
+            height: 36px;
+            line-height: 36px;
+            font-size: 24px;
+            font-weight: bold;
+            color: #fff;
         }
 
-        .c {
-            margin-top: 20px;
+        .main-content {
+            margin-top: 10px;
+            height: calc(100% - 46px);
             display: flex;
-            justify-content: space-between;
+            flex-direction: column;
 
-            & > div {
-                margin-left: 20px;
-                width: calc((100% - 80px) / 5);
-                height: 346px;
-                border-radius: 8px 8px 8px 8px;
-                background: rgba(0, 52, 85, 0.4);
-            }
-
-            & > div:first-child {
-                margin-left: 0;
-            }
-
-            & > div:last-child {
-                width: calc((100% - 80px) / 5 * 2 + 20px);
-            }
-
-            .time-box {
-                padding: 0 25px;
+            .t {
                 display: flex;
-                flex-direction: column;
-                box-sizing: border-box;
+                justify-content: space-between;
+
+                & > div:first-child {
+                    margin-left: 0;
+                }
+            }
+
+            .c {
+                margin-top: 20px;
+                display: flex;
+                justify-content: space-between;
+
+                & > div {
+                    margin-left: 20px;
+                    width: calc((100% - 80px) / 5);
+                    height: 346px;
+                    border-radius: 8px 8px 8px 8px;
+                    background: rgba(0, 52, 85, 0.4);
+                }
+
+                & > div:first-child {
+                    margin-left: 0;
+                }
 
                 & > div:last-child {
-                    border: none;
-                }
-            }
-
-            .task-box {
-                padding: 20px;
-                display: flex;
-                flex-direction: column;
-                box-sizing: border-box;
-
-                .title {
-                    text-align: left;
-                    font-size: 18px;
-                    font-weight: bold;
-                    color: #7ccfd6;
+                    width: calc((100% - 80px) / 5 * 2 + 20px);
                 }
 
-                .echarts-box {
-                    margin-top: 16px;
-                    flex: 1;
-                }
-            }
-
-            .nz-ncp {
-                padding: 20px;
-                display: flex;
-                flex-direction: column;
-                box-sizing: border-box;
-
-                .title-box {
-                    display: flex;
-
-                    & > div {
-                        display: flex;
-                        align-items: flex-start;
-                        font-size: 18px;
-                        color: #a9d1d7;
-
-                        .title {
-                            cursor: pointer;
-                        }
-
-                        .on {
-                            position: relative;
-                            font-weight: bold;
-                            color: #7ccfd6;
-
-                            span {
-                                position: absolute;
-                                bottom: -8px;
-                                left: 0;
-                                width: 100%;
-                                height: 3px;
-                                border-radius: 3px;
-                                background: #66dde9;
-                            }
-                        }
-                    }
-
-                    & > div:nth-child(2) {
-                        margin-left: 60px;
-                    }
-                }
-
-                .lists-box {
-                    margin-top: 16px;
-                    flex: 1;
-                    overflow-y: auto;
-
-                    & > div:nth-child(even) {
-                        background: rgba(102, 221, 233, 0.1);
-                    }
-
-                    & > div {
-                        display: flex;
-                        align-items: center;
-                        justify-content: space-between;
-                        line-height: 48px;
-                        font-size: 18px;
-                        color: #a9d1d7;
-
-                        & > div:first-child {
-                            margin-left: 16px;
-                        }
-
-                        & > div:last-child {
-                            margin-right: 18px;
-                            color: #66dde9;
-                        }
-                    }
-                }
-            }
-
-            .trp-ncp {
-                padding: 20px;
-                display: flex;
-                flex-direction: column;
-                box-sizing: border-box;
-
-                .title-box {
-                    position: relative;
-                    display: flex;
-
-                    & > div {
-                        display: flex;
-                        align-items: flex-start;
-                        font-size: 18px;
-                        color: #a9d1d7;
-
-                        .title {
-                            cursor: pointer;
-                        }
-
-                        .on {
-                            position: relative;
-                            font-weight: bold;
-                            color: #7ccfd6;
-
-                            span {
-                                position: absolute;
-                                bottom: -8px;
-                                left: 0;
-                                width: 100%;
-                                height: 3px;
-                                border-radius: 3px;
-                                background: #66dde9;
-                            }
-                        }
-                    }
-
-                    & > div:nth-child(2) {
-                        margin-left: 60px;
-                    }
-
-                    .more {
-                        position: absolute;
-                        top: 0;
-                        left: auto;
-                        right: 0;
-                        bottom: 0;
-                        margin: auto;
-                        display: flex;
-                        align-items: center;
-                        font-size: 16px;
-
-                        img {
-                            margin-left: 6px;
-                            vertical-align: middle;
-                        }
-                    }
-                }
-
-                .echarts-box {
-                    margin-top: 16px;
-                    flex: 1;
-                }
-            }
-        }
-
-        .b {
-            margin-top: 20px;
-            flex: 1;
-            display: flex;
-            justify-content: space-between;
-
-            & > div {
-                margin-left: 20px;
-                border-radius: 8px 8px 8px 8px;
-                background: rgba(0, 52, 85, 0.4);
-            }
-
-            & > div:first-child {
-                margin-left: 0;
-                flex: 1;
-            }
-
-            & > div:last-child {
-                width: 444px;
-            }
-
-            .cl-sy {
-                padding: 20px;
-                display: flex;
-                flex-direction: column;
-                box-sizing: border-box;
-
-                .title-box {
-                    height: 34px;
-                    position: relative;
-                    display: flex;
-
-                    & > div {
-                        display: flex;
-                        align-items: flex-start;
-                        font-size: 18px;
-                        color: #a9d1d7;
-
-                        .on {
-                            position: relative;
-                            font-weight: bold;
-                            color: #7ccfd6;
-
-                            span {
-                                position: absolute;
-                                bottom: -8px;
-                                left: 0;
-                                width: 100%;
-                                height: 3px;
-                                border-radius: 3px;
-                                background: #66dde9;
-                            }
-                        }
-                    }
-
-                    & > div:nth-child(2) {
-                        margin-left: 60px;
-                    }
-
-                    .date {
-                        position: absolute;
-                        top: -20px;
-                        left: auto;
-                        right: 0;
-                        bottom: auto;
-                        margin: auto;
-                        width: 320px;
-                    }
-                }
-
-                .echarts-box {
-                    margin-top: 16px;
-                    flex: 1;
-                }
-            }
-
-            .ns-nz {
-                padding: 20px;
-                display: flex;
-                flex-direction: column;
-                box-sizing: border-box;
-
-                .title-box {
-                    position: relative;
-                    display: flex;
-
-                    & > div {
-                        display: flex;
-                        align-items: flex-start;
-                        font-size: 18px;
-                        color: #a9d1d7;
-
-                        .title {
-                            cursor: pointer;
-                        }
-
-                        .on {
-                            position: relative;
-                            font-weight: bold;
-                            color: #7ccfd6;
-
-                            span {
-                                position: absolute;
-                                bottom: -8px;
-                                left: 0;
-                                width: 100%;
-                                height: 3px;
-                                border-radius: 3px;
-                                background: #66dde9;
-                            }
-                        }
-                    }
-
-                    & > div:nth-child(2) {
-                        margin-left: 60px;
-                    }
-
-                    .more {
-                        position: absolute;
-                        top: 0;
-                        left: auto;
-                        right: 0;
-                        bottom: 0;
-                        margin: auto;
-                        display: flex;
-                        align-items: center;
-                        font-size: 16px;
-
-                        img {
-                            margin-left: 6px;
-                            vertical-align: middle;
-                        }
-                    }
-                }
-
-                .lists-box {
-                    margin-top: 16px;
-                    flex: 1;
-
+                .time-box {
+                    padding: 0 25px;
                     display: flex;
                     flex-direction: column;
+                    box-sizing: border-box;
 
-                    & > div {
-                        position: relative;
-                        flex: 1;
-                        margin-top: 10px;
-                        padding: 10px 20px;
-                        display: flex;
-                        flex-direction: column;
-                        justify-content: space-between;
+                    & > div:last-child {
+                        border: none;
+                    }
+                }
 
-                        background: rgba(102, 221, 233, 0.1);
-                        border-radius: 8px;
+                .task-box {
+                    padding: 20px;
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+
+                    .title {
+                        text-align: left;
                         font-size: 18px;
-                        color: #a9d1d7;
+                        font-weight: bold;
+                        color: #7ccfd6;
+                    }
 
-                        & > .t-item {
+                    .echarts-box {
+                        margin-top: 16px;
+                        flex: 1;
+                    }
+                }
+
+                .nz-ncp {
+                    padding: 20px;
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+
+                    .title-box {
+                        display: flex;
+
+                        & > div {
+                            display: flex;
+                            align-items: flex-start;
+                            font-size: 18px;
+                            color: #a9d1d7;
+
+                            .title {
+                                cursor: pointer;
+                            }
+
+                            .on {
+                                position: relative;
+                                font-weight: bold;
+                                color: #7ccfd6;
+
+                                span {
+                                    position: absolute;
+                                    bottom: -8px;
+                                    left: 0;
+                                    width: 100%;
+                                    height: 3px;
+                                    border-radius: 3px;
+                                    background: #66dde9;
+                                }
+                            }
+                        }
+
+                        & > div:nth-child(2) {
+                            margin-left: 60px;
+                        }
+                    }
+
+                    .lists-box {
+                        margin-top: 16px;
+                        flex: 1;
+                        overflow-y: auto;
+
+                        & > div:nth-child(even) {
+                            background: rgba(102, 221, 233, 0.1);
+                        }
+
+                        & > div {
                             display: flex;
                             align-items: center;
                             justify-content: space-between;
+                            line-height: 48px;
+                            font-size: 18px;
+                            color: #a9d1d7;
 
                             & > div:first-child {
-                                font-weight: bold;
+                                margin-left: 16px;
+                            }
+
+                            & > div:last-child {
+                                margin-right: 18px;
                                 color: #66dde9;
                             }
                         }
+                    }
+                }
 
-                        & > .b-item {
+                .trp-ncp {
+                    padding: 20px;
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+
+                    .title-box {
+                        position: relative;
+                        display: flex;
+
+                        & > div {
                             display: flex;
-                            align-items: center;
-                            justify-content: space-between;
+                            align-items: flex-start;
+                            font-size: 18px;
+                            color: #a9d1d7;
 
-                            & > div:first-child {
-                                color: #fff;
+                            .title {
+                                cursor: pointer;
+                            }
+
+                            .on {
+                                position: relative;
+                                font-weight: bold;
+                                color: #7ccfd6;
+
+                                span {
+                                    position: absolute;
+                                    bottom: -8px;
+                                    left: 0;
+                                    width: 100%;
+                                    height: 3px;
+                                    border-radius: 3px;
+                                    background: #66dde9;
+                                }
                             }
                         }
 
-                        .t-border {
-                            top: 0;
-                            bottom: auto;
+                        & > div:nth-child(2) {
+                            margin-left: 60px;
                         }
 
-                        .b-border {
-                            top: auto;
-                            bottom: 0;
-                        }
-
-                        .t-border,
-                        .b-border {
+                        .more {
                             position: absolute;
-                            left: 0;
+                            top: 0;
+                            left: auto;
                             right: 0;
+                            bottom: 0;
                             margin: auto;
-                            width: 80%;
-                            height: 1px;
-                            background: linear-gradient(
-                                89deg,
-                                rgba(102, 221, 233, 0) 0%,
-                                #66dde9 51%,
-                                rgba(102, 221, 233, 0) 100%
-                            );
+                            display: flex;
+                            align-items: center;
+                            font-size: 16px;
+
+                            img {
+                                margin-left: 6px;
+                                vertical-align: middle;
+                            }
                         }
                     }
 
-                    & > div:first-child {
-                        margin-top: 10px;
+                    .echarts-box {
+                        margin-top: 16px;
+                        flex: 1;
+                    }
+                }
+            }
+
+            .b {
+                margin-top: 20px;
+                flex: 1;
+                display: flex;
+                justify-content: space-between;
+
+                & > div {
+                    margin-left: 20px;
+                    border-radius: 8px 8px 8px 8px;
+                    background: rgba(0, 52, 85, 0.4);
+                }
+
+                & > div:first-child {
+                    margin-left: 0;
+                    flex: 1;
+                }
+
+                & > div:last-child {
+                    width: 444px;
+                }
+
+                .cl-sy {
+                    padding: 20px;
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+
+                    .title-box {
+                        height: 34px;
+                        position: relative;
+                        display: flex;
+
+                        & > div {
+                            display: flex;
+                            align-items: flex-start;
+                            font-size: 18px;
+                            color: #a9d1d7;
+
+                            .on {
+                                position: relative;
+                                font-weight: bold;
+                                color: #7ccfd6;
+
+                                span {
+                                    position: absolute;
+                                    bottom: -8px;
+                                    left: 0;
+                                    width: 100%;
+                                    height: 3px;
+                                    border-radius: 3px;
+                                    background: #66dde9;
+                                }
+                            }
+                        }
+
+                        & > div:nth-child(2) {
+                            margin-left: 60px;
+                        }
+
+                        .date {
+                            position: absolute;
+                            top: -20px;
+                            left: auto;
+                            right: 0;
+                            bottom: auto;
+                            margin: auto;
+                            width: 320px;
+                        }
+                    }
+
+                    .echarts-box {
+                        margin-top: 16px;
+                        flex: 1;
+                    }
+                }
+
+                .ns-nz {
+                    padding: 20px;
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+
+                    .title-box {
+                        position: relative;
+                        display: flex;
+
+                        & > div {
+                            display: flex;
+                            align-items: flex-start;
+                            font-size: 18px;
+                            color: #a9d1d7;
+
+                            .title {
+                                cursor: pointer;
+                            }
+
+                            .on {
+                                position: relative;
+                                font-weight: bold;
+                                color: #7ccfd6;
+
+                                span {
+                                    position: absolute;
+                                    bottom: -8px;
+                                    left: 0;
+                                    width: 100%;
+                                    height: 3px;
+                                    border-radius: 3px;
+                                    background: #66dde9;
+                                }
+                            }
+                        }
+
+                        & > div:nth-child(2) {
+                            margin-left: 60px;
+                        }
+
+                        .more {
+                            position: absolute;
+                            top: 0;
+                            left: auto;
+                            right: 0;
+                            bottom: 0;
+                            margin: auto;
+                            display: flex;
+                            align-items: center;
+                            font-size: 16px;
+
+                            img {
+                                margin-left: 6px;
+                                vertical-align: middle;
+                            }
+                        }
+                    }
+
+                    .lists-box {
+                        margin-top: 16px;
+                        flex: 1;
+
+                        display: flex;
+                        flex-direction: column;
+
+                        & > div {
+                            position: relative;
+                            flex: 1;
+                            margin-top: 10px;
+                            padding: 10px 20px;
+                            display: flex;
+                            flex-direction: column;
+                            justify-content: space-between;
+
+                            background: rgba(102, 221, 233, 0.1);
+                            border-radius: 8px;
+                            font-size: 18px;
+                            color: #a9d1d7;
+
+                            & > .t-item {
+                                display: flex;
+                                align-items: center;
+                                justify-content: space-between;
+
+                                & > div:first-child {
+                                    font-weight: bold;
+                                    color: #66dde9;
+                                }
+                            }
+
+                            & > .b-item {
+                                display: flex;
+                                align-items: center;
+                                justify-content: space-between;
+
+                                & > div:first-child {
+                                    color: #fff;
+                                }
+                            }
+
+                            .t-border {
+                                top: 0;
+                                bottom: auto;
+                            }
+
+                            .b-border {
+                                top: auto;
+                                bottom: 0;
+                            }
+
+                            .t-border,
+                            .b-border {
+                                position: absolute;
+                                left: 0;
+                                right: 0;
+                                margin: auto;
+                                width: 80%;
+                                height: 1px;
+                                background: linear-gradient(
+                                                89deg,
+                                                rgba(102, 221, 233, 0) 0%,
+                                                #66dde9 51%,
+                                                rgba(102, 221, 233, 0) 100%
+                                );
+                            }
+                        }
+
+                        & > div:first-child {
+                            margin-top: 10px;
+                        }
                     }
                 }
             }
         }
     }
-}
 </style>

--
Gitblit v1.9.3