Merge branch 'dev'

src/components/e-charts/multiple_circle.vue

@@ -126,7 +126,7 @@ export default {
           name: "",
           type: "pie",
           clockWise: false,
-          radius: [60, 63],
+          radius: [50, 53],
           center: ["50%", "46%"],
           hoverAnimation: false,
           avoidLabelOverlap: true,

src/components/service-info/service-info.vue

@@ -9,7 +9,7 @@
       <div class="main_container-left" v-if="data.cover">
         <img :src="data.cover" width="100%" v-if="data.type !== 'workflow'" />
         <workflows-view
-          :zoom="0.6"
+          :isShop="true"
           :id="parseInt(data.workflows_id)"
           :hideDetail="true"
           v-if="data.type == 'workflow'"
@@ -381,8 +381,8 @@ export default {
 }
 .main_container-left > .map_view {
   position: absolute;
-  right: 3px;
-  bottom: 3px;
+  right: 1px;
+  bottom: 2px;
 }
 .main_container-right {
   width: 896px;

src/components/work-flow/workflows-view.vue

 <template>
-  <div class="workflows-view" ref="flowContainer" :style="{ zoom: zoom, height: Number(max_height + 180) + 'px' }">
+  <div class="workflows-view" ref="flowContainer" :style="{ zoom: isShop ? maxParentHeight / Number(max_height + 180) : zoom, height: Number(max_height + 180) + 'px' }">
     <super-flow
       ref="superFlow"
       :node-list="nodeList"
@@ -80,6 +80,14 @@ export default {
       type: Number,
       default: 1,
     },
+    maxParentHeight: {
+      type: Number,
+      default: 200,
+    },
+    isShop: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {

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

@@ -49,7 +49,6 @@
                 class="block-radius-content"
                 :data="mult_data_state"
                 :show_center_data="false"
-                :bar_width="10"
               ></multiple-circle>
               <starlist
                 v-else
@@ -72,6 +71,15 @@
                 class="block-radius-content"
                 :data="mult_data"
                 :text="text"
+                :color="[
+                  '#27bfee',
+                  '#f56b4c',
+                  '#435290',
+                  '#597ec0',
+                  '#e56600',
+                  '#a5937b',
+                  '#8210c5',
+                ]"
               ></multiple-circle>
             </block-radius>
           </el-col>
@@ -741,7 +749,7 @@ export default {
                 data.score3 +
                 data.score2 +
                 data.score1;
-              console.log(this.starlistData, this.starlistTotal)
+              console.log(this.starlistData, this.starlistTotal);
             }
           }
         });

src/pages/workbench/component-center/process-management/designer/detail.vue

@@ -485,7 +485,7 @@ export default {
     },
     public1(item){
       this.dialogInfo.title = "提示";
-      this.dialogInfo.msg = `发布后流程后，流程将部署到工作区域并上架到服务超市，是否发布该流程？`;
+      this.dialogInfo.msg = `发布流程后，流程将部署到工作区域并上架到服务超市，是否发布该流程？`;
       this.dialogInfo.cancelText = "取消";
       this.dialogInfo.sunbmitText = "发布";
       this.dialogInfo.submit = () => {

src/pages/workbench/component-center/process-management/designer/index.vue

@@ -297,7 +297,7 @@ export default {
     },
     publishItem(item) {
       this.dialogInfo.title = "提示";
-      this.dialogInfo.msg = `发布后流程后，流程将部署到工作区域并上架到服务超市，是否发布该流程？`;
+      this.dialogInfo.msg = `发布流程后，流程将部署到工作区域并上架到服务超市，是否发布该流程？`;
       this.dialogInfo.cancelText = "取消";
       this.dialogInfo.sunbmitText = "发布";
       this.dialogInfo.submit = () => {

src/pages/workbench/workPlace.vue

@@ -1628,7 +1628,7 @@ export default {
         }
       };
       var data = [];
-      var color = ["#515fe7", "#36a5ec", "#da9f2a", "#23b2a7", "#d46002"];
+      var color = ["#515fe7", "#36a5ec", "#da9f2a", "#23b2a7", "#d46002", "#44a072"];
       var legendarr = [];
       var temp2_data = 0;
       data_val.forEach(e => {
@@ -1661,8 +1661,8 @@ export default {
           name: "",
           type: "pie",
           clockWise: false,
-          radius: [52, 54],
-          center: ["51%", "45%"],
+          radius: [44, 46],
+          center: ["50%", "45%"],
           z:5,
           hoverAnimation: false,
           itemStyle: {
@@ -1693,8 +1693,8 @@ export default {
         {
         type:'pie',
         z:4,
-        center:['51%','45%'],
-        radius:['43%','63%'],
+        center:['50%','45%'],
+        radius:['36%','54%'],
         hoverAnimation:false,
         avoidLabelOverlap: false,
         label: {

src/pages/workbench/yygl/app_debugger.vue

@@ -252,8 +252,9 @@ export default {
       
     },
     get_list_pod(){
+      console.log(this.pod_name);
         this.$http
-        .get(`/apaas/hubApi/cloud/podList/${this.formInline.area}?itemsPerPage=${this.pageSize}&page=${this.currentPage}&label=${this.formInline.name}&filterBy=${this.pod_name}`)
+        .get(`/apaas/hubApi/cloud/podList/${this.formInline.area}?itemsPerPage=${this.pageSize}&page=${this.currentPage}&label=${this.formInline.name}&filterBy=${this.pod_name != "" ? "name," : ""}${this.pod_name}`)
         .then(response => {
           if(response.data.success){
             this.listTotal = response.data.data.listMeta.totalItems