Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NLT-e-cigarette
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张伯涛
NLT-e-cigarette
Commits
2d3f3622
Commit
2d3f3622
authored
May 30, 2022
by
张伯涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
928c71d9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
44 additions
and
15 deletions
+44
-15
element-ui.scss
src/styles/element-ui.scss
+15
-0
index.vue
src/views/system/dept/index.vue
+2
-1
data.vue
src/views/system/dict/data.vue
+3
-1
index.vue
src/views/system/dict/index.vue
+3
-1
index.vue
src/views/system/menu/index.vue
+2
-1
index.vue
src/views/system/role/index.vue
+3
-2
index.vue
src/views/system/user/index.vue
+16
-9
No files found.
src/styles/element-ui.scss
View file @
2d3f3622
...
@@ -129,6 +129,21 @@ body .el-table th.gutter{
...
@@ -129,6 +129,21 @@ body .el-table th.gutter{
color
:
white
!
important
;
color
:
white
!
important
;
}
}
}
}
.canleBtn
{
border
:
1px
solid
#DCDFE6
!
important
;
background-color
:
white
!
important
;
color
:
#606266
!
important
;
}
.btn-custom-cancel
{
border
:
1px
solid
#DCDFE6
!
important
;
background-color
:
white
!
important
;
color
:
#606266
!
important
;
&
:hover
{
border
:
1px
solid
#DCDFE6
!
important
;
background-color
:
white
!
important
;
color
:
#606266
!
important
;
}
}
// 按钮默认颜色(黑)
// 按钮默认颜色(黑)
.blackBtn
{
.blackBtn
{
border-color
:
#2C333A
;
border-color
:
#2C333A
;
...
...
src/views/system/dept/index.vue
View file @
2d3f3622
...
@@ -259,7 +259,7 @@
...
@@ -259,7 +259,7 @@
</el-row>
</el-row>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancel"
>
取 消
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -493,6 +493,7 @@ export default {
...
@@ -493,6 +493,7 @@ export default {
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
delDept
(
row
.
businessId
)
return
delDept
(
row
.
businessId
)
...
...
src/views/system/dict/data.vue
View file @
2d3f3622
...
@@ -94,6 +94,7 @@
...
@@ -94,6 +94,7 @@
<!--
{{
scope
.
row
.
dictCode
||
'-'
}}
-->
<!--
{{
scope
.
row
.
dictCode
||
'-'
}}
-->
<!--
</
template
>
-->
<!--
</
template
>
-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
type=
"index"
label=
"序号"
width=
"50"
/>
<el-table-column
label=
"字典编码"
align=
"center"
prop=
"businessId"
>
<el-table-column
label=
"字典编码"
align=
"center"
prop=
"businessId"
>
<
template
slot=
"header"
>
<
template
slot=
"header"
>
<div>
字典编码
</div>
<div>
字典编码
</div>
...
@@ -254,7 +255,7 @@
...
@@ -254,7 +255,7 @@
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancel"
>
取 消
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -484,6 +485,7 @@ export default {
...
@@ -484,6 +485,7 @@ export default {
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
delData
(
dictCodes
)
return
delData
(
dictCodes
)
...
...
src/views/system/dict/index.vue
View file @
2d3f3622
...
@@ -119,6 +119,7 @@
...
@@ -119,6 +119,7 @@
<div
class=
"mb12 font-small-bold"
style=
"margin: 0 0 12px 0;font-size: 14px"
>
字典管理列表
</div>
<div
class=
"mb12 font-small-bold"
style=
"margin: 0 0 12px 0;font-size: 14px"
>
字典管理列表
</div>
<el-table
v-loading=
"loading"
border
:data=
"typeList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
border
:data=
"typeList"
@
selection-change=
"handleSelectionChange"
>
<!--
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
-->
<!--
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
-->
<el-table-column
type=
"index"
label=
"序号"
width=
"50"
/>
<el-table-column
align=
"center"
prop=
"businessId"
>
<el-table-column
align=
"center"
prop=
"businessId"
>
<template
slot=
"header"
>
<template
slot=
"header"
>
<div>
字典编号
</div>
<div>
字典编号
</div>
...
@@ -285,7 +286,7 @@
...
@@ -285,7 +286,7 @@
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancel"
>
取 消
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
:loading=
"manageLoading"
:disabled=
"manageLoading"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
:loading=
"manageLoading"
:disabled=
"manageLoading"
@
click=
"submitForm"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -588,6 +589,7 @@ export default {
...
@@ -588,6 +589,7 @@ export default {
this
.
$confirm
(
'是否确认删除字典编号为"'
+
dictIds
+
'"的数据项?'
,
'警告'
,
{
this
.
$confirm
(
'是否确认删除字典编号为"'
+
dictIds
+
'"的数据项?'
,
'警告'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
delType
(
dictIds
)
return
delType
(
dictIds
)
...
...
src/views/system/menu/index.vue
View file @
2d3f3622
...
@@ -331,7 +331,7 @@
...
@@ -331,7 +331,7 @@
</el-row>
</el-row>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancel"
>
取 消
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -627,6 +627,7 @@ export default {
...
@@ -627,6 +627,7 @@ export default {
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
delMenu
(
row
.
businessId
)
return
delMenu
(
row
.
businessId
)
...
...
src/views/system/role/index.vue
View file @
2d3f3622
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancel"
>
取 消
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -315,7 +315,7 @@
...
@@ -315,7 +315,7 @@
</el-col>
</el-col>
</el-row>
</el-row>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancelDataScope"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancelDataScope"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"submitDataScope"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"submitDataScope"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -702,6 +702,7 @@ export default {
...
@@ -702,6 +702,7 @@ export default {
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
delRole
(
roleIds
)
return
delRole
(
roleIds
)
...
...
src/views/system/user/index.vue
View file @
2d3f3622
...
@@ -226,14 +226,6 @@
...
@@ -226,14 +226,6 @@
style=
"margin-left: 10px"
style=
"margin-left: 10px"
@
click=
"handleUpdate(scope.row)"
@
click=
"handleUpdate(scope.row)"
>
修改
</el-link>
>
修改
</el-link>
<el-link
v-hasPermi=
"['sys:user:resetPwd']"
size=
"mini"
type=
"success"
style=
"margin-left: 10px"
:loading=
"addLoading"
@
click=
"handleResetPwd(scope.row)"
>
重置
</el-link>
<el-link
<el-link
v-if=
"scope.row.businessId !== 1"
v-if=
"scope.row.businessId !== 1"
v-hasPermi=
"['sys:user:delete']"
v-hasPermi=
"['sys:user:delete']"
...
@@ -242,6 +234,14 @@
...
@@ -242,6 +234,14 @@
style=
"margin-left: 10px"
style=
"margin-left: 10px"
@
click=
"handleDelete(scope.row)"
@
click=
"handleDelete(scope.row)"
>
删除
</el-link>
>
删除
</el-link>
<el-link
v-hasPermi=
"['sys:user:resetPwd']"
size=
"mini"
type=
"success"
style=
"margin-left: 10px"
:loading=
"addLoading"
@
click=
"handleResetPwd(scope.row)"
>
重置
</el-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -418,6 +418,7 @@
...
@@ -418,6 +418,7 @@
<treeSelect
<treeSelect
v-model=
"form.deptId"
v-model=
"form.deptId"
:disable-branch-nodes=
"false"
:disable-branch-nodes=
"false"
:default-expand-level=
"1"
:options=
"deptOptions"
:options=
"deptOptions"
:show-count=
"true"
:show-count=
"true"
placeholder=
"请选择归属部门"
placeholder=
"请选择归属部门"
...
@@ -439,7 +440,7 @@
...
@@ -439,7 +440,7 @@
<!-- </el-row>-->
<!-- </el-row>-->
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
class=
"canleBtn"
@
click=
"cancel"
>
取 消
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"danger"
class=
"redBtn"
@
click=
"submitForm"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -838,6 +839,7 @@ export default {
...
@@ -838,6 +839,7 @@ export default {
this
.
$confirm
(
'确认要"'
+
text
+
'""'
+
row
.
username
+
'"用户吗?'
,
'警告'
,
{
this
.
$confirm
(
'确认要"'
+
text
+
'""'
+
row
.
username
+
'"用户吗?'
,
'警告'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
changeUserStatus
(
row
.
businessId
,
row
.
flag
)
return
changeUserStatus
(
row
.
businessId
,
row
.
flag
)
...
@@ -1023,6 +1025,7 @@ export default {
...
@@ -1023,6 +1025,7 @@ export default {
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
this
.
$confirm
(
'所选择数据被删除后不可再恢复,是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
delUser
(
userId
)
return
delUser
(
userId
)
...
@@ -1040,6 +1043,7 @@ export default {
...
@@ -1040,6 +1043,7 @@ export default {
this
.
$confirm
(
'是否确认导出所有用户信息?'
,
'警告'
,
{
this
.
$confirm
(
'是否确认导出所有用户信息?'
,
'警告'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'btn-custom-cancel'
,
type
:
'warning'
type
:
'warning'
}).
then
(
function
()
{
}).
then
(
function
()
{
return
exportUser
(
queryParams
).
then
(
response
=>
{
return
exportUser
(
queryParams
).
then
(
response
=>
{
...
@@ -1209,6 +1213,9 @@ export default {
...
@@ -1209,6 +1213,9 @@ export default {
right
:
13px
;
right
:
13px
;
text-align
:
center
;
text-align
:
center
;
}
}
.el-dialog__body
{
min-height
:
400px
!
important
;
}
.labelClassRequired
{
.labelClassRequired
{
text-align
:
center
;
text-align
:
center
;
position
:
relative
;
position
:
relative
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment