代码合并

src/api/ledger.js

@@ -69,6 +69,15 @@ export function delCompany(data) {
     data
   })
 }
+//企业查询风场
+export function getWindFieldVos(data) {
+  return request({
+    url: '/energy-manage-service/api/wind/field/getWindFieldVos',
+    method: 'post',
+    data: jsonToFormData(data)
+  })
+}
+
 // .........................测风塔页面
 // 查询
 export function getAnemometerTowerPage(data) {
@@ -407,11 +416,20 @@ export function getCompanyFieldNumberVo(data) {
     data
   })
 }
-
+// 驾驶舱tree树接口
 export function getSysOrganizationAuthTreeByRoleId(data) {
   return request({
     url: '/energy-manage-service/sysOrganizationAuth/getSysOrganizationAuthTreeByRoleId',
     method: 'post',
     data
   })
+}
+
+// 电子地图接口
+export function getWindEngineGroupByFieldCode(data) {
+  return request({
+    url: '/energy-manage-service/api/wind/engine/group/getWindEngineGroupByFieldCode',
+    method: 'post',
+    data
+  })
 }

src/components/map/index.vue

@@ -2,46 +2,43 @@
   <div class="map-container">
     <div id="map" class="map"></div>
     <div v-if="hoverInfo" :style="hoverStyle" class="hover-info">
-      <h3>XXXX风场</h3>
+      <h3>{{hoverInfo.fieldName}}</h3>
       <div>
-        <p><span>风场编号</span><span>xxxx</span></p>
-        <p><span>风场名称</span><span>xxxx</span></p>
-        <p><span>空气密度-合同</span><span>xxxx</span></p>
-        <p><span>启用状态</span><span>xxxx</span></p>
-        <p><span>风机数量</span><span>xxxx</span></p>
-        <p><span>总额定容量</span><span>xxxx</span></p>
-        <p><span>经度</span><span>xxxx</span></p>
-        <p><span>纬度</span><span>xxxx</span></p>
-        <p><span>海拔高度</span><span>xxxx</span></p>
-        <p><span>更新时间</span><span>xxxx</span></p>
+        <p><span>风场编号</span><span>{{hoverInfo.codeNumber}}</span></p>
+        <p><span>空气密度</span><span>{{hoverInfo.density}}</span></p>
+        <p><span>总额定容量</span><span>{{hoverInfo.ratedCapacityNumber}}</span></p>
+        <p><span>经度</span><span>{{hoverInfo.longitude}}</span></p>
+        <p><span>纬度</span><span>{{hoverInfo.latitude}}</span></p>
+        <p><span>海拔高度</span><span>{{hoverInfo.elevationHeight}}</span></p>
+        <p><span>最新分析时间</span><span> {{ $formatDate(hoverInfo.wfbrCreateTime) }}</span></p>
       </div>
     </div>
+
     <div v-if="hoverfengji" :style="hoverfengjiStyle" class="hover-fengji">
-      <h3>XXX风机</h3>
+      <h3>{{hoverfengji.engineName}}</h3>
       <div>
-        <p><span>风机编号</span><span>xxxx</span></p>
-        <p><span>风机名称</span><span>xxxx</span></p>
-        <p><span>额定容量</span><span>xxxx</span></p>
-        <p><span>海拔高度</span><span>xxxx</span></p>
-        <p><span>轮毂高度</span><span>xxxx</span></p>
-        <p><span>经度</span><span>xxxx</span></p>
-        <p><span>维度</span><span>xxxx</span></p>
-        <p><span>是否标杆风机</span><span>xxxx</span></p>
-        <p><span>创建时间</span><span>xxxx</span></p>
-        <p><span>更新人</span><span>xxxx</span></p>
-        <p><span>更新时间</span><span>xxxx</span></p>
+        <p><span>风机编号</span><span>{{hoverfengji.engineCode}}</span></p>
+        <p><span>额定容量</span><span>{{hoverfengji.ratedCapacity}}</span></p>
+        <p><span>海拔高度</span><span>{{hoverfengji.elevationHeight}}</span></p>
+        <p><span>轮毂高度</span><span>{{hoverfengji.hubHeight}}</span></p>
+        <p><span>经度</span><span>{{hoverfengji.longitude}}</span></p>
+        <p><span>维度</span><span>{{hoverfengji.latitude}}</span></p>
+        <p>是否标杆风机 <span>{{hoverfengji.sightcing == 1 ? '是' : '否'}}</span></p>
+        <p><span>额定风速</span><span>{{hoverfengji.rated_wind_speed}}</span></p>
+        <p><span>切入风速</span><span>{{hoverfengji.ratedCutInWindspeed}}</span></p>
+        <p><span>切出风速</span><span>{{hoverfengji.ratedCutOutWindspeed}}</span></p>
       </div>
     </div>
     <div v-if="hoverta" :style="hovertaStyle" class="hover-ta">
