瀏覽代碼

Merge branch 'master' of http://192.168.50.233:3000/rui.jiang/performance-test

liujiejie 4 月之前
父節點
當前提交
526df99116
共有 2 個文件被更改,包括 20 次插入9 次删除
  1. 8 2
      src/views/performance/assetssMag.vue
  2. 12 7
      src/views/transition/index.vue

+ 8 - 2
src/views/performance/assetssMag.vue

@@ -448,6 +448,7 @@ export default {
     window.addEventListener("message", this.handleMessage); //江
     this.getTableList();
   },
+
   beforeDestroy() {
     this.stopPolling();
     // 销毁消息监听器
@@ -657,6 +658,9 @@ export default {
     // 重置
     reset(formName) {
       this.$refs[formName].resetFields();
+      this.formInline.fieldName = "";
+      this.formInline.analysisState = "";
+      this.formInline.errState = "";
       this.getTableList();
     },
     // fetchData 方法在轮询中调用
@@ -707,12 +711,14 @@ export default {
     },
     examine() {
       this.$router.push({
-        path: "/home/transition/index",
+        path: "/home/transition",
       });
     },
   },
   mounted() {
-    this.startPolling();
+    setTimeout(() => {
+      this.startPolling();
+    }, 5000);
   },
 };
 </script>

+ 12 - 7
src/views/transition/index.vue

@@ -212,7 +212,7 @@
         </el-table-column>
         <el-table-column label="风场名称" prop="windFarmName" width="200">
         </el-table-column>
-        <el-table-column label="任务名称" prop="taskName" > </el-table-column>
+        <el-table-column label="任务名称" prop="taskName"> </el-table-column>
         <el-table-column label="转换类型" prop="transferTypeName" width="130">
         </el-table-column>
         <el-table-column label="导入状态" prop="transferStatus" width="100">
@@ -224,9 +224,8 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="创建时间" prop="createTime">
-        </el-table-column>
-        <el-table-column label="操作" prop="desc">
+        <el-table-column label="创建时间" prop="createTime" width="300"> </el-table-column>
+        <el-table-column label="操作" prop="desc"  width="150">
           <template slot-scope="scope">
             <el-button @click="editor(scope.row)" type="text" size="small">
               编辑
@@ -444,7 +443,6 @@ export default {
     },
 
     details(windFarmCode, type) {
-      this.dialogVisible = true;
       // console.log(windFarmCode, type);
       // return;
       const params = {
@@ -457,8 +455,15 @@ export default {
       axios
         .post("/ETLapi/dataTransfer/getDataTransfer", params)
         .then((res) => {
-          this.dataset = res.data.datas;
+          if (res.data.datas.length === 0) {
+            // 判断是否为0,避免与字符串 "0" 比较
+            this.$message("当前数据暂无入库信息!");
+          } else {
+            this.dialogVisible = true;
+            this.dataset = res.data.datas;
+          }
         })
+
         .catch((error) => {
           console.error("Error fetching data:", error);
         });
@@ -501,7 +506,7 @@ export default {
           this.windoptions.find((option) => option.fieldCode === this.form.wind)
             ?.fieldName || "",
       };
-   
+
       axios
         .post("/ETLapi/dataTransfer/addDataTransferTask", params)
         .then((res) => {