改bug

Dockerfile

@@ -1,4 +1,4 @@
-From python:3.9
+FROM python:3.9
 
 MAINTAINER Liufan<1649750212@qq.com>
 ENV PYTHONUNBUFFERED 1

apps/software/views/report.py

@@ -29,7 +29,6 @@ class Report(APIView):
                 word_list[i] = str(word_list[i])
         return word_list
 
-    # generate report
     @staticmethod
     # @RoleControl
     def get(request, software_id, *args, **kwargs):
@@ -39,56 +38,62 @@ class Report(APIView):
             return HttpResponse(status=404, content='软件已删除或不存在')
         software = software[0]
 
-        executor_id = request.GET.get('executor_id')
-        if not executor_id:
-            logger.error("测试人员id不能为空")
-            return HttpResponse(status=404, content="测试人员id不能为空")
-        cases_info = {}
-        cases = software.testcase_set.filter(executor_id=executor_id, delete=False)
-        executors = set()
-        if cases:
-            for case in cases:
-                state = '未执行'
-                if case.state == 1:
-                    state = '执行成功'
-                elif case.state == 2:
-                    state = '执行失败'
-                cases_info[case.id_in_task] = {
-                    'id': case.id_in_task,
-                    'version': case.version,
-                    'name': case.name,
-                    'requisite': case.requisite,
-                    'priority': case.priority,
-                    'environment': case.environment,
-                    'type': case.type,
-                    'process': case.process,
-                    'expected_result': case.expected_result,
-                    'actual_result': case.actual_result,
-                    'state': state,
-                    'writer': case.writer,
-                    'assessor': case.assessor,
-                    'executor': case.executor,
-                    'remark': case.remark,
-                    'execute_time': str(case.update_time)[:10]
-                }
-                executors.add(case.executor)
-
-        creators = []
-        plans = software.testplan_set.filter(delete=False)
-        if plans:
-            for plan in plans:
-                creators.append(plan.creator.name)
-
-        version_number = software.version_set.order_by('-create_time')[0].number
-
-        file_name = '软件测试报告.docx'
-        print(str(software.create_time).split(' ')[0])
-        document = util_doc.process_doc(software.name, software.type, version_number, str(software.create_time)
-                                        .split(' ')[0], executors, cases_info)
-
-        response = HttpResponse(content_type='application/octet-stream')
-        response['Content-Disposition'] = 'attachment; filename="{0}"'.format(file_name).encode('utf-8', 'ISO-8859-1')
-        document.save(response)
+        beidou_cases = BeidouCase.objects.order_by('-create_time')
+
+        beidou_cases = beidou_cases.filter(software_id=software_id)
+
+        version = request.GET.get('version')
+        if version:
+            beidou_cases = beidou_cases.filter(version=version)
+
+        export_type = request.GET.get('export_type')
+
+        file_name = software.name + '-全部测试用例.xls'
+        if export_type:
+            if export_type == '2':
+                file_name = software.name + '-不合格测试用例.xls'
+                beidou_cases = beidou_cases.filter(state=2)
+
+        if not beidou_cases:
+            logger.error("无符合要求的测试用例")
+            return HttpResponse(status=404, content='无符合要求的测试用例')
+
+        update_time = datetime.datetime.now()
+        file_dir = SOFTWARE_ROOT + "/" + str(update_time)
+        if not os.path.exists(file_dir):
+            os.makedirs(file_dir)
+        file_path = file_dir + "/" + file_name
+
+        cases_info = [
+            ['测试项目', '版本', '测试内容', '定位精度', '定时精度', '伪距测量精度', '载波测量精度', '测速精度',
+             '捕获灵敏度', '接收灵敏度', '跟踪灵敏度', '功率范围', '自主完好性', '系统完好性', '首次捕获时间',
+             '失锁重捕时间', '定位测速更新率', '跟踪通道数', '最大速度', '最大加速度', '执行结果', '测试人员', '备注']]
+
+        for case in beidou_cases:
+            power = ''
+            if case.power_range_low and case.power_range_high:
+                power = str(case.power_range_low) + '-' + str(case.power_range_high)
+            state = '成功'
+            if case.state == 2:
+                state = '失败'
+            executor_name = User.objects.filter(id=case.executor_id)[0].username
+
+            cases_info.append(Report.convert_to_string(
+                [software.name, case.version, case.title, case.positioning_accuracy, case.timing_accuracy,
+                 case.pseudo_range_measurement_accuracy, case.carrier_measurement_accuracy,
+                 case.speed_measurement_accuracy, case.sensitivity_capture, case.receiving_sensitivity,
+                 case.sensitivity_track, power, case.self_integrity, case.system_integrity, case.capture_time,
+                 case.recapture_time, case.update_rate, case.trace_channels, case.max_velocity, case.max_acceleration,
+                 state, executor_name, case.remark]
+            ))
+
+        sio = write_to_xlsx(file_path, cases_info)
+        sio.seek(0)
+        response = HttpResponse(sio.getvalue(), content_type='application/vnd.ms-excel')
+        # response['Content-Disposition'] = 'attachment; filename*=UTF-8''{}'.format(escape_uri_path(file_name))
+        response['Content-Disposition'] = 'attachment; filename="{0}"'.format(file_name).encode('utf-8',
+                                                                                                'ISO-8859-1')
+        response.write(sio.getvalue())
         # executor, action, method = get_log(request)
         # gen_log(action, "测试任务", task.title, method, executor)
         return response

