Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java

@@ -352,7 +352,9 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 				for (int i = 0; i < geOrderNumList.size(); i++) {
 					if (geOrderNumList.size() == 1 || (geOrderNumList.size()==2 && geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() == 1)) {
 						break;
-					} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
+					} else if(i+1 >= geOrderNumList.size()){
+						break;
+					}else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
 						int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
 						geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
 						if(geOrderNumList.size()!=(i+1)) {
@@ -404,6 +406,8 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 					for (int i = 0; i < geOrderNumList.size(); i++) {
 						if (geOrderNumList.size() == 1 || (geOrderNumList.size() == 2 && geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() == 1)) {
 							break;
+						}else if(i+1 >= geOrderNumList.size()){
+							break;
 						} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
 							int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
 							geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java

@@ -82,6 +82,8 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
                 for (int i = 0; i < geOrderNumList.size(); i++) {
                     if (geOrderNumList.size() == 1) {
                         break;
+                    }else if(i+1 >= geOrderNumList.size()){
+                        break;
                     } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
                         int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
                         geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
@@ -105,35 +107,35 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
                     .eq("dict_id", sysDictItem.getDictId())
                     .eq("is_tag_dict", sysDictItem.getIsTagDict())
                     .orderByAsc("sort_order");
-            if (list(queryWrapper).size() > 0) {
-                Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId()))
-                        .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
-                queryWrapper.eq("sort_order", inputOrderNum);
-                Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
-                if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1
-                    //设置排序
-                    QueryWrapper<SysDictItem> orderNumQueryWrapper = new QueryWrapper<>();
-                    orderNumQueryWrapper.ge("sort_order", inputOrderNum)
-                            .eq("dict_id", sysDictItem.getDictId())
-                            .eq("del_flag", CommonConstant.DEL_FLAG_0)
-                            .eq("is_tag_dict", sysDictItem.getIsTagDict())
-                            .orderByAsc("sort_order");
-                    List<SysDictItem> geOrderNumList = list(orderNumQueryWrapper);
 
-                    //判断相邻的序号,去掉不邻的
+            Integer orderNumData = getById(sysDictItem.getId()).getSortOrder();
-                    for (int i = 0; i < geOrderNumList.size(); i++) {
+            queryWrapper.eq("sort_order", inputOrderNum);
-                        if (geOrderNumList.size() == 1) {
+            Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
-                            break;
+            if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1
-                        } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
+                //设置排序
-                            int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
+                QueryWrapper<SysDictItem> orderNumQueryWrapper = new QueryWrapper<>();
-                            geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
+                orderNumQueryWrapper.ge("sort_order", inputOrderNum)
-                            break;
+                        .eq("dict_id", sysDictItem.getDictId())
-                        }
+                        .eq("del_flag", CommonConstant.DEL_FLAG_0)
+                        .eq("is_tag_dict", sysDictItem.getIsTagDict())
+                        .orderByAsc("sort_order");
+                List<SysDictItem> geOrderNumList = list(orderNumQueryWrapper);
+
+                //判断相邻的序号,去掉不邻的
+                for (int i = 0; i < geOrderNumList.size(); i++) {
+                    if (geOrderNumList.size() == 1) {
+                        break;
+                    }else if(i+1 >= geOrderNumList.size()){
+                        break;
+                    } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
+                        int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
+                        geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
+                        break;
                     }
-
-                    geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
-                    saveOrUpdateBatch(geOrderNumList);
                 }
+
+                geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
+                saveOrUpdateBatch(geOrderNumList);
             }
         }
     }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -455,6 +455,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 			//查询展示顺序相同的
 			QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
+					.eq("is_tag_dict", sysDict.getIsTagDict())
 					.orderByAsc("order_num");
 			queryWrapper.eq("order_num", inputOrderNum);
 			Integer orderNumCount = sysDictMapper.selectCount(queryWrapper);
