diff --git a/src/pages/serviceDetail.vue b/src/pages/serviceDetail.vue
index de3e188788399f9f1e1714aed3dd33ead92fd0f9..edb86afcebc5047d3970b8423eab7f8c33e69625 100644
--- a/src/pages/serviceDetail.vue
+++ b/src/pages/serviceDetail.vue
@@ -9,8 +9,8 @@
               </div>
               <div class="type_box_select">
                   <info-list :list_arr="now_service==0?list_arr:servicead_arr" v-if="now_service == 0||now_service == 1">
-                      <table-um :headers="header_arr" url="params_arr" :paginationShow="true" slot="zd_table"></table-um>
-                      <v-apaas-code url="/static/data.json" slot="zd_code"></v-apaas-code>
+                      <table-um :headers="header_arr" :url="responseParamUrl" :paginationShow="true" slot="zd_table"></table-um>
+                      <v-apaas-code :url="codeExampleUrl" slot="zd_code"></v-apaas-code>
                   </info-list>
                   <div v-show="now_service == 2">
                       <p class="service_title"><span></span>服务运行概况</p>
@@ -19,30 +19,30 @@
                             <template>
                                 <div style="height:115px;padding-top:10px;">
                                     <example-icon style="margin:10px auto;"></example-icon>
-                                    <p style="color: #58617a;font-size: 16px;text-align:center;">运行中</p>
+                                    <p style="color: #58617a;font-size: 16px;text-align:center;">{{yx_state.state}}</p>
                                 </div>
                             </template>
                         </nor-card>
                         <nor-card title="平均响应时间" class="service_card">
                             <template>
                                 <div style="height:115px;" class="service_num">
-                                    <p>1200ms</p> 
-                                    <p>最大响应时间：180000ms</p>
+                                    <p>{{yx_state.averageTime}}</p> 
+                                    <p>最大响应时间：{{yx_state.maxTime}}</p>
                                 </div>
                             </template>
                         </nor-card>
                         <nor-card title="吞吐率" class="service_card">
                             <template>
                                 <div style="height:115px;" class="service_num">
-                                    <p>39dps</p> 
-                                    <p>最大吞吐率：120dps</p> 
+                                    <p>{{yx_state.averageTraffic}}</p> 
+                                    <p>最大吞吐率：{{yx_state.maxTraffic}}</p> 
                                 </div>
                             </template>
                         </nor-card>
                         <nor-card title="资源使用" class="service_card">
                             <template>
                                 <div style="height:115px;padding-top:30px;" class="service_num">
-                                    <p>300MB</p>  
+                                    <p>{{yx_state.memory}}</p>  
                                 </div>
                             </template>
                         </nor-card>
@@ -97,6 +97,7 @@ import exampleIcon from "@/pages/example_icon"
 import Topology from "@/components/topology.vue";
 import serviceHeader from '../components/service-header'
 import dialogAction from "@/components/dialog-action";
