Skip to content

W
web-project
Commit 3db85e82 authored by xuhaoze's avatar xuhaoze
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 714dbb31 a2b5ec88
Show whitespace changes
Inline Side-by-side
Showing with 803 additions and 400 deletions
src/api/scheduling.js
View file @ 3db85e82
......@@ -5,3 +5,4 @@ export const postEnergyManage = params => {
console.log(error);
})
}
src/router/index.js
View file @ 3db85e82
// 创建路由为历史
import { createRouter, createWebHistory } from "vue-router";
import {createRouter, createWebHistory} from "vue-router";
import LoginPage from '@/views/login/login.vue'
import HomePage from '@/views/home.vue'
import AboutPage from '@/components/About.vue'
......@@ -376,11 +376,19 @@ const routes = [
{
path: '/Scheduling/WeatherManage',
name: 'WeatherManagePage',
component: () => import('@/views/Scheduling/WeatherManagePage.vue'),
component: () => import('@/views/SchedulingPage/WeatherManagePage.vue'),
meta: {
title: '气象干预'
}
},
{
path: '/Scheduling/AnnualParam',
name: 'AnnualParamPage',
component:()=>import('@/views/SchedulingPage/AnnualParamPage.vue'),
meta: {
title: '年度参数'
}
},
{
path: '/Scheduling/ConfigBoiler',
name: 'ConfigBoiler',
......@@ -397,6 +405,16 @@ const routes = [
meta: {
title: '天气工况管理'
}
}
<<<<<<< HEAD
=======
},{
path: '/Scheduling/InstantHeat',
name: 'InstantHeatPage',
component: () => import('@/views/SchedulingPage/InstantHeatPage.vue'),
meta: {
title: '瞬时热量对比配置'
}
},
{
path: '/Scheduling/WindManage',
......@@ -406,6 +424,7 @@ const routes = [
title: '风力配置管理'
}
}
>>>>>>> 21138bfaa9093e9c1562a373e453c9b1618084d9
]
},
{
......@@ -504,7 +523,7 @@ router.beforeEach(async (to, from, next) => {
if (!userInfo && to.path !== '/login') return next('/login')
//如果已登录避免重复登录
if (userInfo && to.path == '/login') {
return next({ path: from.path ? from.path : '/' })
return next({path: from.path ? from.path : '/'})
}
let hasNewRoutes = false
......
src/views/SchedulingPage/AnnualParamPage.vue 0 → 100644
View file @ 3db85e82
<script setup>
import {ref} from "vue";
import {zhCn} from "element-plus/es/locale/index";
const data = [
{
paramId: "4229478e-9923-4fce-985d-0109efc1e95f", // 编号
supplyId: "33104782-c1ad-432c-953e-e31c2e031be4", // 所属供热站编号
energyType: '三步节能', // 类型(能源)
year: "2024", // 年度
standard: 44.2, // 热指标
degreeStandard: null, // 度日数标定值
indoorTemperature: 23.0, // 室内温度
outdoorTemperature: -9.0, // 室外温度
backWaterTemperature: 46.0, // 回水温度
updateNullFields: null // 无用
},
{
paramId: "4229478e-9923-4fce-985d-0109efc1e95f", // 编号
supplyId: "33104782-c1ad-432c-953e-e31c2e031be4", // 所属供热站编号
energyType: "二步节能", // 类型(能源)
year: "2024", // 年度
standard: 44.2, // 热指标
degreeStandard: null, // 度日数标定值
indoorTemperature: 23.0, // 室内温度
outdoorTemperature: -9.0, // 室外温度
backWaterTemperature: 46.0, // 回水温度
updateNullFields: null // 无用
},
{
paramId: "4229478e-9923-4fce-985d-0109efc1e95f", // 编号
supplyId: "33104782-c1ad-432c-953e-e31c2e031be4", // 所属供热站编号
energyType: null, // 类型(能源)
year: "2024", // 年度
standard: 44.2, // 热指标
degreeStandard: null, // 度日数标定值
indoorTemperature: 23.0, // 室内温度
outdoorTemperature: -9.0, // 室外温度
backWaterTemperature: 46.0, // 回水温度
updateNullFields: null // 无用
},
{
paramId: "4229478e-9923-4fce-985d-0109efc1e95f", // 编号
supplyId: "33104782-c1ad-432c-953e-e31c2e031be4", // 所属供热站编号
energyType: "二步节能", // 类型(能源)
year: "2024", // 年度
standard: 44.2, // 热指标
degreeStandard: null, // 度日数标定值
indoorTemperature: 23.0, // 室内温度
outdoorTemperature: -9.0, // 室外温度
backWaterTemperature: 46.0, // 回水温度
updateNullFields: null // 无用
},
{
paramId: "4229478e-9923-4fce-985d-0109efc1e95f", // 编号
supplyId: "33104782-c1ad-432c-953e-e31c2e031be4", // 所属供热站编号
energyType: "二步节能", // 类型(能源)
year: "2024", // 年度
standard: 44.2, // 热指标
degreeStandard: null, // 度日数标定值
indoorTemperature: 23.0, // 室内温度
outdoorTemperature: -9.0, // 室外温度
backWaterTemperature: 46.0, // 回水温度
updateNullFields: null // 无用
}
]
const tableHeaderClass = data => { // 表头样式
return 'table-header-class'
}
const tableBodyClass = data => { // 表体样式
return 'table-body-class'
}
const searchKey = ref('') // 查询参数
const currentPage = ref(1) // 当前页码
const pageSize = ref(30) // 每页显示条数
function handleEdit(val) {
} // 处理修改
function handleDelete(val) {
} // 处理删除
function handleAdd() {
} // 处理新增
function handleSearch() {
} // 处理查询
</script>
<template>
<div class="annual-param-container">
<div class="search-add-wrapper">
<el-row>
<el-col :span="8" label>年度：</el-col>
<el-col :span="16">
<el-input v-model="searchKey"/>
</el-col>
</el-row>
<el-button type="primary" class="add-search-btn" @click="handleAdd">新增</el-button>
<el-button type="primary" class="add-search-btn" @click="handleSearch">查询</el-button>
</div>
<div class="table-wrapper">
<el-table
:data="data"
border
stripe
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
style="width: 100%">
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column label="节能类型" prop="energyType"/>
<el-table-column label="年度" prop="year"/>
<el-table-column label="热指标(W/m²)" prop="standard"/>
<el-table-column label="度日数标定值" prop="degreeStandard"/>
<el-table-column label="室内温度(℃)" prop="indoorTemperature"/>
<el-table-column label="室外温度(℃)" prop="outdoorTemperature"/>
<el-table-column label="回水温度(℃)" prop="backWaterTemperature"/>
<el-table-column label="操作">
<template #default="scope">
<div class="table-operate-column">
<el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
<el-button link type="primary" @click="handleDelete(scope.row)">删除</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-wrapper">
<el-config-provider :locale="zhCn">
<el-pagination
v-model:current-page="currentPage"
v-model:page-size="pageSize"
:page-sizes="[30, 40, 50, 100, 200, 300]"
:small="true"
layout="total, sizes, prev, pager, next, jumper"
:total="data.length"
@change="data"
class="pagination"/>
</el-config-provider>
</div>
</div>
</template>
<style scoped lang="less">
.annual-param-container {
width: 100%;
margin: 4px;
}
.search-add-wrapper {
width: 100%;
display: flex;
justify-content: start;
}
.search-add-wrapper .el-row {
width: 50%;
margin: 5px 10px 5px 5px;
}
.el-col[label] {
display: flex;
justify-content: end;
align-items: center;
}
.add-search-btn{
margin: 5px 10px 5px 0;
}
:deep(.table-header-class) {
text-align: center;
font-size: 12px;
background-color: #c4d8f1 !important;
color: #124c6a;
}
:deep(.table-body-class) {
font-size: 12px;
color: black;
}
.table-operate-column {
display: flex;
justify-content: center;
align-items: center;
}
.table-operate-column .el-button {
font-size: 12px;
}
::v-deep .el-table__body tr:hover > td {
background: linear-gradient(to top, rgb(0, 198, 255), rgb(255, 255, 255)) !important;
}
.pagination-wrapper{
padding: 5px;
display: flex;
justify-content: space-between;
align-items: center;
}
</style>
\ No newline at end of file
src/views/SchedulingPage/EnergyManagePage.vue
View file @ 3db85e82
......@@ -21,12 +21,12 @@ const tableLabel = reactive([
{
prop: 'id',
label: "序号",
width: 120
width: 100
},
{
prop: 'name',
label: '名称',
width: 230
width: 200
},
{
prop: 'type',
......@@ -35,7 +35,7 @@ const tableLabel = reactive([
{
prop: 'used',
label: "用度",
width: 220
width: 200
},
{
prop: 'date',
......@@ -55,8 +55,8 @@ const config = reactive({
})
const handleSearch = () => {
config.name
getEnergyData()
config.name,
getEnergyData(),
config.name = ''
}
......@@ -183,7 +183,7 @@ onMounted(() => {
<template>
<table cellpadding="0" cellspacing="1" style="background-color: #99bbe8;width: 100%;">
<table class="table_search" cellpadding="0" cellspacing="1" style="background-color: #99bbe8;width: 100%;">
<tr style="height: 10px;">
<th width="30%">
<span>能源类型：</span>
......@@ -328,48 +328,6 @@ onMounted(() => {
</el-form>
</el-dialog>
<!-- <el-dialog v-model="dialogVisible" :title="action == 'add' ? '数据新增' : '数据修改'"
width="800" class="showAll_dialog">
<el-form :inline="true" :model="formEnergy" :rules="rules" ref="energyForm">
<div class="dialog_div">
<table border="3px">
<tr>
<th>供应站编号：</th>
<th><el-select v-model="formEnergy.name" placeholder="请选择">
<el-option label="东部供热站" value="东部供热站" />
<el-option label="行政区供热站" value="行政区供热站" />
<el-option label="福宛里供热站" value="福宛里供热站" />
</el-select></th>
</tr>
<tr>
<th>能源类型</th>
<th><input type="text"></th>
</tr>
<tr>
<th>用度</th>
<th><input type="text"></th>
</tr>
<tr>
<th>日期</th>
<th><input type="text"></th>
</tr>
</table>
<el-button>Default</el-button>
<el-button>Default</el-button>
</div>
</el-form>
<template #footer>
<div style="height: 400px;"></div>
</template>
</el-dialog> -->
</template>
......@@ -385,11 +343,13 @@ onMounted(() => {
.table {
margin-top: 10px;
margin-left: 4px;
}
table {
.table_search {
width: 100%;
margin-left: 4px;
}
table,
......
src/views/SchedulingPage/InstantHeatPage.vue 0 → 100644
View file @ 3db85e82
<template>
<div class="contentBlock">
<div class="contentBlockInn">
<el-card class="card-contianer">
<div class="card-header">
<span>瞬时热量对比配置</span>
</div>
<el-form ref="formRef" :data="formData" :model="formModel" label-width="auto">
<table cellpadding="0" cellspacing="1" >
<tr>
<th style="width: 25%">计划名称：</th>
<td style="width: 60%; margin:0; padding: 0">
<table cellpadding="0" cellspacing="0">
<tr>
<td style="text-align: left">
<el-input style="width: 80%" v-model="formModel.planName"></el-input>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th style="width: 25%">偏差百分比 (%)：</th>
<td style="width: 60%; margin: 0; padding: 0">
<table cellpadding="0" cellspacing="0">
<tr>
<td style="text-align: left">
<el-input style="width: 80%" v-model="formModel.diffPercentage"></el-input>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th style="width: 25%">判断时间 (分)：</th>
<td style="width: 60%; margin: 0; padding: 0">
<table cellpadding="0" cellspacing="0">
<tr>
<td style="text-align: left">
<el-form>
<el-input style="width: 80%" v-model="formModel.timeoutMin"></el-input>
</el-form>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th style="width: 25%">调节温度 (℃)</th>
<td style="width: 60%; margin: 0; padding: 0">
<table cellpadding="0" cellspacing="0">
<tr>
<td style="text-align: left">
<el-input style="width: 80%" v-model="formModel.tempRegulation"></el-input>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th style="width: 25%">备注</th>
<td style="width: 60%; margin: 0; padding: 0">
<table cellpadding="0" cellspacing="0">
<tr>
<td style="text-align: left">
<el-input style="width: 80%" type="textarea" rows="6" v-model="formModel.description"></el-input>
</td>
</tr>
</table>
</td>
</tr>
</table>
<div class="btngrounp">
<el-button type="primary">保存</el-button>
<el-button type="primary" style="margin: 0 0 0 5px">关闭</el-button>
</div>
</el-form>
</el-card>
</div>
</div>
</template>
<script setup>
import { ref, reactive, onMounted, onUnmounted } from "vue";
const formModel = reactive({
planId: '',
planName: '瞬时热量偏差',
diffPercentage: '10',
timeoutMin: '10',
tempRegulation: '1',
description: '"预测瞬时热量"与集团"瞬时热量"进行对比，偏差10%（可变），超过10分钟（可变），对下发温度进行+-温度调节（温度可调）'
})
</script>
<style lang="less" scoped>
.card-contianer {
background-color: #DFE8F6;
}
.card-header {
text-align: center;
font-weight: 700;
font-size: 28px;
margin-bottom:10px;
}
.btngrounp {
margin-top: 10px;
text-align: center;
}
table {
width: 100%;
}
table,
tr,
th,
td {
font-size: 14px;
margin: 0;
padding: 0;
}
table {
width: 100%;
border-collapse: collapse;
}
table th {
background-color: #F2F6F8;
text-align: center;
padding: 5px 10px;
border: 1px solid #DFE8F6;
}
table td {
text-align: center;
background-color: #ffffff;
padding: 5px 10px;
border: 1px solid #DFE8F6;
border-bottom: 0;
}
table.botList td {
width: 33%;
text-align: left;
font-weight: bolder;
}
</style>
src/views/Scheduling/WeatherManagePage.vue → src/views/SchedulingPage/WeatherManagePage.vue
View file @ 3db85e82
......@@ -82,10 +82,10 @@ const tableBodyClass = data => { // 表体样式
}
const setCellStyle = (row, column, rowIndex, columnIndex) => {
let css_color = {}
css_color['padding-left'] = '0px'
css_color['padding-right'] = '0px'
css_color['padding-top'] = '3px'
css_color['padding-bottom'] = '3px'
// css_color['padding-left'] = '0px'
// css_color['padding-right'] = '0px'
// css_color['padding-top'] = '3px'
// css_color['padding-bottom'] = '3px'
return css_color
}
......@@ -117,14 +117,24 @@ const confirmRevise = val => { // 修改弹窗确认按钮事件
}
reviseWindowOpen.value = false
}
const confirmBind = val =>{
const confirmBind = val => {
console.log("处理换热站绑定")
bindWindowOpen.value = false
}
</script>
<template>
<div class="container">
<div class="weather-manage-container">
<el-row>
<el-col :span="15" left-col>
</el-col>
<el-col :span="9" right-col>
<!-- <el-button type="primary" @click="reviseWindowOpen = true" class="add-btn">新增</el-button>-->
<el-button type="primary" class="add-btn">新增</el-button>
<el-button type="primary">查询</el-button>
</el-col>
</el-row>
<div class="table-wrapper">
<el-table
:data="data"
......@@ -143,13 +153,16 @@ const confirmBind = val =>{
<el-table-column prop="windSpeed" label="风速" width="60"/>
<el-table-column prop="illumination" label="光照" width="60"/>
<el-table-column prop="switching" label="手自动切换" width="120"/>
<el-table-column prop="deviationPercentage" label="自动偏差百分比"/>
<el-table-column prop="verifyTime" label="验证时间"/>
<el-table-column prop="adjustTemperature" label="调节温度"/>
<el-table-column prop="deviationPercentage" label="自动偏差百分比" width="170"/>
<el-table-column prop="verifyTime" label="验证时间" width="100"/>
<el-table-column prop="adjustTemperature" label="调节温度" width="100"/>
<el-table-column prop="sort" label="排序" width="60"/>
<el-table-column label="操作" width="200">
<template #default="scope">
<div class="table-operate-column">
<!-- <el-link :underline="false" @click="revise(scope.row)" type="primary">修改</el-link>-->
<!-- <el-link :underline="false" @click="bind(scope.row)" type="primary">绑定换热站</el-link>-->
<!-- <el-link :underline="false" type="primary">详情</el-link>-->
<el-button link @click="revise(scope.row)" type="primary">修改</el-button>
<el-button link @click="bind(scope.row)" type="primary">绑定换热站</el-button>
<el-button link type="primary">详情</el-button>
......@@ -160,18 +173,29 @@ const confirmBind = val =>{
</div>
<div class="pagination-wrapper">
<div class="pagination-text-area">
<div class="pagination-text">
共{{ data.length }}条记录，当前为第{{ currentPage }}页，共{{ totalPageCount }}页
</div>
</div>
<!-- <div class="pagination-text-area">-->
<!-- <div class="pagination-text">-->
<!-- 共{{ data.length }}条记录，当前为第{{ currentPage }}页，共{{ totalPageCount }}页-->
<!-- </div>-->
<!-- </div>-->
<!-- <el-config-provider :locale="zhCn">-->
<!-- <el-pagination-->
<!-- v-model:current-page="currentPage"-->
<!-- v-model:page-size="pageSize"-->
<!-- :page-sizes="[30, 40, 50, 100, 200, 300]"-->
<!-- :small="true"-->
<!-- layout="sizes, prev, pager, next, jumper"-->
<!-- :total="data.length"-->
<!-- @change="data"-->
<!-- class="pagination"/>-->
<!-- </el-config-provider>-->
<el-config-provider :locale="zhCn">
<el-pagination
v-model:current-page="currentPage"
v-model:page-size="pageSize"
:page-sizes="[30, 40, 50, 100, 200, 300]"
:small="true"
layout="sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper"
:total="data.length"
@change="data"
class="pagination"/>
......@@ -197,18 +221,45 @@ const confirmBind = val =>{
</template>
<style scoped>
.weather-manage-container {
width: 100%;
margin: 4px;
}
.el-col[left-col] {
border-right: 1px solid #a6c3e9;
}
.el-row {
width: 100%;
border: 1px solid #a6c3e9;
margin: 5px 0 10px 0;
}
.el-col[right-col] {
padding-left: 10px;
}
.add-btn {
margin: 5px 0;
}
:deep(.table-header-class) {
text-align: center;
font-size: 12px;
background-color: #c4d8f1 !important;
color: #124c6a;
font-weight: normal;
}
:deep(.table-body-class) {
font-size: 12px;
color: black;
}
.table-wrapper {
}
.table-operate-column {
display: flex;
justify-content: center;
......@@ -216,12 +267,11 @@ const confirmBind = val =>{
}
.table-operate-column .el-button {
color: #124c6a;
font-size: 12px;
}
.pagination-wrapper {
padding: 10px;
padding: 5px;
display: flex;
justify-content: space-between;
align-items: center;
......@@ -235,7 +285,7 @@ const confirmBind = val =>{
}
::v-deep .el-table__body tr:hover>td {
::v-deep .el-table__body tr:hover > td {
background: linear-gradient(to top, rgb(0, 198, 255), rgb(255, 255, 255)) !important;
}
</style>
\ No newline at end of file
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