From ddcda5494cb39fc07c09b8ce099921da9f45cb55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?=
 <13694051+wangxizhao123@user.noreply.gitee.com>
Date: Sat, 29 Jun 2024 10:55:35 +0800
Subject: [PATCH] =?UTF-8?q?fase()=E6=8C=87=E6=A0=87=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=EF=BC=8C=E6=BB=91=E7=AA=97=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/goods/forewarn.js                    |  8 +++
 src/views/client/car/index.vue               | 21 ++++---
 src/views/client/sever/forewarning/index.vue | 64 ++++++++++++++++++++
 src/views/client/sever/message/index.vue     | 15 +++--
 src/views/client/sever/window/index.vue      | 16 ++++-
 5 files changed, 109 insertions(+), 15 deletions(-)
 create mode 100644 src/views/client/sever/forewarning/index.vue

diff --git a/src/api/goods/forewarn.js b/src/api/goods/forewarn.js
index f912a34..437fa98 100644
--- a/src/api/goods/forewarn.js
+++ b/src/api/goods/forewarn.js
@@ -42,6 +42,14 @@ export function deleteDataFormatById(vin) {
   })
 }
 
+// 指标预警
+export function listWarningInfoById(vin) {
+  return request({
+    url: '/rule/forewarn/listWarningInfoById/' + vin,
+    method: 'post'
+  })
+}
+
 
 
 
diff --git a/src/views/client/car/index.vue b/src/views/client/car/index.vue
index f178588..b604fb8 100644
--- a/src/views/client/car/index.vue
+++ b/src/views/client/car/index.vue
@@ -132,7 +132,6 @@
         </template>
       </el-table-column>
       <el-table-column label="车牌号" align="center" prop="registrationNumber" />
-      <el-table-column label="所有者" align="center" prop="ownerId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -152,13 +151,14 @@
       <el-table-column label="查看服务">
         <span slot-scope="scope">
           <el-button type="text" @click="fence(scope.row.carId)">查看围栏</el-button>
-          <el-button type="text" @click="breakdown(scope.row.vin)">查看故障报警</el-button>
+          <el-button type="text" @click="breakdown(scope.row.vin)">故障报警</el-button>
+          <el-button type="text" @click="warning(scope.row.vin)">指标预警</el-button>
         </span>
       </el-table-column>
       <el-table-column label="查看车辆检测规则">
         <span slot-scope="scope">
-          <el-button type="text" @click="windows(scope.row.vin)">查看滑窗规则</el-button>
-          <el-button type="text" @click="readFormat(scope.row.vin)">查看车辆报文</el-button>
+          <el-button type="text" @click="windows(scope.row.vin)">滑窗规则</el-button>
+          <el-button type="text" @click="readFormat(scope.row.vin)">车辆报文</el-button>
         </span>
       </el-table-column>
       <el-table-column label="查看实时坐标">
