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

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

@@ -144,8 +144,8 @@
                       </a-select>
                   </div>
               </div>
-             
+
-             
+
               </a-form-model-item>
 
             </div>
@@ -285,9 +285,10 @@ export default {
 
             }
           })
-        } else {
-          this.form.bapc = undefined
         }
+        // else {
+          // this.form.bapc = undefined
+        // }
       })
 
     },
@@ -353,8 +354,8 @@ export default {
     },
     changeId(value, option) {
       this.$nextTick(() => {
-        // this.form = { ...this.form }
+        this.form = { ...this.form }
-        this.$refs.ruleForm.validateField('bapc')
+        this.$refs.ruleForm.clearValidate('bapc')
       })
       this.selectListPc.map(item => {
         if (item.id == value) {

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

@@ -133,7 +133,7 @@
             <!--      // R&H Manager manager-->
             <!--      // 系统管理员 admin-->
             <!--      // 游客 guest-->
-            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo"'>
+            <a-popconfirm overlayClassName='popconfirmIndex' placement="bottomRight" v-if='currentPersonRole == "homo"'>
               <template slot="title" id="popconfirm">
                 <!--      添加-->
                 <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -269,7 +269,7 @@
               {{$t('CompulsoryWithdrawal')}}
             </div>
             <!--        列表设置-->
-            <a-popconfirm :visible="customizevisible" overlayClassName="popconfirm"
+            <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
                           placement="bottomRight" v-if="!this.$route.query.it">
               <template slot="title" id="popconfirmmize">
                 <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 188px">
@@ -2360,15 +2360,15 @@
   }
 </script>
 <style lang="less">
-  .popconfirm {
+  .popconfirmIndex {
     z-index: 999;
   }
 
-  .popconfirm .ant-popover-buttons {
+  .popconfirmIndex .ant-popover-buttons {
     display: none !important;
   }
 
-  .popconfirm .anticon-exclamation-circle {
+  .popconfirmIndex .anticon-exclamation-circle {
     display: none !important;
   }
   ::v-deep .ant-table-fixed-header .ant-table-body-inner {
@@ -2643,7 +2643,7 @@
   }
 </style>
 <style lang='less'>
-  .ant-popover-message-title {
+  .popconfirmIndex .ant-popover-message-title {
     margin-bottom: 50px;
   }
 </style>

jero-web/src/views/projectManagement/historicalVersion/index.vue

@@ -53,7 +53,7 @@
         ref="table"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys}"
@@ -172,6 +172,7 @@
             width: 180,
             fixed: 'left',
             sorter: true,
+            ellipsis: true,
             scopedSlots: { customRender: 'standard' }
           },
           {
@@ -180,6 +181,7 @@
             dataIndex: 'title',
             width: 180,
             fixed: 'left',
+            ellipsis: true,
             scopedSlots: { customRender: 'titleName' }
           },
           {
@@ -584,7 +586,9 @@
 
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
-
+  ::v-deep .ant-table-fixed-left table, .ant-table-fixed-right table{
+    width: min-content;
+  }
   .doc-detail {
     background: #fff;
     height: 100%;