Merge remote-tracking branch 'origin/rmd-dev' into rmd-dev

pdaaphm-ui/src/views/index.vue

@@ -17,17 +17,17 @@
         <!-- 去噪 -->
         <div class="tPanel">
           <el-table size="mini" :data="denoisingList">
-            <el-table-column prop="resultDataName" label="处理前数据" align="center">
+            <el-table-column prop="processedDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
+                  <span class="beforeFile">{{ scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processedDataName" label="处理后数据" align="center">
+            <el-table-column prop="resultDataName" label="处理后数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
-                  <span class="file" @click="handleFile(scope.row.processedDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
+                  <span class="file" @click="handleFile(scope.row.resultDataId, scope.row.processType)">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -41,17 +41,17 @@
         <!-- 特征提取 -->
         <div class="tPanel">
           <el-table size="mini" :data="featureExtractionList">
-            <el-table-column prop="resultDataName" label="处理前数据" align="center">
+            <el-table-column prop="processedDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
+                  <span class="beforeFile">{{ scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processedDataName" label="处理后数据" align="center">
+            <el-table-column prop="resultDataName" label="处理后数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
-                  <span class="file" @click="handleFile(scope.row.processedDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
+                  <span class="file" @click="handleFile(scope.row.resultDataId, scope.row.processType)">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -65,17 +65,17 @@
         <!-- 故障预测 -->
         <div class="tPanel">
           <el-table size="mini" :data="faultPredictionList">
-            <el-table-column prop="resultDataName" label="处理前数据" align="center">
+            <el-table-column prop="processedDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
+                  <span class="beforeFile">{{ scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processedDataName" label="处理后数据" align="center">
+            <el-table-column prop="resultDataName" label="处理后数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
-                  <span class="file" @click="handleFile(scope.row.processedDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
+                  <span class="file" @click="handleFile(scope.row.resultDataId, scope.row.processType)">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -128,17 +128,17 @@
         <!-- 补全 -->
         <div class="bPanel">
           <el-table size="mini" :data="completionList">
-            <el-table-column prop="resultDataName" label="处理前数据" align="center">
+            <el-table-column prop="processedDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
+                  <span class="beforeFile">{{ scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processedDataName" label="处理后数据" align="center">
+            <el-table-column prop="resultDataName" label="处理后数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
-                  <span class="file" @click="handleFile(scope.row.processedDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
+                  <span class="file" @click="handleFile(scope.row.resultDataId, scope.row.processType)">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -152,17 +152,17 @@
         <!-- 扩充 -->
         <div class="bPanel">
           <el-table size="mini" :data="expansionList">
-            <el-table-column prop="resultDataName" label="处理前数据" align="center">
+            <el-table-column prop="processedDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
+                  <span class="beforeFile">{{ scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processedDataName" label="处理后数据" align="center">
+            <el-table-column prop="resultDataName" label="处理后数据" align="center">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
-                  <span class="file" @click="handleFile(scope.row.processedDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
+                  <span class="file" @click="handleFile(scope.row.resultDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -176,17 +176,17 @@
         <!-- 退化评估 -->
         <div class="bPanel">
           <el-table size="mini" :data="assessmentList">
-            <el-table-column prop="resultDataName" label="处理前数据" align="center">
+            <el-table-column prop="processedDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="beforeFile">{{scope.row.resultDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
+                  <span class="beforeFile">{{scope.row.processedDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processedDataName" label="处理后数据" align="center">
+            <el-table-column prop="resultDataName" label="处理后数据" align="center">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.processedDataName" placement="top">
-                  <span class="file" @click="handleFile(scope.row.processedDataId, scope.row.processType)">{{ scope.row.processedDataName }}</span>
+                <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
+                  <span class="file" @click="handleFile(scope.row.resultDataId, scope.row.processType)">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -434,18 +434,21 @@ export default {
                   this.fileShowVisible = true
                   this.$nextTick(() => {
                     this.handleChartOption(content, head, false)
+                    this.loading = false
                   })
                   break;
                 case '3':
                   this.fileShowVisible = true
                   this.$nextTick(() => {
                     this.handleChartOption(content, head, false)
+                    this.loading = false
                   })
                   break;
                 case '4':
                   this.fileShowVisible = true
                   this.$nextTick(() => {
                     this.handleChartOption(content, head, false)
+                    this.loading = false
                   })
                   break;
                 case '5':