4.18

src/style/style.css

@@ -62,6 +62,24 @@ body,html{
     -ms-transform: rotate(30deg);
     transform-origin: 50% 50%;
   }
+  .zongji2{
+    display: flex;
+  }
+  .zongji2 .Firetile{
+    flex: 1;
+    font-size: 0.0625rem;
+  }
+  .zongji2 .Firetile span {
+color: #fff;
+  }
+  .zongji2 .Firetile .text{
+    color: #FF0000;
+    font-size: .1042rem;
+  }
+  .zongji2 .Firetile .text2{
+    color: #FF7A00 ;
+    font-size: .1042rem;
+  }
  .imgneon1 .el-collapse-item__header .el-icon svg path{
     display: none;
   }

src/view/index/first-left.vue

@@ -11,6 +11,26 @@
             </template>
             <div class="rg_content">
               <div class="rg-padding">
+                <div class="he_pading color1">
+              <el-form-item label="物理量:" v-if="props.classradio == 'Fire'">
+                <el-select
+                  v-model="formInline.region"
+                  @change="regionchange($event)"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in strResultFormatlist"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <div class="woter" v-else>
+                <span>物理量：</span>
+                <span>水位</span>
+              </div>
+            </div>
               <div class="zongji">
                 <div class="zongjili img1">{{ warnin }}<span>个</span></div>
                 <div class="zongjili img2">{{ warnin2 }}<span>个</span></div>
@@ -58,9 +78,9 @@
                 <div class="hedse">
               <el-icon class="iconimg1 Frame3" fit="contain"></el-icon>{{ jcname }}
             </div>
-            <div class="zongji" v-if="props.classradio=='Fire'">
-                <div class="zongjili"><span>温度（℃）：</span><span>{{ c}}</span></div>
-                <div class="zongjili"><span>压力（Pa）：</span><span>{{ pa }}</span></div>
+            <div class="zongji2" v-if="props.classradio=='Fire'">
+                <div class="Firetile" ><span>温度（℃）：</span><span class="text">{{ c}}</span></div>
+                <div class="Firetile"><span>压力（Pa）：</span><span class="text2">{{ pa }}</span></div>
               </div>
             <div class="echart">
             <div id="line" style="width: 1.526rem;height:1.03rem;"></div></div>
@@ -140,9 +160,10 @@ let tableHeight = ref(130);
 let playshow=ref(true);
 let suspendshow=ref(false);
 let showfalse=ref(false);
-let c=ref(null);
-let pa=ref(null);
+let c=ref("0");
+let pa=ref("30s");
 const isstop = ref(false);
+const strResultFormatlist = ref([]);
 let count=ref(1);
 let starttime = ref(1);
 let endtime = ref(60);
@@ -234,13 +255,32 @@ console.log(props.classradio);
   // getMonitor();
   // vtkmodel.clearModeAddJg();
   // vtkGridRead()
- // readJob()
+ readJob();
 
 }
+function regionchange(val) {
+  // console.log(val)
+  let newMap = new Map([
+    ["Temperature", "(℃)"],
+    ["Pressure", "(kg/s)"],
+    ["Pressure", "(kg/s)"],
+    ["CO2", "(%)"],
+    ["CO2", "(%)"],
+    ["H2S", "(%)"],
+    ["Flow", "(Pa)"],
+    ["Height", "m"],
+  ]);
+  newMap.forEach((value, key) => {
+    // console.log(key, value);
+    if (key == val) {
+      danwei.value = key + value;
+    }
+  });
+  getMonitor();
+  vtkShow();
+}
 //获取任务信息
 async function readJob() {
-
-
 const params = {
   transCode: "D10017",
   aid: aid.value,
@@ -249,13 +289,18 @@ await request(params)
   .then((res) => {
     if (res.returnCode == "000000000") {
       //成功
+    
       if(res.state=='1'){
       //  vtkmodel.clearModeAddJg(); //隐藏模版显示结果
-      monitor.value = true;
+   
+     // monitor.value = true;
       job.value = res;
-      vtkmodel.clearModeAddJg();
-      reddate(new Date());
-      vtkGridRead();
+     
+      getMonitor();
+      // vtkmodel.clearModeAddJg();
+      // reddate(new Date());
+      // vtkGridRead();
+  
       endtime.value= Number(res.totaltime)/Number(res.reportstep);
       console.log( endtime.value);
     }else if(res.state=='-1'){
@@ -287,7 +332,7 @@ await request(params)
 }
 //监测点数据获取
 async  function getMonitor() {
-
+  strResultFormatlist.value = [];
   const params = {
     transCode: "D10018",
     aid: aid.value,
@@ -295,11 +340,12 @@ async  function getMonitor() {
   };
   request(params)
     .then((res) => {
-      console.log()
+   
       if (res.returnCode == "000000000") {
         let headertable=[];
         //let s=0;
         // dynamicHeaders.value=res.codes;
+        console.log(res);
         for (let i = 0; i < res.codes.length; i++) {
           let num=i+1
           let newMap = new Map([
@@ -321,10 +367,16 @@ async  function getMonitor() {
           headertable.push(
             { prop:'v'+num, label: res.codes[i].code },
           )
+          // strResultFormatlist.value.push({
+          //     id: i,
+          //     name: codes.code,
+          //     value: codes.code,
+          //   });
 
         // { prop: 'state', label: '操作' },
         // ...更多表头数据
         }
+        console.log( strResultFormatlist.value);
          dynamicHeaders.value=headertable;
         let warning=[];//一级警告
         let warning2=[];//二级警告