---对接电能 质量

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

@@ -1,41 +1,14 @@
 <template>
   <div shadow="never" class="homeBoxCard" v-loading="loading">
+    <br>
     <div class="height300" ref="chainChartRef" />
+     <br>
   </div>
 </template>
 <script>
 import { defineComponent, onMounted, ref, watch } from 'vue'
 import * as echarts from 'echarts'
 
-const dataAll = [
-  {
-    name: '本期',
-    type: 'line',
-    smooth: false,
-    data: [0, 0.1, 0, 0, 0, 0, 0, 0, 0, 0.7, 0, 0],
-    symbolSize: 6,
-    markPoint: {
-      data: [
-        { type: 'max', name: 'Max' },
-        { type: 'min', name: 'Min' },
-      ],
-    },
-  },
-  {
-    name: '上期',
-    type: 'line',
-    smooth: false,
-    data: [0, 0, 0.2, 0, 0, 0, 0, 0.8, 0, 0, 0, 0],
-    symbolSize: 6,
-    markPoint: {
-      data: [
-        { type: 'max', name: 'Max' },
-        { type: 'min', name: 'Min' },
-      ],
-    },
-  },
-]
-
 export default defineComponent({
   name: 'CurveCom',
   props: {
@@ -44,15 +17,19 @@ export default defineComponent({
 
   setup(props) {
     const chainChartRef = ref(null)
+    const resultListDate=ref([])
 
     // 读取数据 func
     const loading = ref(true)
     const getData = async () => {
-      console.log('props.echartsDataOne.name')
-      console.log(props.echartsDataOne.name)
-      // loading.value = true
-      // await store.dispatch('Home/queryWorksChartData')
+      alert(1)
       loading.value = false
+      var aa = props.echartsDataOne.listDate
+      var bb = props.echartsDataOne.listDate2
+     
+      resultListDate.value = aa.map(function (index, item) {
+        return index +' - '+ bb[item]
+      })
     }
     function echarts2() {
       let myChart = echarts.init(chainChartRef.value)
@@ -92,13 +69,16 @@ export default defineComponent({
         xAxis: {
           type: 'category',
           boundaryGap: true,
-          data: props.echartsDataOne ? props.echartsDataOne.listDate : '',
+          data: props.echartsDataOne ? resultListDate.value : [],
           axisTick: {
-            show: false, //去除刻度线
-          },
-          axisLabel: {
-            color: 'black', // 文本颜色
+            show: true, //去除刻度线
           },
+      //  axisLabel:false,
+          // axisLabel: {
+          //   interval:0,
+          //       rotate:"-12",
+          //   color: 'black', // 文本颜色
+          // },
           axisLine: {
             show: false, // 去除轴线
           },
@@ -129,7 +109,34 @@ export default defineComponent({
             },
           },
         },
-        series: dataAll,
+        series: [
+          {
+            name: '本期',
+            type: 'line',
+            smooth: false,
+            data: props.echartsDataOne.list2,
+            symbolSize: 6,
+            markPoint: {
+              data: [
+                { type: 'max', name: 'Max' },
+                { type: 'min', name: 'Min' },
+              ],
+            },
+          },
+          {
+            name: '上期',
+            type: 'line',
+            smooth: false,
+            data: props.echartsDataOne.list,
+            symbolSize: 6,
+            markPoint: {
+              data: [
+                { type: 'max', name: 'Max' },
+                { type: 'min', name: 'Min' },
+              ],
+            },
+          },
+        ],
       })
       window.onresize = function () {
         // 自适应大小
@@ -147,7 +154,7 @@ export default defineComponent({
 
     //监听变化
     watch(
-      () => props.echartsDataOne,
+      () => props.echartsDataBefore,
       (newVal, oldVal, clear) => {
         // 执行异步任务，并得到关闭异步任务的 id
         // console.log(newVal)
@@ -167,6 +174,7 @@ export default defineComponent({
       chainChartRef,
       loading,
       echarts,
+      resultListDate
     }
   },
 })

src/views/dataManage/chainAnalysis/index.vue

@@ -85,12 +85,13 @@
           </div>
         </el-radio-group>
       </div>
-      <div class="chainEcharts" v-if="flag">
+      <div class="chainEcharts" v-if="flag && flag2">
         <echarts
-          v-for="(item, index) in echartsDataCurrent"
+          v-for="(item, index) in echartsDataObj"
           :key="index"
           :echartsDataOne="item"
         ></echarts>
+      
       </div>
     </div>
   </div>
@@ -105,7 +106,6 @@ import * as api from '@/api/dataManage/chainAnalysis.js'
 import { ElMessage } from 'element-plus'
 import { parseTime } from '@/utils'
 
-
 export default defineComponent({
   name: 'chainAnalysis',
   components: { echarts },
@@ -125,6 +125,7 @@ export default defineComponent({
       }
     }
     const flag = ref(false)
+    const flag2 = ref(false)
     const typeSrarch = ref(0)
     const treeCheckedList = ref([])
     const valueCalculation = ref()
@@ -135,6 +136,7 @@ export default defineComponent({
     const ecahrtsData = ref({})
     const echartsDataCurrent = ref([])
     const echartsDataBefore = ref([])
+    const echartsDataObj=ref([])
     const state = reactive({
       value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
     })
@@ -160,7 +162,7 @@ export default defineComponent({
       return newArr
     }
 
-    function searchData() {
+    async function searchData() {
       if (!dateTime.value) {
         ElNotification({
           title: '提示',
@@ -172,31 +174,29 @@ export default defineComponent({
 
       if (treeCheckedList.value.length > 0) {
         store.commit('TimeAll_function', dateTime.value)
-        const time = store.state.Time_Data;
+        const time = store.state.Time_Data
 
         // 时间处理start
 
         console.log(time[0])
 
-        var startA=new Date(time[0])  //开始
+        var startA = new Date(time[0]) //开始
         startA = startA.getTime()
 
         var endA = new Date(time[1])
-        endA = endA.getTime()   //结束
+        endA = endA.getTime() //结束
 
-        var distance=endA-startA;   //时间差值
+        var distance = endA - startA //时间差值
 
-        var endB=startA-  60 * 1000  //前一个结束时间
-        var startB=endB-distance   //前一个开始时间
+        var endB = startA - 60 * 1000 //前一个结束时间
+        var startB = endB - distance //前一个开始时间
         console.log('startB')
         console.log(parseTime(startB))
         console.log(parseTime(endB))
 
         // 时间处理end
 
-
-
-        api
+        await api
           .ringRatioList({
             startTime: time[0],
             endTime: time[1],
@@ -208,15 +208,12 @@ export default defineComponent({
             if (requset.status === 'SUCCESS') {
               flag.value = true
               echartsDataCurrent.value = requset.data
-              console.log('echartsDataCurrent')
-              console.log(echartsDataCurrent.value)
-              ecahrtsData.value = requset.data[0]
             } else {
               ElMessage.error(requset.msg)
             }
           })
 
-          api
+        await api
           .ringRatioList({
             startTime: parseTime(startB),
             endTime: parseTime(endB),
@@ -226,17 +223,28 @@ export default defineComponent({
           })
           .then((requset) => {
             if (requset.status === 'SUCCESS') {
-              flag.value = true
+              flag2.value = true
               echartsDataBefore.value = requset.data
-              console.log('echartsDataBefore')
-              console.log(echartsDataBefore.value)
-              ecahrtsData.value = requset.data[0]
             } else {
               ElMessage.error(requset.msg)
             }
           })
 
 
+        var jsona = JSON.stringify(echartsDataCurrent.value)
+        var jsonb = jsona.replace(/"list"/g, '"list2"')
+        jsonb = jsonb.replace(/"listDate"/g, '"listDate2"')
+        var obj1 = JSON.parse(jsonb)
+
+        var obj2 = echartsDataBefore.value;
+         echartsDataObj.value = obj1.map((item, index) => {
+          return { ...item, ...obj2[index] }
+        })
+        console.log('echartsDataObj.value')
+        console.log(echartsDataObj.value)
+        console.log(flag.value)
+         console.log(flag2.value)
+
       } else {
         console.log('', 1)
         ElNotification({
@@ -300,9 +308,12 @@ export default defineComponent({
       ecahrtsData,
       echartsDataCurrent,
       echartsDataBefore,
+         echartsDataObj,
+
       valueCalculation,
       typeSrarch,
       flag,
+      flag2,
       listTabsChange,
       siteChange,
       currentChecked,

src/views/siteManage/index.vue

@@ -405,6 +405,13 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+.custom-tree-node{
+  overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
+
+}
 .app-container.page-nesting {
   padding: 0;
   background: rgba(0, 0, 0, 0);