后台能力运行监控

back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue

@@ -6,14 +6,14 @@
         <img src="~@/assets/img/CapabilityOperationMonitoring/API-allNum.png" />
         <div>
           <h4>API总数</h4>
-          <p>99999</p>
+          <p>{{ Apisnum }}</p>
         </div>
       </div>
       <div class="ApiBox">
         <img src="~@/assets/img/CapabilityOperationMonitoring/API-badNum.png" />
         <div>
           <h4>异常API总数</h4>
-          <p>99999</p>
+          <p>{{ ApisnumShiBai }}</p>
         </div>
       </div>
     </div>
@@ -24,12 +24,23 @@
         <div class="RankingList">
           <h4 class="title">API异常次数排行TOP10</h4>
           <ul>
-            <li class="RankingListData" v-for="(item, index) in RankingData" :key="index">
+            <li
-              <i><b>{{ index + 1 }}</b></i>
+              class="RankingListData"
-              <el-tooltip class="item" effect="dark" :content="item.name" placement="top">
+              v-for="(item, index) in RankingData"
+              :key="index"
+            >
+              <i
+                ><b>{{ index + 1 }}</b></i
+              >
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.name"
+                placement="top"
+              >
                 <h6>{{ item.name }}</h6>
               </el-tooltip>
-              <span>{{ item.num }}</span>
+              <span>{{ item.count }}</span>
             </li>
           </ul>
         </div>
@@ -45,24 +56,62 @@
           <h4 class="title">API异常次数统计</h4>
           <div class="AnomalyStatisticsTable">
             <el-table :data="AnomalyStatisticsTable" border style="width: 100%">
-              <el-table-column prop="name" label="接口名称" width="80" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="name"
+                label="接口名称"
+                width="80"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="address" label="接口地址" width="200" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="address"
+                label="接口地址"
+                width="200"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="method" label="调用方法" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="method"
+                label="调用方法"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="type" label="组件类型" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="type"
+                label="组件类型"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="provider" label="提供商" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="provider"
+                label="提供商"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="state" label="监控状态" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="state"
+                label="监控状态"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
             </el-table>
           </div>
           <!-- 分页 -->
           <div class="tablePagination">
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            <el-pagination
-              :current-page="currentPage4" :page-size="5" layout="total, prev, pager, next, jumper" :total="total">
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage4"
+              :page-size="5"
+              layout="total, prev, pager, next, jumper"
+              :total="total"
+            >
             </el-pagination>
           </div>
         </div>
@@ -72,55 +121,26 @@
 </template>
 <script>
 import * as echarts from 'echarts'
