Merge branch 'master-v32-lushangqing' into 'master'

缓存数据页面接口数据联调-增加一级分类二级分类



See merge request !336

@@ -26,8 +26,15 @@ export default {
         //表格字段
         //表格字段
         let columns=Vue.ref([
         let columns=Vue.ref([
             {
             {
-                prop: 'classify',
-                label: '分类',
+                prop: 'classify1',
+                label: '一级分类',
+                sortable: true,
+                align: 'center',
+                width:'300'
+            },
+            {
+                prop: 'classify2',
+                label: '二级分类',
                 sortable: true,
                 sortable: true,
                 align: 'center',
                 align: 'center',
                 width:'300'
                 width:'300'
@@ -36,7 +43,7 @@ export default {
                 prop: 'key',
                 prop: 'key',
                 label: '缓存key',
                 label: '缓存key',
                 sortable: true,
                 sortable: true,
-                align: 'center',
+                align: 'left',
             },
             },
         ])
         ])
         let currentPage=Vue.ref(1);
         let currentPage=Vue.ref(1);
@@ -84,13 +91,16 @@ export default {
             }
             }
 
 
             proxy.$http.get(`/api-web/redis/cache/key`, params, function (res) {
             proxy.$http.get(`/api-web/redis/cache/key`, params, function (res) {
-                if (res) {
-                    viewData.value =prettyFormat([res]) ;
+                if (res && res.object) {
+                    viewData.value =prettyFormat(res.object) ;
+                }else{
+                    viewData.value='暂无数据';
+                }
                 cacheVisible.value=true;
                 cacheVisible.value=true;
 
 
-                }
             });
             });
         }
         }
+        //格式化json数据
         let  prettyFormat=(code)=> {
         let  prettyFormat=(code)=> {
             try {
             try {
                 for (const key in code) {
                 for (const key in code) {