@@ -470,6 +471,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 				for (int i = 0; i < geOrderNumList.size(); i++) {
 					if (geOrderNumList.size() == 1) {
 						break;
+					}else if(i+1 >= geOrderNumList.size()){
+						break;
 					} else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) {
 						int deleteStart = geOrderNumList.get(i + 1).getOrderNum();
 						geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList());
@@ -490,8 +493,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 			//查询展示顺序相同的
 			QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
+					.eq("is_tag_dict", sysDict.getIsTagDict())
 					.orderByAsc("order_num");
-			Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDict.getId()))
+			List<SysDict> dataList = list(queryWrapper);
+			Integer orderNumData = dataList.stream().filter(e -> e.getId().equals(sysDict.getId()))
 					.map(e -> e.getOrderNum()).collect(Collectors.toList()).get(0);
 			queryWrapper.eq("order_num", inputOrderNum);
 			Integer orderNumCount = sysDictMapper.selectCount(queryWrapper);
@@ -507,7 +512,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 				for (int i = 0; i < geOrderNumList.size(); i++) {
 					if (geOrderNumList.size() == 1) {
 						break;
-					} else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) {
+					} else if(i+1 >= geOrderNumList.size()){
+						break;
+					}else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) {
 						int deleteStart = geOrderNumList.get(i + 1).getOrderNum();
 						geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList());
 						break;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3012,7 +3012,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //        List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
         //订阅技术领域发消息
         List<DomainUserRel> domainUserRelList = domainManageService.list();
+        List<String> thirdIdListAll = new ArrayList<>();
+        List<String> userListAll = new ArrayList<>();
         List<String> thirdIdList = new ArrayList<>();
+        List<String> userList = new ArrayList<>();
         String technologyTerritoryNameEn = "";
         if(StringUtils.isNotBlank(technologyTerritory) && !technologyTerritory.equals(technologyTerritoryNew) && domainUserRelList.size() != 0){
             List<DomainUserRel> collect = domainUserRelList.stream()
@@ -3025,6 +3028,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     List<SysUser> sysUsersFeishu = this.sysUserMapper.selectBatchIds(userIdList);
                     if(sysUsersFeishu.size() != 0){
                         thirdIdList = sysUsersFeishu.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+                        userList = sysUsersFeishu.stream().map(SysUser::getId).collect(Collectors.toList());
+                        if(thirdIdList.size() != 0){
+                            thirdIdListAll.addAll(thirdIdList);
+                        }
+                        if(userList.size() != 0){
+                            userListAll.addAll(userList);
+                        }
                     }
                 }
                 if(domainIdList.size() != 0){
@@ -3060,25 +3070,33 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(sysUsers)) {
                     userIdListUpdate = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
                     userIdListUpdateFeishu = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+                    if(userIdListUpdate.size() != 0){
+                        userListAll.addAll(userIdListUpdate);
+                    }
+                    if(userIdListUpdateFeishu.size() != 0){
+                        thirdIdListAll.addAll(userIdListUpdateFeishu);
+                    }
                 }
             }
         }
 
         //飞书消息
-        if(thirdIdList.size() != 0){
+        if(thirdIdListAll.size() != 0){
+            thirdIdListAll = thirdIdListAll.stream().distinct().collect(Collectors.toList());
             try {
                 String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
                         category + " " + serialNumber+" has been updated.";
                 //跳转文档详情
                 String url = backUrl + "/docManage/library/detail?id=" + id;
-                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url);
+                iFeishuService.batchSendMessage(thirdIdListAll.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url);
             } catch (IOException e) {
                 log.error("文档新增飞书消息推送失败");
             }
         }
 
         //站内消息
-        if(CollectionUtils.isNotEmpty(userIdListUpdate)){
+        if(CollectionUtils.isNotEmpty(userListAll)){
+            userListAll = userListAll.stream().distinct().collect(Collectors.toList());
             String title = (String) map.get("title");
             String href = "<a href='/docManage/library/detail?id=" + id +
                     "&title=" + title +
@@ -3090,20 +3108,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 String content = "In the "+serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, content, contentInfo);
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userListAll, content, contentInfo);
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
             //订阅文档的飞书消息
