首页展示数据修改，性能等级评估页面增加分页并完善功能

.env.development

@@ -1,10 +1,10 @@
 # VUE_APP_API=http://10.81.3.155:8020
-# VUE_APP_API=http://192.168.1.105:6060
-VUE_APP_API=http://10.81.3.153:6060
+VUE_APP_API=http://192.168.1.104:6060
+# VUE_APP_API=http://10.81.3.153:6060
 
 # 经济运行 安全监视 
-# VUE_APP_Matrix=http://192.168.1.105:6060
-VUE_APP_Matrix=http://10.81.3.153:6060
+VUE_APP_Matrix=http://192.168.1.104:6060
+# VUE_APP_Matrix=http://10.81.3.153:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011
@@ -25,4 +25,5 @@ VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
 # 综合报警
 VUE_APP_ALARM=http://10.81.3.154:6015
 # 登录
-VUE_APP_VUE_LOGIN_URL=http://10.81.3.153:8190
+VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080
+# VUE_APP_VUE_LOGIN_URL=http://192.168.1.102:48080

.env.production

@@ -14,4 +14,4 @@ VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
 # 综合报警
 VUE_APP_ALARM=http://10.81.3.154:6015
 # 登录
-VUE_APP_VUE_LOGIN_URL=http://10.81.3.153:8190
+VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080

src/api/common.js

