|
@@ -21,8 +21,8 @@
|
|
<el-option
|
|
<el-option
|
|
v-for="item in strResultFormatlist"
|
|
v-for="item in strResultFormatlist"
|
|
:key="item.id"
|
|
:key="item.id"
|
|
- :label="item.name"
|
|
|
|
- :value="item.value"
|
|
|
|
|
|
+ :label="item.code"
|
|
|
|
+ :value="item.code"
|
|
></el-option>
|
|
></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -32,8 +32,8 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="zongji">
|
|
<div class="zongji">
|
|
- <div class="zongjili img1">{{ warnin }}<span>个</span></div>
|
|
|
|
- <div class="zongjili img2">{{ warnin2 }}<span>个</span></div>
|
|
|
|
|
|
+ <div class="zongjili img1">{{ warnin2 }}<span>个</span></div>
|
|
|
|
+ <div class="zongjili img2">{{ warnin}}<span>个</span></div>
|
|
</div>
|
|
</div>
|
|
<div class="asides_content">
|
|
<div class="asides_content">
|
|
<div class="jc_content tablecolor">
|
|
<div class="jc_content tablecolor">
|
|
@@ -209,7 +209,7 @@ const job = ref({
|
|
cocodes: "", //物理属性code逗号分隔
|
|
cocodes: "", //物理属性code逗号分隔
|
|
});
|
|
});
|
|
const formInline = ref({
|
|
const formInline = ref({
|
|
- region: "shanghai",
|
|
|
|
|
|
+ region: "Height",
|
|
});
|
|
});
|
|
|
|
|
|
const tableData =ref( [
|
|
const tableData =ref( [
|
|
@@ -241,7 +241,7 @@ onMounted(() => {
|
|
// myChart.resize();
|
|
// myChart.resize();
|
|
|
|
|
|
// };
|
|
// };
|
|
-
|
|
|
|
|
|
+fcon.step=count.value;
|
|
});
|
|
});
|
|
const fcon = createFireControl();
|
|
const fcon = createFireControl();
|
|
// 检测点的结果获取
|
|
// 检测点的结果获取
|
|
@@ -256,6 +256,7 @@ console.log(props.classradio);
|
|
// vtkmodel.clearModeAddJg();
|
|
// vtkmodel.clearModeAddJg();
|
|
// vtkGridRead()
|
|
// vtkGridRead()
|
|
readJob();
|
|
readJob();
|
|
|
|
+ console.log(666666666)
|
|
|
|
|
|
}
|
|
}
|
|
function regionchange(val) {
|
|
function regionchange(val) {
|
|
@@ -276,7 +277,7 @@ function regionchange(val) {
|
|
danwei.value = key + value;
|
|
danwei.value = key + value;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- getMonitor();
|
|
|
|
|
|
+ //getMonitor();
|
|
vtkShow();
|
|
vtkShow();
|
|
}
|
|
}
|
|
//获取任务信息
|
|
//获取任务信息
|
|
@@ -285,6 +286,7 @@ const params = {
|
|
transCode: "D10017",
|
|
transCode: "D10017",
|
|
aid: aid.value,
|
|
aid: aid.value,
|
|
};
|
|
};
|
|
|
|
+console.log(111112222233343433+1)
|
|
await request(params)
|
|
await request(params)
|
|
.then((res) => {
|
|
.then((res) => {
|
|
if (res.returnCode == "000000000") {
|
|
if (res.returnCode == "000000000") {
|
|
@@ -292,14 +294,11 @@ await request(params)
|
|
|
|
|
|
if(res.state=='1'){
|
|
if(res.state=='1'){
|
|
// vtkmodel.clearModeAddJg(); //隐藏模版显示结果
|
|
// vtkmodel.clearModeAddJg(); //隐藏模版显示结果
|
|
-
|
|
|
|
- // monitor.value = true;
|
|
|
|
job.value = res;
|
|
job.value = res;
|
|
-
|
|
|
|
getMonitor();
|
|
getMonitor();
|
|
- // vtkmodel.clearModeAddJg();
|
|
|
|
- // reddate(new Date());
|
|
|
|
- // vtkGridRead();
|
|
|
|
|
|
+ vtkmodel.clearModeAddJg();
|
|
|
|
+ reddate(new Date());
|
|
|
|
+ vtkGridRead();
|
|
|
|
|
|
endtime.value= Number(res.totaltime)/Number(res.reportstep);
|
|
endtime.value= Number(res.totaltime)/Number(res.reportstep);
|
|
console.log( endtime.value);
|
|
console.log( endtime.value);
|
|
@@ -376,7 +375,8 @@ async function getMonitor() {
|
|
// { prop: 'state', label: '操作' },
|
|
// { prop: 'state', label: '操作' },
|
|
// ...更多表头数据
|
|
// ...更多表头数据
|
|
}
|
|
}
|
|
- console.log( strResultFormatlist.value);
|
|
|
|
|
|
+ strResultFormatlist.value=res.codes;
|
|
|
|
+ console.log(res);
|
|
dynamicHeaders.value=headertable;
|
|
dynamicHeaders.value=headertable;
|
|
let warning=[];//一级警告
|
|
let warning=[];//一级警告
|
|
let warning2=[];//二级警告
|
|
let warning2=[];//二级警告
|
|
@@ -599,6 +599,7 @@ const lineChart=()=>{
|
|
{
|
|
{
|
|
type: 'value',
|
|
type: 'value',
|
|
minInterval:1,
|
|
minInterval:1,
|
|
|
|
+ splitNumber: 5,
|
|
max: 700,
|
|
max: 700,
|
|
splitLine: {
|
|
splitLine: {
|
|
show: true,
|
|
show: true,
|