!3 0720

Merge pull request !3 from Ann/master

src/views/modules/visi/create1.vue

@@ -466,6 +466,7 @@ export default {
           this.imsql[i].newFileName = this.userID + '_' + this.imsql[i].subEquipmentID + '_' + this.imsql[i].id
         }
       }
+      var onlyStatic = true
       for (let j = 0; j < this.imsql.length; j++) {
         await this.$http({
           url: this.$http.adornUrl('/dataset/dynamic/makeDyDataSet'),
@@ -476,6 +477,7 @@ export default {
 
           this.soutRizhi = this.soutRizhi + '\n' + context.info
         })
+        onlyStatic = false
       }
 
       if (this.st_imsql.length > 0) {
@@ -498,13 +500,15 @@ export default {
         }
       }
       for (let sti = 0; sti < this.st_imsql.length; sti++) {
+        var massage = {
+          'st_imsql': this.st_imsql[sti],
+          'onlyStatic': onlyStatic
+        }
         await this.$http({
           url: this.$http.adornUrl('/dataset/static/makeStaticDataSet'),
           method: 'post',
-          data: this.$http.adornData(this.st_imsql[sti], false)
+          data: this.$http.adornData(massage, false)
         }).then(subresult => {
-          // var context = subresult.data
-
           this.soutRizhi = this.soutRizhi + '\n' + subresult.data.info
         })
       }
@@ -968,7 +972,7 @@ export default {
             userId: this.userID
           }
 
-          MessageBox.confirm(`确定新建数据集?`, '提示', {
+          MessageBox.confirm(`确定新建静态数据集?`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'

src/views/modules/visi/datapreprocess_my.vue

@@ -0,0 +1,100 @@
+<template>
+  <el-dialog :title=" '数据清洗'" :close-on-click-modal="false" :visible.sync="visible">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+      label-width="100px">
+      <el-form-item label="数据集名称" prop="datasetName">
+        <el-input v-model="dataForm.datasetName" placeholder="请输入数据集名称" :disabled=true></el-input>
+      </el-form-item>
+      <el-form-item label="缺失值处理" size="mini">
+        <el-radio-group v-model="radio">
+          <el-radio label="drop">删除缺失值所在行</el-radio>
+          <el-radio label="median">填充中位数</el-radio>
+          <el-radio label="mean">填充平均值</el-radio>
+          <el-radio label="mean">填充平均值</el-radio>
+          <el-radio label="mean">填充众数</el-radio>
+          <el-radio label="mean">热卡填充</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="异常数据检测并删除" size="mini">
+        <el-radio-group v-model="radio">
+          <el-radio label="drop">最值检测</el-radio>
+          <el-radio label="median">盖帽分析</el-radio>
+          <el-radio label="mean">箱子模型</el-radio>
+          <el-radio label="mean">聚类检测</el-radio>
+          <el-radio label="mean">模型检测</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="格式清洗" size="mini">
+        <el-radio-group v-model="radio">
+          <el-radio label="drop">统一转为 字符串</el-radio>
+          <el-radio label="median">时间日期格式化</el-radio>
+        </el-radio-group>
+      </el-form-item>
+<!--      <el-form-item label="是否进行特征工程处理" size="mini">-->
+<!--        <el-radio-group v-model="mark">-->
+<!--          <el-radio label="yes">是</el-radio>-->
+<!--          <el-radio label="no">否</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataPreProcess()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { Message } from "element-ui"
+export default {
+  data() {
+    return {
+      visible: false,
+      radio:'drop',
+       mark:'yes',
+      // 获取所有类别列表
+      dataForm: {
+        id: 0,
+        datasetName: "",
+
+      },
+
+
+    };
+  },
+  methods: {
+    init(filename) {
+      this.dataForm.datasetName=filename+".csv";
+      console.log(this.dataForm.datasetName);
+      this.visible=true;
+    },
+
+    //执行数据预处理流程
+    dataPreProcess(){
+
+        this.$http({
+          url:this.$http.adornUrl('/dataPreProcess/dataPreProcessByPython'),
+          method:'get',
+          params:this.$http.adornParams({
+            datasetName:this.dataForm.datasetName,
+            preProcessMethod:this.radio,
+             featureMark:this.mark
+          }),
+        }).then(({data})=>{
+          if(data&&data.code===0){
+              Message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+            });
+            this.visible=false;
+          }else{
+              Message.error('失败');
+          }
+        });
+    }
+
+  },
+};
+</script>

src/views/modules/visi/dataset.vue

@@ -30,7 +30,7 @@
         <el-tag>筛选:</el-tag>
         <el-select v-model="classificationtag" placeholder="类别" size="mini" style="width: 130px;"
           @change="pageIndex = 1;getDataList2()">
-          <el-option v-for="data in classification" :key="data.categoryId" :label="data.categoryName" :value="data.categoryId">
+          <el-option v-for="data in classification" :key="data.categoryId" :label="data.categoryName" :value="data.categoryName">
           </el-option>
         </el-select>
         <el-select v-model=status placeholder="动静状态" size="mini" style="width: 130px;"
@@ -120,7 +120,7 @@
           <el-button v-if="isAuth('sys:schedule:log')" type="text" size="small" @click="dy_logHandle(scope.row)">日志</el-button>
 
           <el-button type="text" size="small" @click="downloadDataset(scope.row.datasetName)">下载</el-button>
-          <!-- <el-button type="text" size="small" @click="openDataPreProcessDialog(scope.row.datasetName)">预处理</el-button> -->
+           <el-button type="text" size="small" @click="openDataPreProcessDialog(scope.row.datasetName)">预处理</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -150,7 +150,8 @@ import Add from './dataset-add'
 import dydatasetUpdata from './dydataset-updata'
 import stdatasetUpdata from './stdataset-updata'
 import dylog from './dy-schedule-log'
-import DataPreProcess from './datapreprocess'
+// import DataPreProcess from './datapreprocess'
+import DataPreProcess from './datapreprocess_my'
 import { MessageBox } from 'element-ui'
 import { Message } from "element-ui"
 export default {
@@ -557,7 +558,7 @@ export default {
     },
     // 下载数据集
     downloadDataset (filename) {
-      
+
       MessageBox.confirm(`是否下载该数据集?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',