Merge branch 'zj' into dev

src/pages/workbench/workPlace.vue

@@ -1125,7 +1125,7 @@ export default {
       this.getUserData();
           if (this.now_user == 0||this.now_user == 4) {
             this.getHealth();
-            this.getoperatingdata();
+            // this.getoperatingdata();
           } else if (this.now_user == 1) {
             this.getHealth();
             this.getoperatingdata();
@@ -1163,19 +1163,19 @@ export default {
     },
     getUserData() {
       this.person = this.userInfo.user_name;
-      this.login_time = decodeURIComponent(getCookie('lastLogin'));
+      this.login_time = decodeURIComponent(getCookie('lastLogin')).replace('+',' ');
     },
     getoperatingdata() {
       this.$http
-        .get("./static/workpalce.json")
+        .get("/apaas/service/v3/workplace/statistics/business")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
           this.init_yy(
-            data.operatingdata.xarr,
-            data.operatingdata.service_yarr,
-            data.operatingdata.app_yarr,
-            data.operatingdata.get_yarr
+            data.xarr,
+            data.service_yarr,
+            data.app_yarr,
+            data.get_yarr
           );
         })
         .catch(function(response) {});