From 03943ff6ee1b342be241fee06fc86f8bdb143d3c Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 20 Jun 2022 12:03:40 +0800
Subject: [PATCH] [update]

---
 .../src/components/TaskCutOffTime/index.vue   |  6 ++---
 .../ParameterItemCollectionList.vue           |  7 +++---
 .../projectManagement/dialog/configure.vue    | 24 ++++++++++++-------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index dee4202f3..7ca73d419 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -11,9 +11,9 @@
       >
         <a-row :gutter='24'>
           <a-col :span='24'>
-            <a-form-model-item ref='paramsTemplateName' :label="$t('checkTheDeadline')" prop='paramsTemplateName'>
-              <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
-            </a-form-model-item>
+            <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>
+                <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
+              </span>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 83e7306b1..0035ab4d5 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -201,8 +201,9 @@
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
     <!--  截至时间--->
-    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='650px' :footer="null">
-      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray' @GetgetTableList='GetgetTableList'
+    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='600px' :footer="null">
+      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
+                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
     </a-modal>
     <!--  引用参数--->
@@ -524,7 +525,7 @@ export default {
           flag = 0
         }
           //  状态符合，但是没有工程接口人 不能下发收集
-        if(item.sdt.dataValue === null && (flag == 1 || flag == 3)) {
+        if((item.sdt.dataValue === null || item.sdt.dataValue ==='undefined') && (flag == 1 || flag == 3)) {
           this.NotSelectedNoEngineerValue.push(item)
           flag = 3
         }
diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue
index 8a501e3a4..410a485ad 100644
--- a/jero-web/src/views/projectManagement/dialog/configure.vue
+++ b/jero-web/src/views/projectManagement/dialog/configure.vue
@@ -182,22 +182,30 @@ export default {
       })
     },
     addModel(id) {
+      this.paramsConfigEOList = []
       this.visible = true
       this.title = '维护配置信息'
       this.formInline = {}
       this.getconList(id)
     },
-    editModel(value) {
-      this.visible = true
-      this.title = '编辑配置信息'
-      this.$nextTick(() => {
-        this.formInline = value
-      })
-    },
     getconList(id) {
       getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => {
         if (res.success) {
-          this.paramsConfigEOList = res.result.length === 0 ? this.paramsConfigEOList : res.result
+          if(res.result.length === 0) {
+            this.paramsConfigEOList = [
+              {
+                id: '',
+                // displaySeq: 0,
+                configName: '', // 配置名称
+                version: '', // 版本
+                carType: '', // 车型
+                battery: '', // 电池
+                motor: '', // 电机
+              }
+            ]
+          } else {
+            this.paramsConfigEOList = res.result
+          }
           this.visible = true
         } else {
           this.$message.warning(res.message)