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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
高嵩
2023-03-29 14:21:25 +08:00
parent ef570e5ddd 4d57ad1ffb
commit e16487da36
87 changed files with 1152 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+1 -1
View File
@@ -233,5 +233,5 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
* @param cut
* @return
*/
List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result);
List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+43 -13
View File
@@ -349,7 +349,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectCertificationInventoryEOList.add(projectCertificationInventoryEO);
}
// 处理提示信息， 类别+检验项目+配置项+编号+责任领域 作为唯一检验
List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result);
List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId);
if(CollectionUtils.isNotEmpty(saveDataList)){
this.saveBatch(saveDataList);
@@ -499,10 +499,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
* @param result
*/
@Override
public List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result) {
public List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId) {
List<ProjectCertificationInventoryEO> pciSaveList = new ArrayList<>();
List<ProjectCertificationInventoryEO> allDataList = this.list();
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectCertificationInventoryEO> allDataList = this.list(pciQueryWrap);
// 重复数据数组
List<ProjectCertificationInventoryEO> duplicateDataList = allDataList.stream().filter(data -> {
boolean flag = false;
@@ -2299,7 +2301,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
// queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
@@ -2388,16 +2390,44 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(!ObjectUtils.isEmpty(certifycationInventoryListByDutyPersonMap) && CollectionUtils.isNotEmpty(dutyPersonList)){
for (Map.Entry<String, List<ProjectCertificationInventoryEO>> map : certifycationInventoryListByDutyPersonMap.entrySet()) {
String key = map.getKey();
List<ProjectCertificationInventoryEO> value = map.getValue();
List<String> userIdList = Arrays.asList(key.split(","));
// 给责任人发消息
this.sendMessageByTemplateId(
value,
TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
userIdList,
dutyPersonList
);
// 任务待确认状态的数据：发送认证任务确认的催办消息
List<ProjectCertificationInventoryEO> toBeConfirmedPciEoList = map.getValue().stream().filter(pciEo -> {
boolean flag = false;
if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(toBeConfirmedPciEoList)) {
// 给责任人发消息
this.sendMessageByTemplateId(
toBeConfirmedPciEoList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE16.getValue(),
userIdList,
dutyPersonList
);
}
List<ProjectCertificationInventoryEO> toBeSubmitOrReturnPciEoList = map.getValue().stream().filter(pciEo -> {
boolean flag = false;
if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(toBeSubmitOrReturnPciEoList)) {
// 给责任人发消息
this.sendMessageByTemplateId(
toBeSubmitOrReturnPciEoList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
userIdList,
dutyPersonList
);
}
/*// 待提交数据 单独发消息
List<ProjectCertificationInventoryEO> toBeSubmitDataList = value.stream().filter(v -> {
@@ -2636,7 +2666,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
}
List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result);
List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId);
this.saveBatch(saveDataList);
Date now = new Date();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+8 -8
View File
@@ -1117,7 +1117,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())){
projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{
queryWrapper.eq("regulation_owner_id",currentUser.getId()).
or().eq("homologation_engineer_id",currentUser.getId());
or().eq("engineering_interface_person",currentUser.getId()).
or().eq("design_duty_id",currentUser.getId()).
or().eq("verify_duty_id",currentUser.getId());
});
}
List<ProjectLawsInventoryEO> result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper);
@@ -9931,8 +9933,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
|| lawEngineerNameList.contains(loginUser.getUsername())){
if(lawEngineerNameList.contains(loginUser.getUsername())){
SysRole sysRole = new SysRole();
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
@@ -9942,7 +9943,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
sysRoles.add(sysRole);
}
List<String> certificationEngineerList = new ArrayList<>();
/*List<String> certificationEngineerList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){
for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName();
@@ -9962,7 +9963,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
}
sysRoles.add(sysRole);
}
}*/
List<String> engineeringInterfacePersonList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){
@@ -9970,12 +9971,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
if(StringUtils.isNotBlank(engineeringInterfacePerson)){
engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ","");
certificationEngineerList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
engineeringInterfacePersonList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
}
}
}
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
|| engineeringInterfacePersonList.contains(loginUser.getUsername())){
if(engineeringInterfacePersonList.contains(loginUser.getUsername())){
SysRole sysRole = new SysRole();
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+1
View File
@@ -19,6 +19,7 @@
<sql id="BaseQuerySql">
<where>
and project_name is not null
<if test="params.projectName != null and params.projectName !=''">
and (
temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
jero-web/src/common/lang/en-us.js
+5
View File
@@ -1734,4 +1734,9 @@ module.exports = {
gnxtwh:'Functional system maintenance',
gnxt:'Functional system',
dykzq:'Corresponding controller',
releaseRegulatoryList:'Release of regulatory list',
preHomoFlow:'Pre-Homo flow',
verifyConformanceConfirmation:'Verify conformance confirmation',
designConformanceVerification:'Design conformance verification',
nomorethan:'No more than 10',
}
jero-web/src/common/lang/zh-cn.js
+5
View File
@@ -1836,4 +1836,9 @@ module.exports = {
gnxtwh:'功能系统维护',
gnxt:'功能系统',
dykzq:'对应控制器',
releaseRegulatoryList:'法规清单发布',
preHomoFlow:'Pre-Homo流程',
verifyConformanceConfirmation:'验证符合性确认',
designConformanceVerification:'设计符合性确认',
nomorethan:'不能超过10个',
}
jero-web/src/components/AssignedBy/index.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-form-model-item>
</a-col>
<a-col :span='6' style='margin-top: 5px;'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</a-col>
</a-row>
</a-form-model>
jero-web/src/components/AssignedByHomo/index.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-form-model-item>
</a-col>
<a-col :span='6' style='margin-top: 5px;'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</a-col>
</a-row>
</a-form-model>
jero-web/src/components/ParameterLibraryAdd/index.vue
+2 -2
View File
@@ -46,8 +46,8 @@
<a-col :md="12" :sm="8">
<span style="float: right;overflow: hidden;margin-right: 16px;margin-bottom: 20px"
class="table-page-search-submitButtons">
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</span>
</a-col>
jero-web/src/components/SplitSearch/index.vue
+5 -5
View File
@@ -138,12 +138,12 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a @click="handleToggleSearch" v-if="searchList.length > 3">
<span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
<span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/components/currencySearch/index.vue
+6 -6
View File
@@ -135,12 +135,12 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px"
class="table-page-search-submitButtons">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a @click="handleToggleSearch" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</span>
</a-row>
</a-form>
jero-web/src/components/globalAdvancedQuery/index.vue
+3 -3
View File
@@ -11,15 +11,15 @@
<a @click="handleReset">{{$t('empty')}}</a>
</template>
<a-button-group>
<a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginRight:${MarginRight?MarginRight:"8px"}`'>
<a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginLeft:${MarginRight?MarginRight:"8px"}`'>
<!-- <a-icon type="appstore" theme="twoTone" spin/>-->
<a-icon type="filter" theme="filled"/>
<span>{{$t('advancedQuery')}}</span>
</a-button>
<a-button style="margin-right: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
<a-button style="margin-left: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
</a-button-group>
</a-tooltip>
<a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginRight:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
<a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginLeft:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
</slot>
<j-modal
:title="$t('advancedQuery')"
jero-web/src/components/search/index.vue
+3 -3
View File
@@ -174,12 +174,12 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
<a @click="handleToggleSearch" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/components/searchaloneorcfile/index.vue
+5 -5
View File
@@ -138,12 +138,12 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="4" :sm="24" style='display: flex'>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a @click="handleToggleSearch" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/components/searchalonesplit/index.vue
+6 -6
View File
@@ -138,12 +138,12 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a @click="handleToggleSearch" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/components/searchalonetext/index.vue
+5 -5
View File
@@ -138,12 +138,12 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="9" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a @click="handleToggleSearch" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+6 -6
View File
@@ -45,15 +45,15 @@
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+8 -8
View File
@@ -45,15 +45,15 @@
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
</a-col>
</span>
</a-row>
jero-web/src/views/dashboard/customContentList.vue
+2 -2
View File
@@ -17,8 +17,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
jero-web/src/views/documentManage/collection/index.vue
+2 -2
View File
@@ -40,8 +40,8 @@
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentManage/subscribtion/index.vue
+2 -2
View File
@@ -39,8 +39,8 @@
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+2 -1
View File
@@ -9,8 +9,8 @@
</a-form-item>
</a-form>
<div class="form-btn">
<a-button class="form-btn-search" type="primary" @click="search">{{$t('query')}}</a-button>
<a-button class="form-btn-reset" @click="reset">{{$t('reset')}}</a-button>
<a-button class="form-btn-search" type="primary" @click="search">{{$t('query')}}</a-button>
</div>
</div>
<div class="table-operator">
@@ -561,6 +561,7 @@
.form-btn {
.form-btn-search {
margin-left: 8px;
margin-right: 10px;
}
}
jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+2 -2
View File
@@ -14,8 +14,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+2 -2
View File
@@ -33,8 +33,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
+4 -6
View File
@@ -35,9 +35,8 @@
</a-col>
<span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="8" :sm="24">
<a-button class="box-button" type="primary" @click="searchQueryLeft">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchResetLeft">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchResetLeft">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQueryLeft">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
@@ -90,9 +89,8 @@
</a-col>
<span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="8" :sm="24">
<a-button class="box-button" type="primary" @click="searchQueryRight">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchResetRight">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchResetRight">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQueryRight">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/documentComparison/index.vue
+1 -1
View File
@@ -34,8 +34,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
+4 -4
View File
@@ -34,12 +34,12 @@
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/documentTranslation/index.vue
+5 -5
View File
@@ -47,12 +47,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+2 -3
View File
@@ -61,9 +61,8 @@
</div>
</div>
<div class="table-page-search-submitButtons submitButtons">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}
</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</div>
</div>
<div class="text-right">
jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+2 -3
View File
@@ -29,9 +29,8 @@
</div>
</div>
<div class="table-page-search-submitButtons submitButtons">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}
</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</div>
</div>
<div class="text-right">
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+6 -6
View File
@@ -45,15 +45,15 @@
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/virtualList/components/transferList.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+7 -7
View File
@@ -94,15 +94,15 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
</a-col>
</span>
</a-row>
jero-web/src/views/documentTools/virtualList/index.vue
+2 -2
View File
@@ -25,8 +25,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+93 -23
View File
@@ -28,7 +28,7 @@
>
<span slot="detailText" slot-scope="text,record">
<span class="text" :title="text">
{{text && text.length > 10?text.slice(0,9)+'...':text}}
{{text && text.length > 100?text.slice(0,99)+'...':text}}
</span>
</span>
<span slot="operation" slot-scope="text,record">
@@ -58,7 +58,7 @@
</div>
</a-drawer>
<a-modal
:title="$t('newlyAdded')"
:title="title"
:width="600"
:visible="visibleadd"
:confirm-loading="confirmLoading"
@@ -66,7 +66,7 @@
@ok="handleaddOk"
@cancel="handleaddCancel"
>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm" style='margin-left: -40px'>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
@@ -75,32 +75,37 @@
<span class="title-text-text" :title="$t('gnxt')">
{{$t('gnxt')}}</span>
</div>
<a-form-model-item class="itemModel" prop="bazt">
<a-form-model-item class="itemModel" prop="gnxt">
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('gnxt')"
style='width: 80%;'
v-model="formInline.gnxt"></a-input>
</a-form-model-item>
</div>
</a-col>
<div v-for="(item,index) in formInline.dataList" :key="index">
<div class="header-text">
{{$t('dykzq')}}
<a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
<a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
type="minus-circle" :disabled="disabled"/>
</div>
<div style='margin-left: 25px'>
<a-row :gutter="24">
<div style='margin-left: 26px'>
<a-row :gutter="24" style='height:0px'>
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('dykzq') + (index+1)">{{$t('dykzq') + (index+1)}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.dykzq'"
:rules="[{ required: true, message: $t('dykzq') + $t('cannotEmpty'), trigger: 'blur'},
{max: 50,message: $t('relevantSections') + $t('cannotExceed') + 50 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
v-model="item.dykzq"
style='width: 87%;'
:placeholder="$t('PleaseEnter')+$t('dykzq')"/>
</a-form-model-item>
<div class="header-text">
<a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
<a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
type="minus-circle" :disabled="disabled"/>
</div>
</div>
</a-col>
</a-row>
@@ -115,7 +120,7 @@
</template>
<script>
import { getAction, postAction ,deleteAction } from '@/api/manage'
import { getAction, postAction ,deleteAction, putAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
import { mapGetters } from 'vuex'
@@ -128,6 +133,7 @@ export default {
return {
loading: false,
dataSourcehistory:[],
title:'',
columnshistory: [
{
title: this.$t('gnxt'),
@@ -142,18 +148,34 @@ export default {
dataIndex: 'dykzq',
align: 'left',
ellipsis: true,
width: 100,
scopedSlots: { customRender: 'detailText' }
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 220,
width: 100,
scopedSlots: { customRender: 'operation' }
}
],
rules:[],
rules: {
gnxt: [
{
required: true,
message: this.$t('gnxt') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{max: 50,message: this.$t('relevantSections') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur'
}
],
// dykzq: [
// {
// required: true,
// message: this.$t('dykzq') + this.$t('cannotEmpty'),
// trigger: 'blur'
// }
// ],
},
pageSizehistory: 10,
total: 0,
pageNohistory: 1,
@@ -161,7 +183,14 @@ export default {
visibleadd: false,
disabled: false,
showButton:false,
formInline: {},
formInline: {
dataList:[
{
dykzq:'',
}
],
gnxt:''
},
confirmLoading: false,
acceptcode:'',
projectNameList: [],
@@ -169,7 +198,9 @@ export default {
url:{
addModel:''
},
record:{}
record:{},
type:'',
id:'',
}
},
mounted() {
@@ -182,13 +213,37 @@ export default {
this.bussLogList()
},
addHandleClick(){
this.title = this.$t('add')
this.type = 'add'
this.visibleadd = true
this.formInline.gnxt = ''
this.id = ''
this.formInline.dataList = [{}]
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
},
editClick(){
editClick(item){
this.title = this.$t('edit')
this.type = 'edit'
this.formInline.gnxt = item.gnxt
this.id = item.id
let List = item.dykzq.split(',')
let arr = []
List.forEach((item,index)=>{
arr.push({dykzq:List[index]})
})
this.formInline.dataList = arr
this.visibleadd = true
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
},
addClick(index){
if(this.formInline.dataList.length + 1 > 10){
this.$message.warning(this.$t('nomorethan'))
return
}
this.formInline.dataList.splice(index + 1, 0, {})
this.formInline = { ...this.formInline }
},
@@ -209,13 +264,23 @@ export default {
dykzqList.push(item.dykzq)
})
this.formInline.dykzq = dykzqList.join(',')
let url = ''
let action = ''
if(this.type == 'add'){
url = 'ota/otaBaSjGnxtwh/add'
action = postAction
}else{
url = 'ota/otaBaSjGnxtwh/edit'
action = putAction
}
this.$refs.ruleForm.validate(valid => {
if (valid) {
let query = {
...this.formInline
...this.formInline,
id:this.id
}
this.confirmLoading = true
postAction('ota/otaBaSjGnxtwh/add', query).then((res) => {
action(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visibleadd = false
@@ -231,6 +296,7 @@ export default {
},
handleaddCancel() {
this.visibleadd = false
this.formInline = {}
},
onChangehistory(page, pageSize) {
this.pageNohistory = page
@@ -320,6 +386,10 @@ export default {
}
.header-text {
position: relative;
top: 11px;
left: -70px;
width: 55px;
font-size: 16px;
font-weight: 500;
}
jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue
+10 -2
View File
@@ -152,6 +152,7 @@
</div>
<a-form-model-item class="itemModel" prop="VINcodelist">
<a-button type="primary" class="button-text"
:disabled="disabled"
@click="clickButtonToUpload('ssjlfj')">
{{ (formInline.ssjlfj === 'null' || formInline.ssjlfj === '' ||
formInline.ssjlfj == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -243,10 +244,17 @@ export default {
this.showButton=true
}
this.record=record
this.visible = true
this.confirmLoading = false
console.log('555',record);
console.log('555',record);
getAction('/ota/otaBaSjJssj/queryByOtaId',{otaId:this.record.id}).then(res=>{
if(res.code==200){
this.formInline=res.result ==null? {list:[{}]} :res.result
if(res.result.list==null ||res.result.list.length==0){
this.formInline.list=[{}]
}
}
})
this.$nextTick(() => {
this.formInline = { ...this.formInline }
this.$refs.ruleForm.clearValidate()
jero-web/src/views/otamanagement/upgradeactivity/index.vue
+11 -10
View File
@@ -78,12 +78,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
@@ -147,11 +147,11 @@
@click="detailclick(record)">{{$t('See')}}</a>
<a class="text-operation"
@click="maintenanceClick(record)">{{$t('maintenance')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '0')" v-if="!record.onShow">{{$t('endUpgrade')}}</a>
@click="endUpgrade(record , '0')" v-if="record.sjzt==0 && record.bazt=='4'">{{$t('endUpgrade')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '1')" v-if="record.onShow">{{$t('upgradecompletion')}}</a>
@click="endUpgrade(record , '1')" v-if="record.sjzt==1">{{$t('upgradecompletion')}}</a>
<a class="text-operation"
@click="handleExport(record)">{{$t('export')}}</a>
<a class="text-operation"
@@ -201,7 +201,8 @@ export default {
//url传参严格按照当前命名
url: {
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch'
deleteBatch: '/ota/otaBaSjList/delete'
},
visible: false,
loading: false,
@@ -388,7 +389,7 @@ export default {
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
@@ -488,7 +489,7 @@ export default {
downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
},
addModelList(record){
record.onShow=true
record.sjzt=1
this.$forceUpdate()
}
}
jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+14 -4
View File
@@ -32,7 +32,7 @@
<a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span>
<span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
</span>
<span slot="functionalchangedescription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :title='record.gnbgms' :max-length="500"></a-input>
@@ -87,7 +87,9 @@ export default {
return {
dataSource: [
{
sjqbgcs:'不涉及',
sjhbgcs:'不涉及',
sjsjkzq:'ADC ADAS主控制器'
}
],
fileList:'',
@@ -219,7 +221,11 @@ export default {
otaId=''
}
getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
this.dataSource =res.result.list == null ? [{}] : res.result.list
this.dataSource =res.result.list == null ? [ {
sjqbgcs:'不涉及',
sjhbgcs:'不涉及',
sjsjkzq:'ADC ADAS主控制器'
}] : res.result.list
this.fileList = res.result.fj
})
},
@@ -276,7 +282,11 @@ export default {
this.$emit('beupgradedonlinedown')
},
addlineAtBot(){
let obj={}
let obj= {
sjqbgcs:'不涉及',
sjhbgcs:'不涉及',
sjsjkzq:'ADC ADAS主控制器'
}
this.dataSource.push(obj)
},
deleteData(record){
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+10 -2
View File
@@ -90,6 +90,8 @@ export default {
return {
dataSource: [
{
sjqbgcs:'不涉及',
sjhbgcs:'不涉及'
}
],
loading: false,
@@ -285,7 +287,10 @@ export default {
otaId=''
}
getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
this.dataSource =res.result.list == null ? [{}] : res.result.list
this.dataSource =res.result.list == null ? [ {
sjqbgcs:'不涉及',
sjhbgcs:'不涉及'
}] : res.result.list
})
},
save(){
@@ -317,7 +322,10 @@ export default {
this.$emit('upgradedonlinedown')
},
addlineAtBot(){
let obj={}
let obj= {
sjqbgcs:'不涉及',
sjhbgcs:'不涉及'
}
this.dataSource.push(obj)
},
deleteData(record){
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue
+541
View File
@@ -0,0 +1,541 @@
<template>
<!-- 第三页 -->
<div class="box">
<div class="table-operator">
<div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div>
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
</div>
<a-layout style='margin-bottom: 48px;'>
<a-layout style='height: 60px'>
<a-layout-sider style='border: black solid 1px;'>
<span class='sider-span1'>{{$t('upgradePurpose')}}</span>
</a-layout-sider>
<a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;'>
<j-multi-select-tag class="box-input"
v-model="form.sjmd"
@change="update"
:disabled="disable"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:dictCode="'uipgrade_purpose'"
:triggerChange="false"/>
</a-layout-content>
</a-layout>
<a-layout>
<a-layout-sider style='border: black solid 1px;border-top: none;border-bottom: none'>
<span class='sider-span'>{{$t('impactassessmentofupgradeactivities')}}</span>
</a-layout-sider>
<a-layout-content style='max-width: 522px'>
<span class='content-text' :title="$t('correspondingvehicletype')">{{$t('correspondingvehicletype')}}</span>
<span class='content-text' :title="$t('technicalperformancechanges')">{{$t('technicalperformancechanges')}}</span>
<span class='content-text' :title="$t('technicalstandardsandsafetytechnicalconditions')">{{$t('technicalstandardsandsafetytechnicalconditions')}}</span>
<span class='content-text' :title="$t('autoautonomousdrivingfunction')">{{$t('autoautonomousdrivingfunction')}}</span>
</a-layout-content>
<a-layout-content style='width: 5.5%'>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
</a-layout-content>
<a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
<a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
@click="clickButtonToUpload('bgfj')">
{{ (form.bgfj === 'null' || form.bgfj === '' ||
form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
}}
</a-button>
<span class="spanone">{{$t('notetwo')}}</span>
<span class="spanone">{{$t('format')}}</span>
</a-layout-content>
</a-layout>
<div class='box-layout'>
<div class='layout-box'>
<span class='box-text' :title="$t('vehiclepriortothereleaseoftheupgrade')">{{$t('vehiclepriortothereleaseoftheupgrade')}}</span>
<span class='box-text' :title="$t('conditionsareupgradesperformed')">{{$t('conditionsareupgradesperformed')}}</span>
<span class='box-text' :title="$t('upgradefailureorinterruption')">{{$t('upgradefailureorinterruption')}}</span>
<span class='box-text' :title="$t('upgradeactivitiesaffectvehiclesafety')">{{$t('upgradeactivitiesaffectvehiclesafety')}}</span>
<span class='box-text' :title="$t('upgradeactivityprovidesuserconfirmationoptions')">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</span>
<span class='box-text' :title="$t('upgradepackagetest')">{{$t('upgradepackagetest')}}</span>
<span class='box-text' style='border-bottom: black solid 1px' :title="$t('reliabilityofonlineupgradeactivities')">{{$t('reliabilityofonlineupgradeactivities')}}</span>
</div>
<div class='layout-box-second'>
<span class='box-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='box-text'>
<j-dict-select-tag class="box-input"
style='margin-top: 2px'
:disabled="disable"
v-model="form.zxsj"
:placeholder="$t('PleaseSelect')"
:type="'select'"
dictCode="conditions_upgrades"
:triggerChange="false"/>
</span>
<span class='box-text'>
<j-multi-select-tag class="box-input"
v-model="form.aqjz"
style='margin-top: 2px'
:disabled="disable"
dictCode="upgrade_failed"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:triggerChange="false"/>
</span>
<span class='box-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='box-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='box-text'>
<j-multi-select-tag class="box-input"
style='margin-top: 2px'
:disabled="disable"
v-model="form.sjbcs"
:placeholder="$t('PleaseSelect')"
dictCode="package_test"
:type="'select'"
:triggerChange="false"/>
</span>
<span class='box-text' style='border-bottom: black solid 1px'>
<a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
</div>
<div class='layout-box-three'>
<a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
@click="clickButtonToUpload('clfj')">
{{ (form.clfj === 'null' || form.clfj === '' ||
form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
}}
</a-button>
<span class="spanone">{{$t('notethree')}}</span>
<span class="spanone">{{$t('format')}}</span>
</div>
</div>
</a-layout>
<div class="bootom-button">
<a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
<a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
<a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
</div>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
<script>
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'beupgradedonline',
components:{
uploadFile,
ImportFile
},
data() {
return {
dataSource: [
{
key:1,
functionname:'ceshi',
}
],
url: {
exportData: '/ota/otaBaSjSjyxpg/exportData',
importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入
},
loading: false,
disable:false,
columns: [
{
title: this.$t('systemname'),
align: 'left',
dataIndex: 'systemname',
ellipsis: true,
width: 170
},
{
title: this.$t('adjustmentofchangedBulletinparameters'),
align: 'left',
dataIndex: 'adjustmentofchangedBulletinparameters',
ellipsis: true,
width: 170,
children: [
{
title: this.$t('preupgrade'),
align: 'left',
dataIndex: 'preupgrade',
scopedSlots: { customRender: 'preupgrade' },
ellipsis: true,
width: 170
},
{
title: this.$t('afterupgrade'),
align: 'left',
dataIndex: 'afterupgrade',
scopedSlots: { customRender: 'afterupgrade' },
ellipsis: true,
width: 170
},
]
},
{
title: this.$t('controllerparameter'),
align: 'left',
dataIndex: 'controllerparameter',
ellipsis: true,
width: 170,
children: [
{
title: this.$t('nameoftheupgradedelectroniccontroller'),
align: 'left',
dataIndex: 'nameoftheupgradedelectroniccontroller',
ellipsis: true,
width: 170
},
{
title: this.$t('adaptivehardwareversion'),
align: 'left',
dataIndex: 'adaptivehardwareversion',
ellipsis: true,
width: 170
},
{
title: this.$t('beforethesoftwareversionupgraded'),
align: 'left',
dataIndex: 'beforethesoftwareversionupgraded',
ellipsis: true,
width: 170
},
{
title: this.$t('afterthesoftwareversionupgraded'),
align: 'left',
dataIndex: 'afterthesoftwareversionupgraded',
ellipsis: true,
width: 170
},
{
title: this.$t('beforetheOSversionupgraded'),
align: 'left',
dataIndex: 'beforetheOSversionupgraded',
ellipsis: true,
width: 170
},
{
title: this.$t('aftertheoperatingsystemversionupgraded'),
align: 'left',
dataIndex: 'aftertheoperatingsystemversionupgraded',
ellipsis: true,
width: 170
},
{
title: this.$t('softwablackevelopmententerprise'),
align: 'left',
dataIndex: 'softwablackevelopmententerprise',
ellipsis: true,
width: 170
},
{
title: this.$t('initialpackageforintegrityinflammatorydata'),
align: 'left',
dataIndex: 'initialpackageforintegrityinflammatorydata',
ellipsis: true,
width: 170
},
{
title: this.$t('upgradepackageintegrityverificationdata'),
align: 'left',
dataIndex: 'upgradepackageintegrityverificationdata',
ellipsis: true,
width: 170
},
{
title: this.$t('upgradepackagesize'),
align: 'left',
dataIndex: 'upgradepackagesize',
ellipsis: true,
width: 170
},
{
title: this.$t('differentialupgradeornot'),
align: 'left',
dataIndex: 'differentialupgradeornot',
ellipsis: true,
width: 170
},
]
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
}
],
form:{
sjmd:'',
fhgd:1,
zdjsxg:2,
sfyxaq:2,
yhqr:1,
aqkkx:1,
zxsj:2,
aqjz:'2',
sjbcs:'3,4'
}
}
},
mounted() {
// this.getList()
this.getData()
},
methods: {
update(){
this.$forceUpdate()
},
// 模板下载
handleModule() {
downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级影响评估' + '.zip', {})
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.form[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
uploadSuccess(data) {
let attIdList = []
if(data && data.length>0){
data.map(item => {
attIdList.push(item.id || data.name)
})
/** 赋值给当前对应的表单文件 */
this.form[this.uploadName] = attIdList.join(',')
this.form = { ...this.form }
// console.log('form',this.formInline)
}else{
this.form[this.uploadName] = ''
this.form = { ...this.form }
// console.log('form',this.formInline)
}
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
let otaId=localStorage.getItem('otaId')
if(otaId==null){
otaId=''
}
getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code==200){
this.form=res.result==null ? {
sjmd:'',
fhgd:1,
zdjsxg:2,
sfyxaq:2,
yhqr:1,
aqkkx:1,
zxsj:2,
aqjz:'2',
sjbcs:'3,4'
} : res.result
}
})
},
save(){
let otaId = localStorage.getItem('otaId')
if(otaId == null || otaId == undefined){
otaId=''
}
this.form.otaId=otaId
postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
},
last(){
this.save()
this.$emit('safetyPrecautionsup')
},
next(){
this.save()
this.$emit('safetyPrecautionsdown')
},
}
}
</script>
<style lang='less' scoped>
@import '~@assets/less/common.less';
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.bootom-button{
text-align: center!important;
}
.text-operation{
margin-right: 8px;
}
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 10px;
margin-left: 40px;
}
::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
white-space: pre-wrap!important;
}
#components-layout-demo-basic {
text-align: center;
}
::v-deep .ant-layout-footer {
line-height: 1.5;
}
::v-deep .ant-layout-sider {
line-height: 50px;
background: white;
}
::v-deep .ant-layout-content {
min-height: 60px;
line-height: 20px;
}
//::v-deep > .ant-layout {
// margin-bottom: 48px;
//}
::v-deep > .ant-layout:last-child {
margin: 0;
}
.content-text{
display: inline-block;
width: 100%;
height: 50px;
border: black solid 1px;
border-left: none;
border-bottom: none;
vertical-align: top;
overflow: hidden; /*超出部分隐藏*/
// text-overflow: ellipsis; /*超出部分省略号表示*/
white-space: wrap;
display: flex;
// justify-content: center;
align-items: center;
line-height: 1.3;
}
//::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{
// min-width: 723px !important;
// mmax-width: 723px !important;
// width: 723px !important;
// flex: 0 0 200px;
//}
.box-layout{
display: flex;
//justify-content: space-between;
}
.layout-box{
width: 721px;
height:350px;
}
.layout-box-second{
max-width: 425.859px;
width:32.5%;
height:350px;
}
.layout-box-three{
border: black solid 1px;
max-width: 427.859px;
min-width: 227.859px;
width: 427.859px;
height:350px;
}
.box-text{
display: inline-block;
width: 100%;
height: 50px;
line-height: 1.3;
border: black solid 1px;
vertical-align: top;
border-right: none;
border-bottom: none;
overflow: hidden; /*超出部分隐藏*/
// text-overflow: ellipsis; /*超出部分省略号表示*/
white-space: wrap;
display: flex;
// justify-content: center;
align-items: center;
}
.sider-span{
display: inline-block;
width: 100%;
height: 50px;
margin-top: 74px;
}
.sider-span1{
display: inline-block;
width: 100%;
height: 50px;
margin-top: 8px;
}
.spanone{
white-space: pre-wrap;
padding: 0 45px;
display: flex;
}
</style>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+133 -126
View File
@@ -10,59 +10,30 @@
{{$t('templateDownload')}}
</div>
</div>
<a-layout style='margin-bottom: 48px;'>
<a-layout style='height: 60px'>
<a-layout-sider style='border: black solid 1px;'>
<span class='sider-span1'>{{$t('upgradePurpose')}}</span>
</a-layout-sider>
<a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;'>
<j-multi-select-tag class="box-input"
v-model="form.sjmd"
@change="update"
:disabled="disable"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:dictCode="'uipgrade_purpose'"
:triggerChange="false"/>
</a-layout-content>
</a-layout>
<a-layout>
<a-layout-sider style='border: black solid 1px;border-top: none;border-bottom: none'>
<span class='sider-span'>{{$t('impactassessmentofupgradeactivities')}}</span>
</a-layout-sider>
<a-layout-content style='max-width: 522px'>
<span class='content-text' :title="$t('correspondingvehicletype')">{{$t('correspondingvehicletype')}}</span>
<span class='content-text' :title="$t('technicalperformancechanges')">{{$t('technicalperformancechanges')}}</span>
<span class='content-text' :title="$t('technicalstandardsandsafetytechnicalconditions')">{{$t('technicalstandardsandsafetytechnicalconditions')}}</span>
<span class='content-text' :title="$t('autoautonomousdrivingfunction')">{{$t('autoautonomousdrivingfunction')}}</span>
</a-layout-content>
<a-layout-content style='width: 5.5%'>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='content-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
</a-layout-content>
<a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
<table border="1" cellspacing="0" width='100%'>
<tr>
<td>{{$t('upgradePurpose')}}</td>
<td colspan="3" width="400px">
<j-multi-select-tag class="box-input"
v-model="form.sjmd"
@change="update"
:disabled="disable"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:dictCode="'uipgrade_purpose'"
:triggerChange="false"/>
</td>
</tr>
<tr>
<td rowspan="4" width="150px" align="left">{{$t('impactassessmentofupgradeactivities')}}</td>
<td width="150px" height="50px">{{$t('correspondingvehicletype')}}</td>
<td width="150px" height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
<td rowspan="4" width="150px" align="left">
<a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
@click="clickButtonToUpload('bgfj')">
{{ (form.bgfj === 'null' || form.bgfj === '' ||
@@ -71,86 +42,121 @@
</a-button>
<span class="spanone">{{$t('notetwo')}}</span>
<span class="spanone">{{$t('format')}}</span>
</a-layout-content>
</a-layout>
<div class='box-layout'>
<div class='layout-box'>
<span class='box-text' :title="$t('vehiclepriortothereleaseoftheupgrade')">{{$t('vehiclepriortothereleaseoftheupgrade')}}</span>
<span class='box-text' :title="$t('conditionsareupgradesperformed')">{{$t('conditionsareupgradesperformed')}}</span>
<span class='box-text' :title="$t('upgradefailureorinterruption')">{{$t('upgradefailureorinterruption')}}</span>
<span class='box-text' :title="$t('upgradeactivitiesaffectvehiclesafety')">{{$t('upgradeactivitiesaffectvehiclesafety')}}</span>
<span class='box-text' :title="$t('upgradeactivityprovidesuserconfirmationoptions')">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</span>
<span class='box-text' :title="$t('upgradepackagetest')">{{$t('upgradepackagetest')}}</span>
<span class='box-text' style='border-bottom: black solid 1px' :title="$t('reliabilityofonlineupgradeactivities')">{{$t('reliabilityofonlineupgradeactivities')}}</span>
</div>
<div class='layout-box-second'>
<span class='box-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='box-text'>
<j-dict-select-tag class="box-input"
style='margin-top: 2px'
:disabled="disable"
v-model="form.zxsj"
:placeholder="$t('PleaseSelect')"
:type="'select'"
dictCode="conditions_upgrades"
:triggerChange="false"/>
</span>
<span class='box-text'>
<j-multi-select-tag class="box-input"
v-model="form.aqjz"
style='margin-top: 2px'
:disabled="disable"
dictCode="upgrade_failed"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:triggerChange="false"/>
</span>
<span class='box-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='box-text'>
<a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
<span class='box-text'>
<j-multi-select-tag class="box-input"
style='margin-top: 2px'
:disabled="disable"
v-model="form.sjbcs"
:placeholder="$t('PleaseSelect')"
dictCode="package_test"
:type="'select'"
:triggerChange="false"/>
</span>
<span class='box-text' style='border-bottom: black solid 1px'>
<a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</span>
</div>
<div class='layout-box-three'>
</td>
</tr>
<tr>
<td align="left" height="50px">{{$t('technicalperformancechanges')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
</tr>
<tr>
<td height="50px">{{$t('technicalstandardsandsafetytechnicalconditions')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
</tr>
<tr>
<td align="left" height="50px">{{$t('autoautonomousdrivingfunction')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('vehiclepriortothereleaseoftheupgrade')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
<td rowspan="7" width="150px" align="left">
<a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
@click="clickButtonToUpload('clfj')">
{{ (form.clfj === 'null' || form.clfj === '' ||
form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
}}
</a-button>
<span class="spanone">{{$t('notethree')}}</span>
<span class="spanone">{{$t('notetwo')}}</span>
<span class="spanone">{{$t('format')}}</span>
</div>
</div>
</a-layout>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('conditionsareupgradesperformed')}}</td>
<td height="50px">
<j-dict-select-tag class="box-input"
style='margin-top: 2px'
:disabled="disable"
v-model="form.zxsj"
:placeholder="$t('PleaseSelect')"
:type="'select'"
dictCode="conditions_upgrades"
:triggerChange="false"/>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('upgradefailureorinterruption')}}</td>
<td height="50px">
<j-multi-select-tag class="box-input"
v-model="form.aqjz"
style='margin-top: 2px'
:disabled="disable"
dictCode="upgrade_failed"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:triggerChange="false"/>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('upgradeactivitiesaffectvehiclesafety')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('upgradepackagetest')}}</td>
<td height="50px">
<j-multi-select-tag class="box-input"
style='margin-top: 2px'
:disabled="disable"
v-model="form.sjbcs"
:placeholder="$t('PleaseSelect')"
dictCode="package_test"
:type="'select'"
:triggerChange="false"/>
</td>
</tr>
<tr>
<td colspan="2" align="left" height="50px">{{$t('reliabilityofonlineupgradeactivities')}}</td>
<td height="50px">
<a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
</td>
</tr>
</table>
<div class="bootom-button">
<a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
<a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
@@ -426,6 +432,7 @@ this.$forceUpdate()
.bootom-button{
text-align: center!important;
margin-top: 40px;
}
.text-operation{
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+32 -6
View File
@@ -12,7 +12,7 @@
</div>
<a-spin :spinning="confirmLoading">
<a-form-model class="formAdd" ref="ruleForm">
<a-form-model class="formAdd" ref="ruleForm" :model="form" :rules="rules">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text-add">
@@ -37,11 +37,14 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('upgraderecordnumber')">{{$t('upgraderecordnumber')}}</span>
</div>
<div class="title-text-add-input">
<div style="width:78%">
<!-- <span class="title-text-text">中文</span> -->
<a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')" disabled style="width:93%" :max-length="50"></a-input>
<a-form-model-item prop="babh">
<a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')" style="width:93%" :max-length="50"></a-input>
</a-form-model-item>
</div>
</div>
</a-col>
@@ -60,9 +63,10 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add plus">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-form-model-item class="itemModel" prop="bapc">
<a-select :disabled="disabled" class="box-input" v-model="form.bapc" allowClear :placeholder="$t('PleaseSelect')" @change="changeId">
<a-select-option v-for="(item , key ) in selectListPc" :key="key" :value="item.id" >
{{ item.ggpc }}
@@ -174,6 +178,14 @@ import ImportFile from '@/components/ImportFileData/index'
projectNameList2:[],
selectListPc:[],
selectListMb:[],
rules:{
babh:[
{ required:true,message:this.$t('upgraderecordnumber')+this.$t('cannotEmpty'),trigger:'blur'}
],
bapc:[
{ required:true,message:this.$t('Modelandfunctionrecord')+this.$t('cannotEmpty'),trigger:'change'}
]
}
}
},
mounted() {
@@ -230,17 +242,27 @@ import ImportFile from '@/components/ImportFileData/index'
if(otaId==null){
otaId=''
}
postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{
this.$refs.ruleForm.validate(valid=>{
if(valid){
postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{
if(res.code==200){
localStorage.setItem('otaId', res.result.otaId)
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
}
})
},
next(){
this.save()
this.$emit('basicInformationForm')
this.$refs.ruleForm.validate(valid=>{
if(valid){
this.$emit('basicInformationForm')
}})
},
getSelect(){
getAction('/ota/otaBaCxList/list').then(res=>{
@@ -368,4 +390,8 @@ import ImportFile from '@/components/ImportFileData/index'
margin-top: 5px;
line-height: 1.4 !important;
}
.Required {
color: red;
margin-right: 3px;
}
</style>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+8 -2
View File
@@ -203,7 +203,10 @@ export default {
return {
confirmLoading: false,
disabled: false,
formInline:{},
formInline:{
sjky:'车辆解闭锁功能可用，但不可驾驶',
sjbkygn:'除解闭锁均不可用'
},
url: {
exportData: '/ota/otaBaSjGgnrfs/exportData',
importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入
@@ -255,7 +258,10 @@ export default {
getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code == 200){
this.formInline= res.result ==null ? {} :res.result
this.formInline= res.result ==null ? {
sjky:'车辆解闭锁功能可用，但不可驾驶',
sjbkygn:'除解闭锁均不可用'
} :res.result
this.formInline.id=res.result.id
this.$forceUpdate()
}
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+1 -1
View File
@@ -22,7 +22,7 @@
style="margin-bottom: 20px"
>
<span slot="functionname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnmc" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnmc" :max-length="50"></a-input>
</span>
<!-- 配置情况-->
<span slot="configuration" slot-scope="text,record" >
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+2 -2
View File
@@ -93,7 +93,7 @@
</span>
</div>
<div style='width: 300px'>
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('configuration')}}</span>
<span class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.jgldPz">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
@@ -948,7 +948,7 @@ export default {
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
},
jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+1 -1
View File
@@ -206,7 +206,7 @@ import ImportFile from '@/components/ImportFileData/index'
// this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs)
this.dataSource[2].info= res.result.sjsbcs
this.dataSource[3].info= res.result.xxaqjz
if(res.result.zmclList){
if(res.result.zmclList.length != 0){
this.dataSource[0].certifyingmaterials = this.$t('viewFile')
}
this.fileList.uploadName = res.result.zmclList
jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+1 -1
View File
@@ -228,7 +228,7 @@ export default {
this.dataSource[7].relevantverification=Number(res.result.sjsbaq)
this.dataSource[8].relevantverification=Number(res.result.sjgg)
this.dataSource[9].relevantverification=Number(res.result.sjzt)
if(res.result.zmclList){
if(res.result.zmclList.length != 0){
this.dataSource[0].certifyingmaterials = this.$t('viewFile')
}
this.fileList.uploadName = res.result.zmclList
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+5 -5
View File
@@ -21,7 +21,7 @@
style="margin-bottom: 20px"
>
<span slot="sys" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.xtlb" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.xtlb" :max-length="50"></a-input>
</span>
<!-- 可升级-->
<span slot="systemclass" slot-scope="text,record">
@@ -88,10 +88,10 @@
fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
}}</a-button>
<div style='margin-top: 20px'>
<p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内</p>
<p>{{ $t('note') }}</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('format') }}</p>
</div>
</div>
<div class="bootom-button">
<a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
@@ -463,7 +463,7 @@ import uploadFileOta from '@/components/uploadFileOta/file'
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
}
}
jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+1 -1
View File
@@ -168,7 +168,7 @@ export default {
ids:this.ids
}
this.confirmLoading = true
postAction('ota/otaBaCxList/batchRecord', query).then((res) => {
postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
jero-web/src/views/otamanagement/vehicleregistration/index.vue
+6 -6
View File
@@ -78,12 +78,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
</a-col>
</span>
</a-row>
@@ -374,10 +374,10 @@ export default {
}
})
}
}
}
}
},
// 创建车型
createvehicleandfunctionrecords() {
jero-web/src/views/parameter/ParameterTemplate/index.vue
+2 -2
View File
@@ -25,8 +25,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/parameter/escalationlibrary/index.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/parameter/managementdetails/index.vue
+3 -3
View File
@@ -74,12 +74,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/parameter/parameterexport/index.vue
+2 -2
View File
@@ -25,8 +25,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/parameter/parameterlist/index.vue
+2 -2
View File
@@ -34,8 +34,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+8 -9
View File
@@ -110,16 +110,15 @@
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<!-- v-if="this.$route.query.it === undefined"-->
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/TaskListModel.vue
+4 -3
View File
@@ -255,9 +255,10 @@
let Action
if (this.title == this.$t('CertificationProgress')) {
query = {
id: this.formInline.id,
certificationProgress: this.formInline.certificationProgress,
certificationProgressRemark: this.formInline.certificationProgressRemark
...this.formInline
// id: this.formInline.id,
// certificationProgress: this.formInline.certificationProgress,
// certificationProgressRemark: this.formInline.certificationProgressRemark
}
url = this.url.edit
Action = putAction
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+2 -2
View File
@@ -14,8 +14,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
+2 -2
View File
@@ -24,8 +24,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/certificationList/index.vue
+5 -6
View File
@@ -48,12 +48,11 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
jero-web/src/views/projectManagement/components/listAddModel.vue
+6 -6
View File
@@ -45,15 +45,15 @@
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+5 -6
View File
@@ -79,12 +79,11 @@
<!-- </template>-->
<span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+4 -4
View File
@@ -68,13 +68,13 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px;margin-bottom: 20px"
class="table-page-search-submitButtons">
<a-button class="box-button-search" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button-search" style="margin-left: 8px"
@click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button-search" style="margin-left: 8px"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button-search" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</span>
</a-row>
</a-form>
jero-web/src/views/projectManagement/components/nonConformance.vue
+2 -2
View File
@@ -34,8 +34,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/components/transferList.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
+2 -2
View File
@@ -28,8 +28,8 @@
</a-form-model-item>
</a-col>
<a-col :span='6' style='margin-top: 4px;'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</a-col>
</a-row>
</a-form-model>
jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+2 -2
View File
@@ -136,8 +136,8 @@
<!-- </a-form-model-item>-->
</a-col>
<a-col :span='6' style='margin-top: 5px'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</a-col>
</a-row>
</a-form-model>
jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+2 -2
View File
@@ -84,8 +84,8 @@
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span='11' style="margin-top: 5px">
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</a-col>
</a-row>
</a-form-model>
jero-web/src/views/projectManagement/dialog/parametercolumn.vue
+2 -2
View File
@@ -45,8 +45,8 @@
</div>
</a-col>
<a-col :span='6' style='margin-top: 5px'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</a-col>
</a-row>
</a-form-model>
jero-web/src/views/projectManagement/projectLibrary/index.vue
+3 -3
View File
@@ -102,12 +102,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+3 -3
View File
@@ -130,12 +130,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+2 -2
View File
@@ -80,9 +80,9 @@
</a-col>
<span style="float: right" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
<a-button class="box-button"
@click="searchReset">{{ $t('reset') }}</a-button>
<a-button style="margin-left: 8px" class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+2 -2
View File
@@ -36,9 +36,9 @@
</a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
<a-button class="box-button"
@click="searchReset">{{ $t('reset') }}</a-button>
<a-button style="margin-left: 8px" class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/regulationsKanban/components/addModel.vue
+2 -2
View File
@@ -52,8 +52,8 @@
</a-col>
<a-col :span='8' style='margin-top: 2px;'>
<span style="float: right;margin-right: 8px">
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' @click='searchReset'>{{ $t('reset') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
</span>
</a-col>
</a-row>
jero-web/src/views/regulationsKanban/index.vue
+9 -10
View File
@@ -54,16 +54,15 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
</a-col>
</span>
</a-row>
jero-web/src/views/system/DictList.vue
+2 -2
View File
@@ -34,8 +34,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/system/RoleUserList.vue
+2 -2
View File
@@ -16,8 +16,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/system/UserAnnouncementList.vue
+2 -2
View File
@@ -35,9 +35,9 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
<a-button class="box-button"
@click="searchReset">{{ $t('reset') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
</a-col>
</span>
jero-web/src/views/system/UserList.vue
+3 -3
View File
@@ -81,12 +81,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ toggleSearchStatus ? $t('away') : $t('open') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/system/modules/DeptUserInfo.vue
+2 -2
View File
@@ -12,8 +12,8 @@
</a-col>
<span style="float: left;overflow: hidden;margin-top: 1px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+2 -2
View File
@@ -23,8 +23,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+13 -13
View File
@@ -65,12 +65,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
@@ -124,24 +124,24 @@
},
toggleSearchStatus: false,
taskTypeList: [
// {
// name: this.$t('confirmationOfRegulationsList'),
// value: '10'
// },
{
name: this.$t('confirmationOfRegulationsList'),
name: this.$t('releaseRegulatoryList'),
value: '10'
},
{
name: this.$t('listTaskConfirmation'),
value: '1'
},
{
name: this.$t('designComplianceReview'),
name: this.$t('designConformanceVerification'),
value: '2'
},
{
name: this.$t('preHomeConfirmation'),
value: '3'
name: this.$t('preHomoFlow'),
value: '21'
},
{
name: this.$t('verificationComplianceReview'),
name: this.$t('verifyConformanceConfirmation'),
value: '4'
}
],
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
+2 -2
View File
@@ -34,8 +34,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/virtualAuthenticationList/components/transferList.vue
+4 -4
View File
@@ -24,10 +24,10 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
</span>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
jero-web/src/views/virtualAuthenticationList/index.vue
+2 -2
View File
@@ -25,8 +25,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+4 -5
View File
@@ -82,13 +82,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>