Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -429,7 +429,13 @@ const export2Excel = async () => {
   outExportExcel(
     tableHeader,
     tableKey,
-    data.records,
+    data.records.map((item) => {
+      return {
+        ...item,
+        category: categoryConvert(item.category),
+        enable: enabledConvert(item.enable),
+      };
+    }),
     "自定义预警配置导出excel"
   );
 };

src/views/IntegratedAlarm/alarmConfig/historyConfig/index.vue

@@ -366,20 +366,34 @@ const tableKey = [
 ];
 // 批量导出
 const export2Excel = async () => {
-  let { name, wpId, modelId } = query;
+  let tableHeader = [];
+  let tableKey = [];
   const res = await windturbinebj_fetchTableData({
+    ...query,
     pageNum: 1,
     pageSize: 999999,
-    name,
-    wpId,
-    modelId,
   });
 
   ElMessage.success(`导出成功!`);
+  if (query.alarmType == "windturbine" || query.alarmType == "inverter") {
+    tableHeader = state.tableHeader.map((item) => item.title);
+    tableKey = state.tableHeader.map((item) => item.code);
+  } else if (query.alarmType == "booststation") {
+    tableHeader = state.tableHeader1.map((item) => item.title);
+    tableKey = state.tableHeader1.map((item) => item.code);
+  }
   outExportExcel(
     tableHeader,
     tableKey,
-    res.data.records,
+    res.data.records.map((item) => {
+      return {
+        ...item,
+        alarmType: alarmTypeConvert("alarmType", item.alarmType),
+        deviceType: alarmTypeConvert("deviceType", item.deviceType),
+        enable: enabledConvert(item.enable),
+        resetTableName: item.resetTable ? "是" : "否",
+      };
+    }),
     "设备报警配置导出excel"
   );
 };

src/views/IntegratedAlarm/deviceConfig/components/custom.vue

@@ -117,7 +117,29 @@
       height="calc(100% - 45px)"
       style="width: 100%"
     >
-      <el-table-column label="编码" align="center" prop="id" width="50" />
+      <el-table-column
+        v-for="item in state.tableHeader"
+        :key="item.id"
+        :prop="item.prop"
+        :label="item.label"
+        :align="item.align"
+        header-align="center"
+        :width="item.width"
+        :min-width="item.minWidth"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">
+          <span v-if="item.prop == 'rank'"> {{ rankConvert(row.rank) }}</span>
+          <span v-else-if="item.prop == 'category'">
+            {{ categoryConvert(row.category) }}</span
+          >
+          <span v-else-if="item.prop == 'enabled'">
+            {{ row.enabled ? "启用" : "未启用" }}</span
+          >
+          <span v-else>{{ row[item.prop] ? row[item.prop] : "--" }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="编码" align="center" prop="id" width="50" />
       <el-table-column
         label="场站"
         align="center"
@@ -161,7 +183,7 @@
         align="center"
         prop="relatedPartsName"
         min-width="30"
-      />
+      /> -->
       <el-table-column label="操作" align="center" width="80">
         <template #default="scope">
           <el-button
@@ -242,6 +264,23 @@ const state = reactive({
   ],
   visible: false,
   form: {},
+  tableHeader: [
+    { prop: "id", label: "编码", align: "center", width: 50 },
+    { prop: "stationName", label: "场站", align: "center", minWidth: 50 },
+    { prop: "modelId", label: "机型", align: "center", minWidth: 50 },
+    { prop: "name", label: "名称", align: "left", minWidth: 50 },
+    { prop: "expression", label: "表达式", align: "left" },
+    { prop: "rank", label: "级别", align: "center", minWidth: 30 },
+    { prop: "category", label: "类型", align: "center", minWidth: 20 },
+    { prop: "description", label: "描述", align: "left" },
+    { prop: "enabled", label: "是否启用", align: "center", width: 80 },
+    {
+      prop: "relatedPartsName",
+      label: "所属部件",
+      align: "center",
+      minWidth: 30,
+    },
+  ],
 });
 const query = reactive({
   pageNum: 1,
@@ -286,7 +325,7 @@ const getequipmentmodel_list = async () => {
 };
 // 分页导航
 const handlePageChange = (val) => {
-  query.pagenum = val;
+  query.pageNum = val;
   getData();
 };
 const tableHeader = [
@@ -328,7 +367,19 @@ const export2Excel = async () => {
   });
 
   ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, res.records, "自定义预警配置导出excel");
+  outExportExcel(
+    state.tableHeader.map((item) => item.label),
+    state.tableHeader.map((item) => item.prop),
+    res.data.records.map((item) => {
+      return {
+        ...item,
+        rank: rankConvert(item.rank),
+        category: categoryConvert(item.category),
+        enabled: item.enabled ? "启用" : "未启用",
+      };
+    }),
+    "自定义预警配置导出excel"
+  );
 };
 // 模板下载
 const outExe = () => {

src/views/IntegratedAlarm/deviceConfig/components/windturbine.vue

@@ -32,7 +32,7 @@
       </div>
       <div style="display: flex; flex-direction: row; margin-bottom: 10px">
         <el-select
-          v-if="!isStation"
+          v-if="isStation"
           v-model="query.stationId"
           clearable
           size="mini"
@@ -89,69 +89,34 @@
         stripe
         height="calc(100% - 43px)"
       >
-        <el-table-column label="序列号" align="center" prop="id" />
-        <el-table-column label="统一编码" align="center" prop="uniformCode">
-          <template #default="scope">{{
-            // ednaValueConvert(scope.row.ednaValue)
-            scope.row.uniformCode
-          }}</template>
-        </el-table-column>
-        <el-table-column
-          label="描述"
-          align="left"
-          prop="description"
-          width="180"
-        />
         <el-table-column
