From 32774aaeb4b3821a1de640b45d489d1f6e0b95e3 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 18 Jan 2023 14:59:04 +0800
Subject: [PATCH] vue add

---
 nladmin-ui/src/views/system/dept/index.vue          |  4 ++--
 nladmin-ui/src/views/system/menu/dd/index.vue       |  2 +-
 nladmin-ui/src/views/system/menu/index.vue          |  6 +++---
 nladmin-ui/src/views/system/param/index.vue         |  6 +++---
 nladmin-ui/src/views/system/role/index.vue          |  4 ++--
 .../src/views/system/user/center/updatePass.vue     |  2 +-
 .../system/user/dialog/relevanceDeptDialog.vue      |  8 ++++----
 .../system/user/dialog/relevanceUserDialog.vue      |  6 +++---
 nladmin-ui/src/views/system/user/index.vue          | 13 +++++--------
 nladmin-ui/src/views/system/user/user.js            |  2 +-
 10 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/nladmin-ui/src/views/system/dept/index.vue b/nladmin-ui/src/views/system/dept/index.vue
index 04bd219..02565b0 100644
--- a/nladmin-ui/src/views/system/dept/index.vue
+++ b/nladmin-ui/src/views/system/dept/index.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script>
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -266,7 +266,7 @@ export default {
     // 改变状态
     changeEnabled(data, val) {
       const satus = this.enabledTypeOptions.find(item => { return item.key == data.isUsed })
-      debugger
+
       this.$confirm('此操作将 "' + satus.display_name + '" ' + data.name + '部门, 是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/nladmin-ui/src/views/system/menu/dd/index.vue b/nladmin-ui/src/views/system/menu/dd/index.vue
index 3150b9e..da266f5 100644
--- a/nladmin-ui/src/views/system/menu/dd/index.vue
+++ b/nladmin-ui/src/views/system/menu/dd/index.vue
@@ -176,7 +176,7 @@
 </template>
 
 <script>
-import crudMenu from '@/api/system/menu'
+import crudMenu from '@/views/system/menu/menu'
 import IconSelect from '@/components/IconSelect'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
diff --git a/nladmin-ui/src/views/system/menu/index.vue b/nladmin-ui/src/views/system/menu/index.vue
index 91f85cf..306da25 100644
--- a/nladmin-ui/src/views/system/menu/index.vue
+++ b/nladmin-ui/src/views/system/menu/index.vue
@@ -81,8 +81,8 @@
         </el-form-item>
         <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
           <el-radio-group v-model="form.hidden" size="mini">
-            <el-radio-button label="0">是</el-radio-button>
-            <el-radio-button label="1">否</el-radio-button>
+            <el-radio-button label=false>是</el-radio-button>
+            <el-radio-button label=true>否</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" label="菜单标题" prop="title">
@@ -233,7 +233,7 @@ const defaultForm = {
   pid: 0,
   icon: null,
   cache: 0,
-  hidden: 0,
+  hidden: false,
   type: 0,
   permission: null
 }
diff --git a/nladmin-ui/src/views/system/param/index.vue b/nladmin-ui/src/views/system/param/index.vue
index 0225f3b..a7393c3 100644
--- a/nladmin-ui/src/views/system/param/index.vue
+++ b/nladmin-ui/src/views/system/param/index.vue
@@ -42,10 +42,10 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="id" label="id" />
-        <el-table-column prop="code" label="编码" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="code" label="编码" min-width="60" show-overflow-tooltip />
         <el-table-column prop="name" label="名称" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="value" label="值" min-width="270" show-overflow-tooltip />
-        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="value" label="值" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
         <el-table-column v-permission="['admin','param:edit','param:del']" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
diff --git a/nladmin-ui/src/views/system/role/index.vue b/nladmin-ui/src/views/system/role/index.vue
index 6543cf9..7938412 100644
--- a/nladmin-ui/src/views/system/role/index.vue
+++ b/nladmin-ui/src/views/system/role/index.vue
@@ -123,8 +123,8 @@
 
 <script>
 import crudRoles from './role'
-import crudMenu from '@/api/system/menu'
-import { getChild, getMenusTree } from '@/api/system/menu'
+import crudMenu from '@/views/system/menu'
+import { getChild, getMenusTree } from '@/views/system/menu/menu'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
diff --git a/nladmin-ui/src/views/system/user/center/updatePass.vue b/nladmin-ui/src/views/system/user/center/updatePass.vue
index 79f04ce..9f76cc7 100644
--- a/nladmin-ui/src/views/system/user/center/updatePass.vue
+++ b/nladmin-ui/src/views/system/user/center/updatePass.vue
@@ -22,7 +22,7 @@
 
 <script>
 import store from '@/store'
-import { updatePass } from '@/views/system/user'
+import { updatePass } from '@/views/system/user/user'
 export default {
   data() {
     const confirmPass = (rule, value, callback) => {
diff --git a/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue b/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue
index 8ece6df..78380fc 100644
--- a/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue
+++ b/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue
@@ -67,7 +67,7 @@
 
 <script>
 
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
@@ -174,8 +174,8 @@ export default {
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .el-dialog__body {
-    padding-top: 0px;
-  }
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
 </style>
 
diff --git a/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue b/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue
index bfb4a58..85e45c0 100644
--- a/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue
+++ b/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue
@@ -168,8 +168,8 @@ export default {
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .el-dialog__body {
-    padding-top: 0px;
-  }
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
 </style>
 
diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
index 79ac43f..f83118c 100644
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -172,12 +172,12 @@
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
-              <el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
+              <el-dropdown size="mini">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item icon="el-icon-refresh-right"><span @click="resetPassword(scope.row)">重置密码</span></el-dropdown-item>
                   <el-dropdown-item icon="el-icon-key">
-                    <span @click="openDeptDrawer(scope.row)">部门权限</span>
+                    <span @click="openDeptDrawer(scope.row)">分配部门</span>
                   </el-dropdown-item>
                   <el-dropdown-item icon="el-icon-key">
                     <span @click="openDataDialog(scope.row)">数据权限</span>
@@ -304,11 +304,7 @@
         :data="dataPermissions"
         style="width: 100%; max-height: 500px"
       >
-        <el-table-column prop="permission_scope_type" label="权限类型" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.permissionScopeType[scope.row.permissionScopeType] }}
-          </template>
-        </el-table-column>
+        <el-table-column prop="permissionScopeType" label="权限类型" min-width="100" show-overflow-tooltip />
         <el-table-column prop="permissionName" label="权限范围" min-width="100" show-overflow-tooltip />
         <el-table-column prop="deptName" label="部门名称" min-width="100" show-overflow-tooltip />
         <el-table-column prop="personName" label="用户名称" min-width="100" show-overflow-tooltip />
@@ -321,7 +317,7 @@
 
 <script>
 import crudUser from '@/views/system/user/user'
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import crudDataPermission from '@/views/system/dataPermission/dataPermission'
 import { getAll, getLevel } from '@/views/system/role/role'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -868,6 +864,7 @@ export default {
         permissionScopeType: row.value
       }
       crudDataPermission.getDataDetail(param).then(res => {
+        console.log(res)
         this.dataPermissions = res
       })
       this.showData = true
diff --git a/nladmin-ui/src/views/system/user/user.js b/nladmin-ui/src/views/system/user/user.js
index 6cd91a5..ee918b1 100644
--- a/nladmin-ui/src/views/system/user/user.js
+++ b/nladmin-ui/src/views/system/user/user.js
@@ -57,5 +57,5 @@ export function updateEmail(form) {
   })
 }
 
-export default { add, edit, del }
+export default { add, edit, del, updatePass }