模拟数据，新增页面

src/components/coms/panel/panel-sand-toolbar.vue

@@ -1,6 +1,9 @@
 <template>
     <div class="com-panel-sand">
         <div class="com-panel-sand-header font-sm white">
+            <div class="com-panel-sand-sub-titleL">
+                <slot name="toolsL"></slot>
+            </div>
             <span class="com-panel-sand-title">{{ title }}</span>
             <div class="com-panel-sand-sub-title">
                 <slot name="tools"></slot>
@@ -77,6 +80,11 @@
                 right: 0;
                 top: 0.833vh;
             }
+            .com-panel-sand-sub-titleL{
+                position: absolute;
+                left: 0;
+                top: 0.833vh;
+            }
         }
     }
 </style>

src/views/IntegratedAlarm/DetailMatrix/dataJson2.json

@@ -0,0 +1,692 @@
+{
+    "code": 0,
+    "data": {
+        "success": true,
+        "code": 200,
+        "message": "成功",
+        "count": null,
+        "data": {
+            "jrts": 50.0,
+            "powerVos": [
+                {
+                    "wpid": "NX_FGS_HA_FDC_STA",
+                    "wpname": "惠安风电",
+                    "orderNum": 1,
+                    "jrts": 50,
+                    "djts": 0.0,
+                    "bwts": 49.0,
+                    "gzts": 0.0,
+                    "jxts": 0.0,
+                    "xdts": 0.0,
+                    "slts": 1.0,
+                    "lxts": 0.0,
+                    "spped": 3.52,
+                    "ycgl": null,
+                    "bzgl": 0.0,
+                    "llgl": 0.0,
+                    "sjgl": 0.0,
+                    "agc": 0.0,
+                    "cxgl": 20.240428924560547,
+                    "czlx": "-1",
+                    "wtlist": [
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0001_EQ",
+                            "wtname": "1101",
+                            "status": 2.0,
+                            "speed": 5.32,
+                            "power": 597.3,
+                            "transfer": 1298.9,
+                            "rate": 29.86,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3102.87
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0002_EQ",
+                            "wtname": "1102",
+                            "status": 2.0,
+                            "speed": 5.58,
+                            "power": 468.3,
+                            "transfer": 1213.7,
+                            "rate": 23.41,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 2550.9
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0003_EQ",
+                            "wtname": "1103",
+                            "status": 2.0,
+                            "speed": 6.08,
+                            "power": 615.2,
+                            "transfer": 1315.2,
+                            "rate": 30.76,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3737.52
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0004_EQ",
+                            "wtname": "1104",
+                            "status": 2.0,
+                            "speed": 5.41,
+                            "power": 307.2,
+                            "transfer": 1049.8,
+                            "rate": 15.36,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3610.51
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0005_EQ",
+                            "wtname": "1105",
+                            "status": 2.0,
+                            "speed": 4.73,
+                            "power": 404.6,
+                            "transfer": 1114.6,
+                            "rate": 20.23,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 4.0,
+                            "qfdl": 3780.55
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0006_EQ",
+                            "wtname": "1106",
+                            "status": 2.0,
+                            "speed": 4.57,
+                            "power": 435.4,
+                            "transfer": 1177.5,
+                            "rate": 21.77,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3587.39
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0007_EQ",
+                            "wtname": "1107",
+                            "status": 2.0,
+                            "speed": 4.86,
+                            "power": 398.3,
+                            "transfer": 1144.6,
+                            "rate": 19.91,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3841.74
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0008_EQ",
+                            "wtname": "1108",
+                            "status": 2.0,
+                            "speed": 5.66,
+                            "power": 523.1,
+                            "transfer": 1244.3,
+                            "rate": 26.16,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3469.05
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0009_EQ",
+                            "wtname": "1109",
+                            "status": 2.0,
+                            "speed": 5.76,
+                            "power": 516.1,
+                            "transfer": 1243.7,
+                            "rate": 25.8,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3774.52
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0010_EQ",
+                            "wtname": "1110",
+                            "status": 2.0,
+                            "speed": 5.19,
+                            "power": 423.4,
+                            "transfer": 1162.8,
+                            "rate": 21.17,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3270.21
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0011_EQ",
+                            "wtname": "1111",
+                            "status": 2.0,
+                            "speed": 3.56,
+                            "power": 261.8,
+                            "transfer": 1004.8,
+                            "rate": 13.09,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3743.57
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0012_EQ",
+                            "wtname": "1112",
+                            "status": 2.0,
+                            "speed": 4.7,
+                            "power": -1.7,
+                            "transfer": 0.0,
+                            "rate": -0.08,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3314.48
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0013_EQ",
+                            "wtname": "1113",
+                            "status": 2.0,
+                            "speed": 5.5,
+                            "power": 620.4,
+                            "transfer": 1316.5,
+                            "rate": 31.02,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 4.0,
+                            "qfdl": 3396.15
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0014_EQ",
+                            "wtname": "1201",
+                            "status": 2.0,
+                            "speed": 4.8,
+                            "power": 223.9,
+                            "transfer": 1004.6,
+                            "rate": 11.2,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 2917.03
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0015_EQ",
+                            "wtname": "1202",
+                            "status": 2.0,
+                            "speed": 4.4,
+                            "power": 279.1,
+                            "transfer": 1022.5,
+                            "rate": 13.96,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3780.07
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0016_EQ",
+                            "wtname": "1203",
+                            "status": 2.0,
+                            "speed": 3.87,
+                            "power": 262.0,
+                            "transfer": 1006.5,
+                            "rate": 13.1,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 4.0,
+                            "qfdl": 3522.15
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0017_EQ",
+                            "wtname": "1204",
+                            "status": 2.0,
+                            "speed": 5.51,
+                            "power": 609.4,
+                            "transfer": 1311.2,
+                            "rate": 30.47,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3063.71
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0018_EQ",
+                            "wtname": "1205",
+                            "status": 2.0,
+                            "speed": 6.0,
+                            "power": 713.0,
+                            "transfer": 1361.6,
+                            "rate": 35.65,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3385.67
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0019_EQ",
+                            "wtname": "1206",
+                            "status": 2.0,
+                            "speed": 6.37,
+                            "power": 907.2,
+                            "transfer": 1435.0,
+                            "rate": 45.36,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 3.0,
+                            "qfdl": 3821.62
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0020_EQ",
+                            "wtname": "1207",
+                            "status": 2.0,
+                            "speed": 5.97,
+                            "power": 688.4,
+                            "transfer": 1359.7,
+                            "rate": 34.42,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3778.48
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0021_EQ",
+                            "wtname": "1208",
+                            "status": 2.0,
+                            "speed": 6.65,
+                            "power": 666.0,
+                            "transfer": 1344.8,
+                            "rate": 33.3,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3792.78
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0022_EQ",
+                            "wtname": "1209",
+                            "status": 2.0,
+                            "speed": 5.07,
+                            "power": 337.1,
+                            "transfer": 1076.8,
+                            "rate": 16.86,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 3.0,
+                            "qfdl": 3018.72
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0023_EQ",
+                            "wtname": "1210",
+                            "status": 1.0,
+                            "speed": 5.14,
+                            "power": 469.1,
+                            "transfer": 1207.8,
+                            "rate": 23.46,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 5867.58
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0024_EQ",
+                            "wtname": "1211",
+                            "status": 2.0,
+                            "speed": 4.16,
+                            "power": 291.8,
+                            "transfer": 1047.7,
+                            "rate": 14.59,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 7481.29
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0025_EQ",
+                            "wtname": "1212",
+                            "status": 2.0,
+                            "speed": 5.38,
+                            "power": 298.4,
+                            "transfer": 1052.0,
+                            "rate": 14.92,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 3809.75
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0026_EQ",
+                            "wtname": "2301",
+                            "status": 2.0,
+                            "speed": 4.04,
+                            "power": 193.3,
+                            "transfer": 1074.78,
+                            "rate": 9.66,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0027_EQ",
+                            "wtname": "2302",
+                            "status": 2.0,
+                            "speed": 3.55,
+                            "power": 188.6,
+                            "transfer": 1067.48,
+                            "rate": 9.43,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0028_EQ",
+                            "wtname": "2303",
+                            "status": 2.0,
+                            "speed": 4.39,
+                            "power": 339.3,
+                            "transfer": 1119.47,
+                            "rate": 16.96,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0029_EQ",
+                            "wtname": "2304",
+                            "status": 2.0,
+                            "speed": 5.25,
+                            "power": 505.2,
+                            "transfer": 1269.54,
+                            "rate": 25.26,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0030_EQ",
+                            "wtname": "2305",
+                            "status": 2.0,
+                            "speed": 5.66,
+                            "power": 287.7,
+                            "transfer": 1114.27,
+                            "rate": 14.38,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0031_EQ",
+                            "wtname": "2306",
+                            "status": 2.0,
+                            "speed": 5.05,
+                            "power": 0.0,
+                            "transfer": 1.4,
+                            "rate": 0.0,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0032_EQ",
+                            "wtname": "2307",
+                            "status": 2.0,
+                            "speed": 4.47,
+                            "power": 364.1,
+                            "transfer": 1144.37,
+                            "rate": 18.21,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 1.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0033_EQ",
+                            "wtname": "2308",
+                            "status": 2.0,
+                            "speed": 6.09,
+                            "power": 702.6,
+                            "transfer": 1422.61,
+                            "rate": 35.13,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0034_EQ",
+                            "wtname": "2309",
+                            "status": 2.0,
+                            "speed": 8.11,
+                            "power": 916.3,
+                            "transfer": 1547.78,
+                            "rate": 45.81,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0035_EQ",
+                            "wtname": "2310",
+                            "status": 2.0,
+                            "speed": 4.86,
+                            "power": 410.2,
+                            "transfer": 1190.46,
+                            "rate": 20.51,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0036_EQ",
+                            "wtname": "2311",
+                            "status": 2.0,
+                            "speed": 4.8,
+                            "power": 394.9,
+                            "transfer": 1183.86,
+                            "rate": 19.74,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0037_EQ",
+                            "wtname": "2312",
+                            "status": 2.0,
+                            "speed": 5.23,
+                            "power": 510.7,
+                            "transfer": 1284.14,
+                            "rate": 25.54,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0038_EQ",
+                            "wtname": "2313",
+                            "status": 2.0,
+                            "speed": 4.68,
+                            "power": 326.7,
+                            "transfer": 1115.07,
+                            "rate": 16.34,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 4.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0039_EQ",
+                            "wtname": "2401",
+                            "status": 2.0,
+                            "speed": 3.49,
+                            "power": 306.3,
+                            "transfer": 1087.28,
+                            "rate": 15.32,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0040_EQ",
+                            "wtname": "2402",
+                            "status": 2.0,
+                            "speed": 4.38,
+                            "power": 321.9,
+                            "transfer": 1098.97,
+                            "rate": 16.09,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0041_EQ",
+                            "wtname": "2403",
+                            "status": 2.0,
+                            "speed": 3.44,
+                            "power": 0.0,
+                            "transfer": 0.0,
+                            "rate": 0.0,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0042_EQ",
+                            "wtname": "2404",
+                            "status": 2.0,
+                            "speed": 4.17,
+                            "power": 271.5,
+                            "transfer": 1090.88,
+                            "rate": 13.58,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 2.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0043_EQ",
+                            "wtname": "2405",
+                            "status": 2.0,
+                            "speed": 4.35,
+                            "power": 228.6,
+                            "transfer": 1074.08,
+                            "rate": 11.43,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0044_EQ",
+                            "wtname": "2406",
+                            "status": 2.0,
+                            "speed": 5.34,
+                            "power": 589.8,
+                            "transfer": 1349.32,
+                            "rate": 29.49,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 4.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0045_EQ",
+                            "wtname": "2407",
+                            "status": 2.0,
+                            "speed": 4.52,
+                            "power": 439.1,
+                            "transfer": 1219.05,
+                            "rate": 21.96,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0046_EQ",
+                            "wtname": "2408",
+                            "status": 2.0,
+                            "speed": 3.94,
+                            "power": 202.4,
+                            "transfer": 1082.88,
+                            "rate": 10.12,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0047_EQ",
+                            "wtname": "2409",
+                            "status": 2.0,
+                            "speed": 4.39,
+                            "power": 357.1,
+                            "transfer": 1141.37,
+                            "rate": 17.86,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0048_EQ",
+                            "wtname": "2410",
+                            "status": 2.0,
+                            "speed": 6.61,
+                            "power": 681.7,
+                            "transfer": 1410.81,
+                            "rate": 34.09,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 4.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0049_EQ",
+                            "wtname": "2411",
+                            "status": 2.0,
+                            "speed": 4.41,
+                            "power": 298.3,
+                            "transfer": 1085.08,
+                            "rate": 14.92,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 0.0,
+                            "qfdl": 0.0
+                        },
+                        {
+                            "wtid": "NX_FGS_HA_F_WT_0050_EQ",
+                            "wtname": "2412",
+                            "status": 2.0,
+                            "speed": 5.38,
+                            "power": 464.3,
+                            "transfer": 1243.15,
+                            "rate": 23.21,
+                            "current": null,
+                            "voltage": null,
+                            "ssqfzt": 2.0,
+                            "qfdl": 0.0
+                        }
+                    ]
+                }
+            ],
+            "qf0": 75879.12,
+            "qf2": 0.0,
+            "qf1": 0.0,
+            "qf4": 10698.85,
+            "qf3": 6840.34
+        }
+    }
+}

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -297,7 +297,7 @@
     } from "@/utills/func.js";
     import HeaderNav from "@/components/headerNavSta/index.vue";
     import api from "@api/cockpit/matrix/index.js";
