diff --git a/.env.development b/.env.development index 0346afc..4232b16 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # 共享电动车管理系统/开发环境 # VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' -VUE_APP_BASE_API = 'http://192.168.2.189:8080' +VUE_APP_BASE_API = 'http://localhost:8088' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 1d0e8fb..c409b3c 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -764,7 +764,8 @@ export default { this.$refs["form"].validate(valid => { if (valid) { if (this.form.areaId != null) { - updateArea2({areaId:this.form.areaId,boundary:this.form.boundary,boundaryStr:this.form.boundaryStr}).then(response => { + updateArea2({areaId:this.form.areaId,boundary:this.form.boundary,boundaryStr:this.form.boundaryStr,longitude:this.form.longitude, + latitude:this.form.latitude}).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.mapopen = false diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue index 54dc4e9..e3e6c97 100644 --- a/src/views/system/model/index.vue +++ b/src/views/system/model/index.vue @@ -1,6 +1,16 @@ <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.operator" placeholder="选择运营商" 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="车型" prop="model"> <el-input v-model="queryParams.model" @@ -9,14 +19,6 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="运营商" prop="operator"> - <el-input - v-model="queryParams.operator" - 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> @@ -119,7 +121,14 @@ <el-input v-model="form.model" placeholder="请输入车型" /> </el-form-item> <el-form-item v-if="userName == 'admin'" label="运营商" prop="operator"> - <treeselect v-model="form.operator" :options="deptOptions" :show-count="true" placeholder="选择上级运营商" /> + <el-select v-model="form.operator" style="width: 100%" 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-form-item label="满电电压(V)" label-width="90" prop="fullVoltage"> <el-input style="width: 85%" v-model="form.fullVoltage" placeholder="请输入满电电压" /> @@ -147,6 +156,7 @@ import { listModel, getModel, delModel, addModel, updateModel } from "@/api/syst import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import { deptTreeSelect } from '@/api/system/user' +import { listDept2 } from '@/api/system/dept' export default { name: "Model", @@ -273,9 +283,12 @@ export default { }, /** 查询运营商下拉树结构 */ getDeptTree() { - deptTreeSelect().then(response => { - this.deptOptions = response.data; + listDept2({status: '0',pageNum:1,pageSize:999 }).then(response => { + this.deptOptions = response.rows; }); + // deptTreeSelect().then(response => { + // this.deptOptions = response.data; + // }); }, /** 新增按钮操作 */ handleAdd() { diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue index d0acfa2..81e13f1 100644 --- a/src/views/user/user/index.vue +++ b/src/views/user/user/index.vue @@ -158,13 +158,6 @@ @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']" >修改</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDelete(scope.row)" - v-hasPermi="['system:user:remove']" - >删除</el-button> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']"> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-dropdown-menu slot="dropdown">