Merge branch 'master' of http://123.207.147.179:8888/node_server/zjntServer

# Conflicts:
#	src/biz/hjszzl.ts

src/biz/getData.ts

@@ -13,20 +13,23 @@ let guangfuData = {
     {
       key: "安全运行天数",
       value: 62, 
+      unit:"天"
     },
     {
       key: "组件总功率",
-      value: 0,
+      value: 1024, 
+      unit:"kWp"
     },
     {
       key: "设备总数",
-      value: 0,
+      value: 23, 
+      unit:"台"
     },
   ],
   nhfx: {
     count: [
-      {key: '年用电量', value: '85693.7'},
-      {key: '光伏发电量', value: '85872.1'}
+      {key: '年用电量', value: '85693.7', unit:"kwp"},
+      {key: '光伏发电量', value: '85872.1', unit:"kwp"}
     ],
     charData: [
       {key: 2019, value: 0},
@@ -39,27 +42,27 @@ let guangfuData = {
     ],
     dayData: [
       {key: '05:00', value: 0},
-      {key: '06:00', value: 74494.85272216797},
-      {key: '07:00', value: 1274767.62890625},
-      {key: '08:00', value: 3469207.8125},
-      {key: '09:00', value: 5133055.46875},
-      {key: '10:00', value: 6363192.78125},
+      {key: '06:00', value: 74494.85},
+      {key: '07:00', value: 1274767.62},
+      {key: '08:00', value: 3469207.81},
+      {key: '09:00', value: 5133055.46},
+      {key: '10:00', value: 6363192.78},
     ],
   },
   trsy: {
     count: [
-      {key: '光伏投入成本', value: '123'},
-      {key: '运维成本', value: '123'},
-      {key: '发电量', value: '85872.1'},
-      {key: '发电时长', value: 1473.6491358333333},
+      {key: '光伏投入成本', value: '307', unit:"万"},
+      {key: '运维成本', value: '5', unit:"万/年"},
+      {key: '发电量', value: '85872.1', unit:"kwh"},
+      {key: '发电时长', value: 1473.64, unit:"h"},
     ],
     charData: [
-      {key: '2016', value: '518'},
-      {key: '2017', value: '733'},
-      {key: '2018', value: '116'},
-      {key: '2019', value: '634'},
-      {key: '2020', value: '116'},
-      {key: '2021', value: '634'}
+      {key: '2020', value: '0'},
+      {key: '2021', value: '0'},
+      {key: '2022', value: '0'},
+      {key: '2023', value: '0'},
+      {key: '2024', value: '0'},
+      {key: '2025', value: '237'},
     ],
   },
   ztsj: [
@@ -75,26 +78,26 @@ let guangfuData = {
     },
     {
       key: "实时功率",
-      value: 5.800000171661377,
+      value: 5.80,
       unit: "KW",
     },
   ],
   xyfxfd: {
     count: [
-      {key: '今日发电', value: '3773.4'},
-      {key: '日功率', value: 44926325.05975342},
-      {key: '当前功率', value: 2.569999933242798},
-      {key: '等效小时数', value: 0},
+      {key: '今日发电', value: '3773.4', unit:"kwh"},
+      {key: '日功率', value: 4.49, unit:"kw"},
+      {key: '当前功率', value: 2.56, unit:"kw"},
+      {key: '等效小时数', value: 0, unit:"h"},
     ],
     chartData: [
-      {key: '2025-02-11', value: '1167.9'},
-      {key: '2025-02-12', value: '687.5'},
-      {key: '2025-02-13', value: '3749.7'},
-      {key: '2025-02-14', value: '1060.7'},
-      {key: '2025-02-15', value: '364.8'},
-      {key: '2025-02-16', value: '3257.1'},
-      {key: '2025-02-17', value: '2940.3'},
-      {key: '2025-02-18', value: '3773.6'},
+      {key: '02-11', value: '1167.9'},
+      {key: '02-12', value: '687.5'},
+      {key: '02-13', value: '3749.7'},
+      {key: '02-14', value: '1060.7'},
+      {key: '02-15', value: '364.8'},
+      {key: '02-16', value: '3257.1'},
+      {key: '02-17', value: '2940.3'},
+      {key: '02-18', value: '3773.6'},
     ],
   },
   xyfx: {
@@ -105,24 +108,24 @@ let guangfuData = {
     ],
     chartData: {
       "今年": [
-        {key: '2025-02-11', value: 700.74},
-        {key: '2025-02-12', value: 412.5},
-        {key: '2025-02-13', value: 2249.8199999999997},
-        {key: '2025-02-14', value: 636.42},
-        {key: '2025-02-15', value: 218.88},
-        {key: '2025-02-16', value: 1954.2599999999998},
-        {key: '2025-02-17', value: 1764.18},
-        {key: '2025-02-18', value: 2264.16},
+        {key: '02-11', value: 700.74},
+        {key: '02-12', value: 412.5},
+        {key: '02-13', value: 2249.81},
+        {key: '02-14', value: 636.42},
+        {key: '02-15', value: 218.88},
+        {key: '02-16', value: 1954.25},
+        {key: '02-17', value: 1764.18},
+        {key: '02-18', value: 2264.16},
       ],
       "去年": [
-        {key: '2024-02-11', value: 0},
-        {key: '2024-02-12', value: 0},
-        {key: '2024-02-13', value: 0},
-        {key: '2024-02-14', value: 0},
-        {key: '2024-02-15', value: 0},
-        {key: '2024-02-16', value: 0},
-        {key: '2024-02-17', value: 0},
-        {key: '2024-02-18', value: 0},
+        {key: '02-11', value: 0},
+        {key: '02-12', value: 0},
+        {key: '02-13', value: 0},
+        {key: '02-14', value: 0},
+        {key: '02-15', value: 0},
+        {key: '02-16', value: 0},
+        {key: '02-17', value: 0},
+        {key: '02-18', value: 0},
       ],
     },
   },