1

src/api/system/car.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询菜单列表
+export function list(query) {
+  return request({
+    url: '/system/car/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function add(query) {
+  return request({
+    url: '/system/car/add',
+    method: 'post',
+    params: query
+  })
+}
+
+export function update(query) {
+  return request({
+    url: '/system/car/list',
+    method: 'post',
+    params: query
+  })
+}
+
+export function del(carId) {
+  return request({
+    url: '/system/car/del/' + carId,
+    method: 'post'
+  })
+}
+
+export function selectState() {
+  return request({
+    url: '/system/car/selectState',
+    method: 'get'
+  })
+}
+export function findById(carId) {
+  return request({
+    url: '/system/car/findById/' + carId,
+    method: 'get'
+  })
+}
+
+
+export function selectFence() {
+  return request({
+    url: '/system/car/selectFence',
+    method: 'get'
+  })
+}

src/api/system/info.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询企业管理列表
-export function listInfo(query) {
-  return request({
-    url: '/system/info/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询企业管理详细
-export function getInfo(enterpriseId) {
-  return request({
-    url: '/system/info/' + enterpriseId,
-    method: 'get'
-  })
-}
-
-// 新增企业管理
-export function addInfo(data) {
-  return request({
-    url: '/system/info',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改企业管理
-export function updateInfo(data) {
-  return request({
-    url: '/system/info',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除企业管理
-export function delInfo(enterpriseId) {
-  return request({
-    url: '/system/info/' + enterpriseId,
-    method: 'delete'
-  })
-}

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/system/car/index.vue

@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <el-form ref="form" :model="carRequest" label-width="80px">
+      <el-form-item label="vin码">
+        <el-input v-model="carRequest.carVin"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="onSubmit">查询</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="add" v-hasPermi="['system:car:add']"></el-button>
+
+    <el-table :data="carResponse.list" style="width: 100%">
+      <el-table-column label="ID" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carId}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆VIN码" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carVin}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆类型" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carType}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="电子围栏ID" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carFenceId}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆状态" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.state}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="电机厂商" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carElectricalmachiney}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="电池厂商" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.car_battery}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="电机编号" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carElectricalmachineyId}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="电池编号" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.carBatteryId}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.createBy}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.createTime}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新者" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.updateBy}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新时间" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.updateTime}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{scope.row.remark}}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="carRequest.pageNum"
+      :page-sizes="[1,2,3,4]"
+      :page-size="carRequest.pageSize"
+      layout="total,sizes,prev,pager,next,jumper"
+      :total="400">
+    </el-pagination>
+
+    <el-dialog :title="title" :visible.sync="dialogFormVisible">
+      <el-form :model="car">
+        <el-form-item label="车辆VIN码" :label-width="formLabelWidth">
+          <el-input v-model="car.carVin" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆类型" :label-width="formLabelWidth">
+          <el-input v-model="car.carType" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="电子围栏" :label-width="formLabelWidth">
+          <el-select v-model="car.carFenceId" placeholder="请选择电子围栏">
+            <el-option
+              v-for="item in selectFence"
+              :key="selectFence.fenceId"
+              :label="selectFence.fenceName"
+              :value="selectFence.fenceId"></el-option>
+          </el-select>
+        </el-form-item>
+
+
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {list,add,update,del,selectState,findById,selectFence} from "@/api/system/car";
+
+export default {
+  name: 'Index',
+  data() {
+    return {
+      carRequest:{
+        carVin:'',
+        pageNum:1,
+        pageSize:3
+      },
+      carResponse:{
+        list:{},
+        total:0
+      },
+      selectFence:[]
+    }
+  },
+  created() {
+    this.selectFenceList()
+    this.onSubmit()
+  },
+  methods: {
+    selectFenceList(){
+      selectFence(this.selectFence).then(res=>{
+        this.selectFence=res.data
+      })
+    },
+    onSubmit(){
+      list(this.carRequest).then(res=>{
+        this.carResponse=res.data
+      })
+    },
+    handleSizeChange(val){
+      this.carRequest.pageSize=val
+      this.onSubmit()
+    },
+    handleCurrentChange(val){
+      this.carRequest.pageNum=val
+      this.onSubmit()
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>
+<style scoped>
+</style>

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
-    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll">
+      v-if="refreshTable"
-      <el-table-column prop="deptName" label="企业名称" width="260"></el-table-column>
+      v-loading="loading"
-      <el-table-column prop="leader" label="企业负责人" width="200"></el-table-column>
+      :data="deptList"
-      <el-table-column prop="phone" label="企业联系电话" width="200"></el-table-column>
+      row-key="deptId"
-      <el-table-column prop="email" label="企业邮箱" width="200"></el-table-column>
+      :default-expand-all="isExpandAll"
-      <el-table-column prop="createTime" label="入驻时间" width="200"></el-table-column>
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      <el-table-column prop="updateTime" label="状态" width="100">
+    >
+      <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
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
+            size="mini"
-          <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>
+            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">
+            <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级企业" />
+              <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-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入企业名称" />
+              <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/info/index.vue

@@ -1,276 +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="deptName">
-        <el-input v-model="queryParams.deptName" placeholder="请输入企业地址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-
-
-      <el-form-item label="企业状态" prop="status">
-        <el-input v-model="queryParams.status" placeholder="请输入企业状态" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-
-      <el-form-item label="负责人" prop="leader">
-        <el-input v-model="queryParams.leader" 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:info: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:info: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:info: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:info:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="部门id" align="center" prop="enterpriseId" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="负责人" align="center" prop="leader" />
-      <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="邮箱" align="center" prop="email" />
-      <el-table-column label="部门状态" align="center" prop="status" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-
-      <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:info:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:info: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="enterpriseName">
-          <el-input v-model="form.enterpriseName" 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="enterpriseAddress">
-          <el-input v-model="form.enterpriseAddress" placeholder="请输入企业地址" />
-        </el-form-item>
-        <el-form-item label="企业联系电话" prop="phoneNumber">
-          <el-input v-model="form.phoneNumber" placeholder="请输入企业联系电话" />
-        </el-form-item>
-        <el-form-item label="行业类型" prop="industry">
-          <el-input v-model="form.industry" placeholder="请输入行业类型" />
-        </el-form-item>
-        <el-form-item label="企业标识" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入企业标识" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-        <el-form-item label="负责人" prop="leader">
-          <el-input v-model="form.leader" 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 { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/system/info";
-
-export default {
-  name: "Info",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 企业管理表格数据
-      infoList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-
-        deptName:null,
-        status:null,
-        leader:null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询企业管理列表 */
-    getList() {
-      this.loading = true;
-      listInfo(this.queryParams).then(response => {
-        this.infoList = response.data.rows;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        enterpriseId: null,
-        enterpriseName: null,
-        email: null,
-        enterpriseAddress: null,
-        phoneNumber: null,
-        industry: null,
-        status: null,
-        deptId: null,
-        updateTime: null,
-        createTime: null,
-        delFlag: null,
-        leader: 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.enterpriseId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加企业管理";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const enterpriseId = row.enterpriseId || this.ids
-      getInfo(enterpriseId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改企业管理";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.enterpriseId != null) {
-            updateInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const enterpriseIds = row.enterpriseId || this.ids;
-      this.$modal.confirm('是否确认删除企业管理编号为"' + enterpriseIds + '"的数据项？').then(function() {
-        return delInfo(enterpriseIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/info/export', {
-        ...this.queryParams
-      }, `info_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>

src/views/system/user/index.vue

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