|
@@ -13,7 +13,7 @@
|
|
|
<div class="rg_content">
|
|
|
<div class="rg-padding">
|
|
|
<div class="he_pading color1 wusele">
|
|
|
- <el-form-item label="物理量:" v-if="props.classradio == 'Fire'">
|
|
|
+ <el-form-item label="物理量:" v-if="props.classradio == 'Fire'||props.classradio == 'Gass'">
|
|
|
<el-select
|
|
|
v-model="formInline.region"
|
|
|
@change="regionchange($event)"
|
|
@@ -293,9 +293,6 @@ myChart.clear();
|
|
|
readJob();
|
|
|
}
|
|
|
function regionchange(val) {
|
|
|
- console.log(val)
|
|
|
- console.log(11111)
|
|
|
- console.log(strResultFormatlist.value)
|
|
|
let newMap = new Map([
|
|
|
["Temperature", "(℃)"],
|
|
|
["Pressure", "(Pa)"],
|
|
@@ -331,7 +328,7 @@ await request(params)
|
|
|
if(res.state=='1'){
|
|
|
// vtkmodel.clearModeAddJg(); //隐藏模版显示结果
|
|
|
job.value = res;
|
|
|
- getMonitor();
|
|
|
+ getMonitor();
|
|
|
vtkmodel.clearModeAddJg();
|
|
|
reddate(new Date());
|
|
|
vtkGridRead();
|
|
@@ -396,13 +393,6 @@ async function getMonitor() {
|
|
|
for (let i = 0; i < res.codes.length; i++) {
|
|
|
cocode = res.codes[i];
|
|
|
let num=i+1
|
|
|
- console.log(cocode);
|
|
|
- // strResultFormatlist.value.push({
|
|
|
- // // id: i,
|
|
|
- // // name: res.codes[i].code,
|
|
|
- // value: cocode.code,
|
|
|
-
|
|
|
- // });
|
|
|
let newMap = new Map([
|
|
|
["Temperature", "(℃)"],
|
|
|
["Pressure", "(Pa)"],
|
|
@@ -443,23 +433,19 @@ async function getMonitor() {
|
|
|
}
|
|
|
// res.codes[i].code = key+value;
|
|
|
name = key+'\n'+value
|
|
|
- console.log(name)
|
|
|
+
|
|
|
}
|
|
|
});
|
|
|
- console.log(cocode);
|
|
|
strResultFormatlist.value.push({
|
|
|
id: i,
|
|
|
name: name,
|
|
|
value: cocode.code,
|
|
|
|
|
|
});
|
|
|
- console.log(res.codes)
|
|
|
headertable.push(
|
|
|
{ prop:'v'+num, label:name},
|
|
|
)
|
|
|
}
|
|
|
-
|
|
|
- // strResultFormatlist.value=res.codes;
|
|
|
dynamicHeaders.value=headertable;
|
|
|
let warning=[];//一级警告
|
|
|
let warning2=[];//二级警告
|
|
@@ -486,6 +472,7 @@ async function getMonitor() {
|
|
|
tableData.value=res.vals;
|
|
|
}
|
|
|
}) .catch((err) => {
|
|
|
+ tableData.value=[];
|
|
|
ElMessage.error(err.returnMsg);
|
|
|
});
|
|
|
}
|
|
@@ -811,7 +798,7 @@ function vtkScalarRead() {
|
|
|
watch(
|
|
|
newcount,
|
|
|
(newVal, oldVal) => {
|
|
|
-console.log("值改变了", newVal, oldVal);
|
|
|
+ console.log("值改变了", newVal, oldVal);
|
|
|
fcon.step = newVal;
|
|
|
getMonitor();
|
|
|
vtkScalarRead();
|