diff --git a/src/assets/images/icon/tip-icon.png b/src/assets/images/icon/tip-icon.png new file mode 100644 index 0000000..8a27526 Binary files /dev/null and b/src/assets/images/icon/tip-icon.png differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 288c6c7..f7772f4 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -764,8 +764,8 @@ color: #666; } } -//其他 -.delMsg{ - color: #fff; - font-size: 16px; -} \ No newline at end of file +// //其他 +// .delMsg{ +// color: #fff; +// font-size: 16px; +// } \ No newline at end of file diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 9e55150..92e16d9 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1,3 +1,40 @@ +.elect-cont-left{ + width: 265px; + margin-right: 20px; + @include bg_color; + @include box_padding; + .head-container{ + margin-bottom: 20px; + } + .container-left{ + @include tree_height_min; + } +} +.elect-cont-right{ + // padding: 20px; + @include bg_color; + @include box_padding; + .head-container{ + margin-bottom: 20px; + } + .container-right{ + @include table_height_min; + } +} + +.hideSidebar{ + // siderbar-收起 54 + 间距 60 + treeLeft 265 + .elect-cont-right{ + width: calc(100vw - 379px); + } +} +.openSidebar{ + // siderbar-展开 256 + 间距 60 + treeLeft 265 + .elect-cont-right{ + width: calc(100vw - 581px); + } +} + .head-container { // padding: 20px; @@ -27,6 +64,9 @@ height: 30px !important; width: 230px !important; } + .icon-zhuangtai{ + font-size: 14px; + } } .el-tabs{ @@ -136,27 +176,27 @@ .el-button--mini{ padding: 7px 10px; } -.el-message-box, -.el-popover{ - .el-button{ - border-color: #dcdfe6; - color: #606266; - } +// .el-message-box, +// .el-popover{ +// .el-button{ +// border-color: #dcdfe6; +// color: #606266; +// } - .el-button:focus, - .el-button:hover { - color: #1890ff; - border-color: #badeff; - background-color: #e8f4ff; - } - .el-button--primary, - .el-button--primary:focus, - .el-button--primary:hover { - background: #46a6ff; - border-color: #46a6ff; - color: #fff; - } -} +// .el-button:focus, +// .el-button:hover { +// color: #1890ff; +// border-color: #badeff; +// background-color: #e8f4ff; +// } +// .el-button--primary, +// .el-button--primary:focus, +// .el-button--primary:hover { +// background: #46a6ff; +// border-color: #46a6ff; +// color: #fff; +// } +// } .header-container-wrap{ min-height: auto; @@ -335,7 +375,8 @@ } .el-icon-arrow-right:before{ - color: #fff; + // color: #fff; + @include icon_color; } .el-picker-panel__icon-btn:before{ color: #303133; @@ -414,13 +455,22 @@ // 弹框 .el-dialog{ + position: relative; + position: fixed; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + margin-top: 0 !important; width: 736px; padding: 0 20px; + border-radius: 6px; + box-shadow: 0px 14px 21px 0px rgba(0,0,0,0.17); .el-dialog__header{ padding: 17px 0; border-bottom: 1px solid #E6E8ED; .el-dialog__title{ font-size: 16px; + color: #000; } .el-dialog__close{ font-family: "iconfont" !important; @@ -437,6 +487,9 @@ .el-dialog__body{ padding: 30px 0; .el-form-item{ + &:nth-child(odd){ + margin-right: 40px; + } .el-form-item__label{ color: #0C0E1E; } @@ -458,6 +511,12 @@ line-height: 32px; } } + .vue-treeselect--focused{ + .vue-treeselect__control{ + border-radius: 5px; + border-color: #0348F3; + } + } .el-icon-close{ border-radius: 0; font-family: "iconfont" !important; @@ -494,6 +553,9 @@ } .selecct-dropdown{ .el-select-dropdown{ + position: absolute !important; + top: 36px !important; + left: 0 !important; padding: 6px 0; margin-top: 0; .el-select-dropdown__item{ @@ -502,28 +564,48 @@ } } } - } - .dialog-footer{ - display: flex; - justify-content: flex-end; - margin-top: 60px; - .el-button{ - width: 76px; - height: 32px; - line-height: 32px; - padding: 0; - border-color: #E6E8ED; - background-color: transparent; - color: #545B65; - font-weight: normal; - &.el-button--primary{ - color: #fff; - background-color: #0348F3; - border-color: #0348F3; + .el-input-number{ + width: 225px; + .el-input__inner{ + text-align: left; + } + .el-input-number__increase, + .el-input-number__decrease{ + background-color: transparent !important; + &.is-disabled{ + background-color: #E3E7EE !important; + } + } + .el-icon-arrow-down, + .el-icon-arrow-up{ + font-family: "iconfont" !important; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 12px; + color: #545B65; + transform: scale(0.5); + } + .el-icon-arrow-down:before{ + content: "\E629"; + } + .el-icon-arrow-up:before{ + content: "\E62c"; } } - + // .el-input-number.is-controls-right { + // .el-input-number__decrease, + // .el-input-number__increase{ + // display: none; + // } + // .el-input__inner{ + // padding-left: 0; + // padding-right: 0; + // } + // } } + + // position: relative; // position: fixed; // width: 620px; @@ -651,6 +733,29 @@ // } // } } + +.dialog-footer, +.el-message-box__btns{ + display: flex; + justify-content: flex-end; + margin-top: 60px; + .el-button{ + width: 76px; + height: 32px; + line-height: 32px; + padding: 0; + border-color: #E6E8ED; + background-color: transparent; + color: #545B65; + font-weight: normal; + &.el-button--primary{ + color: #fff; + background-color: #0348F3; + border-color: #0348F3; + } + } +} + // .el-dialog, // .right-preview{ // .el-form{ @@ -903,10 +1008,31 @@ } } } +// 提示框-dialog +.tip-dialog{ + .el-dialog{ + width: 504px; + .setting-dialog{ + padding: 0 10px; + } + .tip-content{ + padding-left: 34px; + font-size: 14px; + line-height: 24px; + color: #0C0E1E; + background: url("~@/assets/images/icon/tip-icon.png") no-repeat left top; + background-size: 24px 24px; + span{ + font-size: 12px; + color: #ED4A41; + } + } + } + .dialog-footer{ + margin-top: 27px; + } +} .setting-dialog{ - z-index: 100; - position: relative; - color: #fff; .des-form{ width: 100% !important; margin-top: 0 !important; @@ -956,86 +1082,140 @@ input[type ='number'] { } // 弹框-删除等提示 -.setting-dialog{ - .dialog-delt{ - line-height: 26px; - color: #fff; - margin-bottom: 20px; - } - .delt-tip{ - margin-top: 10px; - color: #EF3147; - } -} +// .setting-dialog{ +// // .dialog-delt{ +// // line-height: 26px; +// // color: #fff; +// // margin-bottom: 20px; +// // } +// // .delt-tip{ +// // margin-top: 10px; +// // color: #EF3147; +// // } +// } // alert 样式 +// .el-message-box{ +// position: relative; +// width: 588px; +// border: 2px solid $mainColor; +// border-bottom: none; +// border-radius: 4px 4px 0 0; +// background-color: $boxBg; +// overflow: visible; +// &::after{ +// position: absolute; +// left: -2px; +// bottom: -30px; +// content: ""; +// width: 589px; +// height: 30px; +// background: url(~@/assets/images/alert_bottom.png) no-repeat; +// background-size: contain; +// } +// .el-message-box__header{ +// padding: 18px 60px; +// background-color: $mainColor; +// .el-message-box__title{ +// font-weight: bold; +// color: #fff; +// } +// .el-message-box__headerbtn{ +// top: -36px; +// right: -16px; +// } +// .el-icon-close{ +// font-family: "iconfont" !important; +// font-style: normal; +// -webkit-font-smoothing: antialiased; +// -moz-osx-font-smoothing: grayscale; +// font-size: 24px; +// color: $mainColor; +// &::before{ +// content: "\E61b"; +// } +// } +// } +// .el-message-box__content{ +// height: 110px; +// padding: 35px 60px 15px 60px; +// color: #fff; +// } +// } +// .el-message-box .el-button, +// .el-popover .el-button{ +// color: #fff; +// border-color: $mainColor; +// background-color: transparent; +// } + +// .el-message-box .el-button:hover, +// .el-popover .el-button:focus{ +// color: #fff; +// background-color: #02255F; +// border-color: $mainColor; +// } +// .el-message-box .el-button--primary, +// .el-message-box .el-button--primary:focus, +// .el-message-box .el-button--primary:hover { +// background: #46a6ff; +// border-color: #46a6ff; +// color: #fff; +// } + .el-message-box{ - position: relative; - width: 588px; - border: 2px solid $mainColor; - border-bottom: none; - border-radius: 4px 4px 0 0; - background-color: $boxBg; - overflow: visible; - &::after{ - position: absolute; - left: -2px; - bottom: -30px; - content: ""; - width: 589px; - height: 30px; - background: url(~@/assets/images/alert_bottom.png) no-repeat; - background-size: contain; - } + width: 504px; + padding: 0 20px 30px 20px; .el-message-box__header{ - padding: 18px 60px; - background-color: $mainColor; + + padding: 17px 0; + border-bottom: 1px solid #E6E8ED; .el-message-box__title{ - font-weight: bold; - color: #fff; + font-size: 16px; + line-height: 24px; + color: #000; } .el-message-box__headerbtn{ - top: -36px; - right: -16px; - } - .el-icon-close{ - font-family: "iconfont" !important; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - font-size: 24px; - color: $mainColor; - &::before{ - content: "\E61b"; + top: 20px; + right: 0; + .el-icon-close{ + font-family: "iconfont" !important; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 16px; + color: #545b65; + &::before{ + content: "\E61b"; + } } } } .el-message-box__content{ - height: 110px; - padding: 35px 60px 15px 60px; - color: #fff; + padding: 26px 10px 10px 10px; + .el-message-box__status{ + top: 12px; + &.el-icon-warning{ + color: #ED4A41; + } + } + .el-message-box__message{ + p{ + color: #0C0E1E; + span{ + display: block; + font-size: 12px; + color: #ED4A41; + } + } + } + } + .el-message-box__btns{ + padding: 0; + margin-top: 27px; } -} -.el-message-box .el-button, -.el-popover .el-button{ - color: #fff; - border-color: $mainColor; - background-color: transparent; } -.el-message-box .el-button:hover, -.el-popover .el-button:focus{ - color: #fff; - background-color: #02255F; - border-color: $mainColor; -} -.el-message-box .el-button--primary, -.el-message-box .el-button--primary:focus, -.el-message-box .el-button--primary:hover { - background: #46a6ff; - border-color: #46a6ff; - color: #fff; -} .el-table__header-wrapper{ @include elTable-style; } @@ -1315,6 +1495,9 @@ input[type ='number'] { background: url('~@/assets/images/warehouse_arrow_right.png') no-repeat; } } +.el-switch .el-switch__core{ + @include switch-disabled; +} .el-switch.is-checked .el-switch__core{ @include switch-style; @@ -1324,6 +1507,8 @@ input[type ='number'] { @include switch-disabled; } + + .vue-treeselect--open-below .vue-treeselect__menu{ padding: 6px 0; top: 4px !important; @@ -1346,5 +1531,5 @@ input[type ='number'] { } } } - -} \ No newline at end of file +} + diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue index 4da7464..412613a 100644 --- a/src/components/Crud/CRUD.operation.vue +++ b/src/components/Crud/CRUD.operation.vue @@ -9,20 +9,26 @@ 新增 - - 修改 + + + 编辑 + - + + 删除 - 导出 + + + 导出 + - + + + +
+
+

