lining 3 tahun lalu
induk
melakukan
8b364a3cc1

+ 32 - 1
src/api/index.js

@@ -70,7 +70,34 @@ const getPower = (data) => {
         method: "get",
     });
 };
-
+const getWindWarning = (data,pageIndex,pageSize) => {
+    return request({
+        baseURL:process.env.VUE_APP_API,
+        url: `/alarm/real-time-alarm?objectId=${data}&pageIndex=${pageIndex}&pageSize=${pageSize}`,
+        method: "get"
+    });
+};
+const getHealthDate=(stid,wtid)=>{
+    return request({
+        baseURL:'http://18.6.30.53:8070',
+        url:`/alarm/statistic?stId=${stid}&wtId=${wtid}`,
+        method:"get"
+    })
+}
+const getDetial=(data)=>{
+    return request({
+        baseURL:process.env.VUE_APP_API,
+        url:`/api/windturbine/info/${data}`,
+        method:"get"
+    })
+}
+const getWarning=(data,wtid,pt)=>{
+    return request({
+        baseURL:'http://18.6.30.53:8070',
+        url:`/alarm/list?stId=${data}&wtId=${wtid}&widget=${pt}`,
+        method:"get"
+    })
+}
 export default {
     login,
     getSnap,
@@ -81,4 +108,8 @@ export default {
     sendWarning,
     sendRecommend,
     getPower,
+    getWindWarning,
+    getHealthDate,
+    getDetial,
+    getWarning
 };

+ 5 - 9
src/components/BasicInformationDetail.vue

@@ -140,7 +140,6 @@
 <script>
   import BackgroundData from 'utils/BackgroundData'
   // import Worning from "./warning.vue"
-  import axios from 'axios';
   import StandAloneImg from "./StandAloneImg.vue";
   import dayjs from 'dayjs'
   export default {
@@ -251,8 +250,7 @@
     },
     methods: {
       getHealthDate() {
-        axios.get(`http://18.6.30.53:8070/alarm/statistic?stId=${this.windturbine.stationId}&wtId=${this.windturbine.windturbineId}`)
-          .then(msg => {
+          api.getHealthDate(this.windturbine.stationId,this.windturbine.windturbineId).then(msg => {
             if (msg.data.code === 200) {
               this.healthInfo = msg.data.data;
             }
@@ -263,8 +261,7 @@
           });
       },
       getDetial() {
-        axios.get(process.env.VUE_APP_API+`/api/windturbine/info/${this.windturbine.windturbineId}`)
-          .then(msg => {
+        api.getDetial(this.windturbine.windturbineId).then(msg => {
             let restaurants = []
             this.selectValue = (msg.data.lockType === 0 ? '' : String(msg.data.lockType))
             this.state1 = msg.data.markValue
@@ -295,8 +292,7 @@
             parts = 'yy'
             break;
         }
-        axios.get(`http://18.6.30.53:8070/alarm/list?stId=${this.windturbine.stationId}&wtId=${this.windturbine.windturbineId}&widget=${parts}`)
-          .then(msg => {
+        api.get(this.windturbine.stationId,this.windturbine.windturbineId,parts).then(msg => {
             if (msg.data.code === 200) {
               msg.data.data && msg.data.data.forEach(item => {
                 item.time = dayjs(item.time).format('MM-DD HH:mm:ss')
@@ -359,8 +355,8 @@
         }
         BackgroundData.getInstance().updateMarks(this.windturbine, this.state1);
       },
-      show() {
-        // axios.get(`http://${config.calcUrl}/alarm/real-time-alarm?objectId=${this.windturbine.windturbineId}&pageIndex=1&pageSize=50`)
+      show() {    
+        // axiios.get(`http://${config.calcUrl}/alarm/real-time-alarm?objectId=${this.windturbine.windturbineId}&pageIndex=1&pageSize=50`)
         // .then(msg=>{
         //   var vs = msg.data;
         //   if(vs.length<=0)return;

+ 2 - 6
src/components/WindturbineDetailPages.vue

@@ -91,7 +91,6 @@
 	// import YawDetail from "./YawDetail.vue";
 	import BasicInformationDetail from "./BasicInformationDetail.vue";
 	import UniformCodes from "utils/UniformCodes";
-	import axios from 'axios';
 	import Dwk from "./BoosterStation/dwk.vue";
 	import Sbdl from "./BoosterStation/sbdl.vue";
 	import Nss from "./BoosterStation/nss.vue";
@@ -249,12 +248,9 @@
 
 			},
 			initData() {
-				// axios.get(`http://${config.calcUrl}/windturbine/line/${this.windturbine.windturbineId}`)
+				// axiios.get(`http://${config.calcUrl}/windturbine/line/${this.windturbine.windturbineId}`)
 				//   .then(msg => this.line = msg.data);
-				axios.get(
-					process.env.VUE_APP_API+`/alarm/real-time-alarm?objectId=${this.windturbine.windturbineId}&pageIndex=1&pageSize=50`
-						)
-					.then(msg => {
+				api.getWindWarning(this.windturbine.windturbineId,'1','50').then(msg => {
 						var vs = msg.data;
 						if (vs.length <= 0) return;
 						this.alarmTime = BackgroundData.getInstance().formatDate(vs[0].lastUpdateTime);

+ 15 - 15
src/utils/BoosterStation.js

@@ -1,5 +1,6 @@
 // import { config } from "../../config";
 import axios from 'axios';
+import api from '../api';
 
 export class BoosterStation{
 	tags={
@@ -1826,21 +1827,20 @@ export class BoosterStation{
 	getDatas(station,action){
 		var currentStation = this.tags[station]
 		var tags = this.getTags(currentStation);
-
-		axios.get(process.env.VUE_APP_ADAPTERURL+`/ts/latest?keys=${tags}`)
-				.then(msg=>{
-					var datas = msg.data;
-					var data = {};
-					for(var v in currentStation){
-						var dt = datas[currentStation[v].tag];
-						if(!dt)continue;
-						data[v]=dt.doubleValue?dt.doubleValue.toFixed(2):(dt.booleanValue?dt.booleanValue:0);
-					}
-					action(data);
-				})
-				.catch(err=>
-					console.error(err)
-				);
+		
+		api.refreshData(tags).then(msg=>{
+			var datas = msg.data;
+			var data = {};
+			for(var v in currentStation){
+				var dt = datas[currentStation[v].tag];
+				if(!dt)continue;
+				data[v]=dt.doubleValue?dt.doubleValue.toFixed(2):(dt.booleanValue?dt.booleanValue:0);
+			}
+			action(data);
+		})
+		.catch(err=>
+			console.error(err)
+		);
 	}
 	
 	getTags(station){