Skip to content

W
web-project
Commit 747a2bdd authored by moonby's avatar moonby
Browse files
Options

Merge branch 'master' of gitee.com:tj-wang-yahui/AMS_HeatSys_Vue_V10

parents 77e1fc05 6955c08e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3194 additions and 591 deletions
dist/config.js
View file @ 747a2bdd
// export const ExternalSERVEICE='http://218.69.97.198:8001' export const ExternalSERVEICE='http://218.69.97.198:8001'
// export const WithinSERVEICE='http://192.168.1.252:8001' export const WithinSERVEICE='http://192.168.1.252:8001'
export const ExternalSERVEICE='http://localhost:5013' // export const ExternalSERVEICE='http://localhost:5013'
export const WithinSERVEICE='http://localhost:5013' // export const WithinSERVEICE='http://localhost:5013'
export const CURRLOGO="LOGO_gangyi.png" export const CURRLOGO="LOGO_gangyi.png"
index.html
View file @ 747a2bdd
...@@ -2,10 +2,15 @@ ...@@ -2,10 +2,15 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> --> <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
<link rel="icon" type="image/svg+xml" href="/ams.ico" /> <link rel="icon" type="image/svg+xml" href="/ams.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>爱默森区域供热管控平台V10.0</title> <title>爱默森区域供热管控平台V10.0</title>
<script>
// 兼容es6 不加这行手机版本太低打包后好多方法无法生效
this.globalThis || (this.globalThis = this)
</script>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
node_modules/.vite/deps/_metadata.json
View file @ 747a2bdd
{ {
"hash": "d2a24596", "hash": "c88a64ec",
"configHash": "f7180c00", "configHash": "6bc3ecb5",
"lockfileHash": "415b4f88", "lockfileHash": "cd7189ec",
"browserHash": "506fb5c3", "browserHash": "c592b5ce",
"optimized": { "optimized": {
"vue": { "vue": {
"src": "../../vue/dist/vue.runtime.esm-bundler.js", "src": "../../vue/dist/vue.runtime.esm-bundler.js",
"file": "vue.js", "file": "vue.js",
"fileHash": "3227ba20", "fileHash": "515b6d6f",
"needsInterop": false "needsInterop": false
}, },
"element-plus": { "element-plus": {
"src": "../../element-plus/es/index.mjs", "src": "../../element-plus/es/index.mjs",
"file": "element-plus.js", "file": "element-plus.js",
"fileHash": "123a5fc4", "fileHash": "2e778094",
"needsInterop": false "needsInterop": false
}, },
"@element-plus/icons-vue": { "@element-plus/icons-vue": {
"src": "../../@element-plus/icons-vue/dist/index.js", "src": "../../@element-plus/icons-vue/dist/index.js",
"file": "@element-plus_icons-vue.js", "file": "@element-plus_icons-vue.js",
"fileHash": "d63343b0", "fileHash": "44a77da3",
"needsInterop": false "needsInterop": false
}, },
"vue3-smooth-scroll": { "vue3-smooth-scroll": {
"src": "../../vue3-smooth-scroll/dist/vue-smooth-scroll.min.js", "src": "../../vue3-smooth-scroll/dist/vue-smooth-scroll.min.js",
"file": "vue3-smooth-scroll.js", "file": "vue3-smooth-scroll.js",
"fileHash": "9466f662", "fileHash": "68d872a0",
"needsInterop": true "needsInterop": true
}, },
"@kyvg/vue3-notification": { "@kyvg/vue3-notification": {
"src": "../../@kyvg/vue3-notification/dist/index.es.js", "src": "../../@kyvg/vue3-notification/dist/index.es.js",
"file": "@kyvg_vue3-notification.js", "file": "@kyvg_vue3-notification.js",
"fileHash": "12d53af5", "fileHash": "e4b1301c",
"needsInterop": false "needsInterop": false
}, },
"jquery": { "jquery": {
"src": "../../jquery/dist/jquery.js", "src": "../../jquery/dist/jquery.js",
"file": "jquery.js", "file": "jquery.js",
"fileHash": "e02e3a42", "fileHash": "b965b93f",
"needsInterop": true "needsInterop": true
}, },
"element-plus/dist/locale/zh-cn.mjs": {
"src": "../../element-plus/dist/locale/zh-cn.mjs",
"file": "element-plus_dist_locale_zh-cn__mjs.js",
"fileHash": "9c48ad79",
"needsInterop": false
},
"axios": {
"src": "../../axios/index.js",
"file": "axios.js",
"fileHash": "5723cd42",
"needsInterop": false
},
"vue-router": { "vue-router": {
"src": "../../vue-router/dist/vue-router.mjs", "src": "../../vue-router/dist/vue-router.mjs",
"file": "vue-router.js", "file": "vue-router.js",
"fileHash": "e7a65c94", "fileHash": "d035ba38",
"needsInterop": false
},
"element-plus/dist/locale/zh-cn.mjs": {
"src": "../../element-plus/dist/locale/zh-cn.mjs",
"file": "element-plus_dist_locale_zh-cn__mjs.js",
"fileHash": "1d0385f0",
"needsInterop": false "needsInterop": false
}, },
"vuex": { "vuex": {
"src": "../../vuex/dist/vuex.esm-bundler.js", "src": "../../vuex/dist/vuex.esm-bundler.js",
"file": "vuex.js", "file": "vuex.js",
"fileHash": "1ad04a64", "fileHash": "0a7adb8c",
"needsInterop": false
},
"axios": {
"src": "../../axios/index.js",
"file": "axios.js",
"fileHash": "eccf63c7",
"needsInterop": false "needsInterop": false
}, },
"echarts": { "echarts": {
"src": "../../echarts/index.js", "src": "../../echarts/index.js",
"file": "echarts.js", "file": "echarts.js",
"fileHash": "4bc23a29", "fileHash": "78551daa",
"needsInterop": false "needsInterop": false
}, },
"@amap/amap-jsapi-loader": { "@amap/amap-jsapi-loader": {
"src": "../../@amap/amap-jsapi-loader/dist/index.js", "src": "../../@amap/amap-jsapi-loader/dist/index.js",
"file": "@amap_amap-jsapi-loader.js", "file": "@amap_amap-jsapi-loader.js",
"fileHash": "7df2260b", "fileHash": "1dd9918c",
"needsInterop": true "needsInterop": true
}, },
"mitt": { "mitt": {
"src": "../../mitt/dist/mitt.mjs", "src": "../../mitt/dist/mitt.mjs",
"file": "mitt.js", "file": "mitt.js",
"fileHash": "3c6009f1", "fileHash": "6cdeaaa7",
"needsInterop": false "needsInterop": false
},
"file-saver": {
"src": "../../file-saver/dist/FileSaver.min.js",
"file": "file-saver.js",
"fileHash": "a4425f4f",
"needsInterop": true
},
"xlsx-js-style": {
"src": "../../xlsx-js-style/dist/xlsx.min.js",
"file": "xlsx-js-style.js",
"fileHash": "09bb44bc",
"needsInterop": true
} }
}, },
"chunks": { "chunks": {
"chunk-YFT6OQ5R": {
"file": "chunk-YFT6OQ5R.js"
},
"chunk-LNZ7GA7G": { "chunk-LNZ7GA7G": {
"file": "chunk-LNZ7GA7G.js" "file": "chunk-LNZ7GA7G.js"
}, },
"chunk-YFT6OQ5R": {
"file": "chunk-YFT6OQ5R.js"
},
"chunk-VDFR5PMD": { "chunk-VDFR5PMD": {
"file": "chunk-VDFR5PMD.js" "file": "chunk-VDFR5PMD.js"
}, },
......
package-lock.json
View file @ 747a2bdd
This source diff could not be displayed because it is too large. You can view the blob instead.
public/config.js
View file @ 747a2bdd
export const ExternalSERVEICE='http://218.69.97.198:8001' // export const ExternalSERVEICE='http://218.69.97.198:8001'
export const WithinSERVEICE='http://192.168.1.252:8001' // export const WithinSERVEICE='http://192.168.1.252:8001'
// export const ExternalSERVEICE='http://localhost:5013' export const ExternalSERVEICE='http://localhost:5013'
// export const WithinSERVEICE='http://localhost:5013' export const WithinSERVEICE='http://localhost:5013'
export const CURRLOGO="LOGO_gangyi.png" export const CURRLOGO="LOGO_gangyi.png"
src/api/analysis.js
View file @ 747a2bdd
...@@ -71,6 +71,13 @@ export const postSecAbsTUc = params => { ...@@ -71,6 +71,13 @@ export const postSecAbsTUc = params => {
}) })
} }
//二网万平米流量
export const postSecTrafficUc = params => {
return http.post(`/api/analysis/external/SecTrafficUc`, params).then(res => res).catch(function (error) {
console.log(error);
})
}
//热量分析报表 //热量分析报表
export const postHeatAnalysis = params => { export const postHeatAnalysis = params => {
return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) {
......
src/components/Remote/HolidayControl.vue
View file @ 747a2bdd
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
:header-cell-style="setHeaderCellStyle" :header-cell-style="setHeaderCellStyle"
:data="visibleData" :data="visibleData"
v-loading="isLoading" v-loading="isLoading"
:row-key="getRowId" :row-key="transferId"
element-loading-text="数据加载中......" element-loading-text="数据加载中......"
:element-loading-spinner="svg" :element-loading-spinner="svg"
element-loading-svg-view-box="-10, -10, 50, 50" element-loading-svg-view-box="-10, -10, 50, 50"
......
src/views/HandlerPage/TransferEnergyView.vue
View file @ 747a2bdd
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
v-model="enertyInfo.type" v-model="enertyInfo.type"
placeholder="请选择" placeholder="请选择"
@change="selTypeChange" @change="selTypeChange"
style="width: 130px" style="width: 150px"
> >
<!-- <el-option label="用量环比" :value="0" /> --> <!-- <el-option label="用量环比" :value="0" /> -->
<el-option label="热单耗" :value="1" /> <el-option label="热单耗" :value="1" />
...@@ -84,11 +84,12 @@ ...@@ -84,11 +84,12 @@
<el-option label="水单耗" :value="3" /> <el-option label="水单耗" :value="3" />
<el-option label="度日数热耗" :value="4" /> <el-option label="度日数热耗" :value="4" />
<el-option label="一网回温" :value="5" /> <el-option label="一网回温" :value="5" />
<!-- <el-option label="一网万平米流量" :value="6" /> <el-option label="一网万平米流量" :value="6" />
<el-option label="换热站板换效率" :value="7" /> <el-option label="换热站板换效率" :value="7" />
<el-option label="换热站二网均温" :value="8" /> --> <el-option label="换热站二网均温" :value="8" />
<!-- <el-option label="二网温差" :value="9" /> <el-option label="二网温差" :value="9" />
<el-option label="二网均温" :value="10" /> --> <el-option label="二网均温" :value="8" />
<el-option label="二网万平米流量" :value="11" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="用量环比类型" v-show="energyTypeDis"> <!-- <el-form-item label="用量环比类型" v-show="energyTypeDis">
...@@ -166,6 +167,7 @@ import { ...@@ -166,6 +167,7 @@ import {
postHeatEffiUc, postHeatEffiUc,
postSecAvgTUc, postSecAvgTUc,
postSecAbsTUc, postSecAbsTUc,
postSecTrafficUc,
} from "../../api/analysis"; } from "../../api/analysis";
const options = reactive([]); const options = reactive([]);
const enterpriseId = ref(); const enterpriseId = ref();
...@@ -402,6 +404,12 @@ function sendClick() { ...@@ -402,6 +404,12 @@ function sendClick() {
case 8: case 8:
postSecAvgTUcFun(); //换热站二网均温 postSecAvgTUcFun(); //换热站二网均温
break; break;
case 9:
postSecAbsTUcFun(); //换热站二网温差
break;
case 11:
postSecTrafficUcFun(); //二网万平米流量
break;
} }
enertyTab.value = "能耗值(" + company.value + ")"; enertyTab.value = "能耗值(" + company.value + ")";
} else { } else {
...@@ -565,6 +573,22 @@ function postHeatEffiUcFun() { ...@@ -565,6 +573,22 @@ function postHeatEffiUcFun() {
}); });
} }
//换热站机组能耗数据接口（二网温差）
function postSecAbsTUcFun() {
tabloading.value = true;
postSecAbsTUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else if (res.status == 9) {
setInterval(function () {
tabloading.value = false;
this.postSecAbsTUcFun();
}, 600000);
}
});
}
//换热站机组能耗数据接口（换热站二网均温） //换热站机组能耗数据接口（换热站二网均温）
function postSecAvgTUcFun() { function postSecAvgTUcFun() {
tabloading.value = true; tabloading.value = true;
...@@ -581,6 +605,22 @@ function postSecAvgTUcFun() { ...@@ -581,6 +605,22 @@ function postSecAvgTUcFun() {
}); });
} }
//换热站机组能耗数据接口（二网万平米流量）
function postSecTrafficUcFun() {
tabloading.value = true;
postSecTrafficUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else if (res.status == 9) {
setInterval(function () {
tabloading.value = false;
this.postSecTrafficUcFun();
}, 600000);
}
});
}
function pageInitFun(res) { function pageInitFun(res) {
tableData.length = 0; tableData.length = 0;
res.data.hourWater.forEach((element) => { res.data.hourWater.forEach((element) => {
......
src/views/RemotePage/CtrlSecondTemp.vue
View file @ 747a2bdd
This diff is collapsed.
src/views/RemotePage/TransControlPage.vue
View file @ 747a2bdd
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'; import { ref, reactive, onMounted, onUnmounted, watch } from 'vue';
import http from '../../api/http'; import http from '../../api/http';
import store from "../../store/index"; import store from "../../store/index";
import { useRoute, useRouter } from 'vue-router'; // import { useRoute, useRouter } from 'vue-router';
import TransferStatusControl from '../../components/Remote/TransferStatusControl.vue'; import TransferStatusControl from '../../components/Remote/TransferStatusControl.vue';
import TransferRegControl from '../../components/Remote/TransferRegControl.vue'; import TransferRegControl from '../../components/Remote/TransferRegControl.vue';
import HolidayControl from '../../components/Remote/HolidayControl.vue'; import HolidayControl from '../../components/Remote/HolidayControl.vue';
...@@ -94,32 +94,6 @@ ...@@ -94,32 +94,6 @@
const isWinDirectionControl = ref(false); const isWinDirectionControl = ref(false);
const isHeatControl = ref(false); const isHeatControl = ref(false);
const isNightFrequency = ref(false); const isNightFrequency = ref(false);
// const editableTabs = reactive([
// {
// title: '换热站状态',
// path: '../../components/Remote/TransferStatusControl.vue',
// name: 'TransferStatusControl',
// isActive: false,
// component: TransferStatusControl
// },
// {
// title: '远程寄存器值',
// path: '/Remote/RemoteTransferReg',
// name: 'TransferRegControl',
// isActive: false,
// component: TransferRegControl
// }
// ])
// function handleTabClick(tab) {
// activeTab.value = tab.name
// }
// const handleClick = (tab, event) => {
// console.log(tab.props.name);
// console.log(editableTabs.find(t => t.name === tab.props.name).path);
// router.push(editableTabs.find(t => t.name === tab.props.name).path);
// };
//初始化页面 //初始化页面
function initPage(){ function initPage(){
......
src/views/Scheduling/AnalysisManage.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
生产与结算数据分析表
</template>
\ No newline at end of file
src/views/Scheduling/AnnualParam.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
年度参数管理
</template>
\ No newline at end of file
src/views/Scheduling/ConfigBoiler.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
锅炉参数配置
</template>
\ No newline at end of file
src/views/Scheduling/EnergyManage.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
能源消耗
</template>
\ No newline at end of file
src/views/Scheduling/InstantHeat.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
瞬时热量对比配置
</template>
\ No newline at end of file
src/views/Scheduling/Phenomenon.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
天气工况
</template>
\ No newline at end of file
src/views/Scheduling/WeatherManage.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
气象干预
</template>
\ No newline at end of file
src/views/Scheduling/WeatherManagePage.vue deleted 100644 → 0
View file @ 77e1fc05
<script setup>
import {computed, isRef, ref, shallowRef} from "vue";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import ReviseWindow from "./weatherManageSub/ReviseWindow.vue";
import BindWindow from "./weatherManageSub/BindWindow.vue";
const data = ref([
{
id: 1,
customName: '非节能（行政区）', // 自定义名称
heatingStationName: '行政区供热站', // 供热站名称
operateTime: '2024-03-19 21:33:50', // 操作时间
interventionMode: '气象仪模式', // 干预模式
temperature: 15.5, // 温度
windSpeed: 0, // 风速
illumination: 0, // 光照
switching: '手动模式', // 手自动切换
deviationPercentage: 10,// 自动偏差百分比
verifyTime: '20', // 验证时间
adjustTemperature: 1, // 调节温度
sort: 1 // 排序
},
{
id: 2,
customName: '非节能（行政区）', // 自定义名称
heatingStationName: '行政区供热站', // 供热站名称
operateTime: '2024-03-19 21:33:50', // 操作时间
interventionMode: '气象仪模式', // 干预模式
temperature: 15.5, // 温度
windSpeed: 0, // 风速
illumination: 0, // 光照
switching: '手动模式', // 手自动切换
deviationPercentage: 10,// 自动偏差百分比
verifyTime: '20', // 验证时间
adjustTemperature: 1, // 调节温度
sort: 2 // 排序
},
{
id: 3,
customName: '非节能（行政区）', // 自定义名称
heatingStationName: '行政区供热站', // 供热站名称
operateTime: '2024-03-19 21:33:50', // 操作时间
interventionMode: '气象仪模式', // 干预模式
temperature: 15.5, // 温度
windSpeed: 0, // 风速
illumination: 0, // 光照
switching: '手动模式', // 手自动切换
deviationPercentage: 10,// 自动偏差百分比
verifyTime: '20', // 验证时间
adjustTemperature: 1, // 调节温度
sort: 3 // 排序
},
{
id: 4,
customName: '非节能（行政区）', // 自定义名称
heatingStationName: '行政区供热站', // 供热站名称
operateTime: '2024-03-19 21:33:50', // 操作时间
interventionMode: '气象仪模式', // 干预模式
temperature: 15.5, // 温度
windSpeed: 0, // 风速
illumination: 0, // 光照
switching: '手动模式', // 手自动切换
deviationPercentage: 10,// 自动偏差百分比
verifyTime: '20', // 验证时间
adjustTemperature: 1, // 调节温度
sort: 4 // 排序
}
])
const currentPage = ref(1) // 当前页码
const pageSize = ref(30) // 每页显示条数
const reviseWindowOpen = ref(false) // 修改按钮弹窗状态
const bindWindowOpen = ref(false) // 绑定按钮弹窗状态
const totalPageCount = computed(() => { // 页面左下角总页数计算
return Math.ceil(data.value.length / pageSize.value)
})
const dependentSub = ref({}) // 弹窗数据
const tableHeaderClass = data => { // 表头样式
return 'table-header-class'
}
const tableBodyClass = data => { // 表体样式
return 'table-body-class'
}
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'
return css_color
}
const revise = (row) => { // 修改按钮单击事件
dependentSub.value = row
reviseWindowOpen.value = true
}
const bind = (row) => { // 绑定按钮单击事件
dependentSub.value = row
bindWindowOpen.value = true
}
const confirmRevise = val => { // 修改弹窗确认按钮事件
for (let i = 0; i < data.value.length; i++) {
if (data.value[i].id === val.id) {
data.value[i].customName = val.customName
data.value[i].interventionMode = val.interventionMode
data.value[i].temperature = val.temperature
data.value[i].windSpeed = val.windSpeed
data.value[i].illumination = val.illumination
data.value[i].switching = val.switching
data.value[i].deviationPercentage = val.deviationPercentage
data.value[i].verifyTime = val.verifyTime
data.value[i].adjustTemperature = val.adjustTemperature
data.value[i].sort = val.sort
break
}
}
reviseWindowOpen.value = false
}
const confirmBind = val =>{
console.log("处理换热站绑定")
bindWindowOpen.value = false
}
</script>
<template>
<div class="container">
<div class="table-wrapper">
<el-table
:data="data"
stripe
border
style="width: 100%"
:cell-style="setCellStyle"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass">
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column prop="customName" label="自定义名称" width="200"/>
<el-table-column prop="heatingStationName" label="供热站名称" width="160"/>
<el-table-column prop="operateTime" label="操作时间" width="210"/>
<el-table-column prop="interventionMode" label="干预模式" width="120"/>
<el-table-column prop="temperature" label="温度" width="60"/>
<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="sort" label="排序" width="60"/>
<el-table-column label="操作" width="200">
<template #default="scope">
<div class="table-operate-column">
<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>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-wrapper">
<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>
</div>
<div class="dialog-wrapper">
<ReviseWindow
:open="reviseWindowOpen"
:data="dependentSub"
@onCancel="reviseWindowOpen = false"
@onConfirm="confirmRevise"
></ReviseWindow>
<BindWindow
:open="bindWindowOpen"
:data="dependentSub"
@onCancel="bindWindowOpen = false"
@onConfirm="confirmBind"></BindWindow>
</div>
</div>
</template>
<style scoped>
:deep(.table-header-class) {
text-align: center;
background-color: #c4d8f1 !important;
color: #124c6a;
font-weight: normal;
}
:deep(.table-body-class) {
color: black;
}
.table-operate-column {
display: flex;
justify-content: center;
align-items: center;
}
.table-operate-column .el-button {
color: #124c6a;
font-size: 12px;
}
.pagination-wrapper {
padding: 10px;
display: flex;
justify-content: space-between;
align-items: center;
}
.pagination-text {
font-size: 12px;
}
.pagination {
}
::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
src/views/Scheduling/WindManage.vue deleted 100644 → 0
View file @ 77e1fc05
<template>
风力配置管理
</template>
\ No newline at end of file
src/views/SchedulingPage/WeatherManagePage.vue
View file @ 747a2bdd
...@@ -73,8 +73,8 @@ const confirmRevise = val => { // 修改弹窗确认按钮事件 ...@@ -73,8 +73,8 @@ const confirmRevise = val => { // 修改弹窗确认按钮事件
} }
alterWeatherMagData(params).then(res=>{ alterWeatherMagData(params).then(res=>{
if(res.success){ if(res.success){
getData()
reviseWindowOpen.value = false reviseWindowOpen.value = false
getData()
ElMessage({ ElMessage({
message: '修改成功.', message: '修改成功.',
type: 'success', type: 'success',
......
src/views/SchedulingPage/weatherManageSub/ReviseWindow.vue
View file @ 747a2bdd
...@@ -78,23 +78,32 @@ function onOpen() { ...@@ -78,23 +78,32 @@ function onOpen() {
async function handleConfirm() { async function handleConfirm() {
if (reviseData.value.hasOwnProperty('supplyId')) { if (reviseData.value.hasOwnProperty('supplyId')) {
if (reviseData.value.supplyId) { if (reviseData.value.supplyId) {
const result = await getTransferInterface(param) getTransferInterface({
for (let item of result.data) { customizeId: reviseData.value.customizeId,
reviseData.value.transfers.push( supplyId: reviseData.value.supplyId
{ }).then(result => {
customizeId: reviseData.value.customizeId, for (let item of result.data) {
unitId: item.transferId, if(item.selected.toLowerCase() === 'true'){
updateNullFields: '' reviseData.value.transfers.push(
} {
) customizeId: reviseData.value.customizeId,
} unitId: item.transferId,
updateNullFields: ''
}
)
}
}
formRef.value.validate(valid => {
if (valid) {
emit('onConfirm', reviseData.value)
}
})
})
} }
} }
formRef.value.validate(valid => {
if (valid) {
emit('onConfirm', reviseData.value)
}
})
} }
</script> </script>
......
src/views/home.vue
View file @ 747a2bdd
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,8 @@
</el-icon> </el-icon>
</a> </a>
<el-dialog v-model="dialogFormVisible" width="1000" > <el-dialog v-model="dialogFormVisible" width="1000" >
<el-tabs :tab-position="tabPosition"> <el-tabs v-model="funsel" :tab-position="tabPosition">
<el-tab-pane label="个人资料"> <el-tab-pane label="个人资料" :name="true">
<el-form :model="userinfo"> <el-form :model="userinfo">
<el-form-item label="登录名：" label-width="140px"> <el-form-item label="登录名：" label-width="140px">
<el-input v-model="userinfo.userName"/> <el-input v-model="userinfo.userName"/>
...@@ -215,9 +215,6 @@ ...@@ -215,9 +215,6 @@
<el-form-item label="真实姓名：" label-width="140px"> <el-form-item label="真实姓名：" label-width="140px">
<el-input v-model="userinfo.realName"/> <el-input v-model="userinfo.realName"/>
</el-form-item> </el-form-item>
<el-form-item label="密码：" label-width="140px">
<el-input v-model="password" type="password"/>
</el-form-item>
<el-form-item label="供热企业：" label-width="140px"> <el-form-item label="供热企业：" label-width="140px">
{{ showenterpriseName }} {{ showenterpriseName }}
</el-form-item> </el-form-item>
...@@ -247,18 +244,18 @@ ...@@ -247,18 +244,18 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="修改密码"> <el-tab-pane label="修改密码" :name="false">
<!-- <el-form :model="savepass"> <el-form :model="savepass">
<el-form-item label="原密码：" label-width="140px"> <el-form-item label="原密码：" label-width="140px">
<el-input v-model="savepass.userName" type="password"/> <el-input v-model="savepass.old" type="password"/>
</el-form-item> </el-form-item>
<el-form-item label="新密码：" label-width="140px"> <el-form-item label="新密码：" label-width="140px">
<el-input v-model="savepass.realName" type="password"/> <el-input v-model="savepass.new1" type="password"/>
</el-form-item> </el-form-item>
<el-form-item label="再次输入新密码：" label-width="140px"> <el-form-item label="再次输入新密码：" label-width="140px">
<el-input v-model="savepass" type="password"/> <el-input v-model="savepass.new2" type="password"/>
</el-form-item> </el-form-item>
</el-form> --> </el-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<template #footer> <template #footer>
...@@ -383,6 +380,7 @@ import { ...@@ -383,6 +380,7 @@ import {
import DataMenu from "../components/DataMenu.vue"; import DataMenu from "../components/DataMenu.vue";
import EventBus from "../utils/event-bus.js"; import EventBus from "../utils/event-bus.js";
import { ElNotification } from "element-plus"; import { ElNotification } from "element-plus";
import { fa } from "element-plus/es/locales.mjs";
//import {RoleEnum} from '../utils/enumData'; //import {RoleEnum} from '../utils/enumData';
var $this; var $this;
...@@ -773,7 +771,12 @@ export default defineComponent({ ...@@ -773,7 +771,12 @@ export default defineComponent({
const countid = ref(); const countid = ref();
const sta = ref(0); const sta = ref(0);
const consta = ref(0); const consta = ref(0);
const password = ref('fnoihfnoighaoiw'); const savepass = ref({
"old":"",
"new1":"",
"new2":""
})
//获取用户信息 //获取用户信息
function getuser() { function getuser() {
var user = store.getters.getUserInfo(); var user = store.getters.getUserInfo();
...@@ -868,8 +871,17 @@ export default defineComponent({ ...@@ -868,8 +871,17 @@ export default defineComponent({
}, 60 * 1000); // 每分钟执行一次 }, 60 * 1000); // 每分钟执行一次
//个人资料弹出框 //个人资料弹出框
const dialogFormVisible = ref(false)//个人资料弹出框显示隐藏 const funsel = ref(true);
var userinfo = ref(111); const dialogFormVisible = ref(false);//个人资料弹出框显示隐藏
var userinfo = ref();
var message = ref();
var retmess = ref();
const open = () => {
ElMessage({
message: message.value,
type: retmess.value?'success':'warning',
})
}
async function getuserdata(){ async function getuserdata(){
var user = store.getters.getUserInfo(); var user = store.getters.getUserInfo();
if (user) { if (user) {
...@@ -878,16 +890,34 @@ export default defineComponent({ ...@@ -878,16 +890,34 @@ export default defineComponent({
const useridInfo = reactive({"id":userId.value}); const useridInfo = reactive({"id":userId.value});
await http.post("/api/User/getData", useridInfo).then((result) => { await http.post("/api/User/getData", useridInfo).then((result) => {
userinfo.value = result.data; userinfo.value = result.data;
console.log(result)
}) })
} }
function updateuser(){ function updateuser(){
userinfo.value.updateNullFields = ""; userinfo.value.updateNullFields = "";
userinfo.value.enterpriseName = ""; userinfo.value.enterpriseName = "";
userinfo.value.token = ""; userinfo.value.token = "";
userinfo.value.roleId = roleId; if(funsel.value){
http.post("/api/User/save", userinfo.value).then((result) => { userinfo.value.roleId = roleId;
console.log(result) http.post("/api/User/save", userinfo.value).then((result) => {
}) message.value = result.message;
retmess.value = result.success;
open();
})
}else{
if(savepass.value.new1 !== savepass.value.new2){
message.value = "两次输入的密码不一致！";
retmess.value = false;
open();
return;
}
userinfo.value.password = savepass.value.new1;
http.post("/api/User/password", userinfo.value).then((result) => {
message.value = result.message;
retmess.value = result.success;
open();
})
}
} }
getuserdata(); getuserdata();
...@@ -926,7 +956,8 @@ export default defineComponent({ ...@@ -926,7 +956,8 @@ export default defineComponent({
leaveMenu, leaveMenu,
updateuser, updateuser,
showenterpriseName, showenterpriseName,
password savepass,
funsel,
}; };
}, },
methods: { methods: {
......
vite.config.js
View file @ 747a2bdd
import { defineConfig } from 'vite' import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue' import vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy'
// 导入path模块 // 导入path模块
import path from 'path' import path from 'path'
//import requireTransform from 'vite-plugin-require-transform' //import requireTransform from 'vite-plugin-require-transform'
...@@ -16,6 +17,9 @@ export default defineConfig({ ...@@ -16,6 +17,9 @@ export default defineConfig({
}, },
plugins: [ plugins: [
[vue()], [vue()],
legacy({
targets:['defaults','not IE 11'],
}),
// requireTransform({ // requireTransform({
// fileRegex: /.js$|.vue$/, // fileRegex: /.js$|.vue$/,
// }) // })
......
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