使用率

ruoyi-ui/src/views/system/service/index.vue

@@ -45,56 +45,60 @@
 
     </div>
     <div class="flexcw">
-      <div class="carboxs boxb" style="min-width: 40%;">
+      <div class="carboxs boxb" v-if="server.jvm||server.mem" style="min-width: 40%;">
         <div class="cardbox ">
-          <div class="titbox">系统内存</div>
-          <div class="flexc" v-if="server.mem">
-            <div class="waterbox" >
-              <water-ball-chart :chartData="server.mem" :waterColors="waterColora"></water-ball-chart>
-            </div>
-            <div class="watxtbox">
-              <div class="txts">
-                <div class="tit">剩余内存</div>
-                <div class="txt">{{server.mem.free}}G</div>
-              </div>
-              <div class="txts">
-                <div class="tit">已用内存</div>
-                <div class="txt">{{server.mem.used}}G</div>
+          <template v-if="server.mem">
+            <div class="titbox">系统内存</div>
+            <div class="flexc">
+              <div class="waterbox" >
+                <water-ball-chart :chartData="server.mem" :waterColors="waterColora"></water-ball-chart>
               </div>
-              <div class="txts">
-                <div class="tit">总内存</div>
-                <div class="txt">{{server.mem.total}}G</div>
-              </div>
-              <div class="txts">
-                <div class="tit">使用率</div>
-                <div class="txt">{{server.mem.usage}}%</div>
+              <div class="watxtbox">
+                <div class="txts">
+                  <div class="tit">剩余内存</div>
+                  <div class="txt">{{server.mem.free}}G</div>
+                </div>
+                <div class="txts">
+                  <div class="tit">已用内存</div>
+                  <div class="txt">{{server.mem.used}}G</div>
+                </div>
+                <div class="txts">
+                  <div class="tit">总内存</div>
+                  <div class="txt">{{server.mem.total}}G</div>
+                </div>
+                <div class="txts">
+                  <div class="tit">使用率</div>
+                  <div class="txt">{{server.mem.usage}}%</div>
+                </div>
               </div>
             </div>
-          </div>
-          <div class="titbox" style="margin-top: 9px;">JVM内存</div>
-          <div class="flexc"  v-if="server.jvm">
-            <div class="waterbox">
-              <water-ball-chart :chartData="server.jvm" :waterColors="waterColorb"></water-ball-chart>
-            </div>
-            <div class="watxtbox">
-              <div class="txts">
-                <div class="tit">剩余内存</div>
-                <div class="txt">{{server.jvm.free}}M</div>
-              </div>
-              <div class="txts">
-                <div class="tit">已用内存</div>
-                <div class="txt">{{server.jvm.used}}M</div>
+          </template>
+          <template v-if="server.jvm">
+            <div class="titbox" style="margin-top: 9px;">JVM内存</div>
+            <div class="flexc">
+              <div class="waterbox">
+                <water-ball-chart :chartData="server.jvm" :waterColors="waterColorb"></water-ball-chart>
               </div>
-              <div class="txts">
-                <div class="tit">总内存</div>
-                <div class="txt">{{server.jvm.total}}M</div>
-              </div>
-              <div class="txts">
-                <div class="tit">使用率</div>
-                <div class="txt">{{server.jvm.usage}}%</div>
+              <div class="watxtbox">
+                <div class="txts">
+                  <div class="tit">剩余内存</div>
+                  <div class="txt">{{server.jvm.free}}M</div>
+                </div>
+                <div class="txts">
+                  <div class="tit">已用内存</div>
+                  <div class="txt">{{server.jvm.used}}M</div>
+                </div>
+                <div class="txts">
+                  <div class="tit">总内存</div>
+                  <div class="txt">{{server.jvm.total}}M</div>
+                </div>
+                <div class="txts">
+                  <div class="tit">使用率</div>
+                  <div class="txt">{{server.jvm.usage}}%</div>
+                </div>
               </div>
             </div>
-          </div>
+          </template>
         </div>
       </div>
 
@@ -221,9 +225,9 @@ export default {
     clearInterval(this.timer)
     var that=this;
     that.getList()
-    this.timer=setInterval(()=>{
-      that.getList()
-    },10000)
+    // this.timer=setInterval(()=>{
+    //   that.getList()
+    // },10000)
     this.openLoading()
   },
   destroyed() {

ruoyi-ui/src/views/system/servicechart/gaugeaChart.vue

@@ -56,8 +56,8 @@ export default {
       this.chart = echarts.init(this.$el, 'macarons')
       this.setOptions(this.chartData)
     },
-    setOptions({ speed} = {}) {
-      const val=speed||0
+    setOptions({ used} = {}) {
+      const val=used||0
       this.chart.setOption({
          // 配置项
         series: [{
@@ -111,7 +111,7 @@ export default {
         formatter: function(value) {
           // 使用富文本标签实现换行和不同样式
               return [
-                  '{a|' + val +'}'+'GHz',
+                  '{a|' + val +'}'+'%',
                   // '{b|正常}'
               ].join('\n');
           },