Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/pages/data-analysis/super-control.vue

@@ -131,6 +131,11 @@ import lineChart from "@/components/e-charts/line_chart";
 import doubleBar from "@/components/e-charts/doubleBar";
 import rankList from "@/components/e-charts/rankList";
 
+/**
+ * 此页面作废，超管的服务管控和组织的服务管控可以直接复用
+ * xuym 2020-08-31
+ */
+
 export default {
   components: {
     BlockRadius,

src/router/index.js

@@ -468,7 +468,7 @@ export default new Router({
             {
               path: "/data_analysis/super_control", // 服务管控-超管
               name: "superControl",
-              component: () => import("@/pages/data-analysis/super-control"),
+              component: () => import("@/pages/data-analysis/org-control"),
             },
           ],
         },