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

pdaaphm-ui/src/views/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="home" v-loading="loading" >
+  <div class="home" v-loading="loading">
     <div class="second">
       <div class="topPanel">
         <!-- 原始数据 -->
@@ -12,25 +12,26 @@
                 </el-tooltip>
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="processStatus" label="状态" align="center">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
-              </template>
-            </el-table-column> -->
           </el-table>
         </div>
         <!-- 去噪 -->
         <div class="tPanel">
           <el-table size="mini" :data="denoisingList">
-            <el-table-column prop="resultDataName" label="数据" align="center">
+            <el-table-column prop="resultDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
                 <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>
+                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processStatus" label="状态" align="center">
+            <el-table-column prop="processedDataName" 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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="processStatus" label="状态" align="center" width="60">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
               </template>
@@ -40,15 +41,21 @@
         <!-- 特征提取 -->
         <div class="tPanel">
           <el-table size="mini" :data="featureExtractionList">
-            <el-table-column prop="resultDataName" label="数据" align="center">
+            <el-table-column prop="resultDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
                 <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>
+                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column prop="processedDataName" 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>
               </template>
             </el-table-column>
-            <el-table-column prop="processStatus" label="状态" align="center">
+            <el-table-column prop="processStatus" label="状态" align="center" width="60">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
               </template>
@@ -58,15 +65,21 @@
         <!-- 故障预测 -->
         <div class="tPanel">
           <el-table size="mini" :data="faultPredictionList">
-            <el-table-column prop="resultDataName" label="数据" align="center">
+            <el-table-column prop="resultDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="file" @click="imgShow(scope.row.dataPath, scope.row.dataType)">{{
-            scope.row.resultDataName }}</span>
+                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processStatus" label="状态" align="center">
+            <el-table-column prop="processedDataName" 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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="processStatus" label="状态" align="center" width="60">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
               </template>
@@ -115,15 +128,21 @@
         <!-- 补全 -->
         <div class="bPanel">
           <el-table size="mini" :data="completionList">
-            <el-table-column prop="resultDataName" label="数据" align="center">
+            <el-table-column prop="resultDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
                 <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>
+                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processStatus" label="状态" align="center">
+            <el-table-column prop="processedDataName" 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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="processStatus" label="状态" align="center" width="60">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
               </template>
@@ -133,16 +152,21 @@
         <!-- 扩充 -->
         <div class="bPanel">
           <el-table size="mini" :data="expansionList">
-            <el-table-column prop="resultDataName" label="数据" align="center">
-
+            <el-table-column prop="resultDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
                 <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>
