Skip to content

D
dsk-cr20g
Commit 7579f082 authored by danfuman's avatar danfuman
Browse files
Options

修改

parent 3016cfb9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 82 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 7579f082
...@@ -307,6 +307,11 @@ ul, li { ...@@ -307,6 +307,11 @@ ul, li {
background: #F0F3FA; background: #F0F3FA;
} }
} }
.el-table__fixed{
box-shadow:none;
height: auto !important;
bottom: 12px;
}
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
} }
......
dsk-operate-ui/src/assets/styles/public.css
View file @ 7579f082
...@@ -342,10 +342,9 @@ select { ...@@ -342,10 +342,9 @@ select {
width: 100px; width: 100px;
display: inline-block; display: inline-block;
margin: 0px 8px; margin: 0px 8px;
}
.el-input__inner { .jabph_popper_box .jabph_popper_wrap .jabph_popper_input .el-input__inner {
width: 100px; width: 100px;
}
} }
.jabph_popper_box div:last-child { .jabph_popper_box div:last-child {
...@@ -582,7 +581,7 @@ select { ...@@ -582,7 +581,7 @@ select {
max-width: 380px; max-width: 380px;
max-height: 400px; max-height: 400px;
overflow: auto; overflow: auto;
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
background-color: #fff; background-color: #fff;
...@@ -679,7 +678,7 @@ select { ...@@ -679,7 +678,7 @@ select {
padding-right: 16px; padding-right: 16px;
display: block; display: block;
margin: 0; margin: 0;
} }
.select-list .el-radio .el-radio__label:hover { .select-list .el-radio .el-radio__label:hover {
...@@ -714,4 +713,4 @@ select { ...@@ -714,4 +713,4 @@ select {
} }
.checkbox .checkbox-content .checkbox-content-qx{ .checkbox .checkbox-content .checkbox-content-qx{
margin-right: 30px; margin-right: 30px;
} }
\ No newline at end of file
dsk-operate-ui/src/views/index.vue
View file @ 7579f082
...@@ -774,6 +774,9 @@ export default { ...@@ -774,6 +774,9 @@ export default {
] ]
} }
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
}, },
initChart1(){ initChart1(){
var rankPic = [ var rankPic = [
...@@ -910,6 +913,9 @@ export default { ...@@ -910,6 +913,9 @@ export default {
], ],
} }
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
}, },
handleClickTab(){ handleClickTab(){
...@@ -1430,6 +1436,7 @@ export default { ...@@ -1430,6 +1436,7 @@ export default {
line-height: 32px; line-height: 32px;
background: #F3F3F4; background: #F3F3F4;
padding-left: 37px; padding-left: 37px;
border: 0;
} }
.el-icon-search{ .el-icon-search{
font-size: 16px; font-size: 16px;
......
dsk-operate-ui/src/views/login.vue
View file @ 7579f082
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
.content{ .content{
width: 1320px; width: 1320px;
margin: 0 auto; margin: 0 auto;
padding-top: 160px; /*padding-top: 180px;*/
} }
.left{ .left{
float: left; float: left;
...@@ -177,13 +177,14 @@ export default { ...@@ -177,13 +177,14 @@ export default {
margin-right: 170px; margin-right: 170px;
} }
.logo{ .logo{
width: 317px; width: 253px;
height: 69px; height: 55px;
margin-bottom: 58px; margin-bottom: 53px;
margin-left: 127px;
} }
.img{ .img{
width: 730px; width: 662px;
height: 624px; height: 566px;
} }
} }
.title { .title {
...@@ -221,6 +222,7 @@ export default { ...@@ -221,6 +222,7 @@ export default {
} }
.el-input__inner{ .el-input__inner{
padding-left: 73px; padding-left: 73px;
border: 0;
} }
} }
.el-input__prefix{ .el-input__prefix{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ 7579f082
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="地区"/> <el-table-column prop="type" label="地区"/>
<el-table-column prop="count" sortable label="招标数量"/> <el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比"/> <el-table-column prop="rate" sortable label="占比" align="right"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="label" label="月份"/> <el-table-column prop="label" label="月份"/>
<el-table-column prop="count" sortable label="招标数量"/> <el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比"/> <el-table-column prop="rate" sortable label="占比" align="right"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -163,7 +163,9 @@ export default { ...@@ -163,7 +163,9 @@ export default {
value:'近五年', value:'近五年',
punishDateShowPopper: false, punishDateShowPopper: false,
punishDate: "", punishDate: "",
yearData:[] yearData:[],
myChart:'',
myChart1:'',
} }
}, },
created() { created() {
...@@ -177,8 +179,22 @@ export default { ...@@ -177,8 +179,22 @@ export default {
getYear().then(res => { getYear().then(res => {
this.yearData=res.rows; this.yearData=res.rows;
}) })
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this.resizeEcharts);
},
activated() {
this.resizeEcharts()
}, },
methods: { methods: {
resizeEcharts (){
const self = this
setTimeout(function(){ //图表跟随页面大小变化宽度
self.myChart.resize()
self.myChart1.resize()
}, 10)
},
getDataByProvince(params){ getDataByProvince(params){
countGroupByProvince(params).then(res => { countGroupByProvince(params).then(res => {
this.tableData=res.data.provinceDate; this.tableData=res.data.provinceDate;
...@@ -199,7 +215,7 @@ export default { ...@@ -199,7 +215,7 @@ export default {
}) })
}, },
initChart() { initChart() {
let myChart = echarts.init(document.getElementById("zb-echarts")) this.myChart = echarts.init(document.getElementById("zb-echarts"))
let option = { let option = {
tooltip: { tooltip: {
trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用 trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
...@@ -252,10 +268,10 @@ export default { ...@@ -252,10 +268,10 @@ export default {
} }
] ]
}; };
myChart.setOption(option); this.myChart.setOption(option);
}, },
initChart1() { initChart1() {
let myChart = echarts.init(document.getElementById("gl-echarts")) this.myChart1 = echarts.init(document.getElementById("gl-echarts"))
let dataList=this.tableData1; let dataList=this.tableData1;
let option = { let option = {
tooltip: { tooltip: {
...@@ -282,7 +298,7 @@ export default { ...@@ -282,7 +298,7 @@ export default {
{ {
data: this.tableData1.map(item => item.count), data: this.tableData1.map(item => item.count),
type: 'bar', type: 'bar',
barWidth: 20, barWidth: 16,
itemStyle: { itemStyle: {
normal: { normal: {
barBorderRadius: [4, 4, 0, 0], barBorderRadius: [4, 4, 0, 0],
...@@ -291,12 +307,12 @@ export default { ...@@ -291,12 +307,12 @@ export default {
var colorList = [] //定义一个存储颜色的数组 var colorList = [] //定义一个存储颜色的数组
//更改前二位柱形颜色 //更改前二位柱形颜色
//定义一个变量 保存柱形图数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存 //定义一个变量 保存柱形图数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
let companyValue1 = JSON.parse(JSON.stringify(dataList)) let dataArr = JSON.parse(JSON.stringify(dataList))
let arr = dataList.sort((a, b) => { let arr = dataList.sort((a, b) => {
return b.count - a.count return b.count - a.count
}) })
//将原数组数据赋值回去 保持数据不变 //将原数组数据赋值回去 保持数据不变
dataList = JSON.parse(JSON.stringify(companyValue1)) dataList = JSON.parse(JSON.stringify(dataArr))
//遍历数据 将原数组和排序后的数组比较 //遍历数据 将原数组和排序后的数组比较
dataList.map(i => { dataList.map(i => {
if (i.count == arr[0].count) { if (i.count == arr[0].count) {
...@@ -315,7 +331,7 @@ export default { ...@@ -315,7 +331,7 @@ export default {
} }
] ]
}; };
myChart.setOption(option); this.myChart1.setOption(option);
}, },
handleDate(command) { handleDate(command) {
if (command && command != "自定义") { if (command && command != "自定义") {
...@@ -433,6 +449,7 @@ export default { ...@@ -433,6 +449,7 @@ export default {
i{ i{
color:#909399; color:#909399;
margin-right: 9px; margin-right: 9px;
font-size: 14px;
} }
} }
.content1{ .content1{
...@@ -507,6 +524,9 @@ export default { ...@@ -507,6 +524,9 @@ export default {
padding: 0; padding: 0;
} }
} }
.el-table__cell.is-right{
text-align: right;
}
} }
} }
} }
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ 7579f082
...@@ -37,21 +37,21 @@ ...@@ -37,21 +37,21 @@
</el-table-column> </el-table-column>
<el-table-column prop="major" label="资质类型"/> <el-table-column prop="major" label="资质类型"/>
<el-table-column label="特级" align="center"> <el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量（个）"/> <el-table-column prop="tjCount" label="数量（个）" align="right"/>
<el-table-column prop="tjRate" label="占比（%）"/> <el-table-column prop="tjRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
<el-table-column label="一级" align="center"> <el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量（个）"/> <el-table-column prop="oneCount" label="数量（个）" align="right"/>
<el-table-column prop="oneRate" label="占比（%）"/> <el-table-column prop="oneRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
<el-table-column label="二级"> <el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量（个）"/> <el-table-column prop="twoCount" label="数量（个）" align="right"/>
<el-table-column prop="twoRate" label="占比（%）"/> <el-table-column prop="twoRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
<el-table-column label="三级"> <el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量（个）"/> <el-table-column prop="threeCount" label="数量（个）" align="right"/>
<el-table-column prop="threeRate" label="占比（%）"/> <el-table-column prop="threeRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -82,21 +82,21 @@ ...@@ -82,21 +82,21 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区"/> <el-table-column prop="province" label="地区"/>
<el-table-column label="特级" align="center"> <el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量（个）"/> <el-table-column prop="tjCount" label="数量（个）" align="right"/>
<el-table-column prop="tjRate" label="占比（%）"/> <el-table-column prop="tjRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
<el-table-column label="一级" align="center"> <el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量（个）"/> <el-table-column prop="oneCount" label="数量（个）" align="right"/>
<el-table-column prop="oneRate" label="占比（%）"/> <el-table-column prop="oneRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
<el-table-column label="二级"> <el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量（个）"/> <el-table-column prop="twoCount" label="数量（个）" align="right"/>
<el-table-column prop="twoRate" label="占比（%）"/> <el-table-column prop="twoRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
<el-table-column label="三级"> <el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量（个）"/> <el-table-column prop="threeCount" label="数量（个）" align="right"/>
<el-table-column prop="threeRate" label="占比（%）"/> <el-table-column prop="threeRate" label="占比（%）" align="right"/>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -124,8 +124,8 @@ ...@@ -124,8 +124,8 @@
<el-table-column label="序号" width="50" align="left"> <el-table-column label="序号" width="50" align="left">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区"/> <el-table-column prop="province" label="地区" />
<el-table-column prop="count" label="企业异地备案数量（个）" sortable/> <el-table-column prop="count" label="企业异地备案数量（个）" sortable align="right"/>
<!--<el-table-column prop="zb" label="占比"/>--> <!--<el-table-column prop="zb" label="占比"/>-->
</el-table> </el-table>
</div> </div>
...@@ -298,8 +298,9 @@ export default { ...@@ -298,8 +298,9 @@ export default {
}) })
areaGroupByProvince().then(res => { areaGroupByProvince().then(res => {
this.zbData=res.data; this.zbData=res.data;
//定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
let arr=this.zbData.sort((old,New)=>{ let dataArr = JSON.parse(JSON.stringify(res.data))
let arr=res.data.sort((old,New)=>{
return New.count - old.count return New.count - old.count
}) })
let data=[] let data=[]
...@@ -307,6 +308,8 @@ export default { ...@@ -307,6 +308,8 @@ export default {
data.push(arr[i]) data.push(arr[i])
} }
this.rankList=data; this.rankList=data;
//将原数组数据赋值回去 保持数据不变
this.zbData = JSON.parse(JSON.stringify(dataArr))
this.initChart2() this.initChart2()
}) })
}, },
...@@ -363,8 +366,11 @@ export default { ...@@ -363,8 +366,11 @@ export default {
} }
] ]
} }
myChart.clear(); myChart.clear(); //图表清除
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
}, },
initChart1() { initChart1() {
let myChart = echarts.init(document.getElementById("jzqy-echarts")) let myChart = echarts.init(document.getElementById("jzqy-echarts"))
...@@ -529,6 +535,9 @@ export default { ...@@ -529,6 +535,9 @@ export default {
} }
myChart.clear(); myChart.clear();
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
}, },
initChart2() { initChart2() {
let myChart = echarts.init(document.getElementById("ba-echarts")) let myChart = echarts.init(document.getElementById("ba-echarts"))
...@@ -585,6 +594,9 @@ export default { ...@@ -585,6 +594,9 @@ export default {
] ]
} }
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
}, },
handleClick(type,index){ handleClick(type,index){
if(type === 1){ if(type === 1){
...@@ -663,6 +675,7 @@ export default { ...@@ -663,6 +675,7 @@ export default {
i{ i{
color:#909399; color:#909399;
margin-right: 9px; margin-right: 9px;
font-size: 14px;
} }
} }
.content1{ .content1{
...@@ -778,6 +791,9 @@ export default { ...@@ -778,6 +791,9 @@ export default {
padding: 0; padding: 0;
} }
} }
.el-table__cell.is-right{
text-align: right;
}
} }
} }
} }
......
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