From 6f722d68490230f2e300d926caf3a3ed4646ac08 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Thu, 1 Aug 2024 18:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 ++--
src/views/system/area/areaSet.vue | 4 ++--
src/views/system/area/index.vue | 21 +++++++++++++++------
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/.env.development b/.env.development
index 4232b16..6eb2ea8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统
ENV = 'development'
# 共享电动车管理系统/开发环境
-# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
-VUE_APP_BASE_API = 'http://localhost:8088'
+VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'http://localhost:8088'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/system/area/areaSet.vue b/src/views/system/area/areaSet.vue
index 4ddae04..96b4b1c 100644
--- a/src/views/system/area/areaSet.vue
+++ b/src/views/system/area/areaSet.vue
@@ -643,7 +643,7 @@ export default {
.left_box {
padding: 10px;
- width: 49%;
+ width: 53%;
border: 1px solid #ccc;
border-radius: 10px;
}
@@ -653,7 +653,7 @@ export default {
border: 1px solid #ccc;
border-radius: 10px;
margin-left: 1%;
- width: 49%;
+ width: 44%;
.right_tit {
margin-bottom: 20px;
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index 4e7e41a..524096a 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -16,12 +16,12 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini"
v-hasPermi="['system:area:add']">新增</el-button>
</router-link>
- <!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
- v-hasPermi="['system:area:add']">新增</el-button> -->
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['system:area: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:area:edit']">修改</el-button>
+ <!-- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['system:area:edit']">修改</el-button> -->
<!-- <el-button
type="success"
plain
@@ -48,6 +48,14 @@
<el-table-column label="运营区域" align="center" prop="areaName" />
<el-table-column label="运营商" align="center" prop="deptName" />
<el-table-column label="车数量" align="center" prop="deviceNum" />
+ <el-table-column label="运营区设置" align="center" :show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <router-link :to="'/system/areaSet/index/' + scope.row.areaId" class="link-type">
+ <el-button size="mini" type="text" icon="el-icon-edit"
+ v-hasPermi="['system:area:edit']">修改</el-button>
+ </router-link>
+ </template>
+ </el-table-column>
<el-table-column label="停车区" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/system/area-parking/index/' + scope.row.areaId" class="link-type">
@@ -55,6 +63,7 @@
</router-link>
</template>
</el-table-column>
+
<el-table-column label="禁停区" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/system/area-noparking/index/' + scope.row.areaId" class="link-type">
@@ -102,10 +111,10 @@
</router-link>
</template>
</el-table-column> -->
- <router-link :to="'/system/areaSet/index/' + scope.row.areaId" class="link-type">
+ <!-- <router-link :to="'/system/areaSet/index/' + scope.row.areaId" class="link-type">
<el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['system:area:edit']">修改</el-button>
- </router-link>
+ </router-link> -->
<el-button size="mini" type="text" icon="el-icon-edit" @click="openmaps(scope.row)"
v-hasPermi="['system:area:edit']">修改电子围栏</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"