diff --git a/web/public/config/columnList.js b/web/public/config/columnList.js
index 42b1c99..3620499 100644
--- a/web/public/config/columnList.js
+++ b/web/public/config/columnList.js
@@ -225,7 +225,6 @@ export const columnList = [
key: 'policy_id',
scopedSlots: { customRender: 'policy_id' }
},
-
{
title: '操作',
dataIndex: 'operate',
@@ -671,16 +670,24 @@ export const stationOptions = [
type: 'select',
list: [
{
- label: '最优经济化',
+ label: '峰谷套利',
value: '1'
},
{
- label: '支撑电网稳定',
+ label: '增网配容',
value: '2'
},
{
- label: '自定义',
+ label: '应急供电',
value: '3'
+ },
+ {
+ label: '并网保电',
+ value: '4'
+ },
+ {
+ label: '自定时段',
+ value: '5'
}
]
},
diff --git a/web/src/components/Home/Operational.vue b/web/src/components/Home/Operational.vue
index 553878a..a75612f 100644
--- a/web/src/components/Home/Operational.vue
+++ b/web/src/components/Home/Operational.vue
@@ -78,7 +78,7 @@ export default {
display: flex;
justify-content: space-around;
align-items: center;
- height: 100%;
+ height: calc(100% - 45px);
.oper-bg {
font-size: 1vw;
display: flex;
diff --git a/web/src/request/index.js b/web/src/request/index.js
index c8e7e27..a5c6afe 100644
--- a/web/src/request/index.js
+++ b/web/src/request/index.js
@@ -1,7 +1,7 @@
import axios from 'axios'
import openNotification from '../utils/notification'
// import { message } from 'ant-design-vue'
-
+import router from 'vue-router'
const service = axios.create({
baseURL: '/api',
timeout: 120000
@@ -17,13 +17,14 @@ service.interceptors.response.use(
const res = response.data
if (res.errCode !== 0) {
+ console.log(res, 'res')
if ((res.ERR_TOKEN = 2 || res.errmsg == '校验token过期')) {
setTimeout(() => {
// router.push({ path: '/login' })
}, 1000)
} else {
console.log(res.errmsg, 'res.errmsg')
- message.error(res.errmsg)
+ // message.error(res.errmsg)
// openNotification({
// status: 'error',
// desc: res.tip
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 0743483..8a545e5 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -13,11 +13,11 @@ export const routes = [
{
path: '/',
name: '/',
- redirect: '/Home',
+ redirect: '/home',
component: () => import(/* webpackChunkName: "main" */ '@/views/MainView.vue'),
children: [
{
- path: 'Home',
+ path: 'home',
component: () => import(/* webpackChunkName: "monitor" */ '@/views/sub/Home.vue')
},
{
diff --git a/web/src/views/sub/Home.vue b/web/src/views/sub/Home.vue
index 0381e2f..5754b6b 100644
--- a/web/src/views/sub/Home.vue
+++ b/web/src/views/sub/Home.vue
@@ -257,7 +257,7 @@ export default {
}
.tianditu {
- width: calc(100% - 520px * 2);
+ width: 44%;
height: 100%;
margin: 0px 15px;
}
@@ -265,7 +265,7 @@ export default {
.content-left,
.content-right {
height: 100%;
- width: 520px;
+ width: 28%;
display: flex;
flex-direction: column;
align-items: center;
diff --git a/web/src/views/system/station.vue b/web/src/views/system/station.vue
index 3cffad1..9ffad72 100644
--- a/web/src/views/system/station.vue
+++ b/web/src/views/system/station.vue
@@ -21,11 +21,10 @@
{{ workModeList.find((item) => record.value == item.value)?.label || '' }}
-
+
{{ policyList.find((item) => record.value == item.value)?.label || '' }}
-
-
+
@@ -78,16 +77,24 @@ export default {
paramsDate: {},
workModeList: [
{
- label: '最优经济化',
- value: 1
+ label: '峰谷套利',
+ value: '1'
},
{
- label: '支撑电网稳定',
- value: 2
+ label: '增网配容',
+ value: '2'
},
{
- label: '自定义',
- value: 3
+ label: '应急供电',
+ value: '3'
+ },
+ {
+ label: '并网保电',
+ value: '4'
+ },
+ {
+ label: '自定时段',
+ value: '5'
}
],
policyList: [