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

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -18,3 +18,7 @@ ALTER TABLE `laws_weilai`.`params_manifest`
 ADD COLUMN `project_version` varchar(255) NULL COMMENT '相关项目版本' AFTER `params_template_name`,
 ADD COLUMN `explanation` varchar(2000) NULL COMMENT '说明' AFTER `project_version`;
 
+-- 项目库修改认证软件版本字段长度---------2022-11-01  未同步生产环境
+ALTER TABLE `laws_weilai`.`project_library_base`
+MODIFY COLUMN `software_version` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '软件版本' AFTER `explanation`;
+

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -3837,7 +3837,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	private Map<String, Object> validatePull(String configName, String controlValues, String value, String mustInput, Boolean isSingle, String cut) {
 		String errorMsg = "";
 		int countError= 0;
-		List<String> controlValueList = Arrays.asList(controlValues.split(","));
+		List<String> controlValueList = Arrays.asList(controlValues.replaceAll("，", ",").split(","));
 		Map<String, Object> resultMap = new HashMap<>();
 //		StringBuilder newValue = new StringBuilder();
 
@@ -3854,7 +3854,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		if (StringUtils.isNotEmpty(value)) {
 			//判断是否是单选
 			if (isSingle) {
-				if (StringUtils.isNotBlank(value) && value.contains(",")) {
+				if (StringUtils.isNotBlank(value) && (value.contains("！") ||value.contains("!"))) {
 					if (CutEnum.CN.getValue().equals(cut)) {
 						errorMsg += configName + "为单选项；";
 					} else {

jero-web/src/views/projectManagement/components/projectStatus.vue

@@ -1,11 +1,15 @@
 <template>
   <a-card :bordered="false">
     <div class="table-operator" style="margin-bottom: 10px">
-      <div @click="versionStatisticsClick" v-if="!this.$route.query.parentId"
+      <div @click="versionStatisticsClick"
+           v-if="!this.$route.query.parentId && $t('Parametercollection')!= activeKey"
            class="operator-text">
         <a-icon type="plus"/>
         {{$t('versionStatistics')}}
       </div>
+      <div v-else
+           class="operator-text">
+      </div>
     </div>
     <a-tabs v-model="activeKey" class="ant-tabs">
       <a-tab-pane :key="$t('CurrentStatusOfTheProject')" :tab="$t('CurrentStatusOfTheProject')">
@@ -22,7 +26,7 @@
                                      v-if="activeKey == $t('CertificationProgress')"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('Parametercollection')" :tab="$t('Parametercollection')">
-        <ParameterCollectionEchart @currentStatus="currentStatus" :idList="idList"
+        <ParameterCollectionEchart @currentStatus="currentStatus" :idList="[]"
                                    v-if="activeKey == $t('Parametercollection')"/>
       </a-tab-pane>
     </a-tabs>