From 0110fde5de65e3f95c4d7c50c2b2748c8d5460ba Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 19 Jul 2022 14:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=94=B6=E9=9B=86=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E8=AE=BE=E7=BD=AE=E5=9B=BA=E5=AE=9A=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/TaskCutOffTime/index.vue      |  7 +++++++
 .../src/components/TaskCutOffTime/indexonekey.vue     | 10 +++++++++-
 .../components/ParameterItemCollectionList.vue        | 11 ++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index 9feec59ec..c8f892d6d 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -49,6 +49,7 @@
       :maskClosable="false"
       :footer="null"
       @cancel='cancleoperationFailed'
+      :body-style="bodystyle"
     >
       <a-row :gutter="24">
         <a-col :span="24">
@@ -113,6 +114,7 @@ export default {
       pageNo: 1,
       pageSize: 10,
       pickerDate: '',
+      bodystyle:{}
     }
   },
   props: {
@@ -124,6 +126,11 @@ export default {
   },
   mounted() {
     this.loadData()
+    this.bodystyle = {
+      height: '480px',
+      overflow: 'hidden',
+      overflowY: 'scroll',
+    }
   },
   methods: {
     loadData() {
diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue
index e5494b253..4a2538ec0 100644
--- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue
+++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue
@@ -48,7 +48,9 @@
       v-model="visibleoperationFailed"
       :maskClosable="false"
       :footer="null"
+      class='modelbox'
       @cancel='cancleoperationFailed'
+      :body-style="bodystyle"
     >
       <a-row :gutter="24">
         <a-col :span="24">
@@ -113,6 +115,7 @@ export default {
       pageNo: 1,
       pageSize: 10,
       pickerDate: '',
+      bodystyle:{}
     }
   },
   props: {
@@ -124,6 +127,11 @@ export default {
   },
   mounted() {
     this.loadData()
+    this.bodystyle = {
+      height: '480px',
+      overflow: 'hidden',
+      overflowY: 'scroll',
+    }
   },
   methods: {
     loadData() {
@@ -273,6 +281,7 @@ export default {
   display: flex;
   justify-content: center;
 }
+
 </style>
 <style scoped>
 .box-title-text {
@@ -280,7 +289,6 @@ export default {
   display: flex;
   /*align-items: center;*/
 }
-
 .title-text {
   width: 114px;
   text-align: right;
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 112095941..811b60cf9 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -120,6 +120,11 @@
 <!--                  <a-icon type="solution"/>-->
 <!--                  {{$t('distributionAndCollection')}}-->
 <!--                </div>-->
+                <!--     一键下发收集 -->
+                <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="solution"/>
+                  {{$t('OneclickCollection')}}
+                </div>
                 <!--      冻结配置-->
                 <div @click="freezeConfiguration" class="operator-text-title">
                   <a-icon type="solution"/>
@@ -154,11 +159,7 @@
               <a-icon type="solution"/>
               {{$t('distributionAndCollection')}}
             </div>
-            <!--     一键下发收集 -->
-            <div @click="defOneclickCollection" class="operator-text" v-if='currentPersonRole == "homo"'>
-              <a-icon type="solution"/>
-              {{$t('OneclickCollection')}}
-            </div>
+
             <!--      分配填写人-->
             <div @click="assignedBy" class="operator-text" v-if='currentPersonRole == "sdt" '>
               <a-icon type="copy"/>