6 년 전 · 49f3af28db
--- a/src/api/icss.js
+++ b/src/api/icss.js
@@ -58,7 +58,6 @@ export default {
 
				     deleteTagGroup(param) {
			
 
				         return axios.post(urls.deleteTagGroup, param)
			
 
				     },
			
 
				-
			
 
				     getGroupParams(val){
			
 
				       if(val == 2){
			
 
				         return groupParams[0]
			
@@ -76,7 +75,7 @@ export default {
 
				         return null
			
 
				       }
			
 
				     },
			
 
				-	similarName(param) {//别名维护
			
 
				+    similarName(param) {//别名维护
			
 
				         return axios.post(urls.similarName, param)
			
 
				     },
			
 
				     delSimilarName(param) {//别名维护-删除
			
--- a/src/api/utils.js
+++ b/src/api/utils.js
@@ -172,7 +172,7 @@ export default {
 
				    *将提交的参数转换成对应的组件form中的key
			
 
				    *
			
 
				    */
			
 
				-  transformKeys(data){
			
 
				+  transformKeys(data, tagFlag){   //tagFlag：独立标签还是标签组 ()
			
 
				     const maps = {
			
 
				       "controlType": 'region2',                            //控件类型(0：默认值 1：下拉单选 2：下拉多选 6：文本框 7：数字键盘文本框 99：联合推送)
			
 
				       "tagType": 'region2',              //标签类型
			
@@ -190,6 +190,9 @@ export default {
 
				       "maxValue":'maxNormalVal',                                 //前缀
			
 
				       "minValue":'minNormalVal'                                 //后缀
			
 
				     };
			
 
				+    if (tagFlag) {
			
 
				+      maps["tagType"] = 'region2'
			
 
				+    }
			
 
				     let obj = {};
			
 
				     for(let it in maps){
			
 
				       obj[maps[it]] = typeof data[it]=='number'?data[it]+'':data[it];
			
--- a/src/components/icss/LabelGroup.vue
+++ b/src/components/icss/LabelGroup.vue
@@ -62,14 +62,14 @@
 
				                     </template>
			
 
				                 </el-table-column>
			
 
				             </el-table>
			
 
				-            <el-pagination v-if="total>pageSize"
			
 
				+        <el-pagination v-if="total>pageSize"
			
 
				                        :current-page.sync="currentPage"
			
 
				                        @current-change="currentChange"
			
 
				                        background
			
 
				                        :page-size="pageSize"
			
 
				                        layout="total,prev, pager, next, jumper"
			
 
				                        :total="total">
			
 
				-            </el-pagination>
			
 
				+        </el-pagination>
			
 
				         </div>
			
 
				        <!--  <div class="pagination">
			
 
				            <el-pagination v-if="total>pageSize"
			
--- a/src/components/icss/PubTagGroup.vue
+++ b/src/components/icss/PubTagGroup.vue
@@ -283,7 +283,7 @@ export default {
 
				   mounted() {
			
 
				     const editData = this.$props.editData;
			
 
				     if(editData.id){
			
 
				-      const trans = utils.transformKeys(editData);
			
 
				+      const trans = utils.transformKeys(editData,2); //(2是标签组类型)
			
 
				       // console.log('editData1', editData)
			
 
				       this.form = Object.assign({},this.form,trans);
			
 
				     }
			
@@ -340,8 +340,7 @@ export default {
 
				     validateSystomName(name,callback) {
			
 
				       if(this.form.region3.trim() == ''){ return }
			
 
				       let param = {
			
 
				-        "existName": this.form.region3,
			
 
				-        // "tagType":this.form.region2.split(''),       
			
 
				+        "existName": this.form.region3,     
			
 
				         "type": this.form.region1,
			
 
				         "notTagType":[8],        //去掉文字标签查重
			
 
				       }
			
--- a/src/components/icss/SingleSelect.vue
+++ b/src/components/icss/SingleSelect.vue
@@ -97,6 +97,8 @@
 
				             return {name:it.name,defaultSelect:it.defaultSelect=='1'?true:false,isBan:it.code==1?true:'',isNone:it.code==2?true:'',isCorrect:it.code==3?true:''};
			
 
				           });
			
 
				           this.rows = arr;
			
 
				+          const items = utils.simpleOptionData(this.rows);
			
 
				+          this.$emit('pushValues',items);
			
 
				         }
			
 
				       },
			
 
				       computed:{