Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -97,7 +97,7 @@
 
 
                     <el-tabs v-model="activeName" @tab-click="tabClick">
                     <el-tabs v-model="activeName" @tab-click="tabClick">
                         <el-tab-pane label="已添加" name="first">
                         <el-tab-pane label="已添加" name="first">
-                            <cm-table-page :columns="columns" :dataList="tabFirstList" @loaddata="loadFirstList"
+                            <cm-table-page :columns="columns" :dataList="tabFirstList" @loaddata="getPageInfoFirst"
                                            :showIndex="true"   :total="countFirst"
                                            :showIndex="true"   :total="countFirst"
                                            :showBorder="true" :loading="false"
                                            :showBorder="true" :loading="false"
                                            :showPage="true" :showTools="true" :height="(height - 500)">
                                            :showPage="true" :showTools="true" :height="(height - 500)">
@@ -110,7 +110,7 @@
                             </cm-table-page>
                             </cm-table-page>
                         </el-tab-pane>
                         </el-tab-pane>
                         <el-tab-pane label="未添加" name="second">
                         <el-tab-pane label="未添加" name="second">
-                            <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="loadSecondList"
+                            <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="getPageInfoSecond"
                                            :showIndex="true" :total="count"
                                            :showIndex="true" :total="count"
                                            :showBorder="true" :loading="false"
                                            :showBorder="true" :loading="false"
                                            :showPage="true" :showTools="true" :height="(height - 500)">
                                            :showPage="true" :showTools="true" :height="(height - 500)">

@@ -188,26 +188,23 @@ export default {
             busTypeArr.value = types;
             busTypeArr.value = types;
             loeadTable();
             loeadTable();
         }
         }
-
         // 查询参数
         // 查询参数
-        let getParams = () =>{
-            return  {
-                keyWords: keyWords.value,
-                resType: resTypeArr.value.join(','),
-                kpiId: kpiTypeArr.value.join(','),
-                busId: busTypeArr.value.join(','),
-                configId: config.value,
-                page: 1,
-                limit: 50
-            }
-        }
+        let getParams = Vue.ref({
+            keyWords: keyWords.value,
+            resType: resTypeArr.value.join(','),
+            kpiId: kpiTypeArr.value.join(','),
+            busId: busTypeArr.value.join(','),
+            configId: config.value,
+            page: 1,
+            limit: 10
+        })
 
 
         let loadFirstList = (reload) => {
         let loadFirstList = (reload) => {
             // if (!reload && tabFirstList.value.length > 0) {
             // if (!reload && tabFirstList.value.length > 0) {
             //     return false;
             //     return false;
             // }
             // }
             if(isSign.value){//true为编辑，false为新增
             if(isSign.value){//true为编辑，false为新增
-                proxy.$http.get(`/api-web/ContrastAnalysis/added`, getParams(), function (res) {
+                proxy.$http.get(`/api-web/ContrastAnalysis/added`, getParams.value, function (res) {
                     if (res && res.success) {
                     if (res && res.success) {
                         proxy.countFirst = res.count;
                         proxy.countFirst = res.count;
                         tabFirstList.value = res.data;
                         tabFirstList.value = res.data;
@@ -220,7 +217,7 @@ export default {
             // if (!reload && tabSecondList.value.length > 0) {
             // if (!reload && tabSecondList.value.length > 0) {
             //     return false;
             //     return false;
             // }
             // }
-            proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams(), function (res) {
+            proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams.value, function (res) {
                 if (res && res.success) {
                 if (res && res.success) {
                     proxy.count = res.count;
                     proxy.count = res.count;
                     tabSecondList.value = res.data;
                     tabSecondList.value = res.data;
@@ -228,6 +225,21 @@ export default {
             });
             });
         }
         }
 
 
+        let getPageInfoFirst = ({page, limit}) => {
+            getParams.value.page = page;
+            getParams.value.limit = limit;
+
+            // 下一页搜索
+            loadFirstList();
+        }
+        let getPageInfoSecond = ({page, limit}) => {
+            getParams.value.page = page;
+            getParams.value.limit = limit;
+
+            // 下一页搜索
+            loadSecondList();
+        }
+
 
 
         let tabClick = (tab, event) => {
         let tabClick = (tab, event) => {
             let name = tab.paneName;
             let name = tab.paneName;
@@ -542,6 +554,8 @@ export default {
             deleteRes,
             deleteRes,
             onBtnSearch,
             onBtnSearch,
             onReset,
             onReset,
+            getPageInfoFirst,
+            getPageInfoSecond,
 
 
             getResType,
             getResType,
             getKpiType,
             getKpiType,

@@ -112,7 +112,7 @@ const handleInfo = () => {
                 trigger: 'change',
                 trigger: 'change',
             },
             },
         ],
         ],
-        solvetime: [
+        solveTime: [
             {
             {
                 type: 'date',
                 type: 'date',
                 required: true,
                 required: true,