常规消缺

.env.development

@@ -20,7 +20,6 @@ VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 # VUE_APP_GENERAT_URL = 'http://192.168.2.45:9002'
 # 王波
 VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
-# VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
 
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://192.168.0.102:9001'
@@ -39,7 +38,7 @@ VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
 
 # 综合报警
 # VUE_APP_ALARM = 'http://10.127.7.241:6015'
-VUE_APP_ALARM = 'http://172.16.12.101:6015'
+VUE_APP_ALARM = 'http://172.16.12.101:7095'
 # VUE_APP_ALARM = 'http://localhost:6015'
 
 # VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'

.env.production

@@ -48,8 +48,8 @@ VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
 # VUE_APP_BASE_URL = 'http://127.0.0.1:8086'
 
 # 综合报警
-# VUE_APP_ALARM = 'http://10.127.7.241:6015'
-VUE_APP_ALARM = 'http://172.16.12.101:6015'
+# VUE_APP_ALARM = 'http://10.127.7.241:7095'
+VUE_APP_ALARM = 'http://172.16.12.101:7095'
 
 # VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'
 VUE_APP_ADP_BASE_URL = 'http://172.16.12.101'

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CalculationModelConfiguration: typeof import('./src/components/powerPredictionComponent/configPage/calculationModelConfiguration.vue')['default']
     Card1: typeof import('./src/components/coms/cards/card-1.vue')['default']
     CheckTable: typeof import('./src/components/coms/table/check-table.vue')['default']
-    Col: typeof import('./src/components/coms/grid/col.vue')['default']
+    Col: typeof import('./src/components/homeComponent/grid/col.vue')['default']
     CollapseList: typeof import('./src/components/coms/collapse/collapse-list.vue')['default']
     CollectionLineManagement: typeof import('./src/components/powerPredictionComponent/configPage/stationFlode/collectionLineManagement.vue')['default']
     CommonHeaders: typeof import('./src/components/commonHeaders.vue')['default']
