diff --git a/src/api/model/system.js b/src/api/model/system.js index 20f512f..a97b4c3 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -223,7 +223,6 @@ export default { template:{ url: `${config.API_URL}/company.import.template`, name: "公司资料导入模版", - // responseType: 'arraybuffer', post: async function (params) { return await http.get(this.url,params,{responseType: 'arraybuffer'}); } @@ -446,4 +445,20 @@ export default { }, }, }, + sso:{ + setup:{ + url: `${config.API_URL}/sys.single.login.config`, + name: "单点登录配置", + post: async function (params) { + return await http.post(this.url, params); + } + }, + get:{ + url: `${config.API_URL}/sys.single.login.config.get`, + name: "获取单点登录配置", + post: async function (params) { + return await http.post(this.url, params); + } + } + } }; diff --git a/src/api/model/user.js b/src/api/model/user.js index 6bbf216..6cdf90a 100644 --- a/src/api/model/user.js +++ b/src/api/model/user.js @@ -73,14 +73,14 @@ export default { }, }, timeoutConfig:{ - url: `${config.API_URL}/system.login.timeout.config`, + url: `${config.API_URL}/sys.login.timeout`, name: "登录超时退出配置", post: async function (params) { return await http.post(this.url, params); }, }, timeoutGet:{ - url: `${config.API_URL}/system.login.timeout.get`, + url: `${config.API_URL}/sys.login.timeout.config`, name: "获取登录超时时间", post: async function (params) { return await http.post(this.url, params); diff --git a/src/assets/icons/Fingerprint.vue b/src/assets/icons/Fingerprint.vue new file mode 100644 index 0000000..9f55318 --- /dev/null +++ b/src/assets/icons/Fingerprint.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/style/fix.scss b/src/style/fix.scss index 7933fca..364efea 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -57,6 +57,9 @@ height: 100%; display: flex; flex-direction: column; + .el-tabs__active-bar{ + bottom: 10px; + } .el-tabs__header{ .el-tabs__nav{ padding: 0 20px; @@ -153,6 +156,7 @@ /** 弹款的头部配置 */ .el-dialog .el-dialog__header{margin-right: 0;padding-bottom: 20px;box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.06);} +.el-dialog .el-dialog__footer{padding-top: 20px;box-shadow: 0 -1px 1px 0 rgba(0, 0, 0, 0.06);} /* 覆盖tinymce样式 */ .sceditor .tox-tinymce {border: 1px solid #DCDFE6;border-radius: 0;} diff --git a/src/style/user.scss b/src/style/user.scss index 7b5f328..03743bf 100644 --- a/src/style/user.scss +++ b/src/style/user.scss @@ -178,6 +178,7 @@ } .viewTitle{ flex-basis: 35px; + font-size: 14px; } .viewCom{ flex: 1; diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue index a7de31c..7ab4103 100644 --- a/src/views/setting/advanced/index.vue +++ b/src/views/setting/advanced/index.vue @@ -1,6 +1,6 @@