+import { getRole } from "../utils/common";
 export default {
   components:{
       infoList,
@@ -110,39 +111,27 @@ export default {
   },
   data() {
     return {
-        now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
+        now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
         buy_style:0,
+        responseParamUrl:'',
+        codeExampleUrl:'',
+        yx_state:{
+            "state":"",
+            "averageTime":"",
+            "maxTime":"",
+            "averageTraffic":"",
+            "maxTraffic":"",
+            "memory":""
+        },
         service_arr:[
             ['服务基本信息','接口详细信息','服务运行状态'],
             ['服务基本信息','接口详细信息','服务运行状态','服务计费规则'],
             ['服务基本信息','接口详细信息','服务运行状态','服务规格'],
         ],
         service_header_arr:{
-            name:'地市GDP基础数据',
-            first:[
-                {
-                    name:'服务类型',
-                    text:'数据服务',
-                },
-                {
-                    name:'申请次数',
-                    text:39,
-                },
-                {
-                    name:'调用次数',
-                    text:319,
-                },
-                {
-                    name:'服务状态',
-                    text:'上架中',
-                },
-            ],
-            second:[
-                {
-                    name:'服务接口地址',
-                    text:'http://localhost:8084/cszh/rest/yxtz/zdrylx?code=430100000000',
-                },
-            ],
+            name:'',
+            first:[],
+            second:[],
             fixed:true,
         },
         now_service:0,
@@ -392,19 +381,19 @@ export default {
         servicead_arr:[
             {
                 title:'请求方式：',
-                info:'get'
+                info:''
             },
             {
                 title:'请求参数：',
-                info:'无请求参数'
+                info:''
             },
             {
                 title:'请求示例：',
-                info:'无请求示例'
+                info:''
             },
             {
                 title:'编码格式：',
-                info:'UTF-8'
+                info:''
             },
             {
                 title:'响应参数：',
@@ -420,32 +409,7 @@ export default {
             },
             
         ],
-        list_arr:[
-            {
-                title:'服务描述：',
-                info:'提供贵州省2019年各市州的GDP数据。'
-            },
-            {
-                title:'服务领域：',
-                info:'经济建设'
-            },
-            {
-                title:'所属组织：',
-                info:'北京比格大数据有限公司'
-            },
-            {
-                title:'开放程度：',
-                info:'共享'
-            },
-            {
-                title:'接口编码：',
-                info:'chart'
-            },
-            {
-                title:'注册发布时间：',
-                info:'2019-02-17 21:09:23'
-            },
-        ],
+        list_arr:[],
     }
   },
   watch:{
@@ -455,21 +419,85 @@ export default {
           }
       }
   },
+  created(){
+    this.now_user = this.$store.state.role
+    getRole().then(data => {
+        this.now_user = data;
+        this.$store.commit('rolefun',data)
+        this.getServiceInfo()
+        this.getInterfaceInfo()
+        this.getServiceBaseInfo()
+        this.getServiceyxztInfo()
+        
+    });
+  },
   mounted(){
-      console.log(this.$store.state.role);
+    
   },
   methods:{
-      getData() {
-      let url = "./static/antv.json";
+    getData() {
+      let url = "/static/antv.json";
       this.$http
         .get(url)
         .then(response => {
           this.datas = response.data.elements;
         })
         .catch(function(response) {
-          this.error = true;
+          
         });
     },
+    getServiceInfo(){
+        this.$http
+            .get('/static/servicedetail.json')
+            .then(response => {
+                let data = response.data.data
+                this.$set(this.service_header_arr,'name',data.serviceInfo.name)
+                this.$set(this.service_header_arr,'first',data.serviceInfo.first)
+                this.$set(this.service_header_arr,'second',data.serviceInfo.second)
+            })
+            .catch(function(response) {
+                
+            });
+    },
+    getInterfaceInfo(){
+        this.$http
+            .get('/static/servicedetail.json')
+            .then(response => {
+                let data = response.data.data
+                this.$set(this.servicead_arr[0],'info',data.serviceinterfaceinfo.type)
+                this.$set(this.servicead_arr[1],'info',data.serviceinterfaceinfo.requestParam)
+                this.$set(this.servicead_arr[2],'info',data.serviceinterfaceinfo.example)
+                this.$set(this.servicead_arr[3],'info',data.serviceinterfaceinfo.format)
+                this.responseParamUrl = data.serviceinterfaceinfo.responseParamUrl
+                this.codeExampleUrl = data.serviceinterfaceinfo.codeExampleUrl
+            })
+            .catch(function(response) {
+                
+            });
+    },
+    getServiceBaseInfo(){
+        this.$http
+            .get('/static/servicedetail.json')
+            .then(response => {
+                let data = response.data.data
+                this.list_arr = data.servicebaseinfo
+            })
+            .catch(function(response) {
+                
+            });
+    },
+    getServiceyxztInfo(){
+        this.$http
+            .get('/static/servicedetail.json')
+            .then(response => {
+                let data = response.data.data
+                this.yx_state = data.serviceyxzt
+            })
+            .catch(function(response) {
+                
+            });
+    },
+
   }
 };
 </script>
diff --git a/src/pages/serviceEdit.vue b/src/pages/serviceEdit.vue
index 096d75d962ef63ef7c381551c002978863bb2ee2..729ffb00811f7458e640fb074cba3e1a79b8623e 100644
--- a/src/pages/serviceEdit.vue
+++ b/src/pages/serviceEdit.vue
@@ -85,7 +85,7 @@
         </el-form-item>
       </el-form>
 
-      <div class="safe_set">
+      <div class="safe_set"  v-if="now_edit==1">
         <div class="safe_title">
           <div v-for="(item,index) in safe_arr" :key="index+4000" 
           class="safe_select"
@@ -93,7 +93,42 @@
           :style="now_safe==index?{borderBottom: '4px solid #f5ab4c'}:{}"
           >{{item}}</div>
         </div>
-        <div class="safe_box_select"></div>
+        <div class="safe_box_select">  
+          <div v-if="now_safe==0">
+            <p class="formtitle">是否开启：</p>
+            <div class="openbgc" @click="openstart" :style="!open?{backgroundImage:'url('+require('../assets/imgs/btn_off_hov.png')+')'}:{}"></div>
+            <p class="formtitle">最大连接数：</p>
+            <el-input v-model="maxline" placeholder="请输入内容"></el-input>       
+          </div>       
+
+          <div v-if="now_safe==1">
+            <p class="formtitle">是否开启：</p>
+            <div class="openbgc" @click="openstart1" :style="!open1?{backgroundImage:'url('+require('../assets/imgs/btn_off_hov.png')+')'}:{}"></div>
+            <p class="formtitle">最大连接数：</p>
+            <el-input v-model="maxline1" placeholder="请输入内容"></el-input>     
+            <div class="limitsd">
+              <p class="formtitle">有效时间：</p>
+              <el-input v-model="usetime1" placeholder="请输入内容"></el-input> 
+              <el-select class="timeslect" v-model="timevalue" placeholder="请选择">
+                <el-option
+                  v-for="item in timeoptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>  
+
+          <div v-if="now_safe==2">
+            <p class="formtitle">是否开启：</p>
+            <div class="openbgc" @click="openstart2" :style="!open2?{backgroundImage:'url('+require('../assets/imgs/btn_off_hov.png')+')'}:{}"></div>       
+          </div>      
+        </div>
+        <div class="savebtn">
+          <div class="btnsty" @click="calcle()">取消</div>
+          <div class="btnsty" @click="saveInfo()">保存</div>
+        </div>
       </div>
     </div>
   </div>
@@ -101,6 +136,7 @@
 
 <script>
 import uploadFile from '../components/upload_file'
+import { getRole } from "../utils/common";
 export default {
   props: {},
   components: {
@@ -119,10 +155,35 @@ export default {
           resource: '',
           fileList:''
         },
+        open:true,
+        maxline:'',
+        open1:false,
+        maxline1:'',
+        open2:'true',
+        usetime1:'',
         now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
         now_edit:0,//信息和安全切换
         now_safe:0,//切换安全
         imgList: [],
+        timevalue:1,
+        timeoptions:[
+          {
+            label:'day(天)',
+            value:0,
+          },
+          {
+            label:'hour(小时)',
+            value:1,
+          },
+          {
+            label:'min(分钟)',
+            value:2,
+          },
+          {
+            label:'second(秒)',
+            value:3,
+          },
+        ],
         safe_arr:['熔断管理','速率限制','TLS加密','敏感字段追踪'],
         area_arr:[
           {
@@ -170,20 +231,7 @@ export default {
             value:10,
           },
         ],
-        origin_arr:[
-          {
-            label:'北京比格大数据公司',
-            value:0
-          },
-          {
-            label:'云上贵州',
-            value:1
-          },
-          {
-            label:'迪爱斯',
-            value:2
-          },
-        ],
+        origin_arr:[],
         rules:{
           desc:[
             { max: 200, message: '长度小于200个字符', trigger: 'blur' }
@@ -193,9 +241,42 @@ export default {
   },
   watch: {},
   computed: {},
-  created() {},
+  created() {
+    this.now_user = this.$store.state.role
+    getRole().then(data => {
+        this.now_user = data;
+        this.$store.commit('rolefun',data)
+        this.getOriginArr()
+    });
+  },
   mounted() {},
   methods: {
+    getOriginArr(){
+      this.$http
+            .get('/static/serviceedit.json')
+            .then(response => {
+                let data = response.data.data
+                this.origin_arr = data.origin_arr
+            })
+            .catch(function(response) {
+                
+            });
+    },
+    calcle(){
+      console.log('1111');
+    },
+    saveInfo(){
+      console.log('2222');
+    },
+    openstart(){
+      this.open = !this.open
+    },
+    openstart1(){
+      this.open1 = !this.open1
+    },
+    openstart2(){
+      this.open2 = !this.open2
+    },
     removepic(){
       this.$refs.servicepic.handleRemove()
     },
@@ -224,6 +305,13 @@ export default {
   background-color: #f7f8f9;
   width: 1022px;
 }
+.limitsd .timeslect .el-input__inner{
+  width: 150px;
+  border-radius: 0 8px 8px 0;
+  background-color: rgba(15, 38, 131, 1);
+  color: rgba(248, 249, 253, 1);
+  border: 0;
+}
 </style>
 
 <style scoped>
@@ -240,6 +328,7 @@ export default {
   border-radius: 12px;
   min-height: calc(100% - 20px);
     margin-bottom: 20px;
+    position: relative;
 }
 .now_page_title {
   margin: 15px 0;
@@ -306,4 +395,53 @@ export default {
     height: 65px;
     cursor: pointer;
 }
+.safe_box_select{
+    padding: 30px 10px 10px 10px;
+    width: 100%;
+    height: 100%;
+}
+.openbgc{
+  width: 56px;
+	height: 23px;
+  background-image: url('../assets/imgs/btn_on_hov.png');
+  background-size:contain;
+  cursor: pointer;
+}
+.formtitle{
+  color: #58617a;
+  margin: 15px 0;
+}
+
+.savebtn{
+  position: absolute;
+  right: 20px;
+  bottom:20px;
+  width: 278px;
+  overflow: hidden;
+}
+.btnsty{
+  width: 124px;
+	height: 44px;
+  line-height: 44px;
+	background-color: rgba(195, 202, 248, 0.5);
+	border-radius: 8px;
+  color: rgba(15, 38, 131, 1);
+  text-align: center;
+  float: left;
+  margin-right: 30px;
+  cursor: pointer;
+}
+.savebtn .btnsty:nth-last-of-type(1){
+  margin-right: 0px;
+  background-color: rgba(15, 38, 131, 1);
+  color: rgba(248, 249, 253, 1);
+}
+.limitsd{
+  position: relative;
+  width: 1022px;
+}
+.limitsd .timeslect{
+  position: absolute;
+  right: 0;
+}
 </style>
diff --git a/src/pages/workPlace.vue b/src/pages/workPlace.vue
index dfb5d794032809039ba4e6bd3d8aa54cc9e69f16..2366de6bcf23c366d2886a69ddd864e2ff91cd94 100644
--- a/src/pages/workPlace.vue
+++ b/src/pages/workPlace.vue
@@ -16,6 +16,7 @@
               :key="index+800"
               class="manage_box"
               @click="manage_func(index)"
+              v-if="item.role==now_user"
             >
               <img :src="item.pic" alt />
               {{item.text}}
@@ -169,6 +170,7 @@
           <img
             style="vertical-align:-9px;"
             src="../assets/imgs/home_btn_enter.png"
+            @click="gotofw()"
             alt
           />
         </p>
@@ -181,7 +183,7 @@
               :style="now_type==index?{borderBottom:'4px solid #f5ab4c',color:'#e56600'}:{}"
               @click="now_type = index"
             >{{item}}</div>
-            <div class="myservice_btn" v-if="now_user==0">
+            <div class="myservice_btn" v-if="now_user==0" @click="gotozc()">
               <img src="../assets/imgs/home_ic_release.png" alt />&nbsp; 服务注册
             </div>
           </div>
@@ -241,8 +243,8 @@ var echarts = require("echarts");
 export default {
   data() {
     return {
-      person: "康先生",
-      login_time: "2020-03-12 10:21:22",
+      person: "",
+      login_time: "",
       now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
       now_type: 0,
       now_app: 0,
@@ -718,21 +720,24 @@ export default {
             pic: require("../assets/imgs/ic_fuwuzs_navy.png"),
             bg: "#e6ebfe",
             color: "#515fe7",
-            num: "12,332"
+            type:"service",
+            num: ""
           },
           {
             text: "应用总数",
             pic: require("../assets/imgs/ic_yingyongzs.png"),
             bg: "#e5f4fe",
             color: "#38aef9",
-            num: "223"
+            type:'app',
+            num: ""
           },
           {
             text: "收益总额",
             pic: require("../assets/imgs/ic_shouyize.png"),
             bg: "#fcefd6",
             color: "#ea7d19",
-            num: "￥2,312"
+            type:'getMoney',
+            num: ""
           }
         ],
         [
@@ -741,28 +746,32 @@ export default {
             pic: require("../assets/imgs/ic_yonghuzs.png"),
             bg: "#e6ebfe",
             color: "#515fe7",
-            num: "2,312"
+            type:'areaUser',
+            num: ""
           },
           {
             text: "服务总数",
             pic: require("../assets/imgs/ic_fuwuzs.png"),
             bg: "#e5f4fe",
             color: "#38aef9",
-            num: "12,332"
+            type:'service',
+            num: ""
           },
           {
             text: "应用总数",
             pic: require("../assets/imgs/ic_yingyongzs.png"),
             bg: "#e7fdfc",
             color: "#25bdb1",
-            num: "223"
+            type:'app',
+            num: ""
           },
           {
             text: "收益总额",
             pic: require("../assets/imgs/ic_shouyize.png"),
             bg: "#fcefd6",
             color: "#ea7d19",
-            num: "￥2,312"
+            type:'getMoney',
+            num: ""
           }
         ],
         [
@@ -771,28 +780,32 @@ export default {
             pic: require("../assets/imgs/ic_yonghuzs.png"),
             bg: "#e6ebfe",
             color: "#515fe7",
-            num: "2,312"
+            type:'allUser',
+            num: ""
           },
           {
             text: "服务总数",
             pic: require("../assets/imgs/ic_fuwuzs.png"),
             bg: "#e5f4fe",
             color: "#38aef9",
-            num: "12,332"
+            type:'service',
+            num: ""
           },
           {
             text: "应用总数",
             pic: require("../assets/imgs/ic_yingyongzs.png"),
             bg: "#e7fdfc",
             color: "#25bdb1",
-            num: "223"
+            type:'app',
+            num: ""
           },
           {
             text: "收益总额",
             pic: require("../assets/imgs/ic_shouyize.png"),
             bg: "#fcefd6",
             color: "#ea7d19",
-            num: "￥2,312"
+             type:'getMoney',
+            num: ""
           }
         ]
       ],
@@ -850,67 +863,42 @@ export default {
         ["创新应用", "应用审批"],
         ["创新应用", "应用审批"]
       ],
-      app_arr: [
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定",
-          version: "1.0.1"
-        },
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定定定定定定",
-          version: "1.0.1"
-        },
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定定定定定定",
-          version: "1.0.1"
-        },
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定定定定定定",
-          version: "1.0.1"
-        },
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定定定定定定",
-          version: "1.0.1"
-        },
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定定定定定定",
-          version: "1.0.1"
-        },
-        {
-          pic: require("../assets/imgs/home_tool_ic_znht.png"),
-          name: "定定定定定定定定",
-          version: "1.0.1"
-        }
-      ],
+      app_arr: [],
       manage_arr: [
         {
           pic: require("../assets/imgs/home_tool_ic_key.png"),
-          text: "我的密钥"
+          text: "我的密钥",
+          role:0,
         },
         {
           pic: require("../assets/imgs/home_tool_ic_organize.png"),
-          text: "组织管理"
+          text: "组织管理",
+          role:1,
+        },
+        {
+          pic: require("../assets/imgs/home_tool_ic_key.png"),
+          text: "密钥管理",
+          role:1,
         },
         {
           pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
-          text: "权限管理"
+          text: "权限管理",
+          role:2,
         },
         {
           pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
-          text: "容器管理"
+          text: "容器管理",
+          role:2,
         },
         {
           pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
-          text: "数据管控"
+          text: "数据管控",
+          role:2,
         },
         {
           pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
-          text: "消息新闻管理"
+          text: "消息新闻管理",
+          role:2,
         }
       ]
     };
@@ -918,62 +906,152 @@ export default {
   components: {
     tableUm
   },
+  created(){
+    this.getUserData()
+    this.getAppData()
+  },
   mounted() {
     this.now_user = this.$store.state.role
     getRole().then(data => {
       this.now_user = data;
       this.$store.commit('rolefun',data)
+      this.getInfoData()
       setTimeout(() => {
         if (this.now_user == 0) {
-          this.init_health(50);
-          this.init_yy();
+          this.getHealth();
+          this.getoperatingdata();
         } else if (this.now_user == 1) {
-          this.init_health(50);
-          this.init_yy();
-          this.init_fwyy();
+          this.getHealth();
+          this.getoperatingdata();
+          this.getappusedata();
         } else if (this.now_user == 2) {
-          this.init_yy();
-          this.init_fwlx_asy([
-            {
-              name: "数据服务",
-              value: 10
-            },
-            {
-              name: "感知服务",
-              value: 10
-            },
-            {
-              name: "视频服务",
-              value: 10
-            },
-            {
-              name: "时空服务",
-              value: 10
-            },
-            {
-              name: "综合服务",
-              value: 10
-            }
-          ]);
-          this.init_yylx_asy([
-            {
-              name: "基础工具",
-              value: 10
-            },
-            {
-              name: "通信应用",
-              value: 10
-            },
-            {
-              name: "业务应用",
-              value: 10
-            }
-          ]);
+          this.getoperatingdata();
+          this.getfwlxdata()
+          this.getyylxdata()
         }
-      });
-    }, 500);
+      }, 500);
+    });
   },
   methods: {
+    gotofw(){
+      this.$router.push('/fwgl/:'+this.now_user)
+    },
+    gotozc(){
+      this.$router.push('/fwzc/fwcs')
+    },
+    getUserData(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.person = data.userdata.person
+            this.login_time = data.userdata.login_time
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getoperatingdata(){
+      this.$http
+          .get('/static/workpalce.json')
+          .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,
+            );
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getappusedata(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.init_fwyy(
+              data.appusedata.xarr,
+              data.appusedata.yarr,
+            );
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getfwlxdata(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.init_fwlx_asy(
+              data.fwlxdata
+            );
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getyylxdata(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.init_yylx_asy(
+              data.yylxdata
+            );
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getHealth(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.init_health(data.health);
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getAppData(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.app_arr = data.appdata
+          })
+          .catch(function(response) {
+           
+          });
+    },
+    getInfoData(){
+      this.$http
+          .get('/static/workpalce.json')
+          .then(response => {
+            console.log(response);
+            let data = response.data.data
+            this.menu_arr[this.now_user].forEach((e,idx) => {
+              if(data.infodata[e.type]){
+                this.$set(this.menu_arr[this.now_user][idx],'num',data.infodata[e.type])
+              }
+            });
+          })
+          .catch(function(response) {
+           
+          });
+    },
     //分配接口调用
     distribut(val){
       console.log(val);
@@ -1203,7 +1281,7 @@ export default {
       };
       return options;
     },
-    init_yy() {
+    init_yy(xarr,service,app,get) {
       var colors = ["#e56600", "#c9cedd", "#515fe7"];
 
       var options = {
@@ -1232,7 +1310,7 @@ export default {
             axisTick: {
               alignWithLabel: true
             },
-            data: ["1月", "2月", "3月", "4月", "5月"]
+            data: xarr
           }
         ],
         yAxis: [
@@ -1264,7 +1342,7 @@ export default {
             name: "服务调用总数",
             type: "bar",
             yAxisIndex: 1,
-            data: [2.0, 4.9, 7.0, 23.2, 25.6],
+            data: service,
             itemStyle: {
               barBorderRadius: 6,
               color: colors[2]
@@ -1275,7 +1353,7 @@ export default {
             name: "应用部署总数",
             type: "bar",
             yAxisIndex: 1,
-            data: [2.6, 5.9, 9.0, 26.4, 28.7],
+            data: app,
             itemStyle: {
               barBorderRadius: 6,
               color: colors[0]
@@ -1286,7 +1364,7 @@ export default {
             name: "收益总额",
             type: "line",
             yAxisIndex: 0,
-            data: [2.0, 2.2, 3.3, 4.5, 6.3],
+            data: get,
             itemStyle: {
               color: colors[0]
             },
@@ -1297,7 +1375,7 @@ export default {
       window[this.yy_asy] = echarts.init(document.getElementById(this.yy_asy));
       window[this.yy_asy].setOption(options, true);
     },
-    init_fwyy() {
+    init_fwyy(xarr,yarr) {
       var dataname = ["服务总数", "应用总数"];
       var options = {
         tooltip: {
@@ -1327,7 +1405,7 @@ export default {
           nameTextStyle: {
             color: "#0d1847"
           },
-          data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
+          data: xarr
         },
         yAxis: {
           type: "value",
@@ -1344,7 +1422,7 @@ export default {
         },
         series: [
           {
-            data: [820, 932, 901, 934, 1290, 1330, 1320],
+            data: yarr,
             type: "line",
             name: dataname[0],
             smooth: true,
@@ -1614,6 +1692,9 @@ export default {
   margin: 10px 20px 40px 0px;
   text-align: center;
 }
+.myapp_contain .myapp_box:nth-of-type(3n){
+  margin-right: 0;
+}
 .myapp_box p:nth-of-type(1) {
   display: block;
   overflow: hidden;
diff --git a/src/utils/common.js b/src/utils/common.js
index ef28f48272f6a129b70754dfa8ae4afa1cd68986..4482fa0cca5df12570fbae815b294599a28caf77 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1,13 +1,15 @@
 function getRole(){
     return new Promise((resolve,reject)=>{
         if(true){
-            resolve(1)
+            resolve(0)
         }else{
             reject('error')
         }
     })
 }
 
+
+
 export{
     getRole
 }
\ No newline at end of file
diff --git a/static/servicedetail.json b/static/servicedetail.json
new file mode 100644
index 0000000000000000000000000000000000000000..462566ee655e6974270b74e85a3f2cffcca81909
--- /dev/null
+++ b/static/servicedetail.json
@@ -0,0 +1,74 @@
+{
+    "data":{
+        "serviceInfo":{
+            "name":"地市GDP基础数据",
+            "first":[
+                {
+                    "name":"服务类型",
+                    "text":"数据服务"
+                },
+                {
+                    "name":"申请次数",
+                    "text":39
+                },
+                {
+                    "name":"调用次数",
+                    "text":319
+                },
+                {
+                    "name":"服务状态",
+                    "text":"上架中"
+                }
+            ],
+            "second":[
+                {
+                    "name":"服务接口地址",
+                    "text":"http://localhost:8084/cszh/rest/yxtz/zdrylx?code=430100000000"
+                }
+            ]
+        },
+        "serviceinterfaceinfo":{
+            "type":"get",
+            "requestParam":"无请求参数",
+            "example":"无请求示例",
+            "format":"UTF-8",
+            "responseParamUrl":"params_arr",
+            "codeExampleUrl":"/static/data.json"
+        },
+        "servicebaseinfo":[
+            {
+                "title":"服务描述：",
+                "info":"提供贵州省2019年各市州的GDP数据。"
+            },
+            {
+                "title":"服务领域：",
+                "info":"经济建设"
+            },
+            {
+                "title":"所属组织：",
+                "info":"北京比格大数据有限公司"
+            },
+            {
+                "title":"开放程度：",
+                "info":"共享"
+            },
+            {
+                "title":"接口编码：",
+                "info":"chart"
+            },
+            {
+                "title":"注册发布时间：",
+                "info":"2019-02-17 21:09:23"
+            }
+        ],
+        "serviceyxzt":{
+            "state":"运行中",
+            "averageTime":"1200ms",
+            "maxTime":"180000ms",
+            "averageTraffic":"120dps",
+            "maxTraffic":"120000dps",
+            "memory":"300MB"
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/static/serviceedit.json b/static/serviceedit.json
new file mode 100644
index 0000000000000000000000000000000000000000..6ab0bab73a5a9506abb3ffea1b0bec8141a1b515
--- /dev/null
+++ b/static/serviceedit.json
@@ -0,0 +1,18 @@
+{
+    "data":{
+        "origin_arr":[
+            {
+                "label":"北京比格大数据公司",
+                "value":0
+              },
+              {
+                "label":"云上贵州",
+                "value":1
+              },
+              {
+                "label":"迪爱斯",
+                "value":2
+              }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/static/workpalce.json b/static/workpalce.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab5e213b6e8043f172ddbd1ee02434cb8e13ddbb
--- /dev/null
+++ b/static/workpalce.json
@@ -0,0 +1,111 @@
+{
+    "data":{
+        "userdata":{
+            "person":"康先生",
+            "login_time":"2020-03-12 10:21:22"
+        },
+        "infodata":{
+            "service":"12,454",
+            "app":"223",
+            "getMoney":"￥2,321",
+            "areaUser":"2,544",
+            "allUser":"1,223"
+        },
+        "appdata":[
+            {
+                "pic":"https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2401797488,3905296019&fm=26&gp=0.jpg",
+                "name":"订单定",
+                "version":"1.0.1"
+            },
+            {
+                "pic":"https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2401797488,3905296019&fm=26&gp=0.jpg",
+                "name":"订单定",
+                "version":"1.0.1"
+            },
+            {
+                "pic":"https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2401797488,3905296019&fm=26&gp=0.jpg",
+                "name":"订单定",
+                "version":"1.0.1"
+            },
+            {
+                "pic":"https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2401797488,3905296019&fm=26&gp=0.jpg",
+                "name":"订单定",
+                "version":"1.0.1"
+            },
+            {
+                "pic":"https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2401797488,3905296019&fm=26&gp=0.jpg",
+                "name":"订单定",
+                "version":"1.0.1"
+            }
+        ],
+        "health":50,
+        "operatingdata":{
+            "xarr":[
+                "1月2日",
+                "2月2日",
+                "3月2日",
+                "4月2日",
+                "5月2日"
+            ],
+            "service_yarr":[
+                2.0, 4.9, 7.0, 23.2, 25.6
+            ],
+            "app_yarr":[
+                2.6, 5.9, 9.0, 26.4, 28.7
+            ],
+            "get_yarr":[
+                2.0, 2.2, 3.3, 4.5, 6.3
+            ]
+        },
+        "appusedata":{
+            "xarr":[
+                "1月2日",
+                "2月2日",
+                "3月2日",
+                "4月2日",
+                "5月2日"
+            ],
+            "yarr":[820, 932, 901, 934, 1290, 1330, 1320]
+        },
+        "fwlxdata":[
+            {
+                "name": "数据服务",
+                "value": 10
+              },
+              {
+                "name": "感知服务",
+                "value": 10
+              },
+              {
+                "name": "视频服务",
+                "value": 10
+              },
+              {
+                "name": "时空服务",
+                "value": 10
+              },
+              {
+                "name": "综合服务",
+                "value": 10
+              }
+        ],
+        "yylxdata":[
+            {
+                "name": "基础工具",
+                "value": 10
+              },
+              {
+                "name": "通信应用",
+                "value": 10
+              },
+              {
+                "name": "业务应用",
+                "value": 10
+              }
+        ]
+
+
+
+
+    }
+}
\ No newline at end of file