前后端接口联调-更新

src/views/vent/home/configurable/components/ModuleGasInject.vue

@@ -14,7 +14,7 @@
     <slot>
       <Header :deviceType="deviceType" :moduleData="moduleData" :data="data" @select="selectedData = $event" />
       <Content :style="{ height: header.show ? 'calc(100% - 30px)' : '100%' }" :moduleData="moduleData" :data="selectedData" />
-      <DetailInfo :showDetail="showDetail" :deviceType="deviceType" @closeModal="closeModal"></DetailInfo>
+      <DetailInfo :showDetail="showDetail" :deviceType="deviceType" :data="data" @closeModal="closeModal"></DetailInfo>
     </slot>
   </component>
 </template>

src/views/vent/home/configurable/components/content.vue

@@ -30,7 +30,7 @@
               :type="config.type" :layout="config.layout" />
           </div>
           <div v-else class="content__module flex flex-justify-around flex-items-center flex-wrap">
-            <MiniBoard v-for="item in config.items" :key="item.prop" :label="item.label" :value="item.value"
+            <MiniBoard v-for="item in config.items" :key="item.prop" :label="item.label" :value="item.value" :unit="item.unit"
               :type="config.type" :layout="config.layout" />
           </div>
         </template>
@@ -148,6 +148,10 @@
          <template v-else-if="config.name === 'gas_inject_card'">
           <gasInjectCard class="content__module" :option="config.config.option" />
         </template>
+          <template v-else-if="config.name === 'gas_line_chart'">
+          <echartLineDate class="content__module" :echartOption="config.config.echartOption" :ecahrtData="config.data" />
+        </template>
+        
       </div>
     </div>
   </div>
@@ -198,6 +202,7 @@ import gasWarnList from './preset/gasWarnList.vue'
 import gasDeviceStatusControl from './preset/gasDeviceStatusControl.vue'
 import gasBoard from './preset/gasBoard.vue'
 import gasInjectCard from './preset/gasInjectCard.vue'
+import echartLineDate from './gasInject/echartLineDate.vue'
 // import FIreWarn from './preset/FIreWarn.vue';
 // import FIreControl from './preset/FIreControl.vue';
 

src/views/vent/home/configurable/components/detail/MiniBoard.vue

@@ -21,7 +21,8 @@
       </slot>
       <slot name="value">
         <div class="mini-board__value" :class="`mini-board__value_${type}`">
-          {{ value }}
+          <span> {{ value }}</span>
+          <span style="margin-left: 5px;">{{ unit }}</span>
         </div>
       </slot>
     </template>
@@ -72,6 +73,7 @@ withDefaults(
   defineProps<{
     label: string;
     value?: string;
+    unit?:string;
     // 告示牌布局，类型为：'val-top' | 'label-top'
     layout: string;
     // 告示牌类型，类型为：'A' | 'B' | 'C' | 'D' | 'E' | 'F' |'New' | 'localFannew'

src/views/vent/home/configurable/components/gasInject/DetailInfo.vue

@@ -11,7 +11,7 @@
       <curveEchartDetail :sysType="'Zq'" :isShowExport="false" :tableColumn="tableColumnSj"></curveEchartDetail>
     </template>
     <template v-if="deviceType == 'gas_zq_sj'">
-      <zqMonitorDetail :isShowExport="false" :tableColumn="tableColumnSj" :optionDetail="optionDetailZq">
+      <zqMonitorDetail :isShowExport="false" :tableColumn="tableColumnSj" :data="data" :optionDetail="optionDetailZq">
       </zqMonitorDetail>
     </template>
     <template v-if="deviceType == 'gas_zq_hj'">
@@ -49,9 +49,15 @@ let props = defineProps({
   showDetail: {
     type: Boolean
   },
+  //设备类型
   deviceType: {
     type: String
+  },
+  //数据
+  data:{
+    type:Object
   }
+
 })
 let visibleDetail = ref(false)
 let $emit = defineEmits(['closeModal'])

src/views/vent/home/configurable/components/gasInject/curveEchartDetail.vue

@@ -43,7 +43,7 @@
 
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from 'vue'
-import echartLineDate from '../gasInject/echartLineDate.vue'
+import echartLineDate from './echartLineDate.vue'
 import { SvgIcon } from '/@/components/Icon';
 import zqHistoryExport from './zqHistoryExport.vue'
 import { zqEchartOption, ccEchartOption } from './gasInject.data'

src/views/vent/home/configurable/components/gasInject/echartLineDate.vue

@@ -52,35 +52,7 @@ function getOption() {
         },
         data: props.ecahrtData.xData
       }],
