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

jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue

@@ -241,10 +241,10 @@ export default {
       })
     },
     addClick(index){
-      if(this.formInline.dataList.length + 1 > 10){
-        this.$message.warning(this.$t('nomorethan'))
-        return
-      }
+      // if(this.formInline.dataList.length + 1 > 10){
+      //   this.$message.warning(this.$t('nomorethan'))
+      //   return
+      // }
       this.formInline.dataList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue

@@ -60,8 +60,8 @@
         <span slot="differentialupgradeornot" slot-scope="text,record" :max-length="50">
 <!--        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>-->
           <a-radio-group v-model="record.sfcfsj">
-            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            <a-radio :value="'1'"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="'2'"> {{ $t('not') }} </a-radio>
           </a-radio-group>
       </span>
       <!--      操作列-->

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

@@ -247,7 +247,7 @@
               {{$t('Assignedby')}}
             </div>
             <!--      导出-->
-            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt"'>
+            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin"'>
               <a-icon type="export"/>
               {{$t('dataExport')}}
             </div>