From 278929e7d235ed2fe1f4c26067aaaa2559672653 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Wed, 18 Sep 2024 09:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/brand.js           |  44 -----
 src/views/system/brand/index.vue  | 302 ------------------------------
 src/views/system/device/index.vue |  24 ---
 src/views/system/model/index.vue  |  15 --
 4 files changed, 385 deletions(-)
 delete mode 100644 src/api/system/brand.js
 delete mode 100644 src/views/system/brand/index.vue

diff --git a/src/api/system/brand.js b/src/api/system/brand.js
deleted file mode 100644
index 19c4e3f..0000000
--- a/src/api/system/brand.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询品牌商列表
-export function listBrand(query) {
-  return request({
-    url: '/system/brand/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询品牌商详细
-export function getBrand(brandId) {
-  return request({
-    url: '/system/brand/' + brandId,
-    method: 'get'
-  })
-}
-
-// 新增品牌商
-export function addBrand(data) {
-  return request({
-    url: '/system/brand',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改品牌商
-export function updateBrand(data) {
-  return request({
-    url: '/system/brand',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除品牌商
-export function delBrand(brandId) {
-  return request({
-    url: '/system/brand/' + brandId,
-    method: 'delete'
-  })
-}
diff --git a/src/views/system/brand/index.vue b/src/views/system/brand/index.vue
deleted file mode 100644
index 199c50b..0000000
--- a/src/views/system/brand/index.vue
+++ /dev/null
@@ -1,302 +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="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="contactPhone">
-        <el-input
-          v-model="queryParams.contactPhone"
-          placeholder="请输入联系电话"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_common_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="['system:brand: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:brand: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:brand: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:brand:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="brandList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="品牌商id" align="center" prop="brandId" />
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="联系人" align="center" prop="contactPerson" />
-      <el-table-column label="联系电话" align="center" prop="contactPhone" />
-      <el-table-column label="邮箱" align="center" prop="email" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
-        </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:brand:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:brand: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="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactPerson">
-          <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactPhone">
-          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="邮箱" prop="email">
-          <el-input v-model="form.email" placeholder="请输入邮箱" />
-        </el-form-item>
-<!--        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option
-              v-for="dict in dict.type.sys_common_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </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 { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/system/brand";
-
-export default {
-  name: "Brand",
-  dicts: ['sys_common_status'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 品牌商表格数据
-      brandList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        contactPhone: null,
-        status: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询品牌商列表 */
-    getList() {
-      this.loading = true;
-      listBrand(this.queryParams).then(response => {
-        this.brandList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        brandId: null,
-        name: null,
-        contactPerson: null,
-        contactPhone: null,
-        email: 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.brandId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加品牌商";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const brandId = row.brandId || this.ids
-      getBrand(brandId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改品牌商";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.brandId != null) {
-            updateBrand(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addBrand(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const brandIds = row.brandId || this.ids;
-      this.$modal.confirm('是否确认删除品牌商编号为"' + brandIds + '"的数据项？').then(function() {
-        return delBrand(brandIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/brand/export', {
-        ...this.queryParams
-      }, `brand_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index f9318d7..721b572 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -1,16 +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-item label="品牌商" prop="deptId" v-if="userName == 'admin'">
-        <el-select v-model="queryParams.deptId" placeholder="选择品牌商"  style="width: 120px;" clearable>
-          <el-option
-            v-for="item in deptOptions"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="MAC" prop="mac">
         <el-input style="width: 120px"
           v-model="queryParams.mac"
@@ -192,7 +182,6 @@
               @sort-change="handleSortChange"
             class="el-table">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="品牌商" align="center" prop="deptName" v-if="userName == 'admin' && columns[0].visible" />
       <el-table-column label="运营区" align="center" prop="areaName"  v-if="columns[1].visible"/>
       <el-table-column label="MAC" align="center" prop="mac" v-if="columns[2].visible"/>
       <el-table-column label="SN" align="center" prop="sn" sortable="custom" :sort-orders="['descending', 'ascending']" v-if="columns[3].visible"/>
@@ -362,18 +351,6 @@
             <el-input v-model="form.vehicleNum" placeholder="请输入车牌号" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="品牌商" prop="operator">
-            <el-select v-model="form.deptId" clearable placeholder="请选择品牌商">
-              <el-option
-                v-for="item in deptOptions"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="车辆型号" prop="modelId" >
             <el-select v-model="form.modelId" clearable placeholder="请选择车辆型号">
@@ -625,7 +602,6 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `品牌商`, visible: true },
         { key: 1, label: `运营区`, visible: true },
         { key: 2, label: `MAC`, visible: true },
         { key: 3, label: `SN`, visible: true },
diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue
index f6faa84..04ad0b7 100644
--- a/src/views/system/model/index.vue
+++ b/src/views/system/model/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品牌商" prop="brand">
-        <el-input
-          v-model="queryParams.brand"
-          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>
@@ -72,7 +64,6 @@
     <el-table v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="车型" align="center" prop="model" />
-      <el-table-column label="品牌商" align="center" prop="brandName" />
       <el-table-column label="满电电压(V)" align="center" prop="fullVoltage" />
       <el-table-column label="亏电电压(V)" align="center" prop="lowVoltage" />
       <el-table-column label="满电续航(km)" align="center" prop="fullEndurance" />
@@ -118,9 +109,6 @@
         <el-form-item label="车型" prop="model">
           <el-input v-model="form.model" placeholder="请输入车型" />
         </el-form-item>
-        <el-form-item v-if="userName == 'admin'" label="品牌商" prop="brand">
-          <treeselect v-model="form.brand" :options="deptOptions" :show-count="true" placeholder="选择上级品牌商" />
-        </el-form-item>
         <el-form-item label="满电电压(V)" label-width="90" prop="fullVoltage">
           <el-input style="width: 85%" v-model="form.fullVoltage" placeholder="请输入满电电压" />
         </el-form-item>
@@ -188,9 +176,6 @@ export default {
         model: [
           { required: true, message: "车型不能为空", trigger: "blur" }
         ],
-        brand: [
-          { required: true, message: "品牌商不能为空", trigger: "blur" }
-        ],
         fullVoltage: [
           { required: true, message: "满电电压不能为空", trigger: "blur" },
           { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入最多两位小数的浮点数', trigger: 'blur' }