فهرست منبع

修改接口submitted/procedure的格式

靳炳淑 6 سال پیش
والد
کامیت
68c27b233a
3فایلهای تغییر یافته به همراه47 افزوده شده و 13 حذف شده
  1. 7 1
      mock/modules/assignment/index.js
  2. 6 2
      mock/serializers/assignment/CodeProcedureSerializer.js
  3. 34 10
      src/views/teacher/Code/detail.vue

+ 7 - 1
mock/modules/assignment/index.js

@@ -78,7 +78,13 @@ router.route("/student/code/:codeId/project").get((req, res) => {
 router.route("/teacher/code/:codeId/submitted/procedure").get((req, res) => {
   res.send({
     code: 0,
-    data: [codeProcedureSerializer(), codeProcedureSerializer()]
+    data: [
+      codeProcedureSerializer(),
+      codeProcedureSerializer(),
+      codeProcedureSerializer(),
+      codeProcedureSerializer(),
+      codeProcedureSerializer()
+    ]
   });
 });
 

+ 6 - 2
mock/serializers/assignment/CodeProcedureSerializer.js

@@ -9,8 +9,12 @@ module.exports = () => {
     code: makeId(),
     group: groupSerializer(),
     buildStatus: statusSerializer(),
-    deployStatus: statusSerializer(),
+    prodDeployStatus: statusSerializer(),
+    testDeployStatus: statusSerializer(),
+    // deployStatus: statusSerializer(),
     unitTestStatus: testStatusSerializer(),
-    functionTestStatus: testStatusSerializer()
+    //functionTestStatus: testStatusSerializer()
+    prodFunctionTestStatus: testStatusSerializer(),
+    testFunctionTestStatus: testStatusSerializer()
   };
 };

+ 34 - 10
src/views/teacher/Code/detail.vue

@@ -49,12 +49,23 @@
                   </span>
                 </b-table-column>
 
-                <b-table-column label="部署" centered>
-                  <span :class="geneTag(props.row.deployStatus.key)">
+                <b-table-column label="生产环境部署" centered>
+                  <span :class="geneTag(props.row.prodDeployStatus.key)">
                     {{
-                      props.row.deployStatus.key === 0
+                      props.row.prodDeployStatus.key === 0
                         ? "未部署"
-                        : props.row.deployStatus.key === -1
+                        : props.row.prodDeployStatus.key === -1
+                        ? "失败"
+                        : "成功"
+                    }}
+                  </span>
+                </b-table-column>
+                <b-table-column label="测试环境部署" centered>
+                  <span :class="geneTag(props.row.testDeployStatus.key)">
+                    {{
+                      props.row.testDeployStatus.key === 0
+                        ? "未部署"
+                        : props.row.testDeployStatus.key === -1
                         ? "失败"
                         : "成功"
                     }}
@@ -73,16 +84,29 @@
                     }}
                   </span>
                 </b-table-column>
-                <b-table-column label="功能测试" centered>
-                  <span :class="geneTag(props.row.functionTestStatus.key)">
+                <b-table-column label="生产环境功能测试" centered>
+                  <span :class="geneTag(props.row.prodFunctionTestStatus.key)">
+                    {{
+                      props.row.prodFunctionTestStatus.key === 0
+                        ? "未测试"
+                        : props.row.prodFunctionTestStatus.key === -1
+                        ? "未知状态"
+                        : props.row.prodFunctionTestStatus.passCount +
+                          "/" +
+                          props.row.prodFunctionTestStatus.testCount
+                    }}
+                  </span>
+                </b-table-column>
+                <b-table-column label="测试环境功能测试" centered>
+                  <span :class="geneTag(props.row.testFunctionTestStatus.key)">
                     {{
-                      props.row.functionTestStatus.key === 0
+                      props.row.testFunctionTestStatus.key === 0
                         ? "未测试"
-                        : props.row.functionTestStatus.key === -1
+                        : props.row.testFunctionTestStatus.key === -1
                         ? "未知状态"
-                        : props.row.functionTestStatus.passCount +
+                        : props.row.testFunctionTestStatus.passCount +
                           "/" +
-                          props.row.functionTestStatus.testCount
+                          props.row.testFunctionTestStatus.testCount
                     }}
                   </span>
                 </b-table-column>