进度

AutomatedTestPlatform/settings.py

@@ -13,8 +13,8 @@ import logging
 from pathlib import Path
 import os
 
-# ENV_PROFILE = os.getenv("ENV")
-ENV_PROFILE = "macOS"
+ENV_PROFILE = os.getenv("ENV")
+# ENV_PROFILE = "macOS"
 ENV_cmd = os.getenv("CmdRunner")
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -44,7 +44,7 @@ if ENV_PROFILE == "SERVER":
     # 访问资源上传的路径
     WEB_URL = "/home/quant_group/data/Web_Script/"
     CORS_ALLOWED_ORIGINS = (
-        ['http://127.0.0.1:*', 'https://172.16.0.82:*']
+        ['http://127.0.0.1:*', 'http://172.16.0.82:*']
 
     )
 

automated_main/view/testing_progress/PersonnelAllocation/personnel_allocation_view.py

@@ -22,6 +22,11 @@ class PersonnelAllocationView(View):
         testing_progress_list = []
 
         for testing_progress in testing_progress_data:
+            if testing_progress.group == "1":
+                render = "split"
+            else:
+                render = ""
+
             testing_progress_dict = {
                 "text": testing_progress.testing_progress_title,
                 "start_date": testing_progress.start_date,
@@ -30,7 +35,7 @@ class PersonnelAllocationView(View):
                 "parent": testing_progress.parent,
                 "type": testing_progress.type,
                 "end_date": testing_progress.end_date,
-                "group": testing_progress.group,
+                "render": render,
                 "description": testing_progress.description
             }
             testing_progress_list.append(testing_progress_dict)

requirements.txt

@@ -58,11 +58,11 @@ lxml==4.5.0
 MarkupSafe==2.1.1
 mccabe==0.6.1
 multidict==6.0.2
-numpy==1.20.3
+numpy==1.19.5
 openpyxl==2.4.11
 outcome==1.2.0
 packaging==20.9
-pandas==1.2.5
+pandas== 1.1.5
 paramiko==2.7.2
 pipreqs==0.4.11
 pluggy==0.13.1