Bladeren bron

增加框架配置和GPU数量等信息在学生端和老师端的显示

Prevalence 7 jaren geleden
bovenliggende
commit
0091e67876

+ 6 - 0
mock/modules/dlwork/index.js

@@ -16,4 +16,10 @@ router.route("/:dlworkId").get((req, res) => {
     data: ProjectSerializer({ id: req.params.id })
   });
 });
+router.route("/teacher/course/:courseId/dlwork").get((req, res) => {
+  res.send({
+    code: 0,
+    data: [DLWorkSerializer(), DLWorkSerializer(), DLWorkSerializer()]
+  });
+});
 module.exports = router;

+ 1 - 0
mock/serializers/dlwork/DLProjectSerializer.js

@@ -25,6 +25,7 @@ module.exports = ({ id = makeId(), codeId = makeId() }) => {
     codeId,
     url: "www.url.com/xiaobai/handsome/smart/dl",
     name: "project-name",
+    dlType: 1,
     buildList: [
       buildSerializer({ buildState: 0 }),
       buildSerializer({ buildState: 1 }),

+ 2 - 0
mock/serializers/dlwork/DLWorkSerializer.js

@@ -19,6 +19,8 @@ module.exports = () => {
     id: makeId(),
     name: "Tensorflow入门",
     description: "这是一个MINIST的作业",
+    dlType: 1,
+    numberOfGPU: 1,
     status: "PREPARING",
     createAt: dayjs("2018-10-21").unix(),
     startAt: dayjs("2019-01-01").unix(),

+ 3 - 3
src/api/dlwork.js

@@ -43,7 +43,7 @@ export const getStudentDLProjectDetail = (dlworkId, userId) => {
  * 老师新建机器学习作业
  * @param type
  * @param name
- * @param dltype 机器学习框架类型,0为Tensorflow,1为Pytorch
+ * @param dlType 机器学习框架类型,0为Tensorflow,1为PyTorch
  * @param numberOfGPU 是否使用GPU
  * @param description
  * @param startAt
@@ -56,7 +56,7 @@ export const postDLAssignment = (
   {
     type,
     name,
-    dltype,
+    dlType,
     useGPU: numberOfGPU,
     description,
     startAt,
@@ -70,7 +70,7 @@ export const postDLAssignment = (
     body: {
       type: type || null,
       name: name || null,
-      dltype: dltype || 0,
+      dlType: dlType || 0,
       numberOfGPU: numberOfGPU || 0,
       description: description || null,
       startAt: startAt || null,

+ 8 - 8
src/components/AssignmentCRUD/CreateAssignment/index.vue

@@ -24,23 +24,23 @@
           </b-field>
           <b-field
             label="作业配置"
-            :type="$v.params.dltype.$error ? 'is-danger' : ''"
-            :message="$v.params.dltype.$error ? '请选择机器学习作业配置' : ''"
+            :type="$v.params.dlType.$error ? 'is-danger' : ''"
+            :message="$v.params.dlType.$error ? '请选择机器学习作业配置' : ''"
           >
           </b-field>
           <div style="display: flex; margin-bottom: 0.5em">
             <b-radio
-              name="dltype"
+              name="dlType"
               value="0"
-              v-model="$v.params.dltype"
+              v-model="$v.params.dlType"
               style="flex: 1"
             >
               Tensorflow
             </b-radio>
             <b-radio
-              name="dltype"
+              name="dlType"
               value="1"
-              v-model="$v.params.dltype"
+              v-model="$v.params.dlType"
               style="flex: 1"
               >Pytorch
             </b-radio>
@@ -239,7 +239,7 @@ export default {
     return {
       params: {
         name: null,
-        dltype: 0,
+        dlType: 0,
         numberOfGPU: 1,
         description: null,
         startAt: null,
@@ -408,7 +408,7 @@ export default {
       name: {
         required
       },
-      dltype: {
+      dlType: {
         required
       },
       numberOfGPU: {

+ 6 - 0
src/views/student/DlWork/detail.vue

@@ -16,6 +16,12 @@
     >
       <template slot="title">
         {{ dlTestDetail.name }}
+        <div v-if="dlTestDetail.dlType === 0" class="tag is-success">
+          <strong style="color: white;">Tensorflow</strong>
+        </div>
+        <div v-if="dlTestDetail.dlType === 1" class="tag is-danger">
+          <strong style="color: white;">PyTorch</strong>
+        </div>
       </template>
       <template slot="content">
         <strong>git 地址 : </strong>

+ 13 - 0
src/views/teacher/DlWork/index.vue

@@ -38,6 +38,17 @@
                 {{ props.row.name }}
               </router-link>
             </b-table-column>
+            <b-table-column label="框架类型" centered>
+              <div v-if="props.row.dlType === 0" class="tag is-success">
+                <strong style="color: white;">Tensorflow</strong>
+              </div>
+              <div v-if="props.row.dlType === 1" class="tag is-danger">
+                <strong style="color: white;">PyTorch</strong>
+              </div>
+            </b-table-column>
+            <b-table-column label="GPU需求数量" centered>
+              {{ props.row.numberOfGPU }}
+            </b-table-column>
             <b-table-column label="状态" centered>
               {{ props.row.status }}
             </b-table-column>
@@ -98,9 +109,11 @@ import UpdateAssignment from "@/components/AssignmentCRUD/UpdateAssignment";
 import CreateAssignment from "@/components/AssignmentCRUD/CreateAssignment";
 import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
 import NoDataSvg from "@/components/NoDataSvg";
+import BTableColumn from "buefy/src/components/table/TableColumn";
 
 export default {
   components: {
+    BTableColumn,
     PageBody,
     PageHeader,
     DeleteAssignment,