修改

dsk-operate-ui/src/views/macro/economies/component/comparison.vue

@@ -18,8 +18,8 @@
     </div>
     <div class="table-item">
       <div class="table-title">
-        <span class="title">指标</span>
-        <span class="title">
+        <span class="span-tit">指标</span>
+        <span class="span-tit">
           <span class="address" v-if="value1Flag">{{addressValue1}}<i class="el-icon-circle-close" @click="handleDelete(1)"></i></span>
           <el-cascader
             v-else
@@ -31,7 +31,7 @@
             @change="handleChange(1)"
             placeholder="添加地区"></el-cascader>
         </span>
-        <span class="title">
+        <span class="span-tit">
           <span class="address" v-if="value2Flag">{{addressValue2}}<i class="el-icon-circle-close" @click="handleDelete(2)"></i></span>
           <el-cascader
             v-else
@@ -43,7 +43,7 @@
             @change="handleChange(2)"
             placeholder="添加地区"></el-cascader>
         </span>
-        <span class="title">
+        <span class="span-tit">
           <span class="address" v-if="value3Flag">{{addressValue3}}<i class="el-icon-circle-close" @click="handleDelete(3)"></i></span>
           <el-cascader
             v-else
@@ -55,7 +55,7 @@
             @change="handleChange(3)"
             placeholder="添加地区"></el-cascader>
         </span>
-        <span class="title">
+        <span class="span-tit">
           <span class="address" v-if="value4Flag">{{addressValue4}}<i class="el-icon-circle-close" @click="handleDelete(4)"></i></span>
           <el-cascader
             v-else
@@ -67,7 +67,7 @@
             @change="handleChange(4)"
             placeholder="添加地区"></el-cascader>
         </span>
-        <span class="title">
+        <span class="span-tit">
           <span class="address" v-if="value5Flag">{{addressValue5}}<i class="el-icon-circle-close" @click="handleDelete(5)"></i></span>
           <el-cascader
             v-else
@@ -377,39 +377,40 @@ export default {
     },
     handleVisibleChange(flag,index){
       if(!flag){
-        switch (index) {
-          case 1:
-            this.value1Flag=true
-            break;
-          case 2:
-            this.value2Flag=true
-            break;
-          case 3:
-            this.value3Flag=true
-            break;
-          case 4:
-            this.value4Flag=true
-            break;
-          case 5:
-            this.value5Flag=true
-            break;
-        }
-        const params = { year: this.queryParams.year,type:3 }
-        let code=[];
-        for (var i in this.regionData) {
-          code=this.regionData[i].path
-        }
-        if(code.length >= 1){
-          params.provinceId=code[0]
-        }
-        if(code.length >= 2){
-          params.cityId=code[1]
-        }
-        if(code.length >= 3){
-          params.areaId=code[2]
+        if(this.value1 || this.value2 || this.value3 || this.value4 || this.value5){
+          switch (index) {
+            case 1:
+              this.value1Flag=true
+              break;
+            case 2:
+              this.value2Flag=true
+              break;
+            case 3:
+              this.value3Flag=true
+              break;
+            case 4:
+              this.value4Flag=true
+              break;
+            case 5:
+              this.value5Flag=true
+              break;
+          }
+          const params = { year: this.queryParams.year,type:3 }
+          let code=[];
+          for (var i in this.regionData) {
+            code=this.regionData[i].path
+          }
+          if(code.length >= 1){
+            params.provinceId=code[0]
+          }
+          if(code.length >= 2){
+            params.cityId=code[1]
+          }
+          if(code.length >= 3){
+            params.areaId=code[2]
+          }
+          this.getData(params,index)
         }
-
-        this.getData(params,index)
       }
     },
     handleChange(index) {
@@ -494,20 +495,33 @@ export default {
       switch (index) {
         case 1:
           this.addressValue1='';
+          this.value1='';
+          this.value1Flag=false
           break;
         case 2:
           this.addressValue2='';
+          this.value2='';
+          this.value2Flag=false
           break;
         case 3:
           this.addressValue3='';
+          this.value3='';
+          this.value3Flag=false
           break;
         case 4:
           this.addressValue4='';
+          this.value4='';
+          this.value4Flag=false
           break;
         case 5:
           this.addressValue5='';
+          this.value5='';
+          this.value5Flag=false
           break;
       }
+      this.tableData.splice(index-1,1,{})
+
+      this.$forceUpdate();
     },
     formatStatus: function(row, column, cellValue) {
       if(row.title === '经济'||row.title === '财政'||row.title === '债务'){
@@ -570,7 +584,7 @@ export default {
         /*justify-content:space-around;*/
         border: 1px solid #E6EAF1;
         border-bottom: 0;
-        .title{
+        .span-tit{
           display: inline-block;
           width: 16.7%;
           height: 50px;