Skip to content

D
dsk-cr20g
Commit 52629709 authored by chenyuefang's avatar chenyuefang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 01b30040 73d9bc9a
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue
View file @ 52629709
...@@ -191,9 +191,9 @@ export default { ...@@ -191,9 +191,9 @@ export default {
myChart4:'', myChart4:'',
addressList:[], addressList:[],
address:[], address:[],
years:[2023], years:[],
years1:[2023], years1:[],
years2:[2023], years2:[],
yearOptions:[], yearOptions:[],
gyfsList:[], gyfsList:[],
tdytList:[], tdytList:[],
...@@ -693,6 +693,9 @@ export default { ...@@ -693,6 +693,9 @@ export default {
Years.push(i); Years.push(i);
} }
this.yearOptions=Years.reverse() this.yearOptions=Years.reverse()
this.years=[this.yearOptions[0]]
this.years1=[this.yearOptions[0]]
this.years2=[this.yearOptions[0]]
}, },
formatStatus: function(row, column, cellValue) { formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-' return cellValue? cellValue : '-'
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 52629709
...@@ -164,8 +164,8 @@ ...@@ -164,8 +164,8 @@
<template slot-scope="scope"> <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="`/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> <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="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="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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="city" label="区域" :formatter="formatStatus" width="150"> <el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment