12.9, 修改黄工提交的bug

src/style/style.css

@@ -240,7 +240,7 @@ color: #fff;
   .header_l h4 {
     font-weight: bold;
     font-size: 0.0625rem;
-    color: #68ADFF;
+    color: #fff;
     line-height: 14px;
     text-align: left;
     font-style: normal;

src/view/components/InfoBoundary.vue

@@ -33,7 +33,7 @@
                         @row-click="handleDelete($event)"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                       >
-                        <el-table-column prop="nid" label="节点选择" />
+                        <el-table-column prop="nname" label="节点选择" />
                         <!-- <el-table-column prop="type" label="边界类型" /> -->
 
                         <el-table-column
@@ -153,7 +153,7 @@
                         @row-click="handleDelete($event)"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                       >
-                        <el-table-column prop="nid" label="节点选择" />
+                        <el-table-column prop="nname" label="节点选择" />
                         <el-table-column prop="type" label="边界类型" />
                       </el-table>
                     </div>
@@ -718,6 +718,7 @@ const addboundary = (valaid) => {
     .then((res) => {
       ftableData.value = res.rows;
       xiugaiobj.value={};
+      
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);

src/view/components/InfoDisaster.vue

@@ -77,15 +77,15 @@
                         :data="tableDatafir"
                         style="width: 100%"
                         :row-class-name="tableRowClassName"
-                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
+                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                         :max-height="tableHeight"
                         @row-click="handleDelete2($event)"
                         :highlight-current-row="currentrow1" 
                       >
                         <el-table-column prop="timeline" label="时间"  />
                         <el-table-column prop="val1" label="温度℃" />
-                        <el-table-column prop="val2" label="二氧化碳"  />
-                        <el-table-column prop="val3" label="二氧化硫"  />
+                        <el-table-column prop="val2" label="二氧化碳(%)"  />
+                        <el-table-column prop="val3" label="二氧化硫(ppm)"  />
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -858,7 +858,7 @@
               oninput ="value=value.replace(/[^0-9]/g,'')"
             />
           </el-form-item>
-          <el-form-item label="温度℃" :label-width="formLabelWidth6">
+          <el-form-item label="温度(℃)" :label-width="formLabelWidth6">
             <el-input
               v-model.Number="Disastersource.val1"
               class="w-50 m-2"
@@ -868,7 +868,7 @@
               oninput ="value=value.replace(/[^0-9.]/g,'')"
             />
           </el-form-item>
-          <el-form-item label="二氧化碳" :label-width="formLabelWidth6">
+          <el-form-item label="二氧化碳(%)" :label-width="formLabelWidth6">
             <el-input
               v-model="Disastersource.val2"
               class="w-50 m-2"
@@ -878,7 +878,7 @@
               oninput ="value=value.replace(/[^0-9.]/g,'')"
             />
           </el-form-item>
-          <el-form-item label="二氧化硫" :label-width="formLabelWidth6">
+          <el-form-item label="二氧化硫(ppm)" :label-width="formLabelWidth6">
             <el-input
               v-model.Number="Disastersource.val3"
               class="w-50 m-2"

src/view/components/MenuCheck.vue

@@ -86,8 +86,8 @@
 
           </div>
           </template>
-          <el-form-item label="监测点编号:" :label-width="formLabelWidth5">
-          <el-input  v-model="source.chcode"  oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"
+          <el-form-item label="监测点编号:"  :label-width="formLabelWidth5">
+          <el-input  v-model="source.chcode"  maxlength="10" oninput ="value=value.replace(/[^\w\\/]/ig,'')"
               class="w-50 m-2"
               placeholder="请输入"  />
           </el-form-item>

src/view/components/MenuMine.vue

@@ -157,7 +157,7 @@
 
     <el-form>
       <el-form-item label="编号" :label-width="formLabelWidth6">
-            <el-input v-model="nodeobj.code"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+            <el-input v-model="nodeobj.code"   maxlength="10" oninput ="value=value.replace(/[^\w\\/]/ig,'')"  class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="名称" :label-width="formLabelWidth6">
             <el-input v-model="nodeobj.name"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
@@ -220,7 +220,7 @@
 </template>
 <div>
   <el-form-item label="编号" :label-width="formLabelWidth7">
-            <el-input v-model="guandaoobj.code"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+            <el-input v-model="guandaoobj.code"    maxlength="10" oninput ="value=value.replace(/[^\w\\/]/ig,'')"   class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
     <el-form-item label="名称" :label-width="formLabelWidth7">
         <el-input v-model="guandaoobj.name"   maxlength="18" class="w-50 m-2" placeholder="请输入" />

src/view/components/MenuPhysics.vue

@@ -66,7 +66,7 @@
             </template>
             <el-form class="demo-form-inline inputnuber" :inline="true" :model="wuliobj">
                 <el-form-item label="编号" :label-width="formLabelWidth6" width="70">
-                    <el-input v-model="wuliobj.code" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="wuliobj.code"  maxlength="10" oninput ="value=value.replace(/[^\w\\/]/ig,'')" class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="名称" :label-width="formLabelWidth6">
                     <el-input v-model="wuliobj.name" maxlength="18" class="w-50 m-2" placeholder="请输入" />

src/view/components/Menupath.vue

@@ -126,7 +126,7 @@
              </template>
              <el-form class="demo-form-inline" >
                  <el-form-item label="编号" :label-width="formLabelWidth6">
-                     <el-input v-model="wuliobj.code" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+                     <el-input v-model="wuliobj.code"   maxlength="10" oninput ="value=value.replace(/[^\w\\/]/ig,'')"  class="w-50 m-2" placeholder="请输入" />
                  </el-form-item>
                  <el-form-item label="名称" :label-width="formLabelWidth6">
                      <el-input v-model="wuliobj.name" maxlength="18" class="w-50 m-2" placeholder="请输入" />

src/view/index/first-left.vue

@@ -76,7 +76,7 @@
                        
                           >
                           <template #default="scope">
-                          <span>{{ Number(scope.row[header.prop]).toFixed(2)}}</span>
+                          <span>{{Math.abs(Number(scope.row[header.prop]).toFixed(2))}}</span>
                           </template>
                         
                         </el-table-column>
@@ -546,8 +546,7 @@ async  function getMonitor() {
         let warning3=[];//突水发生
         let warning4=[];//安全区域
         for (let j = 0; j < res.vals.length; j++) {
-          console.log( res.vals[j]);
-          if(Number(res.vals[j].v1)>1.5){
+          if(Math.abs(Number(res.vals[j].v1))>1.5){
                   res.vals[j].state=3;
             warning.push(res.vals[j].v1)
           }else{
@@ -719,7 +718,7 @@ const handleDelete=(event)=>{
             let num=res.rows[i].data[k].val;
             ///console.log(parseFloat(num).toFixed(2))
            // console.log(num.toFixed(2));
-            arr.push(parseFloat(num).toFixed(2));
+            arr.push(Math.abs(parseFloat(num).toFixed(2)));
           }
           // var arr = Array.from(Object.values(res.rows[i].data),x=>x);
           if(res.rows[i].code=='Temperature'){

src/view/result/Wdisaster.vue

@@ -26,7 +26,7 @@
                           :prop="header.prop"
                           :label="header.label" >
                           <template #default="scope">
-                          <span>{{ Number(scope.row[header.prop]).toFixed(2)}}</span>
+                            <span>{{Math.abs(Number(scope.row[header.prop]).toFixed(2))}}</span>
                           </template>
                         </el-table-column>
                         <el-table-column   prop="state"  label="预警" >
@@ -121,7 +121,7 @@ const handleDelete=(event)=>{
               
             }
             let num=res.rows[i].data[k].val;
-            arr.push(parseFloat(num).toFixed(2));
+            arr.push(Math.abs(parseFloat(num).toFixed(2)));
           }
           console.log(res.rows[i].code);
           if(res.rows[i].code=='Temperature'){
@@ -245,37 +245,31 @@ request(params)
       let warning3=[];//突水发生
       let warning4=[];//安全区域
       for (let j = 0; j < res.vals.length; j++) {
-           if(Number(res.vals[j].v1)==0&&Number(res.vals[j].v1)<=0.1){
+          if(Math.abs(Number(res.vals[j].v1))>1.5){
+                  res.vals[j].state=3;
+            warning.push(res.vals[j].v1)
+          }else{
             res.vals[j].state=0;
             warning4.push(res.vals[j].v1);
-          }else if(Number(res.vals[j].v1)>0.1&&Number(res.vals[j].v1)<=0.5){
-            res.vals[j].state=1;
-            warning3.push(res.vals[j].v1);
-          }else if(Number(res.vals[j].v1)>0.5&&Number(res.vals[j].v1)<=1){
-            res.vals[j].state=2;
-            warning2.push(res.vals[j].v1);
-          }else if(Number(res.vals[j].v1)>1){
-            res.vals[j].state=3;
-            warning.push(res.vals[j].v1);
           }
-
         }
       // for (let j = 0; j < res.vals.length; j++) {
-      //   if(res.vals[j].v1<=1&&res.vals[j].v1<2){
-      //     res.vals[j].state=0;
-      //   }else{
-      //     if(res.vals[j].v1 >= 2&&res.vals[j].v1< 10){
-      //     res.vals[j].state=1;
-      //   }else if(res.vals[j].v1>=10&&res.vals[j].v1<120){
-      //     res.vals[j].state=2;
-      //     warning2.push(res.vals[j].v1)
-      //   }else if(res.vals[j].v1>160){
-      //     warning.push(res.vals[j].v1)
-      //     res.vals[j].state=3;
+      //      if(Number(res.vals[j].v1)==0&&Number(res.vals[j].v1)<=0.1){
+      //       res.vals[j].state=0;
+      //       warning4.push(res.vals[j].v1);
+      //     }else if(Number(res.vals[j].v1)>0.1&&Number(res.vals[j].v1)<=0.5){
+      //       res.vals[j].state=1;
+      //       warning3.push(res.vals[j].v1);
+      //     }else if(Number(res.vals[j].v1)>0.5&&Number(res.vals[j].v1)<=1){
+      //       res.vals[j].state=2;
+      //       warning2.push(res.vals[j].v1);
+      //     }else if(Number(res.vals[j].v1)>1){
+      //       res.vals[j].state=3;
+      //       warning.push(res.vals[j].v1);
+      //     }
 
       //   }
-      //   }
-      // }
+   
  
      warnin2.value=warning2.length;
      warnin.value=warning.length;

src/view/result/Wdisaster2.vue

@@ -26,7 +26,7 @@
                           :prop="header.prop"
                           :label="header.label">
                           <template #default="scope">
-                          <span>{{ Number(scope.row[header.prop]).toFixed(2)}}</span>
+                            <span>{{Math.abs(Number(scope.row[header.prop]).toFixed(2))}}</span>
                           </template>
                         </el-table-column>
                         <el-table-column   prop="state"  label="预警" >
@@ -120,7 +120,7 @@ const handleDelete=(event)=>{
               
             }
             let num=res.rows[i].data[k].val;
-            arr.push(parseFloat(num).toFixed(2));
+            arr.push(Math.abs(parseFloat(num).toFixed(2)));
           }
           if(res.rows[i].code=='Temperature'){
             res.rows[i].code='温度'
@@ -238,21 +238,30 @@ request(params)
         let warning3=[];//突水发生
         let warning4=[];//安全区域
         for (let j = 0; j < res.vals.length; j++) {
-           if(Number(res.vals[j].v1)==0&&Number(res.vals[j].v1)<=0.1){
+          if(Math.abs(Number(res.vals[j].v1))>1.5){
+                  res.vals[j].state=3;
+            warning.push(res.vals[j].v1)
+          }else{
             res.vals[j].state=0;
             warning4.push(res.vals[j].v1);
-          }else if(Number(res.vals[j].v1)>0.1&&Number(res.vals[j].v1)<=0.5){
-            res.vals[j].state=1;
-            warning3.push(res.vals[j].v1);
-          }else if(Number(res.vals[j].v1)>0.5&&Number(res.vals[j].v1)<=1){
-            res.vals[j].state=2;
-            warning2.push(res.vals[j].v1);
-          }else if(Number(res.vals[j].v1)>1){
-            res.vals[j].state=3;
-            warning.push(res.vals[j].v1);
           }
-
         }
+        // for (let j = 0; j < res.vals.length; j++) {
+        //    if(Number(res.vals[j].v1)==0&&Number(res.vals[j].v1)<=0.1){
+        //     res.vals[j].state=0;
+        //     warning4.push(res.vals[j].v1);
+        //   }else if(Number(res.vals[j].v1)>0.1&&Number(res.vals[j].v1)<=0.5){
+        //     res.vals[j].state=1;
+        //     warning3.push(res.vals[j].v1);
+        //   }else if(Number(res.vals[j].v1)>0.5&&Number(res.vals[j].v1)<=1){
+        //     res.vals[j].state=2;
+        //     warning2.push(res.vals[j].v1);
+        //   }else if(Number(res.vals[j].v1)>1){
+        //     res.vals[j].state=3;
+        //     warning.push(res.vals[j].v1);
+        //   }
+
+        // }
      warnin2.value=warning2.length;
      warnin.value=warning.length;