Skip to content

D
dsk-operate-sys-cscec
Commit a7d1dccf authored by liuChang's avatar liuChang
Browse files
Options

Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

parents c4ade1c9 1e71cbc6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 95 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ a7d1dccf
......@@ -307,6 +307,11 @@ ul, li {
background: #F0F3FA;
}
}
.el-table__fixed{
box-shadow:none;
height: auto !important;
bottom: 12px;
}
.caret-wrapper{
width: 10px;
}
......
dsk-operate-ui/src/assets/styles/public.css
View file @ a7d1dccf
......@@ -353,10 +353,9 @@ select {
width: 100px;
display: inline-block;
margin: 0px 8px;
.el-input__inner {
width: 100px;
}
}
.jabph_popper_box .jabph_popper_wrap .jabph_popper_input .el-input__inner {
width: 100px;
}
.jabph_popper_box div:last-child {
......@@ -593,7 +592,7 @@ select {
max-width: 380px;
max-height: 400px;
overflow: auto;
box-shadow: none;
border-radius: 0;
background-color: #fff;
......@@ -690,7 +689,7 @@ select {
padding-right: 16px;
display: block;
margin: 0;
}
.select-list .el-radio .el-radio__label:hover {
......@@ -725,4 +724,4 @@ select {
}
.checkbox .checkbox-content .checkbox-content-qx{
margin-right: 30px;
}
\ No newline at end of file
}
dsk-operate-ui/src/views/index.vue
View file @ a7d1dccf
......@@ -774,6 +774,9 @@ export default {
]
}
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
initChart1(){
var rankPic = [
......@@ -910,6 +913,9 @@ export default {
],
}
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
handleClickTab(){
......@@ -1430,6 +1436,7 @@ export default {
line-height: 32px;
background: #F3F3F4;
padding-left: 37px;
border: 0;
}
.el-icon-search{
font-size: 16px;
......
dsk-operate-ui/src/views/login.vue
View file @ a7d1dccf
......@@ -169,7 +169,7 @@ export default {
.content{
width: 1320px;
margin: 0 auto;
padding-top: 160px;
/*padding-top: 180px;*/
}
.left{
float: left;
......@@ -177,13 +177,14 @@ export default {
margin-right: 170px;
}
.logo{
width: 317px;
height: 69px;
margin-bottom: 58px;
width: 253px;
height: 55px;
margin-bottom: 53px;
margin-left: 127px;
}
.img{
width: 730px;
height: 624px;
width: 662px;
height: 566px;
}
}
.title {
......@@ -221,6 +222,7 @@ export default {
}
.el-input__inner{
padding-left: 73px;
border: 0;
}
}
.el-input__prefix{
......
dsk-operate-ui/src/views/macro/economies/index.vue
View file @ a7d1dccf
......@@ -7,7 +7,11 @@
<el-tab-pane label="产业结构" name="third"></el-tab-pane>
<el-tab-pane label="地区经济对比" name="four"></el-tab-pane>
</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>
<RegionalEconomy v-if="activeName === 'first' && province" :dataQuery="dataQuery"></RegionalEconomy>
<LocalEconomy v-if="activeName === 'second' && province" :dataQuery="dataQuery"></LocalEconomy>
......@@ -22,6 +26,7 @@
import Comparison from './component/comparison'
import IndustrialStructure from './component/industrialStructure'
import { location } from '@/api/macro/macro'
import dataRegion from '@/assets/json/dataRegion'
export default {
name: 'Economies',
components: {
......@@ -34,7 +39,14 @@ export default {
return {
activeName: 'first',
dataQuery:{},
province:''
province:'',
props: {
value: 'id',
label: 'label',
checkStrictly: true
},
addressList: [],
address:''
}
},
created() {
......@@ -47,11 +59,11 @@ export default {
this.dataQuery.province=this.province
}
})
console.log(this.dataQuery)
if(this.dataQuery.activeName){
this.activeName=this.dataQuery.activeName;
}
this.dataRegion()
// let name = sessionStorage.getItem('currentTab')
// if (name != "undefined" && name){
// this.activeName = name;
......@@ -64,6 +76,64 @@ export default {
this.activeName='four'
}
// 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 {
}
}
.location{
font-size: 14px;
color: #0081FF;
i{
margin-right: 6px;
font-size: 16px;
position: relative;
span{
font-size: 14px;
cursor: pointer;
color: #0081FF;
i{
margin-right: 6px;
font-size: 16px;
}
}
.cascader-region {
position: absolute;
left: 0;
top: -6px;
opacity: 0;
line-height: 22px;
}
}
}
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ a7d1dccf
......@@ -37,7 +37,8 @@
</el-table-column>
<el-table-column label="公司名称" align="left" width="300" fixed>
<template slot-scope="scope">
<router-link to="" tag="a" class="a-link" v-html="scope.row.name"></router-link>
<router-link v-if="scope.row.jskEid" :to="`/company/${encodeStr(scope.row.jskEid)}`" tag="a" class="a-link" v-html="scope.row.name" ></router-link>
<span v-else v-html="scope.row.name" ></span>
</template>
</el-table-column>
<el-table-column label="注册地址" prop="domicile" width="150"/>
......@@ -68,6 +69,7 @@
// import LocalEnterprises from './component/localEnterprises'
// import Offsite from './component/offsite'
import {encodeStr} from "@/assets/js/common.js"
import aptitudeCode from '@/assets/json/aptitudeCode'
import { enterprise,location } from '@/api/macro/macro'
export default {
......@@ -75,6 +77,7 @@ export default {
// components: {LocalEnterprises,Offsite},
data() {
return {
encodeStr,
activeName: 'first',
queryParams:{
ename:'',
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ a7d1dccf
......@@ -68,8 +68,8 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="地区"/>
<el-table-column prop="count" sortable label="招标数量"/>
<el-table-column prop="rate" sortable label="占比"/>
<el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比" align="right"/>
</el-table>
</div>
</div>
......@@ -103,8 +103,8 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="label" label="月份"/>
<el-table-column prop="count" sortable label="招标数量"/>
<el-table-column prop="rate" sortable label="占比"/>
<el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比" align="right"/>
</el-table>
</div>
</div>
......@@ -163,7 +163,9 @@ export default {
value:'近五年',
punishDateShowPopper: false,
punishDate: "",
yearData:[]
yearData:[],
myChart:'',
myChart1:'',
}
},
created() {
......@@ -177,8 +179,22 @@ export default {
getYear().then(res => {
this.yearData=res.rows;
})
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this.resizeEcharts);
},
activated() {
this.resizeEcharts()
},
methods: {
resizeEcharts (){
const self = this
setTimeout(function(){ //图表跟随页面大小变化宽度
self.myChart.resize()
self.myChart1.resize()
}, 10)
},
getDataByProvince(params){
countGroupByProvince(params).then(res => {
this.tableData=res.data.provinceDate;
......@@ -199,7 +215,7 @@ export default {
})
},
initChart() {
let myChart = echarts.init(document.getElementById("zb-echarts"))
this.myChart = echarts.init(document.getElementById("zb-echarts"))
let option = {
tooltip: {
trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
......@@ -252,10 +268,10 @@ export default {
}
]
};
myChart.setOption(option);
this.myChart.setOption(option);
},
initChart1() {
let myChart = echarts.init(document.getElementById("gl-echarts"))
this.myChart1 = echarts.init(document.getElementById("gl-echarts"))
let dataList=this.tableData1;
let option = {
tooltip: {
......@@ -282,7 +298,7 @@ export default {
{
data: this.tableData1.map(item => item.count),
type: 'bar',
barWidth: 20,
barWidth: 16,
itemStyle: {
normal: {
barBorderRadius: [4, 4, 0, 0],
......@@ -291,12 +307,12 @@ export default {
var colorList = [] //定义一个存储颜色的数组
//更改前二位柱形颜色
//定义一个变量 保存柱形图数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
let companyValue1 = JSON.parse(JSON.stringify(dataList))
let dataArr = JSON.parse(JSON.stringify(dataList))
let arr = dataList.sort((a, b) => {
return b.count - a.count
})
//将原数组数据赋值回去 保持数据不变
dataList = JSON.parse(JSON.stringify(companyValue1))
dataList = JSON.parse(JSON.stringify(dataArr))
//遍历数据 将原数组和排序后的数组比较
dataList.map(i => {
if (i.count == arr[0].count) {
......@@ -315,7 +331,7 @@ export default {
}
]
};
myChart.setOption(option);
this.myChart1.setOption(option);
},
handleDate(command) {
if (command && command != "自定义") {
......@@ -433,6 +449,7 @@ export default {
i{
color:#909399;
margin-right: 9px;
font-size: 14px;
}
}
.content1{
......@@ -507,6 +524,9 @@ export default {
padding: 0;
}
}
.el-table__cell.is-right{
text-align: right;
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ a7d1dccf
......@@ -37,21 +37,21 @@
</el-table-column>
<el-table-column prop="major" label="资质类型"/>
<el-table-column label="特级" align="center">
<el-table-column prop="tjCount" label="数量（个）"/>
<el-table-column prop="tjRate" label="占比（%）"/>
<el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量（个）" align="right"/>
<el-table-column prop="tjRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="一级" align="center">
<el-table-column prop="oneCount" label="数量（个）"/>
<el-table-column prop="oneRate" label="占比（%）"/>
<el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量（个）" align="right"/>
<el-table-column prop="oneRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="二级">
<el-table-column prop="twoCount" label="数量（个）"/>
<el-table-column prop="twoRate" label="占比（%）"/>
<el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量（个）" align="right"/>
<el-table-column prop="twoRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="三级">
<el-table-column prop="threeCount" label="数量（个）"/>
<el-table-column prop="threeRate" label="占比（%）"/>
<el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量（个）" align="right"/>
<el-table-column prop="threeRate" label="占比（%）" align="right"/>
</el-table-column>
</el-table>
</div>
......@@ -82,21 +82,21 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区"/>
<el-table-column label="特级" align="center">
<el-table-column prop="tjCount" label="数量（个）"/>
<el-table-column prop="tjRate" label="占比（%）"/>
<el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量（个）" align="right"/>
<el-table-column prop="tjRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="一级" align="center">
<el-table-column prop="oneCount" label="数量（个）"/>
<el-table-column prop="oneRate" label="占比（%）"/>
<el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量（个）" align="right"/>
<el-table-column prop="oneRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="二级">
<el-table-column prop="twoCount" label="数量（个）"/>
<el-table-column prop="twoRate" label="占比（%）"/>
<el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量（个）" align="right"/>
<el-table-column prop="twoRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="三级">
<el-table-column prop="threeCount" label="数量（个）"/>
<el-table-column prop="threeRate" label="占比（%）"/>
<el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量（个）" align="right"/>
<el-table-column prop="threeRate" label="占比（%）" align="right"/>
</el-table-column>
</el-table>
</div>
......@@ -124,8 +124,8 @@
<el-table-column label="序号" width="50" align="left">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区"/>
<el-table-column prop="count" label="企业异地备案数量（个）" sortable/>
<el-table-column prop="province" label="地区" />
<el-table-column prop="count" label="企业异地备案数量（个）" sortable align="right"/>
<!--<el-table-column prop="zb" label="占比"/>-->
</el-table>
</div>
......@@ -298,8 +298,9 @@ export default {
})
areaGroupByProvince().then(res => {
this.zbData=res.data;
let arr=this.zbData.sort((old,New)=>{
//定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
let dataArr = JSON.parse(JSON.stringify(res.data))
let arr=res.data.sort((old,New)=>{
return New.count - old.count
})
let data=[]
......@@ -307,6 +308,8 @@ export default {
data.push(arr[i])
}
this.rankList=data;
//将原数组数据赋值回去 保持数据不变
this.zbData = JSON.parse(JSON.stringify(dataArr))
this.initChart2()
})
},
......@@ -363,8 +366,11 @@ export default {
}
]
}
myChart.clear();
myChart.clear(); //图表清除
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
initChart1() {
let myChart = echarts.init(document.getElementById("jzqy-echarts"))
......@@ -529,6 +535,9 @@ export default {
}
myChart.clear();
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
initChart2() {
let myChart = echarts.init(document.getElementById("ba-echarts"))
......@@ -585,6 +594,9 @@ export default {
]
}
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
handleClick(type,index){
if(type === 1){
......@@ -663,6 +675,7 @@ export default {
i{
color:#909399;
margin-right: 9px;
font-size: 14px;
}
}
.content1{
......@@ -778,6 +791,9 @@ export default {
padding: 0;
}
}
.el-table__cell.is-right{
text-align: right;
}
}
}
}
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ a7d1dccf
......@@ -154,15 +154,18 @@
</el-table-column>
<el-table-column prop="companyName" label="公司名称" width="300" fixed>
<template slot-scope="scope">
<p class="companyName">{{ scope.row.companyName }}</p>
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a companyName" v-html="scope.row.companyName" ></router-link>
<span class="table-span" style="color: #3D3D3D;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
<span class="table-span" style="color: rgba(35,35,35,0.4);" v-if="scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
</template>
</el-table-column>
<el-table-column prop="city" label="区域" :formatter="formatStatus" width="100">
<!--<template slot-scope="scope">-->
<!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
<!--</template>-->
<template slot-scope="scope">
<router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">
{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
</router-link>
<!--<span v-else>-</span>-->
</template>
</el-table-column>
<el-table-column prop="biddingCount" label="招标数量" :formatter="formatStatus" sortable="custom" width="120" />
<el-table-column prop="landInfoCount" label="城投拿地" :formatter="formatStatus" sortable="custom" width="100" />
......@@ -233,12 +236,14 @@
</template>
<script>
import {encodeStr} from "@/assets/js/common.js"
import dataRegion from '@/assets/json/dataRegion'
import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics } from '@/api/macro/macro'
export default {
name: 'Urban',
data() {
return {
encodeStr,
queryParams:{
keyword:'',
uipExecutiveLevel:'', //行政级别
......
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