+                  <span class="beforeFile">{{ scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processStatus" label="状态" align="center">
+            <el-table-column prop="processedDataName" 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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="processStatus" label="状态" align="center" width="60">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
               </template>
@@ -152,15 +176,21 @@
         <!-- 退化评估 -->
         <div class="bPanel">
           <el-table size="mini" :data="assessmentList">
-            <el-table-column prop="resultDataName" label="数据" align="center">
+            <el-table-column prop="resultDataName" label="处理前数据" align="center">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" :content="scope.row.resultDataName" placement="top">
-                  <span class="file" @click="imgShow(scope.row.dataPath, scope.row.dataType)">{{
-            scope.row.resultDataName }}</span>
+                  <span class="beforeFile">{{scope.row.resultDataName }}</span>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="processStatus" label="状态" align="center">
+            <el-table-column prop="processedDataName" 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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="processStatus" label="状态" align="center" width="60">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.biz_process_status" :value="scope.row.processStatus" />
               </template>
@@ -208,12 +238,7 @@
     <el-dialog v-loading="loading" title="数据展示" :visible.sync="fileShowVisible" width="80%"
       :close-on-click-modal="false">
       <el-button v-if="fileType !== '4' && fileType !== '5'" style="margin-left:50px;" type="text"
-        @click="changeShow">{{
-            isTableShow ?
-              '表格展示'
-              :
-              '曲线展示'
-          }}</el-button>
+        @click="changeShow">{{ isTableShow ? '表格展示' : '曲线展示' }}</el-button>
       <div v-if="isTableShow && fileType !== '5'">
         <vxe-table border="none" size="mini" show-overflow highlight-hover-row height="400"
           :row-config="{ isHover: true, isCurrent: true }" :sort-config="{ trigger: 'cell' }" :data="completionData">
@@ -221,6 +246,7 @@
             :field="'val' + index" :title="item"></vxe-table-column>
         </vxe-table>
       </div>
+      <!-- <div v-if="!isTableShow && fileType !== '5'" ref="beforeChartRef" style="width: 100%; height: 400px;"></div> -->
       <div v-if="!isTableShow && fileType !== '5'" ref="completionChartRef" style="width: 100%; height: 400px;"></div>
       <ImagePreview v-if="fileType === '5'" :src="imgPreviewUrl"></ImagePreview>
     </el-dialog>
@@ -373,65 +399,69 @@ export default {
       this.resultFileId = resultDataId
       this.fileType = processType
       getData(resultDataId).then(res => {
-        const url = process.env.VUE_APP_BASE_API + res.data.dataPath;
-        this.fetchLogFile(url)
-          .then((text) => {
-            if (this.chart != null && this.chart != "" && this.chart != undefined) {
-              this.chart.dispose();
-              this.chart = null
-            }
-            let data, content, head
-            if (res.data.dataType !== '5' && res.data.dataType !== '6') {
+        if (res.data.imagePath) {
+          this.imgPreviewUrl=res.data.imagePath
+        } else {
+          const url = process.env.VUE_APP_BASE_API + res.data.dataPath;
+          this.fetchLogFile(url)
+            .then((text) => {
+              if (this.chart != null && this.chart != "" && this.chart != undefined) {
+                this.chart.dispose();
+                this.chart = null
+              }
+              let data, content, head
+              // if (res.data.dataType !== '5' && res.data.dataType !== '6') {
               data = this.handleFileData(text)
               content = data.contentData
               head = data.headData
-            }
-            switch (res.data.dataType) {
-              case '0':
-                this.fileShowVisible = true
-                this.$nextTick(() => {
-                  this.handleChartOption(content, head, true)
-                  this.loading = false
-                })
-                break;
-              case '1':
-                this.fileShowVisible = true
-                this.$nextTick(() => {
-                  this.handleChartOption(content, head, false)
-                  this.loading = false
-                })
-                break;
-              case '2':
-                this.fileShowVisible = true
-                this.$nextTick(() => {
-                  this.handleChartOption(content, head, false)
-                })
-                break;
-              case '3':
-                this.fileShowVisible = true
-                this.$nextTick(() => {
-                  this.handleChartOption(content, head, false)
-                })
-                break;
-              case '4':
-                this.fileShowVisible = true
-                this.$nextTick(() => {
-                  this.handleChartOption(content, head, false)
-                })
-                break;
-              case '5':
-                break;
-              case '6':
-                break;
-              default:
-                break;
-            }
-          })
-          .catch((error) => {
-            console.error("Failed to fetch the log file:", error);
-            this.$modal.msgSuccess("文件读取错误");
-            this.loading=false
-          });
+              // }
+              switch (res.data.dataType) {
+                case '0':
+                  this.fileShowVisible = true
+                  this.$nextTick(() => {
+                    this.handleChartOption(content, head, true)
+                    this.loading = false
+                  })
+                  break;
+                case '1':
+                  this.fileShowVisible = true
+                  this.$nextTick(() => {
+                    this.handleChartOption(content, head, false)
+                    this.loading = false
+                  })
+                  break;
+                case '2':
+                  this.fileShowVisible = true
+                  this.$nextTick(() => {
+                    this.handleChartOption(content, head, false)
+                  })
+                  break;
+                case '3':
+                  this.fileShowVisible = true
+                  this.$nextTick(() => {
+                    this.handleChartOption(content, head, false)
+                  })
+                  break;
+                case '4':
+                  this.fileShowVisible = true
+                  this.$nextTick(() => {
+                    this.handleChartOption(content, head, false)
+                  })
+                  break;
+                case '5':
+                  break;
+                case '6':
+                  break;
+                default:
+                  break;
+              }
+            })
+            .catch((error) => {
+              console.error("Failed to fetch the log file:", error);
+              this.$modal.msgSuccess("文件读取错误");
+              this.loading = false
+            });
+        }
       });
     },
     // 读取文件内容
@@ -752,12 +782,11 @@ export default {
 
 }
 
-.file {
+.file,
+.beforeFile {
   cursor: pointer;
   white-space: nowrap;
-  /* 禁止文本换行 */
   overflow: hidden;
-  /* 隐藏超出范围的内容 */
   text-overflow: ellipsis;
 }