Merge branch 'master-500-dev-ztq1' into 'master-500-dev'

Master 500 dev ztq1



See merge request !1083

@@ -458,7 +458,7 @@ export default {
         })
 
         // 监听编辑状态
-        Vue.watch(() => props.projectId, (newValue, oldVlaue) => {
+        Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
             getAssetType();
             getPage();
             getAssets();

@@ -64,17 +64,28 @@ export default {
                 width: '170'
             }
         ])
+        let count = Vue.ref(0);
+        let page = Vue.ref(1);
+        let limit = Vue.ref(10);
 
 
         // 获取系统
         let getDetailList = () => {
-            proxy.$http.get(`/api-web/thirdParty/conf/list`, {keywords:keyword.value}, function (res) {
+            proxy.$http.get(`/api-web/thirdParty/conf/list`, {keywords:keyword.value,page:page.value,limit:limit.value}, function (res) {
                 if (res && res.success == true) {
+                    // console.log(res);
+                    count.value = res.count;
                     tableData.value = res.data;
                 }
             })
         };
 
+        let loadTableDataList = ({page, limit})=>{
+            page.value = page;
+            limit.value = limit;
+            getDetailList();
+        }
+
         let getUser = (arr) => {
             let types = arr.map(function (v) {
                 return v.username;
@@ -294,7 +305,9 @@ export default {
             userList,
             columns,
             handleClose,
-            docRulesForm
+            docRulesForm,
+            loadTableDataList,
+            count,
         }
     }
 }