From 68529d4d0079d427b979b7e9fe6596060dc10f60 Mon Sep 17 00:00:00 2001
From: liyongjie <1318551549@qq.com>
Date: Tue, 2 Apr 2024 19:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=A8=A1=E5=9D=97=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/fault_code_info.js     |   9 +
 src/views/business/dict/index.vue       | 338 ++++++++++++++++++++++++
 src/views/business/faultCodes/index.vue | 221 +---------------
 src/views/business/faultLogs/index.vue  |  24 +-
 4 files changed, 370 insertions(+), 222 deletions(-)
 create mode 100644 src/views/business/dict/index.vue

diff --git a/src/api/business/fault_code_info.js b/src/api/business/fault_code_info.js
index f12e802..a95632a 100644
--- a/src/api/business/fault_code_info.js
+++ b/src/api/business/fault_code_info.js
@@ -2,6 +2,15 @@ import request from '@/utils/request'
 
 // 查询故障码列表
 export function listFaultCodes(query) {
+  return request({
+    url: '/business/faultCodes/current/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询实时故障列表
+export function faultCodesCurrentList(query) {
   return request({
     url: '/business/faultCodes/list',
     method: 'get',
diff --git a/src/views/business/dict/index.vue b/src/views/business/dict/index.vue
new file mode 100644
index 0000000..e836352
--- /dev/null
+++ b/src/views/business/dict/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="故障名称" prop="faultName">
+        <el-input
+          v-model="queryParams.faultName"
+          placeholder="请输入故障名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="故障码" prop="faultCode">
+        <el-input
+          v-model="queryParams.faultCode"
+          placeholder="请输入故障码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否产生报警" prop="alarmFlag" :label-width="100">
+        <el-select v-model="queryParams.alarmFlag" placeholder="请选择是否产生报警" clearable size="mini">
+          <el-option
+            v-for="dict in dict.type.vehicle_alarm_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:faultCodes:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:faultCodes:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:faultCodes:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="faultCodesList" @selection-change="handleSelectionChange" stripe border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="故障码" align="center" prop="faultCode" />
+      <el-table-column label="故障名称" align="center" prop="faultName" />
+      <el-table-column label="故障类型" align="center" prop="faultType">
+        <template slot-scope="scope">
+          <!--          <span v-if="scope.row.faultType==1">通讯丢失故障</span>-->
+          <!--          <span v-if="scope.row.faultType==2">车身故障</span>-->
+          <!--          <span v-if="scope.row.faultType==3">底盘故障</span>-->
+          <!--          <span v-if="scope.row.faultType==4">电子围栏故障</span>-->
+          <!--          <span v-if="scope.row.faultType==5">其他故障</span>-->
+          <dict-tag :options="dict.type.fault_type" :value="scope.row.faultType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="故障等级" align="center" prop="faultLevel">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否产生报警" align="center" prop="alarmFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.vehicle_alarm_status" :value="scope.row.alarmFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="故障描述" align="center" prop="faultDesc" />
+<!--      <el-table-column label="故障位" align="center" prop="faultLocation" />-->
+      <el-table-column label="故障码状态" align="center" key="status" prop="status">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                     active-color="#13ce66"
+                     inactive-color="#ff4949"
+                     @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:faultCodes:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:faultCodes:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改故障码对话框 -->
+    <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="faultName">
+          <el-input v-model="form.faultName" placeholder="请输入故障名称" />
+        </el-form-item>
+        <el-form-item label="故障码" prop="faultCode">
+          <el-input v-model="form.faultCode" placeholder="请输入故障码" />
+        </el-form-item>
+        <el-form-item label="故障类型" prop="faultType">
+          <el-select v-model="form.faultType" placeholder="请选择故障类型">
+            <el-option
+              v-for="dict in dict.type.fault_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障等级" prop="faultLevel">
+          <el-radio-group v-model="form.faultLevel">
+            <el-radio
+              v-for="dict in dict.type.fault_level"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="故障描述" prop="faultDesc">
+          <el-input v-model="form.faultDesc" placeholder="请输入故障描述" />
+        </el-form-item>
+        <el-form-item label="故障位" prop="faultLocation">
+          <el-input v-model="form.faultLocation" 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>
+  </div>
+</template>
+
+<script>
+import { faultCodesCurrentList, getFaultCodes, delFaultCodes, addFaultCodes, updateFaultCodes, changeFaultCodesStatus } from "@/api/business/fault_code_info";
+
+export default {
+  name: "FaultCodes",
+  dicts: ['fault_type','fault_level','vehicle_alarm_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 故障码表格数据
+      faultCodesList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        faultName: null,
+        faultCode: null,
+        alarmFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询故障码列表 */
+    getList() {
+      this.loading = true;
+      faultCodesCurrentList(this.queryParams).then(res => {
+        this.faultCodesList = res.data.rows;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 故障码状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.faultName + '"故障码吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return changeFaultCodesStatus(row.faultId, row.status);
+      }).then(() => {
+        this.getList();
+        this.$message.success(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        faultId: null,
+        faultName: null,
+        faultCode: null,
+        faultType: null,
+        faultLevel: null,
+        alarmFlag: null,
+        faultDesc: null,
+        faultLocation: null,
+        status: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.faultId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加故障码";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const faultId = row.faultId || this.ids
+      getFaultCodes(faultId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改故障码";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.faultId != null) {
+            updateFaultCodes(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFaultCodes(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const faultIds = row.faultId || this.ids;
+      this.$modal.confirm('是否确认删除故障码编号为"' + faultIds + '"的数据项？').then(function() {
+        return delFaultCodes(faultIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+  }
+};
+</script>
diff --git a/src/views/business/faultCodes/index.vue b/src/views/business/faultCodes/index.vue
index 7761d23..3830312 100644
--- a/src/views/business/faultCodes/index.vue
+++ b/src/views/business/faultCodes/index.vue
@@ -20,7 +20,7 @@
       <el-form-item label="是否产生报警" prop="alarmFlag" :label-width="100">
         <el-select v-model="queryParams.alarmFlag" placeholder="请选择是否产生报警" clearable size="mini">
           <el-option
-            v-for="dict in dict.type.sys_yes_no"
+            v-for="dict in dict.type.vehicle_alarm_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -34,59 +34,25 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['business:faultCodes:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['business:faultCodes:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business:faultCodes:remove']"
-        >删除</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="faultCodesList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="故障码" align="center" prop="faultCode" />
       <el-table-column label="故障名称" align="center" prop="faultName" />
       <el-table-column label="故障类型" align="center" prop="faultType">
         <template slot-scope="scope">
-          <span v-if="scope.row.faultType==1">通讯丢失故障</span>
-          <span v-if="scope.row.faultType==2">车身故障</span>
-          <span v-if="scope.row.faultType==3">底盘故障</span>
-          <span v-if="scope.row.faultType==4">电子围栏故障</span>
-          <span v-if="scope.row.faultType==5">其他故障</span>
+<!--          <span v-if="scope.row.faultType==1">通讯丢失故障</span>-->
+<!--          <span v-if="scope.row.faultType==2">车身故障</span>-->
+<!--          <span v-if="scope.row.faultType==3">底盘故障</span>-->
+<!--          <span v-if="scope.row.faultType==4">电子围栏故障</span>-->
+<!--          <span v-if="scope.row.faultType==5">其他故障</span>-->
+            <dict-tag :options="dict.type.fault_type" :value="scope.row.faultType"/>
         </template>
       </el-table-column>
       <el-table-column label="故障等级" align="center" prop="faultLevel">
         <template slot-scope="scope">
-          <span v-if="scope.row.faultLevel==1">高级故障</span>
-          <span v-if="scope.row.faultLevel==2">中级故障</span>
-          <span v-if="scope.row.faultLevel==3">低级故障</span>
+          <dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
         </template>
       </el-table-column>
       <el-table-column label="是否产生报警" align="center" prop="alarmFlag">
@@ -96,34 +62,6 @@
       </el-table-column>
       <el-table-column label="故障描述" align="center" prop="faultDesc" />
       <el-table-column label="故障位" align="center" prop="faultLocation" />
-      <el-table-column label="故障值" align="center" prop="faultValue" />
-      <el-table-column label="故障码状态" align="center" key="status" prop="status">
-        <template slot-scope="scope">
-          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:faultCodes:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:faultCodes:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
     </el-table>
 
     <pagination
@@ -133,56 +71,15 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改故障码对话框 -->
-    <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="faultName">
-          <el-input v-model="form.faultName" placeholder="请输入故障名称" />
-        </el-form-item>
-        <el-form-item label="故障码" prop="faultCode">
-          <el-input v-model="form.faultCode" placeholder="请输入故障码" />
-        </el-form-item>
-        <el-form-item label="故障类型" prop="faultType">
-          <el-select v-model="form.faultType" placeholder="请选择故障类型">
-            <el-option label="通讯丢失故障" value="1"></el-option>
-            <el-option label="车身故障" value="2"></el-option>
-            <el-option label="底盘故障" value="3"></el-option>
-            <el-option label="电子围栏故障" value="4"></el-option>
-            <el-option label="其他故障" value="5"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="故障等级" prop="faultLevel">
-          <el-select v-model="form.faultLevel" placeholder="请选择故障等级">
-            <el-option label="高级故障" value="1"></el-option>
-            <el-option label="中级故障" value="2"></el-option>
-            <el-option label="低级故障" value="3"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="故障描述" prop="faultDesc">
-          <el-input v-model="form.faultDesc" placeholder="请输入故障描述" />
-        </el-form-item>
-        <el-form-item label="故障位" prop="faultLocation">
-          <el-input v-model="form.faultLocation" placeholder="请输入故障位" />
-        </el-form-item>
-        <el-form-item label="故障值" prop="faultValue">
-          <el-input v-model="form.faultValue" 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>
   </div>
 </template>
 
 <script>
-import { listFaultCodes, getFaultCodes, delFaultCodes, addFaultCodes, updateFaultCodes, changeFaultCodesStatus } from "@/api/business/fault_code_info";
+import { listFaultCodes } from '@/api/business/fault_code_info'
 
 export default {
   name: "FaultCodes",
-  dicts: ['sys_yes_no','vehicle_alarm_status'],
+  dicts: ['fault_type','fault_level','vehicle_alarm_status'],
   data() {
     return {
       // 遮罩层
@@ -206,7 +103,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         faultName: null,
         faultCode: null,
         alarmFlag: null,
@@ -236,44 +133,6 @@ export default {
       this.open = false;
       this.reset();
     },
-    // 故障码状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.faultName + '"故障码吗?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return changeFaultCodesStatus(row.faultId, row.status);
-      }).then(() => {
-        this.getList();
-        this.$message.success(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        faultId: null,
-        faultName: null,
-        faultCode: null,
-        faultType: null,
-        faultLevel: null,
-        alarmFlag: null,
-        faultDesc: null,
-        faultLocation: null,
-        faultValue: null,
-        status: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -284,64 +143,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.faultId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加故障码";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const faultId = row.faultId || this.ids
-      getFaultCodes(faultId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改故障码";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.faultId != null) {
-            updateFaultCodes(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addFaultCodes(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const faultIds = row.faultId || this.ids;
-      this.$modal.confirm('是否确认删除故障码编号为"' + faultIds + '"的数据项？').then(function() {
-        return delFaultCodes(faultIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('business/faultCodes/export', {
-        ...this.queryParams
-      }, `faultCodes_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
diff --git a/src/views/business/faultLogs/index.vue b/src/views/business/faultLogs/index.vue
index 90e9061..00cea1d 100644
--- a/src/views/business/faultLogs/index.vue
+++ b/src/views/business/faultLogs/index.vue
@@ -29,7 +29,7 @@
         <el-date-picker clearable v-model="queryParams.startAlarmTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始报警时间"></el-date-picker>
       </el-form-item>
       <el-form-item label="结束报警时间" prop="endAlarmTime">
-        <el-date-picker clearable v-model="queryParams.endAlarmTime" type="datetime" placeholder="请选择结束报警时间"></el-date-picker>
+        <el-date-picker clearable v-model="queryParams.endAlarmTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束报警时间"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -73,23 +73,23 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="faultLogsList" >
+    <el-table v-loading="loading" :data="faultLogsList" border stripe>
 <!--      <el-table-column type="selection" width="55" align="center" />@selection-change="handleSelectionChange"-->
 <!--      <el-table-column label="故障码主键" align="center" prop="logId" />-->
-      <el-table-column label="车辆VIN" align="center" prop="carVin" />
-      <el-table-column label="故障码" align="center" prop="faultCode" />
-      <el-table-column label="故障名称" align="center" prop="faultName" />
-      <el-table-column label="是否产生报警" align="center" prop="alarmFlag" >
+      <el-table-column label="车辆VIN" align="center" prop="carVin" v-if="columns[0].visible"/>
+      <el-table-column label="故障码" align="center" prop="faultCode" v-if="columns[1].visible"/>
+      <el-table-column label="故障名称" align="center" prop="faultName" v-if="columns[2].visible"/>
+      <el-table-column label="是否产生报警" align="center" prop="alarmFlag" v-if="columns[3].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.vehicle_alarm_status" :value="scope.row.alarmFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="开始报警时间" align="center" prop="startAlarmTime" width="180"/>
-      <el-table-column label="结束报警时间" align="center" prop="endAlarmTime" width="180"/>.
-      <el-table-column label="最近报警时间" align="center" prop="recentlyAlarmTime" width="180"/>
-      <el-table-column label="处理时间" align="center" prop="disposeTime" width="180"/>
-      <el-table-column label="处理人" align="center" prop="disposeBy" />
-      <el-table-column label="处理状态" align="center" prop="disposeStatus">
+      <el-table-column label="开始报警时间" align="center" prop="startAlarmTime" width="180" v-if="columns[4].visible"/>
+      <el-table-column label="结束报警时间" align="center" prop="endAlarmTime" width="180" v-if="columns[5].visible"/>.
+      <el-table-column label="最近报警时间" align="center" prop="recentlyAlarmTime" width="180" v-if="columns[6].visible"/>
+      <el-table-column label="处理时间" align="center" prop="disposeTime" width="180" v-if="columns[7].visible"/>
+      <el-table-column label="处理人" align="center" prop="disposeBy" v-if="columns[8].visible"/>
+      <el-table-column label="处理状态" align="center" prop="disposeStatus" v-if="columns[9].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.vehicle_dispose_status" :value="scope.row.disposeStatus"/>
         </template>