Commit c5636d49 authored by 涂茜's avatar 涂茜

fix: update mock api

parent 604896b7
Pipeline #24944 failed with stages
in 1 minute 36 seconds
...@@ -96,4 +96,4 @@ const Demo = () => { ...@@ -96,4 +96,4 @@ const Demo = () => {
export default Demo; export default Demo;
const baseUrl = 'http://192.168.10.150:8777'; const baseUrl = 'https://www.fastmock.site/mock/162c15dca15c4dba9ba51e0a0b76929b/api';
...@@ -23,7 +23,7 @@ const Demo = () => { ...@@ -23,7 +23,7 @@ const Demo = () => {
method: 'post', method: 'post',
data: params, data: params,
}).then((res) => { }).then((res) => {
let resData = response.data; let resData = res.data;
let columnsData = resData.map((item, index) => { let columnsData = resData.map((item, index) => {
return { return {
title: `${item.EquipmentName}-${item.sensorName}${ title: `${item.EquipmentName}-${item.sensorName}${
...@@ -43,12 +43,12 @@ const Demo = () => { ...@@ -43,12 +43,12 @@ const Demo = () => {
}); });
setData(tableData); setData(tableData);
setColumns([...columns, ...columnsData]); setColumns([...columns, ...columnsData]);
handleSeries(); handleSeries(resData);
}); });
}; };
const handleSeries = () => { const handleSeries = (v) => {
let resData = response.data; let resData = v;
let seriesData = []; let seriesData = [];
resData.forEach((item) => { resData.forEach((item) => {
let data = []; let data = [];
...@@ -103,7 +103,7 @@ const Demo = () => { ...@@ -103,7 +103,7 @@ const Demo = () => {
export default Demo; export default Demo;
const baseUrl = 'http://192.168.10.150:8777'; const baseUrl = 'https://www.fastmock.site/mock/162c15dca15c4dba9ba51e0a0b76929b/api';
const initialParams = { const initialParams = {
stream: [ stream: [
...@@ -127,238 +127,3 @@ const initialParams = { ...@@ -127,238 +127,3 @@ const initialParams = {
zoom: '', // 数据抽稀 zoom: '', // 数据抽稀
unit: '', // 数据抽稀 min h unit: '', // 数据抽稀 min h
}; };
const response = {
code: 0,
msg: 'Ok',
data: [
{
stationCode: 'EGBF00000006',
sensorName: '出水瞬时流量',
dataModel: [
{
PV: 8.38,
PT: '2021-03-15 16:03:49',
},
{
PV: 8.67,
PT: '2021-03-15 16:08:50',
},
{
PV: 9.32,
PT: '2021-03-15 16:18:21',
},
{
PV: 9.65,
PT: '2021-03-15 16:23:23',
},
{
PV: 9.63,
PT: '2021-03-15 16:28:24',
},
],
decimalPoint: 2,
EquipmentName: '温州嵇师村低压区智慧集成泵房',
unit: 'm³/h',
normalData: [],
dataModelAbnormal: [],
alarmHisList: [],
AreaCode: null,
SensorType: null,
Min_Data: null,
Avg_Data: null,
MinDatas: [],
MaxDatas: [],
},
{
stationCode: 'EGBF00000006',
sensorName: '今日供水量',
dataModel: [
{
PV: 179,
PT: '2021-03-15 16:03:49',
},
{
PV: 179,
PT: '2021-03-15 16:08:50',
},
{
PV: 181,
PT: '2021-03-15 16:18:21',
},
{
PV: 182,
PT: '2021-03-15 16:23:23',
},
{
PV: 182,
PT: '2021-03-15 16:28:24',
},
],
decimalPoint: 2,
EquipmentName: '温州嵇师村低压区智慧集成泵房',
unit: 'm³',
normalData: [],
dataModelAbnormal: [],
alarmHisList: [],
AreaCode: null,
SensorType: null,
Min_Data: null,
Avg_Data: null,
MinDatas: [],
MaxDatas: [],
},
{
stationCode: 'EGBF00000006',
sensorName: '今日用电量',
dataModel: [
{
PV: 34,
PT: '2021-03-15 16:03:49',
},
{
PV: 34,
PT: '2021-03-15 16:08:50',
},
{
PV: 35,
PT: '2021-03-15 16:18:21',
},
{
PV: 35,
PT: '2021-03-15 16:23:23',
},
{
PV: 35,
PT: '2021-03-15 16:28:24',
},
],
decimalPoint: 0,
EquipmentName: '温州嵇师村低压区智慧集成泵房',
unit: 'kWh',
normalData: [],
dataModelAbnormal: [],
alarmHisList: [],
AreaCode: null,
SensorType: null,
Min_Data: null,
Avg_Data: null,
MinDatas: [],
MaxDatas: [],
},
{
stationCode: 'EGJZ00007117',
sensorName: '进水压力',
dataModel: [
{
PV: 0.08,
PT: '2021-03-15 16:04:21',
},
{
PV: 0.09,
PT: '2021-03-15 16:09:22',
},
{
PV: 0.09,
PT: '2021-03-15 16:18:21',
},
{
PV: 0.08,
PT: '2021-03-15 16:23:23',
},
{
PV: 0.08,
PT: '2021-03-15 16:28:24',
},
],
decimalPoint: 2,
EquipmentName: '温州嵇师村低压区智慧集成泵房-低区',
unit: 'MPa',
normalData: [],
dataModelAbnormal: [],
alarmHisList: [],
AreaCode: null,
SensorType: null,
Min_Data: null,
Avg_Data: null,
MinDatas: [],
MaxDatas: [],
},
{
stationCode: 'EGJZ00007117',
sensorName: '出水压力',
dataModel: [
{
PV: 0.33,
PT: '2021-03-15 16:04:21',
},
{
PV: 0.34,
PT: '2021-03-15 16:09:22',
},
{
PV: 0.33,
PT: '2021-03-15 16:18:21',
},
{
PV: 0.32,
PT: '2021-03-15 16:23:23',
},
{
PV: 0.32,
PT: '2021-03-15 16:28:24',
},
],
decimalPoint: 2,
EquipmentName: '温州嵇师村低压区智慧集成泵房-低区',
unit: 'MPa',
normalData: [],
dataModelAbnormal: [],
alarmHisList: [],
AreaCode: null,
SensorType: null,
Min_Data: null,
Avg_Data: null,
MinDatas: [],
MaxDatas: [],
},
{
stationCode: 'EGJZ00007117',
sensorName: '泵1状态',
dataModel: [
{
PV: 1,
PT: '2021-03-15 16:04:21',
},
{
PV: 1,
PT: '2021-03-15 16:09:22',
},
{
PV: 1,
PT: '2021-03-15 16:18:21',
},
{
PV: 1,
PT: '2021-03-15 16:23:23',
},
{
PV: 1,
PT: '2021-03-15 16:28:24',
},
],
decimalPoint: 0,
EquipmentName: '温州嵇师村低压区智慧集成泵房-低区',
unit: null,
normalData: [],
dataModelAbnormal: [],
alarmHisList: [],
AreaCode: null,
SensorType: null,
Min_Data: null,
Avg_Data: null,
MinDatas: [],
MaxDatas: [],
},
],
};
...@@ -7,7 +7,6 @@ class Demo extends React.Component { ...@@ -7,7 +7,6 @@ class Demo extends React.Component {
super(props); super(props);
this.state = { this.state = {
dataSource: [], dataSource: [],
Authorization: '',
}; };
} }
...@@ -17,9 +16,7 @@ class Demo extends React.Component { ...@@ -17,9 +16,7 @@ class Demo extends React.Component {
fetchData = (params = {}) => { fetchData = (params = {}) => {
const _this = this; const _this = this;
const { Authorization } = this.state;
request(baseUrl + '/Publish/OMS/FileCenter/GetImageOrderByPath', { request(baseUrl + '/Publish/OMS/FileCenter/GetImageOrderByPath', {
headers: { Authorization },
method: 'get', method: 'get',
params: { params: {
path: 'assets/images/appMenu', path: 'assets/images/appMenu',
...@@ -35,31 +32,7 @@ class Demo extends React.Component { ...@@ -35,31 +32,7 @@ class Demo extends React.Component {
// 获取token // 获取token
componentDidMount() { componentDidMount() {
const _this = this; this.fetchData();
request(baseUrl + '/Publish/GateWay/OMS/OMSLogin', {
method: 'post',
requestType: 'form',
data: {
userName: 'omsa',
password: 'pandaomsa',
},
})
.then(function (response) {
if (response.data.token) {
const { access_token, token_type } = response.data.token;
_this.setState(
{
Authorization: token_type + ' ' + access_token,
},
() => {
_this.fetchData();
},
);
}
})
.catch(function (error) {
console.log(error);
});
} }
render() { render() {
...@@ -68,7 +41,7 @@ class Demo extends React.Component { ...@@ -68,7 +41,7 @@ class Demo extends React.Component {
onSearch={(params) => this.fetchData(params)} onSearch={(params) => this.fetchData(params)}
dataSource={this.state.dataSource} dataSource={this.state.dataSource}
onSelect={(value) => this.onSelect(value)} onSelect={(value) => this.onSelect(value)}
url={baseUrl} url={imgUrl}
/> />
); );
} }
...@@ -76,4 +49,5 @@ class Demo extends React.Component { ...@@ -76,4 +49,5 @@ class Demo extends React.Component {
export default Demo; export default Demo;
const baseUrl = 'http://192.168.10.150:8777'; // window.location.origin const imgUrl = 'http://192.168.10.150:8777';
const baseUrl = 'https://www.fastmock.site/mock/162c15dca15c4dba9ba51e0a0b76929b/api';
...@@ -179,4 +179,4 @@ const Demo = () => { ...@@ -179,4 +179,4 @@ const Demo = () => {
export default Demo; export default Demo;
const baseUrl = 'http://192.168.10.150:8777'; const baseUrl = 'https://www.fastmock.site/mock/162c15dca15c4dba9ba51e0a0b76929b/api';
...@@ -108,7 +108,7 @@ const Demo = () => { ...@@ -108,7 +108,7 @@ const Demo = () => {
export default Demo; export default Demo;
const baseUrl = 'http://192.168.10.150:8777'; const baseUrl = 'https://www.fastmock.site/mock/162c15dca15c4dba9ba51e0a0b76929b/api';
const columns = [ const columns = [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment