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

jero-web/src/views/externalReports/index.vue

@@ -385,7 +385,7 @@
             ellipsis: true,
             dataIndex: 'fileName',
             scopedSlots: { customRender: 'fileName' },
-            width: 200
+            width: 270
           },
           {
             title: this.$t('fileDeclaration'),
@@ -393,7 +393,7 @@
             ellipsis: true,
             dataIndex: 'fileDescription',
             scopedSlots: { customRender: 'projectName' },
-            width: 300
+            width: 390
           },
           {
             title: this.$t('uploadedBy'),
@@ -412,7 +412,7 @@
             align: 'left',
             ellipsis: true,
             dataIndex: 'createTime',
-            width: 250
+            width: 245
           },
           {
             title: this.$t('operation'),

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

@@ -364,6 +364,7 @@ h1{
   width: calc(100% - 130px);
   display: inline-block;
   margin-top: 2px;
+  height: 40px;
 }
 
 .box-input {

jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue

@@ -9,7 +9,7 @@
         {{$t('templateDownload')}}
       </div>
     </div>
-    <a-table ref="table" size="middle" :pagination="false" :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="key"
+    <a-table class="table" ref="table" size="middle" :pagination="false" :scroll="{ x: '100%' }" rowKey="key"
       bordered :data-source="dataSource" :columns="columns" style="margin-bottom: 20px">
 
       <span slot="relevantverification" slot-scope="text,record">
@@ -369,4 +369,8 @@ button {
   color: #00B3BE;
   border-color: #00B3BE;
 }
+
+.table {
+  white-space: break-spaces;
+}
 </style>

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -457,7 +457,7 @@
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
                       :isSingleChoice="true"
-                      v-if="visible"
+                      v-if="personnelVisible"
                       @change="PersonnelSelectionChange"
                       :disabled="disabled"
                       v-model="formInline.dutyPersonName"/>
@@ -509,6 +509,7 @@
         formInline: {},
         confirmLoading: false,
         visible: false,
+        personnelVisible:false,
         yearNameDataList: [],
         rules: {
           serialNumber: [
@@ -631,6 +632,7 @@
 
       addModel() {
         this.visible = true
+        this.personnelVisible = true
         this.title = this.$t('add')
         this.formInline = {}
         this.getRegulationNo()
@@ -643,6 +645,7 @@
       editModel(value) {
         this.formInline = {}
         this.visible = true
+        this.personnelVisible = true
         this.formInline = JSON.parse(JSON.stringify(value))
         // if (this.formInline.deliverableType) {
         //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
@@ -659,6 +662,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.personnelVisible = false
       },
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
@@ -709,6 +713,7 @@
                   this.$message.success(this.$t('OperationSuccessful'))
                 }
                 this.visible = false
+                this.personnelVisible = false
                 this.$emit('addModelForm')
               } else {
                 this.$message.warning(res.message)
@@ -831,9 +836,14 @@
                   this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name
                   this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value
                 }
+                this.formInline = {...this.formInline}
               } else if (this.engineeringInterfacePersonList.length == 0) {
                 this.formInline.sdt = undefined
               }
+              this.personnelVisible = false
+              this.$nextTick(()=>{
+                this.personnelVisible = true
+              })
             } else {
               this.$nextTick(() => {
                 this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []

jero-web/src/views/system/DataLogList.vue

@@ -41,6 +41,7 @@
         size="middle"
         rowKey="id"
         :columns="columns"
+        :components="drag(columns,'columns')"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
@@ -61,10 +62,11 @@
   import DataLogModal from './modules/DataLogModal'
   import {JeroListMixin} from '@/mixins/JeroListMixin'
   import JEllipsis from "@/components/jero/JEllipsis";
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'DataLogList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       JEllipsis,
       DataLogModal
@@ -76,28 +78,28 @@
         columns: [
           {
             title: this.$t('tableName'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'dataTable',
             width: "120"
           }, {
             title: this.$t('DataID'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'dataId',
             width: "120"
           }, {
             title: this.$t('VersionNumber'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'dataVersion',
             width: "50"
           }, {
             title: this.$t('DataContent'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'dataContent',
             width: "150",
             scopedSlots: {customRender: 'dataContent'},
           }, {
             title: this.$t('creator'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'createBy',
             width: "100"
           },