Commit a5eb5a82 authored by danfuman's avatar danfuman

修改

parent b1917da8
...@@ -7,7 +7,11 @@ ...@@ -7,7 +7,11 @@
<el-tab-pane label="产业结构" name="third"></el-tab-pane> <el-tab-pane label="产业结构" name="third"></el-tab-pane>
<el-tab-pane label="地区经济对比" name="four"></el-tab-pane> <el-tab-pane label="地区经济对比" name="four"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="location"><i class="el-icon-location"></i>{{province}}</div> <div class="location">
<span><i class="el-icon-location"></i>{{province}}</span>
<el-cascader ref="address" class="cascader-region" popper-class='cascader-region-addd'
@input="addressListbtn" v-model="address" :options="addressList" :props="props" collapse-tags></el-cascader>
</div>
</div> </div>
<RegionalEconomy v-if="activeName === 'first' && province" :dataQuery="dataQuery"></RegionalEconomy> <RegionalEconomy v-if="activeName === 'first' && province" :dataQuery="dataQuery"></RegionalEconomy>
<LocalEconomy v-if="activeName === 'second' && province" :dataQuery="dataQuery"></LocalEconomy> <LocalEconomy v-if="activeName === 'second' && province" :dataQuery="dataQuery"></LocalEconomy>
...@@ -22,6 +26,7 @@ ...@@ -22,6 +26,7 @@
import Comparison from './component/comparison' import Comparison from './component/comparison'
import IndustrialStructure from './component/industrialStructure' import IndustrialStructure from './component/industrialStructure'
import { location } from '@/api/macro/macro' import { location } from '@/api/macro/macro'
import dataRegion from '@/assets/json/dataRegion'
export default { export default {
name: 'Economies', name: 'Economies',
components: { components: {
...@@ -34,7 +39,14 @@ export default { ...@@ -34,7 +39,14 @@ export default {
return { return {
activeName: 'first', activeName: 'first',
dataQuery:{}, dataQuery:{},
province:'' province:'',
props: {
value: 'id',
label: 'label',
checkStrictly: true
},
addressList: [],
address:''
} }
}, },
created() { created() {
...@@ -47,11 +59,11 @@ export default { ...@@ -47,11 +59,11 @@ export default {
this.dataQuery.province=this.province this.dataQuery.province=this.province
} }
}) })
console.log(this.dataQuery)
if(this.dataQuery.activeName){ if(this.dataQuery.activeName){
this.activeName=this.dataQuery.activeName; this.activeName=this.dataQuery.activeName;
} }
this.dataRegion()
// let name = sessionStorage.getItem('currentTab') // let name = sessionStorage.getItem('currentTab')
// if (name != "undefined" && name){ // if (name != "undefined" && name){
// this.activeName = name; // this.activeName = name;
...@@ -64,6 +76,64 @@ export default { ...@@ -64,6 +76,64 @@ export default {
this.activeName='four' this.activeName='four'
} }
// sessionStorage.setItem('currentTab', this.activeName) // sessionStorage.setItem('currentTab', this.activeName)
},
//地区
async dataRegion() {
// await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
// headers: {
// 'Content-Type': 'application/json'
// }
// }).then(res => {
// if (res.data.code == 200) {
// console.log(res.data.data)
// }
// })
var str = [];
for (let x = 0; x < 3; x++) {
for (let i = 0; i < dataRegion.length; i++) {
if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
str.push({
'id': dataRegion[i].id,
"label": dataRegion[i].regionName,
"short": dataRegion[i].short,
"value": dataRegion[i].parentId,
"children": []
});
} else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
for (let j = 0; j < str.length; j++) {
if (str[j].id == dataRegion[i].parentId) {
str[j].children.push({
'id': dataRegion[i].id,
"label": dataRegion[i].regionName,
"short": dataRegion[i].short,
"value": dataRegion[i].parentId,
"children": []
});
}
}
} else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
for (let j = 0; j < str.length; j++) {
for (let k = 0; k < str[j].children.length; k++) {
if (str[j].children[k].id == dataRegion[i].parentId) {
str[j].children[k].children.push({
'id': dataRegion[i].id,
"label": dataRegion[i].regionName,
"short": dataRegion[i].short,
"value": dataRegion[i].parentId
// "children":[]
});
}
}
}
}
}
}
this.addressList = str;
},
addressListbtn() {
let nodesObj = this.$refs.address.getCheckedNodes();
console.log(nodesObj )
console.log(this.address)
} }
} }
} }
...@@ -101,11 +171,22 @@ export default { ...@@ -101,11 +171,22 @@ export default {
} }
} }
.location{ .location{
font-size: 14px; position: relative;
color: #0081FF; span{
i{ font-size: 14px;
margin-right: 6px; cursor: pointer;
font-size: 16px; color: #0081FF;
i{
margin-right: 6px;
font-size: 16px;
}
}
.cascader-region {
position: absolute;
left: 0;
top: -6px;
opacity: 0;
line-height: 22px;
} }
} }
} }
......
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