diff --git a/package.json b/package.json
index 6742000703b3e0663813c130f0971158661bd7eb..1660aed5e880221d987076b56342ad08c4ebc465 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "babel-polyfill": "^6.26.0",
     "codemirror": "^5.45.0",
     "echarts": "^4.8.0",
+    "echarts-liquidfill": "^2.0.6",
     "element-ui": "^2.11.1",
     "js-yaml": "^3.13.1",
     "json2yaml": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index efc5e6413f5c0d71529598109670b4b4311c6e15..6e16045cfef8d4d127dcf0135abadeda3d1dd74e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@ import bdMenu from "./components/menu";
 export default {
   data: () => ({}),
   components: {
-    bdMenu,
+    bdMenu
   },
   methods: {
     getCurrentUser() {
@@ -20,15 +20,18 @@ export default {
           console.log(data.data);
           console.log("--- --- ---");
           this.$store.commit("userInfofun", data.data);
+          if (data.data.is_admin == 1 || data.data.is_admin == 2) {
+            this.$router.push({ name: "workPlace" });
+          }
         } else {
           console.log(data.errMsg);
         }
       });
-    },
+    }
   },
   created() {
     this.getCurrentUser();
-  },
+  }
 };
 </script>
 
diff --git a/src/components/allot-info-confirm.vue b/src/components/allot-info-confirm.vue
index c28f1f03bed362c4dfb086549d25c928929c9232..2de4b37c9d0c4335e063b7e64521fab07e97522c 100644
--- a/src/components/allot-info-confirm.vue
+++ b/src/components/allot-info-confirm.vue
@@ -110,7 +110,7 @@ export default {
       this.$http
         .get("/apaas/service/v3/resource/apply/distributionDisplay", {
           params: {
-            apply_id: apply_id,
+            apply_id: apply_id
           },
         })
         .then(({ data }) => {
@@ -146,7 +146,7 @@ export default {
           params: {
             id: this.detail.id,
             user_id: this.detail.user_id,
-            namespace:this.detail.namespace
+            namespace: this.detail.namespace
           },
         })
         .then(({ data }) => {
diff --git a/src/components/e-charts/bar-chart.vue b/src/components/e-charts/bar-chart.vue
index 41b06568865c7a501fd87743d98057765ec4e3cd..6087dd6b3890094a5da14802b94387daef7e83cb 100644
--- a/src/components/e-charts/bar-chart.vue
+++ b/src/components/e-charts/bar-chart.vue
@@ -16,8 +16,8 @@ export default {
       }
     },
     bar_width: {
-      type: String,
-      default: "12px"
+      type: Number,
+      default: 12
     },
     colors: {
       type: Array,
@@ -32,8 +32,12 @@ export default {
       }
     },
     show_split: {
-      typr: Boolean,
+      type: Boolean,
       default: false
+    },
+    x_router: {
+      type: Number,
+      default: 0
     }
   },
   data: () => ({}),
@@ -60,7 +64,7 @@ export default {
                 fontSize: 12
               },
               interval: 0,
-              rotate: 30,
+              rotate: self.x_router,
               formatter: function(value) {
                 let valueTxt = "";
                 if (value.length > 6) {
diff --git a/src/components/e-charts/dashboard.vue b/src/components/e-charts/dashboard.vue
index 9fb89226d33a587b363725259cd0f1df61b5ed76..53690c72d575edffe06f39973e835a74817a59e8 100644
--- a/src/components/e-charts/dashboard.vue
+++ b/src/components/e-charts/dashboard.vue
@@ -100,9 +100,9 @@ export default {
                 self.data.data > 75
                   ? "#00beb2" //green
                   : self.data.data > 50
-                  ? "#ff7200" //yellow
+                  ? "#38aef9" //blue
                   : self.data.data > 25
-                  ? "#da4251" //red
+                  ? "#ff7200" //yellow
                   : "#da4251" //red
             }
           }
@@ -167,9 +167,9 @@ export default {
                         : self.data.data > 75
                         ? "#d5f7e8"
                         : self.data.data > 50
-                        ? "#ffd98f"
+                        ? "#e5f4fe"
                         : self.data.data > 25
-                        ? "#f7f1d5"
+                        ? "#ffd98f"
                         : "#f7f1d5"
                   },
                   {
@@ -186,9 +186,9 @@ export default {
                         : self.data.data > 75
                         ? "#00beb2" //green
                         : self.data.data > 50
-                        ? "#ff7200" //yellow
+                        ? "#38aef9" //blue
                         : self.data.data > 25
-                        ? "#da4251" //red
+                        ? "#ff7200" //yellow
                         : "#da4251" //red
                   }
                 ])
diff --git a/src/components/e-charts/graph.vue b/src/components/e-charts/graph.vue
index 1c8c341b3a7124fe727c75fe45525b4d7b8b3ea8..7057049186fc59a6bb09534614f51e01cc1c2d5d 100644
--- a/src/components/e-charts/graph.vue
+++ b/src/components/e-charts/graph.vue
@@ -17,9 +17,7 @@ export default {
       }
     }
   },
