update

src/api/economic/index.js

@@ -70,13 +70,7 @@ const benchmarkingWplist2 = () => {
         url: `/consumer/benchmarking/wplist`,
         method: "get",
     });
-};
-const benchmarkingLineList2 = (data) => {
-    return request({
-        url: `/consumer/benchmarking/lineList?projects=${data.projects}`,
-        method: "get",
-    });
-};
+}
 const benchmarkingWxssl = (data) => {
     return request({
         url: `/consumer/benchmarking/wxssl?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
@@ -491,7 +485,6 @@ export default {
     benchmarkingLineList1,
     benchmarkingDetails,
     benchmarkingWplist2,
-    benchmarkingLineList2,
     benchmarkingWxssl,
     benchmarkingCndb,
     benchmarkingCjdb,

src/views/Decision/Decision2.vue

@@ -837,7 +837,7 @@ export default {
     },
     XianLuVal(val) {
 
-      api.benchmarkingLineList2({
+      api.benchmarkingLineList({
          projects: val,
       }).then((res) => {
         this.XianLu = res.data;

src/views/Decision/Decision2Xldb.vue

@@ -829,7 +829,7 @@ export default {
     },
     XianLuVal(val) {
 
-      api.benchmarkingLineList2({
+      api.benchmarkingLineList({
         projects: val,
       }).then((res) => {
         this.XianLu = res.data;

src/views/Decision/zbtjfx.vue

@@ -210,7 +210,7 @@ export default {
   },
   methods: {  
     requestData() {
-      api.benchmarkingLineList({
+      api.targetdataJnjpkpi({
          month: this.month,
       }).then((res) => {
          this.fdl = res.data.fdl.toFixed(2);

src/views/Home/components/map/svg-map-nx.vue

@@ -301,65 +301,65 @@
             </g>
             <g class="popup-layer-svg">
               <g v-show="popup[1]">
-                <use xlink:href="#popup-box-svg" x="115" y="55" />
+                <use xlink:href="#popup-box-svg" x="115" y="35" />
                 <text
                   class="mapKey"
                   x="125"
-                  y="75"
+                  y="55"
                   fill="#919697"
                   font-size="12"
                 >
                   经度
                 </text>
-                <text x="175" y="75" fill="#05bb4c" font-size="12">
+                <text x="175" y="55" fill="#05bb4c" font-size="12">
                   {{ xtMap.QS_FDC && xtMap.XS_FDC.jd }}°
                 </text>
                 <text
                   class="mapKey"
                   x="125"
-                  y="100"
+                  y="80"
                   fill="#919697"
                   font-size="12"
                 >
                   纬度
                 </text>
-                <text x="175" y="100" fill="#05bb4c" font-size="12">
+                <text x="175" y="80" fill="#05bb4c" font-size="12">
                   {{ xtMap.QS_FDC && xtMap.XS_FDC.wd }}°
                 </text>
                 <text
                   class="mapKey"
                   x="125"
-                  y="125"
+                  y="105"
                   fill="#919697"
                   font-size="12"
                 >
                   海拔
                 </text>
-                <text x="175" y="125" fill="#05bb4c" font-size="12">
+                <text x="175" y="105" fill="#05bb4c" font-size="12">
                   {{ xtMap.QS_FDC && xtMap.XS_FDC.hb }}米
                 </text>
                 <text
                   class="mapKey"
                   x="125"
-                  y="150"
+                  y="130"
                   fill="#919697"
                   font-size="12"
                 >
                   功率
                 </text>
-                <text x="175" y="150" fill="#05bb4c" font-size="12">
+                <text x="175" y="130" fill="#05bb4c" font-size="12">
                   {{ xtMap.QS_FDC && xtMap.XS_FDC.gl }}MW
                 </text>
                 <text
                   class="mapKey"
                   x="125"
-                  y="175"
+                  y="155"
                   fill="#919697"
                   font-size="12"
                 >
                   风速
                 </text>
-                <text x="175" y="175" fill="#05bb4c" font-size="12">
+                <text x="175" y="155" fill="#05bb4c" font-size="12">
                   {{ xtMap.QS_FDC && xtMap.XS_FDC.ssfs }}m/s
                 </text>
               </g>
@@ -464,6 +464,106 @@
               </g>
             </g>
           </g>
+
+
+          <g v-if="showPoint">
+            <g
+              v-if="showType === 'all' || showType === 'fc'"
+              class="item-label"
+              @click.stop="clickLabel('DX_FDC', '寿阳风电场')"
+              @mouseover="mouseover(3)"
+              @mouseout="mouseout"
+            >
+              <use xlink:href="#nx-map-line-1" x="205" y="155" />
+              <use xlink:href="#nx-map-circle-1" x="205" y="135" />
+              <rect
+                x="110"
+                y="170"
+                width="110"
+                height="18"
+                stroke="#46C55A35"
+                fill="#000000"
+                opacity="0.8"
+              />
+              <text class="mapKey" x="120" y="185" fill="#919697" font-size="12">
+                寿阳
+              </text>
+              <text
+                class="mapValue"
+                x="200"
+                y="185"
+                fill="#05bb4c"
+                font-size="12"
+              >
+                {{ sourceMap.XS_FDC_zjts }}台
+              </text>
+            </g>
+            <g class="popup-layer-svg">
+              <g v-show="popup[3]">
+                <use xlink:href="#popup-box-svg" x="-20" y="170" />
+                <text
+                  class="mapKey"
+                  x="20"
+                  y="190"
+                  fill="#919697"
+                  font-size="12"
+                >
+                  经度
+                </text>
+                <text x="80" y="190" fill="#05bb4c" font-size="12">
+                  {{ xtMap.QS_FDC && xtMap.XS_FDC.jd }}°
+                </text>
+                <text
+                  class="mapKey"
+                  x="20"
+                  y="215"
+                  fill="#919697"
+                  font-size="12"
+                >
+                  纬度
+                </text>
+                <text x="80" y="215" fill="#05bb4c" font-size="12">
+                  {{ xtMap.QS_FDC && xtMap.XS_FDC.wd }}°
+                </text>
+                <text
+                  class="mapKey"
+                  x="20"
+                  y="240"
+                  fill="#919697"
+                  font-size="12"
+                >
+                  海拔
+                </text>
+                <text x="80" y="240" fill="#05bb4c" font-size="12">
+                  {{ xtMap.QS_FDC && xtMap.XS_FDC.hb }}米
+                </text>
+                <text
+                  class="mapKey"
+                  x="20"
+                  y="265"
+                  fill="#919697"
+                  font-size="12"
+                >
+                  功率
+                </text>
+                <text x="80" y="265" fill="#05bb4c" font-size="12">
+                  {{ xtMap.QS_FDC && xtMap.XS_FDC.gl }}MW
+                </text>
+                <text
+                  class="mapKey"
+                  x="20"
+                  y="290"
+                  fill="#919697"
+                  font-size="12"
+                >
+                  风速
+                </text>
+                <text x="80" y="290" fill="#05bb4c" font-size="12">
+                  {{ xtMap.QS_FDC && xtMap.XS_FDC.ssfs }}m/s
+                </text>
+              </g>
+            </g>
+          </g>
         </g>
       </g>
     </svg>

src/views/NewPages/power-benchmarking.vue

@@ -1124,7 +1124,7 @@ export default {
     // 顶部数据
     requestDataTop(timetype) {
       api
-        .benchmarkingLineList({
+        .benchmarkingDbmaintop({
           timetype: timetype,
           foreigntype: "风电",
         })

src/views/specific/mtbf.vue

@@ -48,34 +48,37 @@
               cellspacing="0"
             >
               <tbody>
-                  <tr>
+                <tr>
                   <td style="width: 4vh"></td>
                   <template v-for="(x, i) of GsList" :key="i">
                     <td style="width: 3vh">本期</td>
                     <td style="width: 3vh">同期</td>
                   </template>
                 </tr>
-                  <tr v-for="(items,key,index) in stations" :key="index">
-                    <td class="td-item" style="width: 4vh">{{items.name}}</td>
-                    <template v-for="(item, index) of items.children" :key="index">
-                      <td style="width: 3vh">
-                        {{ item.current }}
-                        <template v-if="item.compare === -1">
-                          <span class="svg-icon svg-icon-yellow">
-                            <svg-icon svgid="svg-arrow-dpwn-1" />
-                          </span>
-                        </template>
-                        <template v-if="item.compare === 1">
-                          <span class="svg-icon svg-icon-green">
-                            <svg-icon svgid="svg-arrow-up-1" />
-                          </span>
-                        </template>
-                      </td>
-                      <td style="width: 3vh">
-                        {{ item.sameperiod }}
-                      </td>
-                    </template>
-                  </tr>
+                <tr v-for="(items, key, index) in stations" :key="index">
+                  <td class="td-item" style="width: 4vh">{{ items.name }}</td>
+                  <template
+                    v-for="(item, index) of items.children"
+                    :key="index"
+                  >
+                    <td style="width: 3vh">
+                      {{ item.current }}
+                      <template v-if="item.compare === -1">
+                        <span class="svg-icon svg-icon-yellow">
+                          <svg-icon svgid="svg-arrow-dpwn-1" />
+                        </span>
+                      </template>
+                      <template v-if="item.compare === 1">
+                        <span class="svg-icon svg-icon-green">
+                          <svg-icon svgid="svg-arrow-up-1" />
+                        </span>
+                      </template>
+                    </td>
+                    <td style="width: 3vh">
+                      {{ item.sameperiod }}
+                    </td>
+                  </template>
+                </tr>
                 <!-- <tr>
                   <td style="width: 4vh"></td>
                   <template v-for="(x, i) of MhsLists" :key="i">
@@ -262,13 +265,13 @@ export default {
   },
   data() {
     return {
-       stations:{},
+      stations: {},
       monthData: [],
-      MhsLists: [],
-      NshList: [],
-      QshList: [],
-      SbaqList: [],
-      XshList: [],
+      // MhsLists: [],
+      // NshList: [],
+      // QshList: [],
+      // SbaqList: [],
+      // XshList: [],
       GsList: [],
       units: [],
       nowCurrent: 1,
@@ -330,13 +333,13 @@ export default {
       return typeof val === "number" && !isNaN(val);
     },
     getLists(showLoading) {
-      let MhsLists = [];
-      let NshList = [];
-      let QshList = [];
-      let SbaqList = [];
-      let XshList = [];
+      // let MhsLists = [];
+      // let NshList = [];
+      // let QshList = [];
+      // let SbaqList = [];
+      // let XshList = [];
       let GsList = [];
-      let _this = this;
+      // let _this = this;
       let year = "";
       if (typeof this.monthValue === "string") {
         year = this.monthValue;
@@ -345,17 +348,19 @@ export default {
       }
       const site = ["compare", "year", "month"];
 
-      api.specificMtbfList({
-       year: year,
-      }).then((res) => {
- let stations = {}
-        let company ={
-          id:'0',
-          name:'公司',
-          children: []
-        }
+      api
+        .specificMtbfList({
+          year: year,
+        })
+        .then((res) => {
+          let stations = {};
+          let company = {
+            id: "0",
+            name: "公司",
+            children: [],
+          };
 
-           this.list = res.data.map((item) => {
+          this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
                 if (this.isNumber(item[key])) {
@@ -367,36 +372,35 @@ export default {
               }
             }
 
-
-           
-            if(item.wpid === "0"){
-              company.children.push(item)
+            if (item.wpid === "0") {
+              company.children.push(item);
             }
-            if(!stations[item.wpid] && item.wpid !== "0" ){
+            if (!stations[item.wpid] && item.wpid !== "0") {
               stations[item.wpid] = {
-                id:item.wpid,
-                name:item.wpname||'',
-                children: []
-              }
+                id: item.wpid,
+                name: item.wpname || "",
+                children: [],
+              };
             }
-            stations[item.wpid]?.children.push(item)
+            stations[item.wpid]?.children.push(item);
             if (item.wpid === "0") {
               GsList.push(item);
-            } 
+            }
           });
-          stations.company = company
+          stations.company = company;
           for (const item in stations) {
-            stations[item].children = stations[item].children.sort(this.compare("month"));
+            stations[item].children = stations[item].children.sort(
+              this.compare("month")
+            );
           }
           console.log(stations);
-          this.stations = stations
-
+          this.stations = stations;
 
-          this.MhsLists = MhsLists.sort(this.compare("month"));
-          this.NshList = NshList.sort(this.compare("month"));
-          this.QshList = QshList.sort(this.compare("month"));
-          this.SbaqList = SbaqList.sort(this.compare("month"));
-          this.XshList = XshList.sort(this.compare("month"));
+          // this.MhsLists = MhsLists.sort(this.compare("month"));
+          // this.NshList = NshList.sort(this.compare("month"));
+          // this.QshList = QshList.sort(this.compare("month"));
+          // this.SbaqList = SbaqList.sort(this.compare("month"));
+          // this.XshList = XshList.sort(this.compare("month"));
           this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
@@ -466,9 +470,7 @@ export default {
           // this.bardata.area = monthData;
           // this.bardata.data[0] = sameCureent;
           // this.bardata.data[1] = nowCureent;
-      });
-
-
+        });
 
       // _this.API.requestData({
       //   showLoading,