apps/software/views/versionlistview.py

@@ -3,7 +3,7 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from apps.software.models import Software, Version
-from apps.task.models import TestCase
+from apps.task.models import TestCase, BeidouCase
 from apps.user.middleware.rolecontrol import RoleControl
 
 import logging
@@ -39,7 +39,7 @@ class VersionListView(APIView):
 
         for version in version_all:
             software = Software.objects.filter(id=version.software_id, delete=False)[0]
-            fail_num = len(TestCase.objects.filter(software=software, version=version.number, state=2, delete=False))
+            fail_num = len(BeidouCase.objects.filter(software=software, version=version.number, state=2, delete=False))
             version_infos.append({
                 'software_id': software.id,
                 'software_name': software.name,

apps/software/views/versionview.py

@@ -9,8 +9,9 @@ from TestLaboratory.settings import SOFTWARE_ROOT, CASE_FILE_EXPORT
 from apps.file.models import FileManager
 from apps.log.models import get_log, gen_log
 from apps.software.models import Software, Version
-from apps.task.models import TestCase
+from apps.task.models import TestCase, BeidouCase
 from apps.user.middleware.rolecontrol import RoleControl
+from apps.user.models import User
 from util_xlsx import write_to_xlsx
 from utils.util_add_id import gen_next_id
 
@@ -25,6 +26,15 @@ logger = logging.getLogger('django')
 class VersionView(APIView):
     authentication_classes = []
 
+    @staticmethod
+    def convert_to_string(word_list):
+        for i in range(len(word_list)):
+            if word_list[i] is None:
+                word_list[i] = ''
+            elif not isinstance(word_list[i], str):
+                word_list[i] = str(word_list[i])
+        return word_list
+
     # create version
     @staticmethod
     @RoleControl
@@ -190,13 +200,13 @@ class VersionView(APIView):
         cases = None
         file_name = None
         if export_type == '0':
-            cases = TestCase.objects.filter(software=software, version=version_number, delete=False)
+            cases = BeidouCase.objects.filter(software=software, version=version_number, delete=False)
             file_name = '全部测试用例.xls'
         elif export_type == '1':
-            cases = TestCase.objects.filter(~Q(state=0), software=software, version=version_number, delete=False)
+            cases = BeidouCase.objects.filter(~Q(state=0), software=software, version=version_number, delete=False)
             file_name = '已执行测试用例.xls'
         else:
-            cases = TestCase.objects.filter(software=software, version=version_number, state=2, delete=False)
+            cases = BeidouCase.objects.filter(software=software, version=version_number, state=2, delete=False)
             file_name = '不合格测试用例.xls'
 
         if not cases:
@@ -209,27 +219,37 @@ class VersionView(APIView):
             os.makedirs(file_dir)
         file_path = file_dir + "/" + file_name
 
-        cases_info = [['被测软件ID：', software_id],
-                      ['被测软件名：', software.name],
-                      ['被测软件版本', version_number],
-                      ['编号', '名称', '前置条件', '优先级', '测试环境', '测试类型', '测试步骤', '预期结果', '实际结果', '状态',
-                       '编写人', '评审员', '执行人', '备注']]
+        cases_info = [
+            ['测试项目', '版本', '测试内容', '定位精度', '定时精度', '伪距测量精度', '载波测量精度', '测速精度',
+             '捕获灵敏度', '接收灵敏度', '跟踪灵敏度', '功率范围', '自主完好性', '系统完好性', '首次捕获时间',
+             '失锁重捕时间', '定位测速更新率', '跟踪通道数', '最大速度', '最大加速度', '执行结果', '测试人员', '备注']]
 
         for case in cases:
-            state = '未执行'
-            if case.state == 1:
-                state = '执行成功'
-            elif case.state == 2:
-                state = '执行失败'
-            cases_info.append([case.id_in_task, case.name, case.requisite, case.priority, case.environment,
-                               case.type, case.process, case.expected_result, case.actual_result, state,
-                               case.writer, case.assessor, case.executor, case.remark])
+            power = ''
+            if case.power_range_low and case.power_range_high:
+                power = str(case.power_range_low) + '-' + str(case.power_range_high)
+            state = '成功'
+            if case.state == 2:
+                state = '失败'
+            executor_name = User.objects.filter(id=case.executor_id)[0].username
+
+            cases_info.append(VersionView.convert_to_string(
+                [software.name, case.version, case.title, case.positioning_accuracy, case.timing_accuracy,
+                 case.pseudo_range_measurement_accuracy, case.carrier_measurement_accuracy,
+                 case.speed_measurement_accuracy, case.sensitivity_capture, case.receiving_sensitivity,
+                 case.sensitivity_track, power, case.self_integrity, case.system_integrity, case.capture_time,
+                 case.recapture_time, case.update_rate, case.trace_channels, case.max_velocity, case.max_acceleration,
+                 state, executor_name, case.remark]
+            ))
 
         sio = write_to_xlsx(file_path, cases_info)
         sio.seek(0)
-        response = HttpResponse(sio.getvalue(), content_type='multipart/form-data')
-        response['Content-Disposition'] = 'attachment; filename="{0}"'.format(file_name).encode('utf-8')
-        response.write(sio.getvalue())
+        response = HttpResponse(sio.getvalue(), content_type='application/vnd.ms-excel')
+        response['Content-Disposition'] = 'attachment; filename="{0}"'.format(file_name).encode('utf-8',
+                                                                                                'ISO-8859-1')
+        # response = HttpResponse(sio.getvalue(), content_type='multipart/form-data')
+        # response['Content-Disposition'] = 'attachment; filename="{0}"'.format(file_name).encode('utf-8')
+        # response.write(sio.getvalue())
         # executor, action, method = get_log(request)
         # gen_log(action, "目标版本", software.name + "-" + version.number, method, executor)
         return response

apps/task/views/caseview.py

@@ -9,8 +9,9 @@ from rest_framework.views import APIView
 from TestLaboratory.settings import CASE_FILE_ROOT, CASE_FILE_EXPORT, HTTP_HEAD
 from apps.file.models import FileManager
 from apps.log.models import get_log, gen_log
-from apps.task.models import TestTask, TestCase
+from apps.task.models import TestTask, TestCase, BeidouCase
 from apps.user.middleware.rolecontrol import RoleControl
+from apps.user.models import User
 from util_xlsx import load_xlsx, write_to_xlsx
 from utils.util_add_id import get_id
 from utils.util_file.util_fileio import write_file
@@ -23,6 +24,15 @@ class CaseView(APIView):
     # 登录权限验证
     authentication_classes = []
 
+    @staticmethod
+    def convert_to_string(word_list):
+        for i in range(len(word_list)):
+            if word_list[i] is None:
+                word_list[i] = ''
+            elif not isinstance(word_list[i], str):
+                word_list[i] = str(word_list[i])
+        return word_list
+
     # get testcase
     @staticmethod
     # @RoleControl
@@ -38,13 +48,13 @@ class CaseView(APIView):
         cases = None
         file_name = None
         if export_type == '0':
-            cases = TestCase.objects.filter(task=task, delete=False)
+            cases = BeidouCase.objects.filter(task=task, delete=False)
             file_name = task.title+'-全部测试用例.xls'
         elif export_type == '1':
-            cases = TestCase.objects.filter(~Q(state=0), task=task, delete=False)
+            cases = BeidouCase.objects.filter(~Q(state=0), task=task, delete=False)
             file_name = task.title+'-已执行测试用例.xls'
         elif export_type == '2':
-            cases = TestCase.objects.filter(state=2, task=task, delete=False)
+            cases = BeidouCase.objects.filter(state=2, task=task, delete=False)
             file_name = task.title+'-不合格测试用例.xls'
 
         if not cases:
@@ -57,21 +67,28 @@ class CaseView(APIView):
             os.makedirs(file_dir)
         file_path = file_dir + "/" + file_name
 
-        cases_info = [['被测软件ID：', task.plan.software.id],
-                      ['被测软件名：', task.plan.software.name],
-                      ['被测软件版本', task.plan.version],
-                      ['编号', '名称', '前置条件', '优先级', '测试环境', '测试类型', '测试步骤', '预期结果', '实际结果', '状态',
-                       '编写人', '评审员', '执行人', '备注']]
+        cases_info = [
+            ['测试项目', '版本', '测试内容', '定位精度', '定时精度', '伪距测量精度', '载波测量精度', '测速精度',
+             '捕获灵敏度', '接收灵敏度', '跟踪灵敏度', '功率范围', '自主完好性', '系统完好性', '首次捕获时间',
+             '失锁重捕时间', '定位测速更新率', '跟踪通道数', '最大速度', '最大加速度', '执行结果', '测试人员', '备注']]
 
         for case in cases:
-            state = '未执行'
-            if case.state == 1:
-                state = '执行成功'
-            elif case.state == 2:
-                state = '执行失败'
-            cases_info.append([case.id_in_task, case.name, case.requisite, case.priority, case.environment,
-                               case.type, case.process, case.expected_result, case.actual_result, state,
-                               case.writer, case.assessor, case.executor, case.remark])
+            power = ''
+            if case.power_range_low and case.power_range_high:
+                power = str(case.power_range_low) + '-' + str(case.power_range_high)
+            state = '成功'
+            if case.state == 2:
+                state = '失败'
+            executor_name = User.objects.filter(id=case.executor_id)[0].username
+
+            cases_info.append(CaseView.convert_to_string(
+                [case.software.name, case.version, case.title, case.positioning_accuracy, case.timing_accuracy,
+                 case.pseudo_range_measurement_accuracy, case.carrier_measurement_accuracy,
+                 case.speed_measurement_accuracy, case.sensitivity_capture, case.receiving_sensitivity,
+                 case.sensitivity_track, power, case.self_integrity, case.system_integrity, case.capture_time,
+                 case.recapture_time, case.update_rate, case.trace_channels, case.max_velocity, case.max_acceleration,
+                 state, executor_name, case.remark]
+            ))
 
         sio = write_to_xlsx(file_path, cases_info)
         sio.seek(0)

apps/task/views/tasklistview.py

@@ -8,7 +8,7 @@ from TestLaboratory.settings import TASK_ROOT, CASE_TEMPLATE_ROOT, HTTP_HEAD
 from apps.file.models import FileManager
 from apps.log.models import get_log, gen_log
 from apps.plan.models import TestPlan
-from apps.task.models import TestTask, TestCase
+from apps.task.models import TestTask, TestCase, BeidouCase
 from apps.user.middleware.rolecontrol import RoleControl
 from apps.user.models import User
 from utils.util_add_id import get_id
@@ -128,7 +128,7 @@ class TaskListView(APIView):
 
         info = []
         for task in task_all.all():
-            fail_num = len(TestCase.objects.filter(task=task, state=2, delete=False))
+            fail_num = len(BeidouCase.objects.filter(task=task, state=2, delete=False))
             info.append({
                 'software_id': task.plan.software.id,
                 'software_name': task.plan.software.name,

lims-frontend/dist/browserconfig.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/logo.png"/><square150x150logo src="/logo.png"/><square310x310logo src="/logo.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
+<browserconfig><msapplication><tile><square70x70logo src="/logo.jpg"/><square150x150logo src="/logo.jpg"/><square310x310logo src="/logo.jpg"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

lims-frontend/dist/css/chunk-10d2afba.ce57d308.css

@@ -1 +0,0 @@
-.textMarginLeft[data-v-5aacad4c]{margin-left:50px}.infoColor[data-v-5aacad4c]{color:#909399}.fileButton[data-v-5aacad4c]{margin-left:20px;font-size:14px;font-weight:300}.indexColor[data-v-5aacad4c]{width:40px;color:#fff;text-align:center;font-size:12px;padding:2px;border-radius:10%;margin-top:10px;margin-right:10px;display:inline-block}

lims-frontend/dist/css/chunk-32c93460.7d1c1019.css

@@ -1 +0,0 @@
-.textInfo[data-v-22361d9a]{margin-left:50px}

lims-frontend/dist/css/chunk-3fa938b0.67c1abc3.css

@@ -1 +0,0 @@
-.textMarginLeft[data-v-442a705c]{margin-left:50px}.infoColor[data-v-442a705c]{color:#909399}

lims-frontend/dist/css/chunk-47ffa454.795bb4a9.css

@@ -0,0 +1 @@
+.textInfo[data-v-7d86a5d2]{margin-left:50px}

lims-frontend/dist/css/chunk-4c8e2482.494f9561.css

@@ -0,0 +1 @@
+.textMarginLeft[data-v-59fe273e]{margin-left:50px}.infoColor[data-v-59fe273e]{color:#909399}

lims-frontend/dist/css/chunk-52c9f1e3.aaf93adc.css

@@ -0,0 +1 @@
+.textMarginLeft[data-v-12e6b2d4]{margin-left:50px}.infoColor[data-v-12e6b2d4]{color:#909399}

lims-frontend/dist/css/chunk-66d1fac7.3ef894ee.css

@@ -0,0 +1 @@
+.textMarginLeft[data-v-1b4213b7]{margin-left:50px}.infoColor[data-v-1b4213b7]{color:#909399}.fileButton[data-v-1b4213b7]{margin-left:20px;font-size:14px;font-weight:300}.indexColor[data-v-1b4213b7]{width:40px;color:#fff;text-align:center;font-size:12px;padding:2px;border-radius:10%;margin-top:10px;margin-right:10px;display:inline-block}

lims-frontend/dist/css/chunk-6dff90aa.0594504e.css

@@ -1 +0,0 @@
-.textMarginLeft[data-v-2eb73b2e]{margin-left:50px}.infoColor[data-v-2eb73b2e]{color:#909399}

lims-frontend/dist/css/chunk-c72a0c5e.698495aa.css

@@ -0,0 +1 @@
+.loginBox[data-v-2ae432cf]{height:-webkit-max-content;height:-moz-max-content;height:max-content;width:400px;position:relative}.loginBox[data-v-2ae432cf],.rBox[data-v-2ae432cf]{margin:0 auto;margin-top:260px;background-color:#fcfcfc}.rBox[data-v-2ae432cf]{height:35%;width:500px}.inputArea[data-v-2ae432cf]{margin:10px 50px 50px}.inputHeader[data-v-2ae432cf]{font-size:27px;font-family:Source Han Sans CN;font-weight:400;color:#444;margin-bottom:42px}.logtext[data-v-2ae432cf]{width:50px;height:13px;font-size:16px;font-family:Source Han Sans CN;font-weight:400;color:#a9a9b5}.loginBtn[data-v-2ae432cf]{width:349px;height:46px;background:#19a97b}

lims-frontend/dist/css/chunk-fd7a9eb6.3a5a8038.css

@@ -1 +0,0 @@
-.loginBox[data-v-5516f387]{height:-webkit-max-content;height:-moz-max-content;height:max-content;width:400px;position:relative}.loginBox[data-v-5516f387],.rBox[data-v-5516f387]{margin:0 auto;margin-top:260px;background-color:#fcfcfc}.rBox[data-v-5516f387]{height:35%;width:500px}.inputArea[data-v-5516f387]{margin:10px 50px 50px}.inputHeader[data-v-5516f387]{font-size:27px;font-family:Source Han Sans CN;font-weight:400;color:#444;margin-bottom:42px}.logtext[data-v-5516f387]{width:50px;height:13px;font-size:16px;font-family:Source Han Sans CN;font-weight:400;color:#a9a9b5}.loginBtn[data-v-5516f387]{width:349px;height:46px;background:#19a97b}