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:
wangzhijiang
2023-03-29 14:51:47 +08:00
parent 54cada12c8 6208f59321
commit 3c6f79fbed
78 changed files with 375 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+29 -2
View File
@@ -1,6 +1,7 @@
package com.jero.modules.ota.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,11 +9,13 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.extRepo.entity.ExtRepoData;
import com.jero.modules.ota.entity.OtaBaCxList;
import com.jero.modules.ota.service.IOtaBaCxListService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -57,9 +60,33 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<OtaBaCxList> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<OtaBaCxList> page = new Page<OtaBaCxList>(pageNo, pageSize);
LambdaQueryWrapper<OtaBaCxList> queryWrapper = new LambdaQueryWrapper<>();
// 文件名称模糊查询
String cpdjbh = req.getParameter("cpdjbh");
if (StringUtils.isNotBlank(cpdjbh)) {
cpdjbh = cpdjbh.replace("%", "\\%");
queryWrapper.like(OtaBaCxList::getCpdjbh, cpdjbh);
}
String ggpc = req.getParameter("ggpc");
if (StringUtils.isNotBlank(ggpc)) {
ggpc = ggpc.replace("%", "\\%");
queryWrapper.like(OtaBaCxList::getGgpc, ggpc);
}
String cpsb = req.getParameter("cpsb");
if (StringUtils.isNotBlank(cpsb)) {
cpsb = cpsb.replace("%", "\\%");
queryWrapper.like(OtaBaCxList::getCpsb, cpsb);
}
String cpmc = req.getParameter("cpmc");
if (StringUtils.isNotBlank(cpmc)) {
cpmc = cpmc.replace("%", "\\%");
queryWrapper.like(OtaBaCxList::getCpmc, cpmc);
}
queryWrapper.orderByDesc(OtaBaCxList::getCreateTime);
IPage<OtaBaCxList> pageList = otaBaCxListService.page(page, queryWrapper);
return Result.OK(pageList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+7 -5
View File
@@ -1,5 +1,6 @@
package com.jero.modules.ota.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -176,11 +177,12 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
@AutoLog(value = "升级备案-备案维护")
@ApiOperation(value = "升级备案-备案维护", notes = "升级备案-备案维护")
@PostMapping(value = "/batchRecord")
public Result<?> batchRecord(@RequestParam(name = "ids", required = true) String ids,
@RequestParam(name = "bazt", required = true) String bazt,
@RequestParam(name = "batjsj", required = true) String batjsj,
@RequestParam(name = "bz", required = true) String bz,
@RequestParam(name = "cut") String cut) {
public Result<?> batchRecord(@RequestBody JSONObject json) {
String ids = json.getString("ids");
String bazt = json.getString("bazt");
String batjsj = json.getString("batjsj");
String bz = json.getString("bz");
String cut = json.getString("cut");
otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut);
return Result.OK("备案维护成功!");
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java
+80 -38
View File
@@ -3,6 +3,7 @@ package com.jero.modules.ota.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,105 +22,146 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/**
* @Description: 升级备案-升级活动备案列表
* @Author: jero-boot
* @Date: 2023-03-17
* @Date: 2023-03-17
* @Version: V1.0
*/
@Data
@TableName("ota_ba_sj_list")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="ota_ba_sj_list对象", description="升级备案-升级活动备案列表")
@ApiModel(value = "ota_ba_sj_list对象", description = "升级备案-升级活动备案列表")
public class OtaBaSjList implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
/**
* 创建人
*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
/**
* 更新人
*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
/**
* 所属部门
*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**otaId*/
@Excel(name = "otaId", width = 15)
/**
* otaId
*/
@Excel(name = "otaId", width = 15)
@ApiModelProperty(value = "otaId")
private java.lang.String otaId;
/**产品登记编号*/
@Excel(name = "产品登记编号", width = 15)
/**
* 产品登记编号
*/
@Excel(name = "产品登记编号", width = 15)
@ApiModelProperty(value = "产品登记编号")
private java.lang.String cpdjbh;
/**公告批次*/
@Excel(name = "公告批次", width = 15)
/**
* 公告批次
*/
@Excel(name = "公告批次", width = 15)
@ApiModelProperty(value = "公告批次")
private java.lang.String ggpc;
/**产品商标*/
@Excel(name = "产品商标", width = 15)
/**
* 产品商标
*/
@Excel(name = "产品商标", width = 15)
@ApiModelProperty(value = "产品商标")
private java.lang.String cpsb;
/**产品名称*/
@Excel(name = "产品名称", width = 15)
/**
* 产品名称
*/
@Excel(name = "产品名称", width = 15)
@ApiModelProperty(value = "产品名称")
private java.lang.String cpmc;
/**产品型号*/
@Excel(name = "产品型号", width = 15)
/**
* 产品型号
*/
@Excel(name = "产品型号", width = 15)
@ApiModelProperty(value = "产品型号")
private java.lang.String cpxh;
/**备案状态*/
@Excel(name = "备案状态", width = 15)
/**
* 备案状态
*/
@Excel(name = "备案状态", width = 15)
@ApiModelProperty(value = "备案状态")
@Dict(dicCode = "recordstatus")
private java.lang.String bazt;
/**备案提交时间*/
@Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
/**
* 备案提交时间
*/
@Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "备案提交时间")
private java.util.Date batjsj;
/**创建时间*/
@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
/**
* 创建时间
*/
@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date cjsj;
/**备注*/
@Excel(name = "备注", width = 15)
/**
* 备注
*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String bz;
/**升级驾驶附件*/
/**
* 升级驾驶附件
*/
@Excel(name = "升级驾驶附件", width = 15)
@ApiModelProperty(value = "升级驾驶附件")
private java.lang.String sjjsfj;
/**
* 升级状态(0:升级中;1:升级结束)
*/
@Excel(name = "升级状态", width = 15)
@ApiModelProperty(value = "升级状态")
private java.lang.String sjzt;
public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) {
this.cpdjbh = otaBaSjSjmbcx.getBabh();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
+1 -1
View File
@@ -9,8 +9,8 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl;
import com.jero.modules.ota.mapper.OtaBaCxListMapper;
import com.jero.modules.ota.service.*;
import com.jero.modules.ota.utils.ImportFileUtil;
import com.jero.modules.system.util.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.logging.Log;
import org.apache.ibatis.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java
+25 -10
View File
@@ -2,19 +2,18 @@ package com.jero.modules.ota.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.AttachmentEO;
import com.jero.modules.ota.entity.OtaBaCxAqcs;
import com.jero.modules.ota.entity.OtaBaSjJssj;
import com.jero.modules.ota.entity.OtaBaSjJssjyy;
import com.jero.modules.ota.entity.*;
import com.jero.modules.ota.mapper.OtaBaSjJssjMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjJssjService;
import com.jero.modules.ota.service.IOtaBaSjJssjyyService;
import com.jero.modules.ota.service.IOtaBaSjListService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Date;
@@ -32,6 +31,8 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl<OtaBaSjJssjMapper, OtaBa
@Autowired
private IOtaBaSjJssjyyService otaBaSjJssjyyService;
@Autowired
private IOtaBaSjListService otaBaSjListService;
/**
* 保存
@@ -42,10 +43,23 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl<OtaBaSjJssjMapper, OtaBa
@Override
public void add(OtaBaSjJssj otaBaSjJssj) {
Date now = new Date();
otaBaSjJssj.setCreateTime(now);
if (StringUtils.isEmpty(otaBaSjJssj.getId())) {
otaBaSjJssj.setCreateTime(now);
OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaBaSjJssj.getOtaId());
otaBaSjList.setSjzt("1");
otaBaSjListService.editById(otaBaSjList);
}
otaBaSjJssj.setUpdateTime(now);
save(otaBaSjJssj);
otaBaSjJssjyyService.saveBatch(otaBaSjJssj.getList());
saveOrUpdate(otaBaSjJssj);
otaBaSjJssjyyService.deleteByOtaId(otaBaSjJssj.getOtaId());
if (ObjectUtils.isNotEmpty(otaBaSjJssj.getList())) {
List<OtaBaSjJssjyy> yyList = new ArrayList<>();
for (OtaBaSjJssjyy yy : otaBaSjJssj.getList()) {
yy.setOtaId(otaBaSjJssj.getOtaId());
yyList.add(yy);
}
otaBaSjJssjyyService.saveBatch(yyList);
}
}
/**
@@ -111,9 +125,10 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl<OtaBaSjJssjMapper, OtaBa
LambdaQueryWrapper<OtaBaSjJssj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjJssj::getOtaId, otaId);
OtaBaSjJssj res = this.getOne(queryWrapper, false);
List<OtaBaSjJssjyy> list = otaBaSjJssjyyService.queryByOtaId(otaId);
res.setList(list);
if (ObjectUtils.isNotEmpty(res)) {
List<OtaBaSjJssjyy> list = otaBaSjJssjyyService.queryByOtaId(otaId);
res.setList(list);
}
return res;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+1
View File
@@ -78,6 +78,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
otaBaSjList = new OtaBaSjList();
otaBaSjList.setId(UUID.randomUUID().toString().replace("-", ""));
otaBaSjList.updateData(otaBaSjSjmbcx);
otaBaSjList.setSjzt("0");
otaBaSjListService.add(otaBaSjList);
otaBaSjSjmbcx.setOtaId(otaBaSjList.getId());
otaBaSjSjmbcx.setCreateTime(now);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
oldList = new ArrayList<>();
}
ComparisonUtil cu = new ComparisonUtil();
List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.SJKZQMC.getName(), oldList, newList, sysDictService);
List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.XTMC.getName(), oldList, newList, sysDictService);
saveOrUpdateBatch(newList);
otaBaCxTxjlService.saveBatch(reList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+2 -2
View File
@@ -59,7 +59,7 @@ public class ComparisonUtil<T> {
tableField.setAccessible(true);
String tableFieldStr = "空";
Object tableFieldObj = tableField.get(newObj);
if (ObjectUtils.isNotEmpty(tableFieldStr)) {
if (ObjectUtils.isNotEmpty(tableFieldObj)) {
tableFieldStr = tableFieldObj.toString();
}
String content = "新增了一条'" + tableFieldStr + "'";
@@ -77,7 +77,7 @@ public class ComparisonUtil<T> {
String newStr = "";
if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) {
newStr = parseDictText(ote, field, newObj, sysDictService);
content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'";
content = tableFieldStr + "-" + title + "由'空'改为'" + newStr + "'";
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
}
}
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1739,4 +1739,5 @@ module.exports = {
verifyConformanceConfirmation:'Verify conformance confirmation',
designConformanceVerification:'Design conformance verification',
nomorethan:'No more than 10',
uploadedfilelarger:'The uploaded file is larger than 50 MB',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1841,4 +1841,5 @@ module.exports = {
verifyConformanceConfirmation:'验证符合性确认',
designConformanceVerification:'设计符合性确认',
nomorethan:'不能超过10个',
uploadedfilelarger:'文件大于50M',
}
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/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/components/uploadFile/file.vue
+10 -1
View File
@@ -34,7 +34,7 @@
export default {
name: 'file',
props: ['disableds', 'disabled', 'thisFileUploadUrl','acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
props: ['disableds', 'disabled', 'thisFileUploadUrl','size' ,'acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
data() {
return {
visible: false,
@@ -98,6 +98,15 @@
return false
}
}
// 根据大小拦截
if(this.size){
const isLt2KB = file.size / 1024 /1024 < this.size
let name = file.name
if (!isLt2KB) {
this.$message.error(name + this.$t('uploadedfilelarger'))
return false
}
}
if (this.isMultiple) {
if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
this.$message.warning(this.$t('onlyOnefileUploaded'))
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/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/index.vue
+8 -8
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.sjzt==0 && record.bazt=='4'">{{$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.sjzt==1">{{$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"
@@ -202,7 +202,7 @@ export default {
url: {
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
deleteBatch: '/ota/otaBaSjList/delete'
},
visible: false,
loading: false,
jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+1 -1
View File
@@ -68,7 +68,7 @@
<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>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+1 -1
View File
@@ -83,7 +83,7 @@
}}
</a-button>
<p>{{$t('noteone')}}</p>
<uploadFile ref="uploadFile" :acceptcode="'csv'" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFile ref="uploadFile" :acceptcode="'csv'" :size="20" @uploadSuccess="uploadSuccess"></uploadFile>
</a-form-model-item>
</div>
</a-col>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+1 -1
View File
@@ -162,7 +162,7 @@
<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>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+37 -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,32 @@ 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){
this.selectListPc.map(item=>{
if(item.id==this.form.bapc){
this.form.bapc=item.ggpc
}
})
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 +395,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
+1 -1
View File
@@ -182,7 +182,7 @@
<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>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+1 -1
View File
@@ -103,7 +103,7 @@
<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" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
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
+2 -2
View File
@@ -47,7 +47,7 @@
<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>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
@@ -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
+2 -2
View File
@@ -34,7 +34,7 @@
<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>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
@@ -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
@@ -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>
@@ -99,7 +99,7 @@
<a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
</div>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFileOta ref="uploadFileOta" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccessOta"></uploadFileOta>
<uploadFileOta ref="uploadFileOta" :acceptcode="'doc,docx,pdf'" :size="50" @uploadSuccess="uploadSuccessOta"></uploadFileOta>
</div>
</template>
@@ -463,7 +463,7 @@ import uploadFileOta from '@/components/uploadFileOta/file'
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
}
}
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/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/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/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
+4 -4
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>
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>