houyaf před 3 roky
rodič
revize
424cbaeaa8
2 změnil soubory, kde provedl 6 přidání a 5 odebrání
  1. 5 4
      src/settings.ts
  2. 1 1
      src/views/system/permit/role/index.vue

+ 5 - 4
src/settings.ts

@@ -4,11 +4,12 @@ const globalSettings: Settings.all = {
 
   base: {
     // 服务API地址
-    serverUrl: 'http://192.168.1.214:8080', // 正式环境
-    // devServerUrl: 'http://1.15.92.205:8080/', // 开发环境
+    // serverUrl: 'http://192.168.1.214:8080', // 正式环境
+    serverUrl: 'http://127.0.0.1:8080',
+    devServerUrl: 'http://1.15.92.205:8080/', // 开发环境
     // devServerUrl: 'http://113.141.88.27:8000', // 开发环境
     // devServerUrl: 'http://192.168.3.253:8000',
-    devServerUrl: 'http://127.0.0.1:8000',
+    // devServerUrl: 'http://127.0.0.1:8000',
     /**
      * websocket 地址
      * dev 开发环境
@@ -56,7 +57,7 @@ const globalSettings: Settings.all = {
     enable: true,
     enableIcon: true,
     enableHotkeys: true,
-    style: 'fashion',
+    style: 'card',
     mergeTabsBy: '',
   },
   toolbar: {

+ 1 - 1
src/views/system/permit/role/index.vue

@@ -108,7 +108,7 @@ function onRoleDel(row: any) {
       </search-bar>
 
       <el-table v-loading="state.loading" class="list-table" :data="state.dataList" border stripe highlight-current-row height="100%" @sort-change="sortChange" @selection-change="state.batch.selectionDataList = $event">
-        <el-table-column prop="name" label="名称" />
+        <el-table-column prop="roleName" label="名称" />
         <el-table-column label="操作" width="250" align="center" fixed="right">
           <template #default="scope">
             <el-button type="primary" size="small" plain @click="onRoleEdit(scope.row)">