合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'

Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!227

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

@@ -29,6 +29,7 @@
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
                        @input="onInput"
+                       :maxLength="1000"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>

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

@@ -27,6 +27,7 @@
               <a-input class="box-input inputWid"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
                        @input="onInput"
+                       :maxLength="1000"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>

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

@@ -926,13 +926,16 @@
         } else if (long && long === 'en-us') {
           this.cut = 'en'
         }
+        console.log(this.formInline)
         let query = {
           paramsManifestId: this.paramsManifest.id,
           cut: this.cut,
+          ...this.formInline,
+          ...this.queryParamQuery,
           ids: this.selectedRowKeys.join(','),
           exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
         }
-        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.xlsx'
         downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear)
       },
       getList(){

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>