Merge remote-tracking branch 'origin/master'

dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue

@@ -191,9 +191,9 @@ export default {
       myChart4:'',
       addressList:[],
       address:[],
-      years:[2023],
-      years1:[2023],
-      years2:[2023],
+      years:[],
+      years1:[],
+      years2:[],
       yearOptions:[],
       gyfsList:[],
       tdytList:[],
@@ -693,6 +693,9 @@ export default {
         Years.push(i);
       }
       this.yearOptions=Years.reverse()
+      this.years=[this.yearOptions[0]]
+      this.years1=[this.yearOptions[0]]
+      this.years2=[this.yearOptions[0]]
     },
     formatStatus: function(row, column, cellValue) {
       return cellValue? cellValue : '-'

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -164,8 +164,8 @@
               <template slot-scope="scope">
                 <!--<router-link  :to="`/groupAccount/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>-->
                 <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>
-                <span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === null || scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
-                <span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
+                <!--<span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === null || scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>-->
+                <!--<span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>-->
               </template>
             </el-table-column>
             <el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">