Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

xwx
Commit 4ad4840a4be28de318ef605a83f214cb767e955b 2 parents 0447474a 326db02b
Showing 4 changed files with 17 additions and 16 deletions
hg-monitor-web-base/src/main/resources/static/vue3/public/css/base.css
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.html
--- a/hg-monitor-web-base/src/main/resources/static/vue3/public/css/base.css
View file @4ad4840
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/public/css/base.css
View file @4ad4840
@@ -223,8 +223,9 @@ a {
 .text-link{
     text-decoration: underline;
     cursor: pointer;
-}
+    color:#1e9fff;
+}
 .border-solid{
     border: solid 1px #bbb8b8;
 }
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
View file @4ad4840
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
View file @4ad4840
@@ -3,8 +3,8 @@
         <img src="../src/style/img/fault/apm.gif" style="object-fit: contain">
         <h3 style="margin-left: 10px;color: #666666;font-size: 18px">APM</h3>
         <div style="width: calc(100% - 200px);line-height: 54px;font-size: 14px" class="align-right">
-            <a class="m-r-20"  v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
-            <a v-model="cardName" v-if="card && card.length > 0" @click="openOrCloseApm()">{{cardName}}</a>
+            <a class="m-r-20 text-link"  v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
+            <a class="text-link" v-model="cardName" v-if="card && card.length > 0" @click="openOrCloseApm()">{{cardName}}</a>
         </div>
     </div>
     <el-divider/>
@@ -34,13 +34,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #75af49;">
                     <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
+                    <h class="text-link" style="font-size: 24px;color: #75af49;" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
-                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
+                    <h class="text-link" style="font-size: 24px;color: #febb1a;" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
                 </div>
             </div>
         </div>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
View file @4ad4840
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
View file @4ad4840
@@ -13,8 +13,8 @@
             </el-tooltip>
         </div>
         <div style="width: calc(100% - 250px);line-height: 54px" class="align-right">
-            <a class="m-r-20" v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
-            <a v-model="cardName"  v-if="card && card.length > 0"  @click="openOrCloseDialtest()">{{cardName}}</a>
+            <a class="m-r-20 text-link" v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
+            <a class="text-link" v-model="cardName"  v-if="card && card.length > 0"  @click="openOrCloseDialtest()">{{cardName}}</a>
         </div>
     </div>
     <el-divider/>
@@ -44,13 +44,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;align-items: center;">
                     <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('normal')">{{ getFaultItemValue(dialTest,'normal')}}</h>
+                    <h class="text-link" style="font-size: 24px;color: #75af49;" @click="openDiagnosticItem('normal')">{{ getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;align-items: center;">
                     <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
-                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('abnormal')">{{ getFaultItemValue(dialTest,'abnormal') }}</h>
+                    <h class="text-link" style="font-size: 24px;color: #febb1a;" @click="openDiagnosticItem('abnormal')">{{ getFaultItemValue(dialTest,'abnormal') }}</h>
                 </div>
             </div>
         </div>
@@ -71,8 +71,8 @@
         <div v-else v-for="item in cardData" style="width: 190px">
             <div style="width: 190px;height: 190px;background: url(../src/style/img/fault/dialtest/disBiz.png) no-repeat;background-size: 100% 100%;padding-top: 10px;">
                 <div :style="{backgroundColor: item.color}"
-                     style="width: 80px;height: 80px;border-radius: 80px;margin: 20px auto;color: white;line-height: 80px;text-align: center;">
-                    <span>{{item.shortName}}</span>
+                     style="width: 80px;height: 80px;border-radius: 80px;margin: 20px auto;color: white;font-size:18px;display:flex;align-items:center;justify-content:center;text-align: center;">
+                    <span :style="item.shortName?(item.shortName.length>4?'padding:10px;':'padding:15px;'):''">{{item.shortName}}</span>
                 </div>
                 <div class="text-overflow-line2 align-center" style="padding: 0px 25px;">
                     <el-tooltip :content="item.taskName" placement="top" effect="light" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false">
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.html
View file @4ad4840
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.html
View file @4ad4840
@@ -12,9 +12,9 @@
                 <i class="iconfont icon-tishi" />
             </el-tooltip>
         </div>
-        <div style="width: calc(100% - 220px);line-height: 54px" class="align-right">
-            <a class="m-r-20"  v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
-            <a v-model="cardName" v-if="card && card.length > 0"  @click="openOrCloseNpm()">{{cardName}}</a>
+        <div style="width: calc(100% - 220px);line-height: 54px;" class="align-right">
+            <a class="m-r-20 text-link"  v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
+            <a class="text-link" v-model="cardName" v-if="card && card.length > 0"  @click="openOrCloseNpm()">{{cardName}}</a>
         </div>
     </div>
     <el-divider/>
@@ -44,13 +44,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #75af49;">
                     <img src="../src/style/img/fault/success.png" style="width: 20px;height: 20px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
+                    <h style="font-size: 24px;color: #75af49;" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png" style="width: 20px;height: 20px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
-                    <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
+                    <h style="font-size: 24px;color: #febb1a;" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
                 </div>
             </div>
         </div>