feat：添加物候调节

src/api/modules/area.js

@@ -1,13 +0,0 @@
-const config = require("../config")
-
-module.exports = {
-    list: {
-        url: config.base_url + "lz_area/list",
-        type: "post",
-    }
-    ,
-    save: {
-        url: config.base_url + "lz_area/save",
-        type: "post",
-    }
-}

src/api/modules/drug.js

@@ -1,16 +0,0 @@
-const config = require("../config")
-
-
-
-
-module.exports = {
-    list: {
-        url: config.base_url + "ns_drug/list",
-        type: "get",
-    },
-    save: {
-        url: config.base_url + "ns_drug/save",
-        type: "post",
-    },
-
-}

src/api/modules/fitManager.js

@@ -1,36 +0,0 @@
-const config = require("../config")
-module.exports = {
-    fitAreaList: {
-        url: config.base_url + "fit_manager/fitAreaList",
-        type: "post",
-    },
-    pathPointList: {
-        url: config.base_url + "fit_manager/pathPointList",
-        type: "post",
-    },
-    pathPointUpdate: {
-        url: config.base_url + "fit_manager/pathPointUpdate",
-        type: "post",
-    },
-    flyRuntimeInsert: {
-        url: config.base_url + "fly_runtime/insert",
-        type: "post",
-    },
-    flyRuntimeUpdate: {
-        url: config.base_url + "fly_runtime/update",
-        type: "post",
-    },
-    flyRuntimeGet: {
-        url: config.base_url + "fly_runtime/get",
-        type: "get",
-    },
-    flyRuntimeLoad: {
-        url: config.base_url + "fly_runtime/load",
-        type: "get",
-    },
-    flyGetNewImage:{
-        url: config.base_url + "fly_runtime/getNewImage",
-        type: "get",
-    }
-
-}

src/api/modules/fly_system.js

@@ -1,49 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-02-07 13:40:50
- * @LastEditTime: 2021-12-02 15:59:52
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \vue3-element-admin\src\api\modules\system.js
- */
-// const Mock = require("mockjs"); //引入
-const config = require("../config")
-
-module.exports = {
-    login: {
-        url: config.fly_url + "user/phone",
-        type: "post",
-    },
-    menuList: {
-        // uField:["current","size"],
-        url: config.fly_url + "user/menuList",
-        type: "get",
-    },
-    menuAdd: {
-        query:["name","url"],
-        url: config.fly_url + "user/saveOrUpdateMenu",
-        type: "post",
-    },
-    menuEdit: {
-        query:["id","name","url"],
-        url: config.fly_url + "user/saveOrUpdateMenu",
-        type: "post",
-    },
-    menuDel: {
-        query:["id"],
-        url: config.fly_url + "user/delMenu",
-        type: "post",
-    },
-    userList:{
-        url:config.fly_url + "user/userList",
-        type: "get",
-    },
-    roleList:{
-        url:config.fly_url + "user/roleList",
-        type: "get",
-    },
-    roleDel:{
-        url:config.fly_url + "user/delRole",
-        type: "post",
-    }
-};

src/api/modules/garden_worker.js

@@ -1,16 +0,0 @@
-const config = require("../config")
-
-
-
-
-module.exports = {
-    getOrganExplain: {
-        url: config.base_url + "lz_garden_worker/get",
-        type: "get",
-    },
-    list: {
-        url: config.base_url + "lz_garden_worker/list",
-        type: "post",
-    },
-
-}

src/api/modules/ns_drug.js

@@ -1,21 +0,0 @@
-const config = require("../config")
-const baseUrl = config.base_url + "ns_drug/"
-module.exports = {
-    page: {
-        url:  baseUrl + "page/{limit}/{page}",
-        type: "post",
-    },
-    list: {
-        url:  baseUrl + "list",
-        type: "post",
-    },
-    get: {
-        url:  baseUrl + "get",
-        type: "get",
-    },
-    save: {
-        url:  baseUrl + "save",
-        type: "post",
-    },
-
-}

src/api/modules/ns_record_allot.js

@@ -1,17 +0,0 @@
-const config = require("../config")
-const baseUrl = config.base_url + "lz_ns_record_allot/"
-module.exports = {
-    list: {
-        url:  baseUrl + "list/{nsRecordId}",
-        type: "get",
-    },
-    get: {
-        url:  baseUrl + "get",
-        type: "get",
-    },
-    save: {
-        url:  baseUrl + "save",
-        type: "post",
-    },
-
-}

