Commit 272867cc authored by 王亚晖's avatar 王亚晖

修改远程写入状态页

parent 100c3983
...@@ -22,7 +22,7 @@ if (!axios.defaults.baseURL.endsWith('/')) { ...@@ -22,7 +22,7 @@ if (!axios.defaults.baseURL.endsWith('/')) {
let ipAddress = axios.defaults.baseURL; let ipAddress = axios.defaults.baseURL;
axios.interceptors.request.use((config) => { axios.interceptors.request.use((config) => {
config.baseURL = store.getters.getSERVEICE(); config.baseURL = store.getters.getSERVEICE();
console.log(config.baseURL); // console.log(config.baseURL);
return config; return config;
}, (error) => { }, (error) => {
return Promise.reject(error); return Promise.reject(error);
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<el-table-column fixed="right" label="操作" width="100"> <el-table-column fixed="right" label="操作" width="100">
<template #default="{ row }"> <template #default="{ row }">
<el-button link type="primary" :isLoading="isLoading" size="small" @click="ReadStatus(row)">读取</el-button> <el-button link type="primary" :isLoading="isLoading" size="small" @click="ReadStatus(row)">读取</el-button>
<el-button link type="primary" size="small" @click="WriteStatus(row)">写入</el-button> <el-button link type="primary" :isLoading="isLoading" :disabled="row.isDisabled" size="small" @click="WriteStatus(row)">写入</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -333,6 +333,7 @@ ...@@ -333,6 +333,7 @@
element.criclePump3AutoOrManual = jobj.criclePump3AutoOrManual; element.criclePump3AutoOrManual = jobj.criclePump3AutoOrManual;
element.criclePump4AutoOrManual = jobj.criclePump4AutoOrManual; element.criclePump4AutoOrManual = jobj.criclePump4AutoOrManual;
element.secCriclePumpAutoOrManual = jobj.secCriclePumpAutoOrManual; element.secCriclePumpAutoOrManual = jobj.secCriclePumpAutoOrManual;
element.isDisabled = jobj.isDisabled;
//console.log("gainMode:"+jobj.gainMode); //console.log("gainMode:"+jobj.gainMode);
break; break;
} }
...@@ -343,36 +344,76 @@ ...@@ -343,36 +344,76 @@
} }
} }
async function WriteStation(element){ async function WriteStation(element){
try{
console.log("write row:"+element); console.log("write row:"+element);
var writeValue = ""; var writeValue = "";
writeValue +="jdValue:"+element.jdValue if(element.jdValue != null){
element.jdValue = jobj.; writeValue +="jdValue:"+element.jdValue + ";";
elejdValuement.gainMode = jobj.gainMode; }
element.weatherMode = jobj.weatherMode; if(element.gainMode != null){
element.curveMode = jobj.curveMode; writeValue +="gainMode:"+element.gainMode + ";";
element.criclePump1 = jobj.criclePump1; }
element.criclePump2 = jobj.criclePump2; if(element.curveMode != null){
element.pump3 = jobj.pump3; writeValue +="curveMode:"+element.curveMode + ";";
element.pump4 = jobj.pump4; }
element.replenishingPump = jobj.replenishingPump; if(element.criclePump1 != null){
element.secPump1 = jobj.secPump1; writeValue +="criclePump1:"+element.criclePump1 + ";";
element.secPump2 = jobj.secPump2; }
element.evc1AutoOrManual = jobj.evc1AutoOrManual; if(element.criclePump2 != null){
element.evc2AutoOrManual = jobj.evc2AutoOrManual; writeValue +="criclePump2:"+element.criclePump2 + ";";
element.evc3AutoOrManual = jobj.evc3AutoOrManual; }
element.evc4AutoOrManual = jobj.evc4AutoOrManual; if(element.pump3 != null){
element.criclePump1AutoOrManual = jobj.criclePump1AutoOrManual; writeValue +="pump3:"+element.pump3 + ";";
element.criclePump2AutoOrManual = jobj.criclePump2AutoOrManual; }
element.criclePump3AutoOrManual = jobj.criclePump3AutoOrManual; if(element.pump4 != null){
element.criclePump4AutoOrManual = jobj.criclePump4AutoOrManual; writeValue +="pump4:"+element.pump4 + ";";
element.secCriclePumpAutoOrManual = jobj.secCriclePumpAutoOrManual; }
if(element.replenishingPump != null){
writeValue +="replenishingPump:"+element.replenishingPump + ";";
}
if(element.replenishingPump != null){
writeValue +="secPump1:"+element.secPump1 + ";";
}
if(element.replenishingPump != null){
writeValue +="secPump2:"+element.secPump2 + ";";
}
if(element.replenishingPump != null){
writeValue +="evc1AutoOrManual:"+element.evc1AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="evc2AutoOrManual:"+element.evc2AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="evc3AutoOrManual:"+element.evc3AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="evc4AutoOrManual:"+element.evc4AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="criclePump1AutoOrManual:"+element.criclePump1AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="criclePump2AutoOrManual:"+element.criclePump2AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="criclePump3AutoOrManual:"+element.criclePump3AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="criclePump4AutoOrManual:"+element.criclePump4AutoOrManual + ";";
}
if(element.replenishingPump != null){
writeValue +="secCriclePumpAutoOrManual:"+element.secCriclePumpAutoOrManual + ";";
}
var result = await http.post('/api/remote/WriteTransferStatus', value); var result = await http.post('/api/remote/WriteTransferStatus', {"TransferId":element.transferId, "WriteValues": writeValue});
if(result.success){ if(result.success){
ElMessage.success(result.message); ElMessage.success(result.message);
}else{ }else{
ElMessage.error(result.message); ElMessage.error(result.message);
} }
}catch(error){
ElMessage.error(error.message);
}
} }
function setCellStyle({ row, column, rowIndex, columnIndex }) { function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {}; let css_color = {};
......
...@@ -247,7 +247,7 @@ async function fetchClientIp() { ...@@ -247,7 +247,7 @@ async function fetchClientIp() {
store.commit('setSERVEICE', data.ip); store.commit('setSERVEICE', data.ip);
//http.ipAddress = store.getters.getSERVEICE; //http.ipAddress = store.getters.getSERVEICE;
console.log("changeip:" + clientIp.value + " "); //console.log("changeip:" + clientIp.value + " ");
getPicture(); getPicture();
} catch (error) { } catch (error) {
clientIp.value = '获取失败'; clientIp.value = '获取失败';
...@@ -258,7 +258,7 @@ async function fetchClientIp() { ...@@ -258,7 +258,7 @@ async function fetchClientIp() {
async function getPicture() { async function getPicture() {
try { try {
var serverIP = localStorage.getItem("SERVEICE"); var serverIP = localStorage.getItem("SERVEICE");
console.log(clientIp.value + " " + serverIP); // console.log(clientIp.value + " " + serverIP);
if (!serverIP || serverIP == null || serverIP == "") { if (!serverIP || serverIP == null || serverIP == "") {
await fetchClientIp(); await fetchClientIp();
} }
......
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