WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UAT修改

Browse Source
This commit is contained in:
zyx.net
2023-06-09 15:19:17 +08:00
parent 0cf8c9c58f
commit 12d84e2d90
6 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1847,4 +1847,5 @@ module.exports = {
approvalcycle:'Approval cycle(day)',
transittime:'Transit Time',
returntime:'Return time',
operationguide:'Project operation guide',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1948,4 +1948,5 @@ module.exports = {
approvalcycle:'审批周期(天)',
transittime:'通过时间',
returntime:'退回时间',
operationguide:'项目操作指南',
}
jero-web/src/components/tools/UserMenu.vue
+26 -6
View File
@@ -31,13 +31,30 @@
<!-- <a-icon type="question-circle-o"></a-icon>-->
<!-- </a>-->
<!-- </span>-->
<div class="action" @click="Jumpflybook">
<span class="header-notice">
<a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">
<a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
</a-tooltip>
<!-- <div class="action" @click="Jumpflybook">-->
<!-- <span class="header-notice">-->
<!-- <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">-->
<!-- <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>-->
<!-- </a-tooltip>-->
<!-- </span>-->
<!-- </div>-->
<a-dropdown>
<span class="action action-full ant-dropdown-link user-dropdown-menu">
<!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
<!-- <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>-->
<a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
</span>
</div>
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
<a-menu-item key="5" @click="Jumpflybook">
<!-- <a-icon type="logout"/>-->
<span>{{$t('userManual')}}</span>
</a-menu-item>
<a-menu-item key="6" @click="Jumpoperationguide">
<!-- <a-icon type="logout"/>-->
<span>{{$t('operationguide')}}</span>
</a-menu-item>
</a-menu>
</a-dropdown>
<header-notice class="action"/>
<div class="action">
<span v-show="localeval=='zh-cn'">
@@ -217,6 +234,9 @@
Jumpflybook(){
window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank');
},
Jumpoperationguide(){
window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
},
/* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
...mapActions(['Logout']),
...mapGetters(['username', 'avatar', 'userInfo']),
jero-web/src/views/parameter/managementdetails/index.vue
+32
View File
@@ -71,6 +71,38 @@
v-model="formInline.sdtName"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('NareaOfResponsibility')">
<span>{{$t('NareaOfResponsibility')}}</span>
</div>
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('Required')">
<span>{{$t('Required')}}</span>
</div>
<!-- <j-multi-select-tag class="box-input" v-model="formInline.isMust"-->
<!-- :placeholder="$t('PleaseSelect')+$t('Required')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'duty_territory'"/>-->
<!-- <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Required')"-->
<!-- v-model="formInline.isMust"></a-input>-->
<a-select class="box-input" v-model="formInline.isMust" :placeholder="$t('PleaseSelect')+$t('Required')">
<a-select-option :value="'0'">
{{$t('yes')}}
</a-select-option>
<a-select-option :value="'1'">
{{$t('notOnlyRz')}}
</a-select-option>
</a-select>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+12 -12
View File
@@ -67,25 +67,25 @@
<!-- </a-col>-->
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('certificationCategory')">
<span>{{$t('certificationCategory')}}</span>
<div class="title-text" :title="$t('NareaOfResponsibility')">
<span>{{$t('NareaOfResponsibility')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="formInline.certCategory"
:placeholder="$t('PleaseSelect')+$t('certificationCategory')"
:type="'select'"
:triggerChange="false" :dictCode="'cert_category'"/>
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('NareaOfResponsibility')">
<span>{{$t('NareaOfResponsibility')}}</span>
<div class="title-text" :title="$t('certificationCategory')">
<span>{{$t('certificationCategory')}}</span>
</div>
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
<j-dict-select-tag class="box-input" v-model="formInline.certCategory"
:placeholder="$t('PleaseSelect')+$t('certificationCategory')"
:type="'select'"
:triggerChange="false" :dictCode="'cert_category'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
+1
View File
@@ -165,6 +165,7 @@
this.title = val.name
this.projectQuery = val
this.getEchart()
console.log(this.projectQuery.name)
if (this.projectQuery.name == this.$t('certificationSubmission') || this.projectQuery.name == this.$t('certificationEnd')) {
this.$nextTick(() => {
this.num = '0'