-            try {
+//            try {
-                String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
+//                String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
-                        category + " " + serialNumber+" has been updated.";
+//                        category + " " + serialNumber+" has been updated.";
-                //跳转文档详情
+//                //跳转文档详情
-                String url = backUrl + "/docManage/library/detail?id=" + id;
+//                String url = backUrl + "/docManage/library/detail?id=" + id;
-                iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url);
+//                iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url);
-            } catch (IOException e) {
+//            } catch (IOException e) {
-                log.error("文档新增飞书消息推送失败");
+//                log.error("文档新增飞书消息推送失败");
-            }
+//            }
         }
 //        }
         //2. 处理修改代替标准的发送消息(法规负责人)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -545,7 +545,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			}
 
 			Row rowExplain = sheet.createRow(1);
-			short height = (short) (7 * 252);
+			short height = (short) (7 * 200);
 			rowExplain.setHeight((short) height);
 			Cell cell = rowExplain.createCell(0);
 			cell.setCellValue(explain);
@@ -653,7 +653,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			}
 
 			Row rowExplain = sheet.createRow(1);
-			short height = (short) (7 * 252);
+			short height = (short) (7 * 200);
 			rowExplain.setHeight((short) height);
 			Cell cell = rowExplain.createCell(0);
 			cell.setCellValue(explain);
@@ -761,13 +761,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 									}
 								}
 							}
-						}else if(i!=1 && columHeadNos != 5) {
+						}/*else if(i!=1 && columHeadNos != 5) {
 							if (CutEnum.CN.getValue().equals(cut)) {
 								throw new JeroBootException("导入的列数不对,请按照模板格式填写内容");
 							} else {
 								throw new JeroBootException("The number of imported columns is wrong. Please fill in the contents according to the template format.");
 							}
-						}
+						}*/
 					}else{
 						if (CutEnum.CN.getValue().equals(cut)) {
 							throw new JeroBootException("导入的数据不能为空,请检查");
@@ -814,18 +814,18 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
 							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
 							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						}else if(StringUtils.isBlank(lawEngineerName) || StringUtils.isBlank(engineeringInterfacePersonName) || StringUtils.isBlank(certificationEngineerName)) {
+						}else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
 							//除了责任领域,其他的可以全为空->可以
 							projectRelatedPersonnel.setLawEngineerName("");
 							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
 							projectRelatedPersonnel.setCertificationEngineerName("");
-						}/*else {//除了责任领域,备注,有一个为空都报错
+						}else {//除了责任领域,备注,有一个为空都报错
 							if(CutEnum.CN.getValue().equals(cut)){
-								throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行");
+								throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
 							}else{
-								throw new JeroBootException("Please fill in the required fields marked with * .Please check  line" + (i+1));
+								throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check  line" + (i+1));
 							}
-						}*/
+						}
 
 						//导入的备注为数字,被识别成小数点后一位
 						Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java

