数据集选择修改，筛选框修改

src/views/modules/alg/algcreate1.vue

@@ -32,8 +32,16 @@
 
       <el-form-item label="选择数据集：">
         <el-select v-model="datasetSelected" multiple placeholder="选择数据集">
-          <el-option v-for="item in datasetOptions" :key="item.filename" :label="item.filename" :value="item.filename">
-          </el-option>
+          <el-option-group v-for="group in datasetOptions" :key="group.label" :label="group.label">
+            <el-option
+              v-for="item in group.dataset"
+              :key="item.filename"
+              :label="item.filename"
+              :value="item.filename"
+            >
+
+            </el-option>
+          </el-option-group>
         </el-select>
       </el-form-item>
       
@@ -159,7 +167,13 @@ export default {
         }
       ],
       datasetOptions: [
-        
+        {
+          label:'静态数据集',
+          dataset:[]
+        },{
+          label:'动态数据集',
+          dataset:[]
+        }
       ],
       datasetSelected: [],
     };
@@ -201,7 +215,7 @@ export default {
             });
           }
         });
-        //这块为获取所有数据集
+        //这块为获取所有静态数据集
         this.$http({
           url: this.$http.adornUrl("/dataset/listAll"),
           method: "get",
@@ -209,9 +223,22 @@ export default {
           }),
         }).then(({ data }) => {
           if (data && data.code === 0) {
-            this.datasetOptions = data.list;
+            this.datasetOptions[0].dataset = data.list;
+          } else {
+            this.datasetOptions[0] = [];
+          }
+      });
+      //这块为获取所有动态数据集
+        this.$http({
+          url: this.$http.adornUrl("/dataset/listAllDyDataset"),
+          method: "get",
+          params: this.$http.adornParams({
+          }),
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.datasetOptions[1].dataset = data.list;
           } else {
-            this.datasetOptions = [];
+            this.datasetOptions[1] = [];
           }
       });
     },

src/views/modules/alg/algcreate2.vue

@@ -48,10 +48,17 @@
         <el-form :model="dataForm2" :rules="dataRule" ref="dataset" label-width="180px">
 
           <el-form-item label="选择数据集：">
-
             <el-select v-model="value1" multiple placeholder="选择数据集">
-              <el-option v-for="item in datasetOptions" :key="item.filename" :label="item.filename" :value="item.filename">
-              </el-option>
+              <el-option-group v-for="group in datasetOptions" :key="group.label" :label="group.label">
+                <el-option
+                  v-for="item in group.dataset"
+                  :key="item.filename"
+                  :label="item.filename"
+                  :value="item.filename"
+                >
+
+                </el-option>
+              </el-option-group>
             </el-select>
           </el-form-item>
 
@@ -128,8 +135,16 @@
           <el-form-item label="选择数据集：">
 
             <el-select v-model="value1" multiple placeholder="选择数据集">
-              <el-option v-for="item in datasetOptions" :key="item.filename" :label="item.filename" :value="item.filename">
-              </el-option>
+              <el-option-group v-for="group in datasetOptions" :key="group.label" :label="group.label">
+                <el-option
+                  v-for="item in group.dataset"
+                  :key="item.filename"
+                  :label="item.filename"
+                  :value="item.filename"
+                >
+
+                </el-option>
+              </el-option-group>
             </el-select>
           </el-form-item>
 
@@ -188,8 +203,13 @@ export default {
   data() {
     return {
       datasetOptions: [
-        {datasetId:1,datasetName:"fea_data.csv"},
-        {datasetId:2,datasetName:"st_test.csv"},
+        {
+          label:'静态数据集',
+          dataset:[]
+        },{
+          label:'动态数据集',
+          dataset:[]
+        }
       ],
       algOptions: [],
       tmpOptions: [],
@@ -219,20 +239,7 @@ export default {
         algorithmName: [
           { required: true, message: "名称不能为空", trigger: "blur" },
         ],
-        // imageSelected: [
-        //   { required: true, message: "环境不能为空", trigger: "blur" },
-        // ],
-        // email: [
-        //   { required: true, message: "邮箱不能为空", trigger: "blur" },
-        //   { validator: validateEmail, trigger: "blur" },
-        // ],
-        // mobile: [
-        //   { required: true, message: "手机号不能为空", trigger: "blur" },
-        //   { validator: validateMobile, trigger: "blur" },
-        // ],
-        // codes: [
-        //   { required: true, message: "代码文件不能为空", trigger: "blur" },
-        // ],
+
       },
     };
   },
@@ -293,7 +300,7 @@ export default {
           }
         });
 
