参数项清单增加一键下发收集功能

删除截止时间按钮

jero-web/src/common/lang/en-us.js

@@ -770,6 +770,7 @@ module.exports = {
   SynchronousReportLibrary: 'Synchronous Report Library',
   FreezeConfiguration: 'Freeze Configuration',
   distributionAndCollection: 'Distribution And Collection',
+  OneclickCollection: 'One-click Collection',
   deleteConfiguration: 'Delete Configuration',
   addConfiguration: 'Add Configuration',
   electricMachinery: 'ElectricMachinery',

jero-web/src/common/lang/zh-cn.js

@@ -785,6 +785,7 @@ module.exports = {
   SynchronousReportLibrary: '同步上报库',
   FreezeConfiguration: '冻结配置',
   distributionAndCollection: '下发收集',
+  OneclickCollection: '一键下发收集',
   deleteConfiguration: '删除配置',
   addConfiguration: '添加配置',
   electricMachinery: '电机',

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

@@ -2,7 +2,7 @@
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
-        class='tag-module'
+        class='formAdd'
         ref='ruleForm'
         :model='form'
         :rules='rules'
@@ -10,10 +10,29 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='24'>
+          <a-col :span="12">
-            <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>
+            <div class="box-title-text">
-                <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
+              <div class="title-text">
-              </span>
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('cutoffTime')">
+                {{$t('cutoffTime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
+                <a-date-picker class="box-input"
+                               style='width: 160px'
+                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
+                               @change="onChange" @ok="onOk"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="form.legalTaskConfirmation"
+                               :disabled="false"/>
+              </a-form-model-item>
+            </div>
+<!--          <a-col :span='24'>-->
+<!--            <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>-->
+<!--                <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />-->
+<!--              </span>-->
+<!--          </a-col>-->
           </a-col>
         </a-row>
       </a-form-model>
@@ -22,6 +41,32 @@
       <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')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+      @cancel='cancleoperationFailed'
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
+            <span v-html='item'></span>
+<!--            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
+<!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
+<!--            </div>-->
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -43,7 +88,9 @@ export default {
       selectedRowKeysDate: {},
       loading: false,
       editId: '',
+      visibleoperationFailed:false,
       newVisible: false,
+      NotSelectedRowKeysValue:[],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 7 }
@@ -53,7 +100,11 @@ export default {
         sm: { span: 14 }
       },
       form: {},
-      rules: {},
+      rules: {
+        legalTaskConfirmation:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('cutoffTime'), trigger: 'change' }
+        ]
+      },
       areaTable: [],
       flag: false,  //表单提交标识
       spinLoading: false,
@@ -105,19 +156,90 @@ export default {
     },
     //保存
     handleSubmit() {
+      // let _this = this
+      //   let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, }
+      //   this.confirmLoading = true
+      //   postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => {
+      //     if (res.success) {
+      //       this.$emit('areaVisibleTaskCutOffTimeflag', false)
+      //       this.$message.success(_this.$t('OperationSuccessful'))
+      //       this.confirmLoading = false
+      //     } else {
+      //       this.$message.warning(_this.$t('operationFailed'))
+      //       this.confirmLoading = false
+      //     }
+      //   })
+      this.$refs.ruleForm.validate(valid => {
+        if(valid){
+          let long = localStorage.getItem('language')
+          let cut = ''
+          if (long && long == 'zh-cn') {
+            this.cut = 'cn'
+          } else if (long && long == 'en-us') {
+            this.cut = 'en'
+          }
+          // let _array = []
+          // this.selectedRowKeysValue.forEach((item, index) => {
+          //   _array.push(item.id)
+          // })
           let _this = this
-        let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, }
+          let param = {
-        this.confirmLoading = true
+            paramsManifestId: this.$route.query.id,
-        postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => {
+            projectId: this.$route.query.projectId,
-          if (res.success) {
+            ids: this.selectedRowKeysArray,
-            this.$emit('areaVisibleTaskCutOffTimeflag', false)
+            cut: this.cut,
-            this.$message.success(_this.$t('OperationSuccessful'))
+            deadline: `${this.pickerDate}`
-            this.confirmLoading = false
+
-          } else {
+          }
-            this.$message.warning(_this.$t('operationFailed'))
+          this.textLoading = true
-            this.confirmLoading = false
+          axios({
+            url: '/jero-boot/params/collectManifest/issueCollection',
+            method: 'post',
+            data: param,
+            transformRequest: [function(data) {
+              let ret = ''
+              for (let it in data) {
+                ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+              }
+              return ret
+            }],
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'X-Access-Token': _this.token
             }
           })
+            .then((res) => {
+              if (res.data.success) {
+                // _this.$message.success(this.$t('OperationSuccessful'))
+                if(res.data.result.length == 0){
+                  this.visibleoperationFailed = false
+                  _this.$message.success(this.$t('OperationSuccessful'))
+                  this.$emit('areaVisibleTaskCutOffTimeflag', false)
+                  this.$emit('GetgetTableList')
+
+                }else{
+                  this.NotSelectedRowKeysValue = res.data.result
+                  this.visibleoperationFailed = true
+                }
+
+                // this.$emit('areaVisibleTaskCutOffTimeflag', false)
+                // this.$emit('GetgetTableList')
+              } else {
+                _this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+            .catch((error) => {
+              this.textLoading = false
+            })
+        }
+      })
+    },
+    // 错误数据的弹框
+    cancleoperationFailed() {
+      this.visibleoperationFailed = false
+      this.$emit('areaVisibleTaskCutOffTimeflag', false)
+      this.$emit('GetgetTableList')
+      // this.GetgetTableList()
     },
     onChange(val) {
       this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss')
@@ -131,7 +253,10 @@ export default {
 
 <style lang='less' scoped>
 @import '~@assets/less/common.less';
-
+.box-title-text-index {
+  line-height: 1.4;
+  display: flex;
+}
 .diolag-area {
   .table-area {
     margin: 20px 0;
@@ -150,6 +275,70 @@ export default {
   justify-content: center;
 }
 </style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
+</style>
 <style lang='less'>
 .area-module {
   .ant-modal-wrap {

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

@@ -0,0 +1,358 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='formAdd'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('cutoffTime')">
+                {{$t('cutoffTime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
+                <a-date-picker class="box-input"
+                               style='width: 160px'
+                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
+                               @change="onChange" @ok="onOk"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="form.legalTaskConfirmation"
+                               :disabled="false"/>
+              </a-form-model-item>
+            </div>
+<!--          <a-col :span='24'>-->
+<!--            <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>-->
+<!--                <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />-->
+<!--              </span>-->
+<!--          </a-col>-->
+          </a-col>
+        </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>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+      @cancel='cancleoperationFailed'
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
+            <span v-html='item'></span>
+<!--            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
+<!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
+<!--            </div>-->
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+import eventBUs from '../../common/event'
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      visibleoperationFailed:false,
+      newVisible: false,
+      NotSelectedRowKeysValue:[],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {
+        legalTaskConfirmation:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('cutoffTime'), trigger: 'change' }
+        ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10,
+      pickerDate: '',
+    }
+  },
+  props: {
+    selectedRowKeysArray: {
+      type: String,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    loadData() {
+      this.loading = true
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.form
+      }
+      getAction(`sys/user/page`, params).then(res => {
+        if (res.success) {
+          this.areaTable = [...res.result.records]
+          this.total = res.result.total
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.form = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisibleTaskCutOffTimeAll', false)
+    },
+    handleTableChange(val) {
+    },
+    //保存
+    handleSubmit() {
+      // let _this = this
+      //   let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, }
+      //   this.confirmLoading = true
+      //   postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => {
+      //     if (res.success) {
+      //       this.$emit('areaVisibleTaskCutOffTime', false)
+      //       this.$message.success(_this.$t('OperationSuccessful'))
+      //       this.confirmLoading = false
+      //     } else {
+      //       this.$message.warning(_this.$t('operationFailed'))
+      //       this.confirmLoading = false
+      //     }
+      //   })
+      this.$refs.ruleForm.validate(valid => {
+        if(valid){
+          let long = localStorage.getItem('language')
+          let cut = ''
+          if (long && long == 'zh-cn') {
+            this.cut = 'cn'
+          } else if (long && long == 'en-us') {
+            this.cut = 'en'
+          }
+          // let _array = []
+          // this.selectedRowKeysValue.forEach((item, index) => {
+          //   _array.push(item.id)
+          // })
+          let _this = this
+          let param = {
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            cut: this.cut,
+            deadline: `${this.pickerDate}`
+
+          }
+          this.textLoading = true
+          axios({
+            url: '/jero-boot/params/collectManifest/issueCollectionAll',
+            method: 'post',
+            data: param,
+            transformRequest: [function(data) {
+              let ret = ''
+              for (let it in data) {
+                ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+              }
+              return ret
+            }],
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'X-Access-Token': _this.token
+            }
+          })
+            .then((res) => {
+              if (res.data.success) {
+                // _this.$message.success(this.$t('OperationSuccessful'))
+                if(res.data.result.length == 0){
+                  this.visibleoperationFailed = false
+                  _this.$message.success(this.$t('OperationSuccessful'))
+                  this.$emit('areaVisibleTaskCutOffTimeAll', false)
+                  this.$emit('GetgetTableList')
+
+                }else{
+                  this.NotSelectedRowKeysValue = res.data.result
+                  this.visibleoperationFailed = true
+                }
+
+                // this.$emit('areaVisibleTaskCutOffTime', false)
+                // this.$emit('GetgetTableList')
+              } else {
+                _this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+            .catch((error) => {
+              this.textLoading = false
+            })
+        }
+      })
+    },
+    // 错误数据的弹框
+    cancleoperationFailed() {
+      this.visibleoperationFailed = false
+      this.$emit('areaVisibleTaskCutOffTimeAll', false)
+      this.$emit('GetgetTableList')
+      // this.GetgetTableList()
+    },
+    onChange(val) {
+      this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss')
+    },
+    onOk(val) {
+      this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss')
+    },
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+.box-title-text-index {
+  line-height: 1.4;
+  display: flex;
+}
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+</style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+.page{
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
+</style>

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

@@ -131,10 +131,10 @@
                   {{$t('SynchronousReportLibrary')}}
                 </div>
                 <!--      截止时间-->
-                <div @click="TaskCutOffTimeLibrary" class="operator-text-title">
+<!--                <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
-                  <a-icon type="bulb"/>
+<!--                  <a-icon type="bulb"/>-->
-                  {{$t('TaskCutOffTime')}}
+<!--                  {{$t('TaskCutOffTime')}}-->
-                </div>
+<!--                </div>-->
                 <!--      批量删除-->
                 <div @click="handleDelJurisdiction" class="operator-text-title">
                   <a-icon type="delete"/>
@@ -154,6 +154,11 @@
               <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"/>
@@ -257,12 +262,19 @@
                    @GetgetLoginUserType='GetgetLoginUserType'
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
-    <!--  截至时间--->
+    <!--  下发收集--->
-    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='600px' :footer="null">
+    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='600px' :footer="null">
       <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
     </a-modal>
+    <!--  一键下发收集--->
+    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='600px' :footer="null">
+      <task-time v-if='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
+                         @GetgetTableList='GetgetTableList'
+                         @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
+    </a-modal>
+
     <!--  引用参数--->
     <a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
       <reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest'
@@ -404,6 +416,7 @@
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
   import TaskCutOffTime from '@/components/TaskCutOffTime/index'
+  import TaskTime from '@/components/TaskCutOffTime/indexonekey'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
   import AssignedBy from '@/components/AssignedBy/index'
   import axios from 'axios'
@@ -420,6 +433,7 @@
       TaskCutOffTime,
       ReferenceParameter,
       SynchronousSubmissionLibrary,
+      TaskTime,
       globalAdvancedQuery
     },
     data() {
@@ -575,6 +589,7 @@
         areaVisibleFreeze: false, // 冻结配置
         areaVisibleAssignedby: false, // 分配填写人弹框
         areaVisibleTaskCutOffTime: false, // 截至时间弹框
+        OneclickCollection:false,
         areaVisiblereferenceparameter: false, // 引用参数弹框
         areaVisibsynchronous: false, // 同步上报库弹框
         visibleoperationFailed: false, // 数据失败的弹框
@@ -1087,62 +1102,72 @@
       },
       // 下发收集的权限
       distributionAndCollectionJurisdiction() {
-        let homodistributionAndCollection = this.homodistributionAndCollection()
+        if(this.selectedRowKeysValue.length == 0){
-        if (homodistributionAndCollection == 1) {
+          this.$message.warning(this.$t('selectLeastOne'))
-          this.distributionAndCollection()
-        } else if (homodistributionAndCollection == 0) {
-          this.visibleoperationFailed = true
-          this.jurisdiction = 'HOMOZFSJ'
-        } else if (homodistributionAndCollection == 3) {
-          this.visibleoperationFailed = true
-          this.NoEngineer = 0
-        }
-      },
-      // 下发收集---请求接口
-      distributionAndCollection() {
-
-        let _array = []
-        this.selectedRowKeysValue.forEach((item, index) => {
-          _array.push(item.id)
-        })
-        let _this = this
-        let param = {
-          paramsManifestId: this.$route.query.id,
-          projectId: this.$route.query.projectId,
-          ids: _array.join(',')
-        }
-        this.textLoading = true
-        axios({
-          url: '/jero-boot/params/collectManifest/issueCollection',
-          method: 'post',
-          data: param,
-          transformRequest: [function(data) {
-            let ret = ''
-            for (let it in data) {
-              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-            }
-            return ret
-          }],
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'X-Access-Token': _this.token
-          }
-        })
-          .then((res) => {
-            if (res.data.success) {
-              _this.$message.success(this.$t('OperationSuccessful'))
-              _this.areaVisible = false
-              this.textLoading = false
-              _this.GetgetTableList()
         }else{
-              this.textLoading = false
+          this.areaVisibleTaskCutOffTime = true
-              _this.$message.warning(this.$t('operationFailed'))
         }
-          })
+        // let homodistributionAndCollection = this.homodistributionAndCollection()
-          .catch((error) => {
+        // if (homodistributionAndCollection == 1) {
-            this.textLoading = false
+        //   this.areaVisibleTaskCutOffTime = true
-          })
+        //   // this.distributionAndCollection()
+        // } else if (homodistributionAndCollection == 0) {
+        //   this.visibleoperationFailed = true
+        //   this.jurisdiction = 'HOMOZFSJ'
+        // } else if (homodistributionAndCollection == 3) {
+        //   this.visibleoperationFailed = true
+        //   this.NoEngineer = 0
+        // }
       },
+      // 一键下发收集
+      defOneclickCollection() {
+          this.OneclickCollection = true
+      },
+      // // 下发收集---请求接口
+      // distributionAndCollection() {
+      //
+      //   let _array = []
+      //   this.selectedRowKeysValue.forEach((item, index) => {
+      //     _array.push(item.id)
+      //   })
+      //   let _this = this
+      //   let param = {
+      //     paramsManifestId: this.$route.query.id,
+      //     projectId: this.$route.query.projectId,
+      //     ids: _array.join(',')
+      //   }
+      //   this.textLoading = true
+      //   axios({
+      //     url: '/jero-boot/params/collectManifest/issueCollection',
+      //     method: 'post',
+      //     data: param,
+      //     transformRequest: [function(data) {
+      //       let ret = ''
+      //       for (let it in data) {
+      //         ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+      //       }
+      //       return ret
+      //     }],
+      //     headers: {
+      //       'Content-Type': 'application/x-www-form-urlencoded',
+      //       'X-Access-Token': _this.token
+      //     }
+      //   })
+      //     .then((res) => {
+      //       if (res.data.success) {
+      //         _this.$message.success(this.$t('OperationSuccessful'))
+      //         _this.areaVisible = false
+      //         this.textLoading = false
+      //         _this.GetgetTableList()
+      //       } else {
+      //         this.textLoading = false
+      //         _this.$message.warning(this.$t('operationFailed'))
+      //       }
+      //     })
+      //     .catch((error) => {
+      //       this.textLoading = false
+      //     })
+      // },
       // 同步上报库 权限
       handleSynchronousReportLibraryJurisdiction() {
         let homoJurisdictionSynchronousLibrary = this.homoJurisdictionSynchronousLibrary()
@@ -1412,20 +1437,26 @@
         this.areaVisibleAssignedby = val
       },
       // 截止时间
-      TaskCutOffTimeLibrary() {
+      // TaskCutOffTimeLibrary() {
-        let dreTaskCutOffTimeLibrary = this.dreTaskCutOffTimeLibrary()
+      //   let dreTaskCutOffTimeLibrary = this.dreTaskCutOffTimeLibrary()
-        if (dreTaskCutOffTimeLibrary == 1) {
+      //   if (dreTaskCutOffTimeLibrary == 1) {
-          this.areaVisibleTaskCutOffTime = true
+      //     this.areaVisibleTaskCutOffTime = true
-        } else if (dreTaskCutOffTimeLibrary == 0) {
+      //   } else if (dreTaskCutOffTimeLibrary == 0) {
-          this.visibleoperationFailed = true
+      //     this.visibleoperationFailed = true
-          this.jurisdiction = 'HOMOJZSJ'
+      //     this.jurisdiction = 'HOMOJZSJ'
-        }
+      //   }
-      },
+      // },
       // 截至时间确定弹框关闭
       areaVisibleTaskCutOffTimeflag(val) {
+        console.log(val)
         this.areaVisibleTaskCutOffTime = val
         this.$refs.CollectionTabel.getTableList()
       },
+      areaVisibleTaskCutOffTimeAll(val){
+        console.log(val)
+        this.OneclickCollection = val
+        this.$refs.CollectionTabel.getTableList()
+      },
       //引用参数
       referenceparameter() {
         let dreJurisdictionreferenceParameter = this.dreJurisdictionreferenceParameter()