test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(系统设置): 扫码登陆页面权限设置

This commit is contained in:
guoyuqi 2024-06-13 17:56:26 +08:00 committed by 刘瑞斌
parent 672b9fe599
commit f1f48388c0
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/system-setting/src/main/resources/permission.json
View File

@ -169,7 +169,7 @@
"license": true "license": true
}, },
{ {
"id": "SYSTEM_PARAMETER_SETTING_QRCODE:READ", "id": "SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE",
"name": "permission.system_parameter_setting_qrcode.update", "name": "permission.system_parameter_setting_qrcode.update",
"license": true "license": true
} }

4
frontend/src/views/login/components/tabQrCode.vue
View File

@ -99,7 +99,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.tabPlatform { .tabPlatform {
width: 400px; min-width: 480px;
height: 40px; height: 40px;
} }
.login-qrcode { .login-qrcode {
@ -135,7 +135,7 @@
} }
} }
.radioOneButton { .radioOneButton {
width: 200px; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;

1
frontend/src/views/login/components/weComQrCode.vue
View File

@ -43,7 +43,6 @@
state: 'fit2cloud-wecom-qr', state: 'fit2cloud-wecom-qr',
redirect_type: WWLoginRedirectType.callback, redirect_type: WWLoginRedirectType.callback,
panel_size: WWLoginPanelSizeType.small, panel_size: WWLoginPanelSizeType.small,
scope: 'snsapi_privateinfo',
}, },
onCheckWeComLogin: obj.value, onCheckWeComLogin: obj.value,
async onLoginSuccess({ code }: any) { async onLoginSuccess({ code }: any) {

10
frontend/src/views/setting/system/config/components/qrCodeConfig.vue
View File

@ -43,7 +43,7 @@
type="outline" type="outline"
class="arco-btn-outline--secondary" class="arco-btn-outline--secondary"
size="mini" size="mini"
:disabled="!item.valid || !hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE'])" :disabled="!item.valid || !hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])"
@click="getValidateHandler(item.key)" @click="getValidateHandler(item.key)"
>{{ t('organization.service.testLink') }}</a-button >{{ t('organization.service.testLink') }}</a-button
></span ></span
@ -51,7 +51,7 @@
</a-tooltip> </a-tooltip>
<a-button <a-button
v-else v-else
:disabled="!item.valid || !hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE'])" :disabled="!item.valid || !hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])"
type="outline" type="outline"
class="arco-btn-outline--secondary" class="arco-btn-outline--secondary"
size="mini" size="mini"
@ -60,7 +60,7 @@
</a-button> </a-button>
<a-button <a-button
v-if="item.edit" v-if="item.edit"
v-permission="['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE']" v-permission="['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE']"
type="outline" type="outline"
class="arco-btn-outline--secondary" class="arco-btn-outline--secondary"
size="mini" size="mini"
@ -69,7 +69,7 @@
</a-button> </a-button>
<a-button <a-button
v-else v-else
v-permission="['SYSTEM_SERVICE_INTEGRATION:READ+ADD']" v-permission="['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE']"
type="outline" type="outline"
class="arco-btn-outline--secondary" class="arco-btn-outline--secondary"
size="mini" size="mini"
@ -91,7 +91,7 @@
v-else v-else
v-model="item.enable" v-model="item.enable"
size="small" size="small"
:disabled="!hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE'])" :disabled="!hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])"
@change="(v) => changeStatus(v, item.key)" @change="(v) => changeStatus(v, item.key)"
/> />
</span> </span>