Merge branch 'ldx' into dev

src/components/menu.vue

 <template>
   <div class="menu">
-    <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
+    <img @click="gotopage('/services_shop')" src="../assets/imgs/home_img_logo.png" alt class="logo" />
     <div style="float:right;cursor: pointer;position:relative;" class="user_hover">
       <span
         v-if="userInfo.user_name && userInfo.user_name != ''"
@@ -94,7 +94,7 @@ export default {
       user_arr: [
         { name: "个人档案", path: "/user/user_info" },
         { name: "消息通知", path: "/user/message" },
-        { name: "收银中心", path: "" },
+        { name: "订单管理", path: "/user/order_list" },
         { name: "关于BD-aPaaS", path: "" },
         { name: "退出登录", path: "logout" }
       ],
@@ -209,6 +209,7 @@ export default {
 .logo {
   float: left;
   margin: 30px 0 0 40px;
+  cursor: pointer;
 }
 .user {
   float: right;

src/components/service-list/service_list.vue

@@ -216,7 +216,12 @@ export default {
     ],
     page: 1,
     limit: 10,
-    couldTwice: false
+    couldTwice: false,
+    refresh_app_1: false,
+    refresh_app_2: false,
+    refresh_app_3: false,
+    time_app: null,
+    times: null
   }),
   mounted() {},
   watch: {
@@ -327,6 +332,12 @@ export default {
         this.getAppType();
         this.getAppOrg();
         this.getShopList();
+        this.time_app = setInterval(() => {
+          if (this.refresh_app_1 && this.refresh_app_2 && this.refresh_app_3) {
+            this.judgeHeight();
+            clearInterval(this.time_app)
+          }
+        }, 50);
       } else {
         let query = {
           type: this.urlFilter
@@ -356,6 +367,7 @@ export default {
     judgeHeight() {
       let list = this.filterLists;
       for (let i = 0; i < list.length; i++) {
+        if (list[i].childDomains.length != 0) {
           let offHeight = document.getElementById(list[i].id).offsetHeight;
           if (offHeight > 60) {
             list[i].showOpen = true;
@@ -364,6 +376,7 @@ export default {
             list[i].showOpen = false;
           }
         }
+      }
       this.$set((this.filterLists = list));
     },
     clickOpen(index) {
@@ -459,6 +472,7 @@ export default {
       this.$api.serviceShop.getAppArea().then(response => {
         if (response.data.success == 1) {
           this.filterLists[1].childDomains = response.data.data;
+          this.refresh_app_1 = true;
         } else {
           console.log(response.data.errMsg);
         }
@@ -468,6 +482,7 @@ export default {
       this.$api.serviceShop.getAppType().then(response => {
         if (response.data.success == 1) {
           this.filterLists[2].childDomains = response.data.data;
+          this.refresh_app_2 = true;
         } else {
           console.log(response.data.errMsg);
         }
@@ -477,6 +492,7 @@ export default {
       this.$api.serviceShop.getAppOrg().then(response => {
         if (response.data.success == 1) {
           this.filterLists[3].childDomains = response.data.data;
+          this.refresh_app_3 = true;
         } else {
           console.log(response.data.errMsg);
         }

src/components/shop-card.vue

 <template>
-  <div class="shop_card">
-    <div class="shop_car-img" v-if="showImg" @click="intoDetail">
+  <div class="shop_card" @click="intoDetail">
+    <div class="shop_car-img" v-if="showImg">
       <img :src="data.cover" width="100%" />
     </div>
     <div class="shop_card-top">
-      <p
-        class="shop_card-title text_clip_2"
-        v-text="data.name"
-        :title="data.name"
-        @click="intoDetail"
-      ></p>
+      <p class="shop_card-title text_clip_2" v-text="data.name" :title="data.name"></p>
       <p class="shop_card-text under_text">
         <span class="text_clip" v-text="data.department_name" :title="data.department_name"></span>
         <span>
@@ -87,6 +82,7 @@ export default {
   border: 1px solid #ededed;
   border-radius: 10px;
   box-sizing: border-box;
+  cursor: pointer;
 }
 .shop_car-img {
   cursor: pointer;

src/components/topology.vue

@@ -262,7 +262,7 @@ export default {
             type: "image",
             img: "./static/topology_ic_zonghefw.svg",
             size: [15, 15],
-            label: "综合服务"
+            label: "综合应用"
           }
         ]
       };

src/pages/example/example_table.vue

@@ -161,22 +161,22 @@ export default {
       {
         name: "服务类型",
         prop: "fwlx",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       },
       {
         name: "服务领域",
         prop: "fwly",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       },
       {
         name: "开放程度",
         prop: "kfcd",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       },
       {
         name: "服务状态",
         prop: "fwzt",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       }
     ],
     params: {

src/pages/service_shop/services_shop.vue

@@ -28,7 +28,7 @@
     <!-- 热门数据 -->
     <shop-list
       name="热门数据"
-      to="/shop/data_service_list"
+      to="/shop/data_service_list/5"
       detail-path="/shop/sjfwDetail/"
       :data="hot_datas"
       :showImg="false"
@@ -37,7 +37,7 @@
     <!-- 精品地图 -->
     <shop-list
       name="精品地图"
-      to="/shop/space_time_service_list"
+      to="/shop/space_time_service_list/6"
       detail-path="/shop/skfwDetail/"
       :data="map_datas"
       :showImg="true"
@@ -46,7 +46,7 @@
     <!-- 综合应用 -->
     <shop-list
       name="综合应用"
-      to="/shop/comprehensive_app_list"
+      to="/shop/comprehensive_app_list/21"
       detail-path="/shop/zhfwDetail/"
       :data="comprehensive_datas"
       :showImg="true"

src/pages/service_shop/shop_list.vue

@@ -58,7 +58,7 @@ export default {
           this.filterNames = [];
           break;
         case "comprehensive_app_list":
-          this.name = "综合服务";
+          this.name = "综合应用";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
           this.filterNames = ["服务类型", "应用领域", "服务来源组织"];

src/pages/service_shop/zhfwDetail.vue

@@ -4,7 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
         <el-breadcrumb-item to="/shop/comprehensive_app_list/11">
-          综合服务
+          综合应用
         </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>

src/pages/workbench/fwgl/cloud-detail.vue

@@ -21,11 +21,17 @@
               <span class="head_right_msg_item">{{ cloudData.phone }}</span>
               资源申请状态：
               <span
-                v-if="cloudData.first_level == 0"
-                class="head_right_msg_item apply_success"
+                v-if="apply_type == 0 && approve_state == 0 || apply_type != 0 && approve_update_state == 0"
+                class="head_right_msg_item apply_wait"
               >待审批</span>
-              <span v-if="cloudData.first_level == 0" class="head_right_msg_item apply_success">待审批</span>
-              <span v-if="cloudData.first_level == 0" class="head_right_msg_item apply_success">待审批</span>
+              <span
+                v-if="apply_type == 0 && approve_state == 1 || apply_type != 0 && approve_update_state == 1"
+                class="head_right_msg_item apply_success"
+              >审批通过</span>
+              <span
+                v-if="apply_type == 0 && approve_state == -1 || apply_type != 0 && approve_update_state == -1"
+                class="head_right_msg_item apply_refuse"
+              >审批未通过</span>
             </p>
             <p class="head_right_msg_p">
               业务系统名：
@@ -47,25 +53,25 @@
             <div class="params_block_item">
               <div class="params_block_item_in">
                 <span class="params_block_item_title">CPU：</span>
-                <span class="params_block_item_val">{{ orderDetail.cpu }}核</span>
+                <span class="params_block_item_val">{{ cloudDteail.cpu }}核</span>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">内存：</span>
-                <span class="params_block_item_val">{{ orderDetail.memory }}GB</span>
+                <span class="params_block_item_val">{{ cloudDteail.memory }}GB</span>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">容器组：</span>
-                <span class="params_block_item_val">{{ orderDetail.memory }}个</span>
+                <span class="params_block_item_val">{{ cloudDteail.containers }}个</span>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">数据盘：</span>
                 <div class="params_block_item_val">
-                  <div>{{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB</div>
+                  <div>{{ cloudDteail.disk}}</div>
                 </div>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">申请时长：</span>
-                <span class="params_block_item_val">{{ orderDetail.memory }}核</span>
+                <span class="params_block_item_val">{{ cloudDteail.apply_duration_time }}</span>
               </div>
             </div>
             <span class="params_block_title margin_top_20">单个容器组规格：</span>
@@ -73,15 +79,15 @@
               <div class="params_block_item_in">
                 <span class="params_block_item_title">CPU：</span>
                 <div class="params_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ orderDetail.one_cpu_max }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ orderDetail.one_cpu_min }}核</span>
+                  <span class="val_has_2">最高&nbsp;{{ cloudDteail.one_cpu_max }}核</span>
+                  <span class="val_has_2">默认&nbsp;{{ cloudDteail.one_cpu_min }}核</span>
                 </div>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">CPU：</span>
                 <div class="params_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ orderDetail.one_memory_max }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ orderDetail.one_memory_min }}核</span>
+                  <span class="val_has_2">最高&nbsp;{{ cloudDteail.one_memory_max }}核</span>
+                  <span class="val_has_2">默认&nbsp;{{ cloudDteail.one_memory_min }}核</span>
                 </div>
               </div>
             </div>
@@ -91,25 +97,25 @@
             <div class="params_block_item">
               <div class="params_block_item_in">
                 <span class="params_block_item_title">CPU：</span>
-                <span class="params_block_item_val">{{ orderDetail.cpu }}核</span>
+                <span class="params_block_item_val">{{ cloudDetailNew.adjust_cpu }}核</span>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">内存：</span>
-                <span class="params_block_item_val">{{ orderDetail.memory }}GB</span>
+                <span class="params_block_item_val">{{ cloudDetailNew.adjust_memory }}GB</span>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">容器组：</span>
-                <span class="params_block_item_val">{{ orderDetail.memory }}核</span>
+                <span class="params_block_item_val">{{ cloudDetailNew.adjust_containers }}个</span>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">数据盘：</span>
                 <div class="params_block_item_val">
-                  <div>{{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB</div>
+                  <div>{{ cloudDetailNew.adjust_disk}}</div>
                 </div>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">续期时长：</span>
-                <span class="params_block_item_val">{{ orderDetail.memory }}核</span>
+                <span class="params_block_item_val">{{ cloudDetailNew.adjust_duration_time }}核</span>
               </div>
             </div>
             <span class="params_block_title margin_top_20">单个容器组规格：</span>
@@ -117,15 +123,15 @@
               <div class="params_block_item_in">
                 <span class="params_block_item_title">CPU：</span>
                 <div class="params_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ orderDetail.one_cpu_max }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ orderDetail.one_cpu_min }}核</span>
+                  <span class="val_has_2">最高&nbsp;{{ cloudDetailNew.adjust_one_cpu_max }}核</span>
+                  <span class="val_has_2">默认&nbsp;{{ cloudDetailNew.adjust_one_cpu_min }}核</span>
                 </div>
               </div>
               <div class="params_block_item_in">
                 <span class="params_block_item_title">CPU：</span>
                 <div class="params_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ orderDetail.one_memory_max }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ orderDetail.one_memory_min }}核</span>
+                  <span class="val_has_2">最高&nbsp;{{ cloudDetailNew.adjust_one_memory_max }}核</span>
+                  <span class="val_has_2">默认&nbsp;{{ cloudDetailNew.adjust_one_memory_min }}核</span>
                 </div>
               </div>
             </div>
@@ -210,11 +216,11 @@
       </div>
       <div v-if="activeName == '1'" class="my_params">
         <InfoList :list_arr="list_arr_my" class="detail_s_val">
-          <div
-            ref="ApplicationStatus"
-            slot="ApplicationStatus"
-            class="params_apply_desc"
-          >{{ applicationStatus }}</div>
+          <div ref="ApplicationStatus" slot="ApplicationStatus" class="params_apply_desc">
+            <span v-if="super_status == 0" class="head_right_msg_item apply_wait">待审批</span>
+            <span v-if="super_status == 1" class="head_right_msg_item apply_success">审批通过</span>
+            <span v-if="super_status == -1" class="head_right_msg_item apply_refuse">审批未通过</span>
+          </div>
         </InfoList>
       </div>
       <div class="btn_footer">
@@ -246,9 +252,10 @@ export default {
   },
   data() {
     return {
+      id: "",
+      userId: "",
       url:
         "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-      orderDetail: {},
       helper,
       list_arr: [
         {
@@ -322,7 +329,7 @@ export default {
           solt_name: "ApplicationStatus"
         }
       ],
-      applicationStatus: "申请通过",
+      super_status: 0,
       desc:
         "工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：",
       resourceOverview:
@@ -409,9 +416,34 @@ export default {
         }
       ],
       now_user: "",
-      activeName: "0",
+      activeName: null,
       tabShow: true,
-      cloudData: {}
+      cloudData: {},
+      cloudDteail: {
+        containers: "",
+        cpu: "",
+        disk: "",
+        memory: "",
+        apply_duration_time: "",
+        one_cpu_max: "",
+        one_cpu_min: "",
+        one_memory_max: "",
+        one_memory_min: ""
+      },
+      cloudDetailNew: {
+        adjust_containers: "",
+        adjust_cpu: "",
+        adjust_disk: "",
+        adjust_memory: "",
+        adjust_duration_time: "",
+        adjust_one_cpu_max: "",
+        adjust_one_cpu_min: "",
+        adjust_one_memory_max: "",
+        adjust_one_memory_min: ""
+      },
+      apply_type: 0,
+      approve_state: 1,
+      approve_update_state: 1
     };
   },
   watch: {},
@@ -427,8 +459,6 @@ export default {
     }
   },
   mounted() {
-    this.getUrl();
-    this.setListWithRole();
     this.getCloudDetail();
   },
   methods: {
@@ -437,7 +467,24 @@ export default {
     },
     download() {},
     adjustment() {},
-    distribution() {},
+    distribution() {
+      this.$api.workbench
+        .setCloudAllocation({ id: this.id, userId: this.user_id })
+        .then(response => {
+          if (response.data.success == 1) {
+            this.$message({
+              message: "分配成功",
+              type: "success"
+            });
+            this.$router.push(this.getUrl());
+          } else {
+            this.$message({
+              message: "分配失败",
+              type: "error"
+            });
+          }
+        });
+    },
     submit() {},
     refuse() {},
     getCurrentUser() {
@@ -460,12 +507,13 @@ export default {
         let index = this.list_arr.findIndex(
           item => item.title == "资源使用情况："
         );
-        // this.list_arr.splice(index);
-        // this.tabShow = false;
+        this.list_arr.splice(index);
+        this.tabShow = false;
       } else if (this.now_user == 1) {
         this.tabShow = true;
       } else if (this.now_user == 2) {
       }
+      this.activeName = "0";
     },
     getCloudDetail() {
       let query = {
@@ -475,6 +523,7 @@ export default {
       };
       this.$api.workbench.getCloudDetail(query).then(response => {
         let data = response.data.data;
+        console.log(data);
         this.list_arr[3].info = helper.downloadFileFormat(data.apply_file); //  application file name
         this.list_arr[3].url = data.apply_file; //  application file url
         this.list_arr[6].info = data.bgn_time; //  get time
@@ -482,9 +531,10 @@ export default {
         this.list_arr[8].info = data.end_time; //  maturity time
         this.list_arr_my[0].info = data.first_level_time; //  submit application time
         this.list_arr_my[1].info = data.second_level_time; //  super get time
-        this.applicationStatus = data.second_leve; //  super status
+        this.super_status = data.second_leve; //  super status
         this.desc = data.workplacedesc; //  workplace description
         let count = data.cloud_resource_count; //  resource usage
+        if (count) {
           this.data1.total = count.cpu_total;
           this.data1.remaining = count.cpu_total - count.cpu_use;
           this.data1.data = Math.round((count.cpu_total / count.cpu_use) * 100);
@@ -495,13 +545,35 @@ export default {
           );
           this.data3.total = count.disk_total;
           this.data3.remaining = count.disk_total - count.disk_use;
-        this.data3.data = Math.round((count.disk_total / count.disk_use) * 100);
+          this.data3.data = Math.round(
+            (count.disk_total / count.disk_use) * 100
+          );
           this.data4.total = count.containers_total;
           this.data4.remaining = count.containers_total - count.containers_use;
           this.data4.data = Math.round(
             (count.containers_total / count.containers_use) * 100
           );
+        }
         // this.appList =
+        this.cloudDteail.containers = data.containers;
+        this.cloudDteail.cpu = data.cpu;
+        this.cloudDteail.disk = data.disk;
+        this.cloudDteail.memory = data.memory;
+        this.cloudDteail.apply_duration_time = data.apply_duration_time;
+        this.cloudDteail.one_cpu_max = data.one_cpu_max;
+        this.cloudDteail.one_cpu_min = data.one_cpu_min;
+        this.cloudDteail.one_memory_max = data.one_memory_max;
+        this.cloudDteail.one_memory_min = data.one_memory_min;
+        this.cloudDetailNew.adjust_containers = data.adjust_containers;
+        this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
+        this.cloudDetailNew.adjust_disk = data.adjust_disk;
+        this.cloudDetailNew.adjust_memory = data.adjust_memory;
+        this.cloudDteail.adjust_duration_time = data.adjust_duration_time;
+        this.cloudDteail.adjust_one_cpu_max = data.adjust_one_cpu_max;
+        this.cloudDteail.adjust_one_cpu_min = data.adjust_one_cpu_min;
+        this.cloudDteail.adjust_one_memory_max = data.adjust_one_memory_max;
+        this.cloudDteail.adjust_one_memory_min = data.adjust_one_memory_min;
+        this.setListWithRole();
       });
     }
   }
@@ -557,6 +629,12 @@ export default {
 .apply_success {
   color: #515fe7;
 }
+.apply_wait {
+  color: #ef9433;
+}
+.apply_refuse {
+  color: #e15260;
+}
 .cloud_params .service_title {
   padding: 0 10px;
 }

src/pages/workbench/fwgl/serviceDetail.vue

@@ -378,7 +378,7 @@ export default {
         "时空服务",
         "视频服务",
         "感知服务",
-        "综合服务"
+        "综合应用"
       ],
       scrvice_area_arr: [
         "经济建设",

src/router/index.js

@@ -206,7 +206,7 @@ export default new Router({
           path: "/shop/zhfwDetail/:id",
           name: "zhfwDetail",
           component: () => import("@/pages/service_shop/zhfwDetail"),
-        }, // 服务超市 - 综合服务详情
+        }, // 服务超市 - 综合应用详情
         {
           path: "/shop/yysdDetail/:id",
           name: "yysdDetail",

static/serviceBaseInfo.json

@@ -89,7 +89,7 @@
     "publishTime": "2020-03-12 18:31:12",
     "updatedTime": "2020-03-12 18:31:12",
     "dataField": "经济建设",
-    "serviceType": "综合服务",
+    "serviceType": "综合应用",
     "resourceSummary": "提供视频监控的空间分布展示和视频监控直播的服务，MOUMOU监控服务和直播服务的新服务。",
     "specifications": [
       {
@@ -125,7 +125,7 @@
     "providedBy": "北京比格数据",
     "publishTime": "2020-03-12 18:31:12",
     "acquireCount": "9999",
-    "serviceType": "综合服务",
+    "serviceType": "综合应用",
     "dataField": "经济建设",
     "specifications": [
       {

static/workpalce.json

@@ -85,7 +85,7 @@
                 "value": 50
               },
               {
-                "name": "综合服务",
+                "name": "综合应用",
                 "value": 0
               }
         ],