同比环比请求2ci

src/views/dataManage/chainAnalysis/ehcarts/index.vue

@@ -4,11 +4,9 @@
   </div>
 </template>
 <script>
-import {defineComponent, onMounted, ref,watch } from 'vue'
+import { defineComponent, onMounted, ref, watch } from 'vue'
 import * as echarts from 'echarts'
 
-
-
 const dataAll = [
   {
     name: '本期',
@@ -40,25 +38,23 @@ const dataAll = [
 
 export default defineComponent({
   name: 'CurveCom',
-   props: {
+  props: {
     echartsDataOne: Object,
-  
   },
 
   setup(props) {
     const chainChartRef = ref(null)
 
-    
     // 读取数据 func
     const loading = ref(true)
     const getData = async () => {
-        console.log('props.echartsDataOne.name')
+      console.log('props.echartsDataOne.name')
       console.log(props.echartsDataOne.name)
       // loading.value = true
       // await store.dispatch('Home/queryWorksChartData')
       loading.value = false
     }
-    function echarts2(){
+    function echarts2() {
       let myChart = echarts.init(chainChartRef.value)
       // 绘制图表
       myChart.setOption({
@@ -96,7 +92,7 @@ export default defineComponent({
         xAxis: {
           type: 'category',
           boundaryGap: true,
-          data: props.echartsDataOne?props.echartsDataOne.listDate:'',
+          data: props.echartsDataOne ? props.echartsDataOne.listDate : '',
           axisTick: {
             show: false, //去除刻度线
           },
@@ -139,15 +135,14 @@ export default defineComponent({
         // 自适应大小
         myChart.resize()
       }
-
     }
 
     const writeValue = (val) => {
       alert(1)
       val
-     
+
       getData()
-       echarts2()
+      echarts2()
     }
 
     //监听变化
@@ -163,17 +158,15 @@ export default defineComponent({
       { lazy: true }
     )
 
-
     onMounted(() => {
       getData()
       echarts2()
-      
     })
 
     return {
       chainChartRef,
       loading,
-      echarts
+      echarts,
     }
   },
 })

src/views/dataManage/chainAnalysis/index.vue

@@ -86,7 +86,11 @@
         </el-radio-group>
       </div>
       <div class="chainEcharts" v-if="flag">
-        <echarts v-for="(item,index) in ecahrtsDataArr" :key="index" :echartsDataOne="item"></echarts>
+        <echarts
+          v-for="(item, index) in echartsDataCurrent"
+          :key="index"
+          :echartsDataOne="item"
+        ></echarts>
       </div>
     </div>
   </div>
@@ -99,6 +103,8 @@ import echarts from './ehcarts/index.vue'
 import { ElNotification } from 'element-plus'
 import * as api from '@/api/dataManage/chainAnalysis.js'
 import { ElMessage } from 'element-plus'
+import { parseTime } from '@/utils'
+
 
 export default defineComponent({
   name: 'chainAnalysis',
@@ -127,7 +133,8 @@ export default defineComponent({
       new Date(2021, 9, 30, 10, 10),
     ])
     const ecahrtsData = ref({})
-    const ecahrtsDataArr=ref([])
+    const echartsDataCurrent = ref([])
+    const echartsDataBefore = ref([])
     const state = reactive({
       value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
     })
@@ -166,7 +173,29 @@ export default defineComponent({
       if (treeCheckedList.value.length > 0) {
         store.commit('TimeAll_function', dateTime.value)
         const time = store.state.Time_Data;
-        
+
+        // 时间处理start
+
+        console.log(time[0])
+
+        var startA=new Date(time[0])  //开始
+        startA = startA.getTime()
+
+        var endA = new Date(time[1])
+        endA = endA.getTime()   //结束
+
+        var distance=endA-startA;   //时间差值
+
+        var endB=startA-  60 * 1000  //前一个结束时间
+        var startB=endB-distance   //前一个开始时间
+        console.log('startB')
+        console.log(parseTime(startB))
+        console.log(parseTime(endB))
+
+        // 时间处理end
+
+
+
         api
           .ringRatioList({
             startTime: time[0],
@@ -177,16 +206,37 @@ export default defineComponent({
           })
           .then((requset) => {
             if (requset.status === 'SUCCESS') {
-              
               flag.value = true
-              ecahrtsDataArr.value= requset.data
-               console.log('ecahrtsDataArr')
-              console.log(ecahrtsDataArr.value)
+              echartsDataCurrent.value = requset.data
+              console.log('echartsDataCurrent')
+              console.log(echartsDataCurrent.value)
               ecahrtsData.value = requset.data[0]
             } else {
               ElMessage.error(requset.msg)
             }
           })
+
+          api
+          .ringRatioList({
+            startTime: parseTime(startB),
+            endTime: parseTime(endB),
+            type: typeSrarch.value,
+            valueCalculation: typeSrarch.value ? valueCalculation.value : 0,
+            displayField: treeCheckedList.value,
+          })
+          .then((requset) => {
+            if (requset.status === 'SUCCESS') {
+              flag.value = true
+              echartsDataBefore.value = requset.data
+              console.log('echartsDataBefore')
+              console.log(echartsDataBefore.value)
+              ecahrtsData.value = requset.data[0]
+            } else {
+              ElMessage.error(requset.msg)
+            }
+          })
+
+
       } else {
         console.log('', 1)
         ElNotification({
@@ -248,7 +298,8 @@ export default defineComponent({
       },
       dateTime,
       ecahrtsData,
-      ecahrtsDataArr,
+      echartsDataCurrent,
+      echartsDataBefore,
       valueCalculation,
       typeSrarch,
       flag,