Merge branch 'zj' into dev

src/pages/workPlace.vue

@@ -35,7 +35,9 @@
       </div>
     </div>
 
-    <div class="case_box">
+
+    <!-- 普通用户--数据分析 -->
+    <div class="case_box" v-if="now_user == 0">
       <div class="data_asy">
         <p style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;">
           数据分析中心
@@ -68,7 +70,9 @@
       </div>
     </div>
 
-    <div class="case_box">
+
+    <!-- 普通用户--服务 -->
+    <div class="case_box" v-if="now_user == 0">
       <div class="data_asy">
         <p style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;">
           我的服务
@@ -100,6 +104,10 @@
         </div>
       </div>
     </div>
+
+    <!-- 组织用户--数据分析 -->
+
+
   </div>
 </template>
 
@@ -111,7 +119,7 @@ export default {
     return {
       person: "康先生",
       login_time: "2020-03-12 10:21:22",
-      now_user: 0,
+      now_user: 0,//0：普通用户，1：组织管理员，2：超级管理员
       now_type:0,
       now_app:0,
       manage_flag:false,
@@ -142,25 +150,55 @@ export default {
           }
         ],
         [
+          {
+            text: "组织用户数",
+            pic: require("../assets/imgs/ic_yonghuzs.png"),
+            bg: "#e6ebfe",
+            color: "#515fe7",
+            num: "2,312"
+          },
+          {
+            text: "服务总数",
+            pic: require("../assets/imgs/ic_fuwuzs.png"),
+            bg: "#e5f4fe",
+            color: "#38aef9",
+            num: "12,332"
+          },
+          {
+            text: "应用总数",
+            pic: require("../assets/imgs/ic_yingyongzs.png"),
+            bg: "#e7fdfc",
+            color: "#25bdb1",
+            num: "223"
+          },
           {
             text: "收益总额",
             pic: require("../assets/imgs/ic_shouyize.png"),
             bg: "#fcefd6",
             color: "#ea7d19",
             num: "￥2,312"
-          },
+          }
+        ],
+        [
           {
-            text: "服务总数",
-            pic: require("../assets/imgs/ic_fuwuzs_navy.png"),
+            text: "用户总数",
+            pic: require("../assets/imgs/ic_yonghuzs.png"),
             bg: "#e6ebfe",
             color: "#515fe7",
+            num: "2,312"
+          },
+          {
+            text: "服务总数",
+            pic: require("../assets/imgs/ic_fuwuzs.png"),
+            bg: "#e5f4fe",
+            color: "#38aef9",
             num: "12,332"
           },
           {
             text: "应用总数",
             pic: require("../assets/imgs/ic_yingyongzs.png"),
-            bg: "#e5f4fe",
-            color: "#38aef9",
+            bg: "#e7fdfc",
+            color: "#25bdb1",
             num: "223"
           },
           {
@@ -170,7 +208,7 @@ export default {
             color: "#ea7d19",
             num: "￥2,312"
           }
-        ]
+        ],
       ],
       online_tool_arr:[
         {
@@ -519,7 +557,7 @@ export default {
 
 
 <style>
-  .el-scrollbar__wrap {
+  .online_tool .el-scrollbar__wrap {
     overflow-x: hidden;
   }
 </style>