5.20修改bug

src/style/style.css

@@ -1788,4 +1788,8 @@ a{
 }
 .no-shadow .el-dialog__wrapper {
   /* box-shadow: none; */
+}
+.el-table .cell {
+  white-space: pre-line !important;
+  text-align: center;
 }

src/view/components/InfoBoundary.vue

@@ -55,11 +55,17 @@
                         <!-- <el-table-column  width="50">
                                                 //         <template #default="scope">{{scope.row.type == massflow ? '流量边界' : scope.row.type ==	Pressure?'压力边界' }} </template>
                                                 //     </el-table-column> -->
-                        <el-table-column prop="flow" label="流量(m³/s)" width="95" />
-                        <el-table-column prop="pressure" label="压强(pa)"  width="95"/>
-                        <el-table-column prop="temperature" label="温度(℃）" width="95"/>
-                        <el-table-column prop="polcon1" label="二氧化碳" width="95" />
-                        <el-table-column prop="polcon2" label="二氧化硫" width="95" />
+                        <el-table-column prop="flow" label="流量(m³/s)" width="60"/>
+                        
+                          <!-- <el-table-column prop="flow" label="流量">
+                            <template  #default="{ row }">
+                              {{ row.flow }} <br> (m³/s)
+                            </template>
+                          </el-table-column> -->
+                        <el-table-column prop="pressure" label="压强(pa)"  width="60"/>
+                        <el-table-column prop="temperature" label="温度(℃）" width="60" />
+                        <el-table-column prop="polcon1" label="二氧化碳(%)" />
+                        <el-table-column prop="polcon2" label="二氧化硫(ppm)" />
                       </el-table>
                       <div class="asdis_btn">
                         <div class="flex_a"   @click="
@@ -830,3 +836,4 @@ onMounted(() => {});
 defineExpose({ boun, accident4, addboundary, changeModel });
 </script>
 
+

src/view/index/first-left.vue

@@ -23,7 +23,7 @@
                     v-for="item in strResultFormatlist"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
+                    :value="item.value"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -51,11 +51,17 @@
                         :max-height="tableHeight"
                       >
                       <el-table-column prop="chname" label="监测点"  />
+                
                       <el-table-column
                           v-for="(header, index) in dynamicHeaders"
                           :key="index"
                           :prop="header.prop"
-                          :label="header.label">
+                          :label="header.label"
+                       
+                          >
+                          <!-- <template #default="scope">
+                        <div>{{ scope.row[header.prop] }}</div><br><div>{{ scope.row[header.label] }}</div> 
+                      </template> -->
                         </el-table-column>
                       
                         <!-- <el-table-column prop="date" label="监测点"  />
@@ -189,6 +195,7 @@ let heightnum=ref("0");
 let maxtime=ref({
   steptime:"03:02"
 });
+
 let datetime=ref();
 let jcname=ref("监测点");
 let danwei=ref();
@@ -286,16 +293,20 @@ myChart.clear();
  readJob();
 }
 function regionchange(val) {
-  // console.log(val)
+  console.log(val)
+  console.log(11111)
+   console.log(strResultFormatlist.value)
   let newMap = new Map([
-    ["Temperature", "(℃)"],
-    ["Pressure", "(kg/s)"],
-    ["Pressure", "(kg/s)"],
-    ["CO2", "(%)"],
-    ["CO2", "(%)"],
-    ["H2S", "(%)"],
-    ["Flow", "(Pa)"],
-    ["Height", "m"],
+            ["Temperature", "(℃)"],
+            ["Pressure", "(Pa)"],
+            ["CO", "(ppm)"],
+            ["CO2", "(%)"],
+            ["H2S", "(%)"],
+            ["HCL", "(ppm)"],
+            ["NO2", "(ppm)"],
+            ["SO2", "(ppm)"],
+            ["Flow", "(Pa)"],
+            ["Height", "(m)"],
   ]);
   newMap.forEach((value, key) => {
     // console.log(key, value);
@@ -320,7 +331,7 @@ await request(params)
       if(res.state=='1'){
       //  vtkmodel.clearModeAddJg(); //隐藏模版显示结果
       job.value = res;
-      getMonitor();
+     getMonitor();
       vtkmodel.clearModeAddJg();
       reddate(new Date());
       vtkGridRead();
@@ -357,7 +368,17 @@ await request(params)
   });
 }
 //监测点数据获取
+ function  renderheader(h, { column, $index }) {
+  // console.log(column.label)
+    //   return h("div", {}, [
+    //     h("div", {}, column.label.split(",")[0]),
+    //     h("div", {}, column.label.split(",")[1]),
+    //   ]);
+     }
+
 async  function getMonitor() {
+  let cocode;
+  let name;
   const params = {
     transCode: "D10018",
     aid: aid.value,
@@ -373,33 +394,68 @@ async  function getMonitor() {
         // 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,
-          });
+           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", "(kg/s)"],
-            ["Pressure", "(kg/s)"],
-            ["CO2", "(%)"],
+            ["Pressure", "(Pa)"],
+            ["CO", "(ppm)"],
             ["CO2", "(%)"],
             ["H2S", "(%)"],
-            ["Flow", "(Pa)"],
+            ["HCL", "(ppm)"],
+            ["NO2", "(ppm)"],
+            ["SO2", "(ppm)"],
+            ["Flow", "(m³/s)"],
             ["Height", "(m)"],
           ]);