@@ -86,6 +86,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 				for(int i = 0 ; i < geOrderNumList.size() ; i++) {
 					if (geOrderNumList.size() == 1){
 						break;
+					}else if(i+1 >= geOrderNumList.size()){
+						break;
 					}else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) {
 						int deleteStart = geOrderNumList.get(i+1).getOrderNum();
 						geOrderNumList = geOrderNumList.stream().filter(e->e.getOrderNum() < deleteStart).collect(Collectors.toList());
@@ -178,6 +180,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 			for(int i = 0 ; i < geOrderNumList.size() ; i++) {
 				if (geOrderNumList.size()==1){
 					break;
+				}else if(i+1 >= geOrderNumList.size()){
+					break;
 				}else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) {
 					int deleteStart = geOrderNumList.get(i+1).getOrderNum();
 						geOrderNumList = geOrderNumList.stream().filter(e->e.getOrderNum() < deleteStart).collect(Collectors.toList());

jero-web/src/api/manage.js

@@ -1,6 +1,9 @@
 import Vue from 'vue'
 import { axios } from '@/utils/request'
+import store from '@/store'
 import JLoadingOne from '../components/jero/JLoadingOne'
+import { Modal } from 'ant-design-vue'
+import { ACCESS_TOKEN, TENANT_ID } from '@/store/mutation-types'
 
 const showDrawer = {}
 
@@ -153,29 +156,61 @@ export function downloadFile(url, fileName, parameter, callback) {
     isTrue: isTrue
   })
   return downFile(url, parameter).then((data) => {
-    console.log(data)
+    let fileReader = new FileReader()
-    if (!data || data.size === 0) {
+    fileReader.onload = function(event) {
-      Vue.prototype['$message'].warning('文件下载失败')
+      try {
-      return
+        let jsonData = JSON.parse(event.target.result)
+        if (jsonData.message.includes('token')) {
+          index.showDrawer({
+            loading: false,
+            isTrue: isTrue
+          })
+          Modal.error({
+            title: '登录已过期',
+            content: '很抱歉，登录已过期，请重新登录',
+            okText: '重新登录',
+            mask: false,
+            onOk: () => {
+              store.dispatch('Logout').then(() => {
+                Vue.ls.remove(ACCESS_TOKEN)
+                try {
+                  let path = window.document.location.pathname
+                  if (path != '/' && path.indexOf('/user/login') == -1) {
+                    window.location.reload()
+                  }
+                } catch (e) {
+                  window.location.reload()
+                }
+              })
+            }
+          })
+        }
+      } catch (e) {
+        if (!data || data.size === 0) {
+          Vue.prototype['$message'].warning('文件下载失败')
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data]), fileName)
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data]))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName)
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        }
+        index.showDrawer({
+          loading: false,
+          isTrue: isTrue
+        })
+        callback && callback()
+      }
     }
-    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+    fileReader.readAsText(data)
-      window.navigator.msSaveBlob(new Blob([data]), fileName)
-    } else {
-      let url = window.URL.createObjectURL(new Blob([data]))
-      let link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', fileName)
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link) //下载完成移除元素
-      window.URL.revokeObjectURL(url) //释放掉blob对象
-    }
-    index.showDrawer({
-      loading: false,
-      isTrue: isTrue
-    })
-    callback && callback()
   })
 }
 

jero-web/src/common/lang/en-us.js

@@ -712,6 +712,13 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  chinese: 'chinese',
+  integerOrDecimal: 'integer Or Decimal',
+  OneDecimalPlace: 'One Decimal Place',
+  TwoDecimalplaces: 'Two Decimal places',
+  Threedecimalplaces: 'Threedecimalplaces',
+  FourDecimalplaces: 'FourDecimalplaces',
+  Positivefloatingpointnumber: 'Positive floating point number',
   oneconfigurationInformation: 'Contains at least one configuration information',
   Correspondingstandarddeleted: 'Correspondingstandarddeleted',
   changeTheTitle: 'Title already exists, please change the title',

jero-web/src/common/lang/zh-cn.js

@@ -723,6 +723,13 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  chinese: '中文',
+  integerOrDecimal: '整数或小数',
+  OneDecimalPlace: '一位小数',
+  TwoDecimalplaces: '两位小数',
+  Threedecimalplaces: '三位小数',
+  FourDecimalplaces:'四位小数',
+  Positivefloatingpointnumber: '正浮点数',
   oneconfigurationInformation: '至少含有一个配置信息',
   Correspondingstandarddeleted: '对应标准已删除',
   changeTheTitle: '标题已存在，请更换标题',

jero-web/src/components/AssignedBy/index.vue

@@ -138,8 +138,14 @@ export default {
         pageSize: this.pageSize,
         ...this.form
       }
