add: Docker Update

This commit is contained in:
raiots 2022-04-18 23:57:40 +08:00
parent 6a46184fda
commit fc4bbc748c
5 changed files with 7 additions and 10 deletions

View File

@ -1,5 +1,5 @@
# 从仓库拉取 带有 python 3.7 的 Linux 环境 # 从仓库拉取 带有 python 3.8 的 Linux 环境
FROM python:3.7 FROM python:3.8
# 设置 python 环境变量 # 设置 python 环境变量
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1

View File

@ -25,7 +25,7 @@ class Todo(models.Model):
sub_executor_count = models.CharField('协办人数', max_length=32) sub_executor_count = models.CharField('协办人数', max_length=32)
related_task = models.ForeignKey('Task', related_name='related_task', on_delete=models.CASCADE, verbose_name='年度任务') related_task = models.ForeignKey('Task', related_name='related_task', on_delete=models.CASCADE, verbose_name='年度任务')
predict_work = models.DecimalField('预计工作量', default=0, max_digits=5, decimal_places=1, blank=False) predict_work = models.DecimalField('预计工作量', default=0, max_digits=5, decimal_places=1, blank=False)
evaluate_factor = models.DecimalField('折算系数', max_digits=5, decimal_places=1, blank=True, default='1') evaluate_factor = models.DecimalField('折算系数', max_digits=5, decimal_places=1, blank=True, default='1') #Todo 小数点后2位
maturity = models.CharField( maturity = models.CharField(
verbose_name='成熟度', verbose_name='成熟度',
max_length=5, max_length=5,

View File

@ -31,6 +31,7 @@ class IndexView(View):
# https://stackoverflow.com/questions/38237777/django-timezone-now-vs-timezone-now # https://stackoverflow.com/questions/38237777/django-timezone-now-vs-timezone-now
@method_decorator(login_required) @method_decorator(login_required)
#TODO 部门不用部门下用户累加
def get(self, request, year=timezone.now().year, month=timezone.now().month): def get(self, request, year=timezone.now().year, month=timezone.now().month):
# 建立username和真实姓名的对应字典并在工作量计算完成后插入结果集 # 建立username和真实姓名的对应字典并在工作量计算完成后插入结果集
@ -343,10 +344,6 @@ class IndexView(View):
print(stat_result) print(stat_result)
# return HttpResponse(result.items()) # return HttpResponse(result.items())
# 为页面提供日期信息 # 为页面提供日期信息
date = str(year) + '' + str(month) + '' date = str(year) + '' + str(month) + ''

View File

@ -7,4 +7,4 @@ services:
volumes: volumes:
- .:/code - .:/code
ports: ports:
- "8000:8001" - "8000:8000"

View File

@ -58,11 +58,11 @@
<table class="table" style="word-break: break-all"> <table class="table" style="word-break: break-all">
<thead> <thead>
<tr> <tr>
<th style="width: 16px; text-align:center; vertical-align: middle;">#</th> <th style="width: 16px; text-align:center; vertical-align: middle;">序号</th>
<th style="width: 280px; text-align:center; vertical-align: middle;">工作事项</th> <th style="width: 280px; text-align:center; vertical-align: middle;">工作事项</th>
<th style="width: 100px; text-align:center; vertical-align: middle;">完成时间</th> <th style="width: 100px; text-align:center; vertical-align: middle;">完成时间</th>
<th style="width: 160px; text-align:center; vertical-align: middle;">工作要求及交付物</th> <th style="width: 160px; text-align:center; vertical-align: middle;">工作要求及交付物</th>
<th style="width: 50px; text-align:center; vertical-align: middle;">任务编号</th> <th style="width: 60px; text-align:center; vertical-align: middle;">任务编号</th>
<th style="width: 120px; text-align:center; vertical-align: middle;">任务来源</th> <th style="width: 120px; text-align:center; vertical-align: middle;">任务来源</th>
<th style="width: 120px; text-align:center; vertical-align: middle;">承办单位</th> <th style="width: 120px; text-align:center; vertical-align: middle;">承办单位</th>
<th style="width: 120px;text-align:center; vertical-align: middle;">承/督办人</th> <th style="width: 120px;text-align:center; vertical-align: middle;">承/督办人</th>