Răsfoiți Sursa

feat(新版首页+ 标红逻辑统一)

liujing 7 luni în urmă
părinte
comite
a255d01849

+ 3 - 0
src/views/index/css/index1.css

@@ -108,6 +108,7 @@
   width: 75%;
   margin-right: 20px;
   padding:20px;
+  padding-bottom: 0;
 }
 .group_8{
   flex:1;
@@ -120,6 +121,7 @@
   width: 100%;
   /* height: 164px; */
   margin: 0 20px 20px 0;
+  cursor: pointer;
 }
 
 /* .list-items_1:nth-child(3n) {
@@ -193,6 +195,7 @@
   min-height: 4rem;
   justify-content: flex-center;
   padding:20px;
+  cursor: pointer;
 }
 
 .text-wrapper_4 {

+ 34 - 31
src/views/index/newIndex.vue

@@ -55,7 +55,7 @@
             :xs="24"
             style="margin-bottom:0.4375rem"
           >
-          <div class="list-items_1 " >
+          <div class="list-items_1 " @click="handelClick(item)">
             <div class="box_1 flex-row justify-between">
               <div class="title">
                   <span
@@ -68,12 +68,12 @@
                   />{{ item.name }}
                 </div>
                 <div class="flex-row ">
-                  <div style="cursor: pointer;" @click="handelClick(item)">
+                  <div style="cursor: pointer;">
                     <el-badge ref="badgebox" :value="item.exception_num" class="badge">
                       <img class="title_img" :src="bellpin">
                     </el-badge>
                   </div>
-                  <el-dropdown style="cursor: pointer;" @command="goDialog(item)"  trigger="click">
+                  <el-dropdown style="cursor: pointer;" @command="goDialog(item)"  >
                     <div style="width:0.15rem;text-align: center"><img class="title_img" :src="moreImg" style="margin-right:0;width:0.05rem;"></div>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item common="a">可用性计算模型</el-dropdown-item>
@@ -81,7 +81,7 @@
                   </el-dropdown>
                 </div>
             </div>
-            <div class="box_2 flex-row" @click="handelClick(item)">
+            <div class="box_2 flex-row" >
               <div class="echartsbox">
                 <div ref="gauge" class="apply_l " />
               </div>
@@ -141,7 +141,7 @@
           <div class="group_12 margintop20">
             <div class="width100 flex-row justify-between">
               <span class="text_31">帮助文档</span>
-              <span class="text_32">查看更多</span>
+              <!-- <span class="text_32">查看更多</span> -->
             </div>
             <div class="block_4 ">
               <div class="img-box" v-for="item in productList">
@@ -261,35 +261,38 @@ export default {
         type: 2,
         text: 'invoke(Request request,Resapc…',
         label: '已报错'
-      },  {
-        type: 1,
-        text: 'Servlet Process',
-        label: '已警告'
-      },  {
+      },
+      {
         type: 1,
-        text: 'processShoppingOrdeString orb…',
-        label: '已警告'
-      }, {
-        type: 2,
         text: 'Servlet Process',
-        label: '已报错'
-      },  {
-        type: 2,
-        text: 'http.status.code',
-        label: '已报错'
-      }, {
-        type: 1,
-        text: 'processShoppingOrdeString orb…',
-        label: '已警告'
-      }, {
-        type: 2,
-        text: 'http.status.code',
-        label: '已报错'
-      }, {
-        type: 1,
-        text: 'processShoppingOrdeString orb…',
         label: '已警告'
-      },]
+      },
+      // {
+      //   type: 1,
+      //   text: 'processShoppingOrdeString orb…',
+      //   label: '已警告'
+      // }, {
+      //   type: 2,
+      //   text: 'Servlet Process',
+      //   label: '已报错'
+      // },  {
+      //   type: 2,
+      //   text: 'http.status.code',
+      //   label: '已报错'
+      // }, {
+      //   type: 1,
+      //   text: 'processShoppingOrdeString orb…',
+      //   label: '已警告'
+      // }, {
+      //   type: 2,
+      //   text: 'http.status.code',
+      //   label: '已报错'
+      // }, {
+      //   type: 1,
+      //   text: 'processShoppingOrdeString orb…',
+      //   label: '已警告'
+      // }
+    ]
     }
   },
   components: {

+ 0 - 1
src/views/latency/components/TopoTree.vue

@@ -383,7 +383,6 @@ export default {
                 fill: '#E0DFE3'
               }
             })
-
             // bottom percent
             const bottomRect = group.addShape('rect', {
               attrs: {

+ 28 - 32
src/views/latency/index.vue

@@ -653,7 +653,7 @@
         >
           <div v-if="detailData.span_attributes !=null">
             <el-collapse v-model="activeNames">
-              <el-collapse-item title="Attributes" name="one">
+              <el-collapse-item title="属性" name="one">
                 <ul v-if="detailData.span_attributes !=null" class="ul_box">
                   <li v-for="(value,key) in detailData.span_attributes" :key="key">
                     <div class="ul_label">{{ key }}</div>
@@ -661,7 +661,7 @@
                   </li>
                 </ul>
               </el-collapse-item>
-              <el-collapse-item title="Resource" name="tow">
+              <el-collapse-item title="资源" name="tow">
                 <ul v-if="detailData.resource_attributes !=null" class="ul_box">
                   <li v-for="(value,key) in detailData.resource_attributes" :key="key">
                     <div class="ul_label">{{ key }}</div>
@@ -669,7 +669,7 @@
                   </li>
                 </ul>
               </el-collapse-item>
-              <el-collapse-item v-if="detailData.events_timestamp.length>0 && detailData.events_timestamp!=null" :title="'Events'+'('+ detailData.events_timestamp.length +')'" name="three">
+              <el-collapse-item v-if="detailData.events_timestamp.length>0 && detailData.events_timestamp!=null" :title="'事件'+'('+ detailData.events_timestamp.length +')'" name="three">
                 <!-- <el-collapse-item title="Events" name="three"> -->
                 <div class="events_box">
                   <el-collapse :value="activeIn">
@@ -731,14 +731,10 @@
           </div>
         </el-drawer>
 
-        <div v-if="num == 1" id="legend" class="legend" :style="{left:left}">
+        <!-- <div v-if="num == 1" id="legend" class="legend" :style="{left:left}">
           <el-card>
             <div>
-              <h2 style="margin-top:0">图例</h2>
-              <!-- <div class="listwrap">
-                <span class="value" style="color:#31a354">24.88%</span>
-                <span class="lable">延迟占比</span>
-              </div> -->
+              <h2>图例</h2>
               <div class="listwrap">
                 <span class="value">
                   <el-progress :percentage="100" status="success" :show-text="false" />
@@ -759,7 +755,7 @@
               </div>
             </div>
           </el-card>
-        </div>
+        </div> -->
       </el-card>
     </template>
   </BasicLayout>
@@ -1030,7 +1026,7 @@ export default {
     },
     status_change(row) {
       if (row.row.events_timestamp != null) {
-        if (row.row.events_timestamp.length > 0) {
+        if (row.row.events_timestamp.length > 0 || row.row.status_code == 'STATUS_CODE_ERROR' || row.row.http_code > 399) {
           return 'table-error-row'
         } else {
           return ''
@@ -1153,27 +1149,27 @@ export default {
         return arr
       }
     },
-    handleDataTree(data) {
-      const obj = {}
-      const list = []
-      data.forEach((v, k) => {
-        obj.id = v.span_id.substr(v.span_id.length - 4)
-        obj.collapsed = false
-        obj.name = v.span_name
-        obj.label = (v.duration).toFixed(2)
-        obj.rate = v.duration_persent.toFixed(2)
-        obj.status = v.status_code == 'STATUS_CODE_ERROR' ? 'R' : 'G'
-        obj.variableValue = v.duration_persent.toFixed(2)
-        obj.currency = 'ms'
-        obj.variableName = 'V1'
-        obj.variableUp = false
-        if (v.children != undefined && v.children.length > 0) {
-          obj.children = this.handleDataTree(v.children)
-        }
-        list.push(obj)
-      })
-      return list
-    },
+    // handleDataTree(data) {
+    //   const obj = {}
+    //   const list = []
+    //   data.forEach((v, k) => {
+    //     obj.id = v.span_id.substr(v.span_id.length - 4)
+    //     obj.collapsed = false
+    //     obj.name = v.span_name
+    //     obj.label = (v.duration).toFixed(2)
+    //     obj.rate = v.duration_persent.toFixed(2)
+    //     obj.status = v.status_code == 'STATUS_CODE_ERROR' ? 'R' : 'G'
+    //     obj.variableValue = v.duration_persent.toFixed(2)
+    //     obj.currency = 'ms'
+    //     obj.variableName = 'V1'
+    //     obj.variableUp = false
+    //     if (v.children != undefined && v.children.length > 0) {
+    //       obj.children = this.handleDataTree(v.children)
+    //     }
+    //     list.push(obj)
+    //   })
+    //   return list
+    // },
     handleData(data) {
       if (data.length > 0) {
         data.forEach((v, k) => {

+ 1 - 1
src/views/service/InterfaceDetail/components/LinkDetailsDrawer.vue

@@ -551,7 +551,7 @@ export default {
     },
     status_change(row) {
       if (row.row.events_timestamp != null) {
-        if (row.row.events_timestamp.length > 0) {
+        if (row.row.events_timestamp.length > 0 || row.row.status_code == 'STATUS_CODE_ERROR' || row.row.http_code > 399) {
           return 'table-error-row'
         } else {
           return ''