From 1ed0e79403a9fd768a1ceb7574a3f0578663d44c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 23 Dec 2020 11:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/area/index.vue | 10 +++++-----
 vue.config.js                   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index 0b5a679..f26c306 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -1,8 +1,8 @@
 <template>
   <section class="app-container">
     <el-row>
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addArea">添加</el-button>
-      <el-button type="danger" icon="el-icon-delete" size="mini" @click="delArea">批量删除</el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addArea" v-hasPermi="['system:role:select']">添加</el-button>
+      <el-button type="danger" icon="el-icon-delete" size="mini" @click="delArea" v-hasPermi="['system:area:remove']">批量删除</el-button>
     </el-row>
     <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55">
@@ -15,11 +15,11 @@
       </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-view" @click="view(scope.row)">查看省份</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="view(scope.row)" v-hasPermi="['system:province:area']">查看省份</el-button>
 
           <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="view(scope.row)">查看省份</el-button> -->
           <el-button type="primary" icon="el-icon-edit" @click="editArea(scope.row)">修改</el-button>
-          <el-button type="primary" icon="el-icon-delete" @click="delArea(scope.row)">删除</el-button>
+          <el-button type="primary" icon="el-icon-delete" @click="delArea(scope.row)" v-hasPermi="['system:area:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -96,7 +96,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-hasPermi="['system:area:save']">确 定</el-button>
       </div>
     </el-dialog>
   </section>
diff --git a/vue.config.js b/vue.config.js
index 351a650..cdb1175 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,9 +35,9 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://47.115.73.110:8080`,
-        // target: `http://121.37.250.170:8080`,
+        target: `http://121.37.250.170:8080`,
         // target: `http://192.168.0.129:8080`,
-        target: `http://192.168.0.131:8080`,
+        // target: `http://192.168.0.131:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''