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

src/assets/i18n/language-zh.js

@@ -23,8 +23,12 @@ export const lang = {
 
     // data analysis
     data_analysis: "运营管控中心",
-    my_service_data_analysis: "服务分析",
-    my_application_data_analysis: "应用分析",
+    operational_analysis: "运营分析",
+    operation_control: "运行管控",
+    service_data_analysis: "服务分析",
+    application_data_analysis: "应用分析",
+    operation_overview: "运行概况",
+    service_control: "服务管控",
 
     // message
     message: "消息与推送管理",

src/components/e-charts/gkmultiple_circle.vue

@@ -36,7 +36,8 @@ export default {
     data: {
       handler() {
         this.init_yylx_asy(this.data, this.text);
-      }
+      },
+      deep: true,
     }
   },
   computed: {},

src/components/e-charts/graph.vue

@@ -25,8 +25,6 @@ export default {
   methods: {
     graph() {
       let self = this;
-      console.log(this.data.legend.data);
-      console.log(this.data.data);
       return {
         color: ["#274fee", "#ef9433"],
         legend: {

src/components/e-charts/multiple_circle.vue

@@ -48,7 +48,8 @@ export default {
     data: {
       handler() {
         this.init_yylx_asy(this.data, this.text);
-      }
+      },
+      deep: true,
     }
   },
   computed: {},
@@ -125,9 +126,10 @@ export default {
           name: "",
           type: "pie",
           clockWise: false,
-          radius: [65, 68],
-          center: ["50%", "50%"],
+          radius: [60, 63],
+          center: ["50%", "46%"],
           hoverAnimation: false,
+          avoidLabelOverlap: true,
           itemStyle: {
             normal: {
               label: {
@@ -173,9 +175,9 @@ export default {
           subtextStyle: {
             color: "#c9cedd"
           },
-          itemGap: -10, // 主副标题距离
+          itemGap: 0, // 主副标题距离
           left: "center",
-          top: "center"
+          top: "32%"
         },
         color: this.isFwsp ? color2 : color,
         tooltip: {

src/components/e-charts/single_circle.vue

@@ -13,24 +13,24 @@ export default {
         return {
           num: 0,
           color: "#e15260",
-          text: "敏感"
+          text: "敏感",
         };
-      }
-    }
+      },
+    },
   },
   components: {},
   data() {
     return {
-      health: uuidv1()
+      health: uuidv1(),
     };
   },
   watch: {
     data: {
       handler(val) {
-        console.log(val);
         this.init_health(this.data.num, this.data.color, this.data.text);
-      }
-    }
+      },
+      deep: true,
+    },
   },
   computed: {},
   created() {},
@@ -40,22 +40,22 @@ export default {
   methods: {
     init_health(num, color, text) {
       var options = {
-        color:[color,'#c9cedd'],
+        color: [color, "#c9cedd"],
         title: {
           text: num + "%",
           textStyle: {
             color: "#000",
             fontSize: 26,
-            fontWeight: 200
+            fontWeight: 200,
           },
           subtext: text,
           subtextStyle: {
             color: "#707693",
-            fontSize: 12
+            fontSize: 12,
           },
           itemGap: 0, // 主副标题距离
           left: "center",
-          top: "center"
+          top: "center",
         },
         angleAxis: {
           max: 100, // 满分
@@ -63,119 +63,124 @@ export default {
           startAngle: 90,
           // 隐藏刻度线
           axisLine: {
-            show: false
+            show: false,
           },
           axisTick: {
-            show: false
+            show: false,
           },
           axisLabel: {
-            show: false
+            show: false,
           },
           splitLine: {
-            show: false
-          }
+            show: false,
+          },
         },
         radiusAxis: {
           type: "category",
           // 隐藏刻度线
           axisLine: {
-            show: false
+            show: false,
           },
           axisTick: {
-            show: false
+            show: false,
           },
           axisLabel: {
-            show: false
+            show: false,
           },
           splitLine: {
-            show: false
-          }
+            show: false,
+          },
         },
         polar: {
           center: ["50%", "50%"],
-          radius: "140%" //图形大小
+          radius: "140%", //图形大小
         },
         series: [
           {
-        type: 'pie',
-        z:5,
-        center:['50%','50%'],
-        radius:['68%','72%'],
-        silent:true,
+            type: "pie",
+            z: 5,
+            center: ["50%", "50%"],
+            radius: ["68%", "72%"],
+            silent: true,
             label: {
               normal: {
-                show: false
+                show: false,
               },
               emphasis: {
-                show: false
-            }
+                show: false,
+              },
             },
             labelLine: {
               normal: {
-                show: false
+                show: false,
               },
               emphasis: {
-                show: false
-            }
+                show: false,
+              },
             },
             tooltip: {
-            show: false
+              show: false,
+            },
+            data: [
+              {
+                name: "",
+                value: num,
+              },
+              {
+                name: "",
+                value: 100 - num,
               },
-        data:[{
-          name:'',
-          value:num
-        },{
-          name:'',
-          value:100 - num
-        }]
+            ],
           },
           {
-        type:'pie',
-        z:4,
-        center:['50%','50%'],
-        radius:['60%','80%'],
-        hoverAnimation:false,
+            type: "pie",
+            z: 4,
+            center: ["50%", "50%"],
+            radius: ["60%", "80%"],
+            hoverAnimation: false,
             avoidLabelOverlap: false,
             label: {
               normal: {
-                show: false
+                show: false,
               },
               emphasis: {
-                show: false
-            }
+                show: false,
+              },
             },
             labelLine: {
               normal: {
-                show: false
+                show: false,
               },
               emphasis: {
-                show: false
-            }
+                show: false,
+              },
             },
             tooltip: {
-            show: false
+              show: false,
             },
             itemStyle: {
               normal: {
-                color:'#f6f7fc'
-            }
+                color: "#f6f7fc",
+              },
+            },
+            emphasis: {
+              show: false,
+              itemStyle: {
+                color: "#f6f7fc",
               },
-        emphasis:{
-            show:false,
-            itemStyle:{
-                color:'#f6f7fc'
-            }
             },
-        data: [{
+            data: [
+              {
                 value: 1,
-        }],
-    }
-        ]
+              },
+            ],
+          },
+        ],
       };
       window[this.health] = echarts.init(document.getElementById(this.health));
       window[this.health].setOption(options, true);
