fix

src/components/charts.vue

@@ -117,10 +117,11 @@ export default Vue.extend({
       // 接下来的使用就跟之前一样，初始化图表，设置配置项
       // filters: ['D1', 'W1', 'M1', 'Y1'],
       const times = this.generate()
+      times &&
         statSearch(times).then((ret) => {
           if (ret.error == null) {
             this.xData = ret.result
-          var myChart = echarts.init(this.$refs.charts, null)
+            var myChart = echarts.init(this.$refs.charts as HTMLElement)
             myChart.setOption({
               xAxis: {
                 type: 'category',
@@ -137,7 +138,7 @@ export default Vue.extend({
               series: [
                 {
                   data: this.xData
-                  .map((i) => (i && i[0] && i[0].tx_count) || 0)
+                    .map((i: any) => (i && i[0] && i[0].tx_count) || 0)
                     .reverse(),
                   type: 'line',
                   areaStyle: {},

src/components/pc/BlockChainBrowser/AddressOverview/index.vue

 <template>
-  <div class="container">
+  <div class="_container">
     <div class="top flex items-center">
       <div class="address_label mr-2.5 my-title">
         {{ $t('lang.address.address') }}
@@ -59,7 +59,7 @@ export default VueTypedMixins(AddressOverview).extend({
 </script>
 
 <style lang="scss" scoped>
-.container {
+._container {
   width: 1200px;
   height: 440px;
   background: #ffffff;

src/components/pc/BlockChainBrowser/BlockOverview/LeftBox.vue

@@ -7,7 +7,7 @@
     element-loading-spinner="el-icon-loading"
   >
     <div class="flex">
-      <div class="flex left overflow-hidden flex-shrink-0">
+      <div class="flex _left overflow-hidden flex-shrink-0">
         <img
           src="@/assets/images/blockChainBrowser/blockDetail/block.png"
           class="blockIcon"
@@ -22,7 +22,7 @@
           </div>
         </div>
       </div>
-      <div class="middle flex-shrink-0">
+      <div class="_middle flex-shrink-0">
         <div class="my-title">
           {{ $t('lang.block.blockRevenue') }}
         </div>
@@ -30,7 +30,7 @@
           {{ $route.query.height | filterBlockReward }}
         </div>
       </div>
-      <div class="right flex-shrink-0">
+      <div class="_right flex-shrink-0">
         <div class="my-title">
           {{ $t('lang.block.txCount') }}
         </div>
@@ -108,14 +108,14 @@ export default Vue.extend({
   height: 52px;
   margin-right: 20px;
 }
-.left {
+._left {
   width: 360px;
 }
-.middle {
+._middle {
   width: 260px;
 }
 
-.right {
+._right {
   width: 220px;
 }
 .theTitle {

src/components/pc/BlockChainBrowser/ChainOverview/ChainTxNumberChart.vue

 <template>
-  <div class="container shadow-shadow1 bg-white" style="padding: 30px;">
+  <div class="_container shadow-shadow1 bg-white" style="padding: 30px;">
     <div class="flex justify-between">
       <div class="text-darkBlue text-lg font-bold">
         {{ $t('lang.chainPerf.txNumberOnTheChain') }}
@@ -37,7 +37,7 @@ export default Vue.extend({
 </script>
 
 <style scoped>
-.container {
+._container {
   height: 280px;
   border-radius: 4px;
 }

src/components/pc/BlockChainBrowser/DataFilter/index.vue

@@ -5,6 +5,7 @@
     </div>
     <div>
       <MySelect
+        v-if="!hideSelect"
         style="width: 310px;"
         :selectedValue="value"
         :optionList="optionList"
@@ -26,6 +27,9 @@ export default Vue.extend({
     value: [String, Number],
     setValue: Function,
     optionList: Array as PropType<iOptionItem[]>,
+    hideSelect: {
+      type: Boolean,
+    },
   },
   data() {
     return {}

src/mixin/blockChainBrowser.ts

@@ -3,7 +3,15 @@ import { getLatestBlock } from "ycc-api/dist/cmjs/service/home/index";
 import { iBlockMsg } from "ycc-api/dist/cmjs/service/home/types";
 import { getRpc } from "ycc-api/src/service/Rpc";
 import Base64 from "@/utils/_base64";
-import { blockStatStatGets, getAccountCount, getTxList } from "@/service/api";
+import moment from "moment";
+
+import {
+  blockStatStatGets,
+  getAccountCount,
+  getAllPos33TicketCount,
+  getTxCountBewteenTimes,
+  getTxList,
+} from "@/service/api";
 export default Vue.extend({
   data() {
     return {
@@ -18,9 +26,26 @@ export default Vue.extend({
       tps: 0,
       addressNumber: 0,
       latestTxs: [],
+      ticketCount: 0,
     };
   },
   mounted() {
+    getTxCountBewteenTimes(
+      moment().unix(),
+      moment()
+        .add(24, "hour")
+        .unix()
+    ).then((res) => {
+      if (res.error === null) {
+        this.tps = Number(((res.result / 24) * 60 * 60).toFixed(2));
+      }
+    });
+
+    getAllPos33TicketCount().then((ret) => {
+      if (ret.error === null) {
+        this.ticketCount = ret.result;
+      }
+    });
     getAccountCount().then((ret) => {
       if (ret.error === null) {
         this.addressNumber = ret.result;
@@ -39,7 +64,6 @@ export default Vue.extend({
         }));
       }
     });
-    this.getSpeed();
   },
   methods: {
     getSpeed() {
@@ -49,11 +73,10 @@ export default Vue.extend({
           const lastBlock = res.result[1];
           const perTime =
             (lastBlock.time - fatherBlock.time) / (this.latestHeight - 725000);
-          const perTxCount =
-            (lastBlock.tx_count - fatherBlock.tx_count) /
-            (lastBlock.time - fatherBlock.time);
-          this.tps = perTime;
-          this.tps = perTxCount;
+          // const perTxCount =
+          //   (lastBlock.tx_count - fatherBlock.tx_count) /
+          //   (lastBlock.time - fatherBlock.time);
+          this.speed = perTime;
         }
       });
     },
@@ -104,7 +127,7 @@ export default Vue.extend({
         this.latestHeight = lastHeaderRet.result.height;
         this.$store.commit("saveMaxHeight", this.latestHeight);
         const str = this.hexCharCodeToStr(lastHeaderRet.result.hash);
-
+        this.getSpeed();
         fetch("/market")
           .then((ret) => ret.json())
           .then((ret) => {
@@ -151,7 +174,7 @@ export default Vue.extend({
         {
           icon: require("@/assets/images/blockChainBrowser/home/pledgeQuantity.png"),
           title: this.$t("lang.chainMsg.pledgeQuantity"),
-          number: 102938,
+          number: this.ticketCount,
         },
       ];
     },

src/mixin/componentsMixin/AddressOverview.ts

 import Vue from "vue";
 import QRCode from "qrcode";
+import { getAddressTxCount } from "@/service/api";
 export default Vue.extend({
   data() {
-    return {};
+    return {
+      txCount: 0,
+    };
   },
   mounted() {
     this.init();
+    getAddressTxCount(this.$route.query.address as string).then((ret) => {
+      if (ret.error === null) {
+        this.txCount = ret.result;
+      }
+    });
   },
   activated() {
     this.init();
   },
   computed: {
-    tradeInTotalList() {
+    tradeInTotalList(): any {
       return [
         {
           name: this.$t("lang.address.totalReception"),
@@ -23,7 +31,7 @@ export default Vue.extend({
         },
         {
           name: this.$t("lang.block.txCount"),
-          value: "100YCC",
+          value: this.txCount,
         },
         {
           name: this.$t("lang.address.totalValue"),

src/service/api.ts

@@ -172,3 +172,62 @@ export function statSearch(times: number[]) {
     },
   });
 }
+
+export function getAddressTxCount(addr: string) {
+  return axios(expandApi, {
+    method: "post",
+    params: {
+      id: 1,
+      method: "Tx.TxCount",
+      params: [
+        {
+          match_one: [
+            {
+              key: "from",
+              value: addr,
+            },
+            {
+              key: "to",
+              value: addr,
+            },
+          ],
+          match: [],
+        },
+      ],
+    },
+  });
+}
+
+export function getAllPos33TicketCount() {
+  return axios("/yccApi", {
+    method: "post",
+    params: {
+      method: "pos33.GetAllPos33TicketCount",
+      params: [{}],
+    },
+  });
+}
+
+export function getTxCountBewteenTimes(
+  startUnixTime: number,
+  endUnixTime: number
+) {
+  return axios(expandApi, {
+    method: "post",
+    params: {
+      id: 1,
+      method: "Tx.TxCount",
+      params: [
+        {
+          range: [
+            {
+              start: startUnixTime,
+              end: endUnixTime,
+              key: "block_time",
+            },
+          ],
+        },
+      ],
+    },
+  });
+}

src/views/mobile/blockDetail/index.vue

@@ -21,12 +21,12 @@
         :setFocusedTab="setFocusedTab"
       ></m-tabs>
       <div class="bg-white px-4">
-        <Select
+        <!-- <Select
           v-if="focusedTab === 'txRecordTab'"
           :selectedValue="txRecordFilterValue"
           :optionList="txRecordFilterOptionList"
           @change="(v) => (txRecordFilterValue = v)"
-        ></Select>
+        ></Select> -->
       </div>
       <div class="bg-white px-4">
         <Select

src/views/pc/blockDetail/index.vue

@@ -22,12 +22,7 @@
         :setFocusedTab="(v) => (focusedTab = v)"
         :focusedTab="focusedTab"
       ></TabList>
-      <DataFilter
-        v-if="focusedTab === 'txRecordTab'"
-        :optionList="txRecordFilterOptionList"
-        :setValue="(v) => (txRecordFilterValue = v)"
-        :value="txRecordFilterValue"
-      >
+      <DataFilter v-if="focusedTab === 'txRecordTab'" :hideSelect="true">
         <template #left>
           {{ $t('lang.trade.txTotal', [pages.total]) }}
         </template>

vue.config.js

@@ -22,8 +22,8 @@ module.exports = {
         changeOrigin: true,
       },
       "/yccApi": {
-        // target: "https://mainnet.yuan.org/api",
-        target: "http://13.115.171.240:7901/",
+        target: "https://mainnet.yuan.org/api",
+        // target: "http://13.115.171.240:7901/",
         pathRewrite: {
           "^/yccApi": "",
         },