src/api/modules/ns_record_allot_collect.js

@@ -1,8 +0,0 @@
-const config = require("../config")
-const baseUrl = config.base_url + "lz_ns_record_allot_collect/"
-module.exports = {
-    isAllCollect: {
-        url:  baseUrl + "isAllCollect",
-        type: "post",
-    },
-}

src/api/modules/ns_record_allot_executor.js

@@ -1,16 +0,0 @@
-const config = require("../config")
-const baseUrl = config.base_url + "lz_ns_record_allot_executor/"
-module.exports = {
-    remove: {
-        url:  baseUrl + "delete",
-        type: "post",
-    },
-    getExecutorCreateDate: {
-        url:  baseUrl + "getExecutorCreateDate",
-        type: "get",
-    },
-    workerPathList: {
-        url:  baseUrl + "workerPathList",
-        type: "get",
-    },
-}

src/api/modules/ns_record_allot_executor_path.js

@@ -1,10 +0,0 @@
-const config = require("../config")
-const baseUrl = config.base_url + "lz_ns_record_allot_executor_path/"
-
-
-module.exports = {
-    points:{
-        url: baseUrl + "points/{allotExecutorId}",
-        type: "post",
-    }
-}

src/api/modules/ns_type.js

@@ -1,21 +0,0 @@
-const config = require("../config")
-const baseUrl = config.base_url + "ns_type/"
-module.exports = {
-    page: {
-        url:  baseUrl + "page/{limit}/{page}",
-        type: "post",
-    },
-    list: {
-        url:  baseUrl + "list",
-        type: "get",
-    },
-    get: {
-        url:  baseUrl + "get",
-        type: "get",
-    },
-    save: {
-        url:  baseUrl + "save",
-        type: "post",
-    },
-
-}

src/api/modules/nszxcx.js

@@ -1,11 +0,0 @@
-const config = require("../config")
-
-
-
-
-module.exports = {
-    nsDrugStatistics:{
-        url: config.base_url + "ns_record/nsDrugStatistics",
-        type: "post",
-    },
-}

src/api/modules/period.js

@@ -1,16 +0,0 @@
-const config = require("../config")
-
-
-
-
-module.exports = {
-    list: {
-        url: config.base_url + "lz_period/list",
-        type: "get",
-    },
-    allList: {
-        url: config.base_url + "lz_period/allList",
-        type: "get",
-    },
-
-}

src/api/modules/period_warn_model.js

@@ -1,15 +0,0 @@
-const config = require("../config")
-
-
-
-
-module.exports = {
-    data:{
-        url: config.base_url + "period_warn_model/data",
-        type: "post",
-    },
-    list:{
-        url: config.base_url + "period_warn_model/list",
-        type: "get",
-    },
-}

src/api/modules/report.js

@@ -1,13 +0,0 @@
-const config = require("../config")
-
-module.exports = {
-    homeWeatherReport: {
-        url: config.base_url + "lz_tree_report/homeWeatherReport",
-        type: "post",
-    }
-    ,
-    getReport: {
-        url: config.base_url + "lz_tree_report/get",
-        type: "get",
-    }
-}

src/api/modules/static/rongShi.json

@@ -1,38 +0,0 @@
-{
-    "code":0,
-    "data":[
-        {
-            "actionName":"阿维哒螨灵",
-            "createdName":"专家1",
-            "endDate":"2023-01-17",
-            "execStyle":"人工",
-            "executorName":"符式举",
-            "finished":1,
-            "nsTypeId":3,
-            "nsTypeName":"杀虫",
-            "peibi":"1000",
-            "periodName":"白点期",
-            "startDate":"2023-01-14",
-            "tianqi":"阴雨",
-            "wendu":"5-28℃",
-            "yongliang":"9000ml"
-        },
-        {
-            "actionName":"代森锰锌",
-            "createdName":"专家1",
-            "endDate":"2023-01-17",
-            "execStyle":"人工",
-            "executorName":"韦志军",
-            "finished":1,
-            "nsTypeId":9,
-            "nsTypeName":"杀菌",
-            "peibi":"500",
-            "periodName":"白点期",
-            "startDate":"2023-01-14",
-            "tianqi":"阴雨",
-            "wendu":"5-28℃",
-            "yongliang":"18kg"
-        }
-    ],
-    "count":110
-}

