fix():提交前台功能

Reviewed-on: #2

src/api/car/car.js

@@ -42,4 +42,3 @@ export function delCar(id) {
     method: 'delete'
   })
 }
-

src/api/car/information.js

@@ -0,0 +1,49 @@
+import request from "@/utils/request";
+
+
+export function selectCarInformationList(data){
+  return request({
+    url:"/car/carinformation/selectCarInformationList",
+    method: "POST",
+    data: data
+  })
+}
+
+export function addCarInformation(data){
+  return request({
+    url:"/car/carinformation/addCarInformation",
+    method: "POST",
+    data: data
+  })
+}
+
+export function delBycarInformationId(carInformationId) {
+  return request({
+    url: "/car/carinformation/delBycarInformationId" + carInformationId ,
+    method: "GET"
+  })
+}
+
+export function updatecarInformation(data) {
+  return request({
+    url: "/car/carinformation/updatecarInformation",
+    method: "POST",
+    data: data
+  })
+}
+
+
+
+export function orderssd(ordersId) {
+  return request({
+    url: "car/carinformation/" + ordersId ,
+    method: "GET"
+  })
+}
+
+
+
+
+
+
+

src/api/car/message.js

@@ -0,0 +1,49 @@
+import request from "@/utils/request";
+
+
+export function selectCarMessageList(data){
+  return request({
+    url:"/car/carMessage/selectCarMessageList",
+    method: "POST",
+    data: data
+  })
+}
+
+export function insertCarMessage(data){
+  return request({
+    url:"/car/carMessage/insertCarMessage",
+    method: "POST",
+    data: data
+  })
+}
+
+export function delBycarInformationId(carInformationId) {
+  return request({
+    url: "/car/carinformation/delBycarInformationId" + carInformationId ,
+    method: "GET"
+  })
+}
+
+export function updatecarInformation(data) {
+  return request({
+    url: "/car/carinformation/updatecarInformation",
+    method: "POST",
+    data: data
+  })
+}
+
+
+
+export function orderssd(ordersId) {
+  return request({
+    url: "car/carinformation/" + ordersId ,
+    method: "GET"
+  })
+}
+
+
+
+
+
+
+

src/api/car/type.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+//查询所有的车辆类型
+export function listType(){
+  return  request({
+    url: '/car/sysType/list',
+    method: 'get'
+  })
+
+}

src/api/fault/cartype.js

@@ -0,0 +1,11 @@
+import request from "@/utils/request";
+
+
+//故障码分类
+export function getcarType(data){
+  return request({
+    url:"/fault/cartype/list",
+    method: "POST",
+    data: data
+  })
+}

src/api/fault/faultcode.js

@@ -0,0 +1,67 @@
+import request from "@/utils/request";
+
+//故障码列表展示
+export function getfaultcode(data){
+  return request({
+    url:"/fault/faultcode/faultcodelist",
+    method: "POST",
+    data: data
+  })
+}
+
+
+//新增故障码
+export function addfalutcode(data){
+  return request({
+    url:"/fault/faultcode/faultcodeadd",
+    method: "POST",
+    data: data
+  })
+}
+
+//修改故障码
+export function updfalutcode(data){
+  return request({
+    url:"/fault/faultcode/faultcodeupd",
+    method: "POST",
+    data: data
+  })
+}
+
+//删除故障码
+export function delfaultcode(messageTypeId){
+  return request({
+    url:"/fault/faultcode/faultcodedel/"+messageTypeId,
+    method: "POST",
+  })
+}
+
+
+
+//故障码分类
+export function getfaultType(data){
+  return request({
+    url:"/fault/faulttype/list",
+    method: "POST",
+    data: data
+  })
+}
+
+//故障名称
+export function getfaultLabel(data){
+  return request({
+    url:"/fault/faultlabel/list",
+    method: "POST",
+    data: data
+  })
+}
+
+export function getunread(data){
+  return request({
+    url:"/fault/message/unread",
+    method: "POST",
+    data: data
+  })
+}
+
+

src/api/fault/faultlog.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+//日志列表展示
+export function getfaultlog(data){
+  return request({
+    url:"/fault/faultlog/list",
+    method: "POST",
+    data: data
+  })
+}

src/api/fault/faultmessage.js

@@ -0,0 +1,20 @@
+import request from "@/utils/request";
+
+//信息列表
+export function getmessagelist(data){
+  return request({
+    url:"/fault/message/messagelist",
+    method: "POST",
+    data: data
+  })
+}
+
+//状态改变
+export function changestatus(data){
+  return request({
+    url:"/fault/message/changestatus",
+    method: "POST",
+    data: data
+  })
+}
+

src/api/fault/faultrule.js

@@ -0,0 +1,37 @@
+import request from "@/utils/request";
+
+//故障码列表展示
+export function getfaultrule(data){
+  return request({
+    url:"/fault/faultcondition/list",
+    method: "POST",
+    data: data
+  })
+}
+
+//制定规则
+export function addrule(data){
+  return request({
+    url:"/fault/faultcondition/faultconditionadd",
+    method: "POST",
+    data: data
+  })
+}
+
+//修改规则
+export function updruleForm(data){
+  return request({
+    url:"/fault/faultcondition/faultconditionupd",
+    method: "POST",
+    data: data
+  })
+}
+
+//删除规则
+export function delruleForm(carconditionId){
+  return request({
+    url:"/fault/faultcondition/faultconditiondel/"+carconditionId,
+    method: "POST",
+  })
+}
+

src/api/fault/member.js

@@ -0,0 +1,20 @@
+import request from "@/utils/request";
+import data from "@/views/system/dict/data.vue";
+
+
+//故障码分类
+export function getcarType(data){
+  return request({
+    url:"/fault/cartype/list",
+    method: "POST",
+    data: data
+  })
+}
+
+export function getMemberList(data){
+  return request({
+    url:"/fault/member/list",
+    method: "POST",
+    data:data
+  })
+}