-      <h3>XXXXX测风塔</h3>
+      <h3>{{hoverta.anemometerName}}</h3>
       <div>
-        <p><span>测风塔编号</span><span>xxxx</span></p>
-        <p><span>机型类型</span><span>xxxx</span></p>
-        <p><span>经度</span><span>xxxx</span></p>
-        <p><span>维度</span><span>xxxx</span></p>
-        <p><span>状态</span><span>xxxx</span></p>
-        <p><span>测风塔高度</span><span>xxxx</span></p>
-        <p><span>创建时间</span><span>xxxx</span></p>
+        <p><span>测风塔编号</span><span>{{hoverta.anemometerCode}}</span></p>
+
+        <p><span>经度</span><span>{{hoverta.longitude}}</span></p>
+        <p><span>维度</span><span>{{hoverta.anemometerName}}</span></p>
+        <p><span>状态</span><span>{{hoverta.latitude}}</span></p>
+        <p><span>测风塔高度</span><span>{{hoverta.anemometerHeightStrings}}</span></p>
+
       </div>
     </div>
   </div>
@@ -60,8 +57,6 @@ import { Point } from "ol/geom";
 import { Icon, Style } from "ol/style";
 import ZoomSlider from "ol/control/ZoomSlider.js";
 import { defaults as defaultControls } from "ol/control.js";
-import icon from "../../assets/location.png";
-import icon2 from "../../assets/location.png"; //这只是一个演示  具体图片自己去定义
 
 import icon01 from "../../assets/img/icon01.png";
 import icon02 from "../../assets/img/icon02.png";
