jiangrui占村

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

@@ -73,6 +73,69 @@
         </div>
       </el-dialog>
     </div>
+
+    <!-- 入库信息 -->
+<!-- 
+    <div class="BOX">
+      <h3 class="centeredh3">入库数据 <span @click="more">更多</span></h3>
+      <div>
+        <el-table
+          :data="tableData"
+          :max-height="maxHeight"
+          ref="shujuscroll_Table"
+          strip
+          id="Tabtab"
+          show-overflow-tooltip
+          :header-cell-style="{ backgroundColor: 'red' }"
+        >
+          <el-table-column
+            prop="windFarmName"
+            label="风场名称"
+            width="100"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="时间"
+            width="100"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="dataType"
+            label="数据类型"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <el-dialog title="入库信息" :visible.sync="dialogTableVisible">
+      <el-button size="small" @click="importdata">导入数据</el-button>
+      <el-table :data="gridData">
+        <el-table-column
+          property="date"
+          label="风场名称"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          property="name"
+          label="SCADA分钟级"
+          width="200"
+        ></el-table-column>
+        <el-table-column property="address" label="SCADA秒级"></el-table-column>
+        <el-table-column
+          property="address"
+          label="故障数据
+
+"
+        ></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> -->
   </div>
 </template>
   
@@ -102,8 +165,38 @@ export default {
       abnormal: "",
       glShow: false,
       YCShow: false,
+      dialogTableVisible: false,
       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:[]
     };
   },
   created() {
@@ -162,6 +255,13 @@ export default {
         newWindow.postMessage({ fieldName, errState }, "*");
       };
     },
+
+    more() {
+      this.dialogTableVisible = true;
+    },
+    importdata(){
+      window.open(this.$router.resolve({ path: "/transition" }).href, "_blank");
+    }
   },
 };
 </script>
@@ -182,9 +282,19 @@ export default {
   padding-bottom: 15px;
   color: #fff;
   border-radius: 5px;
+  margin-bottom: 10px;
   h3 {
     margin-top: 5px;
   }
+  .centeredh3 {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    span {
+      font-size: 12px;
+      padding-right: 10px;
+    }
+  }
 }
 
 .YC01 {
@@ -285,5 +395,62 @@ export default {
     margin: 0 45px 0 30px;
   }
 }
+
+#Tabtab {
+  font-size: 12px;
+}
+
+::v-deep.el-table .el-table__cell {
+  padding: 2px 0 !important;
+}
+
+/* 去掉最下面的那一条线 */
+.el-table::before {
+  height: 0px;
+}
+
+/* 滚动条样式 */
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
+  background-color: #004f5f;
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 0px;
+  opacity: 0.5;
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  border-radius: 15px;
+  // background-color: rgba(0, 79, 95, 0.75);
+}
+
+// 。。。。。。。。。。。。。。。。。。。。。。。。。。
+#Tabtab {
+  font-size: 12px;
+}
+
+::v-deep.el-table .el-table__cell {
+  padding: 2px 0 !important;
+}
+
+/* 去掉最下面的那一条线 */
+.el-table::before {
+  height: 0px;
+}
+
+/* 滚动条样式 */
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
+  background-color: #004f5f;
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 0px;
+  opacity: 0.5;
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  border-radius: 15px;
+  // background-color: rgba(0, 79, 95, 0.75);
+}
 </style>
   

src/views/performance/assetssMag.vue

@@ -711,7 +711,7 @@ export default {
     },
     examine() {
       this.$router.push({
-        path: "/home/transition",
+        path: "/transition",
       });
     },
   },

src/views/transition/index.vue

@@ -224,8 +224,9 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="创建时间" prop="createTime" width="300"> </el-table-column>
-        <el-table-column label="操作" prop="desc"  width="150">
+        <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">
               编辑
@@ -257,6 +258,7 @@
 <script>
 import axios from "axios";
 import { getWindFieldNames } from "@/api/ledger.js";
+import { log } from "plotly.js-dist";
 export default {
   data() {
     return {
@@ -306,6 +308,7 @@ export default {
         type: "",
         path: "",
         name: "",
+        id:null
       },
       formRules: {
         wind: [{ required: true, message: "请选择风场", trigger: "blur" }],
@@ -473,6 +476,18 @@ export default {
       this.transitionShow = true;
     },
 
+    editor(row) {
+      console.log(row);
+      // return
+      this.transitionShow = true;
+      this.form.name = row.dataCollector;
+      this.form.path = row.readDir;
+      this.form.type = row.transferType;
+      this.form.wind = row.windFarmCode;
+
+      this.form.id=row.id
+    },
+
     onSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
@@ -507,22 +522,27 @@ export default {
             ?.fieldName || "",
       };
 
-      axios
-        .post("/ETLapi/dataTransfer/addDataTransferTask", params)
-        .then((res) => {
-          this.innerVisible = false;
-          this.transitionShow = false;
-          if (res.data.code === 200) {
-            this.$message({
-              message: "导入成功",
-              type: "success",
-            });
-            this.query();
-          }
-          if (res.data.code === 500) {
-            this.$message.error(res.data.message);
-          }
-        });
+      let apiUrl = "/ETLapi/dataTransfer/addDataTransferTask"; // 默认是新增
+      if (this.form.id) {
+        // 如果有 id，说明是编辑
+        apiUrl = "/ETLapi/dataTransfer/editDataTransferTask";
+        params.id = this.form.id; // 传递 id
+      }
+
+      axios.post(apiUrl, params).then((res) => {
+        this.innerVisible = false;
+        this.transitionShow = false;
+        if (res.data.code === 200) {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+          });
+          this.query();
+        }
+        if (res.data.code === 500) {
+          this.$message.error(res.data.message);
+        }
+      });
     },
   },
 };

vue.config.js

@@ -66,9 +66,9 @@ module.exports = {
         // target: "http://192.168.5.4:16200", // 石月
         // target: "http://192.168.50.235:16200", // 内网
         // target: "http://192.168.5.15:16200",
-        target: "http://192.168.50.235:16500", //演示环境
-        // target: "http://106.120.102.238:", //外网演示环境
-        // target: "http://106.120.102.238:16700", // 外网16700  生产16600
+        // target: "http://192.168.50.235:16500", //演示环境
+        // target: "http://106.120.102.238:26500", //外网演示环境
+        target: "http://106.120.102.238:16700", // 外网16700  生产16600
         // target: "http://10.96.137.5",
         changeOrigin: true,
         pathRewrite: {
@@ -88,7 +88,10 @@ module.exports = {
         // target: "http://192.168.50.241:9001", // WZLapi 目标地址
         // 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:18080/WindTransDev", //WTL外网目标地址  
+        // target: "http://106.120.102.238:28999/transDataWeb", //WTL外网目标地址  
+   
+
         changeOrigin: true,
         pathRewrite: {
           "^/ETLapi": "", // 去掉 /WZLapi 前缀