修改参数项收集清单 截止时间弹框

复制参数清单点击取消按钮无反应问题

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

@@ -1,4 +1,13 @@
 <template>
+  <a-modal
+    :title="listTitle"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
@@ -11,7 +20,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text">
+            <div class="box-title-text" style='margin-top: -33px'>
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -36,10 +45,10 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
-    </div>
+<!--    <div class='drawer-bootom-button'>-->
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+<!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -69,6 +78,7 @@
     </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
+  </a-modal>
 </template>
 
 <script>
@@ -85,12 +95,14 @@ export default {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
+      listTitle:this.$t('OneclickCollection'),
       total: 0,
       selectedRowKeysDate: {},
       loading: false,
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
+      visible:false,
       textLoading:false,
       NotSelectedRowKeysValue:[],
       labelCol: {
@@ -134,6 +146,9 @@ export default {
     }
   },
   methods: {
+    searchData(){
+      this.visible = true
+    },
     loadData() {
       this.loading = true
       let params = {
@@ -158,6 +173,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
+      this.visible = false
       this.$emit('areaVisibleTaskCutOffTimeflag', false)
     },
     handleTableChange(val) {
@@ -289,33 +305,40 @@ export default {
 /deep/.ant-modal-body{
   height: 100% !important;
 }
+/deep/.ant-form-item-control{
+  width: 323%;
+  margin-top: 29px;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
-  width: 276px;
-  /*align-items: center;*/
+  align-items: center;
+  /*margin-bottom: 10px;*/
 }
 
 .title-text {
-  width: 90px;
-  text-align: right;
+  width: 100%;
+  color: #000F16;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 500;
   font-size: 14px;
   margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .box-input {
   display: inline-block;
+  width: 70%;
   height: 38px;
-  width: 100%;
+  margin-top: 2px;
 }
 
 .itemModel {
-  width: calc(100% - 130px);
+  width: 100%;
   display: inline-block;
   margin-top: 2px;
 }

jero-web/src/components/TaskCutOffTime/indexonekey.vue

@@ -1,4 +1,13 @@
 <template>
+  <a-modal
+    :title="listTitle"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
@@ -11,7 +20,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text" >
+            <div class="box-title-text" style='margin-top: -33px'>
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -36,10 +45,10 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
-    </div>
+<!--    <div class='drawer-bootom-button'>-->
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+<!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -70,6 +79,7 @@
     </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
+  </a-modal>
 </template>
 
 <script>
@@ -86,9 +96,11 @@ export default {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
+      listTitle:this.$t('OneclickCollection'),
       total: 0,
       selectedRowKeysDate: {},
       loading: false,
+      visible:false,
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
@@ -134,6 +146,9 @@ export default {
     }
   },
   methods: {
+    searchData(){
+      this.visible = true
+    },
     loadData() {
       this.loading = true
       let params = {
@@ -158,6 +173,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
+      this.visible = false
       this.$emit('areaVisibleTaskCutOffTimeAll', false)
     },
     handleTableChange(val) {
@@ -286,33 +302,40 @@ export default {
 
 </style>
 <style scoped>
+/deep/.ant-form-item-control{
+  width: 323%;
+  margin-top: 29px;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
-  width: 276px;
-  /*align-items: center;*/
+  align-items: center;
+  /*margin-bottom: 10px;*/
 }
 
 .title-text {
-  width: 90px;
-  text-align: right;
+  width: 100%;
+  color: #000F16;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 500;
   font-size: 14px;
   margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .box-input {
   display: inline-block;
+  width: 70%;
   height: 38px;
-  width: 100%;
+  margin-top: 2px;
 }
 
 .itemModel {
-  width: calc(100% - 130px);
+  width: 100%;
   display: inline-block;
   margin-top: 2px;
 }