5.5首页修改-提交

.env.development

@@ -26,5 +26,5 @@ VITE_GLOB_API_URL_PREFIX=
 
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//182.92.126.35:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]
-
+# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "localhost"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

src/views/vent/home/colliery/components/wind-line.vue

@@ -285,7 +285,7 @@ function getOption() {
           itemStyle: {
             normal: {
               borderWidth: 5,
-              borderColor: 'rgba(5, 45, 99)',
+              borderColor: 'rgba(1, 57, 134,1)',
             },
           },
           data: RealData,

src/views/vent/home/colliery/index.vue

@@ -201,7 +201,7 @@ function getList() {
       navList[4].val = '0%';
     }
 
-    flList.value = res.windrect || [];
+    flList.value = res.windrect || res.sys_wind;
     lineList.value = res.sys_majorpath || [];
     workList.value = res.sys_surface_caimei || [];
     warnData.value = res.warn || [];

src/views/vent/monitorManager/alarmMonitor/fire/closeWall.vue

@@ -227,7 +227,19 @@ watch(() => props.listData, (val) => {
 
             val.bundletube[0].history.forEach(v => {
                 echartDataSg1.xData.push(v.time)
-                echartDataSg1.yData.push(v.o2val)
+                if (echartDataSg1.lengedData == 'O2') {
+                    echartDataSg1.yData.push(v.o2val)
+                } else if (echartDataSg1.lengedData == 'C2H4') {
+                    echartDataSg1.yData.push(v.ch2val)
+                } else if (echartDataSg1.lengedData == 'CO') {
+                    echartDataSg1.yData.push(v.coval)
+                } else if (echartDataSg1.lengedData == 'CH4') {
+                    echartDataSg1.yData.push(v.chval)
+                } else if (echartDataSg1.lengedData == 'CO2') {
+                    echartDataSg1.yData.push(v.co2val)
+                } else if (echartDataSg1.lengedData == 'C2H2') {
+                    echartDataSg1.yData.push(v.gasval)
+                }
                 echartDataSgList.push(v)
             })
 

src/views/vent/monitorManager/alarmMonitor/fire/fireWork.vue

@@ -133,42 +133,36 @@ function getSgClick(items) {
             echartDataSgList.forEach(el => {
                 echartDataSg.xData.push(el.time)
                 echartDataSg.yData.push(el.o2val)
-
             })
             break;
         case 'C2H4':
             echartDataSgList.forEach(el => {
                 echartDataSg.xData.push(el.time)
                 echartDataSg.yData.push(el.ch2val)
-
             })
             break;
         case 'CO':
             echartDataSgList.forEach(el => {
                 echartDataSg.xData.push(el.time)
                 echartDataSg.yData.push(el.coval)
-
             })
             break;
         case 'CH4':
             echartDataSgList.forEach(el => {
                 echartDataSg.xData.push(el.time)
                 echartDataSg.yData.push(el.chval)
-
             })
             break;
         case 'CO2':
             echartDataSgList.forEach(el => {
                 echartDataSg.xData.push(el.time)
                 echartDataSg.yData.push(el.co2val)
-
             })
             break;
         case 'C2H2':
             echartDataSgList.forEach(el => {
                 echartDataSg.xData.push(el.time)
                 echartDataSg.yData.push(el.gasval)
-
             })
             break;
     }
@@ -207,9 +201,22 @@ watch(() => props.listData, (val, val1) => {
                 })
             })
 
+
             val.bundletube[0].history.forEach(el => {
                 echartDataSg.xData.push(el.time)
-                echartDataSg.yData.push(el.o2val)
+                if (echartDataSg.lengedData == 'O2') {
+                    echartDataSg.yData.push(el.o2val)
+                } else if (echartDataSg.lengedData == 'C2H4') {
+                    echartDataSg.yData.push(el.ch2val)
+                } else if (echartDataSg.lengedData == 'C2H2') {
+                    echartDataSg.yData.push(el.gasval)
+                } else if (echartDataSg.lengedData == 'CH4') {
+                    echartDataSg.yData.push(el.chval)
+                } else if (echartDataSg.lengedData == 'CO') {
+                    echartDataSg.yData.push(el.coval)
+                } else if (echartDataSg.lengedData == 'CO2') {
+                    echartDataSg.yData.push(el.co2val)
+                }
                 echartDataSgList.push(el)
             })
         }