From 8bc50341836797331b352976723375711cb2a692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 8 Feb 2023 00:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/rpt/index/CompsCard.vue |  6 ++--
 src/views/xm/rpt/index/CompsSet.vue  | 43 ++++++++++++++++------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/views/xm/rpt/index/CompsCard.vue b/src/views/xm/rpt/index/CompsCard.vue
index ef7a3d17..0ace63e6 100644
--- a/src/views/xm/rpt/index/CompsCard.vue
+++ b/src/views/xm/rpt/index/CompsCard.vue
@@ -427,12 +427,14 @@ export default {
                 },200)
             })
         },
-        onCompChange(compCfg,checked){  
-            if(checked=='false'||!checked){
+        onCompChange(compCfg,checked){   
+            if(!checked){
                 var index=this.compCfgList.findIndex(k=>k.compId==compCfg.compId) 
                 if(index>=0){ 
                     this.compCfgList.splice(index,1)   
                 } 
+            }else{
+                this.onCompSelect(compCfg)
             }
         }
          
diff --git a/src/views/xm/rpt/index/CompsSet.vue b/src/views/xm/rpt/index/CompsSet.vue
index 65e094c9..daa7325d 100644
--- a/src/views/xm/rpt/index/CompsSet.vue
+++ b/src/views/xm/rpt/index/CompsSet.vue
@@ -11,14 +11,14 @@
                         <draggable @update="datadragEnd" v-model="datas" style='sort: false' >
 　　                        <transition-group >
                                 <div class="nav_item"  :class="{itemActive: item.isChecked,curr:item.isCurr}" v-for="(item, index) in datas" :key="index" @click="selectItem(item, index)">
-                                    <img :src="item.img" alt="">
-                                    <div class="desc">
-                                        <p>{{index+1}} {{item.rptName}}</p>
-                                        <span>
-                                            {{item.desc}}
-                                        </span>
-                                    </div> 
-                                     <el-checkbox  v-model="item.isChecked"  @change="onChange(item,$event)"></el-checkbox> 
+                                        <img :src="item.img" alt="" >
+                                        <div class="desc">
+                                            <p>{{index+1}} {{item.rptName}}</p>
+                                            <span>
+                                                {{item.desc}}
+                                            </span>
+                                        </div> 
+                                     <span class="check" > <el-checkbox  v-model="item.isChecked"  @click.native='stopDefault($event)' @change="onChange(item,$event)"></el-checkbox>  </span>
                                 </div>
 　　                        </transition-group>
                         </draggable>
@@ -29,14 +29,14 @@
                         <draggable @update="datadragEnd" v-model="datas" style='sort: false' >
 　　                        <transition-group >
                         <div class="nav_item" :class="{itemActive: item.isChecked,curr:item.isCurr}" v-for="(item, index) in datas" :key="index" @click="selectItem(item, index)">
-                            <div class="title"><p>{{index+1}} {{item.rptName}}</p></div> 
-                            <div class="context">
-                                <img :src="item.img" alt=""></img>
-                                <div class="desc">
-                                    <span>{{item.desc}}</span>
+                                 <div class="title"><p>{{index+1}} {{item.rptName}}</p></div> 
+                                <div class="context">
+                                    <img :src="item.img" alt=""></img>
+                                    <div class="desc">
+                                        <span>{{item.desc}}</span>
+                                    </div>
                                 </div>
-                            </div>
-                             <el-checkbox  v-model="item.isChecked" @change="onChange(item,$event)"></el-checkbox> 
+                                <span class="check" > <el-checkbox  v-model="item.isChecked"  @click.native='stopDefault($event)' @change="onChange(item,$event)"></el-checkbox></span>
                         </div>
 　　                        </transition-group>
                         </draggable>
@@ -211,16 +211,18 @@ export default {
             }) 
         },
         onChange(comp,checked){ 
-            this.$emit('change',comp,checked) 
-            if(checked!=='true'){
+            this.$emit('change',comp,checked)  
+            if(checked){
+                this.comps.forEach(k=>k.isCurr=false)
+                item.isCurr=true
+            }else{
                 comp.isCurr=false
             }
         },
         onCategroySelect(){
             this.selectItem(this.rptListCpd[0])
         },
-         selectItem(item){  
-            
+         selectItem(item){    
             this.comps.forEach(k=>k.isCurr=false)
             item.isCurr=true 
             item.isChecked=true;
@@ -232,6 +234,9 @@ export default {
             console.log('拖动前的索引 :' + evt.oldIndex)
             console.log('拖动后的索引 :' + evt.newIndex)  
              this.$emit('sort',evt,this.datas)
+         },
+         stopDefault(e){
+            e.stopPropagation()
          }