Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -245,5 +245,22 @@ a {
 .border-left{
 .border-left{
     border-left: 1px solid var(--el-border-color);
     border-left: 1px solid var(--el-border-color);
 }
 }
-
+/*lsq 卡片分页页码样式 2022-08-12*/
+.no-background{
+    background-color: whitesmoke;
+    padding:5px 0;
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+}
+.no-background .el-pager li,.no-background .el-pagination .btn-next,.no-background .el-pagination .btn-prev{
+    background-color: inherit;
+}
+.no-background .el-pager li.is-active{
+    border:1px  solid var(--el-pagination-hover-color);
+    border-radius: 3px;
+}
+.no-background .el-pager li:focus{
+    outline: none;
+}
 
 

@@ -82,5 +82,18 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
-
+    <!--lsq 卡片增加分页 2022-08-12-->
+    <div v-if="cardOpen"  class="no-background">
+        <el-pagination
+                @size-change="handleSizeChange"
+                @prev-click="prePage"
+                @next-click="nextPage"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[10,50,100, 200, 300, 400]"
+                :page-size="pageSize"
+                :layout="'total,prev, pager,next'"
+                :total="count">
+        </el-pagination>
+    </div>
 </div>
 </div>

@@ -55,13 +55,13 @@ export default {
             }
             }
         }
         }
 
 
-        let getDialtestList = () => {
+        let getDialtestList = (currentPage) => {
             let params = {
             let params = {
                 faultNo: props.faultNo,
                 faultNo: props.faultNo,
                 targetType: props.targetType.toLocaleLowerCase(),
                 targetType: props.targetType.toLocaleLowerCase(),
                 //lsq 更多列表 增加分页 2022-08-09
                 //lsq 更多列表 增加分页 2022-08-09
-                page:props.page,
-                limit:props.limit
+                page:currentPage?currentPage:props.page,
+                limit:currentPage?pageSize.value:props.limit
             }
             }
 
 
             store.dispatch('getFaultList', params).then((res) => {
             store.dispatch('getFaultList', params).then((res) => {
@@ -70,6 +70,11 @@ export default {
                     card.value = res.data[0].faultFixInfoList;
                     card.value = res.data[0].faultFixInfoList;
                     //lsq 更多列表增加分页总条数 2022-08-09
                     //lsq 更多列表增加分页总条数 2022-08-09
                     count.value = res.count;
                     count.value = res.count;
+                    //lsq 卡片分页时刷新数据 2022-08-12
+                    if(currentPage){
+                        cardData.value=[];
+                        getDialtestCard(dialTest.value.faultFixInfoList);
+                    }
                 }
                 }
             }).catch(e => {
             }).catch(e => {
                 console.log(e);
                 console.log(e);
@@ -163,6 +168,31 @@ export default {
                 }
                 }
             }
             }
         })
         })
+        //start lsq 卡片分页功能 2022-08-12
+        let currentPage = Vue.ref(1);
+        let pageSize = Vue.ref(props.limit);
+        // 每页展示多少条
+        let handleSizeChange = (val) => {
+            currentPage.value = 1
+            pageSize.value = val;
+            getDialtestList(currentPage.value);
+        }
+        // 切换页码
+        let handleCurrentChange = (val) => {
+            currentPage.value = val;
+            getDialtestList(currentPage.value);
+        }
+        let prePage = (val) => {
+            currentPage.value = val-1;
+            getDialtestList(currentPage.value);
+        }
+
+        // 切换页码
+        let nextPage = (val) => {
+            currentPage.value = val+1;
+            getDialtestList(currentPage.value);
+        }
+        //end 2022-08-12
         return {
         return {
             card,
             card,
             count,
             count,
@@ -177,7 +207,13 @@ export default {
             openKpiList,
             openKpiList,
             getFaultItemValue: service.getFaultItemValue,
             getFaultItemValue: service.getFaultItemValue,
             openDiagnosticItem,
             openDiagnosticItem,
-            visibilityChange
+            visibilityChange,
+            currentPage,
+            pageSize,
+            handleSizeChange,
+            handleCurrentChange,
+            prePage,
+            nextPage
         }
         }
     }
     }
 }
 }

@@ -68,7 +68,7 @@
         <el-empty  :image-size="50" />
         <el-empty  :image-size="50" />
     </div>
     </div>
     <div v-else>
     <div v-else>