@@ -70,10 +65,12 @@ import icon04 from "../../assets/img/icon04.png";
 import icon05 from "../../assets/img/icon05.png";
 import defaultIcon from "../../assets/img/icon05.png";
 export default {
-  maplist: {
-    type: Object,
-    default: () => {
-      return {};
+  props: {
+    windEngineGroupByFieldCodeDetail: {
+      type: Object,
+      default: () => {
+        return {};
+      },
     },
   },
   name: "T-map",
@@ -82,28 +79,27 @@ export default {
       hoverInfo: null,
       hoverStyle: {
         position: "absolute",
-        left: "0px", // Initialize left property
+        left: "0px", 
         top: "0px",
       },
       hoverfengji: null,
       hoverfengjiStyle: {
         position: "absolute",
-        left: "0px", // Initialize left property
+        left: "0px",
         top: "0px",
       },
       hoverta: null,
       hovertaStyle: {
         position: "absolute",
-        left: "0px", // Initialize left property
+        left: "0px",
         top: "0px",
       },
     };
   },
   watch: {
-    maplist: {
+    windEngineGroupByFieldCodeDetail: {
       handler(data) {
         if (data) {
-          console.log(data);
         }
       },
       deep: true, // 深度监听
@@ -189,20 +185,23 @@ export default {
       }
     },
     getIconForValue(val) {
-      // Define icon sources based on different values of val
+
       switch (val) {
-        case "-1" || -1:
-          return icon01; // Define icon1 variable with the path to the icon for val 1
-        case "2":
-          return icon02; // Define icon2 variable with the path to the icon for val 2
-        case "3":
-          return icon03; // Define icon3 variable with the path to the icon for val 3
+        case "-1":
+        case -1:
+          return icon01;
+        case 0:
+        case "0":
+          return icon02;
+        case 1:
+        case "1":
+          return icon03;
         case "4":
-          return icon04; // Define icon3 variable with the path to the icon for val 3
+          return icon04;
         case "5":
-          return icon05; // Define icon3 variable with the path to the icon for val 3
+          return icon05;
         default:
-          return defaultIcon; // Define defaultIcon variable with the path to the default icon
+          return defaultIcon;
       }
     },
 
@@ -217,17 +216,17 @@ export default {
         if (features && features.length > 0) {
           const feature = features.at(0);
           const val = feature.get("data").val;
-          if (val === "3") {
-            this.hoverInfo = `Marker at ${feature.get("data").point}`;
+          if (val == "1") {
+            this.hoverInfo = feature.get("data");
             this.hoverStyle.left = `${evt.pixel[0] + 10}px`;
             this.hoverStyle.top = `${evt.pixel[1] + 10}px`;
-          } else if (val === "4") {
-            this.hoverfengji = true;
+          } else if (val == "4") {
+            this.hoverfengji = feature.get("data");
             this.hoverfengjiStyle.left = `${evt.pixel[0] + 10}px`;
             this.hoverfengjiStyle.top = `${evt.pixel[1] + 10}px`;
             this.currentFeatureData = feature.get("data"); // Store the feature data for click event
-          } else if (val === "5") {
-            this.hoverta = true;
+          } else if (val == "5") {
+            this.hoverta = feature.get("data");
             this.hovertaStyle.left = `${evt.pixel[0] + 10}px`;
             this.hovertaStyle.top = `${evt.pixel[1] + 10}px`;
             this.currentFeatureData = feature.get("data"); // Store the feature data for click event
@@ -271,7 +270,7 @@ export default {
      * 平移缩放
      * @param data
      */
-    moveAndZoom(data = { point: [120.2, 30.35], zoom: 10 }) {
+    moveAndZoom(data = { point: [120.2, 30.35], zoom: 15 }) {
       this.map.getView().animate({
         center: fromLonLat(data.point, "EPSG:4326"),
         zoom: data.zoom,
@@ -299,16 +298,19 @@ export default {
   color: white;
   padding: 0px;
   z-index: 100;
+
   h3 {
     background-color: #008080cc;
     width: 240px;
     padding: 5px 10px;
     font-size: 16px;
   }
+
   div {
     background-color: #00808097;
     width: 240px;
     font-size: 12px;
+
     p {
       padding: 5px 10px;
       display: flex;
@@ -316,21 +318,25 @@ export default {
     }
   }
 }
+
 .hover-fengji {
   position: absolute;
   color: white;
   padding: 0px;
   z-index: 100;
+
   h3 {
     background-color: #027cb4cc;
     width: 240px;
     padding: 5px 10px;
     font-size: 16px;
   }
+
   div {
     background-color: #027cb49e;
     width: 240px;
     font-size: 12px;
+
     p {
       padding: 5px 10px;
       display: flex;
@@ -338,21 +344,25 @@ export default {
     }
   }
 }
+
 .hover-ta {
   position: absolute;
   color: white;
   padding: 0px;
   z-index: 100;
+
   h3 {
     background-color: #d90019b2;
     width: 240px;
     padding: 5px 10px;
     font-size: 16px;
   }
+
   div {
     background-color: #d9001994;
     width: 240px;
     font-size: 12px;
+
     p {
       padding: 5px 10px;
       display: flex;

src/main.js

@@ -32,16 +32,24 @@ if (store.state.auth.userInfo.permission !== undefined) {
   });
 }
 
-// 时间转换
+//开始结束时间转换
 Vue.prototype.$formatDate = function(date) {
   const year = date.getFullYear();
   const month = (date.getMonth() + 1).toString().padStart(2, '0'); // Adding 1 to month since it's zero-based
   const day = date.getDate().toString().padStart(2, '0');
+  return `${year}-${month}-${day}`;
+};
 
-  
+// 时间戳转换
+Vue.prototype.$formatDate = function(timestamp) {
+  const date = new Date(timestamp);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
   return `${year}-${month}-${day}`;
 };
 
+
 new Vue({
   router,
   store,

src/views/admin/cockpitManage/Index.vue

@@ -2,34 +2,25 @@
   <div class="map-ditu">
     <Tmap ref="map" :maplist="maplist" @feature-click="featureClick"></Tmap>
     <div class="ledata">
-      <selecttree
-        placeholder="请选择上级单位"
-        :list="parentOpt"
-        type="1"
-        v-model="companyCode"
-        @change="parentChange"
+      <selecttree placeholder="请选择上级单位" :list="parentOpt" type="1" v-model="companyCode" @change="parentChange"
         :defaultParentProps="{
           children: 'children',
           label: 'companyName',
           value: 'codeNumber',
-        }"
-      >
+        }">
       </selecttree>
 
       <p>
         <span class="SpText">风场总数：</span>{{ totalList.fieldSumNumber }} 个
       </p>
       <p>
-        <span class="SpText">已分析风场：</span
-        >{{ totalList.analysisFinishNumber }} 个
+        <span class="SpText">已分析风场：</span>{{ totalList.analysisFinishNumber }} 个
       </p>
       <p>
-        <span class="SpText">未分析风场：</span
-        >{{ totalList.analysisUnFinishedNumber }} 个
+        <span class="SpText">未分析风场：</span>{{ totalList.analysisUnFinishedNumber }} 个
       </p>
       <p>
-        <span class="SpText">风机数量：</span
-        >{{ totalList.engineGroupNumber }} 个
+        <span class="SpText">风机数量：</span>{{ totalList.engineGroupNumber }} 个
       </p>
       <p>
         <span class="SpText">风机状态：</span>
@@ -37,12 +28,7 @@
         <span class="yellow"></span>
         <span class="green"></span>
       </p>
-      <el-switch
-        v-model="value1"
-        active-text="显示"
-        inactive-text="隐藏"
-        @change="handleSwitchChange"
-      >
+      <el-switch v-model="value1" active-text="显示" inactive-text="隐藏" @change="handleSwitchChange">
       </el-switch>
     </div>
     <Rightdata v-show="ShowRi" class="ridata"></Rightdata>
@@ -90,9 +76,9 @@ export default {
         },
       ],
       maplist: [
-        { point: [116.4074, 39.9042], val: "1" },
-        { point: [104.0657, 30.6595], val: "2" },
-        { point: [108.9402, 34.3416], val: "3" },
+        // { point: [116.4074, 39.9042], val: "1" },
+        // { point: [104.0657, 30.6595], val: "2" },
+        // { point: [108.9402, 34.3416], val: "3" },
       ],
       totalList: [],
       parentOpt: [],
@@ -106,10 +92,11 @@ export default {
   mounted() {
     //模拟地图上的点位
     const data = this.maplist;
-    data.forEach((element) => {
-      console.log(element);
-      // this.$refs.map.addMarker({ point: [116.40740,39.90420], val: "1" });
-    });
+
+    // data.forEach((element) => {
+    //   console.log(element);
+    //   // this.$refs.map.addMarker({ point: [116.40740,39.90420], val: "1" });
+    // });
   },
 
   methods: {
@@ -155,6 +142,7 @@ export default {
     },
     parentChange(data) {
       //data为当前选中对象
+      this.$refs.map.clearMarkers();
       this.maplist = data;
       console.log(data, "parentChange");
       if (data.codeType === "field") {
@@ -162,6 +150,7 @@ export default {
           this.$refs.map.addMarker({
             point: this.parseCoordinates(data.longitudeAndLatitudeString),
             val: data.analysisState,
+            ...data
           });
           return;
         }
@@ -171,11 +160,12 @@ export default {
         dataMapList.forEach((element) => {
           console.log(element);
           if (
-            this.parseCoordinates(element.longitudeAndLatitudeString).length > 0
+            this.parseCoordinates(element.longitudeAndLatitudeString).length > 0 && element.codeType === "field"
           ) {
             this.$refs.map.addMarker({
               point: this.parseCoordinates(element.longitudeAndLatitudeString),
               val: element.analysisState,
+              ...element
             });
             return;
           }
@@ -184,29 +174,28 @@ export default {
       }
     },
 
-    handleSwitchChange() {
-      this.ShowRi = !this.ShowRi;
-    },
-    handleNodeClick(data) {
-      // 将点击的节点值赋给输入框
-      this.treeval = data.label;
-      // 隐藏树列表
-      this.showTree = false;
-    },
     featureClick(data) {
+      console.log(data, "featureClick");
       const val = data.val;
-
       if (val === "-1" || val === -1) {
         this.$message.error("当前风场未进行分析");
-      } else if (val === "2") {
+      } else if (val === "0" || val === 0) {
         this.$message({
           message: "当前风场正在分析中",
           type: "warning",
         });
-      } else if (val === "3") {
-        this.$router.push("cockpitManage/electronic-map");
+      } else if (val === "1" || val === 1) {
+        this.$router.push({
+          path: "cockpitManage/electronic-map",
+          query: {
+            fieldCode: data.codeNumber,
+          },
+        });
       }
     },
+    handleSwitchChange() {
+      this.ShowRi = !this.ShowRi;
+    },
   },
 };
 </script>

src/views/admin/cockpitManage/electronicMap.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="map-ditu">
-    <Tmap ref="map"></Tmap>
+    <Tmap ref="map" :windEngineGroupByFieldCodeDetail="windEngineGroupByFieldCodeDetail"></Tmap>
   </div>
 </template>
 
 <script>
+import { getWindEngineGroupByFieldCode } from "@/api/ledger.js";
 import Tmap from "@/components/map";
 
 export default {
@@ -12,25 +13,79 @@ export default {
   components: {
     Tmap,
   },
-
+  data() {
+    return {
+      fieldCode: "",
+      windEngineGroupByFieldCodeDetail: {}
+    };
+  },
   mounted() {
-    this.addMarkersAndZoom();
+    this.fieldCode = this.$route.query.fieldCode;
+    // this.addMarkersAndZoom();
+  },
+  watch: {
+    fieldCode(newVal) {
+      if (newVal) {
+        this.GETfengji();
+      }
+    },
   },
 
   methods: {
-    addMarkersAndZoom() {
-      const points = [
-        { point: [120.2, 30.35], val: "4" },
-        { point: [120.21, 30.35], val: "5" },
-      ];
-
-      // Add markers to the map
-      points.forEach((point) => {
-        this.$refs.map.addMarker(point);
+    GETfengji() {
+      getWindEngineGroupByFieldCode({ fieldCode: this.fieldCode }).then(
+        (res) => {
+          const result = res.data
+          this.windEngineGroupByFieldCodeDetail = result
+          console.log(result.anemometerTowerList);
+          if (result.anemometerTowerList) {
+            this.addMarkersAndZoom(result.anemometerTowerList, '5')
+          }
+          if (result.windEngineGroupVoList) {
+            this.addMarkersAndZoom(result.windEngineGroupVoList, '4')
+          }
+        }
+      );
+    },
+    parseCoordinates(input) {
+      if (input && typeof input === "string") {
+        return input.split(",").map(Number);
+      }
+      return [];
+    },
+    addMarkersAndZoom(data, type) {
+      console.log(data, type);
+      const dataMapList = data;
+      dataMapList.forEach((element) => {
+        console.log(element);
+        if (
+          this.parseCoordinates(element.longitudeAndLatitudeString).length > 0
+        ) {
+          this.$refs.map.addMarker({
+            point: this.parseCoordinates(element.longitudeAndLatitudeString),
+            val: type,
+            ...element
+          });
+          // this.$refs.map.moveAndZoom({
+          //   point: this.parseCoordinates(element.longitudeAndLatitudeString),
+          //   zoom: 15,
+          // });
+          return;
+        }
+        this.$refs.map.clearMarkers();
       });
+      // const points = [
+      //   { point: [120.2, 30.35], val: "4" },
+      //   { point: [120.21, 30.35], val: "5" },
+      // ];
+
+      // // Add markers to the map
+      // points.forEach((point) => {
+      //   this.$refs.map.addMarker(point);
+      // });
 
-      // Zoom to a specific point
-      const zoomPoint = { point: [120.2, 30.35], zoom: 15 };
+      // // Zoom to a specific point
+      const zoomPoint = { point: this.parseCoordinates(this.windEngineGroupByFieldCodeDetail.windEngineGroupVoList[0].longitudeAndLatitudeString), zoom: 15 };
       this.$refs.map.moveAndZoom(zoomPoint);
     },
   },

src/views/ledger/draught.vue

@@ -399,12 +399,12 @@ export default {
     },
     // 数字验证
     validateNumber(rule, value, callback) {
-      const numberRegex = /^\d{1,4}(\.\d{1,2})?$/ // 匹配不超过四位数且小数点后不超过二位数的数字
+      const numberRegex = /^\d{1,3}(\.\d{1,5})?$/ // 匹配不超过四位数且小数点后不超过二位数的数字
       if (!value) {
         callback(new Error('该项不能为空'))
       } else if (!numberRegex.test(value)) {
         callback(
-          new Error('该项必须为不超过四位数且小数点后不超过三位数的数字')
+          new Error('该项必须为不超过三位数且小数点后不超过五位数的数字')
         )
       } else {
         callback()

src/views/ledger/enterprise.vue

@@ -54,13 +54,16 @@
         <el-table-column prop="companyCode" align="center" label="单位ID">
         </el-table-column>
 
-        <el-table-column prop="fieldCount" label="风场数量" width="200">
+        <el-table-column
+          prop="fieldCount"
+          align="center"
+          label="风场数量"
+          width="200"
+        >
           <template slot-scope="scope">
-            <el-button
-              @click="particulars(scope.row)"
-              type="text"
-              size="small"
-            ></el-button>
+            <el-button @click="particulars(scope.row)" type="text" size="small">
+              {{ scope.row.fieldCount }}
+            </el-button>
           </template>
         </el-table-column>
 
@@ -70,6 +73,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" align="center" label="创建时间">
+          <template slot-scope="{ row }">
+            {{ $formatDate(row.createTime) }}
+          </template>
         </el-table-column>
         <el-table-column
           prop="state"
@@ -185,36 +191,52 @@
     <el-dialog title="风场数量" :visible.sync="unusualdialog" width="1000px">
       <el-table
         class="center-align-table"
-        :data="tableData"
+        :data="FCtableData"
         border
         :cell-style="rowStyle"
         stripe
+        max-height="500"
       >
         <!-- Table Columns -->
-        <el-table-column fixed prop="name" align="center" label="风场名称">
+        <el-table-column fixed prop="fieldName" align="center" label="风场名称">
         </el-table-column>
-        <el-table-column prop="" align="center" label="所在省">
+        <el-table-column prop="provinceName" align="center" label="所在省">
         </el-table-column>
-        <el-table-column prop="" align="center" label="所在市">
+        <el-table-column prop="cityName" align="center" label="所在市">
         </el-table-column>
-        <el-table-column prop="" align="center" label="海拔高度" width="80">
+        <el-table-column
+          prop="elevationHeight"
+          align="center"
+          label="海拔高度"
+          width="80"
+        >
         </el-table-column>
-        <el-table-column prop="" align="center" label="经度" width="80">
+        <el-table-column
+          prop="longitude"
+          align="center"
+          label="经度"
+          width="80"
+        >
         </el-table-column>
-        <el-table-column prop="" align="center" label="纬度" width="80">
+        <el-table-column prop="latitude" align="center" label="纬度" width="80">
         </el-table-column>
-        <el-table-column prop="" align="center" label="额定容量">
+        <el-table-column
+          prop="ratedCapacityNumber"
+          align="center"
+          label="额定容量"
+        >
         </el-table-column>
       </el-table>
 
       <div class="pagination-container">
-        <el-pagination
-          :page-size="10"
-          :pager-count="11"
+        <!-- <el-pagination
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNum"
           layout="total, prev, pager, next"
-          :total="35"
+          :page-size="pageSize"
+          :total="totalSize"
         >
-        </el-pagination>
+        </el-pagination> -->
       </div>
     </el-dialog>
   </div>
@@ -231,6 +253,7 @@ import {
   getCitiesByPId,
   getWindCompany,
   delCompany,
+  getWindFieldVos,
 } from "@/api/ledger.js";
 export default {
   data() {
@@ -262,6 +285,7 @@ export default {
         city: [{ required: true, message: "请选择市", trigger: "change" }],
       },
       tableData: [],
+      FCtableData: [],
       detail: {},
       nuedialog: false,
       unusualdialog: false,
@@ -269,6 +293,9 @@ export default {
       title: "新增",
       warningShown: false,
       addPrarentCompanyCode: null,
+      pageNum: 1,
+        pageSize: 10,
+        totalSize: 0,
     };
   },
   created() {
@@ -287,6 +314,14 @@ export default {
     },
   },
   methods: {
+  //   formatDate(timestamp) {
+  //   const date = new Date(timestamp);
+  //   const year = date.getFullYear();
+  //   const month = String(date.getMonth() + 1).padStart(2, '0');
+  //   const day = String(date.getDate()).padStart(2, '0');
+  //   return `${year}-${month}-${day}`;
+  // },
+
     handleClose() {
       Object.assign(this.$data.newform, this.$options.data().newform);
     },
@@ -465,10 +500,21 @@ export default {
       }
     },
 
-    //异常详情
+    //查看风场信息
     particulars(row) {
       this.unusualdialog = true;
+      // const arr = {
+      //   companyCode: "arr",
+      // };
+      getWindFieldVos({companyCode:row.companyCode}).then((res) => {
+        this.FCtableData = res.data;
+        this.totalSize = res.totalSize;
+      });
     },
+    // handleCurrentChange(val) {
+    //   this.pageNum = val;
+    //   this.getTableList();
+    // },
     // 编辑回显
     compile(row) {
       this.title = "编辑";

vue.config.js

@@ -64,10 +64,10 @@ module.exports = {
     // contentBase: path.join(__dirname, "public"),
     proxy: {
       "/api": {
-        target: "http://192.168.5.4:16200", // 石月
+        // target: "http://192.168.5.4:16200", // 石月
         // target: "http://192.168.50.235:16200", //内网
         // target: "http://192.168.5.15:16200",
-        // target: "http://106.120.102.238:16600", //外网
+        target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {
           "^/api": "", // 需要regit write重写的,