xieshen
/
drought
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#5

This commit is contained in:
RS 2018-07-08 12:31:22 +08:00
parent 869ac35743
commit b626b9381d
13 changed files with 61 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard/templates/dashboard/admdiv_list.html
View File

@ -26,8 +26,8 @@
</a> </a>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-admdiv-list' %}" class="btn btn-white btn-sm"> <a href="admdiv_chart.html" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

65
dashboard/templates/dashboard/country_chart.html
View File

@ -18,72 +18,7 @@
<a href="{% url 'data-country-add' %}" class="btn btn-primary btn-xs">新建</a> <a href="{% url 'data-country-add' %}" class="btn btn-primary btn-xs">新建</a>
</div> </div>
</div> </div>
<div class="ibox-content">
<div class="row m-b-sm m-t-sm">
<div class="col-md-1">
<a href="{% url 'data-country-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 刷新
</a>
</div>
<div class="col-md-1">
<a href="#" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表
</a>
</div>
<div class="col-md-10">
<form method="get" style="width: 100%">
<div class="input-group">
<input type="text" placeholder="按标题搜索" class="input-sm form-control" name="keyword"
value="{{ keyword }}">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm btn-primary"><i
class="fa fa-search"></i> 搜索 </button>
</span>
</div>
</form>
</div>
<div class="col-md-12" style="margin-top: 20px;">
<div class="list-group" style="margin-bottom: 0">
<div class="list-group-item disabled">
<div class="row">
<div class="col-md-4">区域</div>
<div class="col-md-2">区域面积</div>
<div class="col-md-2">耕地面积</div>
<div class="col-md-2">总人口</div>
<div class="col-md-2">操作</div>
</div>
</div>
{% for country in countries %}
<div class="list-group-item">
<div class="row">
<div class="col-md-4">{{ country.name }}</div>
<div class="col-md-2">{{ country.area }}</div>
<div class="col-md-2">{{ country.arable_land_area }}</div>
<div class="col-md-2">{{ country.population }}</div>
<div class="col-md-2">
<a href="{% url 'data-country-detail' country.id %}"
class="btn btn-default btn-xs">查看</a>
<a href="{% url 'data-country-update' country.id %}"
class="btn btn-default btn-xs">修改</a>
<a href="{% url 'data-country-delete' country.id %}"
class="btn btn-danger btn-xs">删除</a>
</div>
</div>
</div>
{% empty %}
<div class="list-group-item" style="text-align: center">暂无数据.</div>
{% endfor %}
</div>
</div>
{% if is_paginated %}
<div class="col-md-12">
{% bootstrap_pagination page_obj size='small' extra=request.GET.urlencode %}
</div>
{% endif %}
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}

4
dashboard/templates/dashboard/country_list.html
View File

@ -26,8 +26,8 @@
</a> </a>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="#" class="btn btn-white btn-sm"> <a href="{% url 'country_chart' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

2
dashboard/templates/dashboard/crop_list.html
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-crop-list' %}" class="btn btn-white btn-sm"> <a href="{% url 'data-crop-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

2
dashboard/templates/dashboard/finance_list.html
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-finance-list' %}" class="btn btn-white btn-sm"> <a href="{% url 'data-finance-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

2
dashboard/templates/dashboard/hydro_list.html
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-hydro-list' %}" class="btn btn-white btn-sm"> <a href="{% url 'data-hydro-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

2
dashboard/templates/dashboard/landuse_list.html
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-landuse-list' %}" class="btn btn-white btn-sm"> <a href="{% url 'data-landuse-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

2
dashboard/templates/dashboard/popu_list.html
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-popu-list' %}" class="btn btn-white btn-sm"> <a href="{% url 'data-popu-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

65
dashboard/templates/dashboard/spi_chart.html
View File

