Merge branch 'ldx' into dev

src/components/upload_file.vue → src/components/general/upload_file.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import cropper from "@/components/cropper";
+import cropper from "@/components/general/cropper";
 export default {
   components: {
     cropper

src/components/general/wave_icon.vue

+<template>
+  <div class="icon-main icon_act">
+    <svg-icon icon-class="fwgl_ic_arrow" class="svg_out"></svg-icon>
+    <svg-icon v-if="state == '运行中'" icon-class="fwgl_ic_operation" class="svg_in"></svg-icon>
+    <svg-icon v-else-if="state == '等待中'" icon-class="fwgl_ic_stop" class="svg_in"></svg-icon>
+    <svg-icon v-else-if="state == '停止'" icon-class="fwgl_ic_wait" class="svg_in"></svg-icon>
+    <svg-icon v-else icon-class="fwgl_ic_bufenguzhang" class="svg_in"></svg-icon>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    state: {
+      type: String,
+      default: ""
+    }
+  },
+  data() {
+    return {};
+  },
+  components: {},
+  mounted: function() {
+    // this.init();
+  },
+  computed: {},
+  methods: {}
+};
+</script>
+
+<style scoped>
+.icon-main {
+  /* margin-top: 100px; */
+  width: 60px;
+}
+.icon_act {
+  /* margin-left: 50px; */
+  position: relative;
+}
+.svg_out {
+  font-size: 60px;
+  animation: out_t;
+  animation-duration: 2s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+}
+.svg_in {
+  font-size: 24px;
+  position: absolute;
+  top: 18px;
+  left: 18px;
+}
+@keyframes out_t {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+</style>
\ No newline at end of file

src/components/menu.vue

@@ -78,19 +78,19 @@
         v-for="(item, index) in menu_arr"
         :key="index + 200"
         class="menu_box user_hover"
-        @click="navAction(index, item.visit_url)"
-        :style="{ color: now_menu == index ? '#fff' : '' }"
+        @click="navAction(item.visit_url)"
+        :style="{ color: now_menu == item.visit_url ? '#fff' : '' }"
       >
         {{ item.menu_name }}
         <div class="user_menu" v-if="item.Child && item.Child.length" style="left: 30px;">
           <div
             v-for="(v, indexs) in item.Child"
             :key="indexs + 700"
-            @click.stop="gotoChildPage(v, index)"
+            @click.stop="gotoChildPage(v, item.visit_url)"
           >{{ v.menu_name }}</div>
         </div>
         <div class="sj" v-if="item.Child && item.Child.length" style="left: 60px;"></div>
-        <div class="bottom_show" v-if="now_menu == index"></div>
+        <div class="bottom_show" v-if="now_menu == item.visit_url"></div>
       </div>
     </div>
   </div>
@@ -101,7 +101,7 @@ export default {
   data() {
     return {
       menu_arr: [],
-      now_menu: 2,
+      now_menu: "",
       user_arr: [
         { name: "个人档案", path: "/user/user_info" },
         { name: "消息通知", path: "/user/message" },
@@ -155,23 +155,23 @@ export default {
       // at here, we will goto shopping cart
       this.$router.push({ name: "shoppingCart" });
     },
-    navAction(index, path) {
+    navAction(path) {
       this.$router.push(path);
-      this.now_menu = index;
-      window.sessionStorage.setItem("menuIndex", index);
+      this.now_menu = path;
+      window.sessionStorage.setItem("menuVisitUrl", path);
     },
     gotoChildPage(v, parent) {
       if (v.visit_url) {
         if (v.visit_url == "/fwgl/" || v.visit_url == "/yygl/") {
           this.$router.push(v.visit_url + this.$store.getters.level);
-        } else if (parent == 2) {
+        } else if (parent == "/services_shop") {
           this.$router.push(v.visit_url);
           this.$store.commit("serviceShopMenuAct", v.visit_url);
         } else {
           this.$router.push(v.visit_url);
         }
         this.now_menu = parent;
-        window.sessionStorage.setItem("menuIndex", parent);
+        window.sessionStorage.setItem("menuVisitUrl", parent);
       }
     },
     getList() {
@@ -189,9 +189,9 @@ export default {
       });
     },
     getMenuIndex() {
-      let index = window.sessionStorage.getItem("menuIndex");
-      console.log(index);
-      this.now_menu = index ? index : 2;
+      let visit_url = window.sessionStorage.getItem("menuVisitUrl");
+      console.log(visit_url);
+      this.now_menu = visit_url ? visit_url : "/services_shop";
     },
     getNowMenu() {
       this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {

src/components/service-list/service_list.vue

@@ -141,7 +141,7 @@
 
 <script>
 import CommodityList from "@/components/service-list/commodity-list.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     "commodity-list": CommodityList,

src/components/shop-car-apply/apply_service_state.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import tableUm from "@/components/table/table-um";
 export default {
   props: ["data", "idx"],

src/components/shop-cloud/shop-cloud.vue

@@ -699,8 +699,8 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
-import uploadFile from "@/components/upload_file";
+import BlockRadius from "@/components/general/block-radius";
+import uploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,

src/icons/svg/fwgl_ic_bufenguzhang.svg

+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.02 22.31"><defs><style>.cls-1{fill:#ff5160;}.cls-2{fill:#ffd5d5;}</style></defs><title>ic_画板 21</title><path class="cls-1" d="M4,21.31a3,3,0,0,1-3-3V4A3,3,0,0,1,5.63,1.49l11,7.15a3,3,0,0,1,0,5l-11,7.15A3,3,0,0,1,4,21.31Z"/><path class="cls-2" d="M4,2a2,2,0,0,1,1.08.33l11,7.15a2,2,0,0,1,0,3.36L5.09,20A2,2,0,0,1,4,20.31a2,2,0,0,1-2-2V4A2,2,0,0,1,4,2M4,0A4,4,0,0,0,0,4v14.3a4,4,0,0,0,6.18,3.36l11-7.15a4,4,0,0,0,0-6.71L6.18.65A4,4,0,0,0,4,0Z"/></svg>
\ No newline at end of file

src/icons/svg/fwgl_ic_operation.svg

+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.02 22.31"><defs><style>.cls-1{fill:#8390ee;}.cls-2{fill:#c3caf8;}</style></defs><title>ic_画板 5</title><path class="cls-1" d="M4,21.31a3,3,0,0,1-3-3V4A3,3,0,0,1,5.63,1.49l11,7.15a3,3,0,0,1,0,5l-11,7.15A3,3,0,0,1,4,21.31Z"/><path class="cls-2" d="M4,2a2,2,0,0,1,1.08.33l11,7.15a2,2,0,0,1,0,3.36L5.09,20A2,2,0,0,1,4,20.31a2,2,0,0,1-2-2V4A2,2,0,0,1,4,2M4,0A4,4,0,0,0,0,4v14.3a4,4,0,0,0,6.18,3.36l11-7.15a4,4,0,0,0,0-6.71L6.18.65A4,4,0,0,0,4,0Z"/></svg>
\ No newline at end of file

src/icons/svg/fwgl_ic_stop.svg

+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><defs><style>.cls-1{fill:#8390ee;}.cls-2{fill:#c3caf8;}</style></defs><title>ic_画板 20</title><rect class="cls-1" x="1" y="1" width="20" height="20" rx="3" ry="3"/><path class="cls-2" d="M18,22H4a4,4,0,0,1-4-4V4A4,4,0,0,1,4,0H18a4,4,0,0,1,4,4V18A4,4,0,0,1,18,22ZM4,2A2,2,0,0,0,2,4V18a2,2,0,0,0,2,2H18a2,2,0,0,0,2-2V4a2,2,0,0,0-2-2Z"/></svg>
\ No newline at end of file

src/icons/svg/fwgl_ic_wait.svg

+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32.04 9"><defs><style>.cls-1{fill:#8390ee;}.cls-2{fill:#c3caf8;}</style></defs><title>ic_画板 4</title><circle class="cls-1" cx="4.5" cy="4.5" r="3.5"/><path class="cls-2" d="M4.5,2A2.5,2.5,0,1,1,2,4.5,2.5,2.5,0,0,1,4.5,2m0-2A4.5,4.5,0,1,0,9,4.5,4.51,4.51,0,0,0,4.5,0Z"/><path class="cls-1" d="M16,8a3.5,3.5,0,0,1,0-7,3.5,3.5,0,0,1,0,7Z"/><path class="cls-2" d="M16,2a2.5,2.5,0,1,1-2.29,1.5A2.49,2.49,0,0,1,16,2m0-2h0a4.5,4.5,0,1,0,1.79.37A4.5,4.5,0,0,0,16,0Z"/><path class="cls-1" d="M27.54,8a3.5,3.5,0,0,1,0-7,3.5,3.5,0,0,1,0,7Z"/><path class="cls-2" d="M27.54,2a2.5,2.5,0,1,1-2.29,1.5A2.49,2.49,0,0,1,27.54,2m0-2h0a4.5,4.5,0,1,0,1.79.37A4.5,4.5,0,0,0,27.54,0Z"/></svg>
\ No newline at end of file

src/icons/svg/ic_2.svg

-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 819.2 716.8"><title>ic_画板 2</title><path d="M759.36,283.6C725,121.68,581.84,0,409.6,0,303.36,0,208.08,46.32,142.48,119.84a354.83,354.83,0,0,0-24.72,31c-2.24,3.12-15.36,15.52-15.36,28.4,0,14.16,11.44,25.12,25.6,25.6,16.8.56,24.72-14.4,27.52-18.48C210.72,104.88,303.76,51.2,409.6,51.2c146,0,267.68,102.08,298.88,238.64a76.51,76.51,0,1,0,50.88-6.24ZM742.4,384A25.6,25.6,0,1,1,768,358.4,25.57,25.57,0,0,1,742.4,384Z"/><path d="M691.2,512a25.52,25.52,0,0,0-18.08,7.52s-8,9-11.52,14c-55.44,79.76-147.52,132.08-252,132.08-146,0-267.92-101.92-299.2-238.48A76.57,76.57,0,1,0,59,433C93.36,595.12,237.2,716.8,409.6,716.8c119.44,0,225-58.56,290.08-148.4,2.8-3.84,12.16-15.76,13.6-18.16a24.21,24.21,0,0,0,3.52-12.64A25.58,25.58,0,0,0,691.2,512ZM76.8,384a25.6,25.6,0,1,1,25.6-25.6A25.58,25.58,0,0,1,76.8,384Z"/></svg>
\ No newline at end of file

src/icons/svg/ic_3.svg

-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 255.98 358.35"><title>ic_画板 3</title><path d="M247.44,150.43a37.52,37.52,0,0,0-9.76-11L72.24,9.39C62.4,1.55,50.48-1.57,38.48.75c-12,2-22.48,9-29.76,19.6A49.83,49.83,0,0,0,0,49.31V309.39a49.61,49.61,0,0,0,13.44,34.48c8.72,9.36,19.92,14.48,31.92,14.48a40.69,40.69,0,0,0,26.48-9.44L237.28,219a49.72,49.72,0,0,0,18.16-32.16A53.05,53.05,0,0,0,247.44,150.43Z"/></svg>
\ No newline at end of file

src/pages/authority/organization/organizationedit.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import { getRole, formatDateTime_date } from "@/utils/common";
 export default {
   props: {},

src/pages/authority/user/organizationuser.vue

@@ -166,7 +166,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import { getRole, formatDateTime_date } from "@/utils/common";
 import { mapGetters, mapState } from "vuex";
 export default {

src/pages/data-analysis/my-service.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import Dashboard from "@/components/e-charts/dashboard";
 export default {
   components: {

src/pages/example/example_code.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 export default {
   data() {
     return {};

src/pages/example/example_com_list.vue

@@ -10,7 +10,7 @@
 <script>
 // @ is an alias to /src
 import CommodityList from "@/components/service-list/commodity-list.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     "commodity-list": CommodityList,

src/pages/example/example_commodity.vue

@@ -11,7 +11,7 @@
 <script>
 // @ is an alias to /src
 import Commodity from "@/components/service-list/commodity.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     Commodity,

src/pages/example/example_icon.vue

 <template>
+  <div class="icon_background">
     <div class="icon-main icon_act">
-    <svg-icon icon-class="ic_2" class="svg_out"></svg-icon>
-    <svg-icon icon-class="ic_3" class="svg_in"></svg-icon>
+      <svg-icon icon-class="fwgl_ic_arrow" class="svg_out"></svg-icon>
+      <svg-icon icon-class="fwgl_ic_bufenguzhang" class="svg_in"></svg-icon>
+    </div>
   </div>
 </template>
 
@@ -20,6 +22,9 @@ export default {
 </script>
 
 <style scoped>
+.icon_background {
+  padding-top: 300px;
+}
 .icon-main {
   /* margin-top: 100px; */
   width: 60px;

src/pages/example/example_upload.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 export default {
   data() {
     return {

src/pages/service_shop/service_application_successfully.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     BlockRadius

src/pages/user/message.vue

@@ -25,7 +25,7 @@
 
 <script>
 import CesTable from "@/components/table/table-um";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     CesTable,

src/pages/user/order/order_detail.vue

@@ -229,7 +229,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import ProcessCard from "@/components/process-card";
 import TableUm from "@/components/table/table-um";
 import InfoList from "@/components/infoList";

src/pages/user/user_info.vue

@@ -176,8 +176,8 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
-import UploadFile from "@/components/upload_file";
+import BlockRadius from "@/components/general/block-radius";
+import UploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,

src/pages/workbench/app_build.vue

@@ -280,7 +280,7 @@
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
 import apassTable from "@/components/apass-table";
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import apassDialog from "@/components/apass-dialog";
 
 export default {

src/pages/workbench/fwgl/serviceEdit.vue

@@ -146,7 +146,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
 export default {

src/pages/workbench/fwzc_fwcs.vue

@@ -350,10 +350,10 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import CesTable from "@/components/table/table-um";
-import Codes from "@/components/codes";
-import uploadFile from "@/components/upload_file";
+import Codes from "@/components/general/codes";
+import uploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,

src/pages/workbench/yygl/app_detail.vue

@@ -152,7 +152,7 @@ import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import serviceTabComments from '@/components/service-tabs/service-tab-comments'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'

src/pages/workbench/yygl/app_edit.vue

@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
 export default {

src/pages/workbench/yygl/deployment.vue

@@ -226,7 +226,7 @@
 <script>
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 import yaml from "js-yaml";
 var checkNumber = (rule, value, callback) => {
   if (!value) {

src/request/api/workbench.js

@@ -18,6 +18,15 @@ const workbench = {
     getServiceTypeList() {
         return axios.get(`/apaas/service/v3/service/manager/servtype`)
     },
+
+    // get application introduction
+    getAppIntroduction(params) {
+        return axios.get(`/apaas/hubApi/market/app/detail/${params.app_id}?deploy_id=${params.deploy_id}`)
+    },
+    // get application params
+    getAppParams(params) {
+        return axios.get(`/apaas/hubApi/market/values/${params.app_id}`)
+    },
 }
 
 export default workbench;

src/router/index.js

@@ -92,7 +92,7 @@ export default new Router({
               component: () => import("@/pages/workbench/yygl/app_edit"),
             },
             {
-              path: "/yygl/:level/:type/deploydetail/:id", // 我部署的应用详情
+              path: "/yygl/:level/:type/deploydetail/:app_id/:deploy_id", // 我部署的应用详情
               name: "deploy_app_detail",
               component: () =>
                 import("@/pages/workbench/yygl/deploy_app_detail"),