-          label="停机类型"
-          align="center"
-          prop="characteristic"
-        />
-        <el-table-column label="风机型号" align="center" prop="modelId">
-          <template #default="{ row }">
-            {{ row.modelId ? row.modelId : "--" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="报警类型" align="center" prop="alarmTypeName">
-          <template #default="{ row }">
-            {{ row.alarmTypeName ? row.alarmTypeName : "--" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="故障编码" align="center" prop="nemCode">
-          <template #default="{ row }">
-            {{ row.nemCode ? row.nemCode : "--" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="报警级别" align="center">
-          <template #default="scope">{{
-            levelIdConvert(scope.row.rank)
-          }}</template>
-        </el-table-column>
-        <el-table-column label="报警分类" align="center" min-width="50">
-          <template #default="scope">{{
-            warningClassIfyIdConvert(scope.row.deviceType)
-          }}</template>
-        </el-table-column>
-        <el-table-column label="是否可以复位" align="center" min-width="50">
-          <template #default="scope">{{
-            scope.row.resetTable ? "是" : "否"
-          }}</template>
-        </el-table-column>
-        <el-table-column label="是否启用" align="center" min-width="50">
-          <template #default="scope">{{
-            scope.row.enabled == 1 ? "是" : "否"
-          }}</template>
-        </el-table-column>
-        <el-table-column
-          label="关联部件"
-          align="center"
-          min-width="50"
-          prop="componentsName"
+          v-for="item in state.tableHeader"
+          :key="item.id"
+          :prop="item.prop"
+          :label="item.label"
+          :align="item.align"
+          header-align="center"
+          :width="item.width"
+          :min-width="item.minWidth"
+          show-overflow-tooltip
         >
           <template #default="{ row }">