@@ -154,7 +154,7 @@ declare module 'vue' {
     RoleManagement: typeof import('./src/components/powerPredictionComponent/configPage/roleManagement.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Row: typeof import('./src/components/coms/grid/row.vue')['default']
+    Row: typeof import('./src/components/homeComponent/grid/row.vue')['default']
     SBQ: typeof import('./src/components/powerPredictionComponent/configPage/configDesignVue/SBQ.vue')['default']
     ScatterLineChart: typeof import('./src/components/chart/combination/scatter-line-chart.vue')['default']
     SimpleLineChart: typeof import('./src/components/chart/line/simple-line-chart.vue')['default']

src/api/zhbj/index.js

@@ -239,7 +239,7 @@ export const getAdapterHistorysnap = (
 // 列表接口
 export const getAlarmCountList = (params) => {
   return request({
-    url: `alarm/history/findWtFeatureStat?timeType=${params.timeType}&begin=${params.begin}&end=${params.end}&stationid=${params.stationid}&components=${params.components}&modelId=${params.modelId}&alarmIds=${params.alarmIds}&alarmType=${params.alarmType}`,
+    url: `alarm/history/findWtFeatureStat?pageNum=${params.pageNum}&pageSize=${params.pageSize}&timeType=${params.timeType}&begin=${params.begin}&end=${params.end}&stationid=${params.stationid}&components=${params.components}&modelId=${params.modelId}&alarmIds=${params.alarmIds}&alarmType=${params.alarmType}`,
     baseURL: process.env.VUE_APP_ALARM,
     method: "get",
   });

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

@@ -154,7 +154,7 @@
       <el-table
         :data="state.tableData"
         stripe
-        style="height: calc(100% - 60px)"
+        style="height: calc(100% - 150px)"
         @sort-change="handleSortChange"
       >
         <el-table-column
@@ -215,6 +215,22 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="pagination-wrapper">
+        <el-pagination
+          layout="total, prev, pager, next"
+          :current-page="query.page"
+          :page-size="query.limit"
+          :total="query.pageTotal"
+          @size-change="
+            (value) => {
+              query.page = 1;
+              query.limit = value;
+              getTableList();
+            }
+          "
+          @current-change="handlePageChange"
+        ></el-pagination>
+      </div>
     </div>
     <el-dialog
       v-model="dialogVisible"
@@ -286,6 +302,12 @@ onMounted(() => {
 const pageTitle = "报警分析";
 const store = useStore();
 const changZhanArray = ref([]);
+const windName = ref([]);
+const query = reactive({
+  page: 1,
+  limit: 10,
+  pageTotal: null,
+});
 const state = reactive({
   typeVal: "windturbine",
   typeList: [
@@ -616,10 +638,17 @@ function getAlarmId() {
   ];
   getTableList();
 }
+// 分页导航
+const handlePageChange = (val) => {
+  query.page = val;
+  getTableList();
+};
 // 获取列表数据 调用接口
 function getTableList() {
   if (state.components?.length) {
     getAlarmCountList({
+      pageNum: query.page,
+      pageSize: query.limit,
       stationid: state.changZhan || "",
       begin: state.starttime,
       end: state.endtime,
@@ -629,7 +658,13 @@ function getTableList() {
       alarmIds: state.alarmIds,
       alarmType: state.typeVal,
     }).then((res) => {
-      changeTableData(res)
+      if (res && res.result.length>0) {
+            changeTableData(res.result)
+            query.pageTotal = res.total
+        } else {
+            state.tHeard = [];
+            state.tableData = [];
+        }
     }).catch(() =>{
       changeTableData(dataJson.data.data.dataList)
     });
@@ -642,6 +677,9 @@ function getTableList() {
 
 const changeTableData = (res) => {
     if (res.length) {
+        if (query.page === 1) {
+            windName.value = []
+        }
         let tableData = [];
         let tHeard = [];
         let data = res;
@@ -651,21 +689,28 @@ const changeTableData = (res) => {
               return wtId === tableItem.windturbineId;
             });
             !wtItem && (wtItem = { wtId });
-            pEle[wtId].forEach((cEle) => {
-              let someRes = tHeard.some((findEle) => {
-                return findEle.label == cEle.alertText;
-              });
+            if (pEle[wtId].length>0) {
+                pEle[wtId].forEach((cEle) => {
+                    let someRes = tHeard.some((findEle) => {
+                        return findEle.label == cEle.alertText;
+                    });
 
-              if (!someRes) {
-                tHeard.push({
-                  label: cEle.alertText,
-                  code: cEle.alarmid,
+                    if (!someRes) {
+                        tHeard.push({
+                        label: cEle.alertText,
+                        code: cEle.alarmid,
+                        });
+                    }
+                    wtItem[`${cEle.alarmid}_count`] = cEle.count;
+                    wtItem[`${cEle.alarmid}_time`] = cEle.time;
+                    wtItem["wtname"] = cEle.windturbineCode
                 });
-              }
-              wtItem[`${cEle.alarmid}_count`] = cEle.count;
-              wtItem[`${cEle.alarmid}_time`] = cEle.time;
-              wtItem["wtname"] = cEle.windturbineCode;
-            });
+            } else {
+                wtItem["wtname"] = windName.value[index]
+            }
+            if (query.page === 1) {
+                windName.value.push(wtItem["wtname"])
+            }
             tableData.push(wtItem);
           }
         });
@@ -798,7 +843,7 @@ const compare = function (property) {
   }
   .table_all {
     width: calc(100% - 20px);
-    height: calc(100% - 130px);
+    height: calc(100% - 80px);
     padding: 20px;
     .leftContent[data-type~="greenSty"] {
       background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
@@ -831,6 +876,11 @@ const compare = function (property) {
         }
       }
     }
+    .pagination-wrapper :deep {
+        height: 30px;
+      text-align: right;
+      margin-top: 10px;
+    }
   }
   .bar {
     display: flex;

src/views/generatingCapacity/dataAnalysis/posAnalysis/components/leafletMap.vue

@@ -30,7 +30,7 @@ export default {
       layers: [],
       rightObj: {},
       areaLayer: null,
-      tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.png",
+      tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
       ciLayer: null,
       viewCenterMap: {
         GJNY_SXGS_ZZ_FDC_STA: { lng: 107.86058, lat: 37.37861 },