Merge remote-tracking branch 'origin/master'

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

@@ -73,7 +73,7 @@
       <parameter-template v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
                           :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'></parameter-template>
     </a-modal>
-    <configure ref="configureRef"/>
+    <configure ref="configureRef" :url='url' :itemId='itemId'/>
   </a-card>
 </template>
 
@@ -146,6 +146,8 @@
            queryById: 'params/manifest/queryById',
            deleteBatch: 'params/manifest/delete',
            deleteAll: 'params/manifest/deleteBatch',
+           conAdd: 'params/config/addBatch',
+           conList: 'params/config/list',
          },
          loading: false,
          dataSource: [],
@@ -158,7 +160,8 @@
          templatetitle: '',
          templatetitleId: '',
          rowId: '',
-         version: 0
+         version: 0,
+         itemId: ''
        }
     },
     mounted() {
@@ -189,8 +192,9 @@
 
       },
       // 配置
-      configure() {
-        this.$refs.configureRef.addModel()
+      configure(item) {
+        this.itemId = item.id
+        this.$refs.configureRef.addModel(item.id)
       },
       handleCancel(val) {
         this.areaVisible = val
@@ -227,9 +231,6 @@
           } else {
           }
         })
-      },
-      handleExport(){
-
       },
       handleAdd(){
         this.areaVisible = true

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

@@ -1078,7 +1078,7 @@
         let num = 2
         // for (let i = 0; i < 3; i++) {
         //   setTimeout(() => {
-            this.startProcessDesign(val, num)
+            this.startProcessDesign(val)
         //   }, 500)
         // }
       },