src/api/modules/static/treeGrowData.json

@@ -1,21 +0,0 @@
-{
-    "code":0,
-    "msg":"success",
-    "data":[
-        {
-            "boFlowerPercent":0.5,
-            "createDate":"2023-08-21",
-            "flowerLeafPercent":1.5,
-            "flowerLength":10.2,
-            "flowerPercent":0.5,
-            "id":1,
-            "miniPercent":0.6,
-            "periodId":1,
-            "redLeafPercent":1.5,
-            "treeId":1,
-            "whitePoint":1.5,
-            "yield":150
-        }
-    ],
-    "success":true
-}

src/api/modules/static/wuhouqi.json

@@ -1,49 +0,0 @@
-{
-    "code":0,
-    "msg":"success",
-    "data":[
-        {
-            "id":1,
-            "name":"白点期",
-            "attrFields":["whitePoint"],
-            "attrNames":["白点率"]
-        },
-        {
-            "id":2,
-            "name":"抽穗期",
-            "attrFields":["flowerLength","flowerLeafPercent"],
-            "attrNames":["花穗长度","花叶比"]
-        },
-        {
-            "id":3,
-            "name":"开花期",
-            "attrFields":["flowerPercent","boFlowerPercent"],
-            "attrNames":["雌花率","爆花率"]
-        },
-        {
-            "id":4,
-            "name":"幼果期",
-            "attrFields":["miniPercent"],
-            "attrNames":["小果率"]
-        },
-        {
-            "id":5,
-            "name":"膨果期",
-            "attrFields":["yield"],
-            "attrNames":["产量"]
-        },
-        {
-            "id":6,
-            "name":"成果期",
-            "attrFields":["yield"],
-            "attrNames":["产量"]
-        },
-        {
-            "id":7,
-            "name":"控捎促花期",
-            "attrFields":["redLeafPercent"],
-            "attrNames":["红叶率"]
-        }
-    ],
-    "success":true
-}

src/api/modules/sub_area.js

@@ -1,12 +0,0 @@
-const config = require("../config")
-
-module.exports = {
-    list: {
-        url: config.base_url + "lz_sub_area/list/{organId}",
-        type: "get",
-    },
-    treeList: {
-        url: config.base_url + "home/tree/list",
-        type: "get",
-    }
-}

src/api/modules/temp_garden_report_pdf.js

@@ -1,12 +0,0 @@
-const config = require("../config")
-
-
-
-
-module.exports = {
-    get: {
-        url: config.base_url + "temp_garden_pdf/get",
-        type: "get",
-    },
-
-}

src/api/modules/weather_item.js

@@ -1,11 +0,0 @@
-const config = require("../config")
-
-
-
-module.exports = {
-    getBefore1DayAfter6Day:{
-        url: config.base_url + "lz_weather_item/getBefore1DayAfter6Day",
-        type: "get",
-    },
-
-}

src/components/chartBox.vue

@@ -4,6 +4,7 @@
       <div class="name">
         <img src="@/assets/images/common/chart-icon.png" alt="" />
         <span>{{name}}</span>
+        <slot name="title-left"></slot>
       </div>
       <div class="slot">
         <slot name="title-right"></slot>
@@ -62,6 +63,7 @@ const handleShrink = () =>{
         font-size: 18px;
         margin-left: 6px;
         font-family: 'SOURCEHANTIFINE';
+        margin-right: 8px;
       }
     }
   }

src/components/charts/barChart.vue

@@ -5,7 +5,7 @@
 <script setup>
 import { onMounted, ref } from "vue";
 import * as echarts from "echarts";
