Browse Source

[修改] 修改相关名称

zishang 3 months ago
parent
commit
eebf166c80

+ 2 - 2
src/views/modules/alg/alg-add.vue

@@ -5,8 +5,8 @@
 
       <el-form-item label="选择算法" size="mini">
         <el-radio-group v-model="datasetStatus">
-          <el-radio :label="1">传统算法</el-radio>
-          <el-radio :label="2">智能算法</el-radio>
+          <el-radio :label="1">干扰算法</el-radio>
+          <el-radio :label="2">雷达算法</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>

+ 5 - 5
src/views/modules/alg/models-add-or-update.vue

@@ -66,7 +66,7 @@ export default {
         id: 0,
         modelName: "",
         // 本模板的类别
-        categoryId: 1, 
+        categoryId: 1,
         form:null,
         appFile:"",
         remark: "",
@@ -76,11 +76,11 @@ export default {
       ],
       forms:[
         {
-          label:"传统算法",
+          label:"干扰算法",
           value:1
         },
         {
-          label:"智能算法",
+          label:"雷达算法",
           value:2
         }
       ],
@@ -156,7 +156,7 @@ export default {
           let formData=new FormData();
           this.fileList.forEach(file=>{
             formData.append('file',file.raw);
-          }); 
+          });
           formData.append('modelName',this.dataForm.modelName);
           formData.append('categoryId',this.dataForm.categoryId);
           formData.append('remark',this.dataForm.remark);
@@ -186,7 +186,7 @@ export default {
           });
         }).catch(() => {})
 
-          
+
 
         }
       });

+ 5 - 5
src/views/modules/alg/models.vue

@@ -30,9 +30,9 @@
 
         <el-select v-model="form" clearable placeholder="形式" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
-          <el-option label='传统算法' value='1'>
+          <el-option label='干扰算法' value='1'>
           </el-option>
-          <el-option label='智能算法' value='2'>
+          <el-option label='雷达算法' value='2'>
           </el-option>
         </el-select>
 
@@ -157,7 +157,7 @@ export default {
         params: this.$http.adornParams({
         }),
       }).then(({ data }) => {
-        
+
       });
     },
     //筛选查询
@@ -196,9 +196,9 @@ export default {
     },
     stateFormat(row, column) {
       if (row.form === 1) {
-        return "传统算法";
+        return "干扰算法";
       } else {
-        return "智能算法";
+        return "雷达算法";
       }
     },
     //去重

+ 2 - 2
src/views/modules/alg/train-add.vue

@@ -5,8 +5,8 @@
 
       <el-form-item label="选择算法" size="mini">
         <el-radio-group v-model="datasetStatus">
-          <el-radio :label="1">传统算法</el-radio>
-          <el-radio :label="2">智能算法</el-radio>
+          <el-radio :label="1">干扰算法</el-radio>
+          <el-radio :label="2">雷达算法</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>

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

@@ -4,7 +4,7 @@
     <el-breadcrumb class="divi2" separator-class="el-icon-arrow-right">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/alg-train'}">算法训练</el-breadcrumb-item>
-      <el-breadcrumb-item>新建训练任务</el-breadcrumb-item>
+      <el-breadcrumb-item>新建任务</el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider class="divi"></el-divider>
 
@@ -81,7 +81,7 @@
           </el-form-item>
         </el-form>
       </el-tab-pane>
-   
+
       <el-tab-pane label="完成" name="third">
 
         <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="180px" :disabled="true">
@@ -96,7 +96,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-        
+
           <el-form-item label="选择算法" prop="algSelected">
             <el-select v-model="dataForm.algSelected" placeholder="选择算法">
               <el-option v-for="data in algs" :key="data.algorithmId" :label="data.algorithmName" :value="data.algorithmId">
@@ -124,7 +124,7 @@
             </el-input>
           </el-form-item>
 
-    
+
 
 
           <el-form-item label="指定cpu">
@@ -141,7 +141,7 @@
             </el-select>
           </el-form-item>
 
-      
+
 
         </el-form>
         <el-form>
@@ -150,7 +150,7 @@
             <el-button type="primary" @click="dataFormSubmit()">完成</el-button>
           </el-form-item>
         </el-form>
-         
+
 
       </el-tab-pane>
     </el-tabs>
@@ -168,17 +168,17 @@ export default {
   },
   activated() {
     this.init();
-  }, 
+  },
   data() {
     return {
-      loading:false,
+      loading: false,
       classification: [],
       algs:[],
       value1: [],
       value2: [],
-      
+
       fileList: [
-        
+
       ],
 
       activeName: "first",
@@ -282,7 +282,7 @@ export default {
           algorithmName: "",
         }),
       }).then(({ data }) => {
-        
+
         this.algs = data.page.list;
       }); */
 
@@ -365,7 +365,7 @@ export default {
           algId:this.dataForm.algSelected,
         }),
       }).then(({ data }) => {
-        
+
         this.versions = data.versions;
       });
     },
@@ -389,7 +389,7 @@ export default {
             this.fileList = [];
           }
         });
-      
+
       /* this.$http({
         url: this.$http.adornUrl("/version/select/"+algId),
         method: "get",
@@ -397,7 +397,7 @@ export default {
           algId:this.algSelected,
         }),
       }).then(({ data }) => {
-        
+
         this.versions = data.versions;
       }); */
     },
