From 445a1c03f2d911bb6b7f30b29aba0f6c62ffe45a Mon Sep 17 00:00:00 2001
From: lixuetao <lixuetao@syxysoft.com>
Date: Thu, 30 Jun 2022 10:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=86=8D=E5=86=B3=E5=AE=9A=E8=83=BD=E5=90=A6?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/TaskParameterCollection.vue    | 26 ++++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9d0b387a8..d6793169d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -729,6 +729,7 @@ module.exports = {
   ParameteItemCollectionList: 'Parameter item collection list',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
+  NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
   theCurrent: 'The current status of this data is',
   thisbuttonCompleted: 'This button can only be operated when the status is completed',
   Frozenstatus: 'Frozen status, can only be viewed',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 5866766a0..9a78d7916 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -740,6 +740,7 @@ module.exports = {
   ParameteItemCollectionList: '参数项收集清单',
   Areyousureparameteritems: '确认提交所选参数项嘛?',
   Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
+  NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查',
   theCurrent: '此数据当前状态为',
   thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮',
   Frozenstatus: '冻结状态,仅可以查看',
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 5d7eae391..cc059baea 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -107,6 +107,7 @@
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import eventBUs from '@/common/event'
 
   export default {
     name: 'TaskParameterCollection',
@@ -177,7 +178,8 @@
           deleteAll: 'params/manifest/deleteBatch',
           conAdd: 'params/config/addBatch',
           conList: 'params/config/list',
-          changeExtension:'params/manifest/changeExtension'
+          changeExtension:'params/manifest/changeExtension',
+          verifyConfig: 'params/manifest/verifyConfig'
         },
         loading: false,
         dataSource: [],
@@ -206,12 +208,22 @@
     },
     methods: {
       paramsManifestClick(item) {
-        localStorage.setItem('paramsManifest', JSON.stringify(item))
-        let newUrl = this.$router.resolve({
-          path: '/ParameterItemCollection',
-          query: item,
+        let _this = this
+        // 先调取接口判断是否有配置信息
+        getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => {
+          if (res.result) {
+            localStorage.setItem('paramsManifest', JSON.stringify(item))
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query: item,
+            })
+            window.open(newUrl.href, '_blank')
+          } else {
+            _this.$message.success(_this.$t('NoConfigurationNotStart'))
+          }
         })
-        window.open(newUrl.href, '_blank')
+
+
       },
       deleteLib(val) {
         if(val.state === '已完成' || val.state === 'Finished' ) {
@@ -381,7 +393,7 @@
   /deep/ .ant-table td {
     white-space: normal;
   }
-  
+
   .doc-detail {
     background: #fff;
     height: 100%;