-        <res-item  v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :itemresClass="itemresClass" @itemresClass="itemresClassMessage" :faultNo="faultNo" :targetType="targetType" :page="page" :limit="limit" :dialogFlg="dialogFlg"/>
+        <res-item  v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :itemresClass="itemresClass" @itemresClass="itemresClassMessage" @callbacklist="callbacklist" :faultNo="faultNo" :targetType="targetType" :page="page" :limit="limit" :dialogFlg="dialogFlg"/>
     </div>
     </div>
 
 
 
 

@@ -54,13 +54,13 @@ export default {
         }
         }
         let faultNo = props.faultNo;
         let faultNo = props.faultNo;
         let targetType = props.targetType.toLocaleLowerCase();
         let targetType = props.targetType.toLocaleLowerCase();
-        let getDialtestList = (flg) => {
+        let getDialtestList = (flg,currentPage,pageSize) => {
             let params = {
             let params = {
                 faultNo: props.faultNo,
                 faultNo: props.faultNo,
                 targetType: props.targetType.toLocaleLowerCase(),
                 targetType: props.targetType.toLocaleLowerCase(),
                 //lsq 更多列表 增加分页 2022-08-10
                 //lsq 更多列表 增加分页 2022-08-10
-                page:props.page,
-                limit:props.limit
+                page:currentPage?currentPage:props.page,
+                limit:currentPage?pageSize:props.limit
             }
             }
 
 
             store.dispatch('getFaultList', params).then((res) => {
             store.dispatch('getFaultList', params).then((res) => {
@@ -158,6 +158,10 @@ export default {
                 clickType.value='';
                 clickType.value='';
             }
             }
         })
         })
+
+        let callbacklist=({currentPage,pageSize})=>{
+            getDialtestList(1,currentPage,pageSize)
+        }
         return {
         return {
             card,
             card,
             cardOpen,
             cardOpen,
@@ -174,6 +178,7 @@ export default {
             openDiagnosticItem,
             openDiagnosticItem,
             itemresClassMessage,
             itemresClassMessage,
             itemresClass,
             itemresClass,
+            callbacklist
         }
         }
     }
     }
 }
 }

@@ -187,3 +187,17 @@
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+<!--lsq 卡片增加分页 2022-08-12-->
+<div v-if="cardOpen" class="no-background">
+    <el-pagination
+            @size-change="handleSizeChange"
+            @prev-click="prePage"
+            @next-click="nextPage"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10,50,100, 200, 300, 400]"
+            :page-size="pageSize"
+            :layout="'total,prev, pager,next'"
+            :total="count">
+    </el-pagination>
+</div>

@@ -118,7 +118,6 @@ export default {
                 }
                 }
                 dialTest.value.push(resItem);
                 dialTest.value.push(resItem);
             }
             }
-          console.log(dialTest.value)
         }
         }
         let getAlarmColor = (cardList) =>{
         let getAlarmColor = (cardList) =>{
             if (cardList.alarmLevel == '0'){
             if (cardList.alarmLevel == '0'){
@@ -206,7 +205,35 @@ export default {
             }
             }
             service.sendEventLineDialog(props.parentEmit, param);
             service.sendEventLineDialog(props.parentEmit, param);
         }
         }
+//start lsq 卡片分页功能 2022-08-12
+        let currentPage = Vue.ref(1);
+        let pageSize = Vue.ref(props.limit);
+        // 每页展示多少条
+        let handleSizeChange = (val) => {
+            currentPage.value = 1
+            pageSize.value = val;
+            refreshCard();
+        }
+        // 切换页码
+        let handleCurrentChange = (val) => {
+            currentPage.value = val;
+            refreshCard();
+        }
+        let prePage = (val) => {
+            currentPage.value = val-1;
+            refreshCard();
+        }
 
 
+        // 切换页码
+        let nextPage = (val) => {
+            currentPage.value = val+1;
+            refreshCard();
+        }
+        //lsq 刷新卡片数据
+        let refreshCard = () =>{
+            emit('callbacklist',{currentPage:currentPage.value,pageSize:pageSize.value});
+        }
+        //end 2022-08-12
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             let cardList = props.cardList;
             let cardList = props.cardList;
@@ -243,6 +270,14 @@ export default {
                 clickType.value='';
                 clickType.value='';
             }
             }
         });
         });