-        //这块为获取所有数据集
+        //这块为获取所有静态数据集
         this.$http({
           url: this.$http.adornUrl("/dataset/listAll"),
           method: "get",
@@ -301,9 +308,22 @@ export default {
           }),
         }).then(({ data }) => {
           if (data && data.code === 0) {
-            this.datasetOptions = data.list;
+            this.datasetOptions[0].dataset = data.list;
+          } else {
+            this.datasetOptions[0] = [];
+          }
+      });
+      //这块为获取所有动态数据集
+        this.$http({
+          url: this.$http.adornUrl("/dataset/listAllDyDataset"),
+          method: "get",
+          params: this.$http.adornParams({
+          }),
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.datasetOptions[1].dataset = data.list;
           } else {
-            this.datasetOptions = [];
+            this.datasetOptions[1] = [];
           }
       });
 

src/views/modules/alg/algs.vue

@@ -22,7 +22,7 @@
       </el-form-item>
       <el-form-item>
         <el-tag>筛选:</el-tag>
-        <el-select v-model="classificationtag" placeholder="类别" size="mini" style="width: 130px;"
+        <el-select v-model="classificationtag" clearable placeholder="类别" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
           <el-option v-for="data in classification" :key="data" :label="data" :value="data">
           </el-option>
@@ -126,7 +126,7 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.classificationtag = null;
+      this.classificationtag = '';
       this.$http({
         url: this.$http.adornUrl("/category/select"),
         method: "get",
@@ -157,6 +157,9 @@ export default {
     //筛选查询
     getDataList2() {
       this.dataListLoading = true;
+      if(this.classificationtag===''){
+        this.classificationtag=null;
+      }
       this.$http({
         url: this.$http.adornUrl("/algs/list"),
         method: "get",

src/views/modules/alg/models.vue

@@ -22,13 +22,13 @@
       </el-form-item>
       <el-form-item>
         <el-tag>筛选:</el-tag>
-        <el-select v-model="classificationtag" placeholder="类别" size="mini" style="width: 130px;"
+        <el-select v-model="classificationtag" clearable placeholder="类别" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
           <el-option v-for="data in classification" :key="data" :label="data" :value="data">
           </el-option>
         </el-select>
 
-        <el-select v-model="form" placeholder="形式" size="mini" style="width: 130px;"
+        <el-select v-model="form" clearable placeholder="形式" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
           <el-option label='传统算法' value='1'>
           </el-option>
@@ -119,8 +119,8 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.classificationtag = null;
-      this.form = null;
+      this.classificationtag = '';
+      this.form = '';
       this.$http({
         url: this.$http.adornUrl("/category/select"),
         method: "get",
@@ -163,6 +163,12 @@ export default {
     //筛选查询
     getDataList2() {
       this.dataListLoading = true;
+      if(this.classificationtag===''){
+        this.classificationtag=null;
+      }
+      if(this.form===''){
+        this.form=null;
+      }
       this.$http({
         url: this.$http.adornUrl("/algs/models/list"),
         method: "get",

src/views/modules/alg/templs.vue

@@ -25,7 +25,7 @@
       </el-form-item>
       <el-form-item>
         <el-tag>筛选:</el-tag>
-        <el-select  v-model="classificationtag" placeholder="类别" size="mini" style="width: 130px;" @change="pageIndex = 1;getDataList2()">
+        <el-select  v-model="classificationtag" clearable placeholder="类别" size="mini" style="width: 130px;" @change="pageIndex = 1;getDataList2()">
           <el-option v-for="data in classification" :key="data" :label="data" :value="data" >
           </el-option>
         </el-select>
@@ -121,7 +121,7 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.classificationtag = null;
+      this.classificationtag = '';
 
       this.$http({
         url: this.$http.adornUrl("/category/select"),
@@ -154,6 +154,9 @@ export default {
     //筛选查询
     getDataList2() {
       this.dataListLoading = true;
+      if(this.classificationtag===''){
+        this.classificationtag=null;
+      }
       this.$http({
         url: this.$http.adornUrl("/algs/templs/list"),
         method: "get",

src/views/modules/alg/train.vue

@@ -20,18 +20,12 @@
       </el-form-item>
       <el-form-item>
         <el-tag>筛选:</el-tag>
-        <el-select v-model="classificationtag" placeholder="类别" size="mini" style="width: 130px;"
+        <el-select v-model="classificationtag" clearable placeholder="类别" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
           <el-option v-for="data in classification" :key="data" :label="data" :value="data">
           </el-option>
         </el-select>
-        <el-select v-model="missStatus" placeholder="状态" size="mini" style="width: 130px;"
-          @change="pageIndex = 1;getDataList2()">
-          <el-option label='停止' value='0'>
-          </el-option>
-          <el-option label='运行中' value='1'>
-          </el-option>
-        </el-select>
+        
       </el-form-item>
       <el-form-item>
         <el-button @click="algorithmTrainCompare()">训练任务对比</el-button>
@@ -214,7 +208,7 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.classificationtag = null;
+      this.classificationtag = '';
       this.missStatus = null;
       this.$http({
         url: this.$http.adornUrl("/category/select"),
@@ -246,6 +240,9 @@ export default {
     //筛选查询
     getDataList2() {
       this.dataListLoading = true;
+      if(this.classificationtag===''){
+        this.classificationtag=null;
+      }
       this.$http({
         url: this.$http.adornUrl("/algstrain/list"),
         method: "get",

src/views/modules/sys/approval.vue

@@ -17,7 +17,7 @@
       </el-form-item>
       <el-form-item>
         <el-tag>筛选:</el-tag>
-        <el-select v-model="classificationtag" placeholder="类别" size="mini" style="width: 130px;"
+        <el-select v-model="classificationtag" clearable placeholder="类别" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
           <el-option v-for="data in classification" :key="data" :label="data" :value="data">
           </el-option>
@@ -107,7 +107,7 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.classificationtag = null;
+      this.classificationtag = '';
       this.form = null;
       this.$http({
         url: this.$http.adornUrl("/category/select"),
@@ -139,6 +139,9 @@ export default {
     //筛选查询
     getDataList2() {
       this.dataListLoading = true;
+      if(this.classificationtag===''){
+        this.classificationtag=null;
+      }
       this.$http({
         url: this.$http.adornUrl("/algs/approval/list"),
         method: "get",

src/views/modules/sys/user.vue

@@ -26,7 +26,7 @@
       <!-- 筛选框 -->
       <el-form-item>
         <el-tag>筛选:</el-tag>
-        <el-select  v-model="statustag" placeholder="状态" size="mini" style="width: 130px;" @change="pageIndex = 1;getDataList2()">
+        <el-select  v-model="statustag" clearable placeholder="状态" size="mini" style="width: 130px;" @change="pageIndex = 1;getDataList2()">
           <el-option v-for="data in statusunique" :key="data" :label="data != '0' ? '正常' :'禁用'" :value="data" >
           </el-option>
         </el-select>
@@ -111,7 +111,7 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      this.statustag = null;
+      this.statustag = '';
       //增加获取角色列表
       this.$http({
         url: this.$http.adornUrl("/sys/role/list"),
@@ -154,6 +154,9 @@ export default {
     //筛选查询
     getDataList2() {
       this.dataListLoading = true;
+      if(this.statustag===''){
+        this.statustag=null;
+      }
       this.$http({
         url: this.$http.adornUrl("/sys/user/list"),
         method: "get",