SunZehao 1 deň pred
rodič
commit
db5716e3fd

+ 14 - 14
.env.production

@@ -15,34 +15,34 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
-VUE_APP_ALARM=http://10.220.1.5:6015
-# VUE_APP_ALARM=http://10.112.33.5:6015
+# VUE_APP_ALARM=http://10.220.1.5:6015
+VUE_APP_ALARM=http://10.112.33.5:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
-VUE_APP_API=http://10.220.1.5:6060
-# VUE_APP_API=http://10.112.33.5:6060
+# VUE_APP_API=http://10.220.1.5:6060
+VUE_APP_API=http://10.112.33.5:6060
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
-VUE_APP_URL=https://10.220.1.5:5300
-# VUE_APP_URL=https://10.112.33.5:5300
+# VUE_APP_URL=https://10.220.1.5:5300
+VUE_APP_URL=https://10.112.33.5:5300
 
-VUE_APP_URL2=http://10.220.1.5:8080
-# VUE_APP_URL2=http://10.112.33.5:8081
+# VUE_APP_URL2=http://10.220.1.5:8080
+VUE_APP_URL2=http://10.112.33.5:8081
 
-VUE_APP_REPORT=http://10.220.1.5:8001
-# VUE_APP_REPORT=http://10.112.33.5:8001
+# VUE_APP_REPORT=http://10.220.1.5:8001
+VUE_APP_REPORT=http://10.112.33.5:8001
 
-VUE_APP_WS_URL=ws://10.220.1.5:6014
-# VUE_APP_WS_URL=ws://10.112.33.5:6014
+# VUE_APP_WS_URL=ws://10.220.1.5:6014
+VUE_APP_WS_URL=ws://10.112.33.5:6014
 
-VUE_APP_GENERAT_URL=http://10.220.1.5:6060
-# VUE_APP_GENERAT_URL=http://10.112.33.5:6060
+# VUE_APP_GENERAT_URL=http://10.220.1.5:6060
+VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
 VUE_APP_HEADER2_URL=http://10.112.32.31:10201

+ 3 - 2
src/api/points/index.js

@@ -49,7 +49,8 @@ export function GetProPoints(data) {
 export function GetPointsData(data) {
   return request({
     baseURL: process.env.VUE_APP_API,
-    url: `findPointDatas?pointIds=${data.pointIds}`,
-    method: "get",
+    url: `findPointDatas`,
+    method: "post",
+    data: data.pointIds
   });
 }

+ 31 - 27
src/components/windDetail/index.vue

@@ -246,44 +246,48 @@
       </div>
       <div class="problemsAI" style="color: #fff">
         <div class="part-info-ai">
-            <!-- v-if="partAInfos.length > 0" -->
-            <div class="part-body-ai">
+          <!-- v-if="partAInfos.length > 0" -->
+          <div class="part-body-ai">
             <div class="monitoring-item">
-                <div class="point point-left bottom"></div>
-                <div class="point point-right bottom"></div>
-                遥测值
+              <div class="point point-left bottom"></div>
+              <div class="point point-right bottom"></div>
+              遥测值
             </div>
             <div class="part-item-ai">
-                <div
+              <div
                 class="part-ai"
                 :class="{ active: index % 2 === 1 }"
                 v-for="(val, index) in partAInfos"
                 :key="index"
+              >
+                <div
+                  class="table-item-ai"
+                  v-for="(item, ind) in val"
+                  :key="ind"
                 >
-                <div class="table-item-ai" v-for="(item, ind) in val" :key="ind">
-                    <div>{{ item.name }}</div>
-                    <div class="table-value-ai">
+                  <div>{{ item.name }}</div>
+                  <div class="table-value-ai">
                     {{
-                        item.name.includes("状态")
+                      item.name.includes("状态")
                         ? item.value
                         : item.name == "总发电量"
                         ? (item.value / 10000).toFixed(2)
                         : Number(item.value).toFixed(2)
                     }}
                     <div v-if="item.valueUnit != 'NULL'" class="unit-ai">
-                        {{ item.valueUnit }}
+                      {{ item.valueUnit }}
                     </div>
                     <div v-else class="unit-ai"></div>
-                    </div>
-                </div>
+                  </div>
                 </div>
+              </div>
             </div>
-            </div>
-        </div>
+          </div>
         </div>
+      </div>
     </div>
     <div class="parts-di">
-        <div class="part-info">
+      <div class="part-info">
         <div class="part-body">
           <div class="monitoring-item">
             <div class="point point-left bottom"></div>
@@ -346,7 +350,7 @@
         </div> -->
       </div>
     </div>
-    
+
     <!-- <div class="problems" style="color: #fff">
         <div class="problemTit">
             <div class="point point-left bottom"></div>
@@ -432,7 +436,7 @@ import {
 import svgIcon from "@/components/coms/icon/svg-icon.vue";
 import alarmDialog from "@/components/alarm";
 
-import dataJson from "./dataJson.json"
+import dataJson from "./dataJson.json";
 export default {
   name: "windDetail",
   data() {
@@ -629,7 +633,7 @@ export default {
     //     this.partAInfos = dataJson.data.partAInfos
     // this.partDInfos = dataJson.data.partDInfos
     // })
-    
+
     this.timer = setInterval(() => {
       if (Object.keys(this.windInfo).length) {
         this.getWtMonitorInfo(this.windInfo);
@@ -1040,8 +1044,8 @@ export default {
 }
 
 .bodys {
-//   display: flex;
-//   flex-direction: row;
+  //   display: flex;
+  //   flex-direction: row;
   width: 100%;
   height: 100%;
   .edge {
@@ -1269,7 +1273,7 @@ export default {
     // justify-content: space-between;
     // position: relative;
     .part-top {
-    //   flex: 1;
+      //   flex: 1;
       width: 60%;
       height: 70vh;
     }
@@ -1309,7 +1313,7 @@ export default {
       }
     }
     .part-imgs {
-        width: 80%;
+      width: 80%;
       min-height: calc(100% - 30px);
       position: relative;
     }
@@ -1409,7 +1413,7 @@ export default {
     margin-right: 20px;
     display: flex;
     .part-top {
-    //   flex: 1;
+      //   flex: 1;
       width: 60%;
       height: 70vh;
     }
@@ -1449,7 +1453,7 @@ export default {
       }
     }
     .part-imgs {
-        width: 80%;
+      width: 80%;
       min-height: calc(100% - 30px);
       position: relative;
     }
@@ -1917,8 +1921,8 @@ export default {
     .round {
       width: 30px;
       height: 18px;
-    //   color: rgba(0, 70, 199, 0.88);
-    color: rgb(15, 120, 240);
+      //   color: rgba(0, 70, 199, 0.88);
+      color: rgb(15, 120, 240);
       margin-right: 90px;
     }
 

+ 4 - 2
src/views/SandTable/SandTable.vue

@@ -931,11 +931,13 @@ export default {
       if (dateType === "z") {
         date = dayjs().subtract(1, "week").format("YYYY-MM-DD HH:mm:ss");
       } else if (dateType === "y") {
-        date = dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss");
+        // date = dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss");
+        date = dayjs().startOf("month").format("YYYY-MM-DD HH:mm:ss");
       } else if (dateType === "n") {
         date = dayjs().subtract(1, "year").format("YYYY-MM-DD HH:mm:ss");
       } else {
-        date = dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss");
+        // date = dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss");
+        date = dayjs().startOf("month").format("YYYY-MM-DD HH:mm:ss");
       }
       let params = {
         stationid: "NX_FGS_HA_FDC_STA",