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:
chenjianxing 2022-12-14 13:57:22 +08:00 committed by jianxing
parent 5d50db90b6
commit a0ed442219
4 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project-management/frontend/src/business/home/ProjectPlatformConfig.vue
View File

@ -23,8 +23,7 @@
<template> <template>
<img v-if="item.instructionsIcon" <img v-if="item.instructionsIcon"
:src="getPlatformImageUrl(config, item)"/> :src="getPlatformImageUrl(config, item)"/>
<span v-if="item.instructionsTip"> <span v-if="item.instructionsTip" v-html="item.instructionsTip">
{{ item.instructionsTip }}
</span> </span>
</template> </template>
</ms-instructions-icon> </ms-instructions-icon>

10
system-setting/frontend/src/business/workspace/integration/BugManagement.vue
View File

@ -4,14 +4,14 @@
<div>{{ $t('organization.integration.select_defect_platform') }}</div> <div>{{ $t('organization.integration.select_defect_platform') }}</div>
<el-radio-group v-model="platform" style="margin-top: 10px"> <el-radio-group v-model="platform" style="margin-top: 10px">
<span v-for="config in platformConfigs" :key="config.key"> <span v-for="config in platformConfigs" :key="config.key">
<el-radio :label="config.label"> <el-radio :label="config.label" class="platform-radio">
<img class="platform" :src="getPlatformImageUrl(config)" :alt="config.label"/> <img class="platform" :src="getPlatformImageUrl(config)" :alt="config.label"/>
</el-radio> </el-radio>
</span> </span>
<el-radio label="Tapd"> <el-radio label="Tapd" class="platform-radio">
<img class="platform" src="/assets/tapd.png" alt="Tapd"/> <img class="platform" src="/assets/tapd.png" alt="Tapd"/>
</el-radio> </el-radio>
<el-radio label="AzureDevops" v-xpack> <el-radio label="AzureDevops" class="platform-radio" v-xpack>
<img class="platform" src="/assets/AzureDevops.png" alt="AzureDevops"/> <img class="platform" src="/assets/AzureDevops.png" alt="AzureDevops"/>
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
@ -81,4 +81,8 @@ export default {
height: 80px; height: 80px;
vertical-align: middle vertical-align: middle
} }
.platform-radio {
margin-left: 20px;
}
</style> </style>

47
system-setting/frontend/src/business/workspace/integration/PlatformConfig.vue
View File

@ -34,31 +34,27 @@
:show.sync="show" :show.sync="show"
ref="bugBtn"/> ref="bugBtn"/>
<div class="defect-tip" v-html="config.tips"> <div class="defect-tip" >
<!-- todo 处理跳转逻辑 --> <div>{{ $t('organization.integration.use_tip') }}</div>
<!-- {{config.tips}}--> <div v-html="config.tips"></div>
<!-- <div>{{ $t('organization.integration.use_tip') }}</div>--> <div>
<!-- <div>--> {{ $t('organization.integration.use_tip_two') }}
<!-- 1. {{ $t('organization.integration.use_tip_jira') }}--> <router-link to="/setting/project/all"
<!-- </div>--> style="margin-left: 5px;color: #551A8B; text-decoration: underline; cursor: pointer">
<!-- <div>--> {{ $t('organization.integration.link_the_project_now') }}
<!-- 2. {{ $t('organization.integration.use_tip_two') }}--> </router-link>
<!-- <router-link to="/setting/project/all"--> </div>
<!-- style="margin-left: 5px;color: #551A8B; text-decoration: underline; cursor: pointer">--> <div>
<!-- {{ $t('organization.integration.link_the_project_now') }}--> {{ $t('organization.integration.use_tip_three') }}
<!-- </router-link>--> <span style="margin-left: 5px;color: #551A8B; text-decoration: underline; cursor: pointer"
<!-- </div>--> @click="resVisible = true">
<!-- <div>--> {{ $t('organization.integration.link_the_info_now') }}
<!-- 3. {{ $t('organization.integration.use_tip_three') }}--> </span>
<!-- <span style="margin-left: 5px;color: #551A8B; text-decoration: underline; cursor: pointer"--> <el-dialog :close-on-click-modal="false" width="80%"
<!-- @click="resVisible = true">--> :visible.sync="resVisible" destroy-on-close @close="closeDialog">
<!-- {{ $t('organization.integration.link_the_info_now') }}--> <ms-person-router @closeDialog="closeDialog"/>
<!-- </span>--> </el-dialog>
<!-- <el-dialog :close-on-click-modal="false" width="80%"--> </div>
<!-- :visible.sync="resVisible" destroy-on-close @close="closeDialog">-->
<!-- <ms-person-router @closeDialog="closeDialog"/>-->
<!-- </el-dialog>-->
<!-- </div>-->
</div> </div>
</div> </div>
</template> </template>
@ -205,6 +201,7 @@ export default {
margin: 10px 0; margin: 10px 0;
padding: 10px; padding: 10px;
border-radius: 3px; border-radius: 3px;
line-height: 25px;
} }
.el-input { .el-input {

3
system-setting/frontend/src/business/workspace/project/ProjectPlatformConfig.vue
View File

@ -23,8 +23,7 @@
<template> <template>
<img v-if="item.instructionsIcon" <img v-if="item.instructionsIcon"
:src="getPlatformImageUrl(config, item)"/> :src="getPlatformImageUrl(config, item)"/>
<span v-if="item.instructionsTip"> <span v-if="item.instructionsTip" v-html="item.instructionsTip">
{{ item.instructionsTip }}
</span> </span>
</template> </template>
</ms-instructions-icon> </ms-instructions-icon>