付凡芮commit

src/views/couplet/VehicleDetection/index.vue

@@ -59,11 +59,298 @@
       </el-table-column>
       <el-table-column label="操作" width="180" align="center">
         <template slot-scope="scope">
-          <el-button size="mini" type="danger" @click="findByVehicle(scope.row.vin)">查看实时数据</el-button>
+          <el-button type="text" @click="dialogTableVisible = true;findByVehicle(scope.row.vin)">查看实时数据 Dialog</el-button>
           <el-button size="mini" type="danger" @click="stopViewingData(scope.row.vin)">停止查看实时数据</el-button>
         </template>
       </el-table-column>
     </el-table>
+
+
+    <el-dialog title="收货地址" :visible.sync="dialogTableVisible">
+      <el-table :data="gridData">
+        <el-table-column label="VIN" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.vin }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="报文创建时间" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.longitude }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="维度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.latitude }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="速度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.speed }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="里程" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.mileage }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="总电压" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.voltage }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="总电流" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.current }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="绝缘电阻" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.resistance }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="档位" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.gear }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="加速踏板行驶值" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.accelerationPedal }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制动踏板行驶值" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.brakePedal }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="燃料消耗率" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.fuelConsumptionRate }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电机控制器温度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.motorControllerTemperature }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电机转速" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.motorSpeed }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电机转矩" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.motorTorque }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电机温度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.motorTemperature }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电机电压" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.motorVoltage }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电机电流" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.motorCurrent }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池剩余电量SOC" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.remainingBattery }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="当前状态允许的最大反馈功率" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.maximumFeedbackPower }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="当前状态允许的最大放电功率" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.maximumDischargePower }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="BMS自检计数器" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.selfCheckCounter }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池充放电电流" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.totalBatteryCurrent }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池负载端电压V3" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.totalBatteryVoltage }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单次最大电压" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.singleBatteryMaxVoltage }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单体电池最低电压" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.singleBatteryMinVoltage }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单体电池最高温度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.singleBatteryMaxTemperature }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单体电池最低温度" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.singleBatteryMinTemperature }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池可用容量" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.availableBatteryCapacity }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="车辆状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.vehicleStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="充电状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.chargingStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="运行状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.operatingStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="SOC" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.socStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="可充电储能装置工作状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.chargingEnergyStorageStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="驱动电机状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.driveMotorStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="定位是否有效" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.positionStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="汽车防盗系统" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.easStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电动加热器" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.ptcStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="电动助力系统" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.epsStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="防抱死" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.absStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="MCU" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.mcuStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池加热状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.heatingStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池当前状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.batteryStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="动力电池保温状态" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.batteryInsulationStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="DCDC" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.dcdcStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="CHG" width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.chgStatus }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -89,6 +376,9 @@ export default {
 
       //车辆类型
       vehicleTypes: [],
+      gridData:{},
+      dialogTableVisible: false,
+      dialogFormVisible: false,
       //对话框的参数
       formLabelWidth: '120px',
       dialogEdit: false,
@@ -129,12 +419,21 @@ export default {
         }
       )
     },
-    findByVehicle(vin){
+    findByVehicle(vin) {
-      postFindByVin(vin).then(() => {
+      // 异步调用 postFindByVin 方法
-        monitorinDataList(vin).then(() => {
+      return postFindByVin(vin)
-          this.$router.push({ path: 'monitorinData', params: { vin } });
+        .then(() => {
+          // 成功后，继续异步调用 monitorinDataList 方法
+          return monitorinDataList(vin);
+        })
+        .then((res) => {
+          // 处理 monitorinDataList 返回的结果
+          this.gridData = res.data;
+        })
+        .catch((error) => {
+          // 添加错误处理，当任一异步操作失败时，打印错误信息或进行其他处理
+          console.error('Error fetching vehicle data:', error);
         });
-      });
     },
     stopViewingData(vin){
       stopViewingData(vin).then(res=>{
@@ -159,7 +458,7 @@ export default {
   created() {
     //获取车辆列表
     this.getVehicleList ()
-
+    this.findByVehicle()
     //获取车辆类型
     this.getVehicleTypes()
   },

src/views/couplet/monitorinData/index.vue

@@ -1,4 +1,4 @@
-<template>
+
   <div>
     <template>
       <el-table :data="tableData" style="width: 100%">
@@ -288,9 +288,7 @@
 
       </el-table>
     </template>
-
   </div>
-</template>
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -319,20 +317,26 @@ export default {
     watch: {},
     //方法集合",
     methods: {
-      getList() {
+      getDataList() {
         monitorinDataList(this.vin).then(
           res => {
             this.tableData = res.data;
           }
         )
       },
+      // refreshTableData() {
+      //   this.getList();
+      // }
     },
     //生命周期 - 创建完成（可以访问当前this实例）",
     created() {
-
+      this.getDataList()
     },
     //生命周期 - 挂载完成（可以访问DOM元素）",
     mounted() {
+      // setInterval(() => {
+      //   this.refreshTableData();
+      // }, 4000);
     },
     beforeCreate() {
     }, //生命周期 - 创建之前",

src/views/couplet/vehicle/index.vue

@@ -24,7 +24,7 @@
 
 
     <!--    列表-->
-    <el-table :data="vehicleList" style="width: 100%" border v-loading="loading">
+    <el-table :data="vehicleList" style="width: 100%" border>
       <el-table-column label="车辆id" width="90" align="center">
         <template slot-scope="scope">
           <span style="margin-left: 10px">{{ scope.row.vehicleId }}</span>
@@ -55,11 +55,11 @@
           <span style="margin-left: 10px">{{ scope.row.batteryNumber }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="vin码" width="180" align="center">
+      <!--      <el-table-column label="vin码" width="180" align="center">-->
-        <template slot-scope="scope">
+      <!--        <template slot-scope="scope">-->
-          <span style="margin-left: 10px">{{ scope.row.vin }}</span>
+      <!--          <span style="margin-left: 10px">{{ scope.row.vin }}</span>-->0
-        </template>
+      <!--        </template>-->
-      </el-table-column>
+      <!--      </el-table-column>-->
       <el-table-column label="车辆状态" width="120" align="center">
         <template slot-scope="scope">
           <span style="margin-left: 10px" v-if="1==scope.row.vehicleState">
@@ -176,8 +176,6 @@ export default {
   data() {
     //这里存放数据"
     return {
-      //加载
-      loading: true,
       //车辆列表
       vehicleList: [],
 
@@ -245,14 +243,8 @@ export default {
     getVehicleList() {
       list(this.vehicleListParams).then(
         res => {
-          if (res.code == 200) {
+          this.vehicleList = res.data.list;
-            this.vehicleList = res.data.list;
+          this.total = res.data.total;
-            this.total = res.data.total;
-            this.loading = false;
-          } else {
-            this.$message.error("列表查询异常");
-          }
-
         }
       )
     },