Luolei 6 سال پیش
والد
کامیت
1cd9412ecd
1فایلهای تغییر یافته به همراه14 افزوده شده و 9 حذف شده
  1. 14 9
      src/components/icss/PubTagPartDetail.vue

+ 14 - 9
src/components/icss/PubTagPartDetail.vue

@@ -78,13 +78,16 @@
       <div class="partWaring">
         <ul>
           <li v-for="i in 5" :key="i">
-            <p v-for="item in poolDetailListTips[i]" class="partDetail tipsWrap ellipsis" v-show="poolDetailListTips[i].length > 0" :key="item">
-              <template v-for="section in currentTipLis">
-                <span class="tips" v-if="item == section.val" :title="section.name" :key="section.val">{{section.name}}</span>         
-              </template>
-            </p>
+            <template v-for="item in poolDetailListTips[i]" v-show="poolDetailListTips[i].length > 0">
+              <p class="partDetail tipsWrap" :key="item.type">
+                <template v-for="section in currentTipLis">
+                  <span v-if="item.type == section.val" :title="section.name" :key="section.val">{{section.name}}</span>         
+                </template>
+              </p>        
+              <p class="partDetail tipsWrap" :title="item.name" :key="item.type+'--'">{{item.name}}</p> 
+            </template>
           </li>
-        </ul>
+        </ul> 
       </div>
     </div>
     <span class="mutex">互斥项</span>
@@ -260,9 +263,11 @@ export default {
         let tmpLis = list[i];
         if(tmpLis.length > 0){
           for(let j = 0;j < tmpLis.length;j++){
-            let tmpLi = list[i][j];
+            let tmpLi = list[i][j],objTmp={};
             if(!utils.filterArr(poolDetailListTips[i],tmpLi.controlType,2)){
-              poolDetailListTips[i].push(tmpLi.controlType)
+              objTmp.type = tmpLi.controlType
+              objTmp.name = tmpLi.name
+              poolDetailListTips[i].push(objTmp)
             }
             poolDetailListIds[i].push(tmpLi.id)
           }
@@ -419,7 +424,7 @@ export default {
             })
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
-                this.poolDetailList[idx] = tmpArr;
+                this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
                 this.searchTagList();
                 this.getPoolDetailListTips();