-            {{ row.componentsName ? row.componentsName : "--" }}
+            <span v-if="item.prop == 'rank'">
+              {{ levelIdConvert(row.rank) }}</span
+            >
+            <span v-else-if="item.prop == 'deviceType'">
+              {{ warningClassIfyIdConvert(row.deviceType) }}</span
+            >
+            <span v-else-if="item.prop == 'resetTable'">
+              {{ row.resetTable ? "是" : "否" }}</span
+            >
+            <span v-else-if="item.prop == 'enabled'">
+              {{ row.enabled == 1 ? "是" : "否" }}</span
+            >
+            <span v-else>{{ row[item.prop] ? row[item.prop] : "--" }}</span>
           </template>
         </el-table-column>
+  
 
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
@@ -216,6 +181,30 @@ const state = reactive({
   modelList: [],
   visible: false,
   form: {},
+  tableHeader: [
+    { label: "序列号", prop: "id", align: "center" },
+    { label: "统一编码", prop: "uniformCode", align: "center" },
+    { label: "描述", prop: "description", align: "left", width: 180 },
+    { label: "停机类型", prop: "characteristic", align: "center" },
+    { label: "风机型号", prop: "modelId", align: "center" },
+    { label: "报警类型", prop: "alarmTypeName", align: "center" },
+    { label: "故障编码", prop: "nemCode", align: "center" },
+    { label: "报警级别", prop: "rank", align: "center" },
+    { label: "报警分类", prop: "deviceType", align: "center", minWidth: 50 },
+    {
+      label: "是否可以复位",
+      prop: "resetTable",
+      align: "center",
+      minWidth: 50,
+    },
+    { label: "是否启用", prop: "enabled", align: "center", minWidth: 50 },
+    {
+      label: "关联部件",
+      prop: "componentsName",
+      align: "center",
+      minWidth: 50,
+    },
+  ],
 });
 const query = reactive({
   pageNum: 1,
@@ -263,7 +252,7 @@ const getequipmentmodel_list = async () => {
 };
 // 分页导航
 const handlePageChange = (val) => {
-  query.pagenum = val;
+  query.pageNum = val;
   getData();
 };
 
@@ -310,17 +299,27 @@ const tableKey = [
 ];
 // 批量导出
 const export2Excel = async () => {
-  let { name, stationId, modelId } = query;
   const res = await windturbinebj_fetchTableData({
+    ...query,
     pageNum: 1,
     pageSize: 999999,
-    name,
-    stationId,
-    modelId,
   });
 
-  ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, res.records, "风机报警配置导出excel");
+  outExportExcel(
+    state.tableHeader.map((item) => item.label),
+    state.tableHeader.map((item) => item.prop),
+    res.data.records.map((item) => {
+      return {
+        ...item,
+        rank: levelIdConvert(item.rank),
+        alarmTypeName: warningClassIfyIdConvert(item.alarmType),
+        deviceType: warningClassIfyIdConvert(item.deviceType),
+        enabled: item.enabled == 1 ? "是" : "否",
+        resetTable: item.resetTable ? "是" : "否",
+      };
+    }),
+    "设备报警配置导出excel"
+  );
 };
 // 模板下载
 const outExe = () => {
@@ -357,8 +356,8 @@ const levelIdConvert = (val) => {
 // 报警分类
 const warningClassIfyIdConvert = (val) => {
   switch (val) {
-    case "station":
-      return "场站";
+    case "interver":
+      return "光伏";
     case "windturbine":
       return "风机";
     case "booststation":

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

@@ -595,10 +595,13 @@ const export2Excel = async () => {
   let params = {
     pageNum: query.page,
     pageSize: query.pageTotal,
-    alarmType: state.typeVal,
+    alarmId: state.alarmId,
+    alarmType: "custom",
+    deviceType: state.typeVal,
     stationid: state.stationId,
-    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
-    modelId: state.modelId,
+    deviceid:
+      state.deviceId || (state.typeVal == "booststation" ? "" : state.deviceId),
+    modelId: state.typeVal == "booststation" ? "" : state.modelId,
     components: state.components,
     description: state.description,
     begin: state.dateTime[0],
@@ -625,7 +628,7 @@ const export2Excel = async () => {
       return ele.id === state.stationId;
     }).name;
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
-
+    console.log(data.ls);
     outExportExcel(
       tableHeader,
       tableKey,
@@ -634,7 +637,10 @@ const export2Excel = async () => {
           ...item,
           ts: formatTime(item.ts),
           rank: tableFilter(item.rank),
-          deviceType: tableFilter(item.deviceType),
+          endtsName: item.endts > 0 ? formatTime(item.endts) : "--",
+          isCloseName: item.endts ? "已解除" : "未解除",
+          confirmed: item.confirmed ? "是" : "否",
+          deviceTypeName: tableFilter(item.deviceType),
         };
       }),
       fileName

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

@@ -657,7 +657,6 @@ const export2Excel = async () => {
       return ele.id === state.stationId;
     }).name;
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
-
     outExportExcel(
       tableHeader,
       tableKey,
@@ -666,7 +665,17 @@ const export2Excel = async () => {
           ...item,
           ts: formatTime(item.ts),
           rank: tableFilter(item.rank),
-          alarmtype: tableFilter(item.alarmtype),
+          alarmTypeName:
+            item.alarmType === "booststation"
+              ? "升压站"
+              : item.alarmType === "windturbine"
+              ? "风机"
+              : item.alarmType === "inverter"
+              ? "光伏"
+              : "",
+          endtsName: item.endts > 0 ? formatTime(item.endts) : "--",
+          isCloseName: item.endts ? "已解除" : "未解除",
+          confirmed: item.confirmed ? "是" : "否",
         };
       }),
       fileName
@@ -691,7 +700,7 @@ const obj = {
   4: "中高级",
   5: "高级",
   booststation: "升压站",
-  custom: "自定义",
+  inverter: "光伏",
   windturbine: "风机",
 };
 const messageTypeObj = {

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/djy-map.vue

@@ -457,158 +457,358 @@ export default {
     return {
       dataList: [
         {
-          name: "升压站",
-          x: "1015",
-          y: "325",
+          name: "#39",
+          x: "1740",
+          y: "10",
+          type: 3,
         },
+
         {
-          name: "#6",
-          x: "1830",
-          y: "550",
+          name: "#38",
+          x: "1675",
+          y: "10",
           type: 3,
         },
+
         {
-          name: "#5",
-          x: "1680",
-          y: "520",
+          name: "#40",
+          x: "1689",
+          y: "-10",
           type: 3,
         },
+
         {
-          name: "#4",
-          x: "1625",
-          y: "350",
+          name: "#37",
+          x: "1615",
+          y: "-10",
           type: 3,
         },
+
         {
-          name: "#3",
-          x: "1515",
+          name: "#36",
+          x: "1570",
+          y: "10",
+          type: 3,
+        },
+
+        {
+          name: "#35",
+          x: "1600",
+          y: "70",
+          type: 3,
+        },
+
+        {
+          name: "#34",
+          x: "1585",
+          y: "125",
+          type: 3,
+        },
+
+        {
+          name: "#33",
+          x: "1535",
+          y: "190",
+          type: 3,
+        },
+
+        {
+          name: "#24",
+          x: "1488",
+          y: "390",
+          type: 3,
+        },
+
+        {
+          name: "#25",
+          x: "1425",
+          y: "430",
+          type: 3,
+        },
+
+        {
+          name: "#49",
+          x: "1420",
+          y: "125",
+          type: 3,
+        },
+
+        {
+          name: "#50",
+          x: "1405",
+          y: "85",
+          type: 3,
+        },
+
+        {
+          name: "#48",
+          x: "1405",
+          y: "165",
+          type: 3,
+        },
+
+        {
+          name: "#45",
+          x: "1400",
           y: "300",
           type: 3,
         },
+
         {
-          name: "#7",
-          x: "1460",
-          y: "830",
+          name: "#23",
+          x: "1380",
+          y: "565",
           type: 3,
         },
+
         {
-          name: "#2",
+          name: "#32",
+          x: "1378",
+          y: "225",
+          type: 3,
+        },
+
+        {
+          name: "#22",
+          x: "1355",
+          y: "500",
+          type: 3,
+        },
+
+        {
+          name: "#46",
+          x: "1345",
+          y: "255",
+          type: 3,
+        },
+
+        {
+          name: "#30",
+          x: "1325",
+          y: "390",
+          type: 3,
+        },
+
+        {
+          name: "#47",
+          x: "1290",
+          y: "175",
+          type: 3,
+        },
+
+        {
+          name: "#31",
+          x: "1250",
+          y: "390",
+          type: 3,
+        },
+
+        {
+          name: "#21",
           x: "1230",
-          y: "200",
+          y: "465",
           type: 3,
         },
+
         {
-          name: "#1",
-          x: "1210",
-          y: "320",
+          name: "#44",
+          x: "1225",
+          y: "335",
           type: 3,
         },
+
         {
-          name: "#17",
-          x: "1130",
-          y: "650",
+          name: "#13",
+          x: "1220",
+          y: "705",
           type: 3,
         },
+
         {
-          name: "#16",
-          x: "1075",
-          y: "120",
+          name: "#14",
+          x: "1165",
+          y: "745",
           type: 3,
         },
+
         {
-          name: "#11",
-          x: "1075",
-          y: "240",
+          name: "#12",
+          x: "1160",
+          y: "645",
           type: 3,
         },
+
         {
-          name: "#10",
-          x: "955",
-          y: "230",
+          name: "#43",
+          x: "1150",
+          y: "400",
+          type: 3,
+        },
+
+        {
+          name: "#20",
+          x: "1140",
+          y: "515",
+          type: 3,
+        },
+
+        {
+          name: "#19",
+          x: "1100",
+          y: "555",
           type: 3,
         },
+
         {
           name: "#15",
-          x: "955",
-          y: "125",
+          x: "1055",
+          y: "735",
           type: 3,
         },
+
         {
-          name: "#14",
-          x: "865",
-          y: "65",
+          name: "#42",
+          x: "1045",
+          y: "385",
           type: 3,
         },
+
         {
           name: "#9",
-          x: "860",
-          y: "230",
+          x: "1020",
+          y: "615",
           type: 3,
         },
+
         {
           name: "#8",
-          x: "770",
-          y: "295",
+          x: "1015",
+          y: "550",
           type: 3,
         },
+
         {
-          name: "#13",
-          x: "770",
-          y: "70",
+          name: "#17",
+          x: "1010",
+          y: "850",
           type: 3,
         },
+
         {
-          name: "#12",
-          x: "740",
-          y: "155",
+          name: "#18",
+          x: "1000",
+          y: "500",
           type: 3,
         },
+
         {
-          name: "#18",
-          x: "710",
-          y: "375",
+          name: "#16",
+          x: "995",
+          y: "790",
           type: 3,
         },
+
         {
-          name: "#19",
-          x: "690",
-          y: "255",
+          name: "#10",
+          x: "975",
+          y: "660",
           type: 3,
         },
+
         {
-          name: "#20",
-          x: "590",
-          y: "275",
+          name: "#11",
+          x: "900",
+          y: "700",
           type: 3,
         },
+
+        {
+          name: "升压站",
+          x: "880",
+          y: "625",
+        },
+
         {
-          name: "#23",
-          x: "440",
-          y: "90",
+          name: "#41",
+          x: "865",
+          y: "500",
           type: 3,
         },
+
         {
-          name: "#21",
-          x: "425",
-          y: "255",
+          name: "#2",
+          x: "835",
+          y: "785",
           type: 3,
         },
+
         {
-          name: "#22",
-          x: "365",
-          y: "155",
+          name: "#26",
+          x: "800",
+          y: "590",
           type: 3,
         },
+
         {
-          name: "#25",
-          x: "175",
-          y: "190",
+          name: "#28",
+          x: "790",
+          y: "525",
           type: 3,
         },
+
         {
-          name: "#24",
-          x: "45",
-          y: "190",
+          name: "#1",
+          x: "770",
+          y: "700",
+          type: 3,
+        },
+
+        {
+          name: "#29",
+          x: "745",
+          y: "410",
+          type: 3,
+        },
+
+        {
+          name: "#27",
+          x: "700",
+          y: "570",
+          type: 3,
+        },
+
+        {
+          name: "#3",
+          x: "600",
+          y: "815",
+          type: 3,
+        },
+
+        {
+          name: "#4",
+          x: "510",
+          y: "815",
+          type: 3,
+        },
+
+        {
+          name: "#7",
+          x: "435",
+          y: "525",
+          type: 3,
+        },
+
+        {
+          name: "#5",
+          x: "420",
+          y: "725",
+          type: 3,
+        },
+
+        {
+          name: "#6",
+          x: "270",
+          y: "720",
           type: 3,
         },
       ],

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/djy-map2.vue

@@ -1,647 +0,0 @@
-<template>
-  <div class="svg-map">
-    <svg
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      x="0px"
-      y="0px"
-      viewBox="0 0 1955 940"
-      :style="
-        'enable-background: new 0 0 866 359; left: ' +
-        svgLeft +
-        '; top: ' +
-        svgTop +
-        ';'
-      "
-      xml:space="preserve"
-      :width="svgWidth"
-      :height="svgHeight"
-    >
-      <defs>
-        <g id="nx-map-line">
-          <line
-            class="nx-map-line"
-            x1="25"
-            y1="25"
-            x2="25"
-            y2="80"
-            stroke="#edbf03"
-            stroke-width="1"
-          />
-          <circle
-            class="nx-map-up-circle"
-            cx="25"
-            cy="25"
-            r="2"
-            fill="#edbf03"
-          />
-        </g>
-        <g id="nx-map-circle">
-          <circle
-            class="nx-map-down-circle-1"
-            cx="25"
-            cy="80"
-            r="3"
-            fill="#edbf03"
-          />
-          <circle
-            class="nx-map-down-circle-2"
-            :class="{ 'nx-map-down-circle-loop': c1 }"
-            cx="25"
-            cy="80"
-            r="9"
-            stroke="#edbf03"
-            stroke-width="1"
-            fill="none"
-          />
-          <circle
-            class="nx-map-down-circle-3"
-            :class="{ 'nx-map-down-circle-loop': c2 }"
-            cx="25"
-            cy="80"
-            r="16"
-            opacity="0.6"
-            stroke="#edbf03"
-            stroke-width="1"
-            fill="none"
-          />
-        </g>
-      </defs>
-      <g>
-        <image
-          style="overflow: visible"
-          width="2050"
-          height="1110"
-          class="map-base"
-          xlink:href="./img/dmt_djy2.png"
-          transform="matrix(1 0 0 1 0 -100)"
-        ></image>
-        <g
-          class="item-label-hover"
-          v-for="(item, index) in dataList"
-          :key="index"
-        >
-          <svg
-            data-v-28794fe1=""
-            version="1.1"
-            xmlns="http://www.w3.org/2000/svg"
-            xmlns:xlink="http://www.w3.org/1999/xlink"
-            :x="String(Number(item.x) - 45)"
-            :y="String(Number(item.y) - 60)"
-            width="150"
-            height="150"
-            viewBox="0 0 220 392"
-            enable-background="new 0 0 220 392"
-            xml:space="preserve"
-            class="windmill"
-          >
-            <image
-              v-if="item.name != '升压站'"
-              data-v-28794fe1=""
-              width="147"
-              height="345"
-              x="58"
-              y="78"
-              xlink:href="@/assets/map/fan/yz.png"
-              class="pillar"
-            ></image>
-            <!-- 运行 -->
-            <image
-              v-if="item.type === 2 || item.type === 3"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_green.png"
-              class="turnCircle"
-            ></image>
-            <!-- 受累 -->
-            <image
-              v-if="item.type === 10 || item.type === 11"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_white.png"
-            ></image>
-            <!-- 限电 -->
-            <image
-              v-if="item.type === 8 || item.type === 9"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_purple.png"
-              class="turnCircle-slow"
-            ></image>
-            <!-- 离线 -->
-            <image
-              v-if="item.type === 12 || item.type === 13"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_black.png"
-            ></image>
-            <!-- 待机 -->
-            <image
-              v-if="item.type === 0 || item.type === 1"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_blue.png"
-            ></image>
-            <!-- 故障 -->
-            <image
-              v-if="item.type === 4 || item.type === 5"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_red.png"
-            ></image>
-            <!-- 检修 -->
-            <image
-              v-if="item.type === 6 || item.type === 7"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_orange.png"
-            ></image>
-            <!-- 升压站 -->
-            <image
-              v-if="item.name == '升压站'"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/png/booster-station.png"
-            ></image>
-          </svg>
-
-          <text
-            v-if="item.name != '升压站'"
-            class="mapKey"
-            :x="Number(item.x) + 25"
-            :y="Number(item.y) + 90"
-            fill="#ffffff"
-            font-size="14"
-          >
-            {{ item.name }}
-          </text>
-          <text
-            v-else
-            class="mapKey"
-            :x="Number(item.x) + 10"
-            :y="Number(item.y) + 80"
-            fill="#ffffff"
-            font-size="14"
-          >
-            {{ item.name }}
-          </text>
-          <g class="isshow" v-if="item.name != '升压站'">
-            <rect
-              :x="Number(item.x) + 55"
-              :y="Number(item.y) + 20"
-              width="90"
-              height="50"
-              stroke="#46C55A35"
-              fill="#000000"
-              opacity="0.8"
-            />
-            <text
-              :x="Number(item.x) + 60"
-              :y="Number(item.y) + 40"
-              fill="#ffffff"
-              font-size="14"
-            >
-              {{ item.fs }}m/s
-            </text>
-            <text
-              :x="Number(item.x) + 60"
-              :y="Number(item.y) + 60"
-              fill="#ffffff"
-              font-size="14"
-            >
-              {{ item.gl }}kW
-            </text>
-          </g>
-        </g>
-      </g>
-      <g>
-        <svg
-          :x="-20"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_green.png"
-          ></image>
-        </svg>
-        <text :x="43" :y="920" fill="#ffffff" font-size="14">运行</text>
-        <svg
-          :x="40"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_white.png"
-          ></image>
-        </svg>
-        <text :x="107" :y="920" fill="#ffffff" font-size="14">受累</text>
-        <svg
-          :x="100"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_purple.png"
-          ></image>
-        </svg>
-        <text :x="165" :y="920" fill="#ffffff" font-size="14">限电</text>
-        <svg
-          :x="160"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_black.png"
-          ></image>
-        </svg>
-        <text :x="229" :y="920" fill="#ffffff" font-size="14">离线</text>
-        <svg
-          :x="220"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_blue.png"
-          ></image>
-        </svg>
-        <text :x="288" :y="920" fill="#ffffff" font-size="14">待机</text>
-        <svg
-          :x="280"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_red.png"
-          ></image>
-        </svg>
-        <text :x="347" :y="920" fill="#ffffff" font-size="14">故障</text>
-        <svg
-          :x="340"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_orange.png"
-          ></image>
-        </svg>
-        <text :x="410" :y="920" fill="#ffffff" font-size="14">检修</text>
-      </g>
-    </svg>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    windturbineList: {
-      type: Array,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      dataList: [
-        {
-          name: "升压站",
-          x: "1015",
-          y: "325",
-        },
-        {
-          name: "#27",
-          x: "1740",
-          y: "800",
-          type: 3,
-        },
-        {
-          name: "#26",
-          x: "1720",
-          y: "680",
-          type: 3,
-        },
-        {
-          name: "#28",
-          x: "1615",
-          y: "720",
-          type: 3,
-        },
-        {
-          name: "#41",
-          x: "1535",
-          y: "660",
-          type: 3,
-        },
-        {
-          name: "#29",
-          x: "1430",
-          y: "870",
-          type: 3,
-        },
-        {
-          name: "#42",
-          x: "1245",
-          y: "535",
-          type: 3,
-        },
-        {
-          name: "#43",
-          x: "1225",
-          y: "420",
-          type: 3,
-        },
-        {
-          name: "#31",
-          x: "1170",
-          y: "320",
-          type: 3,
-        },
-        {
-          name: "#30",
-          x: "1130",
-          y: "265",
-          type: 3,
-        },
-        {
-          name: "#44",
-          x: "1075",
-          y: "375",
-          type: 3,
-        },
-        {
-          name: "#45",
-          x: "945",
-          y: "220",
-          type: 3,
-        },
-        {
-          name: "#46",
-          x: "890",
-          y: "290",
-          type: 3,
-        },
-        {
-          name: "#32",
-          x: "820",
-          y: "265",
-          type: 3,
-        },
-        {
-          name: "#47",
-          x: "755",
-          y: "375",
-          type: 3,
-        },
-        {
-          name: "#48",
-          x: "710",
-          y: "260",
-          type: 3,
-        },
-        {
-          name: "#33",
-          x: "695",
-          y: "140",
-          type: 3,
-        },
-        {
-          name: "#49",
-          x: "615",
-          y: "260",
-          type: 3,
-        },
-        {
-          name: "#34",
-          x: "570",
-          y: "110",
-          type: 3,
-        },
-        {
-          name: "#50",
-          x: "530",
-          y: "295",
-          type: 3,
-        },
-        {
-          name: "#35",
-          x: "455",
-          y: "105",
-          type: 3,
-        },
-        {
-          name: "#36",
-          x: "345",
-          y: "115",
-          type: 3,
-        },
-        {
-          name: "#37",
-          x: "295",
-          y: "80",
-          type: 3,
-        },
-        {
-          name: "#38",
-          x: "230",
-          y: "55",
-          type: 3,
-        },
-        {
-          name: "#39",
-          x: "225",
-          y: "0",
-          type: 3,
-        },
-        {
-          name: "#40",
-          x: "145",
-          y: "80",
-          type: 3,
-        },
-      ],
-      list: this.windturbineList || [],
-    };
-  },
-  created() {
-    this.$nextTick(() => {
-      this.getData();
-    });
-  },
-  methods: {
-    getData() {
-      this.dataList.forEach((item) => {
-        this.list.forEach((i, num) => {
-          if (item.name == i.wtname) {
-            item["fs"] = i.speed + " ";
-            item["gl"] = i.power + " ";
-            item["type"] = i.status;
-          }
-        });
-      });
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.item-label-hover:hover .isshow {
-  display: flex;
-}
-
-.isshow {
-  display: none;
-  color: #ffffff;
-}
-</style>

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/index.vue

@@ -65,11 +65,7 @@
       :windturbineList="windturbineList"
       ref="maps"
     ></djyMap>
-    <djyMap2
-      v-if="project === 'SXJ_KGDL_DJYF02_EG'"
-      :windturbineList="windturbineList"
-      ref="maps"
-    ></djyMap2>
+
     <!-- 牛家岭 -->
     <njlMap
       v-if="project === 'SXJ_KGDL_NJLF01_EG'"
@@ -129,7 +125,6 @@ import ylzMap from "./components/ylz-map.vue";
 import ytyMap from "./components/yty-map.vue";
 import bhb3Map from "./components/bhb3-map.vue";
 import djyMap from "./components/djy-map.vue";
-import djyMap2 from "./components/djy-map2.vue";
 import njlMap from "./components/njl-map.vue";
 import njlMap2 from "./components/njl-map2.vue";
 import pdlMap from "./components/pdl-map.vue";