-  data: () => ({
-    navList: []
-  }),
+  data: () => ({}),
   mounted() {},
   methods: {
     graph() {
@@ -95,7 +93,7 @@ export default {
             lineStyle: {
               width: 2,
               color: "#274fee",
-              shadowColor: "rgb(39, 79, 238, 0.3)",
+              shadowColor: "rgb(39, 79, 238, 0.4)",
               shadowBlur: 5,
               shadowOffsetY: 8
             }
@@ -112,7 +110,7 @@ export default {
             lineStyle: {
               width: 2,
               color: "#ef9433",
-              shadowColor: "rgb(239, 148, 51, 0.3)",
+              shadowColor: "rgb(239, 148, 51, 0.4)",
               shadowBlur: 5,
               shadowOffsetY: 8
             }
diff --git a/src/components/e-charts/water-polo.vue b/src/components/e-charts/water-polo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..60442ff1ff33e77f0673995a6df76b7096c34874
--- /dev/null
+++ b/src/components/e-charts/water-polo.vue
@@ -0,0 +1,176 @@
+<template>
+  <chart :options="water()" class="water" />
+</template>
+
+<script>
+import { graphic } from "echarts/lib/export";
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => {
+        return {
+          xaxis: [],
+          data: [],
+          legend: []
+        };
+      }
+    }
+  },
+  data: () => ({}),
+  mounted() {},
+  methods: {
+    water() {
+      let self = this;
+      return {
+        title: [
+          {
+            text: "支持开发",
+            x: "center",
+            y: "40%",
+            textStyle: {
+              fontSize: 14,
+              fontWeight: "normal",
+              color: "#58617a"
+            }
+          },
+          {
+            text: "不支持开发",
+            x: "center",
+            y: "90%",
+            textStyle: {
+              fontSize: 14,
+              fontWeight: "normal",
+              color: "#58617a"
+            }
+          }
+        ],
+        series: [
+          {
+            type: "liquidFill",
+            data: [
+              {
+                name: "A",
+                value: 0.67,
+                key: 77
+              }
+            ],
+            radius: "50%",
+            center: ["50%", "20%"],
+            outline: {
+              borderDistance: 2,
+              itemStyle: {
+                borderWidth: 3,
+                borderColor: "#274fee",
+                shadowBlur: 0
+              }
+            },
+            backgroundStyle: {
+              color: "#fff",
+              opacity: 1
+            },
+            itemStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 1,
+                    color: ["#c9d3fc"]
+                  },
+                  {
+                    offset: 0,
+                    color: ["#515fe7"]
+                  }
+                ],
+                global: false
+              },
+              opacity: 1,
+              shadowBlur: 0
+            },
+            label: {
+              normal: {
+                formatter: function(param) {
+                  return "63%";
+                },
+                textStyle: {
+                  color: "#000",
+                  insideColor: "#000",
+                  fontSize: 14
+                }
+              }
+            }
+          },
+          {
+            type: "liquidFill",
+            data: [
+              {
+                name: "A",
+                value: 0.67,
+                key: 77
+              }
+            ],
+            radius: "50%",
+            center: ["50%", "70%"],
+            outline: {
+              borderDistance: 2,
+              itemStyle: {
+                borderWidth: 3,
+                borderColor: "#e56600",
+                shadowBlur: 0
+              }
+            },
+            backgroundStyle: {
+              color: "#fff",
+              opacity: 1
+            },
+            itemStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 1,
+                    color: ["#f9ddba"]
+                  },
+                  {
+                    offset: 0,
+                    color: ["#ef9433"]
+                  }
+                ],
+                global: false
+              },
+              opacity: 1,
+              shadowBlur: 0
+            },
+            label: {
+              normal: {
+                formatter: function(param) {
+                  return "63%";
+                },
+                textStyle: {
+                  color: "#000",
+                  insideColor: "#000",
+                  fontSize: 14
+                }
+              }
+            }
+          }
+        ]
+      };
+    }
+  }
+};
+</script>
+<style scoped>
+.water {
+  width: 100%;
+  height: calc(100% - 20px);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/image-detail.vue b/src/components/image-detail.vue
index 33eca3458be7b84db1f5af34c9595fa491b43ae7..1dd4c6960bb4c72f821a2f8396d21153a0a6c143 100644
--- a/src/components/image-detail.vue
+++ b/src/components/image-detail.vue
@@ -127,6 +127,7 @@ export default {
                 type: "success",
               });
               this.getImageDetail();