src/api/platform/strategy.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+
 // 查询预警策略列表
 export function listStrategy(query) {
   return request({
@@ -41,4 +42,12 @@ export function delStrategy(id) {
     url: '/warn/strategy/' + id,
     method: 'delete'
   })
+
+
+
+
+
+
+
+
 }

src/api/syscarfault/breakdown.js

@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 查询车辆故障列表
+export function listBreakdown(query) {
+  return request({
+    url: '/breakdown/breakdown/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询车辆故障详细
+export function getBreakdown(id) {
+  return request({
+    url: '/breakdown/breakdown/' + id,
+    method: 'get'
+  })
+}
+
+// 新增车辆故障
+export function addBreakdown(data) {
+  return request({
+    url: '/breakdown/breakdown',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改车辆故障
+export function updateBreakdown(data) {
+  return request({
+    url: '/breakdown/breakdown',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除车辆故障
+export function delBreakdown(id) {
+  return request({
+    url: '/breakdown/breakdown/' + id,
+    method: 'delete'
+  })
+}
+
+//查询站内信列表
+export function getMessageList(data) {
+  return request({
+    url: '/breakdown/stationMessage/getMessageList',
+    method: 'post',
+    data: data
+  })
+}
+// 修改站内信的状态
+export function updateAsUserDept(id) {
+  return request({
+    url: '/breakdown/stationMessage/updStatus?id=' + id,
+    method: 'get'
+  })
+}
+//统计未读消息的数量
+export function getNum() {
+  return request({
+    url: '/breakdown/stationMessage/getNum',
+    method: 'get'
+  })
+}

src/api/syscarfault/cartype.js

@@ -0,0 +1,11 @@
+import request from "@/utils/request";
+
+
+//故障码分类
+export function getcarType(data){
+  return request({
+    url:"/faultmanage/cartype/list",
+    method: "POST",
+    data: data
+  })
+}

src/api/syscarfault/faultcode.js

@@ -0,0 +1,67 @@
+import request from "@/utils/request";
+
+//故障码列表展示
+export function getfaultcode(data){
+  return request({
+    url:"/faultmanage/faultcode/faultcodelist",
+    method: "POST",
+    data: data
+  })
+}
+
+
+//新增故障码
+export function addfalutcode(data){
+  return request({
+    url:"/faultmanage/faultcode/faultcodeadd",
+    method: "POST",
+    data: data
+  })
+}
+
+//修改故障码
+export function updfalutcode(data){
+  return request({
+    url:"/faultmanage/faultcode/faultcodeupd",
+    method: "POST",
+    data: data
+  })
+}
+
+//删除故障码
+export function delfaultcode(messageTypeId){
+  return request({
+    url:"/faultmanage/faultcode/faultcodedel/"+messageTypeId,
+    method: "POST",
+  })
+}
+
+
+
+//故障码分类
+export function getfaultType(data){
+  return request({
+    url:"/faultmanage/faulttype/list",
+    method: "POST",
+    data: data
+  })
+}
+
+//故障名称
+export function getfaultLabel(data){
+  return request({
+    url:"/faultmanage/faultlabel/list",
+    method: "POST",
+    data: data
+  })
+}
+
+export function getunread(data){
+  return request({
+    url:"/faultmanage/message/unread",
+    method: "POST",
+    data: data
+  })
+}
+
+

src/api/syscarfault/faultlog.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+//日志列表展示
+export function getfaultlog(data){
+  return request({
+    url:"/faultmanage/faultlog/list",
+    method: "POST",
+    data: data
+  })
+}

src/api/syscarfault/faultmessage.js

@@ -0,0 +1,20 @@
+import request from "@/utils/request";
+
+//信息列表
+export function getmessagelist(data){
+  return request({
+    url:"/faultmanage/message/messagelist",
+    method: "POST",
+    data: data
+  })
+}
+
+//状态改变
+export function changestatus(data){
+  return request({
+    url:"/faultmanage/message/changestatus",
+    method: "POST",
+    data: data
+  })
+}
+

src/api/syscarfault/faultrule.js

@@ -0,0 +1,37 @@
+import request from "@/utils/request";
+
+//故障码列表展示
+export function getfaultrule(data){
+  return request({
+    url:"/faultmanage/faultcondition/list",
+    method: "POST",
+    data: data
+  })
+}
+
+//制定规则
+export function addrule(data){
+  return request({
+    url:"/faultmanage/faultcondition/faultconditionadd",
+    method: "POST",
+    data: data
+  })
+}
+
+//修改规则
+export function updruleForm(data){
+  return request({
+    url:"/faultmanage/faultcondition/faultconditionupd",
+    method: "POST",
+    data: data
+  })
+}
+
+//删除规则
+export function delruleForm(carconditionId){
+  return request({
+    url:"/faultmanage/faultcondition/faultconditiondel/"+carconditionId,
+    method: "POST",
+  })
+}
+

src/views/car/car/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="82px">
       <el-form-item label="车辆VIN码" prop="carVin">
         <el-input
           v-model="queryParams.carVin"
@@ -40,7 +40,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['car:car:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +52,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['car:car:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['car:car:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,25 +75,22 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['car:car:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="carList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="自增主键" align="center" prop="id" />
-      <el-table-column label="车辆VIN码" align="center" prop="carVin" />
-      <el-table-column label="车辆车牌号" align="center" prop="carPlate" />
-      <el-table-column label="车辆品牌;" align="center" prop="carBrand" />
-      <el-table-column label="车辆型号" align="center" prop="carModel" />
-      <el-table-column label="车辆车型" align="center" prop="carType" />
-      <el-table-column label="车辆电机厂商" align="center" prop="carMotorManufacturer" />
-      <el-table-column label="电机型号" align="center" prop="carMotorModel" />
-      <el-table-column label="车辆电池厂商" align="center" prop="carBatteryManufacturer" />
-      <el-table-column label="电池型号" align="center" prop="carBatteryModel" />
-      <el-table-column label="围栏组编码" align="center" prop="groupCode" />
-      <el-table-column label="启用状态" align="center" prop="state" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="自增主键" align="center" prop="id"/>
+      <el-table-column label="车辆VIN码" align="center" prop="carVin"/>
+      <el-table-column label="车辆车牌号" align="center" prop="carPlate"/>
+      <el-table-column label="车辆品牌" align="center" prop="carBrand"/>
+      <el-table-column label="车辆型号" align="center" prop="carModel"/>
+      <el-table-column label="车辆车型" align="center" prop="carType"/>
+      <el-table-column label="围栏组编码" align="center" prop="groupCode"/>
+      <el-table-column label="启用状态" align="center" prop="state"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -99,21 +99,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['car:car:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['car:car:remove']"
-          >删除</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAddStrategy(scope.row)"
-            v-hasPermi="['car:car:add']"
-          >添加策略信息</el-button>
+          >删除
+          </el-button>
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-s-order"-->
+          <!--            @click="handleAddStrategy(scope.row)"-->
+          <!--          >详细信息</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -128,64 +129,51 @@
 
     <!-- 添加或修改车辆基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="82px">
         <el-form-item label="车辆VIN码" prop="carVin">
-          <el-input v-model="form.carVin" placeholder="请输入车辆VIN码" />
+          <el-input v-model="form.carVin" placeholder="请输入车辆VIN码"/>
         </el-form-item>
         <el-form-item label="车辆车牌号" prop="carPlate">
-          <el-input v-model="form.carPlate" placeholder="请输入车辆车牌号" />
+          <el-input v-model="form.carPlate" placeholder="请输入车辆车牌号"/>
         </el-form-item>
-        <el-form-item label="车辆电机厂商" prop="carMotorManufacturer">
-          <el-input v-model="form.carMotorManufacturer" placeholder="请输入车辆电机厂商" />
+        <el-form-item label="车辆品牌" prop="carBrand">
+          <el-input v-model="form.carBrand" placeholder="请输入车辆品牌"/>
         </el-form-item>
-        <el-form-item label="电机型号" prop="carMotorModel">
-          <el-input v-model="form.carMotorModel" placeholder="请输入电机型号" />
+        <el-form-item label="车辆型号" prop="carModel">
+          <el-input v-model="form.carModel" placeholder="请输入车辆型号"/>
         </el-form-item>
-        <el-form-item label="车辆电池厂商" prop="carBatteryManufacturer">
-          <el-input v-model="form.carBatteryManufacturer" placeholder="请输入车辆电池厂商" />
-        </el-form-item>
-        <el-form-item label="电池型号" prop="carBatteryModel">
-          <el-input v-model="form.carBatteryModel" placeholder="请输入电池型号" />
+        <el-form-item label="车辆车型" prop="carType">
+          <el-select v-model="form.carType" placeholder="请选择报文模版id" :change="getCarTypeList">
+            <el-option
+              v-for="item in sysCarType"
+              :key="item.id"
+              :label="item.sysTypeName"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="围栏组编码" prop="groupCode">
-          <el-input v-model="form.groupCode" placeholder="请输入围栏组编码" />
+          <el-input v-model="form.groupCode" placeholder="请输入围栏组编码"/>
         </el-form-item>
         <el-form-item label="启用状态" prop="state">
-          <el-input v-model="form.state" placeholder="请输入启用状态" />
+          <el-input v-model="form.state" placeholder="请输入启用状态"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 添加预警策略对话框 -->
-    <el-dialog :title="title" :visible.sync="beginOpen" width="500px" append-to-body>
-      <el-form ref="formList" :model="formList" :rules="rules" label-width="80px">
-          <el-form-item label="车辆类型id" prop="carTypeId">
-            <el-input v-model="formList.carTypeId" placeholder="请输入车辆类型id" />
-          </el-form-item>
-         <el-form-item label="策略名称" prop="strategyName">
-           <el-input v-model="formList.strategyName" placeholder="请输入策略名称" />
-         </el-form-item>
-        <el-form-item label="报文模版id" prop="msgId">
-<!--          <el-input v-model="formList.msgId" placeholder="请输入报文模版id" />-->
-          <el-select v-model="formList.msgId" placeholder="请选择报文模版id">
+                <el-form-item label="策略信息" prop="strategyId">
+                  <el-select v-model="form.msgId" placeholder="请选择报文模版id">
                     <el-option
-              v-for="item in templateList"
-              :key="item.messageTemplateId"
-              :label="item.messageTemplateName"
-              :value="item.messageTemplateId">
+                      v-for="item in strategyList"
+                      :key="item.id"
+                      :label="item.strategyName"
+                      :value="item.id">
                       </el-option>
                   </el-select>
                 </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitAddForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -195,8 +183,8 @@
 
 <script>
 import {listCar, getCar, delCar, addCar, updateCar} from "/src/api/car/car";
-import {templateList} from "@/api/car/message/template";
-import {addStrategy} from "@/api/platform/strategy";
+import {addStrategy, listStrategy} from "@/api/platform/strategy";
+import {listType} from "@/api/car/type";
 
 export default {
   name: "Car",
@@ -216,12 +204,14 @@ export default {
       total: 0,
       // 车辆基础信息表格数据
       carList: [],
-      templateList:[],
+      templateList: [],
+      //车辆类型
+      sysCarType: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      beginOpen:false,
+      beginOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -234,15 +224,25 @@ export default {
         state: null,
       },
       // 表单参数
-      form: {},
-      formList:{},
+      form: {
+        carVin: null,
+        carPlate: null,
+        carBrand: null,
+        carModel: null,
+        carType: null,
+        groupCode: null,
+        state: null,
+        remark: null,
+        msgId: null
+      },
+      formList: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
     this.getList();
+    this.getListType();
   },
   methods: {
     /** 查询车辆基础信息列表 */
@@ -254,6 +254,11 @@ export default {
         this.loading = false;
       });
     },
+    getListType() {
+      listType().then(res => {
+        this.sysCarType = res.data.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -268,12 +273,6 @@ export default {
         carBrand: null,
         carModel: null,
         carType: null,
-        carLastJoinTime: null,
-        carLastOfflineTime: null,
-        carMotorManufacturer: null,
-        carMotorModel: null,
-        carBatteryManufacturer: null,
-        carBatteryModel: null,
         groupCode: null,
         state: null,
         createBy: null,
@@ -282,12 +281,11 @@ export default {
         updateTime: null,
         remark: null
       };
-
       this.resetForm("form");
     },
     //初始化
     init() {
-      this.formList= {
+      this.formList = {
         carTypeId: null,
         strategyName: null,
         msgId: null
@@ -307,7 +305,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -316,21 +314,11 @@ export default {
       this.open = true;
       this.title = "添加车辆基础信息";
     },
-    /** 添加策略信息按钮 **/
-    handleAddStrategy(row) {
-      this.init();
-      const id = row.id || this.ids
-      getCar(id).then(response => {
-        this.formList.carTypeId = response.data.id;
-        this.beginOpen = true;
-        this.title ="添加策略信息";
-      });
-      templateList().then(response => {
-        this.templateList = response.data;
-        console.log(this.templateList);
-
-      });
-
+    /** 离焦获取策略信息 **/
+    getCarTypeList(carType) {
+      listStrategy({sysTypeId: carType}).then(res => {
+        this.strategyList = res.data;
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -340,8 +328,14 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改车辆基础信息";
+        this.listStrategy(response.data.carType)
       });
     },
+    listStrategy(sysTypeId) {
+      listStrategy({sysTypeId: sysTypeId}).then(res => {
+        this.strategyList = res.data.rows;
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -362,25 +356,18 @@ export default {
         }
       });
     },
-    /** 添加策略信息**/
-    submitAddForm(){
-      addStrategy(this.formList).then(response => {
-        this.$modal.msgSuccess("添加策略信息成功");
-        this.beginOpen = false;
-        this.getList();
-      });
-    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除车辆基础信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除车辆基础信息编号为"' + ids + '"的数据项？').then(function () {
         return delCar(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
-
     /** 导出按钮操作 */
     handleExport() {
       this.download('car/car/export', {

src/views/platform/rule/index.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="策略id" prop="strategyId">
+      <el-form-item label="策略名称" prop="strategyId">
         <el-input
           v-model="queryParams.strategyId"
           placeholder="请输入策略id"
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="报文数据类型id" prop="msgTypeId">
-        <el-input
-          v-model="queryParams.msgTypeId"
-          placeholder="请输入报文数据类型id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="滑窗时间" prop="slideTime">
         <el-input
           v-model="queryParams.slideTime"
@@ -41,22 +33,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="最大值" prop="maxValue">
-        <el-input
-          v-model="queryParams.maxValue"
-          placeholder="请输入最大值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最小值" prop="minValue">
-        <el-input
-          v-model="queryParams.minValue"
-          placeholder="请输入最小值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -117,8 +93,9 @@
       <el-table-column label="报文数据类型id" align="center" prop="msgTypeId" />
       <el-table-column label="滑窗时间" align="center" prop="slideTime" />
       <el-table-column label="滑窗频率" align="center" prop="slideFrequency" />
-      <el-table-column label="最大值" align="center" prop="maxValue" />
-      <el-table-column label="最小值" align="center" prop="minValue" />
+      <el-table-column label="数据频率名称" align="center" prop="slideData" />
+      <el-table-column label="数据频率最大值" align="center" prop="slideMaxNum" />
+      <el-table-column label="数据频率最小值" align="center" prop="slideMinNum" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -150,26 +127,53 @@
     <!-- 添加或修改预警规则对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="策略名称" prop="strategyId">
+          <el-select v-model="form.strategyId" placeholder="请选择策略模版id" @change="getFindByTemplateValue">
+            <el-option
+              v-for="item in strategyList"
+              :key="item.id"
+              :label="item.strategyName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="规则名称" prop="ruleName">
           <el-input v-model="form.ruleName" placeholder="请输入规则名称" />
         </el-form-item>
-        <el-form-item label="策略id" prop="strategyId">
-          <el-input v-model="form.strategyId" placeholder="请输入策略id" />
-        </el-form-item>
         <el-form-item label="报文数据类型id" prop="msgTypeId">
-          <el-input v-model="form.msgTypeId" placeholder="请输入报文数据类型id" />
+          <el-select ref="select" v-model="form.msgTypeId" multiple placeholder="请选择报文数据名称">
+            <el-option
+              v-for="item in templateValueList"
+              :key="item.messageId"
+              :label="item.messageCode"
+              :value="item.messageId">
+<!--              <el-checkbox @change="clickBox(item.messageId)" :value ="value.includes(item.messageId)" :label="item.messageCode"></el-checkbox>-->
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="滑窗时间" prop="slideTime">
-          <el-input v-model="form.slideTime" placeholder="请输入滑窗时间" />
+          <el-slider v-model="form.slideTime" :min="1" :max="1000"></el-slider>
+          <el-input-number v-model="form.slideTime" :min="1" :max="1000"></el-input-number>
         </el-form-item>
         <el-form-item label="滑窗频率" prop="slideFrequency">
-          <el-input v-model="form.slideFrequency" placeholder="请输入滑窗频率" />
+          <el-select  v-model="form.slideFrequency" placeholder="请选择滑窗频率">
+            <el-option  value="1:2">1:2</el-option>
+            <el-option  value="1:5">1:5</el-option>
+            <el-option  value="1:10">1:10</el-option>
+            <el-option  value="1:20">1:20</el-option>
+            <el-option  value="1:30">1:30</el-option>
+            <el-option  value="1:60">1:60</el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="最大值" prop="maxValue">
-          <el-input v-model="form.maxValue" placeholder="请输入最大值" />
+        <el-form-item label="数据频率名称" prop="slideData">
+          <el-input v-model="form.slideData" placeholder="请输入数据频率名称" />
+
         </el-form-item>
-        <el-form-item label="最小值" prop="minValue">
-          <el-input v-model="form.minValue" placeholder="请输入最小值" />
+        <el-form-item label="数据频率最大值" prop="slideMaxNum">
+          <el-input v-model="form.slideMaxNum" placeholder="请输入数据频率最大值" />
+        </el-form-item>
+        <el-form-item label="数据频率最小值" prop="slideMinNum">
+          <el-input v-model="form.slideMinNum" placeholder="请输入数据频率最小值" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -182,6 +186,8 @@
 
 <script>
 import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/platform/rule";
+import { listStrategy} from "@/api/platform/strategy";
+import {valueList} from "@/api/car/message/template";
 
 export default {
   name: "Rule",
@@ -195,16 +201,36 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      props: { multiple: true },
       // 显示搜索条件
       showSearch: true,
+
       // 总条数
       total: 0,
       // 预警规则表格数据
       ruleList: [],
+      //车辆类型
+      sysTypeList :[],
+      //报文字段
+      templateValueList:[],
+      value:[],
+      //报文模版类型
+      templateList :[],
+
+      //报文类型Id
+      templateId : null,
+      //车辆类型Id
+      sysTypeId: null,
+      //策略信息组
+      strategyList : [],
+      //策略信息
+      strategy: {},
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      //弹出抽屉
+      drawer:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -214,8 +240,9 @@ export default {
         msgTypeId: null,
         slideTime: null,
         slideFrequency: null,
-        maxValue: null,
-        minValue: null
+        slideData:null,
+        slideMaxNum: null,
+        slideMinNum: null
       },
       // 表单参数
       form: {},
@@ -228,6 +255,18 @@ export default {
     this.getList();
   },
   methods: {
+    clickBox(val) {
+      console.log('val::', val);
+      let values = this.value
+      if(values.includes(val)) {
+        this.value = values.filter(n => n !== val)
+      } else {
+        values.push(val)
+        this.value = values
+      }
+      console.log('this.value::', this.value)
+
+    },
     /** 查询预警规则列表 */
     getList() {
       this.loading = true;
@@ -251,8 +290,9 @@ export default {
         msgTypeId: null,
         slideTime: null,
         slideFrequency: null,
-        maxValue: null,
-        minValue: null
+        slideData:null,
+        slideMaxNum: null,
+        slideMinNum: null
       };
       this.resetForm("form");
     },
@@ -277,7 +317,22 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加预警规则";
+      this.findInformation();
     },
+    findInformation(){
+      /** 策略信息 **/
+      listStrategy().then(res=>{
+        this.strategyList  = res.data.rows;
+      })
+    },
+
+    getFindByTemplateValue(val){
+      const { msgId } = this.strategyList.find(strategy => strategy.id === val)
+      valueList({messageTemplateId:msgId}).then(res=>{
+        this.templateValueList = res.data
+      })
+    },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -287,6 +342,7 @@ export default {
         this.open = true;
         this.title = "修改预警规则";
       });
+      this.findInformation();
     },
     /** 提交按钮 */
     submitForm() {

src/views/platform/strategy/index.vue

@@ -80,7 +80,7 @@
     <el-table v-loading="loading" :data="strategyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="策略id" align="center" prop="id" />
-      <el-table-column label="车辆类型id" align="center" prop="carTypeId" />
+      <el-table-column label="车辆类型id" align="center" prop="sysTypeId" />
       <el-table-column label="策略名称" align="center" prop="strategyName" />
       <el-table-column label="报文模版id" align="center" prop="msgId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -114,15 +114,29 @@
     <!-- 添加或修改预警策略对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="车辆类型id" prop="carTypeId">
-          <el-input v-model="form.carTypeId" placeholder="请输入车辆类型id" />
+        <el-form-item label="车辆类型id" prop="sysTypeId">
+          <el-select v-model="form.sysTypeId" placeholder="请选择报文模版id" @change="leaveSysType(form.sysTypeId)">
+            <el-option
+              v-for="item in sysTypeList"
+              :key="item.sysTypeId"
+              :label="item.sysTypeName"
+              :value="item.sysTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报文模版id" prop="msgId">
+          <el-select v-model="form.msgId" placeholder="请选择报文模版id">
+            <el-option
+              v-for="item in templateList"
+              :key="item.messageTemplateId"
+              :label="item.messageTemplateName"
+              :value="item.messageTemplateId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="策略名称" prop="strategyName">
           <el-input v-model="form.strategyName" placeholder="请输入策略名称" />
         </el-form-item>
-        <el-form-item label="报文模版id" prop="msgId">
-          <el-input v-model="form.msgId" placeholder="请输入报文模版id" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -134,6 +148,8 @@
 
 <script>
 import { listStrategy, getStrategy, delStrategy, addStrategy, updateStrategy } from "/src/api/platform/strategy";
+import {getSysType} from "@/api/car/car";
+import {templateList} from "@/api/car/message/template";
 
 export default {
   name: "Strategy",
@@ -161,21 +177,28 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        carTypeId: null,
+        sysTypeId: null,
         strategyName: null,
         msgId: null
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
+      //报文类型
+      templateList :[],
+      //车辆类型
+      sysTypeList : []
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    /** 根据选中的车辆类型选择报文信息 **/
+    leaveSysType(sysTypeId){
+         this.templateList.messageTemplateId =sysTypeId;
+    },
     /** 查询预警策略列表 */
     getList() {
       this.loading = true;
@@ -194,7 +217,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        carTypeId: null,
+        sysTypeId: null,
         strategyName: null,
         msgId: null
       };
@@ -221,6 +244,18 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加预警策略";
+      this.findInformation();
+
+    },
+    findInformation(){
+      /** 获取车辆类型 **/
+      getSysType().then(res=>{
+        this.sysTypeList = res.data.rows;
+      });
+      /** 获取报文类型模版 **/
+      templateList().then(res=>{
+        this.templateList = res.data;
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -231,6 +266,7 @@ export default {
         this.open = true;
         this.title = "修改预警策略";
       });
+      this.findInformation();
     },
     /** 提交按钮 */
     submitForm() {

src/views/syscarfault/faultcode/index.vue

@@ -0,0 +1,688 @@
+<template>
+  <div>
+    <!--查询-->
+    <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-row>
+        <el-col :span="7"><div class="grid-content bg-purple">
+          <el-form-item label="故障码" prop="pass">
+            <el-input type="text" v-model="ruleForm.faultcodeNumber" autocomplete="off"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="7"><div class="grid-content bg-purple-light">
+          <el-form-item label="故障位" prop="pass">
+            <el-input type="text" v-model="ruleForm.faultBit" autocomplete="off"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="7"><div class="grid-content bg-purple">
+          <el-form-item>
+            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+            <el-button @click="resetForm('ruleForm')">重置</el-button>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-badge :value="messagenumber" class="item" style="margin-top: 10px;">
+            <el-button size="small" @click="openmessage()" type="primary">消息</el-button>
+          </el-badge>
+        </div></el-col>
+      </el-row>
+    </el-form>
+
+    <el-button type="success" @click="tofalutcode(1)">新增故障码</el-button>
+    <!--故障码列表-->
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        label="故障码"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+             {{ scope.row.faultcodeNumber }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障名称"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.messageTypeName }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障编码"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.messageTypeCode }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障组"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.faultGroup }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障位"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.faultBit }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障值"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.faultValue }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障标签"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.faultlabelName }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="是否警告"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              <span v-if="scope.row.isWarning==0">否</span>
+              <span v-if="scope.row.isWarning==1">是</span>
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleEdit(scope.row,2)">修改</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--分页-->
+    <center>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="ruleForm.pageNum"
+        :page-sizes="[3, 5, 10, 15]"
+        :page-size="ruleForm.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </center>
+
+    <!--对话框（新增/修改）-->
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <span>
+        <!--新增故障码-->
+        <div v-if="this.index==1">
+            <el-form :model="addForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+              <el-form-item label="故障名称" prop="pass">
+                <el-input type="text" v-model="addForm.messageTypeName" autocomplete="off"></el-input>
+              </el-form-item>
+              <el-form-item label="故障编码" prop="pass">
+                <el-input type="text" v-model="addForm.messageTypeCode" autocomplete="off"></el-input>
+              </el-form-item>
+              <el-form-item label="故障码" prop="pass">
+                <el-input type="text" v-model="addForm.faultcodeNumber" autocomplete="off"></el-input>
+              </el-form-item>
+<!--              <el-form-item label="故障分类" prop="pass">-->
+<!--                <el-input type="text" v-model="addForm.faulttypeId" autocomplete="off"></el-input>-->
+<!--                <el-select v-model="addForm.faulttypeId" placeholder="请选择">-->
+<!--                  <el-option-->
+<!--                    v-for="item in faultType"-->
+<!--                    :key="item.faulttypeId"-->
+<!--                    :label="item.faulttypeName"-->
+<!--                    :value="item.faulttypeId">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="是否产生报警" prop="pass">-->
+<!--                 <el-input type="text" v-model="addForm.isWarning" autocomplete="off"></el-input>-->
+<!--                  <el-radio-group v-model="addForm.isWarning">-->
+<!--                    <el-radio label="1">是</el-radio>-->
+<!--                    <el-radio label="0">否</el-radio>-->
+<!--                  </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="故障描述" prop="pass">-->
+<!--                <el-input type="text" v-model="addForm.faultContent" autocomplete="off"></el-input>-->
+<!--              </el-form-item>-->
+            </el-form>
+        </div>
+        <!--修改故障码-->
+        <div v-if="this.index==2">
+          <el-form :model="updForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="故障码Id" prop="pass">
+              <el-input type="text" v-model="updForm.faultcodeId" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="故障名称" prop="pass">
+              <el-input type="text" v-model="updForm.faultlabelId" autocomplete="off"></el-input>
+                <el-select v-model="updForm.messageTypeId" placeholder="请选择">
+                  <el-option
+                    v-for="item in faultLabel"
+                    :key="item.messageTypeId"
+                    :label="item.messageTypeName"
+                    :value="item.messageTypeId">
+                  </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="故障码" prop="pass">
+              <el-input type="text" v-model="updForm.faultcodeNumber" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="故障组" prop="pass">
+              <el-input type="text" v-model="updForm.faultGroup" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="故障位" prop="pass">
+              <el-input type="text" v-model="updForm.faultBit" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="故障值" prop="pass">
+              <el-input type="text" v-model="updForm.faultValue" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="是否产生报警" prop="pass">
+<!--                 <el-input type="text" v-model="addForm.isWarning" autocomplete="off"></el-input>-->
+                  <el-radio-group v-model="updForm.isWarning">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+              </el-form-item>
+          </el-form>
+        </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="addfalutcode()" v-if="this.index==1">新增</el-button>
+    <el-button type="primary" @click="updfalutcode()" v-if="this.index==2">修改</el-button>
+  </span>
+    </el-dialog>
+
+    <!--消息确认-->
+    <el-drawer
+      title="消息确认"
+      :visible.sync="drawer"
+      :with-header="false">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="全部" name="first" >
+          <el-table
+            :data="messageData"
+            style="width: 100%">
+            <el-table-column
+              label="发送人"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.sender }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="发送时间"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.createTime }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="消息内容"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.content }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="是否已读"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    <span v-if="scope.row.status==0">未读</span>
+                    <span v-if="scope.row.status==1">已读</span>
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="lookmessage(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="已读" name="second" >
+          <el-table
+            :data="messageData"
+            style="width: 100%">
+            <el-table-column
+              label="发送人"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.sender }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="发送时间"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.createTime }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="消息内容"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.content }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="是否已读"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    <span v-if="scope.row.status==0">未读</span>
+                    <span v-if="scope.row.status==1">已读</span>
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="lookmessage(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="未读" name="third">
+          <el-table
+            :data="messageData"
+            style="width: 100%">
+            <el-table-column
+              label="发送人"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.sender }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="发送时间"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.createTime }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="消息内容"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    {{ scope.row.content }}
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="是否已读"
+              width="180">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <div slot="reference" class="name-wrapper">
+                    <span v-if="scope.row.status==0">未读</span>
+                    <span v-if="scope.row.status==1">已读</span>
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="lookmessage(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+
+        <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible1"
+          width="30%"
+          :before-close="handleClose1">
+          <el-form :model="Form" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="发件人" prop="pass">
+              <el-input type="text" v-model="Form.sender" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="收件人" prop="pass">
+              <el-input type="text" v-model="Form.receiver" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="发送时间" prop="pass">
+              <el-input type="text" v-model="Form.createTime" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="内容" prop="pass">
+              <el-input type="text" v-model="Form.content" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-form>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="yes()">确 定</el-button>
+          </span>
+        </el-dialog>
+
+      </el-tabs>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+  import {resetForm} from "@/utils/muyu";
+import {
+  addfalutcode,
+  delfaultcode,
+  getfaultcode,
+  getfaultLabel,
+  getfaultType, getunread,
+  updfalutcode
+} from "@/api/fault/faultcode";
+import {changestatus, getmessagelist} from "@/api/fault/faultmessage";
+
+export default {
+    name: "Faultcode",
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {},
+    data() {
+      //这里存放数据"
+
+      return {
+        ruleForm:{
+          pageNum:1,
+          pageSize:10
+        },
+        total:0,
+        tableData:[],
+        dialogVisible: false,
+        dialogVisible1: false,
+        addForm:{},
+        updForm:{},
+        title:'',
+        index:'',
+        faultType:[],
+        faultLabel:[],
+        drawer:false,
+        activeName: 'first',
+        messageData:[],
+        messageform:{
+          status:''
+        },
+        messagenumber:'',
+        Form:{}
+
+      };
+    },
+    //计算属性 类似于data概念",
+    computed: {},
+    //监控data中的数据变化",
+    watch: {},
+    //方法集合",
+    methods: {
+      resetForm,
+      //查询
+      submitForm(){
+        this.getfaultcode();
+      },
+      //故障码展示
+      getfaultcode(){
+        getfaultcode(this.ruleForm).then(response=>{
+          console.log(response.data)
+          this.tableData=response.data.faultCodeListRespList
+          this.total=response.data.total
+        })
+      },
+      //分页
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.ruleForm.pageSize=val
+        this.getfaultcode()
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.ruleForm.pageNum=val
+        this.getfaultcode()
+      },
+      //去新增故障码页面
+      tofalutcode(num){
+        this.dialogVisible=true
+        this.index=num
+        this.title='新增'
+        this.getfaultType()
+      },
+      //去修改故障码页面
+      handleEdit(row,num){
+        this.dialogVisible=true
+        this.index=num
+        this.title='修改'
+        this.updForm={
+          faultcodeId: row.faultcodeId,
+          faultlabelId: row.faultlabelId,
+          faultcodeNumber: row.faultcodeNumber,
+          faultGroup: row.faultGroup,
+          faultBit: row.faultBit,
+          faultValue: row.faultValue,
+          isWarning: row.isWarning
+        }
+        this.getfaultLabel()
+      },
+      //关闭新增、修改故障码页面
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      //故障码分类
+      getfaultType(){
+        getfaultType().then(response=>{
+          this.faultType=response.data
+        })
+      },
+      //故障名称
+      getfaultLabel(){
+        getfaultLabel().then(response=>{
+            this.faultLabel=response.data
+        })
+      },
+      //新增故障码
+      addfalutcode(){
+        addfalutcode(this.addForm).then(response=>{
+          alert(response.msg);
+          if (response.code==200){
+            this.dialogVisible=false
+            this.index=''
+            this.getfaultcode()
+          }
+        })
+      },
+      //修改故障码
+      updfalutcode(){
+        updfalutcode(this.updForm).then(response=>{
+          alert(response.msg);
+          if (response.code==200){
+            this.dialogVisible=false
+            this.index=''
+            this.getfaultcode()
+          }
+        })
+      },
+      //删除故障码
+      handleDelete(row){
+        alert(JSON.stringify(row))
+        delfaultcode(row.messageTypeId).then(response=>{
+          alert(response.msg);
+          if (response.code==200){
+            this.getfaultcode()
+          }
+        })
+      },
+      //打开消息确认
+      openmessage(){
+        this.drawer=true
+        this.getmessagelist()
+      },
+      handleClick(tab, event) {
+        console.log(tab, event);
+        this.getmessagelist()
+      },
+      //消息列表
+      getmessagelist(){
+        if (this.activeName=='first'){
+          this.messageform.status=''
+        }
+        if (this.activeName=='second'){
+          this.messageform.status=1
+        }
+        if (this.activeName=='third'){
+          this.messageform.status=0
+        }
+        getmessagelist(this.messageform).then(response=>{
+          this.messageData=response.data
+        })
+      },
+      //查看消息
+      lookmessage(row){
+        this.dialogVisible1=true
+        this.Form={
+          id:row.id,
+          sender: row.sender,
+          receiver: row.receiver,
+          createTime: row.createTime,
+          content: row.content
+        }
+        //改变状态
+        changestatus(row).then(response=>{
+            if (response.code==200){
+              this.getmessagelist()
+            }
+        })
+      },
+      //未读消息
+      getunread(){
+        getunread().then(response=>{
+          this.messagenumber=response.data.length
+        })
+      },
+      handleClose1(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      yes(){
+        this.dialogVisible1=false
+        this.getfaultcode()
+      }
+    },
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+      this.getfaultcode();
+      this.getmessagelist()
+      this.getunread()
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>

src/views/syscarfault/faultlog/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <!--查询-->
+    <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-row>
+        <el-col :span="8"><div class="grid-content bg-purple">
+          <el-form-item label="车辆VIN" prop="pass">
+            <el-input type="text" v-model="ruleForm.carVin" autocomplete="off"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple-light">
+          <el-form-item label="开始报警" prop="pass">
+            <el-input type="text" v-model="ruleForm.startwarningTime" autocomplete="off"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple-light">
+          <el-form-item label="结束报警" prop="pass">
+            <el-input type="text" v-model="ruleForm.endwarningTime" autocomplete="off"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">
+          <el-form-item>
+            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+            <el-button @click="resetForm('ruleForm')">重置</el-button>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+    </el-form>
+
+    <!--日志列表-->
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        label="id"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.logId }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="故障码"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.faultcodeNumber }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="车辆VIN"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.carInformationVIN }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="开始报警时间"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.startwarningTime }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="结束报警时间"
+        width="180">
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <div slot="reference" class="name-wrapper">
+              {{ scope.row.endwarningTime }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--分页-->
+    <center>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="ruleForm.pageNum"
+        :page-sizes="[3, 5, 10, 15]"
+        :page-size="ruleForm.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </center>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+  import {getfaultlog} from "@/api/fault/faultlog";
+
+export default {
+    name: "Faultlog",
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {},
+    data() {
+      //这里存放数据"
+
+      return {
+        ruleForm:{
+          pageNum:1,
+          pageSize:10
+        },
+        total:0,
+        tableData:[]
+      };
+    },
+    //计算属性 类似于data概念",
+    computed: {},
+    //监控data中的数据变化",
+    watch: {},
+    //方法集合",
+    methods: {
+      //查询
+      submitForm(){
+        this.getfaultlog();
+      },
+      //故障码展示
+      getfaultlog(){
+        getfaultlog(this.ruleForm).then(response=>{
+          this.tableData=response.data.faultLogListRespList
+          this.total=response.data.total
+        })
+      },
+      //分页
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.ruleForm.pageSize=val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.ruleForm.pageNum=val
+        this.getList()
+      },
+    },
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+      this.getfaultlog()
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>

src/views/syscarfault/faultrule/index.vue

@@ -0,0 +1,373 @@
+<template>
+  <div>
+    <center>
+      <h2>
+        制定故障规则
+      </h2>
+      <el-form :model="addForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="5"><div class="grid-content bg-purple">
+            <el-form-item label="车辆类型" prop="pass">
+              <el-input type="text" v-model="addForm.carTypeId" autocomplete="off"></el-input>
+              <el-select v-model="addForm.carTypeId" placeholder="请选择">
+                <el-option
+                  v-for="item in carType"
+                  :key="item.carTypeId"
+                  :label="item.carTypeName"
+                  :value="item.carTypeId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="5"><div class="grid-content bg-purple">
+            <el-form-item label="故障项" prop="pass">
+              <el-input type="text" v-model="addForm.messageTypeId" autocomplete="off"></el-input>
+              <el-select v-model="addForm.messageTypeId" placeholder="请选择">
+                <el-option
+                  v-for="item in faultLabel"
+                  :key="item.messageTypeId"
+                  :label="item.messageTypeName"
+                  :value="item.messageTypeId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="5"><div class="grid-content bg-purple-light">
+            <el-form-item label="条件">
+              <el-select v-model="addForm.faultconditionIdentification" placeholder="请选择条件">
+                <el-option label=">" value=">"></el-option>
+                <el-option label="<" value="<"></el-option>
+                <el-option label="=" value="="></el-option>
+                <el-option label=">=" value=">="></el-option>
+                <el-option label="<=" value="<="></el-option>
+              </el-select>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="4"><div class="grid-content bg-purple">
+            <el-form-item label="参数" prop="pass">
+              <el-input type="text" v-model="addForm.faultconditionParameter" autocomplete="off"></el-input>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="5"><div class="grid-content bg-purple-light">
+            <el-form-item>
+              <el-button type="primary" @click="addruleForm('addForm')">提交</el-button>
+              <el-button @click="resetForm('addForm')">重置</el-button>
+            </el-form-item>
+          </div></el-col>
+        </el-row>
+      </el-form>
+      <el-divider></el-divider>
+      <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="8"><div class="grid-content bg-purple">
+            <el-form-item label="车辆类型" prop="pass">
+              <el-select v-model="ruleForm.carTypeId" placeholder="请选择">
+                <el-option
+                  v-for="item in carType"
+                  :key="item.carTypeId"
+                  :label="item.carTypeName"
+                  :value="item.carTypeId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="8"><div class="grid-content bg-purple-light">
+            <el-form-item label="故障项" prop="pass">
+              <el-select v-model="ruleForm.messageTypeId" placeholder="请选择">
+                <el-option
+                  v-for="item in faultLabel"
+                  :key="item.messageTypeId"
+                  :label="item.messageTypeName"
+                  :value="item.messageTypeId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="8"><div class="grid-content bg-purple">
+            <el-form-item>
+              <el-button type="primary" @click="look('ruleForm')">查询</el-button>
+            </el-form-item>
+          </div></el-col>
+        </el-row>
+      </el-form>
+      <el-table
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column
+          label="车辆类型"
+          width="180">
+          <template slot-scope="scope">
+            <el-popover trigger="hover" placement="top">
+              <div slot="reference" class="name-wrapper">
+                {{ scope.row.carTypeName }}
+              </div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="故障项"
+          width="180">
+          <template slot-scope="scope">
+            <el-popover trigger="hover" placement="top">
+              <div slot="reference" class="name-wrapper">
+                {{ scope.row.messageTypeName }}
+              </div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="故障条件"
+          width="180">
+          <template slot-scope="scope">
+            <el-popover trigger="hover" placement="top">
+              <div slot="reference" class="name-wrapper">
+                {{ scope.row.faultconditionIdentification }}
+              </div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="故障参数值"
+          width="180">
+          <template slot-scope="scope">
+            <el-popover trigger="hover" placement="top">
+              <div slot="reference" class="name-wrapper">
+                {{ scope.row.faultconditionParameter }}
+              </div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="handleUpd(scope.row)">修改</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <!--修改故障规则页面-->
+      <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+        <el-form :model="updForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="Id" prop="pass">
+            <el-input type="text" v-model="updForm.carconditionId" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="车辆类型" prop="pass">
+            <el-select v-model="updForm.carTypeId" placeholder="请选择">
+              <el-option
+                v-for="item in carType"
+                :key="item.carTypeId"
+                :label="item.carTypeName"
+                :value="item.carTypeId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="故障项" prop="pass">
+            <el-select v-model="updForm.messageTypeId" placeholder="请选择">
+              <el-option
+                v-for="item in faultLabel"
+                :key="item.messageTypeId"
+                :label="item.messageTypeName"
+                :value="item.messageTypeId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="条件">
+            <el-select v-model="updForm.faultconditionIdentification" placeholder="请选择条件">
+              <el-option label=">" value=">"></el-option>
+              <el-option label="<" value="<"></el-option>
+              <el-option label="=" value="="></el-option>
+              <el-option label=">=" value=">="></el-option>
+              <el-option label="<=" value="<="></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="参数" prop="pass">
+            <el-input type="text" v-model="updForm.faultconditionParameter" autocomplete="off"></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="updruleForm()">确 定</el-button>
+        </span>
+      </el-dialog>
+
+
+
+
+      <!--分页-->
+      <center>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="ruleForm.pageNum"
+          :page-sizes="[3, 5, 10, 15]"
+          :page-size="ruleForm.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+      </center>
+    </center>
+
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+  import {getfaultLabel} from "@/api/fault/faultcode";
+import {resetForm} from "@/utils/muyu";
+import {getcarType} from "@/api/fault/cartype";
+import {addrule, delruleForm, getfaultrule, updruleForm} from "@/api/fault/faultrule";
+
+export default {
+    name: "Faultrule",
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {},
+    data() {
+      //这里存放数据"
+
+      return {
+        ruleForm:{
+          pageNum:1,
+          pageSize:10
+        },
+        total:0,
+        addForm:{},
+        updForm:{},
+        faultLabel:[],
+        carType:[],
+        tableData:[],
+        dialogVisible: false,
+        unread:[]
+      };
+    },
+    //计算属性 类似于data概念",
+    computed: {},
+    //监控data中的数据变化",
+    watch: {},
+    //方法集合",
+    methods: {
+      resetForm,
+      //查询
+      look(){
+        this.getfaultrule()
+      },
+      //故障名称
+      getfaultLabel(){
+        getfaultLabel().then(response=>{
+          this.faultLabel=response.data
+        })
+      },
+      //车辆类型
+      getcarType(){
+        getcarType().then(response=>{
+          this.carType=response.data
+        })
+      },
+      //制定规则
+      addruleForm(){
+        addrule(this.addForm).then(response=>{
+            alert(response.msg)
+            if (response.code==200){
+              this.getfaultrule()
+            }
+        })
+      },
+      //打开规则修改页面
+      handleUpd(row){
+        this.dialogVisible=true
+        this.updForm={
+          carconditionId: row.carconditionId,
+          carTypeId: row.carTypeId,
+          faultlabelId: row.faultlabelId,
+          faultconditionIdentification: row.faultconditionIdentification,
+          faultconditionParameter: row.faultconditionParameter
+        }
+      },
+      //关闭规则修改页面
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      //修改规则
+      updruleForm(){
+        updruleForm(this.updForm).then(response=>{
+          alert(response.msg)
+          if (response.code==200){
+            this.dialogVisible=false
+            this.getfaultrule()
+          }
+        })
+      },
+      //删除规则
+      handleDelete(row){
+        if (confirm("确定删除么,一旦删除不可恢复！")){
+          delruleForm(row.carconditionId).then(response=>{
+            alert(response.msg)
+            if (response.code==200){
+              this.getfaultrule()
+            }
+          })
+        }
+      },
+      //故障规则列表
+      getfaultrule(){
+        getfaultrule(this.ruleForm).then(response=>{
+          this.tableData=response.data.faultConditionListRespList
+          this.total=response.data.total
+        })
+      },
+      //分页
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.ruleForm.pageSize=val
+        this.getfaultcode()
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.ruleForm.pageNum=val
+        this.getfaultcode()
+      },
+
+    },
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+      this.getfaultLabel()
+      this.getcarType()
+      this.getfaultrule()
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>

src/views/user/index.vue

@@ -0,0 +1,99 @@
+<template>
+  <div>
+
+    <template>
+      <el-table
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column
+          prop="date"
+          label="会员唯一标识"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="会员账号"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="会员类型">
+        </el-table-column>
+      </el-table>
+    </template>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+import {getfaultlog} from "@/api/fault/faultlog";
+
+export default {
+  ////import引入的组件需要注入到对象中才能使用"
+
+  //
+  components: {},
+  props: {},
+  data() {
+    ////这里存放数据"
+    return {
+      ruleForm:{
+        pageNum:1,
+        pageSize:10
+      },
+      member: {
+        memberId: '',
+        memberName: '',
+        memberType: ''
+      }
+    };
+  },
+  //计算属性 类似于data概念",
+  computed: {},
+  //监控data中的数据变化",
+  watch: {},
+  ////方法集合",
+  methods: {
+    getMemberList(){
+      getMemberList(this.ruleForm).then(
+        response => {
+          this.tableData = response.data.memberListRespList
+          this.total = response.data.total
+        }
+      )
+    },
+    //故障码展示
+    getfaultlog(){
+      getfaultlog(this.ruleForm).then(response=>{
+        this.tableData=response.data.faultLogListRespList
+        this.total=response.data.total
+      })
+    },
+  },
+  ////生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.getMemberList()
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）",
+  mounted() {
+  },
+  beforeCreate() {
+  }, //生命周期 - 创建之前",
+  beforeMount() {
+  }, //生命周期 - 挂载之前",
+  beforeUpdate() {
+  }, //生命周期 - 更新之前",
+  updated() {
+  }, //生命周期 - 更新之后",
+  beforeDestroy() {
+  }, //生命周期 - 销毁之前",
+  destroyed() {
+  }, //生命周期 - 销毁完成",
+  activated() {
+  } //如果页面有keep-alive缓存功能，这个函数会触发",
+};
+</script>
+<style scoped>
+
+</style>