-
+import * as moment from 'moment'
 export default {
   // components: {},
-  // props: {},
+  props: {
+    callTheTrendData: {
+      type: Object,
+      default: () => {}
+    },
+    timeSwitchindex: {
+      type: String,
+      default: () => {}
+    }
+  },
   data () {
     return {
+      endAndstartTime: {},
+      ApisnumShiBai: '',
+      Apisnum: '',
       // 排行榜
-      RankingData: [
+      RankingData: [],
-        {
-          name: '能力名称一能力名称一能力名称一能力名称一能力名称一',
-          num: '239'
-        },
-        {
-          name: '能力名称二',
-          num: '222'
-        },
-        {
-          name: '能力名称三',
-          num: '123'
-        },
-        {
-          name: '能力名称四',
-          num: '88'
-        },
-        {
-          name: '能力名称五',
-          num: '88'
-        },
-        {
-          name: '能力名称六',
-          num: '88'
-        },
-        {
-          name: '能力名称七',
-          num: '88'
-        },
-        {
-          name: '能力名称八',
-          num: '88'
-        },
-        {
-          name: '能力名称九',
-          num: '88'
-        },
-        {
-          name: '能力名称十',
-          num: '88'
-        }
-      ],
       // 表格
       AnomalyStatisticsTable: [
         {
@@ -174,6 +194,181 @@ export default {
     // 分页
     this.total = this.AnomalyStatisticsTable.length
   },
+  watch: {
+    callTheTrendData: {
+      deep: true,
+      handler () {
+        this.endAndstartTime = this.callTheTrendData
+        if (this.endAndstartTime.end !== this.endAndstartTime.start) {
+          if (this.timeSwitchindex === '周') {
+            // API总数（周）
+            this.$http
+              .get(
+                `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[7d]))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.Apisnum = parseInt(res.data.data.result[0].value[1])
+                // API异常总数(周)
+                this.$http
+                  .get(
+                    `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[7d]))&time=${this.callTheTrendData.end}`
+                  )
+                  .then((resSon) => {
+                    this.ApisnumShiBai = parseInt(
+                      this.Apisnum - resSon.data.data.result[0].value[1]
+                    )
+                  })
+              })
+            // API异常分析(周)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[7d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.RankingData = res.data.data
+              })
+            // // API异常次数统计(周)
+            // this.$http
+            //   .get(
+            //     `/metrics/api/v1/query?query=topk(10, sum(increase(apigateway_http_status{code != "200"}[7d])) by (matched_uri))&time=${this.callTheTrendData.end}`
+            //   )
+            //   .then((res) => {
+            //     debugger
+            //   })
+          } else if (this.timeSwitchindex === '月') {
+            // API总数（月）
+            this.$http
+              .get(
+                `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[30d]))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.Apisnum = parseInt(res.data.data.result[0].value[1])
+                // API异常总数(月)
+                this.$http
+                  .get(
+                    `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[30d]))&time=${this.callTheTrendData.end}`
+                  )
+                  .then((resSon) => {
+                    this.ApisnumShiBai = parseInt(
+                      this.Apisnum - resSon.data.data.result[0].value[1]
+                    )
+                  })
+              })
+            // API异常分析(月)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[30d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.RankingData = res.data.data
+              })
+          } else if (this.timeSwitchindex === '时间段') {
+            // API总数（时间段）
+            this.$http
+              .get(
+                `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[${
+                  this.callTheTrendData.end - this.callTheTrendData.start
+                }s:1s]))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.Apisnum = parseInt(res.data.data.result[0].value[1])
+                // API异常总数(时间段)
+                this.$http
+                  .get(
+                    `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[${
+                      this.callTheTrendData.end - this.callTheTrendData.start
+                    }s:1s]))&time=${this.callTheTrendData.end}`
+                  )
+                  .then((resSon) => {
+                    this.ApisnumShiBai = parseInt(
+                      this.Apisnum - resSon.data.data.result[0].value[1]
+                    )
+                  })
+              })
+            // API异常分析(时间段)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[${
+                  this.callTheTrendData.end - this.callTheTrendData.start
+                }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                  this.callTheTrendData.end
+                }`
+              )
+              .then((res) => {
+                this.RankingData = res.data.data
+              })
+          }
+        } else {
+          // API总数（日）
+          this.$http
+            .get(
+              `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[1d]))&time=${this.callTheTrendData.end}`
+            )
+            .then((res) => {
+              this.Apisnum = parseInt(res.data.data.result[0].value[1])
+              // API异常总数(日)
+              this.$http
+                .get(
+                  `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[1d]))&time=${this.callTheTrendData.end}`
+                )
+                .then((resSon) => {
+                  this.ApisnumShiBai = parseInt(
+                    this.Apisnum - resSon.data.data.result[0].value[1]
+                  )
+                })
+            })
+          // API异常分析(日)
+          this.$http
+            .get(
+              `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[1d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+            )
+            .then((res) => {
+              this.RankingData = res.data.data
+            })
+        }
+      }
+    },
+    timeSwitchindex: {
+      handler () {
+        if (this.timeSwitchindex === '时间段') {
+          // API总数（时间段）
+          this.$http
+            .get(
+              `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[${
+                this.callTheTrendData.end - this.callTheTrendData.start
+              }s:1s]))&time=${this.callTheTrendData.end}`
+            )
+            .then((res) => {
+              this.Apisnum = parseInt(res.data.data.result[0].value[1])
+              // API异常总数(时间段)
+              this.$http
+                .get(
+                  `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[${
+                    this.callTheTrendData.end - this.callTheTrendData.start
+                  }s:1s]))&time=${this.callTheTrendData.end}`
+                )
+                .then((resSon) => {
+                  this.ApisnumShiBai = parseInt(
+                    this.Apisnum - resSon.data.data.result[0].value[1]
+                  )
+                })
+            })
+          // API异常分析(时间段)
+          this.$http
+            .get(
+              `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[${
+                this.callTheTrendData.end - this.callTheTrendData.start
+              }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                this.callTheTrendData.end
+              }`
+            )
+            .then((res) => {
+              this.RankingData = res.data.data
+            })
+        }
+      }
+    }
+  },
   methods: {
     // 分页
     handleSizeChange (val) {
@@ -276,7 +471,7 @@ export default {
     }
 
     .ApiBox {
-      background: url("~@/assets/img/CapabilityOperationMonitoring/bg-blue.png")
+      background: url('~@/assets/img/CapabilityOperationMonitoring/bg-blue.png')
         no-repeat;
       background-size: 100%;
       width: 22.5rem;
@@ -314,7 +509,7 @@ export default {
     }
 
     .ApiBox:last-of-type {
-      background: url("~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png")
+      background: url('~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png')
         no-repeat;
       background-size: 100%;
 

back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue

@@ -81,7 +81,7 @@
             >
               <div>{{ item.name }}</div>
             </el-tooltip>
-            <div>{{ item.snum }}</div>
+            <div>{{ item.count }}</div>
           </div>
         </div>
       </div>
@@ -98,6 +98,10 @@ export default {
     callTheTrendData: {
       type: Object,
       default: () => {}
+    },
+    timeSwitchindex: {
+      type: String,
+      default: () => {}
     }
   },
   data () {
@@ -151,56 +155,93 @@ export default {
       },
       abilityListTabData: ['请求次数', '请求失败次数', '平均延时'], // 能力排行榜tab切换
       newTab: '请求次数',
-      abilityListData: [
+      abilityListData: [] // 能力排行数据初始化
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一222222222222222222222222',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        }
-      ] // 能力排行数据初始化
     }
   },
   watch: {
-    callTheTrendData: {
+    dataRange: {
       deep: true,
       handler () {
         this.endAndstartTime = this.callTheTrendData
         if (this.endAndstartTime.end != this.endAndstartTime.start) {
+          if (this.timeSwitchindex === '周') {
+            if (this.newTab === '请求次数') {
+              // 能力排行榜请求次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[7d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                  this.abilityListData.forEach((item) => {
+                    item.count = parseInt(item.count)
+                  })
+                })
+            } else if (this.newTab === '请求失败次数') {
+              // 能力排行榜请求失败次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[7d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                })
+            }
+          } else if (this.timeSwitchindex === '月') {
+            if (this.newTab === '请求次数') {
+              // 能力排行榜请求次数(月)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[30d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                  this.abilityListData.forEach((item) => {
+                    item.count = parseInt(item.count)
+                  })
+                })
+            } else if (this.newTab === '请求失败次数') {
+              // 能力排行榜请求失败次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[30d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                })
+            }
+          } else if (this.timeSwitchindex === '时间段') {
+            if (this.newTab === '请求次数') {
+              // 能力排行榜请求次数(时间段)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[${
+                    this.callTheTrendData.end - this.callTheTrendData.start
+                  }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                    this.callTheTrendData.end
+                  }`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                  this.abilityListData.forEach((item) => {
+                    item.count = parseInt(item.count)
+                  })
+                })
+            } else if (this.newTab === '请求失败次数') {
+              // 能力排行榜请求失败次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[${
+                    this.callTheTrendData.end - this.callTheTrendData.start
+                  }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                    this.callTheTrendData.end
+                  }`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                })
+            }
+          }
           this.$http
             .get(
               '/metrics/api/v1/query?' +
@@ -240,6 +281,29 @@ export default {
               }
             })
         } else {
+          if (this.newTab === '请求次数') {
+            // 能力排行榜请求次数(日)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[1d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.abilityListData = res.data.data
+                this.abilityListData.forEach((item) => {
+                  item.count = parseInt(item.count)
+                })
+              })
+          } else if (this.newTab === '请求失败次数') {
+            // 能力排行榜请求失败次数(周)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[1d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.abilityListData = res.data.data
+              })
+          }
+
           this.$http
             .get(
               '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=' +
@@ -282,7 +346,6 @@ export default {
             )
             .then((res) => {
               if (res.data.data.result[0]) {
-                debugger
                 this.requestOverviewData[3].tatol = parseInt(
                   res.data.data.result[0].value[1]
                 )
@@ -406,7 +469,6 @@ export default {
                 86400
             )
             .then((res) => {
-              debugger
               if (res.data.data.result[0]) {
                 res.data.data.result[0].values.map((item, index) => {
                   this.shuJuLiuLiang.ruvalue.push(
@@ -422,9 +484,39 @@ export default {
         }
         console.log('this.endAndstartTime', this.endAndstartTime)
       }
+    },
+    timeSwitchindex: {
+      handler () {
+        if (this.timeSwitchindex === '时间段' && this.newTab === '请求次数') {
+          // 能力排行榜请求次数(时间段)
+          this.$http
+            .get(
+              `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[${
+                this.callTheTrendData.end - this.callTheTrendData.start
+              }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                this.callTheTrendData.end
+              }`
+            )
+            .then((res) => {
+              this.abilityListData = res.data.data
+              this.abilityListData.forEach((item) => {
+                item.count = parseInt(item.count)
+              })
+            })
+        }
+      }
+    }
+  },
+  computed: {
+    dataRange () {
+      const { timeSwitchindex, callTheTrendData, newTab } = this
+      return {
+        timeSwitchindex,
+        callTheTrendData,
+        newTab
+      }
     }
   },
-  computed: {},
   methods: {
     // echarts通用方法
     // 请求趋势图

back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue

@@ -40,16 +40,22 @@
             :picker-options="pickerOptions1"
           >
           </el-date-picker>
-          <el-button type="primary" round>确定</el-button>
+          <el-button type="primary" round @click="switchTimeFunction()"
+            >确定</el-button
+          >
         </div>
       </div>
     </div>
     <div class="capability-operation-monitoring-center">
-      <abnormal-situation></abnormal-situation>
+      <abnormal-situation
+        :callTheTrendData="callTheTrendData"
+        :timeSwitchindex="timeSwitchindex"
+      ></abnormal-situation>
     </div>
     <div class="capability-operation-monitoring-bottom">
       <analysis-of-the-request
         :callTheTrendData="callTheTrendData"
+        :timeSwitchindex="timeSwitchindex"
       ></analysis-of-the-request>
     </div>
   </div>
@@ -67,8 +73,9 @@ export default {
   data () {
     return {
       timeSwitchindex: '日',
-      timeStart: '',
+      timeStart: new Date(),
-      timeEnd: '',
+      leftAndrightTime: 0,
+      timeEnd: new Date(),
       pickerOptions0: {
         disabledDate: (time) => {
           if (this.timeEnd != '') {
@@ -87,29 +94,53 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    timeSwitchindex: {
+      handler () {
+        var time = new Date()
+        switch (this.timeSwitchindex) {
+          case '日':
+            this.timeStart = time
+            this.timeEnd = time
+            break
+          case '周':
+            this.timeStart = new Date(time.getTime() - 168 * 60 * 60 * 1000)
+            this.timeEnd = time
+            break
+          case '月':
+            this.timeStart = new Date(time.getTime() - 720 * 60 * 60 * 1000)
+            this.timeEnd = time
+        }
+      }
+    },
+    timeStart: {
+      handler () {
+        this.callTheTrendData.start = parseInt(this.timeStart / 1000)
+      }
+    },
+    timeEnd: {
+      handler () {
+        this.callTheTrendData.end = parseInt(this.timeEnd / 1000)
+      }
+    }
+  },
   computed: {},
   methods: {
+    switchTimeFunction () {
+      this.timeSwitchindex = '时间段'
+    },
     timeSwitch (name) {
       this.timeSwitchindex = name
-      if (name == '周') {
+      if (name === '周') {
         const start = parseInt(
           (Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000
         )
         this.callTheTrendData.start = start
-        console.log(
+      } else if (name === '月') {
-          'this.callTheTrendData',
-          parseInt((Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000)
-        )
-      } else if (name == '月') {
         const start = parseInt(
           (Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000
         )
         this.callTheTrendData.start = start
-        console.log(
-          'this.callTheTrendData',
-          parseInt((Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000)
-        )
       } else {
         this.callTheTrendData.start = Date.parse(new Date()) / 1000
         this.callTheTrendData.end = Date.parse(new Date()) / 1000

back/src/views/modules/workBench/api.js

@@ -1,152 +1,148 @@
 // /resource/getByDept
-import http from '@/utils/request';
+import http from '@/utils/request'
 
 function Request({
-    methods, url, data, success, fali
+  methods, url, data, success, fali
 }) {
-    let _key = methods == 'get' ? 'params' : 'data';
+  const _key = methods == 'get' ? 'params' : 'data'
-    return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
-        http[methods](url, {
+    http[methods](url, {
-            [_key]: data
+      [_key]: data
-        }).then(res => {
+    }).then(res => {
-            resolve(res)
+      resolve(res)
-        }, err => {
+    }, err => {
-            reject(err)
+      reject(err)
-        })
     })
-
+  })
 }
 function RequestPost({
-    methods, url, data, success, fali
+  methods, url, data, success, fali
 }) {
-    return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
-        http[methods](url, 
+    http[methods](url,
-            data
+      data
-        ).then(res => {
+    ).then(res => {
-            resolve(res)
+      resolve(res)
-        }, err => {
+    }, err => {
-            reject(err)
+      reject(err)
-        })
     })
-
+  })
 }
 
 // /resource/getByDept:获取当前登录用户所在部门发布的资源
 
 // 部门待办列表
 export const getToDoTask = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/act/task/deptToDoTaskPage',
+    url: '/act/task/deptToDoTaskPage',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
 // 部门已办列表
 export const getHasToDoTask = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/act/his/getDeptHandledInstancePage',
+    url: '/act/his/getDeptHandledInstancePage',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
 // 上架统计《====》饼图
 export const getTotalByDept = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/resource/selectTotalByDept',
+    url: '/resource/selectTotalByDept',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
-
 // 部门申请
 export const getApply = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/resource/selectTotalApplyByDept',
+    url: '/resource/selectTotalApplyByDept',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
 // 部门需求
 export const getRequire = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/demanData/selectFlagCountByDepts',
+    url: '/demanData/selectFlagCountByDepts',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
 // 频率top5
 export const getFrequence = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/resource/selectDeptResourceByApplyNum', 
+    url: '/resource/selectDeptResourceByApplyNum',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
 // 部门发布动态
 export const getResourceByDept = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        // url: '/resource/getByDept',
+    // url: '/resource/getByDept',
-        url: '/workdynamics/getDeptWork',
+    url: '/workdynamics/getDeptWork',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 
 // 部门能力推荐
 export const getApplyByDept = (data, success, fail) => {
-    Request({
+  Request({
-        methods: 'get',
+    methods: 'get',
-        url: '/resource/getApplyByDept',
+    url: '/resource/getApplyByDept',
-        data
+    data
-    }).then(res => {
+  }).then(res => {
-        success && success(res)
+    success && success(res)
-    }).catch(err => {
+  }).catch(err => {
-        fail && fail(err)
+    fail && fail(err)
-    })
+  })
 }
 // 部门发布能力被调用趋势
 export const getByDept = (data, success, fail) => {
-    RequestPost({
+  RequestPost({
-        methods: 'post',
+    methods: 'get',
-        url: '/resource/trafficDeptResource',
+    url: `/gateway-monitor/queryGroupByDeptInRange?query=sum(label_replace(increase(apigateway_http_status[1d]), "deptInfo", "$1", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (deptInfo)&start=${data.startDate}&end=${data.endDate}&step=86400`
-        data
+  }).then(res => {
-    }).then(res => {
+    success && success(res)
-        success && success(res)
+  }).catch(err => {
-    }).catch(err => {
+    fail && fail(err)
-        fail && fail(err)
+  })
-    })
 }

back/src/views/modules/workBench/components/lineOption.js

@@ -1,129 +1,128 @@
 import * as echarts from 'echarts'
-//折线图
+// 折线图
 export const trendLineChart = (id, chartData, _option) => {
+  const { xaxis = [], ydata = [] } = chartData
+  let option = {
+    tooltip: {
+      trigger: 'axis'
+    },
+    grid: {
+      top: '16%',
+      left: '7%',
+      right: '7%',
+      bottom: '10%'
+    },
+    xAxis: [{
+      type: 'category',
+      boundaryGap: true,
+      axisLine: { // 坐标轴轴线相关设置。数学上的x轴
+        show: true,
+        lineStyle: {
+          color: 'rgba(138,178,241)'
+        }
+      },
+      axisLabel: { // 坐标轴刻度标签的相关设置
+        textStyle: {
+          color: '#2b2b2b',
+          margin: 15,
+          fontSize: '14'
+        }
+      },
+      axisTick: {
+        show: false
+      },
+      data: xaxis
+    }],
+    yAxis: [{
+      name: '使用量(万次)',
+      nameTextStyle: { color: '#2b2b2b' },
+      type: 'value',
+      min: 0,
+      max: 100,
+      splitNumber: 5,
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: 'rgba(255,255,255,0.1)'
+        }
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(138,178,241)'
+        }
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: '#2b2b2b',
+          margin: 15,
+          fontSize: '14'
+        }
 
-    let { xaxis = [], ydata = [], } = chartData;
+      },
-    let option = {
+      axisTick: {
-        tooltip: {
+        show: false
-            trigger: 'axis',
+      }
+    }],
+    series: [{
+      name: '使用量',
+      type: 'line',
+      showAllSymbol: true,
+      symbolSize: 0,
+      symbol: 'circle',
+      symbolSize: 5, // 设定实心点的大小
+      lineStyle: {
+        normal: {
+
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+            offset: 0,
+            color: '#0058e1'
+          }, {
+            offset: 1,
+            color: '#0058e1'
+          }])
         },
-        grid: {
+        borderColor: '#f0f'
-            top: '16%',
+      },
-            left: '7%',
+      label: {
-            right: '7%',
+        show: false
-            bottom: '10%',
+      },
-        },
+      itemStyle: {
-        xAxis: [{
+        normal: {
-            type: 'category',
+          color: '#0058ee'
-            boundaryGap: true,
+        }
-            axisLine: { //坐标轴轴线相关设置。数学上的x轴
+      },
-                show: true,
+      // 区域填充样式
-                lineStyle: {
+      areaStyle: {
-                    color: 'rgba(138,178,241)'
+        normal: {
-                },
+          // 线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
-            },
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-            axisLabel: { //坐标轴刻度标签的相关设置
+            offset: 0,
-                textStyle: {
+            color: 'rgba(0,88,225,0.16)'
-                    color: '#2b2b2b',
+          },
-                    margin: 15,
+          {
-                    fontSize: '14'
+            offset: 1,
-                },
+            color: 'rgba(0,88,225,0)'
-            },
+          }
-            axisTick: {
+          ], false),
-                show: false,
+          shadowColor: 'rgba(53,142,215, 0.9)', // 阴影颜色
-            },
+          shadowBlur: 20 // shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
-            data: xaxis,
+        }
-        }],
+      },
-        yAxis: [{
+      data: ydata
-            name: '使用量(万次)',
+    }]
-            nameTextStyle:{color:"#2b2b2b"},
+  }
-            type: 'value',
-            min: 0,
-            max: 100,
-            splitNumber: 5,
-            splitLine: {
-                show: false,
-                lineStyle: {
-                    color: 'rgba(255,255,255,0.1)'
-                }
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(138,178,241)'
-                },
-            },
-            axisLabel: {
-                show: true,
-                textStyle: {
-                    color: '#2b2b2b',
-                    margin: 15,
-                    fontSize: '14'
-                },
 
-            },
+  if (_option !== undefined) {
-            axisTick: {
+    option = Object.assign({}, option, _option)
-                show: false,
+  }
-            },
-        }],
-        series: [{
-            name: '使用量',
-            type: 'line',
-            showAllSymbol: true,
-            symbolSize: 0,
-            symbol: 'circle', 
-            symbolSize: 5,   //设定实心点的大小
-            lineStyle: {
-                normal: {
 
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+  const client = document.getElementById(id)
-                        offset: 0,
+  const myChart = echarts.init(client)
-                        color: '#0058e1'
+  const clientWidth = client.clientWidth
-                    }, {
+  const clientHeight = client.clientHeight
-                        offset: 1,
+  myChart.clear()
-                        color: '#0058e1'
+  myChart.resize({ width: clientWidth, height: clientHeight })
-                    }])
+  myChart.setOption(option)
-                },
-                borderColor: '#f0f'
-            },
-            label: {
-                show: false,
-            },
-            itemStyle: {
-                normal: {
-                    color: "#0058ee",
-                }
-            },
-            // 区域填充样式
-            areaStyle: {
-                normal: {
-                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: 'rgba(0,88,225,0.16)'
-                    },
-                    {
-                        offset: 1,
-                        color: 'rgba(0,88,225,0)'
-                    }
-                    ], false),
-                    shadowColor: 'rgba(53,142,215, 0.9)', //阴影颜色
-                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
-                }
-            },
-            data: ydata
-        }]
-    };
-
-    if (_option !== undefined) {
-        option = Object.assign({}, option, _option)
-    }
-
-    const client = document.getElementById(id);
-    let myChart = echarts.init(client);
-    const clientWidth = client.clientWidth;
-    const clientHeight = client.clientHeight;
-    myChart.clear();
-    myChart.resize({ width: clientWidth, height: clientHeight });
-    myChart.setOption(option);
 }

back/src/views/modules/workBench/components/trend-view.vue

@@ -8,108 +8,132 @@
           @click="handleTitleSwitch(idx)"
           class="top-title"
           :class="{ active: idx == selectedTitle }"
-        >{{ item }}</div>
+        >
+          {{ item }}
+        </div>
       </div>
     </content-title>
     <div id="trendId" class="trend-echart"></div>
   </div>
 </template>
 <script>
-import { trendLineChart } from "./lineOption";
+import { trendLineChart } from './lineOption'
-import contentTitle from "./content-title";
+import contentTitle from './content-title'
-import * as Apis from "../api";
+import * as Apis from '../api'
+import moment from 'moment'
 export default {
-  data() {
+  data () {
     return {
-      titles: ["近七日", "月度"],
+      titles: ['近七日', '月度'],
       selectedTitle: 0,
       trendChartData: {},
-      startDate: "",
+      startDate: '',
-      endDate:
+      endDate: Math.round(new Date() / 1000),
-        new Date().getFullYear() +
+      ydata: [],
-        "-" +
+      xaxis: []
-        (new Date().getMonth() + 1) +
+    }
-        "-" +
-        new Date().getDate()
-    };
   },
   components: {
     contentTitle
   },
-  mounted() {
+  mounted () {
-    this.initChart();
+    this.initChart()
   },
   watch: {
     selectedTitle: {
-      handler: function(newVal, oldVal) {
+      handler: function (newVal, oldVal) {
-        this.startDate = this.getData(newVal == 0 ? 7 : 30);
+        this.startDate = this.getData(newVal == 0 ? 7 : 30)
+        this.ydata = this.getday2(this.selectedTitle === 0 ? 7 : 30)
+        this.ydata.map((item) => {
+          this.xaxis.push(0)
+        })
       },
       deep: true,
       immediate: true
     }
   },
   methods: {
-    //发布动态
+    // 返回最近七天的日期
-    initChart() {
+    getday2 (index) {
+      const days = []
+      var Dates = new Date()
+      for (let i = 0; i <= 24 * (index - 1); i += 24) {
+        // 今天加上前6天
+        const dateItem = new Date(Dates.getTime() - i * 60 * 60 * 1000) // 使用当天时间戳减去以前的时间毫秒（小时*分*秒*毫秒）
+        const y = dateItem.getFullYear() // 获取年份
+        let m = dateItem.getMonth() + 1 // 获取月份js月份从0开始，需要+1
+        let d = dateItem.getDate() // 获取日期
+        m = this.addDate0(m) // 给为单数的月份补零
+        d = this.addDate0(d) // 给为单数的日期补零
+        const valueItem = y + '-' + m + '-' + d // 组合
+        days.unshift(valueItem) // 添加至数组
+      }
+      console.log('最近七天日期：', days)
+
+      return days
+    },
+
+    // 给日期加0
+    addDate0 (time) {
+      if (time.toString().length == 1) {
+        time = '0' + time.toString()
+      }
+      return time
+    },
+    // 发布动态
+    initChart () {
       Apis.getByDept(
         {
           startDate: this.startDate,
           endDate: this.endDate
         },
-        res => {
+        (res) => {
-          if (res.data.code !== 0) {
+          // if (res.data.code !== 0) {
-            return;
+          //   return
-          }
+          // }
-          this.data = res.data.data.browseDayList || [];
+          this.data = res.data.data[0].values
-          let xaxis = [],
+          this.data.map((item) => {
-            ydata = [];
+            const time = moment(item[0] * 1000).format('YYYY-MM-DD')
-          this.data.forEach(v => {
+            this.ydata.map((itemSon, indexSon) => {
-            Object.keys(v).map((key, value) => {
+              if (itemSon === time) {
-              xaxis.push(key);
+                this.xaxis[indexSon] = parseInt(item[1])
-              ydata.push(value);
+              }
-            });
+            })
-          });
+          })
-          console.log(xaxis)
-            console.log(ydata)
           this.trendChartData = {
-            xaxis: xaxis,
+            xaxis: this.ydata,
-            ydata: ydata
+            ydata: this.xaxis
-          };
+          }
           this.$nextTick(() => {
-            trendLineChart("trendId", this.trendChartData);
+            trendLineChart('trendId', this.trendChartData)
-          });
+          })
         },
-        err => {
+        (err) => {
-          console.log("err", err);
+          console.log('err', err)
         }
-      );
+      )
     },
-    handleTitleSwitch(idx) {
+    handleTitleSwitch (idx) {
-      this.selectedTitle = idx;
+      this.selectedTitle = idx
-      this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30);
+      this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30)
-      console.log(this.startDate);
+      console.log(this.startDate)
-      this.initChart();
+      this.initChart()
     },
-    getData(aa) {
+    getData (aa) {
-      let date1 = new Date(),
+      const date1 = new Date()
-        time1 =
+      const time1 =
-          date1.getFullYear() +
+        date1.getFullYear() +
-          "-" +
+        '-' +
-          (date1.getMonth() + 1) +
+        (date1.getMonth() + 1) +
-          "-" +
+        '-' +
-          date1.getDate(); //time1表示当前时间
+        date1.getDate() // time1表示当前时间
-      let date2 = new Date(date1);
+      const date2 = new Date(date1)
-      date2.setDate(date1.getDate() - aa);
+      date2.setDate(date1.getDate() - aa)
-      let time2 =
+      const time2 = Math.round(date2 / 1000)
-        date2.getFullYear() +
+      return time2
-        "-" +
-        (date2.getMonth() + 1) +
-        "-" +
-        date2.getDate();
-      return time2;
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .trend {

front/src/api/capabilityCloud.js

@@ -97,8 +97,15 @@ export function callTheTrendPort(start, end, params) {
 export function totalCallsSnum(params) {
   return request({
     url:
-      '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' +
+      `metrics/api/v1/query?query=sum(increase(apigateway_http_status))&time=${params}`,
-      params,
+    method: 'get',
+  })
+}
+//能力云图-调用成功次数
+export function totalCallsSnum2(params) {
+  return request({
+    url:
+      `metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}))&time=${params}`,
     method: 'get',
   })
 }

front/src/views/capabilityCloud/components/ComponentServices.vue

@@ -119,6 +119,7 @@
     componentServiceRank,
     callTheTrendPort,
     totalCallsSnum,
+    totalCallsSnum2,
   } from '@/api/capabilityCloud'
   import * as moment from 'moment'
   let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本
@@ -410,6 +411,13 @@
     if (!xinhaianIsShow) {
       totalCallsSnum(end).then((res) => {
         snum.value[1].num = res.data.data.result[0].value[1]
+        totalCallsSnum2(end).then((resSon) => {
+          snum.value[2].num =
+            ((snum.value[1].num - resSon.data.data.result[0].value[1]) /
+              snum.value[1].num) *
+              100 +
+            '%'
+        })
       })
     }
   }