超管运行管控

src/components/apass-table.vue

@@ -132,9 +132,9 @@
                 :styles="item.prop == 'cpu' ? spCurveStyles2 : spCurveStyles3"
               />
             </sparkline>
-            <span class="use" v-if="item.prop == 'cpu' && scope.row.cpu_use"
-              >{{ scope.row["cpu_use"] }}.00mm</span
-            >
+            <span class="use" v-if="item.prop == 'cpu' && scope.row.cpu_use">
+              {{ scope.row["cpu_use"] }}.00mm
+            </span>
             <span
               class="use"
               :style="
@@ -143,13 +143,15 @@
                   : { right: '25px', bottom: '8px' }
               "
               v-if="item.prop == 'cpu' && !scope.row.cpu_use"
-              >0mm</span
             >
+              0mm
+            </span>
             <span
               class="use"
               v-if="item.prop == 'mermoy' && scope.row.memory_use"
-              >{{ (scope.row["memory_use"]/1024/1024).toFixed(2)}}Mi</span
             >
+              {{ (scope.row["memory_use"] / 1024 / 1024).toFixed(2) }}Mi
+            </span>
             <span
               class="use"
               :style="
@@ -208,6 +210,12 @@
             :class="'index_' + scope.row.hotIndex"
             v-text="'TOP' + scope.row.hotIndex"
           ></span>
+          <span
+            v-else-if="item.type === 'hot-index-2'"
+            class="hot_index"
+            :class="'index_' + scope.row.hotIndex"
+            v-text="scope.row.hotIndex + '.'"
+          ></span>
           <span class="sort_table" v-else-if="item.sortable">
             <span>{{ getPercent(scope.row[item.prop]) }}</span>
             <span>
@@ -218,6 +226,16 @@
               <img v-else :src="require('../assets/imgs/icon_down.png')" />
             </span>
           </span>
+          <span class="sort_table" v-else-if="item.sortIcon">
+            <span>{{ scope.row[item.prop] + "%" }}</span>
+            <span>
+              <img
+                v-if="scope.row[item.prop] > 0"
+                :src="require('../assets/imgs/icon_up.png')"
+              />
+              <img v-else :src="require('../assets/imgs/icon_down.png')" />
+            </span>
+          </span>
           <span
             v-else-if="item.type === 'selected-icon'"
             class="selected_icon"

src/components/e-charts/bar-chart-two.vue

@@ -36,12 +36,16 @@ export default {
       type: Number,
       default: 0,
     },
+    xAxis_text_length: {
+      type: Number,
+      default: 0,
+    },
   },
   methods: {
     bar() {
-      let _self = this;
-      let xAxis = (_self.data && _self.data.xAxis) || [];
-      let series = (_self.data && _self.data.series) || [{}, {}];
+      let self = this;
+      let xAxis = (self.data && self.data.xAxis) || [];
+      let series = (self.data && self.data.series) || [{}, {}];
 
       return {
         grid: {
@@ -71,16 +75,22 @@ export default {
               fontSize: 12,
             },
             interval: 0,
-            rotate: _self.x_router,
-            /* formatter: function(value) {
-              let valueTxt = "";
-              if (value.length > 6) {
-                valueTxt = value.substring(0, 5) + "...";
+            rotate: self.x_router,
+            formatter: function(value) {
+              let maxLen = self.xAxis_text_length;
+
+              if (maxLen > 1) {
+                let valueTxt = "";
+                if (value.length > maxLen) {
+                  valueTxt = value.substring(0, maxLen - 1) + "...";
+                } else {
+                  valueTxt = value;
+                }
+                return valueTxt;
               } else {
-                valueTxt = value;
+                return value;
               }
-              return valueTxt;
-            }, */
+            },
           },
           axisLine: {
             lineStyle: {
@@ -132,7 +142,7 @@ export default {
           {
             type: "bar",
             type: "bar",
-            barWidth: _self.bar_width,
+            barWidth: self.bar_width,
             itemStyle: {
               normal: {
                 color: function(params) {
@@ -144,17 +154,17 @@ export default {
                     [
                       {
                         offset: 0,
-                        color: _self.colors[0], // 0% 处的颜色
+                        color: self.colors[0], // 0% 处的颜色
                       },
                       {
                         offset: 1,
-                        color: _self.colors[0], // 100% 处的颜色
+                        color: self.colors[0], // 100% 处的颜色
                       },
                     ],
                     false
                   );
                 },
-                barBorderRadius: _self.bar_border_radius,
+                barBorderRadius: self.bar_border_radius,
               },
             },
             name: series[0].name,
@@ -163,7 +173,7 @@ export default {
           {
             type: "bar",
             type: "bar",
-            barWidth: _self.bar_width,
+            barWidth: self.bar_width,
             itemStyle: {
               normal: {
                 color: function(params) {
@@ -175,17 +185,17 @@ export default {
                     [
                       {
                         offset: 0,
-                        color: _self.colors[1], // 0% 处的颜色
+                        color: self.colors[1], // 0% 处的颜色
                       },
                       {
                         offset: 1,
-                        color: _self.colors[1], // 100% 处的颜色
+                        color: self.colors[1], // 100% 处的颜色
                       },
                     ],
                     false
                   );
                 },
-                barBorderRadius: _self.bar_border_radius,
+                barBorderRadius: self.bar_border_radius,
               },
             },
             name: series[1].name,

src/pages/authority/organization/organizationdetail.vue

@@ -317,9 +317,14 @@ export default {
   color: #242c43;
 }
 .organtable {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: stretch;
   margin-top: 20px;
+  margin-bottom: 40px;
   width: 100%;
-  height: calc(100% - 210px);
+  min-height: calc(100% - 250px);
   background-color: #fff;
   box-shadow: 0px 3px 6px 0px #f4f7fc;
   border-radius: 12px;
@@ -345,4 +350,10 @@ export default {
 .organtable .elinput {
   float: right;
 }
+.organtable .apass_table {
+  flex-grow: 1;
+}
+.organtable .comments_pagination {
+  margin-top: 20px;
+}
 </style>

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

@@ -814,8 +814,10 @@ export default {
 
 <style>
 .hot-search-table .el-table td,
-.hot-search-table .el-table th {
+.hot-search-table .el-table th,
+.hot-search-table .el-table .row_action .btn {
   padding: 6px 0;
+  font-size: 12px;
 }
 .hot-search-table .el-table div.row_action {
   overflow: hidden;

src/pages/data-analysis/org-overview.vue

@@ -73,7 +73,10 @@
               title="服务注册发布数量排名"
               class="block"
             >
-              <bar-charttwo :data="servRegRank"></bar-charttwo>
+              <bar-chart-two
+                :data="servRegRank"
+                :xAxis_text_length="5"
+              ></bar-chart-two>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
@@ -145,7 +148,7 @@
 <script>
 import BlockRadius from "@/components/general/block-radius";
 import lineChart from "@/components/e-charts/line_chart";
-import BarCharttwo from "@/components/e-charts/bar-chart-two";
+import BarChartTwo from "@/components/e-charts/bar-chart-two";
 import BarChart from "@/components/e-charts/bar-chart";
 import Toplist from "@/components/e-charts/toplist";
 import theList from "@/components/e-charts/the-list";
@@ -154,7 +157,7 @@ export default {
   components: {
     BlockRadius,
     lineChart,
-    BarCharttwo,
+    BarChartTwo,
     BarChart,
     Toplist,
     theList,