修改禅道bug

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

@@ -95,7 +95,7 @@ module.exports = {
   newUser: 'New User',
   ExistingUsers: 'Existing Users',
   total: 'Total',
-  strip: 'Data',
+  strip: 'Items',
   RoleCode: 'Role Code',
   createTime: 'Creation Time',
   userName: 'User Name',
@@ -276,7 +276,7 @@ module.exports = {
   AggregateRouting: 'Aggregated Route',
   OpenMode: 'Open Mode',
   external: 'External',
-  inside: 'Inside',
+  inside: 'Internal',
   enterMenuTitle: 'Please enter the menu title',
   enterAuthorizationPolicy: 'Please enter authorization policy',
   AuthorizationIDExists: 'Authorization ID already exists',
@@ -610,7 +610,7 @@ module.exports = {
   deliverableTemplate: 'Deliverable Template',
   entryName: 'Project',
   targetMarket: 'Target Market',
-  projectStatus: 'Status',
+  projectStatus: 'Development',
   StudioEngineer: 'R&H Studio',
   CertificationTime: 'Certification Time',
   NTplatform: 'NT Platform',
@@ -686,12 +686,12 @@ module.exports = {
   confirmOverrule: 'Confirm Overrule',
   The: 'The',
   submitted: 'Data has been submitted and cannot be submitted again',
-  basicInformationOfParameters: 'Project Basic Information',
+  basicInformationOfParameters: 'General Info',
   regulatoryCertificationTaskPlan: 'Regulation/Homologation Task Plan',
   bringInRelevantPersonnel: 'Bring In Relevant Personnel',
   confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel',
   problemType: 'Issue Type',
-  projectDetails: 'Project Info',
+  projectDetails: 'Project Details',
   listOfRegulations: 'Regulation List',
   taskList: 'Task List',
   TaskParameterCollection: 'Task Parameter Collection',
@@ -1241,4 +1241,5 @@ module.exports = {
   turnOnAutoMatch:'Turn on auto match',
   Adjustareasofresponsibility:'Adjust areas of responsibility',
   regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
+  punctuationmark:'Only English punctuation marks other than the # sign can be entered',
 }

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

@@ -1344,4 +1344,5 @@ module.exports = {
   turnOnAutoMatch:'打开自动匹配',
   Adjustareasofresponsibility:'调整责任领域',
   regulatoryTechnicalAssessment:'法规技术评估',
+  punctuationmark:'只能输入除#号外的英文标点符号',
 }

jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue

@@ -78,15 +78,15 @@
                 </div>
               </a-col>
             </a-row>
-            <a-row :gutter="24">
+            <a-row :gutter="24" v-if='!required'>
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="Required" v-if='!required'>*</span>
+                    <span class="Required" >*</span>
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="!required?'separator':''">
+                  <a-form-model-item class="itemModel" prop="separator">
 <!--                    :disabled="disabled"-->
                     <a-input class="box-input"
                              v-model="formInline.separator"