合并故障码前台

# Conflicts:
#	src/api/system/info.js
#	src/views/system/info/index.vue

src/api/business/fault_code_info.js

@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 查询故障码列表
+export function listFaultCodes(query) {
+  return request({
+    url: '/business/faultCodes/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增故障码
+export function addFaultCodes(data) {
+  return request({
+    url: '/business/faultCodes',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询故障码详情
+export function getFaultCodes(faultId) {
+  return request({
+    url: '/business/faultCodes/' + faultId,
+    method: 'get'
+  })
+}
+
+// 修改故障码
+export function updateFaultCodes(data) {
+  return request({
+    url: '/business/faultCodes',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改故障码状态
+export function changeFaultCodesStatus(faultId, status){
+  const data = {
+    faultId,
+    status
+  }
+  return request({
+    url: '/business/faultCodes/changeStatus',
+    method: 'put',
+    data
+  })
+}
+
+// 删除故障码
+export function delFaultCodes(faultId) {
+  return request({
+    url: '/business/faultCodes/' + faultId,
+    method: 'delete'
+  })
+}

src/api/employee/employee.js

@@ -1,45 +0,0 @@
-import request from '@/utils/request'
-import data from "@/views/system/dict/data.vue";
-
-// 查询员工列表
-export function selectEmployeeConditions(data) {
-  return request({
-    url: '/employee/employee/selectEmployeeConditions',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询员工详细
-export function getEmployee(empId) {
-  return request({
-    url: '/employee/employee/' + empId,
-    method: 'get'
-  })
-}
-
-// 新增员工
-export function addEmployee(data) {
-  return request({
-    url: '/employee/employee',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改员工
-export function updateEmployee(data) {
-  return request({
-    url: '/employee/employee',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除员工
-export function delEmployee(empId) {
-  return request({
-    url: '/employee/employee/' + empId,
-    method: 'delete'
-  })
-}

src/api/system/car.js

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 查询菜单列表
+export function list(data) {
+  return request({
+    url: '/system/car/list',
+    method: 'get',
+    data
+  })
+}
+
+export function selectFence(data) {
+  return request({
+    url: '/system/car/selectFence',
+    method: 'get',
+    data
+  })
+}
+
+export function exportA(data){
+  return request({
+    url: '/system/car/exportA',
+    method: 'post',
+    data,
+    responseType: 'blob' // 添加 responseType: 'blob'，以处理文件下载
+  })
+}
+
+
+export function add(data) {
+  return request({
+    url: '/system/car/add',
+    method: 'post',
+    data
+  })
+}
+
+export function update(data) {
+  return request({
+    url: '/system/car/update',
+    method: 'post',
+    data
+  })
+}
+
+export function del(carIds) {
+  return request({
+    url: '/system/car/del/'+carIds,
+    method: 'post'
+  });
+}
+
+
+
+
+
+export function findById(carId) {
+  return request({
+    url: '/system/car/findById/' + carId,
+    method: 'get'
+  })
+}
+
+

src/api/test/goods.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询商品列表
-export function listGoods(query) {
-  return request({
-    url: '/test/goods/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询商品详细
-export function getGoods(deptId) {
-  return request({
-    url: '/test/goods/' + deptId,
-    method: 'get'
-  })
-}
-
-// 新增商品
-export function addGoods(data) {
-  return request({
-    url: '/test/goods/save',
-    method: 'post',
-    data
-  })
-}
-
-// 修改商品
-export function updateGoods(data) {
-  return request({
-    url: '/test/goods/edit',
-    method: 'put',
-    data
-  })
-}
-
-// 删除商品
-export function delGoods(deptId) {
-  return request({
-    url: '/test/goods/' + deptId,
-    method: 'delete'
-  })
-}

src/router/index.js

@@ -134,6 +134,7 @@ export const dynamicRoutes = [
       }
     ]
   },
+
   {
     path: '/monitor/job-log',
     component: Layout,

src/views/business/faultCodes/index.vue

@@ -0,0 +1,357 @@
+<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.sys_yes_no"
+            :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>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['business:faultCodes:export']"-->
+<!--        >导出</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>
+        </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>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否产生报警" align="center" prop="alarmFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :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" 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
+      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 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";
+
+export default {
+  name: "FaultCodes",
+  dicts: ['sys_yes_no','sys_common_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 故障码表格数据
+      faultCodesList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        faultName: null,
+        faultCode: null,
+        alarmFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询故障码列表 */
+    getList() {
+      this.loading = true;
+      listFaultCodes(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,
+        faultValue: 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(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/faultCodes/export', {
+        ...this.queryParams
+      }, `faultCodes_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/employee/index.vue

@@ -1,65 +0,0 @@
-<template>
-  <div>
-    {{employeeList}}
-  </div>
-</template>
-
-<script>
-//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-//例如：import 《组件名称》 from '《组件路径》,
-  import {selectEmployeeConditions} from "@/api/employee/employee";
-
-export default {
-    //import引入的组件需要注入到对象中才能使用"
-    components: {},
-    props: {},
-    data() {
-      //这里存放数据"
-
-      return {
-        reqConditions:{},
-        employeeList:[]
-      };
-    },
-    //计算属性 类似于data概念",
-    computed: {},
-    //监控data中的数据变化",
-    watch: {},
-    //方法集合",
-    methods: {
-      getList() {
-        this.loading = true;
-        selectEmployeeConditions(this.reqConditions).then(response => {
-          console.log(response);
-          this.employeeList = response.data.data;
-          this.total = response.data.total;
-          this.loading = false;
-        });
-      },
-    },
-    //生命周期 - 创建完成（可以访问当前this实例）",
-    created() {
-      this.getList();
-    },
-    //生命周期 - 挂载完成（可以访问DOM元素）",
-    mounted() {
-    },
-    beforeCreate() {
-    }, //生命周期 - 创建之前",
-    beforeMount() {
-    }, //生命周期 - 挂载之前",
-    beforeUpdate() {
-    }, //生命周期 - 更新之前",
-    updated() {
-    }, //生命周期 - 更新之后",
-    beforeDestroy() {
-    }, //生命周期 - 销毁之前",
-    destroyed() {
-    }, //生命周期 - 销毁完成",
-    activated() {
-    } //如果页面有keep-alive缓存功能，这个函数会触发",
-  };
-</script>
-<style scoped>
-
-</style>

src/views/system/car/index.vue

@@ -0,0 +1,422 @@
+<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="车辆vin码" prop="carVin">
+        <el-input
+          v-model="queryParams.carVin"
+          placeholder="请输入车辆vin码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆类型" prop="carType">
+        <el-input
+          v-model="queryParams.carType"
+          placeholder="请输入车辆类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="车辆状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="请选择车辆状态" clearable>
+          <el-option
+            v-for="dict in dict.type.car_state"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="电机厂商" prop="carElectricalmachiney">
+        <el-input
+          v-model="queryParams.carElectricalmachiney"
+          placeholder="请输入电机厂商"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电池厂商" prop="carBattery">
+        <el-input
+          v-model="queryParams.carBattery"
+          placeholder="请输入电池厂商"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电机编号" prop="carElectricalmachineyId">
+        <el-input
+          v-model="queryParams.carElectricalmachineyId"
+          placeholder="请输入电机编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电池编号" prop="carBatteryId">
+        <el-input
+          v-model="queryParams.carBatteryId"
+          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>
+      </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="['system:car: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="['system:car: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="['system:car:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:car:export']"
+        >导出</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="id" align="center" prop="carId" />
+      <el-table-column label="车辆vin码" align="center" prop="carVin" />
+      <el-table-column label="车辆类型" align="center" prop="carType" />
+      <el-table-column label="电子围栏id" align="center" prop="carFenceId" />
+      <el-table-column label="车辆状态" align="center" prop="state">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.car_state" :value="scope.row.state"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="电机厂商" align="center" prop="carElectricalmachiney" />
+      <el-table-column label="电池厂商" align="center" prop="carBattery" />
+      <el-table-column label="电机编号" align="center" prop="carElectricalmachineyId" />
+      <el-table-column label="电池编号" align="center" prop="carBatteryId" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['system:car:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:car: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="carType">
+          <el-input v-model="form.carType" placeholder="请输入车辆类型" />
+        </el-form-item>
+
+        <el-form-item label="电子围栏" prop="carFenceId">
+          <el-checkbox-group v-model="selectedFenceIds">
+            <el-checkbox
+              v-for="fence in selectFence"
+              :key="fence.fenceId"
+              :label="fence.fenceId"
+              :value="fence.fenceId"
+            >
+              {{ fence.fenceName }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="车辆状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择车辆状态">
+            <el-option
+              v-for="dict in dict.type.car_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="电机厂商" prop="carElectricalmachiney">
+          <el-input v-model="form.carElectricalmachiney" placeholder="请输入电机厂商" />
+        </el-form-item>
+        <el-form-item label="电池厂商" prop="carBattery">
+          <el-input v-model="form.carBattery" placeholder="请输入电池厂商" />
+        </el-form-item>
+        <el-form-item label="电机编号" prop="carElectricalmachineyId">
+          <el-input v-model="form.carElectricalmachineyId" placeholder="请输入电机编号" />
+        </el-form-item>
+        <el-form-item label="电池编号" prop="carBatteryId">
+          <el-input v-model="form.carBatteryId" placeholder="请输入电池编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 {list, add, update, findById, del, exportA, selectFence} from "@/api/system/car";
+
+export default {
+  name: "Car",
+  dicts: ['car_state'],
+  data() {
+    return {
+      selectFence:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      //电子围栏空数组
+      fenceIds:[],
+      //电子围栏选中的数组
+      selectedFenceIds: [],
+      // 车辆管理表格数据
+      carList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carVin: '',
+        carType: '',
+        carFenceId: '',
+        state: null,
+        carElectricalmachiney: null,
+        carBattery: null,
+        carElectricalmachineyId: null,
+        carBatteryId: null,
+      },
+      // 表单参数
+      form: {
+
+      },
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+
+    this.selectFenceList()
+  },
+  methods: {
+    selectFenceList(){
+      selectFence().then(res=>{
+        this.selectFence=res.data
+        console.log(this.selectFence)
+        this.fenceIds = this.selectFence
+        console.log(this.fenceIds)
+
+
+      })
+    },
+    /** 查询车辆管理列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.carList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        carId: null,
+        carVin: null,
+        carType: '',
+        carFenceId: '',
+        state: null,
+        carElectricalmachiney: null,
+        carBattery: null,
+        carElectricalmachineyId: null,
+        carBatteryId: 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.carId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.selectFenceList()
+      this.title = "添加车辆管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const carId = row.carId || this.ids
+      findById(carId).then(response => {
+        this.form = response.data;
+        this.form.carFenceId = this.form.carFenceId.split(",");
+        this.open = true;
+        this.title = "修改车辆管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (!Array.isArray(this.form.carFenceId)){
+            this.form.carFenceId=[this.form.carFenceId]
+          }
+          this.form.carFenceId = this.form.carFenceId.map(item => String(item)); // 将每个元素转换为字符串
+
+          this.form.carFenceId = this.selectedFenceIds.join(",");
+          // this.form.carFenceId = this.form.carFenceId.join(",");
+          if (this.form.carId != null) {
+            update(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const carIds = row.carId || this.ids;
+      this.$modal.confirm('是否确认删除车辆管理编号为"' + carIds + '"的数据项？').then(function() {
+        return del(carIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    // handleExport() {
+    //   this.download('system/car/export', {
+    //     ...this.queryParams
+    //   }, `car_${new Date().getTime()}.xlsx`)
+    // }
+    /** 导出按钮操作 */
+    handleExport() {
+      exportA(this.queryParams).then(response => {
+        // 创建一个 Blob 对象，指定 MIME 类型为 Excel 文件类型
+        const blob = new Blob([response.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+        // 创建一个 <a> 标签
+        const link = document.createElement('a');
+        // 将 Blob 对象添加到 <a> 标签的 href 属性中
+        link.href = window.URL.createObjectURL(blob);
+        // 设置下载文件的名称
+        link.download = `car_${new Date().getTime()}.xlsx`;
+        // 将 <a> 标签添加到页面中
+        document.body.appendChild(link);
+        // 模拟点击 <a> 标签，触发文件下载
+        link.click();
+        // 释放 Blob 对象的 URL
+        window.URL.revokeObjectURL(link.href);
+        // 移除 <a> 标签
+        document.body.removeChild(link);
+      }).catch(error => {
+        console.error('导出失败:', error);
+        // 处理导出失败的逻辑
+      });
+    }
+
+
+
+  }
+};
+</script>

src/views/system/dept/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="voEnterpriseInfo" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="企业名称" prop="deptName">
+      <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="voEnterpriseInfo.deptName"
-          placeholder="请输入企业名称"
+          placeholder="请输入部门名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="voEnterpriseInfo.status" placeholder="企业状态" clearable>
+        <el-select v-model="voEnterpriseInfo.status" placeholder="部门状态" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -48,42 +48,68 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-
-    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll">
-      <el-table-column prop="deptName" label="企业名称" width="260"></el-table-column>
-      <el-table-column prop="leader" label="企业负责人" width="200"></el-table-column>
-      <el-table-column prop="phone" label="企业联系电话" width="200"></el-table-column>
-      <el-table-column prop="email" label="企业邮箱" width="200"></el-table-column>
-      <el-table-column prop="createTime" label="入驻时间" width="200"></el-table-column>
-      <el-table-column prop="updateTime" label="状态" width="100">
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="deptList"
+      row-key="deptId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </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="['system:dept:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
-          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+          >新增</el-button>
+          <el-button
+            v-if="scope.row.parentId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-
-    <!-- 添加或修改企业对话框 -->
+    <!-- 添加或修改部门对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
-            <el-form-item label="上级企业" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级企业" />
+            <el-form-item label="上级部门" prop="parentId">
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入企业名称" />
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -111,7 +137,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="企业状态">
+            <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
@@ -148,7 +174,7 @@ export default {
       showSearch: true,
       // 表格树数据
       deptList: [],
-      // 企业树选项
+      // 部门树选项
       deptOptions: [],
       // 弹出层标题
       title: "",
@@ -168,10 +194,10 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: "上级企业不能为空", trigger: "blur" }
+          { required: true, message: "上级部门不能为空", trigger: "blur" }
         ],
         deptName: [
-          { required: true, message: "企业名称不能为空", trigger: "blur" }
+          { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
@@ -197,7 +223,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询企业列表 */
+    /** 查询部门列表 */
     getList() {
       this.loading = true;
       listDept(this.voEnterpriseInfo).then(response => {
@@ -205,7 +231,7 @@ export default {
         this.loading = false;
       });
     },
-    /** 转换企业数据结构 */
+    /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
         delete node.children;
@@ -270,7 +296,7 @@ export default {
       getDept(row.deptId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改企业";
+        this.title = "修改部门";
       });
       listDeptExcludeChild(row.deptId).then(response => {
         this.deptOptions = this.handleTree(response.data, "deptId");

src/views/system/user/index.vue

@@ -2,35 +2,31 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-<!--      <el-col :span="4" :xs="24">-->
-<!--        <div class="head-container">-->
-<!--          <el-input-->
-<!--            v-model="deptName"-->
-<!--            placeholder="请输入部门名称"-->
-<!--            clearable-->
-<!--            size="small"-->
-<!--            prefix-icon="el-icon-search"-->
-<!--            style="margin-bottom: 20px"-->
-<!--          />-->
-<!--        </div>-->
-<!--        <div class="head-container">-->
-<!--          <el-tree-->
-<!--            :data="deptOptions"-->
-<!--            :props="defaultProps"-->
-<!--            :expand-on-click-node="false"-->
-<!--            :filter-node-method="filterNode"-->
-<!--            ref="tree"-->
-<!--            node-key="id"-->
-<!--            default-expand-all-->
-<!--            highlight-current-->
-<!--            @node-click="handleNodeClick"-->
-<!--          />-->
-<!--        </div>-->
-<!--      </el-col>-->
-
-
-
-
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="voEnterpriseInfo" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

src/views/test/goods/index.vue

@@ -1,296 +0,0 @@
-<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="goodsName">
-        <el-input
-          v-model="queryParams.goodsName"
-          placeholder="请输入商品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商品状态" prop="status">
-<!--        <el-select v-model="queryParams.status" clearable placeholder="请选择" style="width: 240px">-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.sys_normal_disable"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"/>-->
-<!--        </el-select>-->
-      </el-form-item>
-      <el-form-item label="商品类型" prop="status">
-        <el-select v-model="queryParams.goodsTypeId" placeholder="请选择" clearable @keyup.enter.native="handleQuery">
-          <el-option v-for="dict in goodsTypeOptions" :key="dict.goodsTypeId" :label="dict.goodsTypeName" :value="dict.goodsTypeId"/>
-        </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="['test:goods: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="['test:goods: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="['test:goods:remove']"
-        >删除</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['test:goods:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="商品id" align="center" prop="goodsId" />
-      <el-table-column label="商品名称" align="center" prop="goodsName" />
-      <el-table-column label="商品单价" align="center" prop="goodsPrice" />
-      <el-table-column label="商品类型" align="center" prop="goodsTypeName" />
-      <el-table-column label="商品图片" align="center" prop="goodsImage" />
-      <el-table-column label="商品状态" align="center" prop="status" />
-      <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="['test:goods:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['test:goods: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="deptName">
-          <el-input v-model="form.goodsName" placeholder="请输入商品名称" />
-        </el-form-item>
-        <el-form-item label="商品单价" prop="orderNum">
-          <el-input v-model="form.goodsPrice" placeholder="请输入商品单价" />
-        </el-form-item>
-        <el-form-item label="商品类型" prop="leader">
-          <el-select v-model="form.goodsTypeId" placeholder="请选择" clearable>
-            <el-option v-for="dict in goodsTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="商品图片" prop="phone">
-          <el-upload
-            class="upload-demo"
-            drag
-            action="https://jsonplaceholder.typicode.com/posts/"
-            multiple>
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
-          </el-upload>
-        </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 { listGoods, getGoods, delGoods, addGoods, updateGoods } from "@/api/test/goods";
-
-export default {
-  name: "Goods",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 商品表格数据
-      goodsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        goodsName: null,
-        goodsTypeId: null,
-        status: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      // 商品类型
-      goodsTypeOptions: [],
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询商品列表 */
-    getList() {
-      this.loading = true;
-      listGoods(this.queryParams).then(res => {
-        this.goodsList = res.rows;
-        this.total = res.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        goodsId: null,
-        goodsName: null,
-        goodsPrice: null,
-        goodsTypeName: null,
-        goodsImage: null,
-        remark: null,
-        status: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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.goodsId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加商品";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const deptId = row.deptId || this.ids
-      getGoods(deptId).then(res => {
-        this.form = res.data;
-        this.open = true;
-        this.title = "修改商品";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.goodsId != null) {
-            updateGoods(this.form).then(res => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addGoods(this.form).then(res => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const goodsId = row.goodsId || this.ids;
-      this.$modal.confirm('是否确认删除商品编号为"' + goodsId + '"的数据项？').then(function() {
-        return delGoods(goodsId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('test/goods/export', {
-        ...this.queryParams
-      }, `goods_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>