Browse Source

[bug] 修改dds消息发布订阅

zishang 3 months ago
parent
commit
2302cc58fd

+ 3 - 3
src/views/modules/alg/algcreate2.vue

@@ -113,7 +113,7 @@
       <el-tab-pane label="完成" name="fourth">
 
         <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="180px" :disabled="true">
-          <el-form-item label="智能算法名称" prop="algorithmName">
+          <el-form-item label="算法名称" prop="algorithmName">
             <el-input v-model="dataForm.algorithmName" placeholder="请输入传统算法名称"></el-input>
           </el-form-item>
 
@@ -142,7 +142,7 @@
 
           <el-form-item label="选择数据集:">
 
-            <el-select v-model="datasetSelected" multiple placeholder="选择数据集" value-key="datasetName">
+            <el-select v-model="datasetSelected" multiple filterable placeholder="选择数据集" value-key="datasetName">
               <el-option-group v-for="group in datasetOptions" :key="group.label" :label="group.label">
                 <el-option
                   v-for="item in group.dataset"
@@ -384,7 +384,7 @@ export default {
       console.log(this.fileList);
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
-          MessageBox.confirm(`是否新建智能算法?`, '提示', {
+          MessageBox.confirm(`是否新建算法?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

+ 38 - 38
src/views/modules/alg/train-create.vue

@@ -58,31 +58,31 @@
 
       </el-tab-pane>
 
-      <el-tab-pane label="资源设置" name="second">
-        <el-form :model="dataForm2" :rules="dataRule" ref="dataset" label-width="180px">
-
-          <el-form-item label="指定cpu">
-            <el-select v-model="cpuSelected" multiple placeholder="选择容器运行在哪些cpu上">
-              <el-option v-for="data in cpus" :key="data.value" :label="data.value" :value="data.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="内存大小" prop="memorySelected">
-            <el-select v-model="dataForm.memorySelected" placeholder="选择内存大小" @change="memoryChange()">
-              <el-option v-for="data in memorys" :key="data.value" :label="data.label" :value="data.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item style="float:right">
-            <el-button @click="activeName='first'">返回</el-button>
-            <el-button type="primary" @click="activeName='third'">下一步</el-button>
-          </el-form-item>
-        </el-form>
-      </el-tab-pane>
-
-      <el-tab-pane label="完成" name="third">
+<!--      <el-tab-pane label="资源设置" name="second">-->
+<!--        <el-form :model="dataForm2" :rules="dataRule" ref="dataset" label-width="180px">-->
+
+<!--          <el-form-item label="指定cpu">-->
+<!--            <el-select v-model="cpuSelected" multiple placeholder="选择容器运行在哪些cpu上">-->
+<!--              <el-option v-for="data in cpus" :key="data.value" :label="data.value" :value="data.value">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+
+<!--          <el-form-item label="内存大小" prop="memorySelected">-->
+<!--            <el-select v-model="dataForm.memorySelected" placeholder="选择内存大小" @change="memoryChange()">-->
+<!--              <el-option v-for="data in memorys" :key="data.value" :label="data.label" :value="data.value">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+
+<!--          <el-form-item style="float:right">-->
+<!--            <el-button @click="activeName='first'">返回</el-button>-->
+<!--            <el-button type="primary" @click="activeName='third'">下一步</el-button>-->
+<!--          </el-form-item>-->
+<!--        </el-form>-->
+<!--      </el-tab-pane>-->
+
+      <el-tab-pane label="确认" name="second">
 
         <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="180px" :disabled="true">
 
@@ -127,26 +127,26 @@
 
 
 
-          <el-form-item label="指定cpu">
-            <el-select v-model="cpuSelected" multiple placeholder="选择容器运行在那些cpu上">
-              <el-option v-for="data in cpus" :key="data.value" :label="data.value" :value="data.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="指定cpu">-->
+<!--            <el-select v-model="cpuSelected" multiple placeholder="选择容器运行在那些cpu上">-->
+<!--              <el-option v-for="data in cpus" :key="data.value" :label="data.value" :value="data.value">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
 
-          <el-form-item label="内存大小" prop="memorySelected">
-            <el-select v-model="dataForm.memorySelected" placeholder="选择内存大小">
-              <el-option v-for="data in memorys" :key="data.value" :label="data.label" :value="data.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="内存大小" prop="memorySelected">-->
+<!--            <el-select v-model="dataForm.memorySelected" placeholder="选择内存大小">-->
+<!--              <el-option v-for="data in memorys" :key="data.value" :label="data.label" :value="data.value">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
 
 
 
         </el-form>
         <el-form>
           <el-form-item style="float:right">
-            <el-button @click="activeName='second'">返回</el-button>
+            <el-button @click="activeName='first'">返回</el-button>
             <el-button type="primary" @click="dataFormSubmit()">完成</el-button>
           </el-form-item>
         </el-form>

+ 3 - 3
src/views/modules/alg/train.vue

@@ -3,7 +3,7 @@
   <div class='' v-loading="loading" element-loading-text="正在处理">
     <el-breadcrumb class="divi2" separator-class="el-icon-arrow-right">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>算法运行</el-breadcrumb-item>
+      <el-breadcrumb-item>算法任务</el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider class="divi"></el-divider>
 
@@ -45,8 +45,8 @@
       <el-table-column prop="missName" header-align="center" align="center" label="任务名称"></el-table-column>
       <el-table-column prop="algFrameId" header-align="center" align="center" label="算法类别">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.algFrameId === -1" size="small">干扰算法</el-tag>
-          <el-tag v-else size="small">干扰算法</el-tag>
+          <el-tag v-if="scope.row.algFrameId === -1" size="small">干扰算法</el-tag>
+          <el-tag v-else size="small">干扰算法</el-tag>
         </template>
       </el-table-column>
 <!--      <el-table-column prop="categoryName" header-align="center" align="center" label="分类"></el-table-column>-->