From cc9bb363172788e8f56aecd45c2f4168eea6663d Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 28 Oct 2024 10:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                   |  4 +--
 src/views/system/article/index.vue | 46 +++++++++++++++---------------
 src/views/system/role/index.vue    | 14 +--------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/.env.development b/.env.development
index 963657b..9ea4291 100644
--- a/.env.development
+++ b/.env.development
@@ -6,9 +6,9 @@ ENV = 'development'
 
 # 电动车租赁系统/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_BASE_API = 'http://192.168.2.21:8090'
+VUE_APP_BASE_API = 'http://localhost:8090'
 # VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
-VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
+# VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
 
 
 # 路由懒加载
diff --git a/src/views/system/article/index.vue b/src/views/system/article/index.vue
index 0de8315..0d8a5b9 100644
--- a/src/views/system/article/index.vue
+++ b/src/views/system/article/index.vue
@@ -37,28 +37,28 @@
           v-hasPermi="['system:article: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:article: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:article:remove']"
-        >删除</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:article: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:article:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -76,7 +76,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="文章id" align="center" prop="articleId" />
       <el-table-column label="分类" align="center" key="classifyName" prop="classify.classifyName" :show-overflow-tooltip="true" />
-      <el-table-column label="代理商" align="center" prop="deptName" />
+      <el-table-column label="代理商" align="center" prop="agentName" />
 <!--      <el-table-column label="运营区" align="center" prop="areaName" />-->
 <!--      <el-table-column label="分类" align="center" prop="classifyName">-->
 <!--        <template slot-scope="scope">-->
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index fb3b5ef..54c2e79 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -292,21 +292,9 @@ export default {
           value: "1",
           label: "全部数据权限"
         },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
         {
           value: "3",
           label: "本部门数据权限"
-        },
-        {
-          value: "4",
-          label: "本部门及以下数据权限"
-        },
-        {
-          value: "5",
-          label: "仅本人数据权限"
         }
       ],
       // 菜单列表
@@ -602,4 +590,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>