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

src/views/admin/cockpitManage/component/leftdata.vue

@@ -75,7 +75,7 @@
     </div>
 
     <!-- 入库信息 -->
-    
+
     <div class="BOX">
       <h3 class="centeredh3">入库数据 <span @click="more">更多</span></h3>
       <div>
@@ -112,30 +112,42 @@
       </div>
     </div>
 
-    <!-- <el-dialog title="入库信息" :visible.sync="dialogTableVisible">
+    <el-dialog title="入库信息" width="70%" :visible.sync="dialogTableVisible">
       <el-button size="small" @click="importdata">导入数据</el-button>
-      <el-table :data="gridData">
+      <el-table :data="gridData" style="max-height: 400px; overflow: auto">
         <el-table-column
-          property="date"
+          property="windFarmName"
           label="风场名称"
-          width="150"
+          show-overflow-tooltip
+          width="150px"
         ></el-table-column>
         <el-table-column
-          property="name"
+          property="minuteTimeAreaList"
           label="SCADA分钟级"
-          width="200"
+          show-overflow-tooltip
         ></el-table-column>
-        <el-table-column property="address" label="SCADA秒级"></el-table-column>
         <el-table-column
-          property="address"
-          label="故障数据
-
-"
+          property="secondTimeAreaList"
+          label="SCADA秒级"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          property="faultTimeAreaList"
+          label="故障数据"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          property="warnTimeAreaList"
+          label="报警数据"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          property="vibrationTimeAreaList"
+          label="振动数据"
+          show-overflow-tooltip
         ></el-table-column>
-        <el-table-column property="address" label="报警数据"></el-table-column>
-        <el-table-column property="address" label="振动数据"></el-table-column>
       </el-table>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
   
@@ -169,16 +181,80 @@ export default {
       dialogTableVisible: false,
       glData: [],
       FXData: [],
-      tableData: [
-     
-      ],
+      tableData: [],
       maxHeight: "200",
-      gridData: [],
+      gridData: [
+        {
+          id: 1,
+          date: "2016-05-02",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+        {
+          id: 2,
+          date: "2016-05-04",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1517 弄",
+        },
+        {
+          id: 3,
+          date: "2016-05-01",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1519 弄",
+          children: [
+            {
+              id: 31,
+              date: "2016-05-01",
+              name: "王小虎",
+              address: "上海市普陀区金沙江路 1519 弄",
+            },
+            {
+              id: 32,
+              date: "2016-05-01",
+              name: "王小虎",
+              address: "上海市普陀区金沙江路 1519 弄",
+            },
+          ],
+        },
+        {
+          id: 4,
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1516 弄",
+        },
+      ],
+      tableData1: [
+        {
+          id: 1,
+          date: "2016-05-02",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+        {
+          id: 2,
+          date: "2016-05-04",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1517 弄",
+        },
+        {
+          id: 3,
+          date: "2016-05-01",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1519 弄",
+          hasChildren: true,
+        },
+        {
+          id: 4,
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1516 弄",
+        },
+      ],
     };
   },
   created() {
     this.getbacklog();
-    this.ruku()
+    this.ruku();
   },
   mounted() {},
   methods: {
@@ -236,6 +312,49 @@ export default {
 
     more() {
       this.dialogTableVisible = true;
+      axios
+        .post(`/ETLapi/dataTransfer/pltIndexMore`)
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.gridData = res.data.datas.map((item) => {
+              // 合并数组中的元素，用 '/' 分隔
+              if (
+                item.secondTimeAreaList &&
+                item.secondTimeAreaList.length > 0
+              ) {
+                item.secondTimeAreaList = [item.secondTimeAreaList.join(" / ")];
+              }
+              if (item.faultTimeAreaList && item.faultTimeAreaList.length > 0) {
+                item.faultTimeAreaList = [item.faultTimeAreaList.join(" / ")];
+              }
+              if (
+                item.minuteTimeAreaList &&
+                item.minuteTimeAreaList.length > 0
+              ) {
+                item.minuteTimeAreaList = [item.minuteTimeAreaList.join(" / ")];
+              }
+              if (
+                item.vibrationTimeAreaList &&
+                item.vibrationTimeAreaList.length > 0
+              ) {
+                item.vibrationTimeAreaList = [
+                  item.vibrationTimeAreaList.join(" / "),
+                ];
+              }
+              if (item.warnTimeAreaList && item.warnTimeAreaList.length > 0) {
+                item.warnTimeAreaList = [item.warnTimeAreaList.join(" / ")];
+              }
+
+              return item;
+            });
+          }
+          if (res.data.code === 500) {
+            this.$message.error(res.data.message);
+          }
+        })
+        .catch((error) => {
+          console.error("Error fetching data:", error);
+        });
     },
     importdata() {
       window.open(this.$router.resolve({ path: "/transition" }).href, "_blank");
@@ -243,10 +362,10 @@ export default {
 
     ruku() {
       axios
-        .post(`/ETLapi/dataTransfer/recentlyImportedSuccessful5Data/`)
+        .post(`/ETLapi/dataTransfer/recentlyImportedSuccessful5Data`)
         .then((res) => {
           if (res.data.code === 200) {
-          this.tableData=res.data.datas
+            this.tableData = res.data.datas;
           }
           if (res.data.code === 500) {
             this.$message.error(res.data.message);

vue.config.js

@@ -90,7 +90,6 @@ module.exports = {
         // 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演示环境
-
         changeOrigin: true,
         pathRewrite: {
           "^/ETLapi": "", // 去掉 /WZLapi 前缀