zyh
This commit is contained in:
commit
b3061ae24e
|
|
@ -0,0 +1,54 @@
|
|||
/* 封装axios用于发送请求 */
|
||||
import axios from "axios";
|
||||
import { Message } from "element-ui"; // 请确保你的项目中已经安装了 Element UI
|
||||
const request = axios.create({
|
||||
// baseURL: "api/", // 设置基地址,博主这个请求跨域了因此我设置了代理服务器,因此基地址才这么短
|
||||
timeout: 5000, // 请求超时:当5s没有响应就会结束请求
|
||||
});
|
||||
|
||||
// 添加请求拦截器,一下内容是axios的拦截器,可以不用写
|
||||
request.interceptors.request.use(
|
||||
function (config) {
|
||||
// 在发送请求之前做些什么
|
||||
return config;
|
||||
},
|
||||
function (error) {
|
||||
// 对请求错误做些什么
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
// 添加响应拦截器
|
||||
request.interceptors.response.use(
|
||||
function (response) {
|
||||
// 对响应数据做点什么
|
||||
return response.data;
|
||||
},
|
||||
function (error) {
|
||||
// 对响应错误做点什么
|
||||
if (error.response) {
|
||||
// 请求已发出,但服务器响应状态码不在 2xx 范围内
|
||||
console.error("Error status:", error.response.status);
|
||||
console.error("Error data:", error.response.data);
|
||||
console.error("Error headers:", error.response.headers);
|
||||
|
||||
// 提示错误信息
|
||||
Message.error(`请求错误:${error.response.status}`);
|
||||
} else if (error.request) {
|
||||
// 请求被发出但未收到响应
|
||||
console.error("No response received:", error.request);
|
||||
|
||||
// 提示错误信息
|
||||
Message.error("网络错误,请稍后重试");
|
||||
} else {
|
||||
// 设置请求时发生了一些错误
|
||||
console.error("Error:", error.message);
|
||||
|
||||
// 提示错误信息
|
||||
Message.error("请求失败,请稍后重试");
|
||||
}
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
export default request;
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
/* 封装axios用于发送请求 */
|
||||
import axios from "axios";
|
||||
import { Message } from "element-ui"; // 请确保你的项目中已经安装了 Element UI
|
||||
const request = axios.create({
|
||||
// baseURL: "api/", // 设置基地址,博主这个请求跨域了因此我设置了代理服务器,因此基地址才这么短
|
||||
// timeout: 5000, // 请求超时:当5s没有响应就会结束请求
|
||||
});
|
||||
|
||||
// 添加请求拦截器,一下内容是axios的拦截器,可以不用写
|
||||
request.interceptors.request.use(
|
||||
function (config) {
|
||||
// 在发送请求之前做些什么
|
||||
return config;
|
||||
},
|
||||
function (error) {
|
||||
// 对请求错误做些什么
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
// 添加响应拦截器
|
||||
request.interceptors.response.use(
|
||||
function (response) {
|
||||
// 对响应数据做点什么
|
||||
return response.data;
|
||||
},
|
||||
function (error) {
|
||||
// 对响应错误做点什么
|
||||
if (error.response) {
|
||||
// 请求已发出,但服务器响应状态码不在 2xx 范围内
|
||||
console.error("Error status:", error.response.status);
|
||||
console.error("Error data:", error.response.data);
|
||||
console.error("Error headers:", error.response.headers);
|
||||
|
||||
// 提示错误信息
|
||||
Message.error(`请求错误:${error.response.status}`);
|
||||
} else if (error.request) {
|
||||
// 请求被发出但未收到响应
|
||||
console.error("No response received:", error.request);
|
||||
|
||||
// 提示错误信息
|
||||
Message.error("网络错误,请稍后重试");
|
||||
} else {
|
||||
// 设置请求时发生了一些错误
|
||||
console.error("Error:", error.message);
|
||||
|
||||
// 提示错误信息
|
||||
Message.error("请求失败,请稍后重试");
|
||||
}
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
export default request;
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,17 @@
|
|||
const { defineConfig } = require("@vue/cli-service");
|
||||
module.exports = defineConfig({
|
||||
transpileDependencies: true,
|
||||
lintOnSave: false,
|
||||
publicPath: "./",
|
||||
devServer: {
|
||||
proxy: {
|
||||
"/api": {
|
||||
target: "http://111.229.30.246:32761",
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
"^/api": "/api",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 负荷管理
|
||||
|
|
@ -37,6 +38,12 @@ export function GetFhzb () {
|
|||
}
|
||||
// 生产线负荷
|
||||
export function GetScxfh () {
|
||||
=======
|
||||
import request from "@/utils/request";
|
||||
|
||||
//
|
||||
export function loadBrand(limit) {
|
||||
>>>>>>> e2f5089284f1c05f354c02866f5974611b2c2d6d
|
||||
return request({
|
||||
url: `brand?limit=${limit}`,
|
||||
method: "GET",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
import request from "@/utils/request";
|
||||
|
||||
// 可调负荷资源
|
||||
export function GetKdfhzy () {
|
||||
export function GetKdfhzy() {
|
||||
return request({
|
||||
url: `/api/GetAdjustableload`,
|
||||
<<<<<<< HEAD
|
||||
method: 'GET'
|
||||
})
|
||||
}
|
||||
|
|
@ -41,4 +42,43 @@ export function GetKdsb () {
|
|||
url: `/api/GetAdjustableDevice`,
|
||||
method: 'GET'
|
||||
})
|
||||
=======
|
||||
method: "GET",
|
||||
});
|
||||
}
|
||||
// 可调负荷策略
|
||||
export function GetKdfhcl() {
|
||||
return request({
|
||||
url: `/api/GetLoadControlStrategy`,
|
||||
method: "GET",
|
||||
});
|
||||
}
|
||||
// 可调负荷分析
|
||||
export function GetKdfhfx() {
|
||||
return request({
|
||||
url: `/api/GetAdjustableLoadAnalysis`,
|
||||
method: "GET",
|
||||
});
|
||||
}
|
||||
// 刚性可调负荷
|
||||
export function GetGang() {
|
||||
return request({
|
||||
url: `/api/GetRigidAdjustableLoads`,
|
||||
method: "GET",
|
||||
});
|
||||
}
|
||||
// 柔性可调负荷
|
||||
export function GetRou() {
|
||||
return request({
|
||||
url: `/api/GetFlexibleAdjustableLoad`,
|
||||
method: "GET",
|
||||
});
|
||||
}
|
||||
//可调设备
|
||||
export function GetKdsb() {
|
||||
return request({
|
||||
url: `/api/GetAdjustableDevice`,
|
||||
method: "GET",
|
||||
});
|
||||
>>>>>>> e2f5089284f1c05f354c02866f5974611b2c2d6d
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import axios from "axios";
|
|||
import { Message } from "element-ui"; // 请确保你的项目中已经安装了 Element UI
|
||||
const request = axios.create({
|
||||
// baseURL: "api/", // 设置基地址,博主这个请求跨域了因此我设置了代理服务器,因此基地址才这么短
|
||||
timeout: 5000, // 请求超时:当5s没有响应就会结束请求
|
||||
// timeout: 5000, // 请求超时:当5s没有响应就会结束请求
|
||||
});
|
||||
|
||||
// 添加请求拦截器,一下内容是axios的拦截器,可以不用写
|
||||
|
|
|
|||
|
|
@ -103,9 +103,17 @@
|
|||
style="width: 100%"
|
||||
:row-class-name="tableRowClassName"
|
||||
>
|
||||
<el-table-column prop="DeviceName" label="可调设备名称" align="center">
|
||||
<el-table-column
|
||||
prop="DeviceName"
|
||||
label="可调设备名称"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column prop="DeviceState" label="开关状态" align="center">
|
||||
<el-table-column
|
||||
prop="DeviceState"
|
||||
label="开关状态"
|
||||
align="center"
|
||||
>
|
||||
<template scope="scope">
|
||||
<img
|
||||
src="../../assets/KDFH/tongguo.png"
|
||||
|
|
@ -114,7 +122,11 @@
|
|||
<img src="../../assets/KDFH/jinggao.png" v-else />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="RealTimeLoad" label="实时负荷" align="center">
|
||||
<el-table-column
|
||||
prop="RealTimeLoad"
|
||||
label="实时负荷"
|
||||
align="center"
|
||||
>
|
||||
<template scope="scope">
|
||||
<span class="count">{{ scope.row.RealTimeLoad }}</span>
|
||||
<span class="danwei">kW</span>
|
||||
|
|
@ -1211,7 +1223,6 @@ export default {
|
|||
var chartDom2 = document.getElementById("ruan");
|
||||
var myChart2 = echarts.init(chartDom2);
|
||||
this.option2 && myChart2.setOption(this.option2);
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -1382,7 +1393,7 @@ export default {
|
|||
#fhdkcl {
|
||||
width: 100%;
|
||||
height: 360px;
|
||||
/deep/ .table{
|
||||
/deep/ .table {
|
||||
.el-table__body-wrapper {
|
||||
overflow-y: auto;
|
||||
max-height: 218px;
|
||||
|
|
@ -1661,15 +1672,15 @@ export default {
|
|||
#kdsb {
|
||||
width: 100%;
|
||||
height: 500px;
|
||||
/deep/ .table{
|
||||
/deep/ .table {
|
||||
.el-table__body-wrapper {
|
||||
overflow-y: auto;
|
||||
height: 530px;
|
||||
}
|
||||
//隐藏滚动条
|
||||
.el-table__body-wrapper::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
overflow-y: auto;
|
||||
height: 530px;
|
||||
}
|
||||
//隐藏滚动条
|
||||
.el-table__body-wrapper::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,15 @@ const { defineConfig } = require("@vue/cli-service");
|
|||
module.exports = defineConfig({
|
||||
transpileDependencies: true,
|
||||
lintOnSave: false,
|
||||
// publicPath: './',
|
||||
publicPath: "./",
|
||||
devServer: {
|
||||
proxy: {
|
||||
"/api": {
|
||||
target: "http://111.229.30.246:32761/api",
|
||||
pathRewrite: { "^/api": "" },
|
||||
secure: false,
|
||||
target: "http://111.229.30.246:32761",
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
"^/api": "/api",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue