2.0.0项目初始化

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/DeptController.java

@@ -49,7 +49,7 @@ public class DeptController extends BaseController {
     }
 
     @ApiOperation(value = "获取部门列表", notes = "")
-    @GetMapping()
+    @GetMapping("/list")
     public R getDeptList() {
         List<DeptEntity> list = deptService.list(Wrappers.emptyWrapper());
         List<DeptVo> collect = list.stream().map(deptMapper::toVO).collect(Collectors.toList());

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/MenuController.java

@@ -49,7 +49,7 @@ public class MenuController extends BaseController {
     }
 
     @ApiOperation(value = "获取资源列表", notes = "")
-    @GetMapping()
+    @GetMapping("/list")
     public R getMenuList() {
         List<MenuEntity> list = menuService.list(Wrappers.emptyWrapper());
         List<MenuVo> collect = list.stream().map(menuMapper::toVO).collect(Collectors.toList());

datax-ui/src/views/system/dept/DeptAdd.vue

@@ -44,9 +44,11 @@ export default {
   name: 'DeptAdd',
   components: { Treeselect },
   props: {
-    parentId: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -55,7 +57,7 @@ export default {
       title: '部门新增',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -85,7 +87,7 @@ export default {
     }
   },
   created () {
-    console.log('parentId:' + this.parentId)
+    console.log('data:' + JSON.stringify(this.data))
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data

datax-ui/src/views/system/dept/DeptDetail.vue

@@ -43,9 +43,11 @@ export default {
   name: 'DeptDetail',
   components: { Treeselect },
   props: {
-    id: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -54,7 +56,7 @@ export default {
       title: '部门详情',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -69,13 +71,13 @@ export default {
     }
   },
   created () {
-    console.log('id:' + this.id)
+    console.log('data:' + JSON.stringify(this.data))
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data
       }
     })
-    this.getDept(this.id)
+    this.getDept(this.data.id)
   },
   methods: {
     showCard () {

datax-ui/src/views/system/dept/DeptEdit.vue

@@ -44,9 +44,11 @@ export default {
   name: 'DeptEdit',
   components: { Treeselect },
   props: {
-    id: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -55,7 +57,7 @@ export default {
       title: '部门编辑',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -82,13 +84,13 @@ export default {
     }
   },
   created () {
-    console.log('id:' + this.id)
+    console.log('data:' + JSON.stringify(this.data))
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data
       }
     })
-    this.getDept(this.id)
+    this.getDept(this.data.id)
   },
   methods: {
     showCard () {

datax-ui/src/views/system/dept/DeptList.vue

@@ -122,6 +122,14 @@ export default {
     return {
       bodyHeight: document.body.offsetHeight - 130 + 'px',
       tableHeight: document.body.offsetHeight - 230 + 'px',
+      // 展示切换
+      showOptions: {
+        data: {},
+        showList: true,
+        showAdd: false,
+        showEdit: false,
+        showDetail: false
+      },
       // 遮罩层
       loading: true,
       // 表格头
@@ -184,10 +192,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd (row) {
+      this.showOptions.data = {}
       if (row != undefined) {
-        this.showOptions.parentId = row.id;
+        this.showOptions.data.parentId = row.id;
       }
-      this.showOptions.id = undefined
       this.showOptions.showList = false
       this.showOptions.showAdd = true
       this.showOptions.showEdit = false
@@ -196,7 +204,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleEdit (row) {
-      this.showOptions.id = row.id || this.ids[0]
+      this.showOptions.data.id = row.id || this.ids[0]
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = true
@@ -205,7 +213,7 @@ export default {
     },
     /** 详情按钮操作 */
     handleDetail (row) {
-      this.showOptions.id = row.id || this.ids[0]
+      this.showOptions.data.id = row.id || this.ids[0]
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = false
@@ -225,7 +233,7 @@ export default {
     statusFormatter (row, column, cellValue, index) {
       const status = row.status
       if (status === "0") {
-        return <el-tag type="success">禁用</el-tag>
+        return <el-tag type="warning">禁用</el-tag>
       } else {
         return <el-tag type="success">启用</el-tag>
       }

datax-ui/src/views/system/dept/index.vue

@@ -4,13 +4,13 @@
       <dept-list v-if="options.showList" @showCard="showCard"></dept-list>
     </transition>
     <transition name="el-zoom-in-top">
-      <dept-add v-if="options.showAdd" :parentId="options.parentId" @showCard="showCard"></dept-add>
+      <dept-add v-if="options.showAdd" :data="options.data" @showCard="showCard"></dept-add>
     </transition>
     <transition name="el-zoom-in-top">
-      <dept-edit v-if="options.showEdit" :id="options.id" @showCard="showCard"></dept-edit>
+      <dept-edit v-if="options.showEdit" :data="options.data" @showCard="showCard"></dept-edit>
     </transition>
     <transition name="el-zoom-in-bottom">
-      <dept-detail v-if="options.showDetail" :id="options.id" @showCard="showCard"></dept-detail>
+      <dept-detail v-if="options.showDetail" :data="options.data" @showCard="showCard"></dept-detail>
     </transition>
   </div>
 </template>
@@ -27,7 +27,7 @@ export default {
   data () {
     return {
       options: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,

datax-ui/src/views/system/post/PostAdd.vue

@@ -34,13 +34,21 @@ import { addPost } from '@/api/system/post'
 
 export default {
   name: 'PostAdd',
+  props: {
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },
   data () {
     return {
       bodyHeight: document.body.offsetHeight - 130 + 'px',
       title: '岗位新增',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,

datax-ui/src/views/system/post/PostDetail.vue

@@ -34,9 +34,11 @@ import { getPost } from '@/api/system/post'
 export default {
   name: 'PostDetail',
   props: {
-    id: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -45,7 +47,7 @@ export default {
       title: '岗位详情',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -58,13 +60,13 @@ export default {
     }
   },
   created () {
-    console.log('id:' + this.id)
+    console.log('id:' + this.data.id)
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data
       }
     })
-    this.getPost(this.id)
+    this.getPost(this.data.id)
   },
   methods: {
     showCard () {

datax-ui/src/views/system/post/PostEdit.vue

@@ -35,9 +35,11 @@ import { getPost, updatePost } from '@/api/system/post'
 export default {
   name: 'PostEdit',
   props: {
-    id: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -46,7 +48,7 @@ export default {
       title: '岗位编辑',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -65,13 +67,13 @@ export default {
     }
   },
   created () {
-    console.log('id:' + this.id)
+    console.log('id:' + this.data.id)
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data
       }
     })
-    this.getPost(this.id)
+    this.getPost(this.data.id)
   },
   methods: {
     showCard () {

datax-ui/src/views/system/post/PostList.vue

@@ -170,7 +170,7 @@ export default {
       tableHeight: document.body.offsetHeight - 230 + 'px',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -264,7 +264,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd () {
-      this.showOptions.id = undefined
+      this.showOptions.data = {}
       this.showOptions.showList = false
       this.showOptions.showAdd = true
       this.showOptions.showEdit = false
@@ -273,7 +273,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleEdit (row) {
-      this.showOptions.id = row.id || this.ids[0]
+      this.showOptions.data.id = row.id || this.ids[0]
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = true
@@ -282,7 +282,7 @@ export default {
     },
     /** 详情按钮操作 */
     handleDetail (row) {
-      this.showOptions.id = row.id || this.ids[0]
+      this.showOptions.data.id = row.id || this.ids[0]
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = false
@@ -321,11 +321,12 @@ export default {
       this.getList()
     },
     statusFormatter (row, column, cellValue, index) {
-      const status = row.status
-      if (status === "0") {
-        return <el-tag type="success">禁用</el-tag>
+      let status = row.status
+      let status_dictText = row.status_dictText
+      if (status === '0') {
+        return <el-tag type="warning">{status_dictText}</el-tag>
       } else {
-        return <el-tag type="success">启用</el-tag>
+        return <el-tag type="success">{status_dictText}</el-tag>
       }
     }
   }

datax-ui/src/views/system/post/index.vue

@@ -4,13 +4,13 @@
       <post-list v-if="options.showList" @showCard="showCard"></post-list>
     </transition>
     <transition name="el-zoom-in-top">
-      <post-add v-if="options.showAdd" @showCard="showCard"></post-add>
+      <post-add v-if="options.showAdd" :data="options.data" @showCard="showCard"></post-add>
     </transition>
     <transition name="el-zoom-in-top">
-      <post-edit v-if="options.showEdit" :id="options.id" @showCard="showCard"></post-edit>
+      <post-edit v-if="options.showEdit" :data="options.data" @showCard="showCard"></post-edit>
     </transition>
     <transition name="el-zoom-in-bottom">
-      <post-detail v-if="options.showDetail" :id="options.id" @showCard="showCard"></post-detail>
+      <post-detail v-if="options.showDetail" :data="options.data" @showCard="showCard"></post-detail>
     </transition>
   </div>
 </template>
@@ -27,7 +27,7 @@ export default {
   data () {
     return {
       options: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,

datax-ui/src/views/system/role/RoleAdd.vue

@@ -9,21 +9,32 @@
               </el-button-group>
             </div>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-              <el-form-item label="角色名称" prop="postName">
+              <el-form-item label="角色名称" prop="roleName">
                 <el-input v-model="form.roleName" placeholder="请输入角色名称" />
               </el-form-item>
               <el-form-item label="角色编码" prop="roleCode">
                 <el-input v-model="form.roleCode" placeholder="请输入角色编码" />
               </el-form-item>
-              <el-form-item label="数据范围" prop="dataScope">
-                <el-radio-group v-model="form.dataScope">
-                  <el-radio
-                    v-for="dict in dataScopeOptions"
-                    :key="dict.id"
-                    :label="dict.itemText"
-                  >{{dict.itemValue}}</el-radio>
-                </el-radio-group>
-              </el-form-item>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="菜单权限">
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="权限范围" prop="dataScope">
+                    <el-select v-model="form.dataScope">
+                      <el-option
+                        v-for="item in dataScopeOptions"
+                        :key="item.id"
+                        :label="item.itemValue"
+                        :value="item.itemText"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="数据权限" v-show="form.dataScope === '2'">
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-form-item label="状态" prop="status">
                 <el-radio-group v-model="form.status">
                   <el-radio
@@ -46,13 +57,21 @@ import { addRole } from '@/api/system/role'
 
 export default {
   name: 'RoleAdd',
+  props: {
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },
   data () {
     return {
       bodyHeight: document.body.offsetHeight - 130 + 'px',
       title: '角色新增',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,

datax-ui/src/views/system/role/RoleDetail.vue

@@ -8,21 +8,32 @@
             </el-button-group>
           </div>
           <el-form ref="form" :model="form" label-width="80px" disabled>
-            <el-form-item label="角色名称" prop="postName">
+            <el-form-item label="角色名称" prop="roleName">
               <el-input v-model="form.roleName" />
             </el-form-item>
             <el-form-item label="角色编码" prop="roleCode">
               <el-input v-model="form.roleCode" />
             </el-form-item>
-            <el-form-item label="数据范围" prop="dataScope">
-              <el-radio-group v-model="form.dataScope">
-                <el-radio
-                  v-for="dict in dataScopeOptions"
-                  :key="dict.id"
-                  :label="dict.itemText"
-                >{{dict.itemValue}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="菜单权限">
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="权限范围" prop="dataScope">
+                  <el-select v-model="form.dataScope">
+                    <el-option
+                      v-for="item in dataScopeOptions"
+                      :key="item.id"
+                      :label="item.itemValue"
+                      :value="item.itemText"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="数据权限" v-show="form.dataScope === '2'">
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
                 <el-radio
@@ -46,9 +57,11 @@ import { getRole } from '@/api/system/role'
 export default {
   name: 'RoleDetail',
   props: {
-    id: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -57,7 +70,7 @@ export default {
       title: '角色详情',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -76,7 +89,7 @@ export default {
     }
   },
   created () {
-    console.log('id:' + this.id)
+    console.log('id:' + this.data.id)
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data
@@ -87,7 +100,7 @@ export default {
         this.dataScopeOptions = response.data
       }
     })
-    this.getRole(this.id)
+    this.getRole(this.data.id)
   },
   methods: {
     showCard () {

datax-ui/src/views/system/role/RoleEdit.vue

@@ -9,21 +9,32 @@
             </el-button-group>
           </div>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="角色名称" prop="postName">
+            <el-form-item label="角色名称" prop="roleName">
               <el-input v-model="form.roleName" placeholder="请输入角色名称" />
             </el-form-item>
             <el-form-item label="角色编码" prop="roleCode">
               <el-input v-model="form.roleCode" placeholder="请输入角色编码" />
             </el-form-item>
-            <el-form-item label="数据范围" prop="dataScope">
-              <el-radio-group v-model="form.dataScope">
-                <el-radio
-                  v-for="dict in dataScopeOptions"
-                  :key="dict.id"
-                  :label="dict.itemText"
-                >{{dict.itemValue}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="菜单权限">
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="权限范围" prop="dataScope">
+                  <el-select v-model="form.dataScope">
+                    <el-option
+                      v-for="item in dataScopeOptions"
+                      :key="item.id"
+                      :label="item.itemValue"
+                      :value="item.itemText"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="数据权限" v-show="form.dataScope === '2'">
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
                 <el-radio
@@ -47,9 +58,11 @@ import { getRole, updateRole } from '@/api/system/role'
 export default {
   name: 'RoleEdit',
   props: {
-    id: {
-      type: String,
-      default: undefined
+    data: {
+      type: Object,
+      default: function() {
+        return {}
+      }
     }
   },
   data () {
@@ -58,7 +71,7 @@ export default {
       title: '角色编辑',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -86,7 +99,7 @@ export default {
     }
   },
   created () {
-    console.log('id:' + this.id)
+    console.log('id:' + this.data.id)
     this.getDicts("sys_common_status").then(response => {
       if (response.success) {
         this.statusOptions = response.data
@@ -97,7 +110,7 @@ export default {
         this.dataScopeOptions = response.data
       }
     })
-    this.getRole(this.id)
+    this.getRole(this.data.id)
   },
   methods: {
     showCard () {

datax-ui/src/views/system/role/RoleList.vue

@@ -170,7 +170,7 @@ export default {
       tableHeight: document.body.offsetHeight - 230 + 'px',
       // 展示切换
       showOptions: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,
@@ -271,7 +271,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd () {
-      this.showOptions.id = undefined
+      this.showOptions.data = {}
       this.showOptions.showList = false
       this.showOptions.showAdd = true
       this.showOptions.showEdit = false
@@ -280,7 +280,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleEdit (row) {
-      this.showOptions.id = row.id || this.ids[0]
+      this.showOptions.data.id = row.id || this.ids[0]
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = true
@@ -289,7 +289,7 @@ export default {
     },
     /** 详情按钮操作 */
     handleDetail (row) {
-      this.showOptions.id = row.id || this.ids[0]
+      this.showOptions.data.id = row.id || this.ids[0]
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = false
@@ -329,24 +329,16 @@ export default {
     },
     dataScopeFormatter (row, column, cellValue, index) {
       const dataScope = row.dataScope
-      if (dataScope === "1") {
-        return '全部'
-      } else if (dataScope === 2) {
-        return '自定义'
-      } else if (dataScope === 3) {
-        return '本部门'
-      } else if (dataScope === 4) {
-        return '本部门及以下'
-      } else if (dataScope === 5) {
-        return '仅本人'
-      }
+      let dataScope_dictText = row.dataScope_dictText
+      return dataScope_dictText
     },
     statusFormatter (row, column, cellValue, index) {
-      const status = row.status
-      if (status === "0") {
-        return <el-tag type="success">禁用</el-tag>
+      let status = row.status
+      let status_dictText = row.status_dictText
+      if (status === '0') {
+        return <el-tag type="warning">{status_dictText}</el-tag>
       } else {
-        return <el-tag type="success">启用</el-tag>
+        return <el-tag type="success">{status_dictText}</el-tag>
       }
     }
   }

datax-ui/src/views/system/role/index.vue

@@ -4,13 +4,13 @@
       <role-list v-if="options.showList" @showCard="showCard"></role-list>
     </transition>
     <transition name="el-zoom-in-top">
-      <role-add v-if="options.showAdd" @showCard="showCard"></role-add>
+      <role-add v-if="options.showAdd" :data="options.data" @showCard="showCard"></role-add>
     </transition>
     <transition name="el-zoom-in-top">
-      <role-edit v-if="options.showEdit" :id="options.id" @showCard="showCard"></role-edit>
+      <role-edit v-if="options.showEdit" :data="options.data" @showCard="showCard"></role-edit>
     </transition>
     <transition name="el-zoom-in-bottom">
-      <role-detail v-if="options.showDetail" :id="options.id" @showCard="showCard"></role-detail>
+      <role-detail v-if="options.showDetail" :data="options.data" @showCard="showCard"></role-detail>
     </transition>
   </div>
 </template>
@@ -27,7 +27,7 @@ export default {
   data () {
     return {
       options: {
-        id: undefined,
+        data: {},
         showList: true,
         showAdd: false,
         showEdit: false,