From 1ed97988ed7a7f58ccaec64d74218f3459bd5f76 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Wed, 27 May 2020 10:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog-action.vue           |   2 +-
 src/components/service-header.vue          |   4 +-
 src/pages/authority/organizationdetail.vue | 230 +++++++++++++++++++++
 src/pages/authority/organizationedit.vue   |  38 ++++
 src/pages/authority/users.vue              |  33 ++-
 src/pages/workbench/fwgl/serviceDetail.vue |  78 ++++++-
 src/router/index.js                        |   7 +-
 7 files changed, 378 insertions(+), 14 deletions(-)
 create mode 100644 src/pages/authority/organizationdetail.vue
 create mode 100644 src/pages/authority/organizationedit.vue

diff --git a/src/components/dialog-action.vue b/src/components/dialog-action.vue
index f903f86..a5a28f7 100644
--- a/src/components/dialog-action.vue
+++ b/src/components/dialog-action.vue
@@ -35,7 +35,7 @@
 
 <script>
 export default {
-  name: "dialogAction",
+  name: "dialog-action",
   props: {
     confirmOptions: {
       type: Object,
diff --git a/src/components/service-header.vue b/src/components/service-header.vue
index 25f2d4b..366895e 100644
--- a/src/components/service-header.vue
+++ b/src/components/service-header.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="info_logo">
-    <div class="logo"></div>
+    <div class="logo" :style="{backgroundImage:'url('+data.url+')'}"></div>
     <div class="info">
       <p class="info_title">
         <span>{{ data.name }}</span>
@@ -78,8 +78,8 @@ export default {
   float: left;
   width: 144px;
   height: 144px;
-  background-color: #0f6ac7;
   margin-right: 13px;
+  background-size: cover;
 }
 .info {
   float: left;
diff --git a/src/pages/authority/organizationdetail.vue b/src/pages/authority/organizationdetail.vue
new file mode 100644
index 0000000..31b47ec
--- /dev/null
+++ b/src/pages/authority/organizationdetail.vue
@@ -0,0 +1,230 @@
+<template>
+    <div class="detail_contain">
+        <p class="now_page_title">我的服务 / 申请的服务 / <span>服务详情</span></p>
+        <div class="info_contain">
+            <service-header :data="service_header_arr"></service-header>
+        </div>
+        <div class="organtable">
+            <p><span></span>组织用户管理  <el-input class="elinput" v-model="input" prefix-icon="el-icon-search" placeholder="请输入关键字"></el-input></p>
+            <table-um @adelete="adelete" :headers="header_arr" :paginationShow="true" :stripe="true" :datas="datas"></table-um>
+        </div>
+        <dialog-action
+            ref="myConfirm"
+            :confirmOptions="tipsOptions"
+            ></dialog-action>
+    </div>
+</template>
+
+<script>
+import serviceHeader from '@/components/service-header'
+import tableUm from '@/components/table-um'
+import dialogAction from "@/components/dialog-action";
+export default {
+    props: [],
+    components: {
+        serviceHeader,
+        tableUm,
+        dialogAction
+    },
+    data() {
+        return {
+            service_header_arr:{
+                name:'apaas-mapvideos',
+                first:[
+                    {
+                        name:'业务系统数',
+                        text:3,
+                    },
+                    {
+                        name:'组织管理员',
+                        text:'2人',
+                    },
+                ],
+                second:[
+                    {
+                        name:'组织创建时间',
+                        text:'2020-06-08 17:34:12',
+                    },
+                ],
+                fixed:true,
+            },
+            input:'',
+            tipsOptions: {
+                title:'',
+                message:"",
+                btnSubmitText: "",
+                btnCancelText: "",
+                position: "",
+            },
+            datas:[
+                {
+                    id:1,
+                    account:'qwwww',
+                    name:'wwwww',
+                    type:'eeeee',
+                    time:"qwewewewrwe"
+                },
+                {
+                    id:2,
+                    account:'qwwww',
+                    name:'wwwww',
+                    type:'eeeee',
+                    time:"qwewewewrwe"
+                },
+                {
+                    id:3,
+                    account:'qwwww',
+                    name:'wwwww',
+                    type:'eeeee',
+                    time:"qwewewewrwe"
+                },
+                {
+                    id:4,
+                    account:'qwwww',
+                    name:'wwwww',
+                    type:'eeeee',
+                    time:"qwewewewrwe"
+                },
+                {
+                    id:5,
+                    account:'qwwww',
+                    name:'wwwww',
+                    type:'eeeee',
+                    time:"qwewewewrwe"
+                },
+            ],
+            header_arr:[
+                {
+                    prop:'account',
+                    label:'账号',
+                    minWidth:'25%',
+                    align:'left',
+                },
+                {
+                    prop:'name',
+                    label:'业务系统名称',
+                    minWidth:'25%',
+                    align:'left',
+                },
+                {
+                    prop:'type',
+                    label:'用户类型',
+                    minWidth:'25%',
+                    align:'center',
+                },
+                {
+                    prop:'time',
+                    label:'上次操作修改时间',
+                    minWidth:'25%',
+                    align:'center',
+                },
+                {
+                    label: "操作",
+                    type: "Button",
+                    width:'120px',
+                    align: "center",
+                    width: 140,
+                    btnList: [
+                        {
+                            type: "adelete",
+                            label: "删除",
+                        },
+                    ],
+                },
+            ]
+        };
+    },
+    watch: {
+
+    },
+    computed: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+        adelete(val){
+            this.tipsOptions= {
+                title:'',
+                message:"",
+                btnSubmitText: "",
+                btnCancelText: "",
+                position: "",
+            }
+            this.tipsOptions.message="是否删除该数据"
+            this.tipsOptions.confirmSubmit = () => {
+                console.log("deleteItem - "+JSON.stringify(val));
+                this.$refs.myConfirm.hideModel();
+            };
+            this.$refs.myConfirm.showModel();
+        },
+    },
+};
+</script>
+
+<style>
+.organtable .el-input__inner{
+    width: 240px;
+}
+.organtable .el-input{
+    width: 240px;
+}
+</style>
+<style scoped>
+.detail_contain{
+    width: 100%;
+    padding: 0 20px;
+    height: calc(100% - 84px);
+    margin-bottom: 20px;
+}
+.info_contain{
+    padding: 25px 20px;
+    background-color: #fff;
+    width: 100%;
+    box-shadow: 0px 3px 6px 0px 
+		#f4f7fc;
+	border-radius: 12px;
+}
+.now_page_title{
+    margin: 15px 0;
+    color: #898d9e;
+}
+.now_page_title span{
+    color: #242c43;
+}
+.organtable{
+    margin-top: 20px;
+    width: 100%;
+    height: calc(100% - 210px);
+    background-color: #fff;
+    box-shadow: 0px 3px 6px 0px 
+		#f4f7fc;
+	border-radius: 12px;
+    padding: 20px;
+    
+}
+.organtable p{
+    font-size: 16px;
+    color: #58617a;
+    height: 60px;
+    line-height: 60px;
+    border-bottom: 2px solid #f4f7fc;
+    margin-bottom: 10px;
+}
+.organtable p span{
+    display: inline-block;
+    width: 4px;
+	height: 16px;
+	background-color: #515fe7;
+	border-radius: 2px;
+    margin-right: 15px;
+    vertical-align: -3px;
+}
+.organtable .elinput{
+    float: right;
+}
+</style>
diff --git a/src/pages/authority/organizationedit.vue b/src/pages/authority/organizationedit.vue
new file mode 100644
index 0000000..2529984
--- /dev/null
+++ b/src/pages/authority/organizationedit.vue
@@ -0,0 +1,38 @@
+<template>
+    <div>
+        1111
+    </div>
+</template>
+
+<script>
+export default {
+    props: [],
+    components: {
+
+    },
+    data() {
+        return {
+
+        };
+    },
+    watch: {
+
+    },
+    computed: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    },
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/authority/users.vue b/src/pages/authority/users.vue
index 068f7bf..532c396 100644
--- a/src/pages/authority/users.vue
+++ b/src/pages/authority/users.vue
@@ -1,12 +1,39 @@
- <template>
-  <div></div>
+<template>
+    <div>
+
+    </div>
 </template>
 
 <script>
 export default {
-  methods: {}
+    props: [],
+    components: {
+
+    },
+    data() {
+        return {
+
+        };
+    },
+    watch: {
+
+    },
+    computed: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    },
 };
 </script>
 
 <style scoped>
+
 </style>
+
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 52704a5..41564f3 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -177,9 +177,32 @@ export default {
         ["服务基本信息", "接口详细信息", "服务运行状态", "服务规格"],
       ],
       service_header_arr: {
+        url:'',
         name: "",
-        first: [],
-        second: [],
+        first: [
+                {
+                    "name": "服务类型",
+                    "text": ""
+                },
+                {
+                    "name": "申请次数",
+                    "text": '',
+                },
+                {
+                    "name": "调用次数",
+                    "text": '',
+                },
+                {
+                    "name": "服务状态",
+                    "text": ""
+                }
+        ],
+        second: [
+          {
+            "name": "服务接口地址",
+            "text": ""
+          }
+        ],
         fixed: true,
       },
       now_service: 0,
@@ -456,7 +479,32 @@ export default {
           solt_name: "zd_code",
         },
       ],
-      list_arr: [],
+      list_arr: [
+            {
+                "title": "服务描述：",
+                "info": ""
+            },
+            {
+                "title": "服务领域：",
+                "info": ""
+            },
+            {
+                "title": "所属组织：",
+                "info": ""
+            },
+            {
+                "title": "开放程度：",
+                "info": ""
+            },
+            {
+                "title": "接口编码：",
+                "info": ""
+            },
+            {
+                "title": "注册发布时间：",
+                "info": ""
+            }
+      ],
     };
   },
   watch: {
@@ -490,12 +538,28 @@ export default {
     },
     getServiceInfo() {
       this.$http
-        .get("/static/servicedetail1.json")
+        .get("/apaas/service/v3/service/manager?service_id=10")
         .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);
+          console.log(data);
+          this.$set(this.service_header_arr, "name", data.name);
+          this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1);
+          this.$set(this.service_header_arr['first'][1], 'text', data.apply_num);
+          this.$set(this.service_header_arr['first'][2], 'text', data.request_count);
+          this.$set(this.service_header_arr['first'][3], 'text', data.state);
+          this.$set(this.service_header_arr['second'][0], "text", data.req_url);
+          this.$set(this.service_header_arr, "url", data.cover);
+          this.$set(this.list_arr[0], "info", data.descript);
+          this.$set(this.list_arr[1], "info", data.sectors);
+          this.$set(this.list_arr[2], "info", data.organization);
+          this.$set(this.list_arr[3], "info", data.data_service_type3);
+          this.$set(this.list_arr[4], "info", data.encode_method);
+          this.$set(this.list_arr[5], "info", data.create_time);
+          this.$set(this.servicead_arr[0], "info", data.req_type);
+          this.$set(this.servicead_arr[1], "info", data.req_query);
+          this.$set(this.servicead_arr[2], "info", data.create_time);
+          this.$set(this.servicead_arr[3], "info", data.create_time);
+          
         })
         .catch(function(response) {});
     },
diff --git a/src/router/index.js b/src/router/index.js
index c6307e6..9034bc5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -153,7 +153,7 @@ export default new Router({
               component: () => import("@/pages/service_shop/shopping_cart"),
             },
             {
-              path: "/shop/shop_car_apply", // 购物车页
+              path: "/shop/shop_car_apply", // 购物车服务申请页
               name: "shopCarApply",
               component: () => import("@/pages/service_shop/shop_car_apply"),
             },
@@ -228,6 +228,11 @@ export default new Router({
               name: "organization",
               component: () => import("@/pages/authority/organization"),
             },
+            {
+              path: "/authority/organizationdetail", // 组织管理页
+              name: "organizationdetail",
+              component: () => import("@/pages/authority/organizationdetail"),
+            },
             {
               path: "/authority/users", // 用户管理页
               name: "users",
-- 
2.26.0