Skip to content

F
fgqyxxlr
Commit 8f92b881 by mouthliu
Options

修改非公首页样式

parent e83d9398
Showing with 128 additions and 115 deletions
ruoyi-admin/src/main/resources/templates/main.html
...@@ -25,97 +25,110 @@ ...@@ -25,97 +25,110 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="row border-bottom white-bg dashboard-header"> <div class="row border-bottom white-bg dashboard-header">
<div class="col-sm-12"> <div class="col-sm-12">
<h4 class="form-header h4">统计信息</h4>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${qyzs}"></span></button>-->
<!-- <span>非公企业总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer">
<div class="rad-con">
<p th:text="${qyzs}"></p>
<p>非公企业总数</p>
</div>
</div>
</div>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${qyzs}"></span></button>-->
<!-- <span>非公企业总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer6">
<div class="rad-con">
<p th:text="${qyzyzs}"></p>
<p>正常运营企业数</p>
</div>
</div>
</div>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${qyzs}"></span></button>-->
<!-- <span>非公企业总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer7">
<div class="rad-con">
<p th:text="${gtzs}"></p>
<p>个体户总数</p>
</div>
</div>
</div>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${dzz}"></span></button>-->
<!-- <span>非公企业党组织数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer1">
<div class="rad-con">
<p th:text="${dzz}"></p>
<p>非公党组织数</p>
</div>
</div>
</div>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${fgl}"></span></button>-->
<!-- <span>非公企业党组织覆盖率</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer2">
<div class="rad-con">
<p th:text="${fgl}"></p>
<p>非公企业党组织覆盖率</p>
</div>
</div>
</div>
<div class="ibox float-e-margins">
<div class="col-xs-2" style="float: left;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzzqyzs}"></span></button>--> <div class="ibox-content" style="height: 800px">
<!-- <span>社会组织总数</span>--> <div class="col-xs-2">
<div class="prg-cont rad-prg" id="indicatorContainer3"> <h4 class="form-header h4">统计信息</h4>
<div class="rad-con"> <div class="col-xs-12" style="float: left ;padding-right: 0px;">
<p th:text="${shzzqyzs}"></p> <!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${qyzs}"></span></button>-->
<p>社会组织总数</p> <!-- <span>非公企业总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer">
<div class="rad-con">
<p th:text="${qyzs}"></p>
<p>非公企业总数</p>
</div>
</div>
</div>
<div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${qyzs}"></span></button>-->
<!-- <span>非公企业总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer6">
<div class="rad-con">
<p th:text="${qyzyzs}"></p>
<p>正常运营企业数</p>
</div>
</div>
</div>
<div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${qyzs}"></span></button>-->
<!-- <span>非公企业总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer7">
<div class="rad-con">
<p th:text="${gtzs}"></p>
<p>个体户总数</p>
</div>
</div>
</div>
<div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${dzz}"></span></button>-->
<!-- <span>非公企业党组织数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer1">
<div class="rad-con">
<p th:text="${dzz}"></p>
<p>非公党组织数</p>
</div>
</div>
</div>
<div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${fgl}"></span></button>-->
<!-- <span>非公企业党组织覆盖率</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer2">
<div class="rad-con">
<p th:text="${fgl}"></p>
<p>非公企业党组织覆盖率</p>
</div>
</div>
</div>
</div> </div>
</div> <div class="col-xs-8">
</div> <div style="height:800px;width: 100%;" id="echarts-map-chart"></div>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzz}"></span></button>-->
<!-- <span>社会组织党组织数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer4">
<div class="rad-con">
<p th:text="${shzz}"></p>
<p>社会组织党组织数</p>
</div> </div>
</div> <div class="col-xs-2">
</div> <h4 class="form-header h4">统计信息</h4>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;"> <div class="col-xs-12" style="float: left;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzz}"></span></button>--> <!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzzqyzs}"></span></button>-->
<!-- <span>社会组织党组织数</span>--> <!-- <span>社会组织总数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer8"> <div class="prg-cont rad-prg" id="indicatorContainer3">
<div class="rad-con"> <div class="rad-con">
<p th:text="${shzzzydzzs}"></p> <p th:text="${shzzqyzs}"></p>
<p>正常运营社会组织党组织数</p> <p>社会组织总数</p>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-2" style="float: left ;width: 11%;padding-right: 0px;"> <div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzzfgl}"></span></button>--> <!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzz}"></span></button>-->
<!-- <span>社会组织党组织覆盖率</span>--> <!-- <span>社会组织党组织数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer5"> <div class="prg-cont rad-prg" id="indicatorContainer4">
<div class="rad-con"> <div class="rad-con">
<p th:text="${shzzfgl}"></p> <p th:text="${shzz}"></p>
<p>社会组织党组织覆盖率</p> <p>社会组织党组织数</p>
</div>
</div>
</div>
<div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzz}"></span></button>-->
<!-- <span>社会组织党组织数</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer8">
<div class="rad-con">
<p th:text="${shzzzydzzs}"></p>
<p>正常运营社会组织党组织数</p>
</div>
</div>
</div>
<div class="col-xs-12" style="float: left ;padding-right: 0px;">
<!-- <button class="btn btn-primary dim btn-large-dim" type="button"><span style="font-size: 26px;" th:text="${shzzfgl}"></span></button>-->
<!-- <span>社会组织党组织覆盖率</span>-->
<div class="prg-cont rad-prg" id="indicatorContainer5">
<div class="rad-con">
<p th:text="${shzzfgl}"></p>
<p>社会组织党组织覆盖率</p>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -196,30 +209,30 @@ ...@@ -196,30 +209,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <!-- <div class="row">-->
<div class="col-sm-12"> <!-- <div class="col-sm-12">-->
<h5 style="border-left: 2px solid red;padding-left: 10px;">非公企业和社会组织党组织分布图</h5> <!-- <h5 style="border-left: 2px solid red;padding-left: 10px;">非公企业和社会组织党组织分布图</h5>-->
<div class="ibox float-e-margins"> <!-- <div class="ibox float-e-margins">-->
<div class="ibox-content" style="height: 800px"> <!-- <div class="ibox-content" style="height: 800px">-->
<div style="height:1000px;width: 20%;float: left;padding-top:5%"> <!-- <div style="height:1000px;width: 20%;float: left;padding-top:5%">-->
<div style="height: 600px;width:100%;"> <!-- <div style="height: 600px;width:100%;">-->
<ul id="echart-map-lists"> <!-- <ul id="echart-map-lists">-->
</ul> <!-- </ul>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div style="height:800px;width: 50%;float: left" id="echarts-map-chart"></div> <!-- <div style="height:800px;width: 50%;float: left" id="echarts-map-chart"></div>-->
<div style="height:800px;width: 20%;float: right;padding-top:5%"> <!-- <div style="height:800px;width: 20%;float: right;padding-top:5%">-->
<div style="height: 600px;width:100%;"> <!-- <div style="height: 600px;width:100%;">-->
<ul id="echart-map-listss"> <!-- <ul id="echart-map-listss">-->
</ul> <!-- </ul>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: echarts-js"/> <th:block th:include="include :: echarts-js"/>
...@@ -745,14 +758,14 @@ ...@@ -745,14 +758,14 @@
// orient 设置布局方式，默认水平布局，可选值：'horizontal'（水平） ¦ 'vertical'（垂直） // orient 设置布局方式，默认水平布局，可选值：'horizontal'（水平） ¦ 'vertical'（垂直）
orient: 'vertical', orient: 'vertical',
// x 设置水平安放位置，默认全图居中，可选值：'center' ¦ 'left' ¦ 'right' ¦ {number}（x坐标，单位px） // x 设置水平安放位置，默认全图居中，可选值：'center' ¦ 'left' ¦ 'right' ¦ {number}（x坐标，单位px）
x: 'right', x: 'left',
// y 设置垂直安放位置，默认全图顶端，可选值：'top' ¦ 'bottom' ¦ 'center' ¦ {number}（y坐标，单位px） // y 设置垂直安放位置，默认全图顶端，可选值：'top' ¦ 'bottom' ¦ 'center' ¦ {number}（y坐标，单位px）
y: 'top', y: 'top',
align: 'right', align: 'left',
data: ['非公企业'] data: ['非公企业']
}, },
grid: { grid: {
left: '3%', left: '10%',
right: '4%', right: '4%',
bottom: '3%', bottom: '3%',
containLabel: false containLabel: false
...@@ -814,7 +827,7 @@ ...@@ -814,7 +827,7 @@
data: ['社会组织'] data: ['社会组织']
}, },
grid: { grid: {
left: '3%', left: '10%',
right: '4%', right: '4%',
bottom: '3%', bottom: '3%',
containLabel: false containLabel: false
......
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