rui.jiang 4 months ago
parent
commit
be507b2066
3 changed files with 35 additions and 40 deletions
  1. 29 34
      src/views/admin/cockpitManage/component/leftdata.vue
  2. 5 5
      src/views/transition/index.vue
  3. 1 1
      vue.config.js

+ 29 - 34
src/views/admin/cockpitManage/component/leftdata.vue

@@ -75,7 +75,7 @@
     </div>
 
     <!-- 入库信息 -->
-<!-- 
+    
     <div class="BOX">
       <h3 class="centeredh3">入库数据 <span @click="more">更多</span></h3>
       <div>
@@ -91,19 +91,19 @@
           <el-table-column
             prop="windFarmName"
             label="风场名称"
-            width="100"
+            width="90"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="createTime"
             label="时间"
-            width="100"
+            width="90"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
-            prop="dataType"
+            prop="transferTypeName"
             label="数据类型"
             show-overflow-tooltip
           >
@@ -112,7 +112,7 @@
       </div>
     </div>
 
-    <el-dialog title="入库信息" :visible.sync="dialogTableVisible">
+    <!-- <el-dialog title="入库信息" :visible.sync="dialogTableVisible">
       <el-button size="small" @click="importdata">导入数据</el-button>
       <el-table :data="gridData">
         <el-table-column
@@ -146,6 +146,7 @@ import {
   getAnalysisResultErrStateList,
   analysisResultList,
 } from "@/api/ledger.js";
+import axios from "axios";
 
 export default {
   // props: {
@@ -169,38 +170,15 @@ export default {
       glData: [],
       FXData: [],
       tableData: [
-        {
-          windFarmName: "风场A",
-          date: "2023-01-01",
-          dataType: "风速数据",
-        },
-        {
-          windFarmName: "风场B",
-          date: "2023-01-02",
-          dataType: "温度数据",
-        },
-        {
-          windFarmName: "风场C",
-          date: "2023-01-03",
-          dataType: "湿度数据",
-        },
-        {
-          windFarmName: "风场D",
-          date: "2023-01-04",
-          dataType: "风向数据",
-        },
-        {
-          windFarmName: "风场D",
-          date: "2023-01-04",
-          dataType: "风向数据",
-        },
+     
       ],
       maxHeight: "200",
-      gridData:[]
+      gridData: [],
     };
   },
   created() {
     this.getbacklog();
+    this.ruku()
   },
   mounted() {},
   methods: {
@@ -259,9 +237,25 @@ export default {
     more() {
       this.dialogTableVisible = true;
     },
-    importdata(){
+    importdata() {
       window.open(this.$router.resolve({ path: "/transition" }).href, "_blank");
-    }
+    },
+
+    ruku() {
+      axios
+        .post(`/ETLapi/dataTransfer/recentlyImportedSuccessful5Data/`)
+        .then((res) => {
+          if (res.data.code === 200) {
+          this.tableData=res.data.datas
+          }
+          if (res.data.code === 500) {
+            this.$message.error(res.data.message);
+          }
+        })
+        .catch((error) => {
+          console.error("Error fetching data:", error);
+        });
+    },
   },
 };
 </script>
@@ -290,6 +284,7 @@ export default {
     width: 100%;
     display: flex;
     justify-content: space-between;
+    margin-bottom: 5px;
     span {
       font-size: 12px;
       padding-right: 10px;

+ 5 - 5
src/views/transition/index.vue

@@ -95,7 +95,7 @@
         </el-select>
       </p>
       <p>
-        转换状态:
+        导入成功:
         <el-select v-model="statevalue" placeholder="请选择">
           <el-option
             v-for="item in stateoptions"
@@ -273,22 +273,22 @@ export default {
         {
           transferStatus: -1,
 
-          label: "等待转换",
+          label: "等待导入",
         },
         {
           transferStatus: 0,
 
-          label: "转换中",
+          label: "导入中",
         },
         {
           transferStatus: 1,
 
-          label: "转换成功",
+          label: "导入成功",
         },
         {
           transferStatus: 2,
 
-          label: "转换失败",
+          label: "导入失败",
         },
       ],
       activeNames: ["1"],

+ 1 - 1
vue.config.js

@@ -89,7 +89,7 @@ module.exports = {
         // target: "http://192.168.5.11:8001", // WZLapi 目标地址
         // target: "http://106.120.102.238:18080/ImportDataDev", //导数工具
         // target: "http://106.120.102.238:18080/WindTransDev", //WTL外网目标地址  
-        target: "http://106.120.102.238:28999/transDataWeb", //WTL外网目标地址  
+        target: "http://106.120.102.238:28999/transDataWeb", //WTL演示环境
    
 
         changeOrigin: true,