diff --git a/Dockerfile b/Dockerfile index 98c9b29..5c8191a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# 从仓库拉取 带有 python 3.7 的 Linux 环境 -FROM python:3.7 +# 从仓库拉取 带有 python 3.8 的 Linux 环境 +FROM python:3.8 # 设置 python 环境变量 ENV PYTHONUNBUFFERED 1 diff --git a/apps/tasks/models.py b/apps/tasks/models.py index 8bd01d8..a50023e 100644 --- a/apps/tasks/models.py +++ b/apps/tasks/models.py @@ -25,7 +25,7 @@ class Todo(models.Model): sub_executor_count = models.CharField('协办人数', max_length=32) 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) - 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( verbose_name='成熟度', max_length=5, diff --git a/apps/tasks/views.py b/apps/tasks/views.py index 76d69bd..8d2e3a6 100644 --- a/apps/tasks/views.py +++ b/apps/tasks/views.py @@ -31,6 +31,7 @@ class IndexView(View): # https://stackoverflow.com/questions/38237777/django-timezone-now-vs-timezone-now @method_decorator(login_required) + #TODO 部门不用部门下用户累加 def get(self, request, year=timezone.now().year, month=timezone.now().month): # 建立username和真实姓名的对应字典,并在工作量计算完成后插入结果集 @@ -343,10 +344,6 @@ class IndexView(View): print(stat_result) # return HttpResponse(result.items()) - - - - # 为页面提供日期信息 date = str(year) + '年' + str(month) + '月' diff --git a/docker-compose.yml b/docker-compose.yml index cb913aa..3ac1955 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,4 +7,4 @@ services: volumes: - .:/code ports: - - "8000:8001" + - "8000:8000" diff --git a/templates/tasks/group_todolist.html b/templates/tasks/group_todolist.html index 0deb800..0644f63 100644 --- a/templates/tasks/group_todolist.html +++ b/templates/tasks/group_todolist.html @@ -58,11 +58,11 @@
# | +序号 | 工作事项 | 完成时间 | 工作要求及交付物 | -任务编号 | +任务编号 | 任务来源 | 承办单位 | 承/督办人 |
---|