Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

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

@@ -121,6 +121,7 @@
     totalCallsSnum,
   } from '@/api/capabilityCloud'
   import * as moment from 'moment'
+  let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本
   let snum = ref([
     { title: '上架总量', num: '0000' },
     { title: '总调用次数(API)', num: '0' },
@@ -153,6 +154,7 @@
         (Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000
       )
       const end = Date.parse(new Date()) / 1000
+      if (!xinhaianIsShow) {
         callTheTrendPort(start, end, 86400).then((res) => {
           if (res.data.data.result) {
             res.data.data.result[0].values.splice(0, 1)
@@ -165,6 +167,9 @@
             callTheTrend(callTheTrendData.value)
           }
         })
+      } else {
+        callTheTrend(callTheTrendData.value)
+      }
     } else {
       for (let i = 0; i < 31; i++) {
         let time = moment()
@@ -177,6 +182,7 @@
         (Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000
       )
       const end = Date.parse(new Date()) / 1000
+      if (!xinhaianIsShow) {
         callTheTrendPort(start, end, 86400).then((res) => {
           if (res.data.data.result) {
             // res.data.data.result.splice(0, 1)
@@ -195,6 +201,9 @@
             callTheTrend(callTheTrendData.value)
           }
         })
+      } else {
+        callTheTrend(callTheTrendData.value)
+      }
     }
   }
   //调用趋势echarts图
@@ -355,10 +364,12 @@
   //总调用次数接口
   const TotalCallsAPI = () => {
     const end = Date.parse(new Date()) / 1000
+    if (!xinhaianIsShow) {
       totalCallsSnum(end).then((res) => {
         snum.value[1].num = res.data.data.result[0].value[1]
       })
     }
+  }
   const init = () => {
     timeSwitch(timeSwitchindex.value)
     NumberOfComponentServices()