Commit f08ff3d0 authored by wangjc's avatar wangjc

数据修改

parent 10355965
...@@ -67,7 +67,9 @@ ...@@ -67,7 +67,9 @@
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import store from "../../store/index"; import store from "../../store/index";
import http from '../../api/http'; import http from '../../api/http';
import {transferArtwork} from '@/dataJson/exchangeStation/processDiagram/processDiagram'
import {weatherReal} from '@/dataJson/exchangeStation/realData/realData'
import {forEach} from "lodash";
const props = defineProps(['id','refreshTime']); const props = defineProps(['id','refreshTime']);
console.log(props); console.log(props);
const route = useRoute() const route = useRoute()
...@@ -169,22 +171,31 @@ function getEnterprise(){ ...@@ -169,22 +171,31 @@ function getEnterprise(){
} }
//获取气象实时数据 //获取气象实时数据
function getweather(){ /* function getweather(){
http.post("/api/weather/Real",SupplyId.value).then((result) => { http.post("/api/weather/Real",SupplyId.value).then((result) => {
temperature.value = result.data["temperature"]; temperature.value = result.data["temperature"];
wind.value = result.data["wind"]; wind.value = result.data["wind"];
illumination.value = result.data["illumination"]; illumination.value = result.data["illumination"];
humidity.value = result.data["humidity"]; humidity.value = result.data["humidity"];
}) })
} }*/
function getweather(){
temperature.value = weatherReal["temperature"];
wind.value = weatherReal["wind"];
illumination.value = weatherReal["illumination"];
humidity.value = weatherReal["humidity"];
}
getTransferData(); getTransferData();
//获取换热站实时数据 //获取换热站实时数据
function getTransferData(){ function getTransferData(){
http.post("/api/transfer/Artwork", id.value).then((result) => { /* http.post("/api/transfer/Artwork", id.value).then((result) => {
console.log(result); console.log(result);
result.data.forEach(element =>{ result.data.forEach(element =>{
transferData[element.enName] = element.paramValue; transferData[element.enName] = element.paramValue;
})*/
forEach(transferArtwork, element =>{
transferData[element.enName] = element.paramValue;
}) })
SecondInTemp.value = transferData["SecondInTemp"]; SecondInTemp.value = transferData["SecondInTemp"];
SecondInPressure.value = transferData["SecondInPressure"]; SecondInPressure.value = transferData["SecondInPressure"];
...@@ -218,7 +229,6 @@ function getEnterprise(){ ...@@ -218,7 +229,6 @@ function getEnterprise(){
GroundWaterReplenishmentSum.value = transferData["GroundWaterReplenishmentSum"]; GroundWaterReplenishmentSum.value = transferData["GroundWaterReplenishmentSum"];
PowerConsume.value = transferData["PowerConsume"]; PowerConsume.value = transferData["PowerConsume"];
})
} }
setInterval(() => { setInterval(() => {
getTransferData(); getTransferData();
......
export const patrolGetPatrolHisData={
"rowCount": 6385,
"dataInfoList": [
{
"index": 1,
"transferName": "观溪庭院观溪",
"realName": "",
"patrolTime": "2025-01-02 18:08:33"
},
{
"index": 2,
"transferName": "观溪庭院观溪",
"realName": "",
"patrolTime": "2025-01-02 11:27:04"
},
{
"index": 3,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-02 11:33:09"
},
{
"index": 4,
"transferName": "兴安里西北区 ",
"realName": "",
"patrolTime": "2025-01-02 12:23:12"
},
{
"index": 5,
"transferName": "观溪庭院海钰园",
"realName": "",
"patrolTime": "2025-01-03 08:34:40"
},
{
"index": 6,
"transferName": "观溪庭院观溪",
"realName": "",
"patrolTime": "2025-01-02 18:16:43"
},
{
"index": 7,
"transferName": "云岚庭院低区",
"realName": "",
"patrolTime": "2025-01-03 08:28:33"
},
{
"index": 8,
"transferName": "兴安里西北区 ",
"realName": "",
"patrolTime": "2025-01-02 13:46:22"
},
{
"index": 9,
"transferName": "观溪庭院海钰园",
"realName": "",
"patrolTime": "2025-01-02 14:18:48"
},
{
"index": 10,
"transferName": "观溪庭院海钰园",
"realName": "",
"patrolTime": "2025-01-02 19:03:36"
},
{
"index": 11,
"transferName": "云岚庭院低区",
"realName": "",
"patrolTime": "2025-01-03 11:04:28"
},
{
"index": 12,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-02 14:13:27"
},
{
"index": 13,
"transferName": "观溪庭院观溪",
"realName": "",
"patrolTime": "2025-01-02 18:56:20"
},
{
"index": 14,
"transferName": "逸盛苑低区",
"realName": "",
"patrolTime": "2025-01-02 21:16:52"
},
{
"index": 15,
"transferName": "逸盛苑低区",
"realName": "",
"patrolTime": "2025-01-03 02:54:40"
},
{
"index": 16,
"transferName": "云岚庭院低区",
"realName": "",
"patrolTime": "2025-01-03 04:52:05"
},
{
"index": 17,
"transferName": "云岚庭院低区",
"realName": "",
"patrolTime": "2025-01-02 19:47:57"
},
{
"index": 18,
"transferName": "云岚庭院低区",
"realName": "",
"patrolTime": "2025-01-03 04:03:17"
},
{
"index": 19,
"transferName": "逸盛苑低区",
"realName": "",
"patrolTime": "2025-01-02 13:10:32"
},
{
"index": 20,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-03 10:04:31"
},
{
"index": 21,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-03 04:18:27"
},
{
"index": 22,
"transferName": "观溪庭院海钰园",
"realName": "",
"patrolTime": "2025-01-03 04:46:57"
},
{
"index": 23,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-02 18:32:37"
},
{
"index": 24,
"transferName": "逸盛苑低区",
"realName": "",
"patrolTime": "2025-01-02 13:37:03"
},
{
"index": 25,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-02 20:00:31"
},
{
"index": 26,
"transferName": "观溪庭院海钰园",
"realName": "",
"patrolTime": "2025-01-02 11:27:04"
},
{
"index": 27,
"transferName": "兴安里西南区",
"realName": "",
"patrolTime": "2025-01-03 02:22:02"
},
{
"index": 28,
"transferName": "兴安里西北区 ",
"realName": "",
"patrolTime": "2025-01-03 01:46:01"
},
{
"index": 29,
"transferName": "观溪庭院海钰园",
"realName": "",
"patrolTime": "2025-01-02 21:16:52"
},
{
"index": 30,
"transferName": "云岚庭院低区",
"realName": "",
"patrolTime": "2025-01-02 12:57:23"
}
]
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -226,6 +226,7 @@ import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } ...@@ -226,6 +226,7 @@ import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError }
import DataForm from '../../components/DataForm.vue'; import DataForm from '../../components/DataForm.vue';
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import http from '../../api/http' import http from '../../api/http'
import {tigerTigerHeatUserGetName,tigerTigerHeatUserReal,tigerTigerHeatUserHis} from '@/dataJson/exchangeStation/hotUser/hotUser.js'
import store from "../../store/index"; import store from "../../store/index";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import { import {
...@@ -464,7 +465,7 @@ async function getHisData() { ...@@ -464,7 +465,7 @@ async function getHisData() {
//获得小区数据 //获得小区数据
async function getName() { async function getName() {
loading.value = true loading.value = true
await http.post('/api/tiger/TigerHeatUser/GetName').then((result) => { /* await http.post('/api/tiger/TigerHeatUser/GetName').then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
var list = []; var list = [];
...@@ -474,7 +475,15 @@ async function getName() { ...@@ -474,7 +475,15 @@ async function getName() {
}) })
setSelect(list) setSelect(list)
} }
})*/
//处理返回数据
var list = [];
//供热站--小区
tigerTigerHeatUserGetName.forEach(data => {
list.push({supplyName:data.supplyName,name:data.name});
}) })
setSelect(list)
loading.value = false loading.value = false
} }
......
...@@ -225,6 +225,7 @@ ...@@ -225,6 +225,7 @@
import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } from 'vue' import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import http from '../../api/http' import http from '../../api/http'
import {tigerTigerTapDataHis,tigerTapDataReal} from '@/dataJson/exchangeStation/valve/valve.js'
import store from "../../store/index"; import store from "../../store/index";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
// import { da } from 'element-plus/es/locale'; // import { da } from 'element-plus/es/locale';
...@@ -341,7 +342,13 @@ function disabledDate(thisdate){ ...@@ -341,7 +342,13 @@ function disabledDate(thisdate){
} }
//数据控制,根据isHisData的值决定数据控制逻辑,false为实时数据,true为历史数据 //数据控制,根据isHisData的值决定数据控制逻辑,false为实时数据,true为历史数据
var dataUrl = isHisData.value ? '/api/tiger/TigerTapData/His' : '/api/tiger/TigerTapData/Real'; //const dataUrl = isHisData.value ? tigerTigerTapDataHis : tigerTapDataReal;
if (isHisData.value){
var dataUrl=tigerTigerTapDataHis
}else {
dataUrl=tigerTapDataReal
}
var exportUrl= isHisData.value ? '/api/tiger/TigerTapData/HisExport' : '/api/tiger/TigerTapData/RealExport'; var exportUrl= isHisData.value ? '/api/tiger/TigerTapData/HisExport' : '/api/tiger/TigerTapData/RealExport';
function initTitle() { function initTitle() {
...@@ -408,7 +415,7 @@ async function changeData() { ...@@ -408,7 +415,7 @@ async function changeData() {
//实时数据初始化 //实时数据初始化
async function initReal() { async function initReal() {
dataUrl = '/api/tiger/TigerTapData/Real'; dataUrl = tigerTapDataReal;
exportUrl = '/api/tiger/TigerTapData/RealExport' exportUrl = '/api/tiger/TigerTapData/RealExport'
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
tableInfo.realData.length = 0; tableInfo.realData.length = 0;
...@@ -416,7 +423,7 @@ async function initReal() { ...@@ -416,7 +423,7 @@ async function initReal() {
} }
//历史数据初始化 //历史数据初始化
async function initHis() { async function initHis() {
dataUrl = '/api/tiger/TigerTapData/His'; dataUrl = tigerTigerTapDataHis;
exportUrl = '/api/tiger/TigerTapData/HisExport'; exportUrl = '/api/tiger/TigerTapData/HisExport';
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
tableInfo.hisData.length = 0; tableInfo.hisData.length = 0;
...@@ -426,7 +433,7 @@ async function initHis() { ...@@ -426,7 +433,7 @@ async function initHis() {
//获得数据 //获得数据
async function getRealData() { async function getRealData() {
loading.value = true loading.value = true
await http.post(dataUrl).then((result) => { /* await http.post(dataUrl).then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
tableInfo.realData = result.data; tableInfo.realData = result.data;
...@@ -434,13 +441,18 @@ async function getRealData() { ...@@ -434,13 +441,18 @@ async function getRealData() {
} else { } else {
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
} }
}) })*/
//处理返回数据
tableInfo.realData = dataUrl;
setshowData();
loading.value = false loading.value = false
} }
async function getHisData() { async function getHisData() {
loading.value = true loading.value = true
await http.post(dataUrl, { name: [], startTime: startTime.value, endTime: endTime.value, start: currentPage.value - 1, count: pageSize.value, sort: "" }).then((result) => { /* await http.post(dataUrl, { name: [], startTime: startTime.value, endTime: endTime.value, start: currentPage.value - 1, count: pageSize.value, sort: "" }).then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
// makeFormsTitle(result.data.title); // makeFormsTitle(result.data.title);
...@@ -450,7 +462,12 @@ async function getHisData() { ...@@ -450,7 +462,12 @@ async function getHisData() {
} else { } else {
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
} }
}) })*/
//处理返回数据
// makeFormsTitle(result.data.title);
tableInfo.hisData = dataUrl.dataInfoList;
total.value = dataUrl.rowCount;
setshowData();
loading.value = false loading.value = false
} }
...@@ -474,7 +491,7 @@ async function getName() { ...@@ -474,7 +491,7 @@ async function getName() {
//根据参数获得数据 //根据参数获得数据
async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) { async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) {
loading.value = true loading.value = true
await http.post(dataUrl, { name: name, startTime: start, endTime: end, start: startPage, count: pagesCount, sort: sort }).then((result) => { /* await http.post(dataUrl, { name: name, startTime: start, endTime: end, start: startPage, count: pagesCount, sort: sort }).then((result) => {
if (result.status === 0) { if (result.status === 0) {
//处理返回数据 //处理返回数据
// makeFormsTitle(result.data.title); // makeFormsTitle(result.data.title);
...@@ -486,7 +503,14 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) { ...@@ -486,7 +503,14 @@ async function getHisDataByInfo(name, start, end, startPage, pagesCount, sort) {
tableInfo.tableData.length = 0; tableInfo.tableData.length = 0;
total.value=0; total.value=0;
} }
}) })*/
//处理返回数据
// makeFormsTitle(result.data.title);
tableInfo.hisData = dataUrl.dataInfoList;
total.value = dataUrl.rowCount;
setshowData();
// makeFormsData(result.data.realData);
loading.value = false loading.value = false
} }
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, onMounted, onUnmounted } from 'vue'; import { ref, reactive, onMounted, onUnmounted } from 'vue';
import http from '../../api/http'; import http from '../../api/http';
import {patrolGetPatrolHisData} from '@/dataJson/exchangeStation/historyPatrol/historyPatrol'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import store from "../../store/index"; import store from "../../store/index";
import { getFileName } from '../../utils/utils'; import { getFileName } from '../../utils/utils';
...@@ -215,7 +216,7 @@ ...@@ -215,7 +216,7 @@
PatrolInfo.start = ((currentPage.value - 1) * pageSize.value) + 1; PatrolInfo.start = ((currentPage.value - 1) * pageSize.value) + 1;
PatrolInfo.count = pageSize.value - 1; PatrolInfo.count = pageSize.value - 1;
} }
http.post("/api/patrol/GetPatrolHisData", PatrolInfo).then((result) => { /* http.post("/api/patrol/GetPatrolHisData", PatrolInfo).then((result) => {
console.log(result.data); console.log(result.data);
console.log(PatrolInfo); console.log(PatrolInfo);
if(result.data !== null){ if(result.data !== null){
...@@ -227,8 +228,19 @@ ...@@ -227,8 +228,19 @@
total.value = 0; total.value = 0;
} }
loading.value = false; loading.value = false;
}); });*/
const result = patrolGetPatrolHisData;
if (result !== null) {
tableData.value = result.dataInfoList;
total.value = result.rowCount;
}
if (result === null || PatrolInfo.Id.length < 1) {
tableData.value = null;
total.value = 0;
} }
loading.value = false;
}
function setCellStyle({ row, column, rowIndex, columnIndex }) { function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {}; let css_color = {};
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
import { ref, reactive, onMounted, onUnmounted } from 'vue'; import { ref, reactive, onMounted, onUnmounted } from 'vue';
import http from '../../api/http'; import http from '../../api/http';
import store from "../../store/index"; import store from "../../store/index";
import {patrolGetPatrolTodeyData} from '@/dataJson/exchangeStation/todayPatrol/todayPatrol'
const options = reactive([]); const options = reactive([]);
const tableData = ref([]); const tableData = ref([]);
const tableHeight = ref(500); const tableHeight = ref(500);
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
//获取数据列表 //获取数据列表
function gettransfer() { function gettransfer() {
loading.value = true; loading.value = false;
http.post("/api/patrol/GetPatrolTodeyData", AlarmInfo.value).then((result) => { /* http.post("/api/patrol/GetPatrolTodeyData", AlarmInfo.value).then((result) => {
console.log(result.data); console.log(result.data);
if(result.data !== null){ if(result.data !== null){
tableData.value = result.data; tableData.value = result.data;
...@@ -121,7 +121,8 @@ ...@@ -121,7 +121,8 @@
tableData.value = null; tableData.value = null;
} }
loading.value = false; loading.value = false;
}); });*/
tableData.value=patrolGetPatrolTodeyData;
} }
function setCellStyle({ row, column, rowIndex, columnIndex }) { function setCellStyle({ row, column, rowIndex, columnIndex }) {
......
This diff is collapsed.
...@@ -361,6 +361,7 @@ import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } ...@@ -361,6 +361,7 @@ import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError }
import DataForm from '../../components/DataForm.vue'; import DataForm from '../../components/DataForm.vue';
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import http from '../../api/http' import http from '../../api/http'
import {statusTransfer} from '@/dataJson/exchangeStation/realStatus/realStatus.js'
import store from "../../store/index"; import store from "../../store/index";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import { import {
...@@ -599,7 +600,7 @@ function makeFormsData(realData) { ...@@ -599,7 +600,7 @@ function makeFormsData(realData) {
async function getForms(NenterpriseId, supplyIdList, transferIdList, pageIndex, pageCount, sortList) { async function getForms(NenterpriseId, supplyIdList, transferIdList, pageIndex, pageCount, sortList) {
// enterpriseId: NenterpriseId,supplyIdList:selectList,transferName:transferName, pageIndex: pageIndex, pageCount: pageCount,sortList:sortList // enterpriseId: NenterpriseId,supplyIdList:selectList,transferName:transferName, pageIndex: pageIndex, pageCount: pageCount,sortList:sortList
loading.value = true loading.value = true
await http.post('/api/status/transfer', { enterpriseId: NenterpriseId, supplyIdList: supplyIdList, transferIdList: transferIdList, pageIndex: pageIndex, pageCount: pageCount, sortList: sortList }).then((result) => { /* await http.post('/api/status/transfer', { enterpriseId: NenterpriseId, supplyIdList: supplyIdList, transferIdList: transferIdList, pageIndex: pageIndex, pageCount: pageCount, sortList: sortList }).then((result) => {
makeFormsTitle(result.data.title); makeFormsTitle(result.data.title);
titleData.value = result.data.title; titleData.value = result.data.title;
...@@ -607,7 +608,10 @@ async function getForms(NenterpriseId, supplyIdList, transferIdList, pageIndex, ...@@ -607,7 +608,10 @@ async function getForms(NenterpriseId, supplyIdList, transferIdList, pageIndex,
makeFormsData(result.data.realData); makeFormsData(result.data.realData);
// console.log(tableInfo) // console.log(tableInfo)
}) })*/
makeFormsTitle(statusTransfer.title)
titleData.value=statusTransfer.title
makeFormsData(statusTransfer.realData)
loading.value = false loading.value = false
} }
......
...@@ -67,6 +67,7 @@ import $ from 'jquery' ...@@ -67,6 +67,7 @@ import $ from 'jquery'
import { JSEncrypt } from 'jsencrypt' import { JSEncrypt } from 'jsencrypt'
import { WebControl } from '../../assets/script/video/web-control.esm.min.js' import { WebControl } from '../../assets/script/video/web-control.esm.min.js'
import { onActivated, onDeactivated } from 'vue' import { onActivated, onDeactivated } from 'vue'
import {videoGetVideoTable} from "@/dataJson/exchangeStation/videoMonitor/videoMonitor.js";
onActivated(()=>{ onActivated(()=>{
if(route.query.id){ if(route.query.id){
VideoInfo.value=route.query.id; VideoInfo.value=route.query.id;
...@@ -189,12 +190,13 @@ function getStats() { ...@@ -189,12 +190,13 @@ function getStats() {
//从数据库获得监控点信息 //从数据库获得监控点信息
function getVideoInfo() { function getVideoInfo() {
http.post('/api/video/GetVideoTable').then((result) => { /* http.post('/api/video/GetVideoTable').then((result) => {
//若获得视频列表,则存入 //若获得视频列表,则存入
if (result.data.count > 0) { if (result.data.count > 0) {
VideoInfo.videoList.push.apply(VideoInfo.videoList, result.data.dataTable); VideoInfo.videoList.push.apply(VideoInfo.videoList, result.data.dataTable);
} }
}) })*/
VideoInfo.videoList.push.apply(VideoInfo.videoList, videoGetVideoTable.dataTable)
} }
//页面初始化 //页面初始化
......
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