@@ -414,7 +414,7 @@ export default {
     memoryChange(){
       this.$refs["dataForm"].validate();
     },
-    
+
 
     //去重
     unique(arr) {
@@ -424,7 +424,7 @@ export default {
       }
       return Array.from(new Set(ss));
     },
-    
+
     // 以下4个函数是文件上传功能的
     handleRemove(file, fileList) {
       console.log(file, fileList);
@@ -467,4 +467,4 @@ export default {
   padding: 5px 0px;
   margin: 10px;
 }
-</style>
+</style>

+ 32 - 36
src/views/modules/alg/train.vue

@@ -3,16 +3,16 @@
   <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>
 
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-button v-if="isAuth('train:save')" type="primary" @click="addHandle()">新建训练任务</el-button>
+        <el-button v-if="isAuth('train:save')" type="primary" @click="addHandle()">新建任务</el-button>
       </el-form-item>
       <el-form-item>
-        <el-input v-model="dataForm.missName" placeholder="请输入训练任务名称" clearable
+        <el-input v-model="dataForm.missName" placeholder="请输入任务名称" clearable
           @keyup.enter.native="pageIndex = 1;getDataList()"></el-input>
       </el-form-item>
       <el-form-item>
@@ -25,10 +25,10 @@
           <el-option v-for="data in classification" :key="data" :label="data" :value="data">
           </el-option>
         </el-select>
-        
+
       </el-form-item>
       <el-form-item>
-        <el-button @click="algorithmTrainCompare()">训练任务对比</el-button>
+        <el-button @click="algorithmTrainCompare()">任务对比</el-button>
       </el-form-item>
 
 
@@ -37,24 +37,20 @@
     <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
       style="width: 100%;">
       <!-- 不允许多选 -->
-      <el-table-column type="selection" header-align="center" align="center" width="50">
-      </el-table-column>
-      <!-- <el-table-column prop="algorithmTrainingId" header-align="center" align="center" width="80" label="训练任务ID">
+      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <!-- <el-table-column prop="algorithmTrainingId" header-align="center" align="center" width="80" label="任务ID">
       </el-table-column> -->
       <el-table-column label="序号" header-align="center" align="center" width="80" type="index" :index='(index)=>{return (index+1) + (this.pageIndex-1)*this.pageSize}'> </el-table-column>
 
-      <el-table-column prop="missName" header-align="center" align="center" label="训练任务名称">
-      </el-table-column>
+      <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>
-      <el-table-column prop="username" header-align="center" align="center" label="创建人">
-      </el-table-column>
+<!--      <el-table-column prop="categoryName" header-align="center" align="center" label="分类"></el-table-column>-->
+      <el-table-column prop="username" header-align="center" align="center" label="创建人"></el-table-column>
       <el-table-column prop="missStatus" header-align="center" align="center" label="状态">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.missStatus === 0" size="small" type="danger">停止</el-tag>
@@ -85,7 +81,7 @@
             查看
           </el-button>
 
-          <!-- <el-button type="text" size="small" 
+          <!-- <el-button type="text" size="small"
             @click="install(scope.row.algorithmTrainingId)">安装</el-button> -->
 
           <el-button v-if="isAuth('train:run')" type="text" size="small" :disabled="scope.row.missStatus==1?false:true"
@@ -103,7 +99,7 @@
           <el-button type="text" size="small" class="warningButton"
             @click="deleteMissHandle(scope.row.algorithmTrainingId)">删除</el-button>
 
-          
+
         </template>
       </el-table-column>
     </el-table>
@@ -175,7 +171,7 @@ export default {
         this.getDataList();
       },0)
     },1000); */
-    
+
   },
   //切换路由时,清除定时器
   beforeRouteLeave(to, from, next){
@@ -188,7 +184,7 @@ export default {
   methods: {
     // startInterval() {
     //   setInterval(() => {
-        
+
     //     if(this.flag % 2){
     //        this.dataList = [];
     //       console.log(this.tempList);
@@ -320,7 +316,7 @@ export default {
           var d2=row.missStopTime;
           var dateEnd=new Date(d2.replace(/-/g, "/"));
         }
-        
+
         //console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@dateEnd");
       //console.log(dateEnd);
         var dateDiff = dateEnd.getTime() - dateBegin.getTime(); //时间差的毫秒数
@@ -430,8 +426,8 @@ export default {
             algorithmTrainingId:id
           }),
         }).then(({data})=>{
-          
-          
+
+
         });
     },
     //对比两个训练任务的tensorboard图像
@@ -473,7 +469,7 @@ export default {
           console.log("安装成功");
       });
     },
-    
+
     // 运行任务
     runtrain(id,algFrameId,algorithmId) {
       /* if(algFrameId!=-1){
@@ -485,7 +481,7 @@ export default {
             }),
           }).then(({data})=>{
             this.getDataList();
-            
+
         });
 
         this.$http({
@@ -495,7 +491,7 @@ export default {
               algorithmTrainingId:id
             }),
           }).then(({data})=>{
-            
+
         });
       }else{
         this.selectAlgParaVisibel=true;
@@ -523,15 +519,15 @@ export default {
                   algorithmTrainingId:id
                 }),
               }).then(({data})=>{
-                
+
             });
         });
       }).catch(() => {})
 
-      
 
-        
-      
+
+
+
 
     },
     // 重新运行任务
@@ -572,12 +568,12 @@ export default {
               message: '暂停成功'
             });
             this.loading=false;
-          }); 
+          });
         }).catch(() => {
           Message({
             type: 'info',
             message: '已取消暂停'
-          });          
+          });
         });
     },
 
@@ -605,7 +601,7 @@ export default {
       });
       }).catch(() => {})
 
-      
+
 
     },
 
@@ -674,15 +670,15 @@ export default {
             this.loading=false;
         });
 
-          
+
         }).catch(() => {
           Message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
     },
-    
+
   },
 };
 </script>