+          
           newMap.forEach((value, key) => {
             if ( key  == res.codes[i].code ) {
-              console.log(key);
-              res.codes[i].code = key+value;
-              
+              if(key=='Temperature'){
+                  key='温度'
+              }else if(key=='Pressure'){
+                key='压强'
+              }else if(key=='CO'){
+                key= '一氧化碳'
+              }else if(key=='CO2'){
+                key= '二氧化碳'
+              }else if(key=='HCL'){
+                key= '氯化氢'
+              }else if(key=='NO2'){
+                key= '二氧化氮'
+              }else if(key=='SO2'){
+                key= '二氧化硫'
+              }else if(key=='H2S'){
+                key= '硫化氢'
+              }else if(key=='Height'){
+                key= '水位'
+              }else if(key=='Flow'){
+                key= '流量'
+              }else{
+
+              }
+             // 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: res.codes[i].code },
+            { prop:'v'+num, label:name},
           )
         }
           
@@ -771,6 +827,7 @@ if( newVal>=endtime.value){
 defineExpose({firstshow,isshow,indexinit});
 </script>
 <style lang="scss" scoped>
+
 .el-slider {
     width: 100%;
     height: 32px;
@@ -785,3 +842,10 @@ align-items: center;
 
 }
 </style>
+<style>
+.el-table .cell {
+  white-space:pre-line; 
+  text-align: center ;
+
+}
+</style>

src/view/result.vue

@@ -281,23 +281,21 @@ function increment() {
 }
 // 物理量的选择
 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;
-    }
-  });
+  // let newMap = new Map([
+  //   ["Temperature", "(℃)"],
+  //   ["Pressure", "(kg/s)"],
+  //   ["Pressure", "(kg/s)"],
+  //   ["CO2", "(%)"],
+  //   ["CO2", "(%)"],
+  //   ["H2S", "(%)"],
+  //   ["Flow", "(Pa)"],
+  //   ["Height", "m"],
+  // ]);
+  // newMap.forEach((value, key) => {
+  //   if (key == val) {
+  //     danwei.value = key + value;
+  //   }
+  // });
 
 }
 const hazardtype = (val) => {
@@ -324,6 +322,7 @@ const wdiclick=(id,selid)=>{
 }
 //监测点数据获取
 async function getMonitor(leftAid, rightAid) {
+  let name;
   const params = {
     transCode: "D10018",
     aid: leftAid,
@@ -336,9 +335,50 @@ async function getMonitor(leftAid, rightAid) {
         console.log(res);
         for (let i = 0; i < res.codes.length; i++) {
           let cocode = res.codes[i];
+          let newMap = new Map([
+            ["Temperature", "(℃)"],
+            ["Pressure", "(Pa)"],
+            ["CO", "(ppm)"],
+            ["CO2", "(%)"],
+            ["H2S", "(%)"],
+            ["HCL", "(ppm)"],
+            ["NO2", "(ppm)"],
+            ["SO2", "(ppm)"],
+            ["Flow", "(Pa)"],
+            ["Height", "(m)"],
+          ]);
+          newMap.forEach((value, key) => {
+            if ( key  == res.codes[i].code ) {
+              if(key=='Temperature'){
+                  key='温度'
+              }else if(key=='Pressure'){
+                key='压强'
+              }else if(key=='CO'){
+                key= '一氧化碳'
+              }else if(key=='CO2'){
+                key= '二氧化碳'
+              }else if(key=='HCL'){
+                key= '氯化氢'
+              }else if(key=='NO2'){
+                key= '二氧化氮'
+              }else if(key=='SO2'){
+                key= '二氧化硫'
+              }else if(key=='H2S'){
+                key= '硫化氢'
+              }else if(key=='Height'){
+                key= '水位'
+              }else if(key=='Flow'){
+                key= '流量'
+              }else{
+
+              }
+             // res.codes[i].code = key+value;
+             name =  key+value
+            }
+          });
           strResultFormatlist.value.push({
             id: i,
-            name: cocode.code,
+            name: name,
             value: cocode.code,
           });
         }

src/view/result/Wdisaster.vue

@@ -24,7 +24,7 @@
                           v-for="(header, index) in dynamicHeaders"
                           :key="index"
                           :prop="header.prop"
-                          :label="header.label">
+                          :label="header.label" >
                         </el-table-column>
                         <el-table-column   prop="state"  label="预警" >
                           <template #default="scope">
@@ -163,18 +163,43 @@ request(params)
       for (let i = 0; i < res.codes.length; i++) {
         let num=i+1
         let newMap = new Map([
-          ["Temperature", "(℃)"],
-          ["Pressure", "(kg/s)"],
-          ["Pressure", "(kg/s)"],
-          ["CO2", "(%)"],
-          ["CO2", "(%)"],
-          ["H2S", "(%)"],
-          ["Flow", "(Pa)"],
-          ["Height", "(m)"],
+            ["Temperature", "(℃)"],
+            ["Pressure", "(Pa)"],
+            ["CO", "(ppm)"],
+            ["CO2", "(%)"],
+            ["H2S", "(%)"],
+            ["HCL", "(ppm)"],
+            ["NO2", "(ppm)"],
+            ["SO2", "(ppm)"],
+            ["Flow", "(m³/s)"],
+            ["Height", "(m)"],
         ]);
         newMap.forEach((value, key) => {
           if ( key  == res.codes[i].code ) {
-            res.codes[i].code = key + value;
+            if(key=='Temperature'){
+                  key='温度'
+              }else if(key=='Pressure'){
+                key='压强'
+              }else if(key=='CO'){
+                key= '一氧化碳'
+              }else if(key=='CO2'){
+                key= '二氧化碳'
+              }else if(key=='HCL'){
+                key= '氯化氢'
+              }else if(key=='NO2'){
+                key= '二氧化氮'
+              }else if(key=='SO2'){
+                key= '二氧化硫'
+              }else if(key=='H2S'){
+                key= '硫化氢'
+              }else if(key=='Height'){
+                key= '水位'
+              }else if(key=='Flow'){
+                key= '流量'
+              }else{
+
+              }
+            res.codes[i].code = key +"\n"+ value;
           }
         });
         headertable.push(

src/view/result/Wdisaster2.vue

@@ -158,18 +158,43 @@ request(params)
       for (let i = 0; i < res.codes.length; i++) {
         let num=i+1
         let newMap = new Map([
-          ["Temperature", "(℃)"],
-          ["Pressure", "(kg/s)"],
-          ["Pressure", "(kg/s)"],
-          ["CO2", "(%)"],
-          ["CO2", "(%)"],
-          ["H2S", "(%)"],
-          ["Flow", "(Pa)"],
-          ["Height", "(m)"],
+        ["Temperature", "(℃)"],
+            ["Pressure", "(Pa)"],
+            ["CO", "(ppm)"],
+            ["CO2", "(%)"],
+            ["H2S", "(%)"],
+            ["HCL", "(ppm)"],
+            ["NO2", "(ppm)"],
+            ["SO2", "(ppm)"],
+            ["Flow", "(m³/s)"],
+            ["Height", "(m)"],
         ]);
         newMap.forEach((value, key) => {
           if ( key  == res.codes[i].code ) {
-            res.codes[i].code = key + value;
+            if(key=='Temperature'){
+                  key='温度'
+              }else if(key=='Pressure'){
+                key='压强'
+              }else if(key=='CO'){
+                key= '一氧化碳'
+              }else if(key=='CO2'){
+                key= '二氧化碳'
+              }else if(key=='HCL'){
+                key= '氯化氢'
+              }else if(key=='NO2'){
+                key= '二氧化氮'
+              }else if(key=='SO2'){
+                key= '二氧化硫'
+              }else if(key=='H2S'){
+                key= '硫化氢'
+              }else if(key=='Height'){
+                key= '水位'
+              }else if(key=='Flow'){
+                key= '流量'
+              }else{
+
+              }
+              res.codes[i].code = key +"\n"+ value;
           }
         });
         headertable.push(