-    }
-  }
+    },
+  },
 };
 </script>
 

src/components/menu.vue

@@ -186,7 +186,6 @@ export default {
     },
     navAction(path) {
       this.now_menu = path;
-      window.sessionStorage.setItem("menuVisitUrl", path);
       this.$router.push(path);
     },
     gotoChildPage(v, parent) {
@@ -200,7 +199,6 @@ export default {
           this.$router.push(v.visit_url);
         }
         this.now_menu = parent;
-        window.sessionStorage.setItem("menuVisitUrl", parent);
       }
     },
     getList() {
@@ -218,8 +216,7 @@ export default {
       });
     },
     getMenuIndex() {
-      let visit_url = window.sessionStorage.getItem("menuVisitUrl");
-      this.now_menu = visit_url ? visit_url : "";
+      this.now_menu = this.$route.path;
     },
     getNowMenu() {
       this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => {
@@ -242,7 +239,6 @@ export default {
           } else {
           }
           this.menu_arr = arr;
-          console.log(this.user_arr);
           this.getMenuIndex();
         }
       });

src/components/work-flow/super-flow.vue

@@ -743,7 +743,6 @@ export default {
       }
     },
     nodeItemMouseDown(evt, info) {
-      console.log("dwad");
       const { clientX, clientY, currentTarget } = evt;
       const { top, left } = evt.currentTarget.getBoundingClientRect();
       const conf = this.dragConf;

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

@@ -14,6 +14,7 @@
       :nav-list="navList"
       :title-path="navList[0] && navList[0].path"
     ></sideNavBarClass>
+    <div v-else class="skeleton"></div>
     <div class="main_container">
       <router-view :key="'type_' + $route.params.type"></router-view>
     </div>
@@ -145,4 +146,8 @@ export default {
   background-color: #f6f7fb;
   overflow: auto;
 }
+.skeleton {
+  width: 180px;
+  background-color: #0d1847;
+}
 </style>

src/pages/data-analysis/my-application.vue

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb separator="/" class="bread_crumb1">
       <el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.data_analysis") }}</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ $t("lang.my_application_data_analysis") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.application_data_analysis") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <el-row class="in_analysis">
       <!-- 可横向铺满 -->

src/pages/data-analysis/my-service.vue

@@ -8,7 +8,7 @@
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         {{
-        $t("lang.my_service_data_analysis")
+        $t("lang.service_data_analysis")
         }}
       </el-breadcrumb-item>
     </el-breadcrumb>
@@ -71,7 +71,7 @@
               @changeButton="changeApplicationFieldBtn"
               class="block"
             >
-              <BarChart :data="bar_data" />
+              <BarChart :x_router="30" :data="bar_data" />
             </block-radius>
           </el-col>
         </el-row>
@@ -635,6 +635,7 @@ export default {
           }
         });
     },
+    getServiceTransfer() {},
     detailHotSearch(item) {
       this.$router.push("/fwgl/0/0/servicedetail/" + item.id);
     },
@@ -676,7 +677,7 @@ export default {
       if (index == 0) {
         this.getServiceHealth();
       } else {
-        this.a();
+        this.getServiceTransfer();
       }
     },
   },

src/request/api/data-analysis.js

@@ -37,6 +37,12 @@ const dataAnalysis = {
   getServiceHotSearch() {
     return axios.get(`/apaas/service/v3/statistics/normal/service/search`);
   },
+  getServiceApprovalChanges() {
+    return axios.get(``);
+  },
+  getServiceApprovalStatus() {
+    return axios.get(``);
+  },
 
   //app
   getAppOverview(){
@@ -69,6 +75,12 @@ const dataAnalysis = {
   getAppHot(){
     return axios.get(`/apaas/hubApi/analysis/appSearch`);
   },
+  getAppApproval(params) {
+    return axios.get(`/apaas/hubApi/analysis/approvalChanges?day=${params.type}`);
+  },
+  getAppApprovalState(params) {
+    return axios.get(`/apaas/hubApi/analysis/approvalStatus?style=${params.type}`);
+  },
 }
 
 export default dataAnalysis;