此操作将导出所选数据

+ 你是否还要继续? +
+
+ 取消 + 继续 +
+
-
-
- - - - - - - - +
+
+ +
+
+ +
+
- -
- - - - -
- - - - - - - - - - 是 - 否 - - - - {{ item.label }} - - - - - -
- 取消 - 确认 + +
+ +
+
+ + + + + + + + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + {{ item.label }} + + +
+ 取消 + 确认 +
+
+ + +
+ + + + + + + + + + + + + + + + + + +
- - -
- - - - - - - - - - - - - - - -
@@ -116,13 +144,14 @@ import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' +// import udOperation from '@crud/UD.operation' import DateRangePicker from '@/components/DateRangePicker' +import pagination from '@crud/Pagination' const defaultForm = { id: null, name: null, isTop: '1', subCount: 0, pid: null, deptSort: 999, enabled: 'true' } export default { name: 'Dept', - components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker }, + components: { Treeselect, crudOperation, rrOperation, DateRangePicker, pagination }, cruds() { return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }}) }, @@ -140,6 +169,9 @@ export default { { required: true, message: '请输入序号', trigger: 'blur', type: 'number' } ] }, + deptName: '', deptDatas: [], jobs: [], level: 3, roles: [], + jobDatas: [], roleDatas: [], // 多选时使用 + defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' }, permission: { add: ['admin', 'dept:add'], edit: ['admin', 'dept:edit'], @@ -233,10 +265,11 @@ export default { }, // 改变状态 changeEnabled(data, val) { - this.$confirm('此操作将 "' + this.dict.label.dept_status[val] + '" ' + data.name + '部门, 是否继续？', '提示', { - confirmButtonText: '确定', + this.$confirm('此操作将禁用 / 启用部门 “' + data.name + '”' + '你是否还要继续？', '提示', { + confirmButtonText: '继续', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + dangerouslyUseHTMLString: true }).then(() => { crudDept.edit(data).then(res => { this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS) @@ -255,14 +288,5 @@ export default { } - - diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index cc30064..85151fc 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -1,94 +1,91 @@ @@ -131,7 +128,7 @@ import { getMenusTree, getChild } from '@/api/system/menu' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' +// import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' @@ -141,7 +138,7 @@ import DateRangePicker from '@/components/DateRangePicker' const defaultForm = { id: null, name: null, depts: [], description: null, dataScope: '全部', level: 3 } export default { name: 'Role', - components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker }, + components: { Treeselect, pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }}) }, @@ -350,14 +347,14 @@ export default { } - + --> - +} --> + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d3639af..1be534d 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -4,7 +4,7 @@
- +
@@ -16,7 +16,7 @@
-
+
@@ -26,8 +26,8 @@
- - 密码重置 + + 密码重置
@@ -74,7 +74,7 @@ - + @@ -85,14 +85,29 @@
- - - - + + + + +
+
+

此操作将重置所选用户密码为"123456"

+ 你是否还要继续? +
- 确定 + 取消 + 继续
@@ -130,6 +145,7 @@
+
@@ -187,6 +203,8 @@ export default { }, btnLoading: false, resetVisible: false, + // delVisible: false, + // deleteData: {}, height: document.documentElement.clientHeight - 180 + 'px;', deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [], jobDatas: [], roleDatas: [], // 多选时使用 @@ -434,10 +452,12 @@ export default { }, // 改变状态 changeEnabled(data, val) { - this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', { - confirmButtonText: '确定', + // '此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 你是否继续？', + this.$confirm('此操作将禁用 / 启用用户 “' + data.username + '”' + '你是否还要继续？', '提示', { + confirmButtonText: '继续', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + dangerouslyUseHTMLString: true }).then(() => { crudUser.edit(data).then(res => { this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS) @@ -469,50 +489,21 @@ export default { checkboxT(row, rowIndex) { return row.id !== this.user.id } + // handleClose() { + // this.delVisible = false + // }, + // toDelete(data) { + // this.deleteData = data + // this.delVisible = true + // }, + // handleDelConfirm() { + // this.delVisible = false + // this.crud.delAllLoading = true + // this.crud.doDelete(this.deleteData) + // } } }