束管监测详情界面bug修改-提交

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -615,7 +615,15 @@ async function getDataSource() {
               dataSource.value = data
             }
           } else {
-            dataSource.value = data
+            let tableData:any[]=[]
+            data.forEach(el=>{
+              if(el.netStatus==1){
+                tableData.splice(0, 0,el);
+              }else {
+                tableData.push(el);
+              }
+            })
+            dataSource.value = tableData
           }
         }else{
           dataSource.value = []

src/views/vent/monitorManager/deviceMonitor/components/device/modal/blastDelta.vue

@@ -344,13 +344,12 @@ function getCoordABY(params) {
 }
 //根据纵坐标获取直线AB横坐标
 function getCoordABX(params1) {
-    return Math.ceil(((parseFloat(coordinateB.x) - parseFloat(coordinateA.x)) * params1 + parseFloat(coordinateA.x) * parseFloat(coordinateB.y) - parseFloat(coordinateB.x) * parseFloat(coordinateA.y)) / (parseFloat(coordinateB.y) - parseFloat(coordinateA.y)))
+    return Math.floor(((parseFloat(coordinateB.x) - parseFloat(coordinateA.x)) * params1 + parseFloat(coordinateA.x) * parseFloat(coordinateB.y) - parseFloat(coordinateB.x) * parseFloat(coordinateA.y)) / (parseFloat(coordinateB.y) - parseFloat(coordinateA.y)))
 }
 
 watch(() => props.posMonitor, (newV, oldV) => {
     maxY1.value = parseFloat(newV.coval) + parseFloat(newV.gasval) + parseFloat(newV.ch2val) + parseFloat(newV.chval)
     maxX1.value = parseFloat(newV.o2val)
-   
     let btTriBlasts = JSON.parse(newV.btTriBlast)
     coordinateA.x = btTriBlasts.A_x
     coordinateA.y = btTriBlasts.A_y

src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -91,7 +91,7 @@
           </div>
         </div>
         <div class="right-bottom">
-          <span class="base-title">设备监测曲线</span>
+          <span class="base-title">设备监测曲线&nbsp; <span style="color:red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' : '' }}</span></span>
           <div class="echarts-box">
             <BarAndLine  class="echarts-line" xAxisPropType="time" :dataSource="historyList" height="100%"
               width="65%" :chartsColumns="chartsColumns" :option="echatsOption" chartsType="listMonitor" />