@@ -3,7 +3,7 @@ import request from "@/tools/request";
 export function login(data) {
   return request({
     baseURL: process.env.VUE_APP_VUE_LOGIN_URL,
-    url: "login",
+    url: "/admin-api/system/auth/login",
     method: "post",
     data,
     headers: {
@@ -14,7 +14,7 @@ export function login(data) {
 export function getUserinfo() {
   return request({
     baseURL: process.env.VUE_APP_VUE_LOGIN_URL,
-    url: "/getInfo",
+    url: "/admin-api/system/auth/get-permission-info",
     method: "get",
     headers: {
       isUser: true,

src/api/home/home.js

@@ -42,7 +42,7 @@ export function FindProjectplan(data) {
 export function FindGroupRealtime(data) {
   return request({
     baseURL: process.env.VUE_APP_Matrix,
-    url: `cockpit/GroupRealtime?wpId=${data.wpId}&uniformCode=SSZGL`,
+    url: `cockpit/GroupRealtime?wpId=${data.wpId}&uniformCode=${data.uniformCode}`,
     method: "get",
   });
 }

src/api/monthlyPerformanceAnalysis.js

@@ -296,7 +296,7 @@ export function getApicurveFitting(params) {
 export function getApiequipmentinfoDayList(params) {
   return request({
     baseURL: process.env.VUE_APP_Matrix,
-    url: `/pro-econ-equipment-info-day-top/equipmentinfo-day-list?companyId=${params.companyId}&date=${params.date}&staType=${params.staType}&types=${params.types}&type=${params.type}&windpowerstationId=${params.wpId}`,
+    url: `/pro-econ-equipment-info-day-top/equipmentinfo-day-list?companyId=${params.companyId}&date=${params.date}&staType=${params.staType}&types=${params.types}&type=${params.type}&windpowerstationId=${params.wpId}&pageNum=${params.pageNum}&pageSize=${params.pageSize}`,
     method: "GET",
   });
 }

src/components/alarm/index.vue

@@ -84,12 +84,12 @@ export default {
     },
     getTableData() {
       GetTableData({
-        begin: dayjs().format("YYYY-MM-DD"),
-        end: dayjs().add(1, "day").format("YYYY-MM-DD"),
+        begin: dayjs().startOf('day').format("YYYY-MM-DD HH:mm:ss"),
+        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
         alarmType: "windturbine",
         stationid: this.wpid,
         deviceid: this.wtid,
-        pageNum: this.page.currentPage - 1,
+        pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
         description: "",
       }).then(({ data }) => {

src/components/chart/pie/dash-pie-chart.vue

@@ -27,6 +27,10 @@ export default {
       type: String,
       default: "标题",
     },
+    unit: {
+      type: String,
+      default: "",
+    },
     // 值
     value: {
       type: Number,
@@ -66,15 +70,18 @@ export default {
       let option = {
         title: {
           show: true,
-          text: this.title,
+          text: this.unit,
+          subtext: this.title,
+          subtextStyle: {
+            fontSize: 12,
+            color: "#fff",
+          },
           x: "45%",
-          y: "80%",
+          y: "62%",
           z: 8,
           textAlign: "center",
           textStyle: {
-            color: $("#appBody").is(".dark")
-              ? partten.getColor("gray")
-              : "#000",
+            color:'#999',
             fontSize: util.vh(12),
             fontWeight: "normal",
           },

src/components/headerNav/index.vue

@@ -17,7 +17,7 @@
         <span>{{ tab.text }}</span>
       </div>
     </div>
-    <div class="rightTitle" v-if="wpId != 'KGDL_FGS'">
+    <!-- <div class="rightTitle" v-if="wpId != 'KGDL_FGS'">
       <div
         class="all-enterprise"
         :class="{ active1: enterpriseIndex == 'all' }"
@@ -46,7 +46,7 @@
       >
         <span>{{ item.aname }}</span>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -95,7 +95,7 @@ export default {
         },
       ],
       enterpriseIndex: "all",
-      companyName: "清洁能源",
+      companyName: "山西",
       showType: "all",
       childNode: [],
       regionList: [

src/components/qushi/qushiDialog.vue

@@ -133,6 +133,16 @@
         >
           <el-table-column
             align="center"
+            v-for="item in tableHeader"
+            :key="item.code"
+            :prop="item.code"
+            :label="item.title"
+            :width="item.width ? item.width : ''"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <!-- <el-table-column
+            align="center"
             prop="name"
             label="指标名称"
             width="500"
@@ -156,12 +166,12 @@
           </el-table-column>
           <el-table-column align="center" prop="value" label="快照值">
           </el-table-column>
-          <el-table-column align="center" prop="minvalue" label="最大值">
+          <el-table-column align="center" prop="minvalue" label="最小值">
           </el-table-column>
-          <el-table-column align="center" prop="maxvalue" label="最小值">
+          <el-table-column align="center" prop="maxvalue" label="最大值">
           </el-table-column>
           <el-table-column align="center" prop="avgvalue" label="平均值">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="showy"
             label="操作"
@@ -288,7 +298,7 @@ import {
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import dayjs from "dayjs";
 import windChartCom from "./lineCharts.vue";
-
+import { outExportExcel } from "@/tools/excel/exportExcel.js"; //引入文件
 export default {
   name: "changeCheck", //趋势对比
   components: {
@@ -315,6 +325,15 @@ export default {
   },
   data() {
     return {
+      tableHeader: [
+        { title: "指标名称", code: "name", width: 500 },
+        { title: "描述", code: "tagName", width: 400 },
+        { title: "快照时间", code: "dateTime", width: 200 },
+        { title: "快照值", code: "value" },
+        { title: "最大值", code: "maxvalue" },
+        { title: "最小值", code: "minvalue" },
+        { title: "平均值", code: "avgvalue" },
+      ],
       value: true,
       dialogVisibles: false,
       stse: [],
@@ -470,7 +489,11 @@ export default {
       }
       this.ysetDialogVisible = false;
     },
-    exportDatas() {},
+    exportDatas() {
+      let tableHeader = this.tableHeader.map((item) => item.title);
+      let tableKey = this.tableHeader.map((item) => item.code);
+      outExportExcel(tableHeader,tableKey,this.detailsValue,'对比曲线导出数据');
+    },
     c() {
       this.dialogFull ? (this.dialogFull = false) : (this.dialogFull = true);
     },

src/router/index.js

@@ -310,7 +310,7 @@ export const asyncRoutes = [
         meta: {
           title: "综合报警",
           icon: "svg-alarm-center",
-          permissions: ["jn_alarm"],
+          permissions: ["jn_alarm", "*:*:*"],
         },
         children: [
           {
@@ -321,7 +321,7 @@ export const asyncRoutes = [
             meta: {
               title: "报警列表",
               icon: "",
-              permissions: ["jn_alarm_bjlb"],
+              permissions: ["jn_alarm_bjlb", "*:*:*"],
             },
           },
         ],
@@ -402,19 +402,19 @@ export const asyncRoutes = [
               permissions: ["jn_dbgl_wxssl", "*:*:*"],
             },
           },
-          {
-            path: "companyBenchmarking",
-            component: () =>
-              import(
-                "@/views/economicsOperation/benchmarkingManagement/companyBenchmarking"
-              ),
-            name: "companyBenchmarking",
-            meta: {
-              title: "公司对标",
-              icon: "",
-              permissions: ["jn_dbgl_gsdb", "*:*:*"],
-            },
-          },
+        //   {
+        //     path: "companyBenchmarking",
+        //     component: () =>
+        //       import(
+        //         "@/views/economicsOperation/benchmarkingManagement/companyBenchmarking"
+        //       ),
+        //     name: "companyBenchmarking",
+        //     meta: {
+        //       title: "公司对标",
+        //       icon: "",
+        //       permissions: ["jn_dbgl_gsdb", "*:*:*"],
+        //     },
+        //   },
           {
             path: "siteBenchmarking",
             component: () =>

src/store/modules/user.js

@@ -30,9 +30,9 @@ const mutations = {
     state.loginState = false;
   },
   SET_TOKEN: (state, data) => {
-    state.authToken = data.token;
+    state.authToken = data.accessToken;
     state.userId = data.userId;
-    setToken(data.token);
+    setToken(data.accessToken);
     setUserId(data.userId);
   },
   SET_LOGINSTATE: (state, login) => {
@@ -54,11 +54,11 @@ const actions = {
   GetInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
       getUserinfo()
-        .then((res) => {
+        .then(({ data: res }) => {
           if (res.roles && res.roles.length > 0) {
             // 验证返回的roles是否是一个非空数组
             commit("SET_ROLES", res.roles);
-            commit("SET_NAME", res.user.userName);
+            // commit("SET_NAME", res.user.nickname);
             commit("SET_PERMISSIONS", res.permissions);
           } else {
             commit("SET_ROLES", ["ROLE_DEFAULT"]);

src/views/Home/components/map.vue

@@ -21,7 +21,13 @@
           <span class="unit">天</span>
         </div>
         <div class="security">
-          <div class="text">资产统计:</div>
+          <div v-if="wpId.includes('FDC') || wpId.includes('GDC')" class="text">
+            {{ currentTitle }}资产统计:
+          </div>
+          <div v-else-if="tabShow == 0" class="text">资产统计:</div>
+          <div v-else-if="tabShow == -1" class="text">风电资产统计:</div>
+          <div v-else-if="tabShow == -2" class="text">光伏资产统计:</div>
+
           <div class="num">
             <span class="font-num">
               {{
@@ -35,7 +41,7 @@
             <span class="unit-t">MW</span>
           </div>
           <div class="lineBox">
-            <div class="fd-rl" v-if="tabShow == -1 || tabShow == 0">
+            <div class="fd-rl" v-if="tabShow == 0">
               <span class="text">风电</span>
               <span class="font-num">
                 {{
@@ -48,7 +54,7 @@
               </span>
               <span class="unit">MW</span>
             </div>
-            <div class="gf-rl" v-if="tabShow == -2 || tabShow == 0">
+            <div class="gf-rl" v-if="tabShow == 0">
               <span class="text">光伏</span>
               <span class="font-num">{{
                 wpId.includes("GDC")
@@ -332,23 +338,35 @@
         "
       >
         <div class="security-day">
-          <div class="text">清洁能源产业总装机容量:</div>
+          <div v-if="activeTab == 0" class="text">清洁能源产业总装机容量:</div>
+          <div v-if="activeTab == -1" class="text">
+            清洁能源产业风电总装机容量:
+          </div>
+          <div v-if="activeTab == -2" class="text">
+            清洁能源产业光伏总装机容量:
+          </div>
           <div class="num">
-            <span class="font-num">{{
+            <span class="font-num" v-if="activeTab == 0">{{
               StationinformationData?.qt?.zzjrl
             }}</span>
+            <span class="font-num" v-if="activeTab == -1">{{
+              StationinformationData?.qt?.fdzzjrl
+            }}</span>
+            <span class="font-num" v-if="activeTab == -2">{{
+              StationinformationData?.qt?.gfzzjrl
+            }}</span>
             <span class="unit">MW</span>
           </div>
           <div class="security">
             <div class="lineBox">
-              <div v-if="activeTab == -1 || activeTab == 0">
+              <div v-if="activeTab == 0">
                 <span>风电</span>
                 <span class="num font-num">{{
                   StationinformationData?.qt?.fdzzjrl
                 }}</span>
                 <span class="unit">MW</span>
               </div>
-              <div v-if="activeTab == -2 || activeTab == 0">
+              <div v-if="activeTab == 0">
                 <span>光伏</span>
                 <span class="num font-num">{{
                   StationinformationData?.qt?.gfzzjrl
@@ -766,36 +784,15 @@
           </BarCharts>
         </div>
       </el-dialog>
-      <el-dialog
-        class="dialogs"
-        width="80%"
-        v-model="dialogGroupRealname"
-        :show-close="true"
-      >
-        <template #title>
-          <div class="dialog-title">
-            <img class="dialog-title-img" src="@assets/imgs/dialog-title.png" />
-            <div class="title">{{ showName }}</div>
-          </div>
-        </template>
-        <div class="dialog-body" style="height: 40vh">
-          <img class="dialog-img" src="@assets/imgs/dialog.png" />
-          <windChartCom
-            :windCurveValues="groupList"
-            :unit="'MW'"
-            :CurveTitle="'实时负荷'"
-            width="100%"
-            height="38vh"
-            chartId="windChar"
-          />
-        </div>
-      </el-dialog>
+
       <Row type="flex" style="margin-bottom: 20px">
         <Col :span="24">
           <div class="model-bg-new">
             <div class="titles">
-              <div class="name">实时负荷</div>
-              <div class="unit">(单位: MW)</div>
+              <div class="name">
+                {{ activeTab == 0 ? "实时负荷" : "关键指标" }}
+              </div>
+              <!-- <div class="unit">(单位: MW)</div> -->
             </div>
             <power-review-home
               :data="powerDataHome"
@@ -806,6 +803,7 @@
           <!--   @chartClick="showPowerChart" -->
         </Col>
       </Row>
+      <!-- 风电场 -->
       <Row
         type="flex"
         style="margin-bottom: 20px"
@@ -924,6 +922,7 @@
           </div>
         </Col>
       </Row>
+      <!-- 光电站 -->
       <Row
         type="flex"
         style="margin-bottom: 20px"
@@ -1033,7 +1032,32 @@
         </Col>
       </Row>
     </div>
-
+    <!-- 全国实时负荷/关键指标弹窗 -->
+    <el-dialog
+      class="dialogs"
+      width="80%"
+      v-model="dialogGroupRealname"
+      :show-close="true"
+      destroy-on-close
+    >
+      <template #title>
+        <div class="dialog-title">
+          <img class="dialog-title-img" src="@assets/imgs/dialog-title.png" />
+          <div class="title">{{ showName }}</div>
+        </div>
+      </template>
+      <div class="dialog-body" style="height: 40vh">
+        <img class="dialog-img" src="@assets/imgs/dialog.png" />
+        <windChartCom
+          :windCurveValues="groupList"
+          :unit="'MW'"
+          :CurveTitle="chartName"
+          width="100%"
+          height="38vh"
+          chartId="windChar"
+        />
+      </div>
+    </el-dialog>
     <div v-if="currentTitle != '全国'">
       <!-- 山西右侧信息 -->
       <div class="card wind_card">
@@ -1259,6 +1283,7 @@
         width="70%"
         v-model="dialogVisible"
         :show-close="true"
+        destroy-on-close
       >
         <template #title>
           <div class="dialog-title">
@@ -1448,12 +1473,13 @@ export default {
           wpId: "KGDL_FGS",
         },
         {
-          name: "清洁能源",
+          name: "山西",
           wpId: "SXJ_RGN",
         },
       ],
       switchShow: false, //接入情况弹窗
       showName: "",
+      chartName: "",
       StationinformationData: [],
       showkey: "",
       dialogGroupRealname: false, //全国实时负荷弹窗开关
@@ -1587,28 +1613,79 @@ export default {
               this.homeSuspensionWindowsData.hbqyxx = { ...element };
             }
           });
-
-          this.powerDataHome = [
-            {
-              title: "清洁能源",
-              value: (data?.qt?.sjgl / 1000).toFixed(2),
-              dialogTitle: "清洁能源",
-              max: 3000,
-            },
-            {
-              title: "风电",
-              value: (data?.qt?.fdsjgl / 1000).toFixed(2),
-              dialogTitle: "风电功率详情",
-              max: 3000,
-            },
-            {
-              title: "光伏",
-              value: (data?.qt?.gfsjgl / 1000).toFixed(2),
-              dialogTitle: "光伏功率详情",
-              max: 3000,
-            },
-          ];
-
+          if (this.tabShow == -1) {
+            this.powerDataHome = [
+              {
+                title: "实时风速",
+                value: (data?.qt?.ssfs).toFixed(2),
+                dialogTitle: "实时风速",
+                max: 3000,
+                unit: "m/s",
+              },
+              {
+                title: "实际功率",
+                value: (data?.qt?.fdsjgl).toFixed(2),
+                dialogTitle: "实际功率",
+                max: 3000,
+                unit: "MW",
+              },
+              {
+                title: "风能利用率",
+                value: (data?.qt?.fnlyl).toFixed(2),
+                dialogTitle: "风能利用率",
+                max: 100,
+                unit: "%",
+              },
+            ];
+          } else if (this.tabShow == 0) {
+            this.powerDataHome = [
+              {
+                title: "清洁能源",
+                value: (data?.qt?.sjgl / 1000).toFixed(2),
+                dialogTitle: "清洁能源",
+                max: 3000,
+                unit: "MW",
+              },
+              {
+                title: "风电",
+                value: (data?.qt?.fdsjgl / 1000).toFixed(2),
+                dialogTitle: "风电功率详情",
+                max: 3000,
+                unit: "MW",
+              },
+              {
+                title: "光伏",
+                value: (data?.qt?.gfsjgl / 1000).toFixed(2),
+                dialogTitle: "光伏功率详情",
+                max: 3000,
+                unit: "MW",
+              },
+            ];
+          } else if (this.tabShow == -2) {
+            this.powerDataHome = [
+              {
+                title: "光照强度",
+                value: (data?.qt?.gzzs).toFixed(2),
+                dialogTitle: "光照强度",
+                max: 3000,
+                unit: "W/m²",
+              },
+              {
+                title: "实际功率",
+                value: (data?.qt?.sjgl).toFixed(2),
+                dialogTitle: "实际功率",
+                max: 3000,
+                unit: "MW",
+              },
+              {
+                title: "光能利用率",
+                value: (data?.qt?.fnlyl).toFixed(2),
+                dialogTitle: "光能利用率",
+                max: 100,
+                unit: "%",
+              },
+            ];
+          }
           let sbztmap = {
             fd: {},
             gf: {},
@@ -1801,7 +1878,7 @@ export default {
       //当wpId是FDC/GDC时,此时点击全部、风电、光伏按钮，展示山西地图及对应的公司信息
       let fcId = wpId;
       if ((wpId.includes("FDC") || wpId.includes("GDC")) && this.flag) {
-        if (name != "清洁能源") {
+        if (name != "山西") {
           fcId = this.historyWpId;
         } else {
           fcId = "SXJ_RGN";
@@ -1868,9 +1945,10 @@ export default {
       this.currentActiveTab(penetrateType);
     },
     // 全国实时负荷点击弹窗
-    showPowerChart({ dialogTitle, data }) {
+    showPowerChart({ dialogTitle, data, chartName = "" }) {
       this.dialogGroupRealname = true;
       this.showName = dialogTitle;
+      this.chartName = chartName ? chartName : dialogTitle;
       this.groupList = data;
     },
     // 区域实时负荷点击弹窗
@@ -2324,7 +2402,7 @@ p {
     .model-bg {
       width: 100%;
       min-height: 135px;
-    //   background-color: rgba(3, 5, 9, 0.5);
+      //   background-color: rgba(3, 5, 9, 0.5);
       border-radius: 6px;
       display: flex;
       flex-direction: column;
@@ -2396,11 +2474,11 @@ p {
           top: 270px;
         }
         &.box2 {
-        //   top: 500px;
+          //   top: 500px;
           top: 450px;
         }
         &.box3 {
-        //   top: 730px;
+          //   top: 730px;
           top: 690px;
         }
         .energy-system-content {

src/views/Home/components/map/SX.vue

@@ -106,13 +106,6 @@
               showType === 'fc' ||
               companyid == 'SXJ_KGDL_FLFD_ZGS0'
             "
-            @click.stop="
-              clickLabel(
-                'SXJ_KGDL_XWT_FDC_STA',
-                '右玉小五台风电场',
-                penetrateType
-              )
-            "
           >
             <svg
               version="1.1"
@@ -136,14 +129,6 @@
                 xlink:href="./pillars.png"
               ></image>
               <image
-                v-if="sourceMap.XWT_FDC_fczt === 3"
-                width="200"
-                height="165"
-                xlink:href="./fl_white.png"
-                transform="matrix(1 0 0 1 -20 40)"
-              ></image>
-              <image
-                v-else
                 width="200"
                 height="165"
                 class="fan"
@@ -156,21 +141,105 @@
               "
             >
               <rect
-                x="443"
-                y="2"
+                x="441"
+                y="-8"
                 width="82"
-                height="12"
+                height="24"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
-              <text class="mapKey" x="446" y="11" fill="#919697" font-size="8">
+              <text
+                class="mapKey"
+                x="444"
+                y="0"
+                fill="#919697"
+                font-size="8"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_XWT_FDC_STA',
+                    '右玉小五台风电场',
+                    penetrateType
+                  )
+                "
+              >
                 右玉小五台
               </text>
-              <text x="498" y="11" fill="#05bb4c" font-size="8">
+              <text
+                x="492"
+                y="0"
+                fill="#05bb4c"
+                font-size="8"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_XWT_FDC_STA',
+                    '右玉小五台风电场',
+                    penetrateType
+                  )
+                "
+              >
                 {{ sourceMap?.station?.SXJ_KGDL_XWT_FDC_STA?.zjts }}
               </text>
-              <text class="mapKey" x="508" y="11" fill="#919697" font-size="8">
+              <text
+                class="mapKey"
+                x="508"
+                y="0"
+                fill="#919697"
+                font-size="8"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_XWT_FDC_STA',
+                    '右玉小五台风电场',
+                    penetrateType
+                  )
+                "
+              >
+                台
+              </text>
+              <text
+                class="mapKey"
+                x="444"
+                y="12"
+                fill="#919697"
+                font-size="8"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_DJY_FDC_STA',
+                    '右玉丁家窑',
+                    penetrateType
+                  )
+                "
+              >
+                右玉丁家窑
+              </text>
+              <text
+                x="492"
+                y="12"
+                fill="#05bb4c"
+                font-size="8"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_DJY_FDC_STA',
+                    '右玉丁家窑',
+                    penetrateType
+                  )
+                "
+              >
+                {{ sourceMap?.station?.SXJ_KGDL_DJY_FDC_STA?.zjts }}
+              </text>
+              <text
+                x="508"
+                y="12"
+                fill="#919697"
+                font-size="8"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_DJY_FDC_STA',
+                    '右玉丁家窑',
+                    penetrateType
+                  )
+                "
+              >
                 台
               </text>
             </g>
@@ -187,8 +256,8 @@
               version="1.1"
               xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
-              x="403"
-              y="5"
+              x="368"
+              y="45"
               width="45"
               height="45"
               viewBox="0 0 220 392"
@@ -227,94 +296,37 @@
               "
             >
               <rect
-                x="360"
-                y="-10"
-                width="82"
-                height="30"
+                x="310"
+                y="64"
+                width="75"
+                height="15"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
-              <text
-                class="mapKey"
-                x="363"
-                y="-1"
-                fill="#919697"
-                font-size="8"
-                @click.stop="
-                  clickLabel('SXJ_KGDL_YF_FDC_STA', '平鲁禹丰', penetrateType)
-                "
-              >
-                平鲁禹丰
-              </text>
-              <text
-                x="410"
-                y="-1"
-                fill="#05bb4c"
-                font-size="8"
-                @click.stop="
-                  clickLabel('SXJ_KGDL_YF_FDC_STA', '平鲁禹丰', penetrateType)
-                "
-              >
-                {{ sourceMap?.station?.SXJ_KGDL_YF_FDC_STA?.zjts }}
-              </text>
-              <text
-                x="425"
-                y="-1"
-                fill="#919697"
-                font-size="8"
-                @click.stop="
-                  clickLabel('SXJ_KGDL_YF_FDC_STA', '平鲁禹丰', penetrateType)
-                "
-              >
-                台
-              </text>
-              <text
-                class="mapKey"
-                x="363"
-                y="14"
-                fill="#919697"
-                font-size="8"
+              <g
                 @click.stop="
                   clickLabel(
-                    'SXJ_KGDL_DJY_FDC_STA',
-                    '右玉丁家窑',
+                    'SXJ_KGDL_NJL_FDC_STA',
+                    '牛家岭风电场',
                     penetrateType
                   )
                 "
               >
-                右玉丁家窑
-              </text>
-              <text
-                x="410"
-                y="14"
-                fill="#05bb4c"
-                font-size="8"
-                @click.stop="
-                  clickLabel(
-                    'SXJ_KGDL_DJY_FDC_STA',
-                    '右玉丁家窑',
-                    penetrateType
-                  )
-                "
-              >
-                {{ sourceMap?.station?.SXJ_KGDL_DJY_FDC_STA?.zjts }}
-              </text>
-              <text
-                x="425"
-                y="14"
-                fill="#919697"
-                font-size="8"
-                @click.stop="
-                  clickLabel(
-                    'SXJ_KGDL_DJY_FDC_STA',
-                    '右玉丁家窑',
-                    penetrateType
-                  )
-                "
-              >
-                台
-              </text>
+                <text
+                  class="mapKey"
+                  x="314"
+                  y="75"
+                  fill="#919697"
+                  font-size="8"
+                >
+                  牛家岭
+                </text>
+                <text x="352" y="75" fill="#05bb4c" font-size="8">
+                  {{ sourceMap?.station?.SXJ_KGDL_NJL_FDC_STA?.zjts }}
+                </text>
+                <text x="372" y="75" fill="#919697" font-size="8">台</text>
+              </g>
             </g>
           </g>
           <g
@@ -369,50 +381,28 @@
               "
             >
               <rect
-                x="305"
-                y="10"
+                x="295"
+                y="-6"
                 width="100"
-                height="30"
+                height="36"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
-              <text
-                class="mapKey"
-                x="313"
-                y="19"
-                fill="#919697"
-                font-size="8"
-                @click.stop="
-                  clickLabel(
-                    'SXJ_KGDL_BHB_FDC_STA',
-                    '平鲁败虎堡',
-                    penetrateType
-                  )
-                "
-              >
-                平鲁败虎堡
-              </text>
-              <text
-                x="375"
-                y="19"
-                fill="#05bb4c"
-                font-size="8"
+              <g
                 @click.stop="
-                  clickLabel(
-                    'SXJ_KGDL_BHB_FDC_STA',
-                    '平鲁败虎堡',
-                    penetrateType
-                  )
+                  clickLabel('SXJ_KGDL_YF_FDC_STA', '平鲁禹丰', penetrateType)
                 "
               >
-                {{ sourceMap?.station?.SXJ_KGDL_BHB_FDC_STA?.zjts }}
-              </text>
-              <text
-                x="390"
-                y="19"
-                fill="#919697"
-                font-size="8"
+                <text class="mapKey" x="299" y="3" fill="#919697" font-size="8">
+                  平鲁禹丰
+                </text>
+                <text x="355" y="3" fill="#05bb4c" font-size="8">
+                  {{ sourceMap?.station?.SXJ_KGDL_YF_FDC_STA?.zjts }}
+                </text>
+                <text x="385" y="3" fill="#919697" font-size="8">台</text>
+              </g>
+              <g
                 @click.stop="
                   clickLabel(
                     'SXJ_KGDL_BHB_FDC_STA',
@@ -421,44 +411,21 @@
                   )
                 "
               >
-                台
-              </text>
-              <text
-                class="mapKey"
-                x="313"
-                y="34"
-                fill="#919697"
-                font-size="8"
-                @click.stop="
-                  clickLabel(
-                    'SXJ_KGDL_BHB3_FDC_STA',
-                    '平鲁败虎堡三期',
-                    penetrateType
-                  )
-                "
-              >
-                平鲁败虎堡三期
-              </text>
-              <text
-                x="375"
-                y="34"
-                fill="#05bb4c"
-                font-size="8"
-                @click.stop="
-                  clickLabel(
-                    'SXJ_KGDL_BHB3_FDC_STA',
-                    '平鲁败虎堡三期',
-                    penetrateType
-                  )
-                "
-              >
-                {{ sourceMap?.station?.SXJ_KGDL_BHB3_FDC_STA?.zjts }}
-              </text>
-              <text
-                x="390"
-                y="34"
-                fill="#919697"
-                font-size="8"
+                <text
+                  class="mapKey"
+                  x="299"
+                  y="14"
+                  fill="#919697"
+                  font-size="8"
+                >
+                  平鲁败虎堡
+                </text>
+                <text x="360" y="14" fill="#05bb4c" font-size="8">
+                  {{ sourceMap?.station?.SXJ_KGDL_BHB_FDC_STA?.zjts }}
+                </text>
+                <text x="385" y="14" fill="#919697" font-size="8">台</text>
+              </g>
+              <g
                 @click.stop="
                   clickLabel(
                     'SXJ_KGDL_BHB3_FDC_STA',
@@ -467,8 +434,20 @@
                   )
                 "
               >
-                台
-              </text>
+                <text
+                  class="mapKey"
+                  x="299"
+                  y="26"
+                  fill="#919697"
+                  font-size="8"
+                >
+                  平鲁败虎堡三期
+                </text>
+                <text x="368" y="26" fill="#05bb4c" font-size="8">
+                  {{ sourceMap?.station?.SXJ_KGDL_BHB3_FDC_STA?.zjts }}
+                </text>
+                <text x="385" y="26" fill="#919697" font-size="8">台</text>
+              </g>
             </g>
           </g>
           <g
@@ -528,7 +507,7 @@
                 x="420"
                 y="110"
                 width="80"
-                height="50"
+                height="46"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
@@ -1336,10 +1315,10 @@
             >
               <g>
                 <rect
-                  x="320"
+                  x="310"
                   y="48"
                   width="80"
-                  height="40"
+                  height="25"
                   stroke="#46C55A35"
                   fill="#000000"
                   opacity="0.8"
@@ -1355,17 +1334,17 @@
                 >
                   <text
                     class="mapKey"
-                    x="323"
+                    x="314"
                     y="57"
                     fill="#919697"
                     font-size="8"
                   >
                     平鲁高家堰
                   </text>
-                  <text x="375" y="57" fill="#05bb4c" font-size="8">
+                  <text x="362" y="57" fill="#05bb4c" font-size="8">
                     {{ sourceMap?.station?.SXJ_KGDL_GJY_FDC_STA?.zjts }}
                   </text>
-                  <text x="390" y="57" fill="#919697" font-size="8">台</text>
+                  <text x="379" y="57" fill="#919697" font-size="8">台</text>
                 </g>
                 <g
                   @click.stop="
@@ -1378,40 +1357,17 @@
                 >
                   <text
                     class="mapKey"
-                    x="323"
+                    x="314"
                     y="69"
                     fill="#919697"
                     font-size="8"
                   >
                     平鲁红石峁
                   </text>
-                  <text x="375" y="69" fill="#05bb4c" font-size="8">
+                  <text x="365" y="69" fill="#05bb4c" font-size="8">
                     {{ sourceMap?.station?.SXJ_KGDL_HSM_FDC_STA?.zjts }}
                   </text>
-                  <text x="390" y="69" fill="#919697" font-size="8">台</text>
-                </g>
-                <g
-                  @click.stop="
-                    clickLabel(
-                      'SXJ_KGDL_NJL_FDC_STA',
-                      '牛家岭风电场',
-                      penetrateType
-                    )
-                  "
-                >
-                  <text
-                    class="mapKey"
-                    x="323"
-                    y="82"
-                    fill="#919697"
-                    font-size="8"
-                  >
-                    牛家岭
-                  </text>
-                  <text x="375" y="82" fill="#05bb4c" font-size="8">
-                    {{ sourceMap?.station?.SXJ_KGDL_NJL_FDC_STA?.zjts }}
-                  </text>
-                  <text x="390" y="82" fill="#919697" font-size="8">台</text>
+                  <text x="379" y="69" fill="#919697" font-size="8">台</text>
                 </g>
               </g>
             </g>

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

@@ -3598,7 +3598,7 @@
           <g v-if="showPoint && $store.state.themeName === 'dark'">
             <g
               class="item-label"
-              @click="clickLabel('SXJ_RGN', '清洁能源', 3)"
+              @click="clickLabel('SXJ_RGN', '山西', 3)"
               @mouseover="mouseoverIncident('山西')"
               @mouseout="mouseoutIncident('山西')"
             >
@@ -3875,7 +3875,7 @@
           <g v-if="showPoint && $store.state.themeName === 'light'">
             <g
               class="item-label"
-              @click.stop="clickLabel('SXJ_RGN', '清洁能源')"
+              @click.stop="clickLabel('SXJ_RGN', '山西')"
               @mouseover="mouseoverIncident('山西')"
               @mouseout="mouseoutIncident('山西')"
             >

src/views/Home/components/power-review-home.vue

@@ -5,6 +5,7 @@
       <Col v-for="item in PowerLoad" :key="item" :span="6">
         <dash-pie-chart
           :title="item.title"
+          :unit="item.unit"
           :value="item.value"
           :max="item.max"
           height="10vh"
@@ -34,16 +35,47 @@ export default {
       PowerLoad: [],
       valuelist: [
         {
-          value: "value1",
+          value: "SSZGL",
           name: "清洁能源",
+          code: "value1",
+          sign: 1,
         },
         {
-          value: "value2",
+          value: "SSZGL",
           name: "风电功率详情",
+          code: "value2",
+          sign: 1,
         },
         {
-          value: "value3",
+          value: "SSZGL",
           name: "光伏功率详情",
+          code: "value3",
+          sign: 1,
+        },
+        {
+          value: "SSPJFS",
+          name: "实时风速",
+          code: "value4",
+        },
+        {
+          value: "RPJGZD",
+          name: "光照强度",
+          code: "value6",
+        },
+        {
+          value: "SSZGL",
+          name: "实际功率",
+          code: "value1",
+        },
+        {
+          value: "FNLYL",
+          name: "风能利用率",
+          code: "value7",
+        },
+        {
+          value: "FNLYL",
+          name: "光能利用率",
+          code: "value7",
         },
       ],
       wpId: "",
@@ -68,11 +100,13 @@ export default {
 
   methods: {
     openDialog(dialogTitle) {
-      let data = {
+      let obj = this.valuelist.find((item) => item.name == dialogTitle);
+      let params = {
         wpId: this.wpId,
+        uniformCode: obj.value,
       };
-      let obj = this.valuelist.find((item) => item.name == dialogTitle);
-      FindGroupRealtime(data).then(({ data }) => {
+
+      FindGroupRealtime(params).then(({ data }) => {
         this.$emit("chartClick", {
           dialogTitle,
           //   dialogType,
@@ -82,9 +116,10 @@ export default {
                 .startOf("date")
                 .add(item.hours, "hour")
                 .format("MM-DD HH:mm"),
-              value: item[obj.value],
+              value: item[obj.code],
             };
           }),
+          chartName: obj.sign ? "实际功率" : obj.dialogTitle,
         });
       });
     },

src/views/Home/components/windChartCom.vue

@@ -74,7 +74,7 @@ export default {
           },
         },
         legend: {
-          top: "6%",
+          top: "0",
           right: "2%",
           textStyle: {
             fontSize: "12",

src/views/economicsOperation/analyse/standAloneAnalyse/index.vue

@@ -107,7 +107,7 @@
               <div v-else>{{ scope.column.label }}</div>
             </template>
             <template #default="scope" v-if="item.title === '操作'">
-              <!-- <span class="historyBtn" @click="seachDetail(scope.row)">详情</span> -->
+              <span class="historyBtn" @click="seachDetail(scope.row)">详情</span>
               <span class="historyBtn" @click="seachHistoryData(scope.row)"
                 >历史</span
               >

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/decision1Mx.vue

@@ -225,7 +225,7 @@ export default {
       ],
       typeIndex: "1",
       typeOptions: [
-        { id: "1", name: "风场" },
+        { id: "1", name: "场站" },
         { id: "2", name: "项目" },
         { id: "3", name: "线路" },
       ],

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -244,7 +244,7 @@ export default {
       ],
       typeIndex: "1",
       typeOptions: [
-        { id: "1", name: "风场" },
+        { id: "1", name: "场站" },
         { id: "2", name: "项目" },
         { id: "3", name: "线路" },
       ],

src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -586,6 +586,14 @@
         >
         </el-table-column>
       </el-table>
+      <el-pagination
+        @current-change="handlePageChange"
+        :current-page="page.currentPage"
+        :page-size="page.pagesize"
+        layout="total, prev, pager, next, jumper"
+        :total="page.total"
+      >
+      </el-pagination>
     </div>
     <el-dialog
       class="dialogs"
@@ -923,6 +931,11 @@ export default {
   },
   data() {
     return {
+      page: {
+        pagesize: 10,
+        currentPage: 1,
+        total: 0,
+      },
       company: "",
       companyOptions: [],
       stationObj: "",
@@ -988,6 +1001,10 @@ export default {
     };
   },
   methods: {
+    handlePageChange(val) {
+      this.page.currentPage = val;
+      this.goDetail();
+    },
     funthb() {
       thb({
         companys: this.company,
@@ -1068,6 +1085,7 @@ export default {
             },
           ];
           this.tableData = res.data;
+
           let lossPower = [];
           res.data.forEach((item) => {
             let obj = {
@@ -1115,6 +1133,8 @@ export default {
         id: row.id,
         beginDate: this.starTime,
         endDate: this.endTime,
+        pagesize: this.page.pagesize,
+        pagenum: this.page.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {

src/views/economicsOperation/performanceAnalyse/performanceAssess/index.vue

@@ -48,12 +48,34 @@
           时间
           <div class="">
             <el-date-picker
+              v-if="tabIndex == 0"
               size="mini"
               v-model="pickerTimer"
               type="date"
               value-format="YYYY-MM-DD"
               placeholder="选择日期"
               popper-class="date-select"
+              @change="historyTimer = pickerTimer"
+            >
+            </el-date-picker>
+            <el-date-picker
+              v-if="tabIndex == 1"
+              size="mini"
+              v-model="pickerTimer"
+              type="month"
+              value-format="YYYY-MM"
+              placeholder="选择月份"
+              popper-class="date-select"
+            >
+            </el-date-picker>
+            <el-date-picker
+              v-if="tabIndex == 2"
+              size="mini"
+              v-model="pickerTimer"
+              type="year"
+              value-format="YYYY"
+              placeholder="选择年份"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -108,7 +130,7 @@
           stripe
           @selection-change="handleCurrentChange"
           size="mini"
-          height="80vh"
+          height="77vh"
           ref="Eval_table"
           style="width: 100%"
         >
@@ -151,6 +173,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div style="text-align: right">
+          <el-pagination
+            @current-change="handlePageChange"
+            :current-page="page.currentPage"
+            :page-size="page.pagesize"
+            layout="total, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
     <el-dialog
@@ -202,6 +234,7 @@ import {
 } from "@/api/monthlyPerformanceAnalysis";
 import historyDetail from "./historyDetail.vue";
 import dayDetailInfo from "./dayDetailInfo.vue";
+import dayjs from "dayjs";
 export default {
   name: "performanceAssess",
   components: {
@@ -260,6 +293,12 @@ export default {
         { id: -1, name: "风电" },
         { id: -2, name: "光伏" },
       ],
+      page: {
+        currentPage: 1,
+        pagesize: 18,
+        total: 0,
+      },
+      historyTimer: "",
     };
   },
   created() {
@@ -273,9 +312,22 @@ export default {
     },
   },
   methods: {
+    handlePageChange(val) {
+      this.page.currentPage = val;
+      this.seachData();
+    },
     // 切换tab
     tabSelect(index) {
       this.tabIndex = index;
+      if (this.tabIndex == 0) {
+        this.pickerTimer = dayjs().format("YYYY-MM-DD");
+      } else if (this.tabIndex == 1) {
+        this.pickerTimer = dayjs().format("YYYY-MM");
+      } else if (this.tabIndex == 2) {
+        this.pickerTimer = dayjs().format("YYYY");
+      }
+      this.historyTimer = dayjs().format("YYYY-MM-DD");
+      this.page.currentPage = 1;
       this.seachData();
     },
     changeBtn(id) {
@@ -289,6 +341,7 @@ export default {
     async getCompanyData() {
       this.companyOptions = [];
       this.pickerTimer = this.getchangeTime(new Date());
+      this.historyTimer = this.getchangeTime(new Date());
       const { data: datas } = await getApicompanyslist();
       this.companyOptions = datas.data;
       this.companyVal = datas.data[0]?.id;
@@ -327,9 +380,12 @@ export default {
         types: this.tabIndex * 1 + 1,
         wpId: this.stationVal,
         type: this.tabEvent,
+        pageNum: this.page.currentPage,
+        pageSize: this.page.pagesize,
       };
       const { data: datas } = await getApiequipmentinfoDayList(params);
-      this.EvaluationData = datas.data;
+      this.EvaluationData = datas.data.records;
+      this.page.total = datas.data.total;
     },
     handleCurrentChange(val) {
       if (val.length > 2) {
@@ -358,10 +414,10 @@ export default {
       this.dialogTitle = "历史数据查询";
       this.$nextTick(() => {
         let startT =
-          new Date(this.pickerTimer).getTime() - 10 * 24 * 60 * 60 * 1000;
+          new Date(this.historyTimer).getTime() - 10 * 24 * 60 * 60 * 1000;
         this.$refs.windhistoryDetail.pickerTimer = [
           this.getchangeTime(new Date(startT)),
-          this.pickerTimer,
+          this.historyTimer,
         ];
         this.$refs.windhistoryDetail.tabIndex = this.tabIndex * 1 + 1;
         this.$refs.windhistoryDetail.tabEvent = this.tabEvent;

src/views/layout/login-page.vue

@@ -117,11 +117,15 @@ export default {
           Cookies.remove("password");
           Cookies.remove("rememberMe");
         }
-        login(this.loginForm).then((data) => {
-          if (data.code == 200) {
+        login({
+          password: that.loginForm.password,
+          username: that.loginForm.username,
+        }).then(({ code, data, msg }) => {
+          this.$store.commit("user/SET_NAME", that.loginForm.username);
+          if (code == 0) {
             this.$store.commit("user/SET_TOKEN", data);
             let loginSta = new Promise((resolve, reject) => {
-              login1({ token: data.token, userId: data.userId })
+              login1({ token: data.accessToken, userId: data.userId })
                 .then(({ data }) => {
                   resolve(data);
                 })
@@ -130,7 +134,7 @@ export default {
                 });
             });
             let loginHeal = new Promise((resolve, reject) => {
-              login2({ token: data.token, userId: data.userId })
+              login2({ token: data.accessToken, userId: data.userId })
                 .then((res) => {
                   resolve(res);
                 })
@@ -161,7 +165,7 @@ export default {
             //   }
           } else {
             that.BASE.showMsg({
-              msg: data.msg,
+              msg: msg,
               type: "error",
             });
             this.loading = false;

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -83,8 +83,8 @@
           开始日期：
           <el-date-picker
             v-model="begin"
-            type="date"
-            value-format="YYYY-MM-DD"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择日期"
             size="mini"
             popper-class="date-select"
@@ -95,8 +95,8 @@
           结束日期：
           <el-date-picker
             v-model="end"
-            type="date"
-            value-format="YYYY-MM-DD"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择日期"
             size="mini"
             popper-class="date-select"
@@ -182,8 +182,8 @@ export default {
       booststation: "",
       booststationOptions: [],
       description: "",
-      begin: dayjs().format("YYYY-MM-DD"),
-      end: dayjs().add(1, "day").format("YYYY-MM-DD"),
+      begin: dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
+      end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       alarmData: [],
       loading: false,
       tableHeader: [
@@ -255,7 +255,7 @@ export default {
           stationid: this.station,
           deviceid: this.wind,
           description: this.description,
-          pageNum: this.page.currentPage - 1,
+          pageNum: this.page.currentPage,
           pageSize: this.page.pagesize,
         };
       } else {
@@ -265,7 +265,7 @@ export default {
           alarmType: this.alarmType,
           stationid: this.sub,
           description: this.description,
-          pageNum: this.page.currentPage - 1,
+          pageNum: this.page.currentPage,
           pageSize: this.page.pagesize,
         };
       }
@@ -321,7 +321,8 @@ export default {
 <style scoped lang="less">
 .alarm-body {
   height: 100%;
-  padding: 20px 20px 20px 40px;
+  width: 100%;
+  padding: 20px;
   display: flex;
   flex-direction: column;
   .search-form {

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/pl-map.vue

@@ -113,7 +113,7 @@
             width="74"
             height="54"
             :x="Number(item.x) - 10"
-            :y="Number(item.y) + 160"
+            :y="Number(item.y) + 85"
             xlink:href="@/assets/png/booster-station.png"
           ></image>
           <!-- </svg> -->
@@ -130,8 +130,8 @@
           <text
             v-else
             class="mapKey"
-            :x="Number(item.x) + 20"
-            :y="Number(item.y) + 220"
+            :x="Number(item.x)"
+            :y="Number(item.y) + 160"
             fill="#ffffff"
             font-size="14"
           >

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/yx-map.vue

@@ -184,16 +184,17 @@ export default {
           y: "670",
           type: 3,
         },
+
         {
           name: "58方阵",
           x: "1670",
-          y: "630",
+          y: "540",
           type: 3,
         },
         {
           name: "59方阵",
           x: "1670",
-          y: "540",
+          y: "630",
           type: 3,
         },
         {

vue.config.js

@@ -90,7 +90,7 @@ module.exports = {
   chainWebpack: (config) => {
     config.resolve.symlinks(true); // 修复热更新失效
     config.plugin("html").tap((args) => {
-      args[0].title = "智能综合分析系统";
+      args[0].title = "发电场站生产实时运营管理平台";
 
       return args;
     });