+      if(this.form.username !== undefined) {
+        this.form.username = `*${this.form.username}*`
+      }
       getAction(`sys/user/page`, params).then(res => {
         if (res.success) {
+          if(this.form.username !== undefined) {
+            this.form.username = this.form.username.slice(1,this.form.username.length-1)
+          }
           this.areaTable = [...res.result.records]
           this.total = res.result.total
         }

jero-web/src/components/CollectionType/index.vue

@@ -4,23 +4,93 @@
 <!--      纯文本-->
       <div v-if='detailDate.controlType === "1"'>
         <div v-for='(item,index) in detailDate.list' :key='index'>
-          <div v-if='item.type==="text"' class='add-width'>
+          <div v-if='item.type==="text"'>
-<!--            文本校验  分情况-->
+            <!--            文本校验  分情况-->
-<!--            1 无-->
+            <!--            1 无-->
-<!--            2 中文-->
+            <!--            2 中文-->
-<!--            3 正整数-->
+            <!--            3 正整数-->
-<!--            4 政府点数-->
+            <!--            4 政府点数-->
-<!--            5 证书或小数-->
+            <!--            5 证书或小数-->
-<!--            6 一位小数-->
+            <!--            6 一位小数-->
-<!--            7 两位小数-->
+            <!--            7 两位小数-->
-<!--            8 三位小数-->
+            <!--            8 三位小数-->
-<!--            9 四为小数-->
+            <!--            9 四为小数-->
-            <div v-if="item.controlVerify == '3'"></div>
+            <!--           无 -->
-            <a-input-number class="box-input inputWid"
+            <div v-if="item.controlVerify == '1'">
-                     :disabled="item.isLock == '1' ? true: false"
+              <a-input class="box-input inputWid"
-                     :max="99999"
+                       :disabled="item.isLock == '1' ? true: false"
-                     :step="0"
+                       :placeholder="$t('pleaseEnter')"
-                     v-model="item.dataValue" />
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                              :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
         </div>
       </div>
@@ -76,20 +146,186 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"' class='add-width'>
+          <div v-if='item.type==="text"'>
-            <a-input class="box-input inputWid"
+            <!--            文本校验  分情况-->
-                     :disabled="item.isLock == '1' ? true: false"
+            <!--            1 无-->
-                     v-model="item.dataValue" />
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
         </div>
       </div>
 <!--      文本+下拉多选-->
       <div v-if='detailDate.controlType === "6"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="text"' class='add-width'>
+          <div v-if='item.type==="text"'>
-            <a-input class="box-input inputWid"
+            <!--            文本校验  分情况-->
-                     :disabled="item.isLock == '1' ? true: false"
+            <!--            1 无-->
-                     v-model="item.dataValue" />
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
           <div v-if='item.type==="pull_more"' class='add-width'>
             <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
@@ -105,10 +341,93 @@
 <!--      文本+附件-->
       <div v-if='detailDate.controlType === "7"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="text"' class='add-width'>
+          <div v-if='item.type==="text"'>
-            <a-input class="box-input inputWid"
+            <!--            文本校验  分情况-->
-                     :disabled="item.isLock == '1' ? true: false"
+            <!--            1 无-->
-                     v-model="item.dataValue"/>
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
           <div v-if='item.type==="file"' class='add-width'>
             <a-button type="primary" class="button-text inputWid"
@@ -186,39 +505,80 @@
             <!--            7 两位小数-->
             <!--            8 三位小数-->
             <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
             <div v-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue" />
             </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
             <div v-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
                               v-model="item.dataValue" />
             </div>
+            <!--            两位小数-->
             <div v-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
                               v-model="item.dataValue" />
             </div>
+            <!--            三位小数-->
             <div v-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
                               v-model="item.dataValue" />
             </div>
+            <!--            四位小数-->
             <div v-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
                               v-model="item.dataValue" />
             </div>
           </div>
@@ -358,4 +718,7 @@ export default {
 .add-width{
   width: 30%;
 }
+/deep/.ant-table-column-sort .ant-table-row-cell-ellipsis{
+  text-align: left;
+}
 </style>

jero-web/src/mixins/JeroListMixin.js

@@ -81,6 +81,7 @@ export const JeroListMixin = {
       if (arg === 1) {
         this.ipagination.current = 1;
       }
+
       var params = this.getQueryParams();//查询条件
       this.loading = true;
       getAction(this.url.list, params).then((res) => {
@@ -123,6 +124,7 @@ export const JeroListMixin = {
         sqp['superQueryParams']=encodeURI(this.superQueryParams)
         sqp['superQueryMatchType'] = this.superQueryMatchType
       }
+      console.log(this.queryParam,'this.queryParam')
       var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
       param.field = this.getQueryField();
       param.pageNo = this.ipagination.current;

jero-web/src/views/documentManage/tags/tabs/TagItem.vue

@@ -18,7 +18,7 @@
               <span>{{$t('ChineseName')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ChineseName')"
-                     v-model="queryParamOne.dbFieldTxt"></a-input>
+                     v-model="queryParamTwo.dbFieldTxt"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8" v-show='submitKey=="1"'>

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -10,7 +10,7 @@
         </span>
       </div>
       <div class="Virtual-detail-right">
-        <div @click="UpdateLogClick" class="operator-text-text" style="margin-right: 37px;cursor: pointer"
+        <div @click="UpdateLogClick" v-has="'dummyLog:page'" class="operator-text-text" style="margin-right: 37px;cursor: pointer"
              :title="$t('UpdateLog')">
           <a-icon type="reload"/>
           {{$t('UpdateLog')}}

jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue

@@ -96,7 +96,7 @@
     data() {
       return {
         title: this.$t('projectDetails'),
-        textTitle: '认证参数收集',
+        textTitle: this.$t('TaskParameterCollection'),
         isDisplayNum: '',
         areaOfResponsibility: {},
         url: {

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -95,7 +95,7 @@
       return {
         title: this.$t('projectDetails'),
         isDisplayNum: '',
-        textTitle: '项目详情',
+        textTitle: this.$t('projectDetails'),
         url: {
           logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: '',
@@ -133,18 +133,22 @@
           textColor[0].classList.remove('Virtual-detail-left-text-color')
         }
         let text = document.getElementsByClassName('Virtual-detail-left-text')
-        if (text && text.length > 0) {
+        if (name == 0) {
-          for (let i = 0; i < text.length; i++) {
+          text[name].classList.add('Virtual-detail-left-text-color')
-            if (text[i].title == name) {
+        } else {
-              text[i].classList.add('Virtual-detail-left-text-color')
+          if (text && text.length > 0) {
-            } else if (text[i].title == name) {
+            for (let i = 0; i < text.length; i++) {
-              text[i].classList.add('Virtual-detail-left-text-color')
+              if (text[i].title == name) {
-            } else if (text[i].title == name) {
+                text[i].classList.add('Virtual-detail-left-text-color')
-              text[i].classList.add('Virtual-detail-left-text-color')
+              } else if (text[i].title == name) {
-            } else if (text[i].title == name) {
+                text[i].classList.add('Virtual-detail-left-text-color')
-              text[i].classList.add('Virtual-detail-left-text-color')
+              } else if (text[i].title == name) {
-            } else if (text[i].title == name) {
+                text[i].classList.add('Virtual-detail-left-text-color')
-              text[i].classList.add('Virtual-detail-left-text-color')
+              } else if (text[i].title == name) {
+                text[i].classList.add('Virtual-detail-left-text-color')
+              } else if (text[i].title == name) {
+                text[i].classList.add('Virtual-detail-left-text-color')
+              }
             }
           }
         }

jero-web/src/views/projectManagement/dialog/configure.vue

@@ -16,6 +16,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('configurationName')">{{$t('configurationName')}}</span>
                   </div>
@@ -30,6 +31,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                     <span class="title-text-text" :title="$t('Version')">{{$t('Version')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="nioNumber">
@@ -45,6 +47,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('Model')">{{$t('Model')}}</span>
                   </div>
@@ -59,6 +62,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                     <span class="title-text-text" :title="$t('Battery')">{{$t('Battery')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="nioNumber">
@@ -74,6 +78,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('electricMachinery')">{{$t('electricMachinery')}}</span>
                   </div>