-      yAxis: [{
-        name: props.echartOption.yname,
-        nameTextStyle: {
-          color: "#7ec7ff",
-          fontSize: 12,
-          padding: 0
-        },
-        min: 0,
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgba(4, 49, 79)',
-          },
-        },
-        axisLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: '#7ec7ff',
-            padding: 12
-          },
-          formatter: '{value}',
-        },
-        axisTick: {
-          show: false,
-        },
-      }],
+      yAxis:props.echartOption.yAxis,
       series: props.echartOption.series.map((el, index) => {
         return {
           name: el.name,

src/views/vent/home/configurable/components/gasInject/gasInject.data.ts

@@ -246,21 +246,21 @@ export let tableColumnCc: BasicColumn[] = [
         align: 'center',
         ellipsis: true,
       },
-       {
+      {
         title: '甲烷气体总量',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
         align: 'center',
         ellipsis: true,
       },
-        {
+      {
         title: '甲烷气体标况瞬量',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
         align: 'center',
         ellipsis: true,
       },
-          {
+      {
         title: '甲烷气体工况瞬量',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
@@ -274,7 +274,7 @@ export let tableColumnCc: BasicColumn[] = [
         align: 'center',
         ellipsis: true,
       },
-       {
+      {
         title: '抽采负压',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
@@ -308,21 +308,21 @@ export let tableColumnCc: BasicColumn[] = [
         align: 'center',
         ellipsis: true,
       },
-       {
+      {
         title: '甲烷气体总量',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
         align: 'center',
         ellipsis: true,
       },
-        {
+      {
         title: '甲烷气体标况瞬量',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
         align: 'center',
         ellipsis: true,
       },
-          {
+      {
         title: '甲烷气体工况瞬量',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
@@ -336,7 +336,7 @@ export let tableColumnCc: BasicColumn[] = [
         align: 'center',
         ellipsis: true,
       },
-       {
+      {
         title: '抽采负压',
         dataIndex: 'fileType_dictText',
         key: 'fileType_dictText',
@@ -357,24 +357,23 @@ export let tableColumnCc: BasicColumn[] = [
 
 //注气详情界面配置项数据
 export let optionDetailZq = [
-  { label: '注气总量', value: 'value1' },
-  { label: '标况瞬量', value: 'value2' },
-  { label: '工况瞬量', value: 'value3' },
-  { label: '注气压力', value: 'value4' },
+  { label: '注气总量(m³)', value: 'flowStdAccum' },
+  { label: '标况瞬量(m³/min)', value: 'flowStdInstant' },
+  { label: '工况瞬量(m³/min)', value: 'flowWorkInstant' },
+  { label: '注气压力(Pa)', value: 'injectionPressure' },
 ]
 //抽采详情界面配置项数据
 export let optionDetailCc = [
-  { label: '混合气体标况总量', value: 'value1' },
-  { label: '混合气体标况瞬量', value: 'value2' },
-  { label: '甲烷气体标况总量', value: 'value3' },
-  { label: '甲烷气体标况瞬量', value: 'value4' },
-  { label: '甲烷浓度', value: 'value5' },
-  { label: '抽采负压', value: 'value6' },
+  { label: '混合气体标况总量', value: 'flowStdAccum' },
+  { label: '混合气体标况瞬量', value: 'flowStdInstant' },
+  { label: '甲烷气体标况总量', value: 'flowWorkInstant' },
+  { label: '甲烷气体标况瞬量', value: 'flowWorkInstant' },
+  { label: '甲烷浓度', value: 'flowWorkInstant' },
+  { label: '抽采负压', value: 'flowWorkInstant' },
 ]
 
 //注气详情图表配置项
 export let zqEchartOption = {
-  yname: 'MPa',
   tooltip: {
     trigger: 'axis',
     padding: 8,
@@ -407,6 +406,35 @@ export let zqEchartOption = {
       { name: '注气压力' },
     ]
   },
+  yAxis: [{
+    name: 'MPa',
+    nameTextStyle: {
+      color: "#7ec7ff",
+      fontSize: 12,
+      padding: 0
+    },
+    min: 0,
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(4, 49, 79)',
+      },
+    },
+    axisLine: {
+      show: false,
+    },
+    axisLabel: {
+      show: true,
+      textStyle: {
+        color: '#7ec7ff',
+        padding: 12
+      },
+      formatter: '{value}',
+    },
+    axisTick: {
+      show: false,
+    },
+  }],
   series: [
     {
       name: '注气流量',
@@ -487,7 +515,6 @@ export let zqEchartOption = {
 }
 //抽采详情图表配置项
 export let ccEchartOption = {
-  yname: 'MPa',
   tooltip: {
     trigger: 'axis',
     padding: 8,
@@ -521,6 +548,35 @@ export let ccEchartOption = {
       { name: '瓦斯浓度' },
     ]
   },
+  yAxis: [{
+    name: 'MPa',
+    nameTextStyle: {
+      color: "#7ec7ff",
+      fontSize: 12,
+      padding: 0
+    },
+    min: 0,
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(4, 49, 79)',
+      },
+    },
+    axisLine: {
+      show: false,
+    },
+    axisLabel: {
+      show: true,
+      textStyle: {
+        color: '#7ec7ff',
+        padding: 12
+      },
+      formatter: '{value}',
+    },
+    axisTick: {
+      show: false,
+    },
+  }],
   series: [
     {
       name: '抽采纯量',

src/views/vent/home/configurable/components/gasInject/zqMonitorDetail.vue

@@ -12,10 +12,10 @@
       <div class="main-content">
         <div class="common-area">
           <div class="area-item">
-            <zqDetailCard :dataIndex="1" :optionDetail="optionDetail" :zqDetailData="zqDetailData1"></zqDetailCard>
+            <zqDetailCard :dataIndex="1" :optionDetail="optionDetail" :zqDetailData="data.ZqsjDetail.first"></zqDetailCard>
           </div>
           <div class="area-item">
-            <zqDetailCard :dataIndex="2" :optionDetail="optionDetail" :zqDetailData="zqDetailData2"></zqDetailCard>
+            <zqDetailCard :dataIndex="2" :optionDetail="optionDetail" :zqDetailData="data.ZqsjDetail.second"></zqDetailCard>
           </div>
         </div>
         <div class="center-area">
@@ -39,10 +39,10 @@
         </div>
         <div class="common-area">
           <div class="area-item">
-            <zqDetailCard :dataIndex="3" :optionDetail="optionDetail" :zqDetailData="zqDetailData3"></zqDetailCard>
+            <zqDetailCard :dataIndex="3" :optionDetail="optionDetail" :zqDetailData="data.ZqsjDetail.third"></zqDetailCard>
           </div>
           <div class="area-item">
-            <zqDetailCard :dataIndex="4" :optionDetail="optionDetail" :zqDetailData="zqDetailData4"></zqDetailCard>
+            <zqDetailCard :dataIndex="4" :optionDetail="optionDetail" :zqDetailData="data.ZqsjDetail.fourth"></zqDetailCard>
           </div>
         </div>
       </div>
@@ -71,8 +71,10 @@ let props = defineProps({
   //详情界面配置项
   optionDetail:{
     type:Array
+  },
+  data:{
+    type:Object as any
   }
-
 })
 
 let showExport = ref(false)

src/views/vent/home/configurable/configurable.api.ts

@@ -636,6 +636,28 @@ export const getElectroData = (params) => {
   });
 };
 
+//获取抽采系统数据
+export const sysCc = (params) => {
+  const key = `${Api.getSystem}?${JSON.stringify(params)}`;
+  if (!cache.has(key)) {
+    cache.set(
+      key,
+      defHttp.post({ url: Api.getSystem, params }).finally(() => {
+        cache.delete(key);
+      })
+    );
+  }
+  return (cache.get(key) as Promise<any>).then((res) => {
+    return res;
+  });
+};
+//获取抽采系统数据
+function getCcSystem() {
+  return new Promise(async (resolve) => {
+    const result = await sysCc({ systemID: "2036610034808954882" });
+    resolve(result);
+  });
+}
 //获取注气系统数据
 export const getSystemApi = (params) => {
   const key = `${Api.getSystem}?${JSON.stringify(params)}`;
@@ -647,14 +669,59 @@ export const getSystemApi = (params) => {
       })
     );
   }
-  return (cache.get(key) as Promise<any>).then((res) => {
+  return (cache.get(key) as Promise<any>).then(async (res) => {
+    let pumpData = await getCcSystem();
+    res.pumpData = pumpData
+   // let pdata= res.pumpData.deviceInfo.pump
+   // res.pumpSj= res.pumpData
     console.log(res, '注气系统数据-----')
     //注气数据
+    let data = res.deviceInfo.injection.datalist[0].readData
     res.deviceStatusControl = {
-      runStatus: res.deviceInfo.injection.datalist[0].readData.runStatus,
-      paramSetting: res.deviceInfo.injection.datalist[0].readData.paramSetting
+      runStatus: data.runStatus || '-',
+      paramSetting: data.paramSetting || '-'
+    }
+    res.ZqsjData = {
+      injectionPressure: data.injectionPressure || '-',
+      injectionTemperature: data.injectionTemperature || '-',
+      flowStdInstant: data.flowStdInstant || '-',
+      flowStdAccum: data.flowStdAccum || '-',
+    }
+    res.ZqsjDetail = {
+      first: {
+        flowStdAccum: data.flowStdAccum_1,
+        flowStdInstant: data.flowStdInstant_1,
+        flowWorkInstant: data.flowWorkInstant_1,
+        injectionPressure: data.injectionPressure_1,
+      },
+      second: {
+        flowStdAccum: data.flowStdAccum_2,
+        flowStdInstant: data.flowStdInstant_2,
+        flowWorkInstant: data.flowWorkInstant_2,
+        injectionPressure: data.injectionPressure_2,
+      },
+      third: {
+        flowStdAccum: data.flowStdAccum_3,
+        flowStdInstant: data.flowStdInstant_3,
+        flowWorkInstant: data.flowWorkInstant_3,
+        injectionPressure: data.injectionPressure_3,
+      },
+      fourth: {
+        flowStdAccum: data.flowStdAccum_4,
+        flowStdInstant: data.flowStdInstant_4,
+        flowWorkInstant: data.flowWorkInstant_4,
+        injectionPressure: data.injectionPressure_4,
+      },
+    }
+
+    res.ZqParamLine = {
+      xData: ['3.26', '3.27', '3.28', '3.29', '3.30', '3.31'],
+      yData: ["20", "50", "12", "65", "30", "60"],
+      yData1: ["40", "60", "22", "85", "50", "40"],
+      yData2: ["70", "30", "42", "65", "80", "60"],
+      yData3: [],
+      yData4: []
     }
-   
 
     return res;
   });

src/views/vent/home/configurable/configurable.data.ts

@@ -2,6 +2,7 @@
 import { Config } from '../../deviceManager/configurationTable/types';
 // import { BDdustMock, BDfireMock } from './configurable.data.bd';
 import { getThemifyImagesURL } from '/@/utils/ui';
+import * as echarts from 'echarts';
 
 //注气驱替-主界面
 export const testConfigGasInject: Config[] = [
@@ -561,24 +562,28 @@ export const testConfigGasInjectZq: Config[] = [
       board: [
         {
           type: 'Gas',
-          readFrom: '',
+          readFrom: 'ZqsjData',
           layout: 'label-top',
           items: [
             {
               label: '瞬时注气流量',
-              value: '${flow_merge}',
+              value: '${flowStdInstant}',
+              unit: 'm³/min',
             },
             {
               label: '累计注气流量',
               value: '${fy_merge}',
+              unit: 'm³',
             },
             {
               label: '注气温度',
-              value: '${leakage}',
+              value: '${flowStdAccum}',
+              unit: '℃',
             },
             {
               label: '注气压力',
-              value: '${leakage}',
+              value: '${injectionPressure}',
+              unit: 'Pa',
             },
           ],
         },
@@ -685,35 +690,319 @@ export const testConfigGasInjectZq: Config[] = [
         direction: 'column',
         items: [
           {
-            name: 'chart',
+            name: 'gas_line_chart',
             basis: '100%',
           },
         ],
       },
       board: [],
       list: [],
-      chart: [
-        {
-          type: 'line_area',
-          readFrom: '',
-          legend: { show: false },
-          xAxis: [{ show: true }],
-          yAxis: [{ show: true, name: '浓度', position: 'left' }],
-          series: [
-            {
-              label: '${strinstallpos}',
-              readFrom: 'historyList',
-              xprop: 'time',
-              yprop: 'dustval',
-            },
-          ],
-        },
-      ],
+      chart: [],
       table: [],
       gallery: [],
       complex_list: [],
       gallery_list: [],
-      preset: [],
+      preset: [
+        {
+          readFrom: 'ZqParamLine',
+          echartOption: {
+            yname: 'MPa',
+            tooltip: {
+              trigger: 'axis',
+              padding: 8,
+              backgroundColor: 'rgba(0, 0, 0, .6)',
+              textStyle: {
+                color: '#fff',
+                fontSize: 12,
+              },
+            },
+            grid: {
+              top: '26%',
+              left: '5%',
+              right: '5%',
+              bottom: '8%',
+              containLabel: true
+            },
+            legend: {
+              top: '3%',
+              right: '3%',
+              icon: 'circle',
+              itemWidth: 8,
+              itemHeight: 8,
+              itemGap: 12,
+              textStyle: {
+                color: '#fff',
+                fontSize: 12,
+              },
+              data: [
+                { name: '注气压力' },
+                { name: '标况累计流量' },
+                { name: '标况瞬时流量' },
+                { name: '工况累计流量' },
+                { name: '工况瞬时流量' },
+              ]
+            },
+            yAxis: [
+              {
+                position: 'left', // Y轴1在左边
+                name: '压力(Pa)',
+                nameTextStyle: {
+                  color: "#7ec7ff",
+                  fontSize: 12,
+                  padding: 0
+                },
+                min: 0,
+                splitLine: {
+                  show: true,
+                  lineStyle: {
+                    color: 'rgba(4, 49, 79)',
+                  },
+                },
+                axisLine: {
+                  show: false,
+                },
+                axisLabel: {
+                  show: true,
+                  textStyle: {
+                    color: '#7ec7ff',
+                    padding: 12
+                  },
+                  formatter: '{value}',
+                },
+                axisTick: {
+                  show: false,
+                },
+              },
+              {
+                position: 'right', // Y轴2在右边
+                name: '流量(m³)',
+                nameTextStyle: {
+                  color: "#7ec7ff",
+                  fontSize: 12,
+                  padding: 0
+                },
+                min: 0,
+                splitLine: {
+                  show: true,
+                  lineStyle: {
+                    color: 'rgba(4, 49, 79)',
+                  },
+                },
+                axisLine: {
+                  show: false,
+                },
+                axisLabel: {
+                  show: true,
+                  textStyle: {
+                    color: '#7ec7ff',
+                    padding: 12
+                  },
+                  formatter: '{value}',
+                },
+                axisTick: {
+                  show: false,
+                },
+              },
+            ],
+            series: [
+              {
+                name: '注气压力',
+                type: 'line',
+                symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+                showAllSymbol: true,
+                symbolSize: 0,
+                smooth: true,
+                yAxisIndex: 0,
+                lineStyle: {
+                  normal: {
+                    width: 2,
+                    color: 'rgba(236, 255, 62,1)', // 线条颜色
+                  },
+                  borderColor: 'rgba(0,0,0,.4)',
+                },
+                itemStyle: {
+                  color: 'rgba(236, 255, 62,1)',
+                  borderColor: "#646ace",
+                  borderWidth: 2
+                },
+                areaStyle: { //区域填充样式
+                  normal: {
+                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                      offset: 0,
+                      color: "rgba(236, 255, 62,.4)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(236, 255, 62, .1)"
+                    }
+                    ], false),
+                    shadowColor: 'rgba(236, 255, 62, 0.5)', //阴影颜色
+                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+                  }
+                },
+                data: 'yData'
+              },
+              {
+                name: '标况累计流量',
+                type: 'line',
+                symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+                showAllSymbol: true,
+                symbolSize: 0,
+                smooth: true,
+                yAxisIndex: 1,
+                lineStyle: {
+                  normal: {
+                    width: 2,
+                    color: 'rgba(86, 241, 133,1)', // 线条颜色
+                  },
+                  borderColor: 'rgba(0,0,0,.4)',
+                },
+                itemStyle: {
+                  color: 'rgba(86, 241, 133,1)',
+                  borderColor: "#646ace",
+                  borderWidth: 2
+
+                },
+                areaStyle: { //区域填充样式
+                  normal: {
+                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                      offset: 0,
+                      color: "rgba(86, 241, 133,.4)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(86, 241, 133, .1)"
+                    }
+                    ], false),
+                    shadowColor: 'rgba(86, 241, 133, 0.5)', //阴影颜色
+                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+                  }
+                },
+                data: 'yData1'
+              },
+              {
+                name: '标况瞬时流量',
+                type: 'line',
+                symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+                showAllSymbol: true,
+                symbolSize: 0,
+                smooth: true,
+                yAxisIndex: 1,
+                lineStyle: {
+                  normal: {
+                    width: 2,
+                    color: 'rgba(56, 218, 228,1)', // 线条颜色
+                  },
+                  borderColor: 'rgba(0,0,0,.4)',
+                },
+                itemStyle: {
+                  color: 'rgba(56, 218, 228,1)',
+                  borderColor: "#646ace",
+                  borderWidth: 2
+
+                },
+                areaStyle: { //区域填充样式
+                  normal: {
+                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                      offset: 0,
+                      color: "rgba(56, 218, 228,.4)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(56, 218, 228, .1)"
+                    }
+                    ], false),
+                    shadowColor: 'rgba(56, 218, 228, 0.5)', //阴影颜色
+                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+                  }
+                },
+                data: 'yData2'
+              },
+              {
+                name: '工况累计流量',
+                type: 'line',
+                symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+                showAllSymbol: true,
+                symbolSize: 0,
+                smooth: true,
+                yAxisIndex: 1,
+                lineStyle: {
+                  normal: {
+                    width: 2,
+                    color: 'rgba(255, 0, 0,1)', // 线条颜色
+                  },
+                  borderColor: 'rgba(0,0,0,.4)',
+                },
+                itemStyle: {
+                  color: 'rgba(255, 0, 0,1)',
+                  borderColor: "#646ace",
+                  borderWidth: 2
+
+                },
+                areaStyle: { //区域填充样式
+                  normal: {
+                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                      offset: 0,
+                      color: "rgba(255, 0, 0,.4)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(255, 0, 0, .1)"
+                    }
+                    ], false),
+                    shadowColor: 'rgba(255, 0, 0, 0.5)', //阴影颜色
+                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+                  }
+                },
+                data: 'yData3'
+              },
+              {
+                name: '工况瞬时流量',
+                type: 'line',
+                symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+                showAllSymbol: true,
+                symbolSize: 0,
+                smooth: true,
+                yAxisIndex: 1,
+                lineStyle: {
+                  normal: {
+                    width: 2,
+                    color: 'rgba(255, 157, 28,1)', // 线条颜色
+                  },
+                  borderColor: 'rgba(0,0,0,.4)',
+                },
+                itemStyle: {
+                  color: 'rgba(255, 157, 28,1)',
+                  borderColor: "#646ace",
+                  borderWidth: 2
+
+                },
+                areaStyle: { //区域填充样式
+                  normal: {
+                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                      offset: 0,
+                      color: "rgba(255, 157, 28,.4)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(255, 157, 28, .1)"
+                    }
+                    ], false),
+                    shadowColor: 'rgba(255, 157, 28, 0.5)', //阴影颜色
+                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+                  }
+                },
+                data: 'yData4'
+              },
+            ]
+          },
+        }
+      ],
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanmain',
     },
     showStyle: {