+              this.$emit("refresh");
             } else {
               this.$message({
                 message: `删除失败`,
diff --git a/src/components/order-list/order-list-com.vue b/src/components/order-list/order-list-com.vue
index f26ff3f5bbc2a53636b7283e30fb9ae521436ee8..9c117f6417bd4492448947d7f26d738ece4fdb49 100644
--- a/src/components/order-list/order-list-com.vue
+++ b/src/components/order-list/order-list-com.vue
@@ -60,7 +60,7 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.floor(pagination.total / pagination.rowsPerPage) + 1
+          Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -69,7 +69,7 @@
             @click="handleCurrentChange(1)"
             :disabled="
             pagination.page >=
-              Math.floor(pagination.total / pagination.rowsPerPage) + 1
+              Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           "
           ></el-button>
         </div>
diff --git a/src/components/service-list/commodity-list.vue b/src/components/service-list/commodity-list.vue
index 1174eebe54bb4b6f1d6ea93c0cb6638736773213..dc99c0a923457ca62229dbbe9de34a18c51f34b7 100644
--- a/src/components/service-list/commodity-list.vue
+++ b/src/components/service-list/commodity-list.vue
@@ -47,7 +47,7 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.floor(pagination.total / pagination.rowsPerPage) + 1
+          Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -56,7 +56,7 @@
             @click="handleCurrentChange(1)"
             :disabled="
             pagination.page >=
-              Math.floor(pagination.total / pagination.rowsPerPage) + 1
+              Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           "
           ></el-button>
         </div>
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index 304e36497c78ddc27c81f47734aa74098ed22fea..8b1de09a6bcb5e133c755a83fa59558e1b581e55 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -236,7 +236,7 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.floor(pagination.total / pagination.rowsPerPage) + 1
+          Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -245,7 +245,7 @@
             @click="handleCurrentChange(1)"
             :disabled="
               pagination.page >=
-                Math.floor(pagination.total / pagination.rowsPerPage) + 1
+                Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
             "
           ></el-button>
         </div>
diff --git a/src/components/topology.vue b/src/components/topology.vue
index 4ba94fc5ca8a878c94673c0775a9a0fa890961ac..866845a6899b38799447591e382f23aca3febbfd 100644
--- a/src/components/topology.vue
+++ b/src/components/topology.vue
@@ -416,7 +416,7 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
 .canvas {
-  height: 600px;
+  height: 100%;
   width: 100%;
   margin: 0 auto;
   position: relative;
diff --git a/src/main.js b/src/main.js
index b2e03a59d5b6d882249da9e696e684e9d49860e8..8cb174c35f991671dfc24e2ba8d05bb5120f2f26 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,6 +39,9 @@ import 'echarts/lib/component/polar'; // 极坐标系
 import 'echarts/lib/chart/scatter'; // 散点图
 import 'echarts/lib/component/dataZoom'
 
+import liquidfill from 'echarts-liquidfill'
+Vue.use(liquidfill)
+
 import Sparkline from 'vue-sparklines'
 
 Vue.use(Sparkline)
diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue
index 11c04013fbcd19abb91e31f47f99b1f222b5c119..27badbf14d88456a401e1dca2eacb25f44a637e0 100644
--- a/src/pages/data-analysis/my-application.vue
+++ b/src/pages/data-analysis/my-application.vue
@@ -11,12 +11,41 @@
           <el-col :span="24" class="in_block">
             <block-radius :show_header="true" title="应用总体概况" class="block">
               <div class="left_1">
-                <div ref="left_1_l" class="left_1_l">
-                  <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
-                  <div class="left_1_title">应用总数</div>
-                  <div class="left_1_num">2222</div>
+                <div class="left_block">
+                  <div ref="left_1_l" class="left_1_l">
+                    <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
+                    <div class="left_1_msg">
+                      <div class="left_1_title">服务总数</div>
+                      <div class="left_1_num">4</div>
+                    </div>
+                  </div>
+                  <div class="chain">
+                    月环比
+                    <span
+                      class="chain_mid"
+                      :class="overview.month_chain >= 0 ? 'chain_up' : 'chain_down'"
+                    >
+                      {{ Math.abs(overview.month_chain) }}%
+                      <img
+                        :src="overview.month_chain >= 0 ? require('@/assets/imgs/icon_up.png') : require('@/assets/imgs/icon_down.png')"
+                      />
+                    </span>周环比
+                    <span :class="overview.week_chain >= 0 ? 'chain_up' : 'chain_down'">
+                      {{ Math.abs(overview.week_chain) }}%
+                      <img
+                        :src="overview.week_chain >= 0 ? require('@/assets/imgs/icon_up.png') : require('@/assets/imgs/icon_down.png')"
+                      />
+                    </span>
+                  </div>
+                  <div class="left_1_line"></div>
+                  <div class="left_1_l_bottom">
+                    日均被部署次数
+                    <span class="left_1_l_bottom_msg">12432</span>（次）
+                  </div>
+                </div>
+                <div class="left_1_right">
+                  <WaterPolo class="water_polo" />
                 </div>
-                <dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard>
               </div>
             </block-radius>
           </el-col>
@@ -35,7 +64,7 @@
             <block-radius
               :show_header="true"
               title="应用类型分析"
-              :buttons_arr="['发布的应用', '调用的应用']"
+              :buttons_arr="['构建的应用', '申请的应用 ']"
               @changeButton="changeServiceTypeBtn"
               class="block"
             >
@@ -46,15 +75,25 @@
       </el-col>
       <el-col :span="12" class="in_center">
         <el-row>
-          <el-col :span="24" class="in_block">
-            <block-radius class="block"></block-radius>
-          </el-col>
           <el-col :span="24" class="in_block">
             <block-radius
               :show_header="true"
-              title="应用热门搜索"
+              title="应用使用领域统计"
+              :buttons_arr="['构建的应用', '申请的应用']"
+              @changeButton="changeServiceTypeBtn"
               class="block"
             >
+              <BarChart
+                :data="bar_data_org"
+                :colors="['#1034eb', '#4274f8']"
+                :bar_border_radius="[20, 20, 0, 0]"
+                :bar_width="26"
+                :show_split="true"
+              />
+            </block-radius>
+          </el-col>
+          <el-col :span="24" class="in_block">
+            <block-radius :show_header="true" title="应用热门搜索" class="block">
               <div class="block-radius-content service-hot-search">
                 <div class="left-content">
                   <div class="hot-line">
@@ -71,11 +110,11 @@
                   </div>
                 </div>
                 <div class="right-content">
-                  <apass-table 
-                    class="hot-search-table" 
+                  <apass-table
+                    class="hot-search-table"
                     :header="hotSearchHeader"
-                    :data="hotSearchData" 
-                    :padding-left="0" 
+                    :data="hotSearchData"
+                    :padding-left="0"
                     @sort-change="hotSearchSortChange"
                   ></apass-table>
                 </div>
@@ -83,7 +122,7 @@
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius 
+            <block-radius
               class="block"
               :show_header="true"
               title="应用总数变化趋势"
@@ -125,20 +164,16 @@
                 class="block-radius-content"
                 :data="commentlistData"
               ></commentlist>
-              <starlist 
-                v-else 
-                class="block-radius-content" 
-                :options="starlistData" 
+              <starlist
+                v-else
+                class="block-radius-content"
+                :options="starlistData"
                 style="margin-top: 30px;height: calc(100% - 51px);"
               ></starlist>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius 
-              class="block"
-              :show_header="true"
-              title="应用在线区域统计"
-            >
+            <block-radius class="block" :show_header="true" title="应用在线状态统计">
               <single-circle class="block-radius-content" :data="single_data"></single-circle>
             </block-radius>
           </el-col>
@@ -147,7 +182,7 @@
       <!-- 不可横向铺满，一般为最后一行 -->
       <el-col :span="6" class="in_block">
         <block-radius :show_header="true" title="应用来源机构分析" class="block">
-          <BarChart :data="bar_data_org" :colors="['#e56600', '#e56600']" />
+          <BarChart :data="bar_data_org" :colors="['#274fee', '#274fee']" :x_router="30" />
         </block-radius>
       </el-col>
       <el-col :span="18" class="in_block default">
@@ -161,7 +196,6 @@
 
 <script>
 import BlockRadius from "@/components/general/block-radius";
-import Dashboard from "@/components/e-charts/dashboard";
 import multipleCircle from "@/components/e-charts/multiple_circle";
 import singleCircle from "@/components/e-charts/single_circle";
 import lineChart from "@/components/e-charts/line_chart";
@@ -171,10 +205,10 @@ import Commentlist from "@/components/e-charts/commentlist";
 import BarChart from "@/components/e-charts/bar-chart";
 import ApassTable from "@/components/apass-table";
 import Graph from "@/components/e-charts/graph";
+import WaterPolo from "@/components/e-charts/water-polo";
 export default {
   components: {
     BlockRadius,
-    Dashboard,
     multipleCircle,
     singleCircle,
     Toplist,
@@ -183,10 +217,14 @@ export default {
     lineChart,
     BarChart,
     ApassTable,
-    Graph
+    Graph,
+    WaterPolo
   },
   data: () => ({
-    navList: [],
+    overview: {
+      month_chain: 14.5,
+      week_chain: -14.2
+    },
     mult_data: [
       { name: "基础工具", value: 40 },
       { name: "通用应用", value: 0 },
@@ -224,10 +262,6 @@ export default {
         }
       ]
     },
-    das_data: {
-      data: 40,
-      text: "健康占比"
-    },
     bar_data_org: {
       xaxis: [
         "01-01",
@@ -372,33 +406,33 @@ export default {
         hotIndex: 1,
         name: "地图视频融合应用1",
         count: 666,
-        increases: 1.28,
+        increases: 1.28
       },
       {
         hotIndex: 2,
         name: "地图视频融合应用2",
         count: 666,
-        increases: 0.03,
+        increases: 0.03
       },
       {
         hotIndex: 3,
         name: "地图视频融合应用3",
         count: 666,
-        increases: 0.58,
+        increases: 0.58
       },
       {
         hotIndex: 4,
         name: "地图视频融合应用4",
         count: 666,
-        increases: -0.28,
+        increases: -0.28
       },
       {
         hotIndex: 5,
         name: "地图视频融合应用5",
         count: 666,
-        increases: -0.58,
-      },
-    ], // 热门搜索 数据
+        increases: -0.58
+      }
+    ] // 热门搜索 数据
   }),
   mounted() {
     this.hotSearchHeader = [
@@ -406,19 +440,19 @@ export default {
         label: "排名",
         type: "hot-index",
         width: 100,
-        align: "center",
+        align: "center"
       },
       {
         label: "应用名称",
         prop: "name",
         type: "button",
-        callback: this.detailHotSearch,
+        callback: this.detailHotSearch
       },
       {
         label: "搜索次数",
         prop: "count",
         width: 100,
-        align: "center",
+        align: "center"
       },
       {
         label: "日涨幅",
@@ -426,9 +460,9 @@ export default {
         width: 100,
         sortType: "0", // 0：升序 1：降序
         sortable: true,
-        align: "center",
-      },
-    ]
+        align: "center"
+      }
+    ];
   },
   methods: {
     detailHotSearch(item) {
@@ -489,32 +523,80 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-.left_1_l {
-  width: 40%;
+.left_block {
+  width: 280px;
   height: 100%;
-  display: inline-block;
-  padding: 20px 0 0 0;
+  padding: 10px 0 0 0;
+}
+.left_1_l {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
 }
 .left_1_title {
   width: 100%;
-  text-align: center;
 }
 .left_1_num {
   font-size: 32px;
   color: #515fe7;
   width: 100%;
-  text-align: center;
 }
 .left_1_img {
   width: 120px;
-  display: block;
-  margin: 0 auto;
+  height: 120px;
+  display: inline-block;
+}
+.chain {
+  color: #58617a;
+  font-size: 14px;
+  padding: 10px;
+}
+.chain_down {
+  background-color: #fbe8e8;
+  border-radius: 3px;
+  padding: 2px 4px;
+  font-size: 12px;
+  margin-left: 8px;
+  color: #e15260;
+}
+.chain_up {
+  background-color: #e7fdfc;
+  border-radius: 3px;
+  padding: 1px 4px;
+  font-size: 12px;
+  margin-left: 8px;
+  color: #25bdb1;
+}
+.chain_mid {
+  margin-right: 20px;
+}
+.left_1_l_bottom {
+  color: #58617a;
+  padding: 10px;
+}
+.left_1_l_bottom_msg {
+  margin-left: 20px;
+}
+.left_1_msg {
+  display: inline-block;
+  width: 120px;
+  padding-bottom: 10px;
 }
-.left_1_r {
-  width: 50%;
+.left_1_line {
+  width: 90%;
+  margin-left: 5%;
+  height: 1px;
+  background-color: #f2f2f2;
+}
+.left_1_right {
+  width: 180px;
   height: 100%;
   display: inline-block;
 }
+.water_polo {
+  width: 140px;
+  margin: 0 auto 20px;
+}
 .default {
   text-align: center;
 }
@@ -560,7 +642,7 @@ export default {
 </style>
 
 <style>
-.hot-search-table .el-table td, 
+.hot-search-table .el-table td,
 .hot-search-table .el-table th {
   padding: 6px 0;
 }
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index d8c98736d5c85a65d1340c908c9fd3e7d54f9fb1..27bb7975bb70f001e19857669a4ed3307259f31c 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -22,7 +22,7 @@
                 <div ref="left_1_l" class="left_1_l">
                   <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
                   <div class="left_1_title">服务总数</div>
-                  <div class="left_1_num">2222</div>
+                  <div class="left_1_num">4</div>
                 </div>
                 <dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard>
               </div>
@@ -39,7 +39,7 @@
               @changeButton="changeServiceTypeBtn"
               class="block"
             >
-              <multiple-circle  class="block-radius-content" :data="mult_data" :text="text"></multiple-circle>
+              <multiple-circle class="block-radius-content" :data="mult_data" :text="text"></multiple-circle>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
@@ -58,14 +58,12 @@
       <el-col :span="12" class="in_center">
         <el-row>
           <el-col :span="24" class="in_block height_2x">
-            <block-radius class="block"></block-radius>
+            <block-radius :show_header="true" title="运行拓扑图" class="block">
+              <Topology class="topology" :datas="topology_datas" />
+            </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius
-              :show_header="true"
-              title="服务热门搜索"
-              class="block"
-            >
+            <block-radius :show_header="true" title="服务热门搜索" class="block">
               <div class="block-radius-content service-hot-search">
                 <div class="left-content">
                   <div class="hot-line">
@@ -82,11 +80,11 @@
                   </div>
                 </div>
                 <div class="right-content">
-                  <apass-table 
-                    class="hot-search-table" 
+                  <apass-table
+                    class="hot-search-table"
                     :header="hotSearchHeader"
-                    :data="hotSearchData" 
-                    :padding-left="0" 
+                    :data="hotSearchData"
+                    :padding-left="0"
                     @sort-change="hotSearchSortChange"
                   ></apass-table>
                 </div>
@@ -94,8 +92,8 @@
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius 
-              class="block" 
+            <block-radius
+              class="block"
               :show_header="true"
               title="服务总数变化趋势"
               :buttons_arr="['近14天', '近30天']"
@@ -135,7 +133,7 @@
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius 
+            <block-radius
               :show_header="true"
               title="服务开放程度统计"
               :buttons_arr="['发布的服务', '调用的服务']"
@@ -158,10 +156,10 @@
                 class="block-radius-content"
                 :data="commentlistData"
               ></commentlist>
-              <starlist 
-                v-else 
-                class="block-radius-content" 
-                :options="starlistData" 
+              <starlist
+                v-else
+                class="block-radius-content"
+                :options="starlistData"
                 style="margin-top: 30px;height: calc(100% - 51px);"
               ></starlist>
             </block-radius>
@@ -171,7 +169,7 @@
       <!-- 不可横向铺满，一般为最后一行 -->
       <el-col :span="6" class="in_block">
         <block-radius :show_header="true" title="服务来源机构分析" class="block">
-          <BarChart :data="bar_data_org" :colors="['#e56600', '#e56600']" />
+          <BarChart :data="bar_data_org" :x_router="30" :colors="['#e56600', '#e56600']" />
         </block-radius>
       </el-col>
       <el-col :span="18" class="in_block default">
@@ -195,6 +193,7 @@ import Commentlist from "@/components/e-charts/commentlist";
 import BarChart from "@/components/e-charts/bar-chart";
 import ApassTable from "@/components/apass-table";
 import Graph from "@/components/e-charts/graph";
+import Topology from "@/components/topology.vue";
 export default {
   components: {
     BlockRadius,
@@ -207,10 +206,10 @@ export default {
     lineChart,
     BarChart,
     ApassTable,
-    Graph
+    Graph,
+    Topology
   },
   data: () => ({
-    navList: [],
     mult_data: [
       { name: "基础工具", value: 40 },
       { name: "通用应用", value: 0 },
@@ -249,8 +248,8 @@ export default {
       ]
     },
     das_data: {
-      data: 40,
-      text: "健康占比",
+      data: 90,
+      text: "健康占比"
     },
     bar_data: {
       xaxis: [
@@ -263,7 +262,7 @@ export default {
         "01-07",
         "01-08"
       ],
-      data: [100, 120, 130, 150, 160, 120, 110, 100],
+      data: [100, 120, 130, 150, 160, 120, 110, 100]
     },
     bar_data_org: {
       xaxis: [
@@ -274,9 +273,9 @@ export default {
         "01-05",
         "01-06",
         "01-07",
-        "01-08",
+        "01-08"
       ],
-      data: [100, 120, 130, 150, 160, 120, 110, 100],
+      data: [100, 120, 130, 150, 160, 120, 110, 100]
     },
     toplistData: [
       {
@@ -392,32 +391,32 @@ export default {
         hotIndex: 1,
         name: "地图视频融合服务1",
         count: 666,
-        increases: 1.28,
+        increases: 1.28
       },
       {
         hotIndex: 2,
         name: "地图视频融合服务2",
         count: 666,
-        increases: 0.03,
+        increases: 0.03
       },
       {
         hotIndex: 3,
         name: "地图视频融合服务3",
         count: 666,
-        increases: 0.58,
+        increases: 0.58
       },
       {
         hotIndex: 4,
         name: "地图视频融合服务4",
         count: 666,
-        increases: -0.28,
+        increases: -0.28
       },
       {
         hotIndex: 5,
         name: "地图视频融合服务5",
         count: 666,
-        increases: -0.58,
-      },
+        increases: -0.58
+      }
     ], // 热门搜索 数据
     graph_arr: {
       xaxis: [
@@ -435,7 +434,8 @@ export default {
         [100, 1210, 130, 1530, 160, 120, 110, 1200]
       ],
       legend: ["aaa1", "bbb1"]
-    }
+    },
+    topology_datas: {}
   }),
   mounted() {
     this.hotSearchHeader = [
@@ -443,19 +443,19 @@ export default {
         label: "服务排名",
         type: "hot-index",
         width: 100,
-        align: "center",
+        align: "center"
       },
       {
         label: "服务名称",
         prop: "name",
         type: "button",
-        callback: this.detailHotSearch,
+        callback: this.detailHotSearch
       },
       {
         label: "搜索次数",
         prop: "count",
         width: 100,
-        align: "center",
+        align: "center"
       },
       {
         label: "日涨幅",
@@ -463,9 +463,10 @@ export default {
         width: 100,
         sortType: "0", // 0：升序 1：降序
         sortable: true,
-        align: "center",
-      },
-    ]
+        align: "center"
+      }
+    ];
+    this.getTopologyData();
   },
   methods: {
     detailHotSearch(item) {
@@ -496,6 +497,12 @@ export default {
     },
     changeServeiceTotalChangeBtn(index) {
       console.log("服务总数变化趋势: " + index);
+      console.log(index);
+    },
+    getTopologyData() {
+      this.$api.workbench.getServiceTopology().then(response => {
+        this.topology_datas = response.data.elements;
+      });
     }
   }
 };
@@ -533,7 +540,7 @@ export default {
   width: 40%;
   height: 100%;
   display: inline-block;
-  padding: 20px 0 0 0;
+  padding: 10px 0 0 0;
 }
 .left_1_title {
   width: 100%;
@@ -597,10 +604,14 @@ export default {
   height: calc(100% - 36px);
   background-color: pink;
 }
+.topology {
+  width: 100%;
+  height: calc(100% - 20px);
+}
 </style>
 
 <style>
-.hot-search-table .el-table td, 
+.hot-search-table .el-table td,
 .hot-search-table .el-table th {
   padding: 6px 0;
 }
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index 99a3c1c5a2fed00d07badb2bb898558ffbf4d28d..3afb4c897d3dab567dfc3abda12e8be1ca9af76a 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -322,25 +322,25 @@ export default {
     header_arr: [
       {
         prop: "name",
-        label: "微服务名称",
+        label: "字段编码",
         minWidth: "20%",
         align: "left"
       },
       {
-        prop: "is_sensituve",
-        label: "健康状态",
+        prop: "show_type",
+        label: "字段类型",
         width: "120px",
         align: "center"
       },
       {
-        prop: "is_must",
-        label: "接口链接",
+        prop: "label",
+        label: "字段名称",
         minWidth: "40%",
         align: "center"
       },
       {
         prop: "descript",
-        label: "微服务描述",
+        label: "字段说明",
         minWidth: "40%",
         align: "left"
       }
diff --git a/src/pages/user/order/order_list.vue b/src/pages/user/order/order_list.vue
index 11f5dde3ecc44d9bc6c679f43cc29863fae12429..49ca27d60a2d32b0e0eb75d448748f43b6dd6467 100644
--- a/src/pages/user/order/order_list.vue
+++ b/src/pages/user/order/order_list.vue
@@ -15,7 +15,6 @@ export default {
     OrderList
   },
   data: () => ({
-    navList: []
   }),
   mounted() {},
   methods: {}
diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue
index 70c0ecd48206c8e626f5f4403e8f283a5d7daae9..5de167bd5ed89a4fe01ff55c28e041cbb7e80f79 100644
--- a/src/pages/workbench/app_build.vue
+++ b/src/pages/workbench/app_build.vue
@@ -268,7 +268,10 @@
             完成
           </el-button>
         </div>
-        <image-detail ref="imageDetail"></image-detail>
+        <image-detail
+          ref="imageDetail"
+          @refresh="refreshImageList"
+        ></image-detail>
       </app-build-step>
 
       <template slot="action">
@@ -451,7 +454,6 @@ export default {
           message: `提交成功`,
           type: "success",
         });
-        this.step2Loading = false;
         this.step = 2;
         this.app_id = response.data;
 
@@ -463,8 +465,9 @@ export default {
           message: response.errMsg || `提交失败`,
           type: "warning",
         });
-        this.step2Loading = false;
       }
+
+      this.step2Loading = false;
     },
     deployUploadError() {
       this.$message({
@@ -530,19 +533,17 @@ export default {
         });
         this.image_info.image_name = "";
         this.image_info.tag = "";
-        this.image_info.file = "";
-        this.$refs.step1_upload.clearFiles();
-        this.addImageLoading = false;
-        this.image_datas = [];
-        this.image_page = 1;
-        this.initImageList();
+        this.refreshImageList();
       } else {
         this.$message({
           message: response.errMsg || `上传镜像失败`,
           type: "warning",
         });
-        this.addImageLoading = false;
       }
+
+      this.image_info.file = "";
+      this.$refs.step1_upload.clearFiles();
+      this.addImageLoading = false;
     },
     imageUploadError() {
       this.$message({
@@ -569,16 +570,14 @@ export default {
       this.dialogInfo.msg = "是否删除该镜像？";
       this.dialogInfo.submit = () => {
         this.$http
-          .delete(`/apaas/hubApi/image/del/${item.name}`)
+          .delete(`/apaas/hubApi/image/del/${item.name}?app_id=${this.app_id}`)
           .then((response) => {
             if (response.data.success == 1) {
               this.$message({
                 message: `删除成功`,
                 type: "success",
               });
-              this.image_datas = [];
-              this.image_page = 1;
-              this.initImageList();
+              this.refreshImageList();
             } else {
               this.$message({
                 message: `删除失败`,
@@ -599,7 +598,7 @@ export default {
     showImageDetail(item) {
       this.$refs.imageDetail.showDialog({
         ...item,
-        app_id: this.app_id
+        app_id: this.app_id,
       });
     },
     stepsDone() {
@@ -607,19 +606,30 @@ export default {
     },
     deployAction() {
       // 跳转至应用详情进行部署操作
-      this.$router.push(
-        `/yygl/0/0/detail/${this.app_id}`
-      );
+      this.$router.push(`/yygl/0/0/detail/${this.app_id}`);
     },
     backToList() {
       this.$router.push(`/yygl/0/0`);
     },
+    refreshImageList() {
+      this.image_datas = [];
+      this.image_page = 1;
+      this.initImageList();
+    },
   },
   mounted() {
     this.getYwlys();
     this.getTypes();
     this.getOrgs();
 
+    this.$api.user.getNowUser().then(({ data }) => {
+      if (data.success == 1) {
+        this.app_info.org = data.data.department_id;
+      } else {
+        console.log(data.errMsg);
+      }
+    });
+
     this.image_headers = [
       {
         label: "镜像名称",
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 0ea9176a16ea3df56980a549ffeda304d01815fd..1771755e83e3547f26914e6ae8829e9eb43c54f7 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -912,6 +912,7 @@ export default {
             label: "用户申请时间",
             prop: "apply_time",
             align: "center",
+            width: 180,
           },
           {
             label: "操作",
@@ -921,11 +922,15 @@ export default {
             actionList: [
               {
                 getLabel(item) {
-                  return item.use_uid !== "" ? "已分配" : "分配";
+                  if (item.approve_state !== 1) {
+                    return "";
+                  }
+
+                  return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配";
                 },
                 callback: this.cloudAllot,
                 disabledRule(item) {
-                  return item.use_uid !== "";
+                  return !(item.approve_state === 1 && item.use_uid === "");
                 },
               },
             ],
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index aeb11d33dcbc20953811fc74ea0dfefeb05c05c4..947f81b17b015b466baeb4f783b834f6e8e28ba1 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -128,7 +128,7 @@
             <el-button v-if="activeBtn == 1" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
           </div>
         </div>
-        <div v-if="activeBtn == 4">
+        <div v-if="activeBtn == 4 && zhyyVal != 34">
           <el-tabs v-model="activeZh" class="fwcs_tabs" @tab-click="clickTab">
             <el-tab-pane label="请求参数" name="0">
               <ces-table
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index bad4250942e2bf46edd5f3849f975289ce90d48a..e714478708674d23855654a1709017199d6f3297 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -57,8 +57,10 @@
         <p
           style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
         >
-          云资源概况分析
-          <img style="vertical-align:-9px;" src="@/assets/imgs/home_btn_enter.png" alt />
+          <span style="cursor:pointer;" @click="$router.push('/data_analysis')">
+              <span style="display: inline-block;vertical-align:middle;">数据分析中心</span>
+              <img style="vertical-align:middle;" src="@/assets/imgs/home_btn_enter.png" />
+          </span>
         </p>
         <div class="data_charts">
           <div class="charts_box" :style="now_chart==0?'':{marginLeft:'-720px'}">
@@ -124,7 +126,7 @@
             v-for="(item, index) in online_tool_arr"
             :key="index + 300"
             class="online_box"
-            @click="goto_online_page(item.url,index)"
+            @click="goto_online_page(item.url,index,undefined,item.target)"
             @mouseenter="enter_online_tool(index)" 
             @mouseleave="leave_online_tool()"
             :style="now_online==index&&item.move_bg?{backgroundColor:item.move_bg}:{ backgroundColor: item.bg }"
@@ -960,10 +962,12 @@ export default {
       ],
       online_tool_arr: [
         {
-          text: "智能绘图",
+          text: "智能制图",
           pic: require("@/assets/imgs/home_tool_ic_znht.png"),
           bg: "#e5f4fe",
-          color: "#38aef9"
+          color: "#38aef9",
+          url: "https://apaasgis.wodcloud.com/portal/geoplat/viewer/mapViewer.html",
+          target: 1
         },
         {
           text: "数据开发",
@@ -981,13 +985,17 @@ export default {
           text: "流程设计",
           pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
           bg: "#e6ebfe",
-          color: "#515fe7"
+          color: "#515fe7",
+          url: "https://apaas.wodcloud.com/lcgl/index.html#/",
+          target: 1
         },
         {
-          text: "可视化报表",
+          text: "可视化图表",
           pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
           bg: "#fff2e2",
-          color: "#ea7d19"
+          color: "#ea7d19",
+          url: "https://apaas.wodcloud.com/bi/",
+          target: 1
         },
         {
           text: "模板应用",
@@ -1143,9 +1151,13 @@ export default {
           }
         });
     },
-    goto_online_page(url,index,idx){
+    goto_online_page(url,index,idx,target){
       if(url){
-        this.$router.push(url);
+        if (target==1) {
+          window.open(url);
+        } else {
+          this.$router.push(url);
+        }
       }
     },
     get_service_list() {
diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue
index bb5bbf6d423bdf4f80888145dc176f3487ef7178..8e7f0dabda6f126f460f7310286dd452829e132f 100644
--- a/src/pages/workbench/yygl/app_detail.vue
+++ b/src/pages/workbench/yygl/app_detail.vue
@@ -57,11 +57,10 @@
                 :data="image_arr"
                 :padding-left="60"
               ></apass-table>
-              <p style="text-align: center" v-if="image_loading">加载中...</p>
-              <p
-                style="text-align: center"
-                v-if="image_noMore && image_arr.length > 0"
-              >
+              <p style="text-align: center;line-height: 36px;" v-if="image_loading">
+                加载中...
+              </p>
+              <p style="text-align: center;line-height: 36px;" v-if="image_noMore">
                 没有更多了
               </p>
             </div>
@@ -198,7 +197,7 @@
       ref="myConfirm"
       :confirmOptions="tipsOptions"
     ></dialog-action>
-    <image-detail ref="imageDetail"></image-detail>
+    <image-detail ref="imageDetail" @refresh="refreshImageList"></image-detail>
   </div>
 </template>
 
@@ -488,12 +487,11 @@ export default {
       this.$message.error("上传失败");
     },
     load_data() {
-      console.log(2222);
       this.asynLoad = false;
       if (5 * this.now_page < this.total) {
         this.now_page = this.now_page + 1;
         this.get_image_list();
-      } else {
+      } else if (this.total > 0) {
         this.image_noMore = true;
       }
     },
@@ -534,9 +532,7 @@ export default {
         .then((response) => {
           if (response.data.success == 1) {
             this.$message.success("删除成功");
-            this.now_page = 1;
-            this.image_arr = [];
-            this.get_image_list();
+            this.refreshImageList();
           } else {
             this.$message.error("删除失败");
           }
@@ -786,6 +782,11 @@ export default {
         })
         .catch(function(response) {});
     },
+    refreshImageList() {
+      this.now_page = 1;
+      this.image_arr = [];
+      this.get_image_list();
+    }
   },
 };
 </script>
diff --git a/src/pages/workbench/yygl/apply_app_detail.vue b/src/pages/workbench/yygl/apply_app_detail.vue
index 473ce7fc3210b0391378c17dd0df68f83be87a1c..c9d73c8ff815dbaf1dda17112b3f29d5b7bf0f55 100644
--- a/src/pages/workbench/yygl/apply_app_detail.vue
+++ b/src/pages/workbench/yygl/apply_app_detail.vue
@@ -185,7 +185,7 @@ export default {
             "text": "应急领域"
           },
           {
-            "name": "在线区域",
+            "name": "在线状态",
             "text": "平台应用"
           }
         ],
diff --git a/src/pages/workbench/yygl/approval_app_detail.vue b/src/pages/workbench/yygl/approval_app_detail.vue
index 4c42785356db6825878ba7868dd2016ca8f734a1..d03d7d74053aae6845184125bbc22f9e57b529f7 100644
--- a/src/pages/workbench/yygl/approval_app_detail.vue
+++ b/src/pages/workbench/yygl/approval_app_detail.vue
@@ -172,7 +172,7 @@ export default {
         ],
         second: [
           {
-              "name": "在线区域",
+              "name": "在线状态",
               "text": ""
           },
           {
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index 08b580f8ef2c332e4eadbb2f4efd5cc77a7a98f8..db27c24db03bcf9474085a2e7ba08ff088dd7856 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -106,7 +106,7 @@ export default {
         this.cardType = 0;
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -222,7 +222,7 @@ export default {
             align: "center",
           },
           {
-            label: "在线区域",
+            label: "在线状态",
             prop: "online_state_name",
             align: "center",
           },
@@ -248,7 +248,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -324,7 +324,7 @@ export default {
             align: "center",
           },
           {
-            label: "在线区域",
+            label: "在线状态",
             prop: "online_state_name",
             align: "center",
           },
@@ -391,7 +391,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -487,7 +487,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -546,7 +546,7 @@ export default {
             align: "center",
           },
           {
-            label: "在线区域",
+            label: "在线状态",
             prop: "online_state_name",
             align: "center",
           },
@@ -586,7 +586,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -658,7 +658,7 @@ export default {
             align: "center",
           },
           {
-            label: "在线区域",
+            label: "在线状态",
             prop: "online_state_name",
             align: "center",
           },
@@ -733,7 +733,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -820,7 +820,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -879,7 +879,7 @@ export default {
             align: "center",
           },
           {
-            label: "在线区域",
+            label: "在线状态",
             prop: "online_state_name",
             align: "center",
           },
@@ -919,7 +919,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线区域",
+            name: "在线状态",
             prop: "online_state",
             data: [
               {
@@ -1067,7 +1067,7 @@ export default {
             return item.value;
           })
           .join(",");
-      } // 在线区域 / 部署来源
+      } // 在线状态 / 部署来源
       if (filter.appTypes) {
         params.appTypes = filter.appTypes
           .map((item) => {
@@ -1142,7 +1142,7 @@ export default {
     }, // 唤醒弹窗
     deleteAction(item) {
       if (this.cardType === 0) {
-        if (item.online_state != 2) {
+        if (item.online_state == 0 || (item.online_state == 2 && item.source=="apply")) {
           this.dialogInfo.title = "";
           this.dialogInfo.msg = "是否删除该条应用？";
           this.dialogInfo.cancelText = "";
@@ -1182,7 +1182,9 @@ export default {
           this.dialogInfo.cancelText = "";
           this.dialogInfo.sunbmitText = "";
           this.dialogInfo.submit = () => {
-            if (item.up_deploy_status === 3) {
+            console.log(`${item.app_name}不能被删除...`);
+
+            /* if (item.up_deploy_status === 3) {
               this.$message({
                 message: `${item.app_name}正在申请下架中.`,
                 type: "warning",
@@ -1210,7 +1212,7 @@ export default {
                     type: "warning",
                   });
                 });
-            }
+            } */
           };
         }
       } else if (this.cardType === 1) {
diff --git a/src/request/api/service_shop.js b/src/request/api/service_shop.js
index 73716c91601c1ea3ee56452f7fb2484e5ff1b08c..966e6577ecc82474e8d1d27ee44737d6ecc32ace 100644
--- a/src/request/api/service_shop.js
+++ b/src/request/api/service_shop.js
@@ -13,7 +13,7 @@ const serviceShop = {
 serviceName=${params.serviceName}&serviceType1=${params.serviceType1}&
 serviceType2s=${params.serviceType2s}&dataDomains=${params.dataDomains}&
 organizeIds=${params.organizeIds}&orderBy=${params.orderBy}&
-Page=${params.Page}&Size=${params.Size}`);
+page=${params.Page}&size=${params.Size}`);
     },
     getServiceShopDetail(params) {
         return axios.get(`/apaas/serviceapp/v3/servicemarket/detail?serviceId=`)
diff --git a/static/applyappdetail.json b/static/applyappdetail.json
index e2668e51dc513c33a54c662645c0efce43f22e26..3acaefc124b6f7b25c1cea22f43a29e578370760 100644
--- a/static/applyappdetail.json
+++ b/static/applyappdetail.json
@@ -14,7 +14,7 @@
           "text": "应急领域"
         },
         {
-          "name": "在线区域",
+          "name": "在线状态",
           "text": "平台应用"
         }
       ],
diff --git a/static/approvalappdetail.json b/static/approvalappdetail.json
index 37e618e815b29ceec05520e00cd0cdbb20fa4b33..21b95013019cf96c1ea5dc918a9cc58413223254 100644
--- a/static/approvalappdetail.json
+++ b/static/approvalappdetail.json
@@ -20,7 +20,7 @@
             ],
             "second": [
                 {
-                    "name": "在线区域",
+                    "name": "在线状态",
                     "text": "平台应用"
                 },
                 {
diff --git a/yarn.lock b/yarn.lock
index a54741ff02285cd41f990c1166c7eaf7fba629cf..d907cfe763624d0060716ab6ac851fe97964f379 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2706,6 +2706,11 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+echarts-liquidfill@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npm.taobao.org/echarts-liquidfill/download/echarts-liquidfill-2.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts-liquidfill%2Fdownload%2Fecharts-liquidfill-2.0.6.tgz#0668dc61d87a6262003090bd32c55aa8108c252e"
+  integrity sha1-BmjcYdh6YmIAMJC9MsVaqBCMJS4=
+
 echarts@^4.8.0:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.8.0.tgz#b2c1cfb9229b13d368ee104fc8eea600b574d4c4"
@@ -7528,6 +7533,16 @@ xtend@^4.0.0, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
+xterm-addon-fit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npm.taobao.org/xterm-addon-fit/download/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193"
+  integrity sha1-BuDF0KaqrPsAnvVl76HIHpPZAZM=
+
+xterm@^4.7.0:
+  version "4.8.1"
+  resolved "https://registry.npm.taobao.org/xterm/download/xterm-4.8.1.tgz#155a1729a43e1a89b406524e22c5634339e39ca1"
+  integrity sha1-FVoXKaQ+Gom0BlJOIsVjQznjnKE=
+
 xxhashjs@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
@@ -7550,6 +7565,18 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yaml2json@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/yaml2json/download/yaml2json-1.0.2.tgz#3ab846deb87c062d9904e143c6947128d488c119"
+  integrity sha1-OrhG3rh8Bi2ZBOFDxpRxKNSIwRk=
+  dependencies:
+    yaml "0.2.x"
+
+yaml@0.2.x:
+  version "0.2.3"
+  resolved "https://registry.npm.taobao.org/yaml/download/yaml-0.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyaml%2Fdownload%2Fyaml-0.2.3.tgz#b5450e92e76ef36b5dd24e3660091ebaeef3e5c7"
+  integrity sha1-tUUOkudu82td0k42YAkeuu7z5cc=
+
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"