Merge remote-tracking branch 'origin/dev2/luolei' into dev

src/components/icss/InspactTagGroup.vue

@@ -33,7 +33,7 @@
       <p class="poolTitle">操作界面：</p>
       <ul class="tagList operationPool">
             <li class = "tagItem"
-                v-for="(item) in rightTagsList2" 
+                v-for="(item) in rightTagsList" 
                 :key='item.id'
                 :style="getStyle2(item)?styles:null"
                 @click='selectRightTag(item)'
@@ -84,7 +84,6 @@ export default {
     mounted() {
       this.$nextTick(()=>{
         this.rightTagsList = this.options
-        this.rightTagsList2 = this.options
         this.$emit('changeActionData',this.options, false);
         this.searchTagList()
       })
@@ -157,37 +156,39 @@ export default {
             // if(!this.searchVal) {
             //     this.leftTagsList = this.searchTagList()
             // }
-            
+            console.log(99)
             for (let i = 0; i < this.selectRightTagsList.length; i++) {
                 this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[i].id)
             }
-            for (let i = 0; i < this.selectRightTagsList.length; i++) {//每次往回移时同时删掉下面输入框
-                if (this.selectRightTagsList[i].type !== 'input') {
-                    for (let j = 0; j < this.rightTagsList2.length; j++) {
-                        if(this.selectRightTagsList[i].id === this.rightTagsList2[j].id) {
-                            this.rightTagsList2.splice(j, 1)
-                        }
-                    }
-                }
-            }
+            // for (let i = 0; i < this.selectRightTagsList.length; i++) {//每次往回移时同时删掉下面输入框
+            //     if (this.selectRightTagsList[i].type !== 'input') {
+            //         for (let j = 0; j < this.rightTagsList2.length; j++) {
+            //             if(this.selectRightTagsList[i].id === this.rightTagsList2[j].id) {
+            //                 this.rightTagsList2.splice(j, 1)
+            //             }
+            //         }
+            //     }
+            // }
             this.selectLeftTagsList = []
             this.selectRightTagsList = []
             this.searchTagList()
-            this.$emit('changeActionData',this.rightTagsList2, false);
+            this.$emit('changeActionData',this.rightTagsList, false);
         },
         toRightList() {
+          console.log(999, this.selectLeftTagsList)
+
             this.rightTagsList.push(...this.selectLeftTagsList);
             // let textItem = { text: ',' ,type:'input' }
-            for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个加入输入框，默认为逗号
-                this.rightTagsList2.push(this.selectLeftTagsList[i]);
-            }
-            
+            // for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个加入输入框，默认为逗号
+            //     this.rightTagsList2.push(this.selectLeftTagsList[i]);
+            // }
             for (let i = 0; i < this.rightTagsList.length; i++) {
                 this.leftTagsList = this.leftTagsList.filter(item => item.id !== this.rightTagsList[i].id)
             }
             this.selectLeftTagsList = []
             this.selectRightTagsList = []
-            this.$emit('changeActionData',this.rightTagsList2, false);
+            this.$emit('changeActionData',this.rightTagsList, false);
+
         },
         searchTagList() {
             let notIds = []