-import { barOption } from "./option/barOption.js";
+import { barOption } from "./options/barOption.js";
 
 const props = defineProps({
   styleName: {

src/components/charts/option/barOption.js → src/components/charts/options/barOption.js

@@ -1,6 +1,6 @@
 import * as echarts from "echarts";
 
-const styleName1 = {
+const commonStyle = {
   xAxis: {
     type: "category",
     axisTick: {
@@ -32,6 +32,10 @@ const styleName1 = {
     bottom: "0%",
     containLabel: true,
   },
+}
+
+const styleName1 = {
+  ...commonStyle,
   series: [
     {
       data: [32, 40, 42],
@@ -55,8 +59,56 @@ const styleName1 = {
         ]),
         borderRadius: [2, 2, 0, 0],
       },
+    }
+  ],
+};
+
+const styleName2 = {
+  ...commonStyle,
+  series: [
+    {
+      data: [32, 40, 42],
+      type: "bar",
+      barWidth: 26,
+      stack: 'total',
+      label: {
+        show: true,
+        color: "#fff",
+        position: "insideTop",
+      },
+      itemStyle: {
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "#BBA269",
+          },
+          {
+            offset: 1,
+            color: "#3D3523",
+          },
+        ]),
+        // borderRadius: [2, 2, 0, 0],
+      },
     },
+    {
+      data: [0,22, 28],
+      type: "bar",
+      barWidth: 26,
+      stack: 'total',
+      itemStyle: {
+         color: 'rgba(56,56,56,0.94)',
+         borderRadius: [2, 2, 0, 0],
+      },
+      label: {
+         show: true,
+         position: 'insideTop',
+         color: '#fff',
+         formatter:({value})=>{
+          return value?value:''
+         }
+      }
+   },
   ],
 };
 
-export const barOption = {styleName1};
+export const barOption = {styleName1,styleName2};

src/components/charts/pieChart.vue

@@ -5,7 +5,7 @@
 <script setup>
 import { onMounted, ref } from "vue";
 import * as echarts from "echarts";
-import { pieOption } from "./option/pieOption.js";
+import { pieOption } from "./options/pieOption.js";
 
 const props = defineProps({
   styleName: {

src/views/home/components/homePage.vue

@@ -3,8 +3,19 @@
     <div class="chart-item">
       <chart-box name="气象预警" arrow="left"></chart-box>
     </div>
-    <div class="chart-item">
-      <chart-box name="物候调节" arrow="left"></chart-box>
+    <div class="chart-item phenology">
+      <chart-box name="物候调节" arrow="left">
+        <template #title-left>
+          <span class="title-left"> - 控梢期</span>
+        </template>
+        <bar-chart class="bar-chart" styleName="styleName2" :xData="phenologyXData" :yData="phenologyYData"></bar-chart>
+        <div class="time-line">
+          <div class="line"></div>
+          <div class="tips box-bg">
+            物候进程：预计 <span>2天</span> 后第三次秋梢完全老熟，进入控梢期
+          </div>
+        </div>
+      </chart-box>
     </div>
     <div class="chart-item diseases">
       <chart-box name="病虫测报" arrow="left">
@@ -47,6 +58,17 @@ import chartBox from "@/components/chartBox.vue";
 import barChart from "@/components/charts/barChart.vue";
 import pieChart from "@/components/charts/pieChart.vue";
 
+// 物候调节
+const phenologyXData = ["萌动小叶", "红黄相间", "新梢老熟"]
+const phenologyYData = [44, 33, 30]
+const aaa = [{
+  "a":[44, 33, 30],
+  aa:'22',
+},{
+  "b":[0,22, 28],
+  bb:'33'
+}]
+
 // 病虫测报
 const diseasesBtnGroup = ["病害1","病害2","病害3"]
 const active = ref(0)
@@ -80,6 +102,31 @@ const evaluateYData = [33, 41, 43]
       padding: 3px 6px;
       box-sizing: border-box;
       background: linear-gradient(180deg, rgb(85, 85, 85,0.4) 0%, rgb(35, 35, 35,1) 100%);
+      span{
+        color: #69BDFF;
+      }
+    }
+    .title-left{
+      color: rgba(255,255,255,0.7);
+    }
+    &.phenology{
+      .bar-chart{
+        width: 100%;
+        height: calc(100% - 70px);
+      }
+      .time-line{
+        width: 100%;
+        height: 70px;
+        .line{
+          width: 100%;
+          height: calc(100% - 34px);
+        }
+        .tips{
+          width: 100%;
+          height: 34px;
+          line-height: 28px;
+        }
+      }
     }
     &.diseases{
       .btn-group{
@@ -107,9 +154,6 @@ const evaluateYData = [33, 41, 43]
         text-indent: 2em;
         letter-spacing: 1px;
         color: rgba(255,255,255,0.7);
-        span{
-          color: #69BDFF;
-        }
       }
     }
     &.evaluate {