4.18下班上传

src/view/index/first-left.vue

@@ -21,8 +21,8 @@
                   <el-option
                     v-for="item in strResultFormatlist"
                     :key="item.id"
-                    :label="item.code"
-                    :value="item.code"
+                    :label="item.name"
+                    :value="item.name"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -78,7 +78,7 @@
                 <div class="hedse">
               <el-icon class="iconimg1 Frame3" fit="contain"></el-icon>{{ jcname }}
             </div>
-            <div class="zongji2" v-if="props.classradio=='Fire'">
+            <div class="zongji2" v-show="noneshow">
                 <div class="Firetile" ><span>温度（℃）：</span><span class="text">{{ c}}</span></div>
                 <div class="Firetile"><span>压力（Pa）：</span><span class="text2">{{ pa }}</span></div>
               </div>
@@ -163,6 +163,7 @@ let showfalse=ref(false);
 let c=ref("0");
 let pa=ref("30s");
 const isstop = ref(false);
+let noneshow=ref(false);
 const strResultFormatlist = ref([]);
 let count=ref(1);
 let starttime = ref(1);
@@ -178,12 +179,13 @@ let steptimes = ref([]);
 let series = ref([]);
 let heightnum=ref("0");
 let jcname=ref("监测点");
+let danwei=ref();
 let state=ref();
 let warnin=ref(0);
 let warnin2=ref(0);
 const min = ref(0);
 const max = ref(1);
-
+let selelist=ref();
 const dynamicHeaders = ref([
 
 ]);
@@ -212,7 +214,7 @@ const job = ref({
   cocodes: "", //物理属性code逗号分隔
 });
 const formInline = ref({
-  region: "Height",
+  region: "Temperature",
 });
 
 const tableData =ref( [
@@ -334,7 +336,7 @@ await request(params)
 }
 //监测点数据获取
 async  function getMonitor() {
-  strResultFormatlist.value = [];
+
   const params = {
     transCode: "D10018",
     aid: aid.value,
@@ -344,11 +346,19 @@ async  function getMonitor() {
     .then((res) => {
    
       if (res.returnCode == "000000000") {
+        strResultFormatlist.value = [];
         let headertable=[];
         //let s=0;
         // dynamicHeaders.value=res.codes;
         console.log(res);
         for (let i = 0; i < res.codes.length; i++) {
+          let cocode = res.codes[i];
+
+          strResultFormatlist.value.push({
+            id: i,
+            name: cocode.code,
+            value: cocode.code,
+          });
           let num=i+1
           let newMap = new Map([
             ["Temperature", "(℃)"],
@@ -363,23 +373,21 @@ async  function getMonitor() {
           newMap.forEach((value, key) => {
             if ( key  == res.codes[i].code ) {
               console.log(key);
-              res.codes[i].code = key + value;
+              res.codes[i].code = key+value;
+              
             }
           });
           headertable.push(
             { prop:'v'+num, label: res.codes[i].code },
           )
-          // strResultFormatlist.value.push({
-          //     id: i,
-          //     name: codes.code,
-          //     value: codes.code,
-          //   });
-
-        // { prop: 'state', label: '操作' },
-        // ...更多表头数据
         }
-        strResultFormatlist.value=res.codes;
-        console.log(res);
+        if(props.classradio=='Fire'){
+       
+          formInline.value.region=strResultFormatlist.value[0].value;
+         
+        }
+     
+        // strResultFormatlist.value=res.codes;
          dynamicHeaders.value=headertable;
         let warning=[];//一级警告
         let warning2=[];//二级警告