@ -18,72 +18,7 @@
<a href="{% url 'data-country-add' %}" class="btn btn-primary btn-xs">新建</a> <a href="{% url 'data-country-add' %}" class="btn btn-primary btn-xs">新建</a>
</div> </div>
</div> </div>
<div class="ibox-content">
<div class="row m-b-sm m-t-sm">
<div class="col-md-1">
<a href="{% url 'data-country-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 刷新
</a>
</div>
<div class="col-md-1">
<a href="#" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表
</a>
</div>
<div class="col-md-10">
<form method="get" style="width: 100%">
<div class="input-group">
<input type="text" placeholder="按标题搜索" class="input-sm form-control" name="keyword"
value="{{ keyword }}">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm btn-primary"><i
class="fa fa-search"></i> 搜索 </button>
</span>
</div>
</form>
</div>
<div class="col-md-12" style="margin-top: 20px;">
<div class="list-group" style="margin-bottom: 0">
<div class="list-group-item disabled">
<div class="row">
<div class="col-md-4">区域</div>
<div class="col-md-2">区域面积</div>
<div class="col-md-2">耕地面积</div>
<div class="col-md-2">总人口</div>
<div class="col-md-2">操作</div>
</div>
</div>
{% for country in countries %}
<div class="list-group-item">
<div class="row">
<div class="col-md-4">{{ country.name }}</div>
<div class="col-md-2">{{ country.area }}</div>
<div class="col-md-2">{{ country.arable_land_area }}</div>
<div class="col-md-2">{{ country.population }}</div>
<div class="col-md-2">
<a href="{% url 'data-country-detail' country.id %}"
class="btn btn-default btn-xs">查看</a>
<a href="{% url 'data-country-update' country.id %}"
class="btn btn-default btn-xs">修改</a>
<a href="{% url 'data-country-delete' country.id %}"
class="btn btn-danger btn-xs">删除</a>
</div>
</div>
</div>
{% empty %}
<div class="list-group-item" style="text-align: center">暂无数据.</div>
{% endfor %}
</div>
</div>
{% if is_paginated %}
<div class="col-md-12">
{% bootstrap_pagination page_obj size='small' extra=request.GET.urlencode %}
</div>
{% endif %}
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}

2
dashboard/templates/dashboard/spi_list.html
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<a href="{% url 'data-spi-list' %}" class="btn btn-white btn-sm"> <a href="{% url 'data-spi-list' %}" class="btn btn-white btn-sm">
<i class="fa fa-refresh"></i> 图表 <i class="glyphicon glyphicon-equalizer"></i> 图表
</a> </a>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

9
dashboard/urls.py
View File

@ -59,4 +59,13 @@ urlpatterns = [
path('admdiv/<str:pk>/delete/', AdmdivDeleteView.as_view(), name='data-admdiv-delete'), path('admdiv/<str:pk>/delete/', AdmdivDeleteView.as_view(), name='data-admdiv-delete'),
path('admdiv/<str:pk>/detail/', AdmdivDetailView.as_view(), name='data-admdiv-detail'), path('admdiv/<str:pk>/detail/', AdmdivDetailView.as_view(), name='data-admdiv-detail'),
path('country_chart/',views.country_chart,name='country_chart'),
path('admdiv_chart/',views.admdiv_chart,name='admdiv_chart'),
path('crop_chart/',views.crop_chart,name='crop_chart'),
path('finance_chart/',views.finance_chart,name='finance_chart'),
path('hydro_chart/',views.hydro_chart,name='hydro_chart'),
path('landuse_chart/',views.landuse_chart,name='landuse_chart'),
path('popu_chart/',views.popu_chart,name='popu_chart'),
path('spi_chart/',views.spi_chart,name='spi_chart'),
] ]

15
dashboard/views.py
View File

@ -55,21 +55,36 @@ class CountryDeleteView(DeleteView):
def country_chart(request): def country_chart(request):
return render(request, 'dashboard/country_chart.html') return render(request, 'dashboard/country_chart.html')
def admdiv_chart(request): def admdiv_chart(request):
return render(request, 'dashboard/admdiv_chart.html') return render(request, 'dashboard/admdiv_chart.html')
def crop_chart(request): def crop_chart(request):
return render(request, 'dashboard/crop_chart.html') return render(request, 'dashboard/crop_chart.html')
def finance_chart(request): def finance_chart(request):
return render(request, 'dashboard/finance_chart.html') return render(request, 'dashboard/finance_chart.html')
def hydro_chart(request): def hydro_chart(request):
return render(request, 'dashboard/hydro_chart.html') return render(request, 'dashboard/hydro_chart.html')
def landuse_chart(request): def landuse_chart(request):
return render(request, 'dashboard/landuse_chart.html') return render(request, 'dashboard/landuse_chart.html')
def popu_chart(request): def popu_chart(request):
return render(request, 'dashboard/popu_chart.html') return render(request, 'dashboard/popu_chart.html')
def spi_chart(request): def spi_chart(request):
return render(request, 'dashboard/spi_chart.html') return render(request, 'dashboard/spi_chart.html')
@method_decorator(login_required, name='dispatch') @method_decorator(login_required, name='dispatch')
class SpiListView(ListView): class SpiListView(ListView):
context_object_name = 'spis' context_object_name = 'spis'

19
graphic/import/update_test1.py Normal file
View File

@ -0,0 +1,19 @@
import uuid
import psycopg2
G = 'host=210.77.68.250 port=5432 dbname=geobrought user=brought password=g214G214'
GT = 'host=210.77.68.250 port=5432 dbname=brought user=brought password=g214G214'
if __name__ == '__main__':
with psycopg2.connect(G) as connection:
with connection.cursor() as cursor:
cursor.execute('select * from test1;')
results = cursor.fetchall()
for r in results:
id = r[0]
cursor.execute('update added = ')