+        //lsq 卡片数据刷新 2022-08-12
+        Vue.watch(() => [currentPage.value, pageSize.value], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
+            setTimeout(function (){
+                dialTest.value = [];
+                getDialtestList(props.cardList.faultFixInfoList);
+            },500)
+        })
+
         return {
         return {
             card,
             card,
             count,
             count,
@@ -261,6 +296,12 @@ export default {
             resClass,
             resClass,
             openDiagnosticItem,
             openDiagnosticItem,
             openResPonse,
             openResPonse,
+            currentPage,
+            pageSize,
+            handleSizeChange,
+            handleCurrentChange,
+            prePage,
+            nextPage
         }
         }
     }
     }
 }
 }

@@ -95,5 +95,19 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
+    <!--lsq 卡片增加分页 2022-08-12-->
+    <div v-if="cardOpen" class="no-background">
+        <el-pagination
+                @size-change="handleSizeChange"
+                @prev-click="prePage"
+                @next-click="nextPage"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[10,50,100, 200, 300, 400]"
+                :page-size="pageSize"
+                :layout="'total,prev, pager,next'"
+                :total="count">
+        </el-pagination>
+    </div>
 </div>
 </div>
 
 

@@ -82,15 +82,14 @@ export default {
                 }
                 }
                 cardData.value.push(resItem);
                 cardData.value.push(resItem);
             }
             }
-            console.log(cardData.value)
         }
         }
-        let getNpmList = () => {
+        let getNpmList = (currentPage) => {
             let params = {
             let params = {
                 faultNo: props.faultNo,
                 faultNo: props.faultNo,
                 targetType: props.targetType.toLocaleLowerCase(),
                 targetType: props.targetType.toLocaleLowerCase(),
                 //lsq 更多列表 增加分页 2022-08-09
                 //lsq 更多列表 增加分页 2022-08-09
-                page:props.page,
-                limit:props.limit
+                page:currentPage?currentPage:props.page,
+                limit:currentPage?pageSize.value:props.limit
             }
             }
 
 
             store.dispatch('getFaultList', params).then((res) => {
             store.dispatch('getFaultList', params).then((res) => {
@@ -99,6 +98,11 @@ export default {
                     card.value = dialTest.value.faultFixInfoList;
                     card.value = dialTest.value.faultFixInfoList;
                     //lsq 更多列表增加分页总条数 2022-08-09
                     //lsq 更多列表增加分页总条数 2022-08-09
                     count.value = res.count;
                     count.value = res.count;
+                    //lsq 卡片分页时刷新数据 2022-08-12
+                    if(currentPage){
+                        cardData.value=[];
+                        getDialtestCard(dialTest.value.faultFixInfoList);
+                    }
                 }
                 }
             }).catch(e => {
             }).catch(e => {
                 console.log(e);
                 console.log(e);
@@ -180,7 +184,31 @@ export default {
                 }
                 }
             }
             }
         })
         })
+        //start lsq 卡片分页功能 2022-08-12
+        let currentPage = Vue.ref(1);
+        let pageSize = Vue.ref(props.limit);
+        // 每页展示多少条
+        let handleSizeChange = (val) => {
+            currentPage.value = 1
+            pageSize.value = val;
+            getNpmList(currentPage.value);
+        }
+        // 切换页码
+        let handleCurrentChange = (val) => {
+            currentPage.value = val;
+            getNpmList(currentPage.value);
+        }
+        let prePage = (val) => {
+            currentPage.value = val-1;
+            getNpmList(currentPage.value);
+        }
 
 
+        // 切换页码
+        let nextPage = (val) => {
+            currentPage.value = val+1;
+            getNpmList(currentPage.value);
+        }
+        //end 2022-08-12
         return {
         return {
             card,
             card,
             count,
             count,
@@ -196,7 +224,13 @@ export default {
             openKpiList,
             openKpiList,
             openResPonse,
             openResPonse,
             openDiagnosticItem,
             openDiagnosticItem,
-            visibilityChange
+            visibilityChange,
+            currentPage,
+            pageSize,
+            handleSizeChange,
+            handleCurrentChange,
+            prePage,
+            nextPage
         }
         }
     }
     }
 }
 }