@@ -284,19 +284,22 @@ export default {
     bulk() {
       alert("信息已发送，等待处理")
     },
-    fence(carId) {
+    fence(carId) {// 查看围栏
       this.$router.push({path: '/client/sever/fence',query:{carId:carId}})
     },
-    breakdown(vin) {
+    breakdown(vin) {// 查看故障报警
       this.$router.push({path: '/client/sever/breakdown',query:{vin:vin}})
     },
-    realTime(vin) {
+    warning(vin) {// 查看指标预警
+      this.$router.push({path: '/client/sever/forewarning',query:{vin:vin}})
+    },
+    realTime(vin) {// 查看实时坐标
       this.$router.push({path: '/client/sever/random',query:{vin:vin}})
     },
-    readFormat(vin) {
+    readFormat(vin) {// 查看车辆报文
       this.$router.push({path: '/client/sever/message',query:{vin:vin}})
     },
-    windows(vin) {
+    windows(vin) {// 查看滑窗规则
       this.$router.push({path: '/client/sever/window',query:{vin:vin}})
     },
     /** 查询车辆信息列表 */
diff --git a/src/views/client/sever/forewarning/index.vue b/src/views/client/sever/forewarning/index.vue
new file mode 100644
index 0000000..2b1d86e
--- /dev/null
+++ b/src/views/client/sever/forewarning/index.vue
@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <el-table :data="warningInfo">
+      <el-table-column prop="vin" label="车辆编码"></el-table-column>
+      <el-table-column prop="field" label="预警编码"></el-table-column>
+      <el-table-column prop="abnormalType" label="异常状态"></el-table-column>
+      <el-table-column prop="time" label="预警时间"></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listWarningInfoById } from "@/api/goods/forewarn";
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  components: {},
+  props: {},
+  data() {
+    // 这里存放数据"
+    return {
+      vin: this.$route.query.vin,
+      warningInfo: []
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 监控data中的数据变化",
+  watch: {},
+  // 方法集合",
+  methods: {
+    getInfo() {
+      listWarningInfoById(this.vin).then(res => {
+        this.warningInfo = res.data
+      })
+    }
+  },
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.getInfo()
+  },
+  // 生命周期 - 挂载完成（可以访问DOM元素）",
+  mounted() {
+  },
+  beforeCreate() {
+  }, // 生命周期 - 创建之前",
+  beforeMount() {
+  }, // 生命周期 - 挂载之前",
+  beforeUpdate() {
+  }, // 生命周期 - 更新之前",
+  updated() {
+  }, // 生命周期 - 更新之后",
+  beforeDestroy() {
+  }, // 生命周期 - 销毁之前",
+  destroyed() {
+  }, // 生命周期 - 销毁完成",
+  activated() {
+  } // 如果页面有keep-alive缓存功能，这个函数会触发",
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/client/sever/message/index.vue b/src/views/client/sever/message/index.vue
index 336c262..d28ca0a 100644
--- a/src/views/client/sever/message/index.vue
+++ b/src/views/client/sever/message/index.vue
@@ -9,7 +9,7 @@
             {{item.label}}
           </label>
           <div v-if="isSelected(index)">
-            <label>Start:<input type="number" v-model="item.start" min="1"  disabled/></label>
+            <label>Start:<input type="number" v-model="item.start" min="1" disabled/></label>
             <label>End:<input type="number" v-model="item.end" min="1" disabled/></label>
           </div>
         </div>
@@ -66,7 +66,7 @@ export default {
       // 基本信息
       basic: [
         {dataCode:"vin",label:"车辆标识",start:1,end:17},
-        {dataCode:"time",label:"时间",start:18,end:27},
+        {dataCode:"time",label:"时间",start:18,end:30},
         {dataCode:"longitude",label:"经度",start:31,end:40},
         {dataCode:"latitude",label:"纬度",start:41,end:50},
         {dataCode:"speed",label:"车速",start:52,end:57},
@@ -75,7 +75,7 @@ export default {
       ],
       // 标准信息
       standard: [
-        {dataCode:"totalVoltage",label:"总电压",start:69,end:75},
+        {dataCode:"totalVoltage",label:"总电压",start:69,end:74},
         {dataCode:"totalCurrent",label:"总电流",start:75,end:79},
         {dataCode:"insulationResistance",label:"绝缘电阻",start:80,end:87},
         {dataCode:"acceleratorPedal",label:"加速踏板行程值",start:90,end:91},
@@ -149,7 +149,14 @@ export default {
     },
     //添加内容
     dian() {
-      indexDataFormat(this.selectedOptions,this.vin)
+      indexDataFormat(this.selectedOptions,this.vin).then(res => {
+        console.log(res)
+        if (res.data != 0){
+          this.$modal.msgSuccess("新增成功")
+        }else{
+          this.$modal.msgSuccess("新增失败")
+        }
+      })
       this.getInfo()
     },
     getInfo() {
diff --git a/src/views/client/sever/window/index.vue b/src/views/client/sever/window/index.vue
index 9393107..615dc47 100644
--- a/src/views/client/sever/window/index.vue
+++ b/src/views/client/sever/window/index.vue
@@ -5,6 +5,7 @@
       <el-table-column prop="vin" label="车辆标识"></el-table-column>
       <el-table-column prop="dataCode" label="数据编码"></el-table-column>
       <el-table-column prop="label" label="标签"></el-table-column>
+      <el-table-column prop="floating" label="浮动数据"></el-table-column>
       <el-table-column prop="standardData" label="标准数据"></el-table-column>
       <el-table-column prop="radiusName" label="滑窗范围"></el-table-column>
       <el-table-column prop="lengthName" label="滑动长度"></el-table-column>
@@ -40,6 +41,9 @@
             <el-option v-for="item in length" :key="item.lengthId" :label="item.lengthName" :value="item.lengthId"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="浮动数据" prop="floating">
+          <el-input v-model="form.floating " placeholder="请输入浮动数据" />
+        </el-form-item>
         <el-form-item label="标准数据" prop="standardData">
           <el-input v-model="form.standardData " placeholder="请输入标准数据" />
         </el-form-item>
@@ -132,8 +136,16 @@ export default {
     },
     // 删除
     deleteDate(id) {
-      deleteDataSpecification(id)
-      this.getList()
+      deleteDataSpecification(id).then(res => {
+        console.log(res)
+        if (res.data>0) {
+          this.$message.success("成功")
+          this.getList()
+        } else {
+          this.$message.error("失败")
+        }
+      })
+
     },
     // 取消按钮
     cancel() {