-    import dataJson from "./dataJson.json"
+    import dataJson from "./dataJson2.json"
     export default {
         // 名称
         name: "DetailMatrix", //明细矩阵
@@ -681,7 +681,7 @@
         },
 
         mounted() {
-            this.sourceMap = dataJson.sourceMapData
+            // this.sourceMap = dataJson.sourceMapData
             // this.showMatrixList = dataJson.showMatrixListdata
             // dataJson.showMatrixListdata.forEach((it, index) => {
             //     it.wtlist = new Array(125).fill({
@@ -723,7 +723,8 @@
             // 请求服务
             requestData(first) {
                 if (first) {
-                    this.BASE.showLoading();
+                    // this.BASE.showLoading();
+                    this.changeData(first, dataJson)
                 }
                 api
                     .matrixDetailPush({
@@ -732,32 +733,36 @@
                         type: this.tabIndex.toString(),
                     })
                     .then((res) => {
-                        this.BASE.closeLoading();
-                        if (Object.values(res.data.data).length) {
-                            let sourceMap = res.data.data;
-                            let windNumData = res.data.data.powerVos[0]
-                            this.titleListNew.forEach(it => {
-                                it.value1 = windNumData[it.code]
-                            })
-                            this.sourceMap = sourceMap;
-                            if (first) {
-                                const tempWtArray = this.chunkArray(this.sourceMap.powerVos, 3);
-                                this.showMatrixList = tempWtArray[0];
-                                for (let i = 1; i < tempWtArray.length; i++) {
-                                    setTimeout(() => {
-                                        this.showMatrixList.push(...tempWtArray[i]);
-                                    }, 5);
-                                }
-                            } else {
-                                this.handleClick(this.fillFjzt);
-                            }
-                        } else {
-                            this.sourceMap = {};
-                            this.showMatrixList = [];
-                        }
+                        // this.BASE.closeLoading();
+                        this.changeData(first, res)
                     });
             },
 
+            changeData(first, res) {
+                if (Object.values(res.data.data).length) {
+                    let sourceMap = res.data.data;
+                    let windNumData = res.data.data.powerVos[0]
+                    this.titleListNew.forEach(it => {
+                        it.value1 = windNumData[it.code]
+                    })
+                    this.sourceMap = sourceMap;
+                    if (first) {
+                        const tempWtArray = this.chunkArray(this.sourceMap.powerVos, 3);
+                        this.showMatrixList = tempWtArray[0];
+                        for (let i = 1; i < tempWtArray.length; i++) {
+                            setTimeout(() => {
+                                this.showMatrixList.push(...tempWtArray[i]);
+                            }, 5);
+                        }
+                    } else {
+                        this.handleClick(this.fillFjzt);
+                    }
+                } else {
+                    this.sourceMap = {};
+                    this.showMatrixList = [];
+                }
+            },
+
 
 
             // 点击切换状态

src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -320,8 +320,8 @@ const state = reactive({
     //   value: "inverter",
     // },
   ],
-  tableData: [],
-  tHeard: [],
+  tableData: dataJson.data.data.data,
+  tHeard: dataJson.data.data.title,
   changZhan: "",
   components: ["FDJ", "CLX"], //部件
   modelId: "", //型号

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -275,6 +275,7 @@
 import { useStore } from "vuex";
 import BASE from "@tools/basicTool.js";
 import dataJson from "./dataJson.json";
+import dataJson2 from "../customAnalyse/dataJson.json";
 import {
   ref,
   onMounted,
@@ -328,8 +329,8 @@ const state = reactive({
     //   value: "inverter",
     // },
   ],
-  tableData: [],
-  tHeard: [],
+  tableData: dataJson2.data.data.data,
+  tHeard: dataJson2.data.data.title,
   changZhan: "",
   components: ["FDJ", "CLX"], //部件
   modelId: "", //型号

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -287,35 +287,38 @@ export default {
     },
 
     initWarningList() {
-      let alarmList = [];
-      // let fullTableData = [];
-      let dialogTableData = [];
-      this.$store.state.warningList.forEach((ele) => {
-        if (
-          this.deviceType === ele.deviceType &&
-          this.alarmType === ele.alarmType
-        ) {
-          alarmList?.length < this.$store.state.warningListLimitLength &&
-            alarmList.push(ele);
-          dialogTableData?.length < 50 && dialogTableData.push(ele);
-          // fullTableData.push(ele);
+        if (this.$store.state.warningList?.length>0) {
+            let alarmList = [];
+            // let fullTableData = [];
+            let dialogTableData = [];
+            this.$store.state.warningList.forEach((ele) => {
+                if (
+                this.deviceType === ele.deviceType &&
+                this.alarmType === ele.alarmType
+                ) {
+                alarmList?.length < this.$store.state.warningListLimitLength &&
+                    alarmList.push(ele);
+                dialogTableData?.length < 50 && dialogTableData.push(ele);
+                // fullTableData.push(ele);
+                }
+            });
+            alarmList.sort((a, b) => {
+                return b.ts - a.ts;
+            });
+            dialogTableData.sort((a, b) => {
+                return b.ts - a.ts;
+            });
+            // fullTableData.sort((a, b) => {
+            //   return b.ts - a.ts;
+            // });
+            this.alarmList = alarmList;
+            console.log("alarmList===>>>>", this.alarmList)
+            if (!this.stopUpdate) {
+                this.dialogTableData = dialogTableData;
+            }
+            // this.fullTableData = fullTableData;
         }
-      });
-      alarmList.sort((a, b) => {
-        return b.ts - a.ts;
-      });
-      dialogTableData.sort((a, b) => {
-        return b.ts - a.ts;
-      });
-      // fullTableData.sort((a, b) => {
-      //   return b.ts - a.ts;
-      // });
-      this.alarmList = alarmList;
-      console.log("alarmList===>>>>", this.alarmList)
-      if (!this.stopUpdate) {
-        this.dialogTableData = dialogTableData;
-      }
-      // this.fullTableData = fullTableData;
+      
     },
 
     clickAlarmItem() {

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -603,7 +603,7 @@ const query = reactive({
 const tableLoading = ref(false);
 // 获取历史记录表
 const getAlarmHistoryt = async () => {
-  tableLoading.value = true;
+//   tableLoading.value = true;
   let params = {
     pageNum: query.page,
     pageSize: query.limit,
@@ -620,14 +620,17 @@ const getAlarmHistoryt = async () => {
     end: state.dateTime[1],
   };
   const { data } = await alarm_history(params);
-  tableLoading.value = false;
-  query.pageTotal = data?.total;
-  data?.ls?.forEach((ele) => {
-    ele.isCloseName = ele.endts ? "已解除" : "未解除";
-    ele.deviceTypeName = tableFilter(ele.deviceType);
-    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
-  });
-  state.tableData = data?.ls;
+//   tableLoading.value = false;
+    if (data) {
+        query.pageTotal = data?.total;
+    data?.ls?.forEach((ele) => {
+        ele.isCloseName = ele.endts ? "已解除" : "未解除";
+        ele.deviceTypeName = tableFilter(ele.deviceType);
+        ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
+    });
+    state.tableData = data?.ls;
+    }
+  
 };
 //报警类型变化
 const typechange = () => {

src/views/IntegratedAlarm/yhjyReport/index.vue

@@ -425,9 +425,9 @@
             /**场站 */
             funGetStation() {
                 let that = this;
-                // this.renderReportPage({
-                //     data: jsonData.reldata
-                // });
+                this.renderReportPage({
+                    data: jsonData.reldata
+                });
                 that.stationList = [];
                 that.reportStation = "";
                 getWpList().then((res) => {

src/views/SandTable/SandTable.vue

@@ -6,16 +6,9 @@
             <StBack></StBack>
             <ThreeModel1 class="three-model-layer" :data="mapSource" @when="when" @clickMapItem="clickMapItem">
             </ThreeModel1>
-            <div class="sand-table-left" v-if="showPanel">
-                <!-- <PanelSand class="left-panel" title="气象预测" :subTitle="timeStr + '实况'" style="height: 21vh">
-                    <weather style="cursor: pointer" :data="tqmap1" @click="openWeatherDialog" />
-                </PanelSand>
-                <PanelSand class="left-panel" title="健康推荐">
-                    <RankTable :data="rmls" @rowClick="clickHealthRow" height="23.2vh"></RankTable>
-                </PanelSand>
-                <PanelSand class="left-panel" title="停机信息">
-                    <RankTable :data="sels" @rowClick="clickStopRow" height="23.2vh"></RankTable>
-                </PanelSand> -->
+             <!-- v-if="showPanel" -->
+            <!-- 第一机组 -->
+            <div class="sand-table-left">
                 <PanelSand class="left-panel" title="停机信息">
                     <template v-slot:tools>
                         <div class="exchange" @click="changeBjSwitch">
@@ -36,44 +29,43 @@
                             <span :class="warnSwitch === 'n' ? 'white' : 'gray'" @click="changeWarnSwitch('n')">年</span>
                         </div>
                     </template>
-                    <template v-slot:default>
-                        <RadarPieChart height="18vh" :list="warnChartData" title="预警隐患情况" />
+                    <template v-slot:toolsL>
+                        <div class="exchange">
+                            <span :class="warnPC ? 'white' : 'gray'" @click="changeWarnPC('z')">频次</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="warnPC ? 'gray' : 'white'" @click="changeWarnPC('y')">时长</span>
+                        </div>
                     </template>
-                </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="非停时长占比" @click="clickTime" style="cursor: pointer">
                     <template v-slot:default>
-                        <RadarPieChartCom height="18vh" :list="warnChartData" title="非停时长占比" />
+                        <RadarPieChart height="18vh" :list="warnChartData" :title="warnPC ? '预警频次情况' : '预警时长情况'" />
                     </template>
                 </PanelSandToolbar>
-            </div>
-            <div></div>
-            <div class="sand-table-right" v-if="showPanel">
-                <!-- <PanelSand class="right-panel  mg-t-16" title="视频监控">
-                    <el-row v-for="(pItem, pIndex) in videoArray1" :key="pIndex">
-                        <el-col :span="12" class="pre-img-box" v-for="(cItem, cIndex) in pItem" :key="cIndex"
-                            @click="openVideoDialog1(cItem)">
-                        </el-col>
-                    </el-row>
-                    <div class="mask"></div>
-                </PanelSand>
-                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况">
+                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况" @click="clickTime" style="cursor: pointer">
                     <template v-slot:tools>
-                        <div class="exchange" @click="changeWarnSwitch">
+                        <div class="exchange">
+                            <span :class="probSwitch === 'z' ? 'white' : 'gray'" @click="changeProbSwitch('z')">周</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="probSwitch === 'y' ? 'white' : 'gray'" @click="changeProbSwitch('y')">月</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="probSwitch === 'n' ? 'white' : 'gray'" @click="changeProbSwitch('n')">年</span>
                         </div>
                     </template>
-                    <template v-slot:default>
-                        <RadarPieChart height="21vh" :list="warnChartData" title="预警隐患情况" />
-                    </template>
-                </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况">
-                    <template v-slot:tools>
-                        <div class="exchange" @click="changeBjSwitch">
+                    <template v-slot:toolsL>
+                        <div class="exchange">
+                            <span :class="probPC ? 'white' : 'gray'" @click="changeProbPC('z')">频次</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="probPC ? 'gray' : 'white'" @click="changeProbPC('y')">时长</span>
                         </div>
                     </template>
                     <template v-slot:default>
-                        <RadarPieChart height="21vh" :list="bjChartData" title="故障隐患情况" />
+                        <RadarPieChartCom height="18vh" :list="probChartData" title="故障情况" />
                     </template>
-                </PanelSandToolbar> -->
+                </PanelSandToolbar>
+            </div>
+            <!-- <div></div>
+             v-if="showPanel" -->
+             <!-- 第二机组 -->
+            <div class="sand-table-right">
                 <PanelSand class="left-panel" title="停机信息">
                     <template v-slot:tools>
                         <div class="exchange" @click="changeBjSwitch2">
@@ -94,13 +86,36 @@
                             <span :class="warnSwitch2 === 'n' ? 'white' : 'gray'" @click="changeWarnSwitch2('n')">年</span>
                         </div>
                     </template>
+                    <template v-slot:toolsL>
+                        <div class="exchange">
+                            <span :class="warnPC2 ? 'white' : 'gray'" @click="changeWarnPC2('z')">频次</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="warnPC2 ? 'gray' : 'white'" @click="changeWarnPC2('y')">时长</span>
+                        </div>
+                    </template>
                     <template v-slot:default>
-                        <RadarPieChart height="18vh" :list="warnChartData" title="预警隐患情况" />
+                        <RadarPieChart height="18vh" :list="warnChartData" :title="warnPC2 ? '预警频次情况' : '预警时长情况'" />
                     </template>
                 </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="非停时长占比" @click="clickTime">
+                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况" @click="clickTime">
+                    <template v-slot:tools>
+                        <div class="exchange">
+                            <span :class="probSwitch2 === 'z' ? 'white' : 'gray'" @click="changeProbSwitch2('z')">周</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="probSwitch2 === 'y' ? 'white' : 'gray'" @click="changeProbSwitch2('y')">月</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="probSwitch2 === 'n' ? 'white' : 'gray'" @click="changeProbSwitch2('n')">年</span>
+                        </div>
+                    </template>
+                    <template v-slot:toolsL>
+                        <div class="exchange">
+                            <span :class="probPC2 ? 'white' : 'gray'" @click="changeProbPC2('z')">频次</span>
+                            <i class="blue fa fa-exchange mg-l-8 mg-r-8"></i>
+                            <span :class="probPC2 ? 'gray' : 'white'" @click="changeProbPC2('y')">时长</span>
+                        </div>
+                    </template>
                     <template v-slot:default>
-                        <RadarPieChartCom height="18vh" :list="warnChartData" title="非停时长占比" style="cursor: pointer" />
+                        <RadarPieChartCom height="18vh" :list="probChartData" title="故障情况" style="cursor: pointer" />
                     </template>
                 </PanelSandToolbar>
             </div>
@@ -130,7 +145,8 @@
             >
                 <template #title>
                     <div class="dialogTitle">
-                        非停时长占比与故障次数
+                        <span style="margin-left: 10px">非停时长占比与故障次数</span>
+                        
                     </div>
                 </template>
                 <div class="allMsg">
@@ -158,6 +174,48 @@
                     </div>
                 </template> -->
             </el-dialog>
+            <el-dialog
+                v-model="showTableDialog"
+                :custom-class="noTimeDialogsc"
+                width="80%"
+            >
+                <template #title>
+                    <div class="dialogTitle">
+                        <span style="margin-left: 10px">停机信息</span>
+                        
+                    </div>
+                </template>
+                <div class="warnTable">
+                    <el-table
+                        size="mini"
+                        :data="tableData"
+                        style="width: 100%; height: calc(100% - 310px)"
+                        max-height="520px"
+                        stripe>
+                        <el-table-column
+                            v-for="item in tableHeader"
+                            :label="item.name"
+                            :prop="item.code"
+                            :key="item.code"
+                            :width="item.width || ''"
+                            show-overflow-tooltip
+                            header-align="center"
+                            align="center"
+                        >
+                        <template #default="scope">
+                            <span v-if="item.code == 'status'">
+                                <span :style="scope.row.status === 0 ? 'color: red' : ''">{{scope.row.status === 0 ? "异常" : "正常"}}</span>
+                            </span>
+                            <span v-else>
+                                {{
+                                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
+                                }}
+                            </span>
+                        </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-dialog>
         </div>
         <router-view v-else />
     </div>
@@ -221,6 +279,12 @@
                 bjSwitch2: false,
                 warnSwitch: 'z',
                 warnSwitch2: 'z',
+                probSwitch: 'z',
+                probSwitch2: 'z',
+                warnPC: true,
+                warnPC2: true,
+                probPC: true,
+                probPC2: true,
                 timmer1: null,
                 showWeatherDialog: false,
                 showTableDialog: false,
@@ -341,7 +405,8 @@
                 ],
                 showVideoDialog: false,
                 dialogVideoUrl: "",
-                warnChartData: [],
+                warnChartData: dataJson.data.warnChartData,
+                probChartData: dataJson.data.probChartData,
                 bjChartData: [],
                 ForecastPower: [{
                         name: "今日预测电量",
@@ -398,26 +463,13 @@
                 },
                 sels: {
                     column: [
-                        // {
-                        //     name: "风机编号",
-                        //     field: "windPowerStationId"
-                        // },
-                        // {
-                        //     name: "停机时间",
-                        //     field: "stopTime",
-                        //     width: "120px"
-                        // },
-                        // {
-                        //     name: "时长",
-                        //     field: "stopHours"
-                        // }
                         {
                             name: "机组",
                             field: "code",
                             width: "60px",
                         },
                         {
-                            name: "预警时间",
+                            name: "停机时长(h)",
                             field: "selsTime",
                         },
                         {
@@ -426,7 +478,7 @@
                             width: "60px",
                         },
                     ],
-                    data: []
+                    data: dataJson.data.sels.data
                 },
                 rmls: {
                     column: [{
@@ -450,6 +502,42 @@
                     ],
                     data: [],
                 },
+                tableHeader: [
+                    {
+                        name: "机组",
+                        code: "code"
+                    },
+                    {
+                        name: "停机开始时间",
+                        code: "startTime"
+                    },
+                    {
+                        name: "停机结束时间",
+                        code: "endTime"
+                    },
+                    {
+                        name: "停机时长",
+                        code: "selsTime"
+                    },
+                    {
+                        name: "故障信息",
+                        code: "message"
+                    },
+                    {
+                        name: "当前状态",
+                        code: "status"
+                    }
+                ],
+                tableData: [
+                    {
+                        code: "1001",
+                        startTime: "2024-12-31 09:00",
+                        endTime: "2024-12-31 18:00",
+                        selsTime: "8.0",
+                        message: "电气故障，机械故障",
+                        status: "正常"
+                    }
+                ]
             };
         },
 
@@ -461,17 +549,26 @@
                 if (res.data["72time"] && res.data["72time"].length > 0) {
                     let xAxis = [];
                     let seriesSpeed = [];
+                    let seriesGl = [];
                     res.data["72time"].forEach((it) => {
                         xAxis.push(dayjs(it.time).format("MM-DD HH:mm"));
                         seriesSpeed.push(it.speed);
+                        seriesGl.push(it.expectedpower);
                     });
                     let series = [
                         {
-                        name: "故障次数",
-                        data: seriesSpeed,
-                        type: "line",
-                        symbol: "none",
-                        }
+                            name: "故障次数",
+                            data: seriesSpeed,
+                            type: "line",
+                            symbol: "none",
+                        },
+                        {
+                            name: "故障时长",
+                            data: seriesGl,
+                            yAxisIndex: 1,
+                            type: "line",
+                            symbol: "none",
+                        },
                     ];
                     that.getPowerLine(
                         xAxis,
@@ -498,7 +595,7 @@
 
                 let option = {
                     title: {
-                    text: "故障次数趋势",
+                    text: "故障次数时长",
                     left: "5px",
                     top: "5px",
                     textStyle: {
@@ -516,7 +613,7 @@
                     top: "5",
                     itemWidth: 5,
                     itemHeight: 5,
-                    data: ["故障次数"],
+                    data: ["故障次数", "故障时长"],
                     textStyle: {
                         color: "#fff",
                     },
@@ -561,6 +658,27 @@
                         },
                         },
                     },
+                    {
+                        type: "value",
+                        splitLine: {
+                        lineStyle: {
+                            color: "#ccc",
+                            type: "dashed", // 修改为虚线
+                            opacity: 0.2,
+                        },
+                        },
+                        name: "单位：时长",
+                        axisLine: {
+                        lineStyle: {
+                            color: "#fff",
+                        },
+                        },
+                        axisLabel: {
+                        formatter(value) {
+                            return parseFloat(value.toFixed(1));
+                        },
+                        },
+                    },
                     ],
                     series: series,
                 };
@@ -590,7 +708,7 @@
 
                 let option = {
                     title: {
-                    text: "故障次数趋势",
+                    text: "故障次数时长",
                     left: "5px",
                     top: "5px",
                     textStyle: {
@@ -608,7 +726,7 @@
                     top: "5",
                     itemWidth: 5,
                     itemHeight: 5,
-                    data: ["故障次数"],
+                    data: ["故障次数", "故障时长"],
                     textStyle: {
                         color: "#fff",
                     },
@@ -653,6 +771,27 @@
                         },
                         },
                     },
+                    {
+                        type: "value",
+                        splitLine: {
+                        lineStyle: {
+                            color: "#ccc",
+                            type: "dashed", // 修改为虚线
+                            opacity: 0.2,
+                        },
+                        },
+                        name: "单位：时长",
+                        axisLine: {
+                        lineStyle: {
+                            color: "#fff",
+                        },
+                        },
+                        axisLabel: {
+                        formatter(value) {
+                            return parseFloat(value.toFixed(1));
+                        },
+                        },
+                    },
                     ],
                     series: series,
                 };
@@ -691,12 +830,6 @@
 
             getWtInfo() {
                 let that = this;
-                that.bjChartData = dataJson.data.bjChartData;
-                that.warnChartData = dataJson.data.warnChartData;
-                that.tqmap1 = dataJson.data.tqmap1;
-                that.sels.data = dataJson.data.sels.data;
-                that.rmls.data = dataJson.data.rmls.data;
-                that.gxkmap = dataJson.data.gxkmap;
                 
                 let dateTime = [
                     dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
@@ -732,20 +865,28 @@
                 }
                 
                 const { data } = await alarm_history(params);
-                
-                if (type === 'history') {
-                    data?.ls?.forEach((ele) => {
-                        ele.isCloseName = ele.endts ? "已解除" : "未解除";
-                        ele.rmlsTime = ele.ts > 0 ? this.formatTime(ele.ts) : "--";
-                    });
-                    this.rmls.data = data?.ls;
+
+                if (data) {
+                    if (type === 'history') {
+                        data?.ls?.forEach((ele) => {
+                            ele.isCloseName = ele.endts ? "已解除" : "未解除";
+                            ele.rmlsTime = ele.ts > 0 ? this.formatTime(ele.ts) : "--";
+                        });
+                        this.rmls.data = data?.ls;
+                    } else {
+                        data?.ls?.forEach((ele) => {
+                            ele.isCloseName = ele.endts ? "已解除" : "未解除";
+                            ele.selsTime = ele.ts > 0 ? this.formatTime(ele.ts) : "--";
+                        });
+                        this.sels.data = data?.ls;
+                    }
                 } else {
-                    data?.ls?.forEach((ele) => {
-                        ele.isCloseName = ele.endts ? "已解除" : "未解除";
-                        ele.selsTime = ele.ts > 0 ? this.formatTime(ele.ts) : "--";
-                    });
-                    this.sels.data = data?.ls;
+                    this.sels.data = dataJson.data.sels.data;
+                    this.warnChartData = dataJson.data.warnChartData;
+                    this.probChartData = dataJson.data.probChartData;
                 }
+                
+                
             },
             // 时间格式化
             formatTime(val) {
@@ -900,8 +1041,7 @@
                 });
             },
 
-            clickStopRow(row) {
-                this.tableItem = row;
+            clickStopRow() {
                 this.showTableDialog = true;
             },
 
@@ -1004,6 +1144,25 @@
             changeWarnSwitch2(val) {
                 this.warnSwitch2 = val
             },
+            changeProbSwitch(val) {
+                this.probSwitch = val
+            },
+            changeProbSwitch2(val) {
+                this.warnSwitch2 = val
+            },
+            
+            changeProbPC() {
+                this.probPC = !this.probPC;
+            },
+            changeProbPC2() {
+                this.probPC2 = !this.probPC2;
+            },
+            changeWarnPC() {
+                this.warnPC = !this.warnPC;
+            },
+            changeWarnPC2() {
+                this.warnPC2 = !this.warnPC2;
+            },
             clickTime() {
                 let res = jsonData
                 this.noTimeDialog = true
@@ -1012,17 +1171,26 @@
                 if (res.data["72time"] && res.data["72time"].length > 0) {
                 let xAxis = [];
                 let seriesSpeed = [];
+                let seriesGl = []
                 res.data["72time"].forEach((it) => {
                     xAxis.push(dayjs(it.time).format("MM-DD HH:mm"));
                     seriesSpeed.push(it.speed);
+                    seriesGl.push(it.expectedpower);
                 });
                 let series = [
                     {
-                    name: "故障次数",
-                    data: seriesSpeed,
-                    type: "line",
-                    symbol: "none",
-                    }
+                        name: "故障次数",
+                        data: seriesSpeed,
+                        type: "line",
+                        symbol: "none",
+                    },
+                    {
+                        name: "故障时长",
+                        data: seriesGl,
+                        yAxisIndex: 1,
+                        type: "line",
+                        symbol: "none",
+                    },
                 ];
                 that.$nextTick(() =>{
                      that.getPowerLine3(
@@ -1046,7 +1214,7 @@
 
                 let option = {
                     title: {
-                        text: "故障次数趋势",
+                        text: "故障次数时长",
                         left: "5px",
                         top: "5px",
                         textStyle: {
@@ -1064,7 +1232,7 @@
                         top: "5",
                         itemWidth: 5,
                         itemHeight: 5,
-                        data: ["故障次数"],
+                        data: ["故障次数", "故障时长"],
                         textStyle: {
                             color: "#fff",
                         },
@@ -1101,6 +1269,27 @@
                         },
                         },
                     },
+                    {
+                        type: "value",
+                        splitLine: {
+                        lineStyle: {
+                            color: "#ccc",
+                            type: "dashed", // 修改为虚线
+                            opacity: 0.2,
+                        },
+                        },
+                        name: "单位：时长",
+                        axisLine: {
+                        lineStyle: {
+                            color: "#fff",
+                        },
+                        },
+                        axisLabel: {
+                        formatter(value) {
+                            return parseFloat(value.toFixed(1));
+                        },
+                        },
+                    },
                     ],
                     series: series,
                 };
@@ -1505,6 +1694,7 @@
     .modal {
         .dialogTitle {
             position: relative;
+            left: 10px;
         }
 
         .jumpBtn {

src/views/SandTable/component/dataBJJson.json

@@ -73,54 +73,116 @@
         "sels": {
             "data": [
                 {
-                    "windPowerStationId": "NG01_04",
-                    "stopTime": "2024-08-08 08:00:00",
-                    "stopHours": "8.9"
+                    "code": "1001",
+                    "selsTime": "98.4",
+                    "stopHours": "8.9",
+                    "isCloseName": "故障"
                 },
                 {
-                    "windPowerStationId": "NG01_05",
-                    "stopTime": "2024-08-09 08:00:00",
-                    "stopHours": "9.9"
+                    "code": "1002",
+                    "selsTime": "82.4",
+                    "stopHours": "9.9",
+                    "isCloseName": "检修"
                 },
                 {
-                    "windPowerStationId": "NG01_06",
-                    "stopTime": "2024-08-10 08:00:00",
-                    "stopHours": "6.9"
+                    "code": "1003",
+                    "selsTime": "68.4",
+                    "stopHours": "6.9",
+                    "isCloseName": "故障"
                 },
                 {
-                    "windPowerStationId": "NG01_07",
-                    "stopTime": "2024-08-11 08:00:00",
-                    "stopHours": "15.9"
+                    "code": "1004",
+                    "selsTime": "54.4",
+                    "stopHours": "15.9",
+                    "isCloseName": "检修"
                 },
                 {
-                    "windPowerStationId": "NG01_08",
-                    "stopTime": "2024-08-12 08:00:00",
-                    "stopHours": "5.9"
+                    "code": "1005",
+                    "selsTime": "12.4",
+                    "stopHours": "5.9",
+                    "isCloseName": "正常"
                 }
             ]
         },
     "warnChartData": [{
-        "name": "2024-01",
+        "name": "预警1",
         "value": 210
       },
       {
-        "name": "2024-02",
+        "name": "预警2",
         "value": 260
       },
       {
-        "name": "2024-03",
+        "name": "预警3",
         "value": 580
       },
       {
-        "name": "2024-04",
+        "name": "预警4",
         "value": 540
       },
       {
-        "name": "2024-05",
+        "name": "预警5",
         "value": 360
       },
       {
-        "name": "2024-06",
+        "name": "预警6",
+        "value": 510
+      },
+      {
+        "name": "预警7",
+        "value": 580
+      },
+      {
+        "name": "预警8",
+        "value": 540
+      },
+      {
+        "name": "预警9",
+        "value": 360
+      },
+      {
+        "name": "预警10",
+        "value": 510
+      }
+    ],
+    "probChartData": [{
+        "name": "故障1",
+        "value": 210
+      },
+      {
+        "name": "故障2",
+        "value": 260
+      },
+      {
+        "name": "故障3",
+        "value": 580
+      },
+      {
+        "name": "故障4",
+        "value": 540
+      },
+      {
+        "name": "故障5",
+        "value": 360
+      },
+      {
+        "name": "故障6",
+        "value": 510
+      },
+      {
+        "name": "故障7",
+        "value": 580
+      },
+      {
+        "name": "故障8",
+        "value": 540
+      },
+      {
+        "name": "故障9",
+        "value": 360
+      },
+      {
+        "name": "故障10",
         "value": 510
       }
     ],

src/views/SandTable/component/radar-pie-chart.vue

@@ -82,19 +82,20 @@
                         type: 'pie',
                         radius: '70%',
                         center: ['30%', '50%'], // 左右偏移
-                        data: [{
-                                value: 1048,
-                                name: '其他他故障'
-                            },
-                            {
-                                value: 735,
-                                name: '机械故障'
-                            },
-                            {
-                                value: 580,
-                                name: '电器故障'
-                            }
-                        ],
+                        // data: [{
+                        //         value: 1048,
+                        //         name: '其他他故障'
+                        //     },
+                        //     {
+                        //         value: 735,
+                        //         name: '机械故障'
+                        //     },
+                        //     {
+                        //         value: 580,
+                        //         name: '电器故障'
+                        //     }
+                        // ],
+                        data: this.list,
                         label: {
                             show: false // 取消显示文字
                         },

src/views/SandTable/component/rank-table.vue

@@ -1,5 +1,5 @@
 <template>
-    <table class="com-table rank-table">
+    <table class="com-table rank-table" @click="clickRow">
         <thead>
             <tr>
                 <!-- <th>排名</th> -->
@@ -12,22 +12,10 @@
         <el-scrollbar>
             <tbody :style="{ height: height }">
                 <tr v-for="(row, index) of tableData" :key="index" class="rank">
-                    <!-- <td class="rank-index">
-            <span>{{ index + 1 }}</span>
-          </td> -->
-                    <!-- @click="clickRow(row)" -->
                     <td v-for="(col, i) of data.column" :key="i"
                         :style="{ width: col.width, height: '3.8vh', lineHeight: '3.8vh' }"
                         :class="rankcolSty(col, row)" @mouseleave="leave()">
-                        <!-- :class="{
-              light: hoverRow == row || hoverCol == col,
-              num: col.is_num,
-              'always-light': col.is_light || row.is_light,
-            }" -->
-                        <!-- @click="onClick(col, row)" -->
-                        <component :is="col.type ? col.type : 'span'" v-bind="col.props"
-                            v-html="template(col, row[col.field])">
-                        </component>
+                        <span>{{template(col, row[col.field])}}</span>
                     </td>
                 </tr>
             </tbody>
@@ -169,7 +157,7 @@
             },
             rankcolSty(col, row) {
                 if (col.name === '状态') {
-                    if (row[col.field] === '未解除') {
+                    if (row[col.field] === '故障' || row[col.field] === '检修') {
                         return 'rankcol0'
                     } else {
                         return 'rankcol1'