From c5ea37e889344184ed10b64885a39ca557ddcc2f Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 29 Apr 2022 09:56:14 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97=E8=A1=A8]?=
 =?UTF-8?q?=20=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 54 ++++++++++---------
 .../views/parameter/parameterlist/index.vue   |  4 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 6ed2adc1b..a697d48bf 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -213,7 +213,7 @@
           <a-row :gutter="24">
             <a-col :span="24" >
               <a-tabs>
-                <a-tab-pane v-for='(item,index) in tt' :tab="item.textVal" :key="index + 1">
+                <a-tab-pane v-for='(item,index) in contentList' :tab="item.textVal" :key="index + 1">
                   <a-row :gutter="24">
                     <a-col :span="12">
                       <div class="box-title-text">
@@ -288,31 +288,31 @@ export default {
   data() {
     return {
       isRequired: [ // 是否必填
-        {value:1, label: '是' },
-        {value:0, label: '否' }
+        {value:'1', label: '是' },
+        {value:'0', label: '否' }
       ],
       controlType: [ // 控件类型
-        {value:1, label: '文本' },
-        {value:2, label: '下拉单选' },
-        {value:3, label: '下拉多选' },
-        {value:4, label: '附件' },
-        {value:5, label: '文本+下拉单选' },
-        {value:6, label: '文本+下拉多选' },
-        {value:7, label: '文本+附件' },
-        {value:8, label: '下拉单选+附件' },
-        {value:9, label: '下拉多选+附件' },
-        {value:10, label: '文本+下拉单选+附件' },
+        {value:'1', label: '文本' },
+        {value:'2', label: '下拉单选' },
+        {value:'3', label: '下拉多选' },
+        {value:'4', label: '附件' },
+        {value:'5', label: '文本+下拉单选' },
+        {value:'6', label: '文本+下拉多选' },
+        {value:'7', label: '文本+附件' },
+        {value:'8', label: '下拉单选+附件' },
+        {value:'9', label: '下拉多选+附件' },
+        {value:'10', label: '文本+下拉单选+附件' },
       ],
       controlVerification: [ // 控件校验
-        {value:1, label: '无' },
-        {value:2, label: '中文' },
-        {value:3, label: '正整数' },
-        {value:4, label: '正浮点数' },
-        {value:5, label: '整数或小数' },
-        {value:6, label: '一位小数' },
-        {value:7, label: '两位小数' },
-        {value:8, label: '三位小数' },
-        {value:9, label: '四位小数' },
+        {value:'1', label: '无' },
+        {value:'2', label: '中文' },
+        {value:'3', label: '正整数' },
+        {value:'4', label: '正浮点数' },
+        {value:'5', label: '整数或小数' },
+        {value:'6', label: '一位小数' },
+        {value:'7', label: '两位小数' },
+        {value:'8', label: '三位小数' },
+        {value:'9', label: '四位小数' },
       ],
       CategoryTreeList: [], // 技术领域
       certCategoryParamsInfoEOList: [], // 认证类别得tab栏
@@ -343,7 +343,7 @@ export default {
       projectNameList: [],
       title: '',
       stateOne: '',
-      tt : []
+      contentList : []
     }
   },
   mounted() {
@@ -380,7 +380,7 @@ export default {
 
       // this.formInline.certCategoryParamsInfoEOList = []
       val.forEach((item) => {
-        this.tt.push({
+        this.contentList.push({
           textVal: item.text, // tab
           certCategory: '', // 所属认证类别
           paramsNumber: '', // 编号
@@ -433,6 +433,8 @@ export default {
         if (valid) {
           let url = ''
           let Action
+          this.formInline.paramsTemplateId = this.$route.query.id
+          console.log(this.formInline.paramsTemplateId,'this.formInline.paramsTemplateIdthis.formInline.paramsTemplateId')
           if (this.formInline.id) {
             url = this.url.edit
             Action = postAction
@@ -447,8 +449,8 @@ export default {
               query[res] = query[res].join(',')
             }
           })
-          let querytt = JSON.parse(JSON.stringify(this.tt))
-          query.certCategoryParamsInfoEOList = querytt
+          let querycontentList = JSON.parse(JSON.stringify(this.contentList))
+          query.certCategoryParamsInfoEOList = querycontentList
           this.confirmLoading = true
           Action(url, query).then((res) => {
             if (res.success) {
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index f964d48c9..e295e3f1e 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -118,7 +118,8 @@ export default {
         add: 'params/paramsInfo/add',
         edit: 'params/paramsInfo/edit',
         deleteBatch: 'params/paramsInfo/delete',
-        deleteAll: 'params/paramsInfo/deleteBatch'
+        deleteAll: 'params/paramsInfo/deleteBatch',
+
       },
       total: 0,
       pageSize: 10,
@@ -289,6 +290,7 @@ export default {
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        cut: this.$route.query.id,
         ...this.queryParam
       }
       this.loading = true