东泰鑫源bug修改提交

src/views/vent/common/basicEchartLine.vue

@@ -16,6 +16,12 @@ let props = defineProps({
       return {};
     },
   },
+  markLine:{
+    type:Object,
+    default:()=>{
+      return {}
+    }
+  },
   echartData: {
     type: Object,
     default: () => {
@@ -34,6 +40,8 @@ let gridVs = reactive({
   bottom: '',
 })
 
+let markLines=reactive({})
+
 let echartDatas = reactive({
   xData: [],
   yData: [],
@@ -168,6 +176,7 @@ function getOption() {
           //y轴的相关设置
           type: 'value', //y轴数据类型为连续的数据
           min: 0, //y轴上的刻度最小值
+          max:100,
           // splitNumber: 7,//y轴上的刻度段数
           splitLine: {
             show: true,
@@ -195,10 +204,13 @@ function getOption() {
           name: echartDatas.legendName.length != 0 ? echartDatas.legendName[0] : '',
           type: 'line', //统计图类型为折线图
           smooth: false, //是否平滑曲线显示
+          markLine:markLines,
+
           symbolSize: 0, //数据点的大小，[0,0]//b表示宽度和高度
           lineStyle: {
             //线条的相关设置
             normal: {
+              width: 1,
               color: '#1faef0', // 线条颜色
             },
           },
@@ -208,26 +220,6 @@ function getOption() {
             borderWidth: 1
 
           },
-          // areaStyle: {
-          //   //区域填充样式
-          //   normal: {
-          //     //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
-          //     color: new echarts.graphic.LinearGradient(
-          //       0,
-          //       0,
-          //       0,
-          //       1,
-          //       [
-          //         { offset: 0, color: 'rgba(31, 174, 240, 0.7)' },
-          //         { offset: 0.7, color: 'rgba(31, 174, 240, 0)' },
-          //       ],
-          //       false,
-          //     ),
-
-          //     shadowColor: 'rgba(31, 174, 240, 0.6)', //阴影颜色
-          //     shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
-          //   },
-          // },
           data: echartDatas.yData.length != 0 ? echartDatas.yData : [],
         },
         {
@@ -247,26 +239,6 @@ function getOption() {
             borderWidth: 1
 
           },
-          // areaStyle: {
-          //   //区域填充样式
-          //   normal: {
-          //     //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
-          //     color: new echarts.graphic.LinearGradient(
-          //       0,
-          //       0,
-          //       0,
-          //       1,
-          //       [
-          //         { offset: 0, color: 'rgba(31, 237, 155, 0.7)' },
-          //         { offset: 0.7, color: 'rgba(31, 237, 155, 0)' },
-          //       ],
-          //       false,
-          //     ),
-
-          //     shadowColor: 'rgba(31, 237, 155, 0.6)', //阴影颜色
-          //     shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
-          //   },
-          // },
           data: echartDatas.yData1.length != 0 ? echartDatas.yData1 : [],
         },
       ],
@@ -295,6 +267,10 @@ watch(() => props.echartData, (newE, oldE) => {
   getOption();
 }, { immediate: true, deep: true })
 
+watch(()=>props.markLine,(newM,oldM)=>{
+  markLines=Object.assign({},newM)
+},{immediate:true,deep:true})
+
 
 onMounted(() => {
   getOption();

src/views/vent/dust/dustHome/components/multipleDust.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="multipleDust">
-        <basicEchartLine :gridV="gridV" :echartData="echartDatas"></basicEchartLine>
+        <basicEchartLine :gridV="gridV" :markLine="markLine1" :echartData="echartDatas"></basicEchartLine>
     </div>
 </template>
 
@@ -24,6 +24,8 @@ let gridV = reactive({
     bottom: '15%',
 })
 
+let markLine1=reactive({})
+
 let echartDatas = reactive({
     xData: [],
     yData: [],

src/views/vent/dust/dustHome/index.vue

@@ -58,7 +58,7 @@
         </div>
         <transition name="fade" mode="out-in">
           <div class="center-b" v-if="isShow">
-            <DanelBd :moduleName="'综放工作面粉尘浓度'" :contentStyle="{ contentH: '245px' }" :commonTitle="'selected'"
+            <DanelBd :moduleName="'综采工作面粉尘浓度'" :contentStyle="{ contentH: '245px' }" :commonTitle="'selected'"
               :selectList="selectListBd" :selectValue="sensorCode" @change-select="changeSelect">
               <multipleDust :echartData="echartData" />
             </DanelBd>
@@ -122,7 +122,7 @@ let cardData = reactive<any[]>([]);
 let echartDataWork = ref<any[]>([]);
 let areaType = ref('');
 
-//综放工作面粉尘浓度数据
+//综采工作面粉尘浓度数据
 let selectListBd = reactive<any[]>([]);
 let sensorCode = ref('');
 let echartData = reactive({
@@ -179,7 +179,7 @@ function getMonitor() {
   }, 5000);
 }
 
-//综放工作面下拉选项切换
+//综采工作面下拉选项切换
 function changeSelect(data) {
   sensorCode.value = data.value;
   getDustInfosList();

src/views/vent/dust/dustWarnAnalysis/index.vue

@@ -19,7 +19,7 @@
             <div class="area-title">粉尘监测预警</div>
           </div>
           <div class="content-area">
-            <basicEchartLine :gridV="gridV" :echartData="echartData"></basicEchartLine>
+            <basicEchartLine :gridV="gridV" :markLine="markLine1" :echartData="echartData"></basicEchartLine>
           </div>
         </div>
       </div>
@@ -65,6 +65,7 @@ let gridV = reactive({
   bottom: '10%',
 })
 
+let markLine1=reactive({})
 let echartData = reactive({
   xData: [],
   yData: [],

src/views/vent/dust/dustWarnAnalysisList/index.vue

@@ -291,13 +291,13 @@ let columns = reactive([
 
 //数据随便写的，不符合实际情况，因为懒得改
 const treeData = reactive([
-  { name: "81203综放工作面", value: "111", id: '1', pid: null },
+  { name: "81203综采工作面", value: "111", id: '1', pid: null },
   { name: "束管监测系统", value: "222", id: '1-2', pid: '1' },
-  { name: "81203综放工作面", value: "458", id: '2', pid: null },
+  { name: "81203综采工作面", value: "458", id: '2', pid: null },
   { name: "束管监测系统", value: "445", id: '2-1', pid: '2' },
   { name: "束管监测系统", value: "456", id: '2-2', pid: '2' },
   { name: "束管监测系统", value: "647", id: '2-3', pid: '2' },
-  { name: "81203综放工作面", value: "189", id: '3', pid: null },
+  { name: "81203综采工作面", value: "189", id: '3', pid: null },
   { name: "束管监测系统", value: "664", id: '3-1', pid: '3' },
   { name: "束管监测系统", value: "652", id: '3-2', pid: '3' },
   { name: "束管监测系统", value: "732", id: '3-3', pid: '3' },

src/views/vent/fire/compositeWarn/composite.api.ts

@@ -16,14 +16,14 @@ export const getFireAreaInfo = (params) => defHttp.get({ url: Api.getFireAreaInf
 
 /**
  *
- * 获取工作面光钎条数及测点编号
+ * 获取工作面光纤条数及测点编号
  * @param params
  */
 export const getInfosByAreaCode = (params) => defHttp.get({ url: Api.getInfosByAreaCode, params });
 
 /**
  *
- * 获取光钎测温图表数据
+ * 获取光纤测温图表数据
  * @param params
  */
 export const getGxcwHistoryDataByPointCode = (params) =>

src/views/vent/fire/compositeWarn/index.vue

@@ -3,7 +3,7 @@
     <div class="composite-left-box">
       <basicTree :treeData="treeData" @selectChange="selectChange"></basicTree>
     </div>
-    <!-- 光钎，束管 -->
+    <!-- 光纤，束管 -->
     <div class="composite-right-box">
       <div style="width:100%;height:100%"
         v-if="echartDataGx.xData.length != 0 || echartDataGx.yData.length != 0 || echartDataGx.yData1.length != 0 || card3List.length != 0 || echartData.xData.length != 0 || echartData.yData.length != 0 || echartData.yData1.length != 0">
@@ -13,12 +13,12 @@
         <div :class="flagShow == 'gx' ? 'gx-center-box1' : 'gx-center-box'"
           v-if="flagShow == 'gx' || flagShow == 'all'">
           <div class="gx-center-item-title">
-            <div class="item-left">光钎测温系统温度实时监测</div>
+            <div class="item-left">光纤测温系统温度实时监测</div>
             <a-select style="width: 180px" :options="gxSelectList" size="small" placeholder="请选择"
               v-model:value="gxSelect" allowClear @change="pointChange"></a-select>
           </div>
           <div class="gx-center-item-content">
-            <basicEchartLine :gridV="gridV" :echartData="echartDataGx"></basicEchartLine>
+            <basicEchartLine :gridV="gridV" :markLine="markLine1" :echartData="echartDataGx"></basicEchartLine>
           </div>
 
         </div>
@@ -37,7 +37,7 @@
             <a-range-picker v-model:value="TimeRange" :format="dateFormat" @change="onDataChange" />
           </div>
           <div class="content-area">
-            <basicEchartLine :gridV="gridV" :echartData="echartData"></basicEchartLine>
+            <basicEchartLine :gridV="gridV1" :markLine="markLine2" :echartData="echartData"></basicEchartLine>
           </div>
 
         </div>
@@ -70,13 +70,13 @@ let card3List = reactive<any[]>([])
 
 //数据随便写的，不符合实际情况，因为懒得改
 const treeData = reactive<any[]>([
-  // { name: "81203综放工作面", value: "111", id: '1', pid: null },
+  // { name: "81203综采工作面", value: "111", id: '1', pid: null },
   // { name: "束管监测系统", value: "222", id: '1-2', pid: '1' },
-  // { name: "81203综放工作面", value: "458", id: '2', pid: null },
+  // { name: "81203综采工作面", value: "458", id: '2', pid: null },
   // { name: "束管监测系统", value: "445", id: '2-1', pid: '2' },
   // { name: "束管监测系统", value: "456", id: '2-2', pid: '2' },
   // { name: "束管监测系统", value: "647", id: '2-3', pid: '2' },
-  // { name: "81203综放工作面", value: "189", id: '3', pid: null },
+  // { name: "81203综采工作面", value: "189", id: '3', pid: null },
   // { name: "束管监测系统", value: "664", id: '3-1', pid: '3' },
   // { name: "束管监测系统", value: "652", id: '3-2', pid: '3' },
   // { name: "束管监测系统", value: "732", id: '3-3', pid: '3' },
@@ -87,13 +87,41 @@ let gasType = ref('')
 let pointCode = ref('')
 let flagShow = ref('')
 let dateFormat = ref('YYYY-MM-DD');
-let TimeRange = ref<[Dayjs, Dayjs]>([dayjs(dayjs(new Date().getTime()).format('YYYY-MM-DD'), dateFormat.value), dayjs(dayjs(new Date().getTime()+ 24 * 60 * 60 * 1000).format('YYYY-MM-DD'), dateFormat.value)])
+let TimeRange = ref<[Dayjs, Dayjs]>([dayjs(dayjs(new Date().getTime()).format('YYYY-MM-DD'), dateFormat.value), dayjs(dayjs(new Date().getTime() + 24 * 60 * 60 * 1000).format('YYYY-MM-DD'), dateFormat.value)])
 let gridV = reactive({
+  top: '13%',
+  left: '3%',
+  right: '3%',
+  bottom: '10%',
+})
+let gridV1 = reactive({
   top: '8%',
   left: '3%',
   right: '3%',
   bottom: '10%',
 })
+let markLine1 = reactive({ //最大值和最小值
+  data: [{
+    name: '预警值40­°C',
+    yAxis: 40,
+    label: {
+      show: true,
+      position: 'insideEndTop',
+      formatter: '预警值40­°C',
+      color: '#FF5D1D',
+      fontSize: 12,
+    },
+    lineStyle: {
+      normal: {
+        width: 1,
+        color: "#FF5D1D",
+      }
+    }
+
+  },
+  ]
+})
+let markLine2=reactive({})
 
 let echartData = reactive(
   {
@@ -135,7 +163,7 @@ function getMonitor() {
 
 //时间选项切换
 function onDataChange(value, dateString) {
-  TimeRange.value = [ value[0], value[1]]
+  TimeRange.value = [value[0], value[1]]
 }
 
 //获取左侧菜单树
@@ -155,14 +183,14 @@ async function getFireAreaInfos() {
     cardContentList[2]['val'] = treeData[0].infoTypeTwo.aveTemperature
     if (treeData[0]['gxcwCnt'] > 0 && treeData[0]['sgjcCnt'] > 0) {
       flagShow.value = 'all'
-      //获取工作面光钎条数及测点编号
+      //获取工作面光纤条数及测点编号
       getInfosByAreaCodeList()
       //获取工作面束管测点编号列表
       getSgjcPointInfoList()
 
     } else if (treeData[0]['gxcwCnt'] > 0) {
       flagShow.value = 'gx'
-      //获取工作面光钎条数及测点编号
+      //获取工作面光纤条数及测点编号
       getInfosByAreaCodeList()
     } else if (treeData[0]['sgjcCnt'] > 0) {
       flagShow.value = 'sg'
@@ -185,13 +213,13 @@ function selectChange(treeNode) {
   let sgjcCnt = treeData.filter((s) => s.name == treeNode.node.dataRef.title)[0]['sgjcCnt']
   if (gxcwCnt > 0 && sgjcCnt > 0) {
     flagShow.value = 'all'
-    //获取工作面光钎条数及测点编号
+    //获取工作面光纤条数及测点编号
     getInfosByAreaCodeList()
     //获取工作面束管测点编号列表
     getSgjcPointInfoList()
   } else if (gxcwCnt > 0) {
     flagShow.value = 'gx'
-    //获取工作面光钎条数及测点编号
+    //获取工作面光纤条数及测点编号
     getInfosByAreaCodeList()
 
   } else if (sgjcCnt > 0) {
@@ -201,7 +229,7 @@ function selectChange(treeNode) {
   }
 }
 
-//获取工作面光钎条数及测点编号
+//获取工作面光纤条数及测点编号
 async function getInfosByAreaCodeList() {
   let res = await getInfosByAreaCode({ areaCode: areaCode.value })
   if (res.length != 0) {
@@ -213,16 +241,16 @@ async function getInfosByAreaCodeList() {
       })
     })
     gxSelect.value = gxSelect.value ? gxSelect.value : res[0]['pointCode']
-    //获取光钎测温图表数据
+    //获取光纤测温图表数据
     getGxcwHistoryDataByPointCodeList()
   }
 }
-//工作面光钎测温测点编号选项切换
+//工作面光纤测温测点编号选项切换
 function pointChange(val) {
   gxSelect.value = val
   getGxcwHistoryDataByPointCodeList()
 }
-//获取光钎测温图表数据
+//获取光纤测温图表数据
 async function getGxcwHistoryDataByPointCodeList() {
   let res = await getGxcwHistoryDataByPointCode({ pointCode: gxSelect.value })
   echartDataGx.xData.length = 0
@@ -262,7 +290,7 @@ async function getSgjcRealDataByPointCodeList() {
   if (res.length != 0) {
     card3List.length = 0
     res.forEach(el => {
-      card3List.push({ title: el.type, ndLabel: '浓度', ndVal: el.currentValue, tLabel: '时间', tVal: el.time, aLabel: '位置', aVal: el.position,unit:el.unit||'' })
+      card3List.push({ title: el.type, ndLabel: '浓度', ndVal: el.currentValue, tLabel: '时间', tVal: el.time, aLabel: '位置', aVal: el.position, unit: el.unit || '' })
     })
     gasType.value = gasType.value ? gasType.value : card3List[0]['title']
     //获取束管曲线数据
@@ -276,9 +304,9 @@ function toggleChange(title) {
 }
 //获取束管曲线数据
 async function getSgjcHistoryDataList() {
-  let startTime=`${dayjs(TimeRange.value[0]).format('YYYY-MM-DD')} 00:00:00`
-  let endTime=`${dayjs(TimeRange.value[1]).format('YYYY-MM-DD')} 00:00:00`
-  let res = await getSgjcHistoryData({ pointCode: pointCode.value, type: gasType.value, startTime: startTime, endTime:endTime  })
+  let startTime = `${dayjs(TimeRange.value[0]).format('YYYY-MM-DD')} 00:00:00`
+  let endTime = `${dayjs(TimeRange.value[1]).format('YYYY-MM-DD')} 00:00:00`
+  let res = await getSgjcHistoryData({ pointCode: pointCode.value, type: gasType.value, startTime: startTime, endTime: endTime })
   echartData.xData.length = 0
   echartData.yData.length = 0
   echartData.yData1.length = 0

src/views/vent/fire/fireAtomizing/index.vue

@@ -308,13 +308,13 @@
 
   //数据随便写的，不符合实际情况，因为懒得改
   const treeData = reactive([
-    { name: '81203综放工作面', value: '111', id: '1', pid: null },
+    { name: '81203综采工作面', value: '111', id: '1', pid: null },
     { name: '束管监测系统', value: '222', id: '1-2', pid: '1' },
-    { name: '81203综放工作面', value: '458', id: '2', pid: null },
+    { name: '81203综采工作面', value: '458', id: '2', pid: null },
     { name: '束管监测系统', value: '445', id: '2-1', pid: '2' },
     { name: '束管监测系统', value: '456', id: '2-2', pid: '2' },
     { name: '束管监测系统', value: '647', id: '2-3', pid: '2' },
-    { name: '81203综放工作面', value: '189', id: '3', pid: null },
+    { name: '81203综采工作面', value: '189', id: '3', pid: null },
     { name: '束管监测系统', value: '664', id: '3-1', pid: '3' },
     { name: '束管监测系统', value: '652', id: '3-2', pid: '3' },
     { name: '束管监测系统', value: '732', id: '3-3', pid: '3' },

src/views/vent/fire/fireDistributionPoint/index.vue

@@ -21,7 +21,7 @@ import { ref, reactive, onMounted,onUnmounted } from 'vue';
 import basicSensor from '../../common/basicSensor.vue';
 import { getFireAreaInfo, getZcHfWd, getHeadingFace, getDsWd, getMainTrafficYw } from './firePoint.api'
 
-let sensorTitle = ref('综放工作面传感器监测');
+let sensorTitle = ref('综采工作面传感器监测');
 let sensorTitleJj = ref('掘进工作面传感器监测');
 let sensorTitleZys = ref('主运输系统传感器监测');
 let sensorTitleJD = ref('机电硐室及配电点传感器监测');
@@ -81,7 +81,7 @@ async function getFireAreaInfos() {
   }
 }
 
-//获取综放工作面传感器监测数据
+//获取综采工作面传感器监测数据
 async function getZcHfWdList() {
   let res = await getZcHfWd()
   if (res.length != 0) {

src/views/vent/fire/fireGoaf/index.vue

@@ -16,7 +16,7 @@
           </div>
 
           <div class="content-area">
-            <basicEchartLine :gridV="gridV" :echartData="echartData"></basicEchartLine>
+            <basicEchartLine :gridV="gridV"  :markLine="markLine1" :echartData="echartData"></basicEchartLine>
           </div>
         </div>
       </div>
@@ -52,6 +52,8 @@ let gridV = reactive({
   bottom: '10%',
 })
 
+let markLine1=reactive({})
+
 let echartData = reactive({
   xData: [],
   yData: [],

src/views/vent/fire/fireGoafList/index.vue

@@ -291,13 +291,13 @@ let columns = reactive([
 
 //数据随便写的，不符合实际情况，因为懒得改
 const treeData = reactive([
-  { name: "81203综放工作面", value: "111", id: '1', pid: null },
+  { name: "81203综采工作面", value: "111", id: '1', pid: null },
   { name: "束管监测系统", value: "222", id: '1-2', pid: '1' },
-  { name: "81203综放工作面", value: "458", id: '2', pid: null },
+  { name: "81203综采工作面", value: "458", id: '2', pid: null },
   { name: "束管监测系统", value: "445", id: '2-1', pid: '2' },
   { name: "束管监测系统", value: "456", id: '2-2', pid: '2' },
   { name: "束管监测系统", value: "647", id: '2-3', pid: '2' },
-  { name: "81203综放工作面", value: "189", id: '3', pid: null },
+  { name: "81203综采工作面", value: "189", id: '3', pid: null },
   { name: "束管监测系统", value: "664", id: '3-1', pid: '3' },
   { name: "束管监测系统", value: "652", id: '3-2', pid: '3' },
   { name: "束管监测系统", value: "732", id: '3-3', pid: '3' },

src/views/vent/fire/fireHome/firehome.api.ts

@@ -47,14 +47,14 @@ export const getSgjcRealDataByPointCode = (params) =>
 
 /**
  *
- * 获取光钎条数及测点编号
+ * 获取光纤条数及测点编号
  * @param params
  */
 export const getInfosByAreaCode = (params) => defHttp.get({ url: Api.getInfosByAreaCode, params });
 
 /**
  *
- * 获取光钎测温图表数据
+ * 获取光纤测温图表数据
  * @param params
  */
 export const getGxcwHistoryDataByPointCode = (params) =>

src/views/vent/fire/fireHome/index.vue

@@ -136,7 +136,7 @@ import {
 let toggleOpen = ref(false)
 let moduleSelect = reactive([
   { label: '工作面束管监测' },
-  // { label: '工作面光钎监测' },
+  // { label: '工作面光纤监测' },
 ]);
 
 //是否显示左侧区域和右侧区域
@@ -369,11 +369,11 @@ async function getFireAreaInfoListBd() {
   if (res.length != 0) {
     let dataBd = res.filter((m) => m.areaType == 5);
     areaCodeBd.value = dataBd[0].areaCode;
-    //获取光钎条数及测点编号
+    //获取光纤条数及测点编号
     getInfosByAreaCodeList();
   }
 }
-//获取光钎条数及测点编号
+//获取光纤条数及测点编号
 async function getInfosByAreaCodeList() {
   let res = await getInfosByAreaCode({ areaCode: areaCodeBd.value });
   if (res.length != 0) {
@@ -385,12 +385,12 @@ async function getInfosByAreaCodeList() {
       });
     });
     pointCodeBd.value = pointCodeBd.value ? pointCodeBd.value : selectListBd[0].value;
-    //获取光钎测温图表数据
+    //获取光纤测温图表数据
     getGxcwHistoryDataByPointCodeList();
   }
 }
 
-//获取光钎测温图表数据
+//获取光纤测温图表数据
 async function getGxcwHistoryDataByPointCodeList() {
   let res = await getGxcwHistoryDataByPointCode({ pointCode: pointCodeBd.value });
   echartDatas.xData.length = 0;
@@ -427,7 +427,7 @@ function getTableList() {
       break;
   }
 }
-//获取综放工作面传感器监测数据
+//获取综采工作面传感器监测数据
 async function getZcHfWdList() {
   let res = await getZcHfWd();
   safetyHead.length = 0;

src/views/vent/fire/fireMonitor/fireMonitor.api.ts

@@ -27,7 +27,7 @@ export const getPfmhRealData = (params) => defHttp.get({ url: Api.getPfmhRealDat
 
 /**
  *
- * 获取光钎测温图表数据
+ * 获取光纤测温图表数据
  * @param params
  */
 export const getGxcwHistoryDataByPointCode = (params) =>
@@ -35,7 +35,7 @@ export const getGxcwHistoryDataByPointCode = (params) =>
 
 /**
  *
- * 获取工作面光钎条数及测点编号
+ * 获取工作面光纤条数及测点编号
  * @param params
  */
 export const getInfosByAreaCode = (params) => defHttp.get({ url: Api.getInfosByAreaCode, params });

src/views/vent/fire/fireMonitor/index.vue

@@ -13,12 +13,12 @@
     </div>
     <div class="bot-box">
       <div class="bot-item-title">
-        <div class="item-left">光钎测温系统温度实时监测</div>
+        <div class="item-left">光纤测温系统温度实时监测</div>
         <a-select style="width: 180px" :options="gxSelectList" size="small" placeholder="请选择" v-model:value="gxSelect"
           allowClear @change="pointChange"></a-select>
       </div>
       <div class="bot-item-content">
-        <basicEchartLine :gridV="gridV" :echartData="echartDataGx"></basicEchartLine>
+        <basicEchartLine :gridV="gridV" :markLine="markLine1" :echartData="echartDataGx"></basicEchartLine>
       </div>
     </div>
 
@@ -48,11 +48,33 @@ let gxSelect = ref('')
 let gxSelectList = reactive<any[]>([])
 
 let gridV = reactive({
-  top: '8%',
+  top: '13%',
   left: '3%',
   right: '3%',
   bottom: '10%',
 })
+
+let markLine1 = reactive({ //最大值和最小值
+  data: [{
+    name: '预警值40­°C',
+    yAxis: 40,
+    label: {
+      show: true,
+      position: 'insideEndTop',
+      formatter: '预警值40­°C',
+      color: '#FF5D1D',
+      fontSize: 12,
+    },
+    lineStyle: {
+      normal: {
+        width: 1,
+        color: "#FF5D1D",
+      }
+    }
+
+  },
+  ]
+})
 let echartDataGx = reactive(
   {
     xData: [],
@@ -66,11 +88,11 @@ let echartDataGx = reactive(
 async function getYwRealDataList() {
   let res = await getYwRealData({ areaCode: 'zybds001' })
   console.log(res, '烟雾传感器数据------------')
-  if(res.length!=0){
-    sensorList.length=0
-    res.forEach(el=>{
-      el.isOpens=el.isOpen=='0' ? '正常' : '关闭'
-      sensorList.push({name:el.pointName,warn:el.isOpens,times:el.time})
+  if (res.length != 0) {
+    sensorList.length = 0
+    res.forEach(el => {
+      el.isOpens = el.isOpen == '0' ? '正常' : '关闭'
+      sensorList.push({ name: el.pointName, warn: el.isOpens, times: el.time })
     })
   }
 }
@@ -78,11 +100,11 @@ async function getYwRealDataList() {
 async function getHyRealDataList() {
   let res = await getHyRealData({ areaCode: 'zybds001' })
   console.log(res, '火焰传感器数据------')
-  if(res.length!=0){
-    sensorList1.length=0
-    res.forEach(el=>{
-      el.isOpens=el.isOpen=='0' ? '正常' : '关闭'
-      sensorList1.push({name:el.pointName,warn:el.isOpens,times:el.time})
+  if (res.length != 0) {
+    sensorList1.length = 0
+    res.forEach(el => {
+      el.isOpens = el.isOpen == '0' ? '正常' : '关闭'
+      sensorList1.push({ name: el.pointName, warn: el.isOpens, times: el.time })
     })
   }
 }
@@ -90,16 +112,16 @@ async function getHyRealDataList() {
 async function getPfmhRealDataList() {
   let res = await getPfmhRealData({ areaCode: 'zybds001' })
   console.log(res, '喷粉灭火装置数据---')
-  if(res.length!=0){
-    sensorList2.length=0
-    res.forEach(el=>{
-      el.isOpens=el.isOpen=='0' ? '正常' : '关闭'
-      sensorList2.push({name:el.pointName,warn:el.isOpens,times:el.time})
+  if (res.length != 0) {
+    sensorList2.length = 0
+    res.forEach(el => {
+      el.isOpens = el.isOpen == '0' ? '正常' : '关闭'
+      sensorList2.push({ name: el.pointName, warn: el.isOpens, times: el.time })
     })
   }
 }
 
-//获取工作面光钎条数及测点编号
+//获取工作面光纤条数及测点编号
 async function getInfosByAreaCodeList() {
   let res = await getInfosByAreaCode({ areaCode: 'zybds001' })
   if (res.length != 0) {
@@ -111,11 +133,11 @@ async function getInfosByAreaCodeList() {
       })
     })
     gxSelect.value = gxSelect.value ? gxSelect.value : res[0]['pointCode']
-    //获取光钎测温图表数据
+    //获取光纤测温图表数据
     getGxcwHistoryDataByPointCodeList()
   }
 }
-//获取光钎测温图表数据
+//获取光纤测温图表数据
 async function getGxcwHistoryDataByPointCodeList() {
   let res = await getGxcwHistoryDataByPointCode({ pointCode: gxSelect.value })
   echartDataGx.xData.length = 0
@@ -131,7 +153,7 @@ async function getGxcwHistoryDataByPointCodeList() {
     echartDataGx.yData1.push(el)
   })
 }
-//工作面光钎测温测点编号选项切换
+//工作面光纤测温测点编号选项切换
 function pointChange(val) {
   gxSelect.value = val
   getGxcwHistoryDataByPointCodeList()

src/views/vent/fire/wokeFace/index.vue

@@ -6,7 +6,7 @@
     <div class="workPlace-right-box">
       <div style="width:100%;height:100%"
         v-if="workBtnList.length != 0 || echartDataGx.xData.length != 0 || echartDataGx.yData.length != 0 || echartDataGx.yData1.length != 0 || card3List.length != 0 || echartData.xData.length != 0 || echartData.yData.length != 0 || echartData.yData1.length != 0">
-        <!-- 光钎 -->
+        <!-- 光纤 -->
         <div class="top-box-card" v-if="flagShow == 'gx' || flagShow == 'all'">
           <basicCard :cardContentList="cardContentList" />
         </div>
@@ -14,7 +14,7 @@
           <basicWorkBtn :workBtnList="workBtnList" @btnToggle="btnToggle" />
         </div>
         <div class="center-box" v-if="flagShow == 'gx' || flagShow == 'all'">
-          <basicEchartLine :gridV="gridV" :echartData="echartDataGx" />
+          <basicEchartLine :gridV="gridV" :markLine="markLine1" :echartData="echartDataGx" />
         </div>
 
 
@@ -34,7 +34,7 @@
             <a-range-picker v-model:value="TimeRange" :format="dateFormat" @change="onDataChange" />
           </div>
           <div class="content-area">
-            <basicEchartLine :gridV="gridV" :echartData="echartData"></basicEchartLine>
+            <basicEchartLine :gridV="gridV" :markLine="markLine2" :echartData="echartData"></basicEchartLine>
           </div>
 
         </div>
@@ -118,6 +118,29 @@ let gridV = reactive({
   bottom: '12%',
 })
 
+let markLine1 = reactive({ //最大值和最小值
+  data: [{
+    name: '预警值40­°C',
+    yAxis: 40,
+    label: {
+      show: true,
+      position: 'insideEndTop',
+      formatter: '预警值40­°C',
+      color: '#FF5D1D',
+      fontSize: 12,
+    },
+    lineStyle: {
+      normal: {
+        width: 1,
+        color: "#FF5D1D",
+      }
+    }
+
+  },
+  ]
+})
+let markLine2=reactive({})
+
 let echartData = reactive({
   xData: [],
   yData: [],
@@ -179,13 +202,13 @@ async function getFireAreaInfos() {
     getPlzzRealDataList()
     if (treeData[0]['gxcwCnt'] > 0 && treeData[0]['sgjcCnt'] > 0) {
       flagShow.value = 'all'
-      //获取工作面光钎条数及测点编号
+      //获取工作面光纤条数及测点编号
       getInfosByAreaCodeList()
       // //获取工作面束管测点编号列表
       getSgjcPointInfoList()
     } else if (treeData[0]['gxcwCnt'] > 0) {
       flagShow.value = 'gx'
-      //获取光钎条数及测点编号
+      //获取光纤条数及测点编号
       getInfosByAreaCodeList()
     } else if (treeData[0]['sgjcCnt'] > 0) {
       flagShow.value = 'sg'
@@ -215,13 +238,13 @@ function selectChange(treeNode) {
   let sgjcCnt = treeData.filter((s) => s.name == treeNode.node.dataRef.title)[0]['sgjcCnt']
   if (gxcwCnt > 0 && sgjcCnt > 0) {
     flagShow.value = 'all'
-    //获取工作面光钎条数及测点编号
+    //获取工作面光纤条数及测点编号
     getInfosByAreaCodeList()
     //获取工作面束管测点编号列表
     getSgjcPointInfoList()
   } else if (gxcwCnt > 0) {
     flagShow.value = 'gx'
-    //获取工作面光钎条数及测点编号
+    //获取工作面光纤条数及测点编号
     getInfosByAreaCodeList()
 
   } else if (sgjcCnt > 0) {
@@ -231,7 +254,7 @@ function selectChange(treeNode) {
   }
 }
 
-//获取光钎条数及测点编号
+//获取光纤条数及测点编号
 async function getInfosByAreaCodeList() {
   let res = await getInfosByAreaCode({ areaCode: areaCode.value })
   if (res.length != 0) {
@@ -244,18 +267,18 @@ async function getInfosByAreaCodeList() {
       })
     })
     gxSelect.value = gxSelect.value ? gxSelect.value : res[0]['pointCode']
-    //获取光钎测温图表数据
+    //获取光纤测温图表数据
     getGxcwHistoryDataByPointCodeList()
   }
 }
 
-//光钎选项切换
+//光纤选项切换
 function btnToggle(item) {
   gxSelect.value = item.value
   getGxcwHistoryDataByPointCodeList()
 }
 
-//获取光钎测温图表数据
+//获取光纤测温图表数据
 async function getGxcwHistoryDataByPointCodeList() {
   let res = await getGxcwHistoryDataByPointCode({ pointCode: gxSelect.value })
   echartDataGx.xData.length = 0

src/views/vent/fire/wokeFace/workeFace.api.ts

@@ -18,13 +18,13 @@ enum Api {
 export const getFireAreaInfo = (params) => defHttp.get({ url: Api.getFireAreaInfo, params });
 
 /**
- * 获取光钎条数及测点编号
+ * 获取光纤条数及测点编号
  * @param params
  */
 export const getInfosByAreaCode = (params) => defHttp.get({ url: Api.getInfosByAreaCode, params });
 
 /**
- * 获取光钎图表数据
+ * 获取光纤图表数据
  * @param params
  */
 export const getGxcwHistoryDataByPointCode = (params) =>