diff --git a/.env.development b/.env.development index f908a966..783495b0 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ ENV = 'development' -VUE_APP_BASE_URL = 'http://119.45.196.33:5000/' \ No newline at end of file +VUE_APP_BASE_URL = 'http://face.api.talelin.com/' \ No newline at end of file diff --git a/src/assets/style/realize/element-variable.scss b/src/assets/style/realize/element-variable.scss index c66051b5..1417dabd 100644 --- a/src/assets/style/realize/element-variable.scss +++ b/src/assets/style/realize/element-variable.scss @@ -423,11 +423,11 @@ thead tr { overflow-y: auto; } -.el-menu--vertical >>> .icon-erjizhibiao { +.el-menu--vertical ::v-deep .icon-erjizhibiao { display: none; } -.el-menu--vertical >>> .two-folder { +.el-menu--vertical ::v-deep .two-folder { margin-left: 40px; } diff --git a/src/component/base/search/lin-search.vue b/src/component/base/search/lin-search.vue index dd9a77e1..316d95e0 100644 --- a/src/component/base/search/lin-search.vue +++ b/src/component/base/search/lin-search.vue @@ -43,7 +43,7 @@ export default { } diff --git a/src/component/base/table/lin-table.vue b/src/component/base/table/lin-table.vue deleted file mode 100644 index dfde9c11..00000000 --- a/src/component/base/table/lin-table.vue +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - diff --git a/src/component/layout/user.vue b/src/component/layout/user.vue index a877ab25..be485dcf 100644 --- a/src/component/layout/user.vue +++ b/src/component/layout/user.vue @@ -392,12 +392,12 @@ export default { @@ -370,7 +370,7 @@ export default { margin-left: 10px; vertical-align: bottom; } -.input-new-tag >>> .el-input__inner { +.input-new-tag ::v-deep .el-input__inner { height: 24px; } diff --git a/src/plugin/lin-cms-ui/view/form/input.vue b/src/plugin/lin-cms-ui/view/form/input.vue index 18b7c948..01bcbc1d 100644 --- a/src/plugin/lin-cms-ui/view/form/input.vue +++ b/src/plugin/lin-cms-ui/view/form/input.vue @@ -189,7 +189,7 @@ export default { diff --git a/src/plugin/lin-cms-ui/view/other/dialog.vue b/src/plugin/lin-cms-ui/view/other/dialog.vue index 342493c9..6511d252 100644 --- a/src/plugin/lin-cms-ui/view/other/dialog.vue +++ b/src/plugin/lin-cms-ui/view/other/dialog.vue @@ -355,7 +355,7 @@ export default { margin-bottom: 20px; } -.dialogForm >>> .el-select { +.dialogForm ::v-deep .el-select { width: 100%; } diff --git a/src/plugin/lin-cms-ui/view/other/timeline.vue b/src/plugin/lin-cms-ui/view/other/timeline.vue index b21fb388..3f434915 100644 --- a/src/plugin/lin-cms-ui/view/other/timeline.vue +++ b/src/plugin/lin-cms-ui/view/other/timeline.vue @@ -276,15 +276,15 @@ export default { margin-bottom: 20px; } -.timeLineCard >>> .el-card__body { +.timeLineCard ::v-deep .el-card__body { padding: 20px; } -.timeLineCard >>> .el-card__body h4 { +.timeLineCard ::v-deep .el-card__body h4 { margin: 20px 0px; } -.timeLineCard >>> .el-card__body { +.timeLineCard ::v-deep .el-card__body { margin: 14px 0px; } diff --git a/src/plugin/lin-cms-ui/view/table/table-combo.vue b/src/plugin/lin-cms-ui/view/table/table-combo.vue index 799f6a3f..e07e4c88 100644 --- a/src/plugin/lin-cms-ui/view/table/table-combo.vue +++ b/src/plugin/lin-cms-ui/view/table/table-combo.vue @@ -518,16 +518,16 @@ export default { } } // dialog -.tableSample >>> .el-dialog__footer { +.tableSample ::v-deep .el-dialog__footer { text-align: left; padding-left: 30px; } -.tableSample >>> .el-dialog__header { +.tableSample ::v-deep .el-dialog__header { padding-left: 30px; } -.tableSample >>> .el-dialog__body { +.tableSample ::v-deep .el-dialog__body { padding: 30px; } diff --git a/src/view/about/about.vue b/src/view/about/about.vue index aad5a080..b4aa67ed 100644 --- a/src/view/about/about.vue +++ b/src/view/about/about.vue @@ -466,12 +466,12 @@ export default { .personal-tabs { margin-bottom: 20px; } - .personal-tabs >>> .is-top { + .personal-tabs ::v-deep .is-top { width: 320px; display: flex; justify-content: space-around; } - .personal-tabs >>> .el-tabs__content { + .personal-tabs ::v-deep .el-tabs__content { text-indent: 20px; } } diff --git a/src/view/admin/group/group-create.vue b/src/view/admin/group/group-create.vue index 7f20bf91..ee5ff328 100644 --- a/src/view/admin/group/group-create.vue +++ b/src/view/admin/group/group-create.vue @@ -93,7 +93,6 @@ export default { resetForm() } else { loading.value = false - ElMessage.error(`${res.message}`) } } else { ElMessage.error('请将信息填写完整') diff --git a/src/view/admin/group/group-list.vue b/src/view/admin/group/group-list.vue index 83dbb03a..1327917d 100644 --- a/src/view/admin/group/group-list.vue +++ b/src/view/admin/group/group-list.vue @@ -118,15 +118,15 @@ export default { font-weight: 500; } } -.groupListInfoDialog /deep/ .el-dialog__footer { +.groupListInfoDialog ::v-deep .el-dialog__footer { text-align: left; padding-left: 30px; } -.groupListInfoDialog /deep/ .el-dialog__header { +.groupListInfoDialog ::v-deep .el-dialog__header { padding-left: 30px; } -.groupListInfoDialog /deep/ .el-dialog__body { +.groupListInfoDialog ::v-deep .el-dialog__body { padding: 30px; } diff --git a/src/view/admin/user/user-info.vue b/src/view/admin/user/user-info.vue index 1547c372..4857cd8d 100644 --- a/src/view/admin/user/user-info.vue +++ b/src/view/admin/user/user-info.vue @@ -152,7 +152,6 @@ export default { ctx.emit('handleInfoResult', true) } else { loading.value = false - ElMessage.error(`${res.message}`) } } } else { diff --git a/src/view/admin/user/user-password.vue b/src/view/admin/user/user-password.vue index ce982b6f..38005ca5 100644 --- a/src/view/admin/user/user-password.vue +++ b/src/view/admin/user/user-password.vue @@ -127,7 +127,7 @@ function getRules(ctx, info, form) { diff --git a/src/view/log/log.vue b/src/view/log/log.vue index e67139b1..f065e4a4 100644 --- a/src/view/log/log.vue +++ b/src/view/log/log.vue @@ -313,7 +313,7 @@ export default {