Skip to content

W
web-project
Commit 2123d02a authored by 王亚晖's avatar 王亚晖
Browse files
Options

换热站远程控制

parent 87c753b3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4396 additions and 984 deletions
node_modules/.vite/deps/_metadata.json
View file @ 2123d02a
......@@ -2,127 +2,133 @@
"hash": "a3bf35f5",
"configHash": "2effb732",
"lockfileHash": "1020ca60",
"browserHash": "12c911ce",
"browserHash": "c8c3c18c",
"optimized": {
"@amap/amap-jsapi-loader": {
"src": "../../@amap/amap-jsapi-loader/dist/index.js",
"file": "@amap_amap-jsapi-loader.js",
"fileHash": "ded453c7",
"fileHash": "d42d438d",
"needsInterop": true
},
"@element-plus/icons-vue": {
"src": "../../@element-plus/icons-vue/dist/index.js",
"file": "@element-plus_icons-vue.js",
"fileHash": "4b53b9e4",
"fileHash": "baef5005",
"needsInterop": false
},
"@kyvg/vue3-notification": {
"src": "../../@kyvg/vue3-notification/dist/index.es.js",
"file": "@kyvg_vue3-notification.js",
"fileHash": "e546232c",
"fileHash": "383f2fd6",
"needsInterop": false
},
"@vue/reactivity": {
"src": "../../@vue/reactivity/dist/reactivity.esm-bundler.js",
"file": "@vue_reactivity.js",
"fileHash": "7e68d47b",
"fileHash": "55b6ad91",
"needsInterop": false
},
"axios": {
"src": "../../axios/index.js",
"file": "axios.js",
"fileHash": "8b719b07",
"fileHash": "9992cd5a",
"needsInterop": false
},
"echarts": {
"src": "../../echarts/index.js",
"file": "echarts.js",
"fileHash": "4995ca74",
"fileHash": "c1c5414b",
"needsInterop": false
},
"element-plus": {
"src": "../../element-plus/es/index.mjs",
"file": "element-plus.js",
"fileHash": "d42a7c53",
"fileHash": "d20fb1c8",
"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": "619b2502",
"fileHash": "b66ad807",
"needsInterop": false
},
"file-saver": {
"src": "../../file-saver/dist/FileSaver.min.js",
"file": "file-saver.js",
"fileHash": "98c4e4bf",
"fileHash": "1060b38d",
"needsInterop": true
},
"html2canvas": {
"src": "../../html2canvas/dist/html2canvas.esm.js",
"file": "html2canvas.js",
"fileHash": "ed6a0bc2",
"fileHash": "6d3c0050",
"needsInterop": false
},
"jquery": {
"src": "../../jquery/dist/jquery.js",
"file": "jquery.js",
"fileHash": "25007889",
"fileHash": "d14e6f78",
"needsInterop": true
},
"jsencrypt": {
"src": "../../jsencrypt/lib/index.js",
"file": "jsencrypt.js",
"fileHash": "561b900d",
"fileHash": "bb37f250",
"needsInterop": false
},
"jspdf": {
"src": "../../jspdf/dist/jspdf.es.min.js",
"file": "jspdf.js",
"fileHash": "552b9f4d",
"fileHash": "737a71c5",
"needsInterop": false
},
"mitt": {
"src": "../../mitt/dist/mitt.mjs",
"file": "mitt.js",
"fileHash": "ae37024a",
"fileHash": "344dd8cb",
"needsInterop": false
},
"vue": {
"src": "../../vue/dist/vue.runtime.esm-bundler.js",
"file": "vue.js",
"fileHash": "3367b94c",
"fileHash": "187234b1",
"needsInterop": false
},
"vue-router": {
"src": "../../vue-router/dist/vue-router.mjs",
"file": "vue-router.js",
"fileHash": "c22b29e9",
"fileHash": "031634ec",
"needsInterop": false
},
"vue3-print-nb": {
"src": "../../vue3-print-nb/dist/vue3-print-nb.es.js",
"file": "vue3-print-nb.js",
"fileHash": "a54ca526",
"fileHash": "0f1272c6",
"needsInterop": false
},
"vue3-smooth-scroll": {
"src": "../../vue3-smooth-scroll/dist/vue-smooth-scroll.min.js",
"file": "vue3-smooth-scroll.js",
"fileHash": "864c8004",
"fileHash": "01116be9",
"needsInterop": true
},
"vuex": {
"src": "../../vuex/dist/vuex.esm-bundler.js",
"file": "vuex.js",
"fileHash": "3e231eb0",
"fileHash": "da34bb30",
"needsInterop": false
},
"xlsx-js-style": {
"src": "../../xlsx-js-style/dist/xlsx.min.js",
"file": "xlsx-js-style.js",
"fileHash": "46eaef8f",
"fileHash": "e60a2e2d",
"needsInterop": true
},
"element-plus/es/locale/index": {
"src": "../../element-plus/es/locale/index.mjs",
"file": "element-plus_es_locale_index.js",
"fileHash": "ec3d362d",
"needsInterop": false
}
},
"chunks": {
......@@ -135,11 +141,14 @@
"index.es-YZCZVYIJ": {
"file": "index__es-YZCZVYIJ.js"
},
"chunk-NNO57RI4": {
"file": "chunk-NNO57RI4.js"
},
"chunk-D7ZASVPN": {
"file": "chunk-D7ZASVPN.js"
},
"chunk-NNO57RI4": {
"file": "chunk-NNO57RI4.js"
"chunk-KUPSCFII": {
"file": "chunk-KUPSCFII.js"
},
"chunk-6DBZPQPP": {
"file": "chunk-6DBZPQPP.js"
......
node_modules/.vite/deps/element-plus.js
View file @ 2123d02a
......@@ -42,6 +42,9 @@ import {
zoom_in_default,
zoom_out_default
} from "./chunk-NNO57RI4.js";
import {
English
} from "./chunk-KUPSCFII.js";
import {
Comment,
Fragment,
......@@ -10370,183 +10373,6 @@ var useFocus = (el) => {
};
};
// node_modules/element-plus/es/locale/lang/en.mjs
var English = {
name: "en",
el: {
breadcrumb: {
label: "Breadcrumb"
},
colorpicker: {
confirm: "OK",
clear: "Clear",
defaultLabel: "color picker",
description: "current color is {color}. press enter to select a new color."
},
datepicker: {
now: "Now",
today: "Today",
cancel: "Cancel",
clear: "Clear",
confirm: "OK",
dateTablePrompt: "Use the arrow keys and enter to select the day of the month",
monthTablePrompt: "Use the arrow keys and enter to select the month",
yearTablePrompt: "Use the arrow keys and enter to select the year",
selectedDate: "Selected date",
selectDate: "Select date",
selectTime: "Select time",
startDate: "Start Date",
startTime: "Start Time",
endDate: "End Date",
endTime: "End Time",
prevYear: "Previous Year",
nextYear: "Next Year",
prevMonth: "Previous Month",
nextMonth: "Next Month",
year: "",
month1: "January",
month2: "February",
month3: "March",
month4: "April",
month5: "May",
month6: "June",
month7: "July",
month8: "August",
month9: "September",
month10: "October",
month11: "November",
month12: "December",
week: "week",
weeks: {
sun: "Sun",
mon: "Mon",
tue: "Tue",
wed: "Wed",
thu: "Thu",
fri: "Fri",
sat: "Sat"
},
weeksFull: {
sun: "Sunday",
mon: "Monday",
tue: "Tuesday",
wed: "Wednesday",
thu: "Thursday",
fri: "Friday",
sat: "Saturday"
},
months: {
jan: "Jan",
feb: "Feb",
mar: "Mar",
apr: "Apr",
may: "May",
jun: "Jun",
jul: "Jul",
aug: "Aug",
sep: "Sep",
oct: "Oct",
nov: "Nov",
dec: "Dec"
}
},
inputNumber: {
decrease: "decrease number",
increase: "increase number"
},
select: {
loading: "Loading",
noMatch: "No matching data",
noData: "No data",
placeholder: "Select"
},
dropdown: {
toggleDropdown: "Toggle Dropdown"
},
cascader: {
noMatch: "No matching data",
loading: "Loading",
placeholder: "Select",
noData: "No data"
},
pagination: {
goto: "Go to",
pagesize: "/page",
total: "Total {total}",
pageClassifier: "",
page: "Page",
prev: "Go to previous page",
next: "Go to next page",
currentPage: "page {pager}",
prevPages: "Previous {pager} pages",
nextPages: "Next {pager} pages",
deprecationWarning: "Deprecated usages detected, please refer to the el-pagination documentation for more details"
},
dialog: {
close: "Close this dialog"
},
drawer: {
close: "Close this dialog"
},
messagebox: {
title: "Message",
confirm: "OK",
cancel: "Cancel",
error: "Illegal input",
close: "Close this dialog"
},
upload: {
deleteTip: "press delete to remove",
delete: "Delete",
preview: "Preview",
continue: "Continue"
},
slider: {
defaultLabel: "slider between {min} and {max}",
defaultRangeStartLabel: "pick start value",
defaultRangeEndLabel: "pick end value"
},
table: {
emptyText: "No Data",
confirmFilter: "Confirm",
resetFilter: "Reset",
clearFilter: "All",
sumText: "Sum"
},
tour: {
next: "Next",
previous: "Previous",
finish: "Finish"
},
tree: {
emptyText: "No Data"
},
transfer: {
noMatch: "No matching data",
noData: "No data",
titles: ["List 1", "List 2"],
filterPlaceholder: "Enter keyword",
noCheckedFormat: "{total} items",
hasCheckedFormat: "{checked}/{total} checked"
},
image: {
error: "FAILED"
},
pageHeader: {
title: "Back"
},
popconfirm: {
confirmButtonText: "Yes",
cancelButtonText: "No"
},
carousel: {
leftArrow: "Carousel arrow left",
rightArrow: "Carousel arrow right",
indicator: "Carousel switch to index {index}"
}
}
};
// node_modules/element-plus/es/hooks/use-locale/index.mjs
var buildTranslator = (locale) => (path, option) => translate(path, option, unref(locale));
var translate = (path, option, locale) => get_default(locale, path, path).replace(/\{(\w+)\}/g, (_2, key) => {
node_modules/.vite/deps/element-plus.js.map
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/CurveControl.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/HeatControl.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/HolidayControl.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/LimitControl.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/NightControl.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/NightFrequency.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/OutdoorTempControl.vue deleted 100644 → 0
View file @ 87c753b3
<template>
室外温度控制参数组
<el-table>
</el-table>
</template>
\ No newline at end of file
src/components/Remote/SecTempControl.vue
View file @ 2123d02a
This diff is collapsed.
src/components/Remote/TransferRegControl.vue
View file @ 2123d02a
......@@ -55,12 +55,6 @@
<el-icon v-if="row.transferStatus === 3"><Connection color="rgb(255,0,0)"/></el-icon>
</template>
</el-table-column>
<!-- <el-table-column fixed="right" label="操作" width="100px">
<template #default="{ row }">
<el-button link type="primary" :isLoading="isLoading" size="small" @click="ReadStatus(row)">读取</el-button>
<el-button link type="primary" :isLoading="isLoading" :disabled="row.isDisabled" size="small" @click="WriteStatus(row)">写入</el-button>
</template>
</el-table-column> -->
</el-table>
<div :style="{ height: tableHeight + 'px', paddingTop: 10 + 'px' }" style="width: 100%; margin: 0 5px; display:flex; flex-direction: column; align-items: center; vertical-align: top;">
<h3 >{{ forms.transferName }}</h3>
......@@ -242,6 +236,10 @@
ElMessage.warning("请勾选需要远程控制的换热站！");
return;
}
if(forms.isDisabled === true){
ElMessage.error(forms.transferName +" 先读取后写入");
return;
}
myIndeterminate.value = !myIndeterminate.value;
progress.value=1;
isLoading.value = true;
......@@ -261,7 +259,6 @@
count=count+1;
progress.value = (count/total*100).toFixed(2);
}
}
isLoading.value = false;
myIndeterminate.value = !myIndeterminate.value;
......@@ -305,55 +302,59 @@
try{
//console.log("write row:"+element.transferName);
var writeValue = "";
if(forms.ecv1OpeningSet != null){
if(forms.ecv1OpeningSet != null && forms.ecv1OpeningSet != ""){
element.ecv1OpeningSet=forms.ecv1OpeningSet;
writeValue +="Ecv1OpeningSet:"+forms.ecv1OpeningSet + ";";
}
if(forms.ecv2OpeningSet != null){
if(forms.ecv2OpeningSet != null && forms.ecv2OpeningSet != ""){
element.ecv2OpeningSet=forms.ecv2OpeningSet;
writeValue +="Ecv2OpeningSet:"+forms.ecv2OpeningSet + ";";
}
if(forms.ecv3OpeningSet != null){
if(forms.ecv3OpeningSet != null && forms.ecv3OpeningSet != ""){
element.ecv3OpeningSet=forms.ecv3OpeningSet;
writeValue +="Ecv3OpeningSet:"+forms.ecv3OpeningSet + ";";
}
if(forms.ecv4OpeningSet != null){
if(forms.ecv4OpeningSet != null && forms.ecv4OpeningSet != ""){
element.ecv4OpeningSet=forms.ecv4OpeningSet;
writeValue +="Ecv4OpeningSet:"+forms.ecv4OpeningSet + ";";
}
if(forms.criclePump1FreqGiven != null){
if(forms.criclePump1FreqGiven != null && forms.criclePump1FreqGiven != ""){
element.criclePump1FreqGiven=forms.criclePump1FreqGiven;
writeValue +="CriclePump1FreqGiven:"+forms.criclePump1FreqGiven + ";";
}
if(forms.criclePump2FreqGiven != null){
if(forms.criclePump2FreqGiven != null && forms.criclePump2FreqGiven != ""){
element.criclePump2FreqGiven=forms.criclePump2FreqGiven;
writeValue +="CriclePump2FreqGiven:"+forms.criclePump2FreqGiven + ";";
}
if(forms.criclePump3FreqGiven != null){
if(forms.criclePump3FreqGiven != null && forms.criclePump3FreqGiven != ""){
element.criclePump3FreqGiven=forms.criclePump3FreqGiven;
writeValue +="CriclePump3FreqGiven:"+forms.criclePump3FreqGiven + ";";
}
if(forms.tempGainValue != null){
if(forms.tempGainValue != null && forms.tempGainValue != ""){
element.tempGainValue=forms.tempGainValue;
writeValue +="TempGainValue:"+forms.tempGainValue + ";";
}
if(forms.pressureDiffSetting != null){
if(forms.pressureDiffSetting != null && forms.pressureDiffSetting != ""){
element.pressureDiffSetting=forms.pressureDiffSetting;
writeValue +="PressureDiffSetting:"+forms.pressureDiffSetting + ";";
}
if(forms.waterBoxOpen != null){
if(forms.waterBoxOpen != null && forms.waterBoxOpen != ""){
element.waterBoxOpen=forms.waterBoxOpen;
writeValue +="WaterBoxOpen:"+forms.waterBoxOpen + ";";
}
if(forms.waterBoxClose != null){
if(forms.waterBoxClose != null && forms.waterBoxClose != ""){
element.waterBoxClose=forms.waterBoxClose;
writeValue +="WaterBoxClose:"+forms.waterBoxClose + ";";
}
if(forms.jdSecondInletTemp != null){
if(forms.jdSecondInletTemp != null && forms.jdSecondInletTemp != ""){
element.jdSecondInletTemp=forms.jdSecondInletTemp;
writeValue +="JDSecondInletTemp:"+forms.jdSecondInletTemp + ";";
}
if(writeValue === ''){
ElMessage.error(element.transferName +" 未获取到写入数据");
return;
}
//console.log(writeValue);
var result = await http.post('/api/remote/WriteTransfer', {"TransferId":element.transferId, "WriteValues": writeValue, "PanelType": 1});
if(result.success){
......
src/components/Remote/TransferStatusControl.vue
View file @ 2123d02a
......@@ -365,64 +365,68 @@
try{
console.log("write row:"+element);
var writeValue = "";
if(element.jdValue != null){
if(element.jdValue != null && element.jdValue != ""){
writeValue +="JDValue:"+element.jdValue + ";";
}
if(element.gainMode != null){
if(element.gainMode != null && element.gainMode != ""){
writeValue +="GainMode:"+element.gainMode + ";";
}
if(element.curveMode != null){
if(element.curveMode != null || element.curveMode != ""){
writeValue +="CurveMode:"+element.curveMode + ";";
}
if(element.criclePump1 != null){
if(element.criclePump1 != null || element.criclePump1 != ""){
writeValue +="CriclePump1:"+element.criclePump1 + ";";
}
if(element.criclePump2 != null){
if(element.criclePump2 != null || element.criclePump2 != ""){
writeValue +="CriclePump2:"+element.criclePump2 + ";";
}
if(element.pump3 != null){
if(element.pump3 != null || element.pump3 != ""){
writeValue +="Pump3:"+element.pump3 + ";";
}
if(element.pump4 != null){
if(element.pump4 != null|| element.pump4 != ""){
writeValue +="Pump4:"+element.pump4 + ";";
}
if(element.replenishingPump != null){
if(element.replenishingPump != null || element.replenishingPump != ""){
writeValue +="ReplenishingPump:"+element.replenishingPump + ";";
}
if(element.secPump1 != null){
if(element.secPump1 != null || element.secPump1 != ""){
writeValue +="SecPump1:"+element.secPump1 + ";";
}
if(element.secPump2 != null){
if(element.secPump2 != null || element.secPump2 != ""){
writeValue +="SecPump2:"+element.secPump2 + ";";
}
if(element.evc1AutoOrManual != null){
if(element.evc1AutoOrManual != null || element.evc1AutoOrManual != ""){
writeValue +="Evc1AutoOrManual:"+element.evc1AutoOrManual + ";";
}
if(element.evc2AutoOrManual != null){
if(element.evc2AutoOrManual != null || element.evc2AutoOrManual != ""){
writeValue +="Evc2AutoOrManual:"+element.evc2AutoOrManual + ";";
}
if(element.evc3AutoOrManual != null){
if(element.evc3AutoOrManual != null || element.evc3AutoOrManual != ""){
writeValue +="Evc3AutoOrManual:"+element.evc3AutoOrManual + ";";
}
if(element.evc4AutoOrManual != null){
if(element.evc4AutoOrManual != null || element.evc4AutoOrManual != ""){
writeValue +="Evc4AutoOrManual:"+element.evc4AutoOrManual + ";";
}
if(element.criclePump1AutoOrManual != null){
if(element.criclePump1AutoOrManual != null || element.criclePump1AutoOrManual != ""){
writeValue +="CriclePump1AutoOrManual:"+element.criclePump1AutoOrManual + ";";
}
if(element.criclePump2AutoOrManual != null){
if(element.criclePump2AutoOrManual != null || element.criclePump2AutoOrManual != ""){
writeValue +="CriclePump2AutoOrManual:"+element.criclePump2AutoOrManual + ";";
}
if(element.criclePump3AutoOrManual != null){
if(element.criclePump3AutoOrManual != null || element.criclePump3AutoOrManual != ""){
writeValue +="CriclePump3AutoOrManual:"+element.criclePump3AutoOrManual + ";";
}
if(element.criclePump4AutoOrManual != null){
if(element.criclePump4AutoOrManual != null || element.criclePump4AutoOrManual != ""){
writeValue +="CriclePump4AutoOrManual:"+element.criclePump4AutoOrManual + ";";
}
if(element.secCriclePumpAutoOrManual != null){
if(element.secCriclePumpAutoOrManual != null || element.secCriclePumpAutoOrManual != ""){
writeValue +="SecCriclePumpAutoOrManual:"+element.secCriclePumpAutoOrManual + ";";
}
console.log(element.secCriclePumpAutoOrManual);
if(writeValue === ''){
ElMessage.error(element.transferName +" 未获取到写入数据");
return;
}
//console.log(element.secCriclePumpAutoOrManual);
var result = await http.post('/api/remote/WriteTransfer', {"TransferId":element.transferId, "WriteValues": writeValue, "PanelType": 0});
if(result.success){
ElMessage.success(element.transferName +" "+ result.data);
......
src/components/Remote/WeatherControl.vue
View file @ 2123d02a
This diff is collapsed.
src/views/RemotePage/TransControlPage.vue
View file @ 2123d02a
......@@ -43,9 +43,6 @@
<el-tab-pane label="热量" v-if="isHeatControl">
<HeatControl :activeRadio="activeRadio"/>
</el-tab-pane>
<el-tab-pane label="室外温度控制" v-if="isOutdoorTempControl">
<OutdoorTempControl :activeRadio="activeRadio"/>
</el-tab-pane>
<el-tab-pane label="循环泵夜间降频" v-if="isNightFrequency">
<NightFrequency :activeRadio="activeRadio"/>
</el-tab-pane>
......@@ -78,7 +75,7 @@
import WeatherControl from '../../components/Remote/WeatherControl.vue';
import LimitControl from '../../components/Remote/LimitControl.vue';
import HeatControl from '../../components/Remote/HeatControl.vue';
import OutdoorTempControl from '../../components/Remote/OutdoorTempControl.vue';
//import OutdoorTempControl from '../../components/Remote/OutdoorTempControl.vue';
import NightFrequency from '../../components/Remote/NightFrequency.vue';
const radioTitle = ref('供热站');
......@@ -96,7 +93,6 @@
const isLimitControl = ref(false);
const isWinDirectionControl = ref(false);
const isHeatControl = ref(false);
const isOutdoorTempControl = ref(false);
const isNightFrequency = ref(false);
// const editableTabs = reactive([
......@@ -197,9 +193,6 @@
if(item.moduleCode ==="HeatControl"){
isHeatControl.value = true;
}
if(item.moduleCode ==="OutdoorTempControl"){
isOutdoorTempControl.value = true;
}
if(item.moduleCode ==="NightFrequency"){
isNightFrequency.value = true;
}
......
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