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

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

@@ -43,18 +43,13 @@
       <span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record">
           <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjsjkzq"></a-input>
       </span>
-      <span slot="functiondescription" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnbgms"></a-input>
-      </span>
-      <span slot="applicationconditions" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg"></a-input>
-      </span>
+    
    
  
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation" @click="addlineAtBot">{{$t('add')}}</a>
-          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+          <a class="text-operation" @click="deleteData(record)" v-if="dataSource.length > 1">{{$t('delete')}}</a>
       </span>
     </a-table>
     <div>
@@ -155,23 +150,6 @@ export default {
           width: 170,
           scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' },
         },
-        {
-          title: this.$t('functiondescription'),
-          align: 'left',
-          dataIndex: 'functiondescription',
-          ellipsis: true,
-          width: 170,
-          scopedSlots: { customRender: 'functiondescription' },
-        },
-        {
-          title: this.$t('applicationconditions'),
-          align: 'left',
-          dataIndex: 'applicationconditions',
-          ellipsis: true,
-          width: 170,
-          scopedSlots: { customRender: 'applicationconditions' },
-        },
-      
         {
           title: this.$t('operation'),
           align: 'left',

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

@@ -79,6 +79,7 @@
                                 formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                                 }}
                               </a-button>
+                              <p>支持cxv格式，大下20M以内，数量1-10个</p>
                               <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
                             </a-form-model-item>
             </div>

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

@@ -63,7 +63,7 @@
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation" @click="addlineAtBot">{{$t('addcontroller')}}</a>
-          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+          <a class="text-operation" @click="deleteData(record)" v-if="dataSource.length > 1">{{$t('delete')}}</a>
       </span>
     </a-table>
     <div>

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

@@ -478,8 +478,12 @@ this.$forceUpdate()
   border-bottom: none;
   vertical-align: top;
   overflow: hidden; /*超出部分隐藏*/
-  text-overflow: ellipsis; /*超出部分省略号表示*/
-  white-space: nowrap;
+  // text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: wrap;
+  display: flex;
+  // justify-content: center;
+  align-items: center;
+  line-height: 1.3;
 }
 //::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{
 //  min-width: 723px !important;
@@ -511,14 +515,17 @@ this.$forceUpdate()
   display: inline-block;
   width: 100%;
   height: 50px;
-  line-height: 50px;
+  line-height: 1.3;
   border: black solid 1px;
   vertical-align: top;
   border-right: none;
   border-bottom: none;
   overflow: hidden; /*超出部分隐藏*/
-  text-overflow: ellipsis; /*超出部分省略号表示*/
-  white-space: nowrap;
+  // text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: wrap;
+  display: flex;
+  // justify-content: center;
+  align-items: center;
 }
 .sider-span{
   display: inline-block;

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

@@ -260,7 +260,10 @@ export default {
   display: flex;
 
 }
-
+h1{
+  font-weight: 700;
+  font-style: 20px;
+}
 .title-text-add {
   width: 440px;
   text-align: right;