12.13下班之前的提交

src/App.vue

@@ -31,13 +31,13 @@
 
 @font-face {
   font-family: 'YouShe';
-  src: url('static/font/YouSheBiaoTiHei-2.ttf') format('truetype');
+  src: url('public/static/font/YouSheBiaoTiHei-2.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'YaHei';
-  src: url('static/font/YaHei.ttf') format('truetype');
+  src: url('public/static/font/YaHei.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }

src/style/style.css

@@ -298,12 +298,14 @@ color: #fff;
     text-align: left;
     font-style: normal;
     text-transform: none;
-    padding: 13px 0 7px 0;
+    /* padding: 13px 0 7px 0; */
     display: inline-block;
     width: 30%;
     display: inline-flex;
     justify-content: flex-start;
     align-items: flex-start;
+    display: block;
+    margin-top: 5px;
      /* font-size: var(--el-form-label-font-size);  */
   }
   
@@ -475,12 +477,26 @@ color: #fff;
   .asdis_btn .btn {
     width: .4167rem;
     height:30px;
-    background-image: url(../assets/img/Group1429.png);
+    /* background-image: url(../assets/img/Group1429.png); */
+    position: relative;
+    background-color: rgba(61, 219, 252, 0.20);
     background-repeat: no-repeat;
     line-height: 30px;
     background-size: 100% 100%;
-    border: 1px solid #1A8CFE;
+    /* border: 1px solid #1A8CFE; */
   }
+  .asdis_btn .btn:before {
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 200%;
+    height: 200%;
+    /* border-radius: 5px; */
+    border: 1px solid rgba(61, 219, 252, 1);
+    transform-origin: 0 0;
+    transform: scale(0.5);
+}
   .asdis_btn .btn .spantext {
     font-weight: bold;
     font-size: 0.0625rem;
@@ -488,7 +504,7 @@ color: #fff;
     text-align: center;
     font-style: normal;
     text-transform: none;
-    opacity: 0.6;
+    opacity: 1;
   }
   
   .logs {
@@ -1110,32 +1126,67 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
   line-height: 30px;
   margin-top: -1px;
   font-size: 14px;
-  background-image: url(../assets/img/Rectangle399.png);
-  background-repeat: no-repeat;
-  background-size: cover;
+  background-color: rgba(61, 219, 252, 0.20) !important; 
+  /* background-image: url(../assets/img/Rectangle399.png); */
   overflow: hidden;
   text-align: center;
-  border: 1px solid #1A8CFE;
+  position: relative;
+  /* border: 1px solid #1A8CFE; */
+}
+.guand_1 .asdis_btn .btns::before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 200%;
+  height: 200%;
+  /* border-radius: 5px; */
+  border: 1px solid rgba(61, 219, 252, 1);
+  transform-origin: 0 0;
+  transform: scale(0.5);
+}
+.L_aside .el-collapse ul li, .L_aside .el-collapse-item__header ul li{
+  margin-top: 3px;
 }
 .guand_1 .btns .spantext{
   font-size: 12px;
 }
 .btns {
     width: .3125rem;
-    background-image: url(../assets/img/Rectangle399.png);
+    /* background-image: url(../assets/img/Rectangle399.png); */  
+    background-color: rgba(61, 219, 252, 0.20) !important; 
     background-repeat: no-repeat;
     background-size: cover;
+    color: #fff;
     height: .1198rem;
-    line-height: .1042rem ;
+    line-height: .1198rem ;
     overflow: hidden;
     text-align: center;
-    border: 1px solid #1A8CFE;
-
+    position: relative;
+    /* border: 1px solid #1A8CFE; */
   }
-  .tabactive{
+  .btns::before {
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 200%;
+    height: 200%;
+    /* border-radius: 5px; */
+    border: 1px solid rgba(61, 219, 252, 1);
+    transform-origin: 0 0;
+    transform: scale(0.5);
+}
+.btn2 .el-button {
+  background-color: rgba(61, 219, 252, 0.20)
+}
+.el-button:focus, .el-button:hover{
+  background-color: rgba(61, 219, 252, 0.20)
+}
+  /* .tabactive{
     background-image: url(/src/assets/img/Rectangle3992.png) !important;
    background-size: 100% 100%;
-  }  
+  }   */
   .chuactive{
     background-image: url(/src/assets/img/Group1403.png) !important;
     background-size: 100% 100%;
@@ -1157,7 +1208,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
     text-align: left;
     font-style: normal;
     text-transform: none;
-    opacity: 0.6;
+    opacity:1;
   }
   .el-table__body-wrapper .el-table__row .el-button>span{
     font-size: .0625rem !important;

src/view/InfoDialoges.vue

@@ -178,8 +178,7 @@
                                                 </el-select> 
                                             </el-form-item>
                                         </div>
-                                        <ul>
-                                            <li>
+                                        <ul> <li>
                                                 <div class="demo-datetime-picker">
                                                     <!-- <span class="inputtext_1">选择时间</span> -->
                                                     <div class="block">
@@ -191,28 +190,41 @@
                                                     </div>
                                                 </div>
                                             </li>
-                                            <li><span class="inputtext_1">时间步长</span>
+                                         <el-tooltip class="box-item" effect="dark" content="求解器求解物理时间步长"
+                                            placement="right">
+                                            <li>  
+                                                <span class="inputtext_1">时间步长</span>  
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.dt" />
                                                     <span class="righttext">s</span>
-                                                </div>
+                                                </div> 
                                             </li>
+                                        </el-tooltip>
+                                        <el-tooltip class="box-item" effect="dark" content="求解器求解空间推进步长"
+                                            placement="right">
                                             <li><span class="inputtext_1">空间步长</span>
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.dx" />
                                                     <span class="righttext">m</span>
                                                 </div>
                                             </li>
+                                        </el-tooltip>
+                                        <el-tooltip class="box-item" effect="dark" content="用户关心的灾情持续总时长"
+                                            placement="right">
                                             <li><span class="inputtext_1">模拟时长</span>
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.totaltime" />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
+                                        </el-tooltip>
+                                        <el-tooltip class="box-item" effect="dark" content="演化结果输出频率"
+                                            placement="right">
                                             <li><span class="inputtext_1">输出步长</span>
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.reportstep" />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
+                                        </el-tooltip>
                                             <li><span class="inputtext_1">交互步长</span>
-                                                <div class="inputkuang"> <el-input
+                                                <div class="inputkuang"> <el-input disabled
                                                         v-model="tuiyanobj.interactionstep" />
                                                     <span class="righttext">s</span>
                                                 </div>
@@ -270,32 +282,42 @@
                                                         </div>
                                                 </div>
                                             </li>
+                                            <el-tooltip class="box-item" effect="dark" content="求解器求解物理时间步长"
+                                            placement="right">
                                             <li>
-                                                <!-- <el-form-item label="时间步长">
-                                                <el-input v-model="tuiyanobj.dt" placeholder="时间步长" clearable />
-                                                </el-form-item> -->
-                                                <span class="inputtext_1">时间步长</span>
+                                                <span class="inputtext_1">时间步长</span>  
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.dt"   oninput ="value=value.replace(/[^0-9]/g,'')"   />
                                                     <span class="righttext">s</span>
                                                 </div>
+                                         
                                             </li>
+                                        </el-tooltip>
+                                        <el-tooltip class="box-item" effect="dark" content="求解器求解空间推进步长"
+                                            placement="right">
                                             <li><span class="inputtext_1">空间步长</span>
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.dx"   oninput ="value=value.replace(/[^0-9]/g,'')"  />
                                                     <span class="righttext">m</span>
                                                 </div>
                                             </li>
+                                        </el-tooltip>
+                                        <el-tooltip class="box-item" effect="dark" content="用户关心的灾情持续总时长"
+                                            placement="right">
                                             <li><span class="inputtext_1">模拟时长</span>
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.totaltime"  oninput ="value=value.replace(/[^0-9]/g,'')"  />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
+                                        </el-tooltip>
+                                        <el-tooltip class="box-item" effect="dark" content="演化结果输出频率"
+                                            placement="right">
                                             <li><span class="inputtext_1">输出步长</span>
                                                 <div class="inputkuang"> <el-input v-model="tuiyanobj.reportstep"   oninput ="value=value.replace(/[^0-9.]/g,'')"  />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
+                                        </el-tooltip>
                                             <li><span class="inputtext_1">交互步长</span>
-                                                <div class="inputkuang"> <el-input
+                                                <div class="inputkuang"> <el-input disabled
                                                         v-model="tuiyanobj.interactionstep"    oninput ="value=value.replace(/[^0-9.]/g,'')"   />
                                                     <span class="righttext">s</span>
                                                 </div>
@@ -660,10 +682,10 @@ const accident = () => {
 
         }else{
         // setTimeout(function(){
-        console.log("不在模拟范围类")
+        
          initWebSocket();
-         rizhi.value.logs='';
-         newlog.value =''; 
+        rizhi.value.logs='';
+        newlog.value =''; 
         emit('headerclick', sgdata.value);
         emit('childfun');
         emit('moxingclick', true);
@@ -822,7 +844,6 @@ const pollute = () => {
     request(params)
         .then((res) => {
             options.value = res.rows;
-            
            value.value.push(res.rows[0]);
      
 
@@ -1106,4 +1127,19 @@ defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible ,cha
  .scoperadio .el-radio__label {
     display: none !important;
 }
+.tooltip-base-box {
+  width: 600px;
+}
+.tooltip-base-box .row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tooltip-base-box .center {
+  justify-content: center;
+}
+.tooltip-base-box .box-item {
+  width: 110px;
+  margin-top: 10px;
+}
 </style>

src/view/appmian.vue

@@ -307,7 +307,7 @@ const childfun = () => {
   boundary.value.addboundary(aid.value);
   sourcedis.value.accident3(activeIndex.value);
   boundary.value.accident4(activeIndex.value);
- // indexref.value.changeColor(0);
+  //indexref.value.changeColor(0);
 };
 const headerclick = (data) => {
   headerobj.value.name = data.name;

src/view/components/InfoDisaster.vue

@@ -29,7 +29,7 @@
                       </template>
                         <el-table-column prop="pname" label="选择巷道" />
                         <el-table-column prop="site" label="位置" />
-                        <el-table-column label="操作" >
+                        <!-- <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
                               size="small"
@@ -38,7 +38,7 @@
                               >查看</el-button
                             >
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -88,8 +88,8 @@
                       <template v-slot:empty>
                         <p>暂无数据</p>
                         </template>
-                        <el-table-column prop="timeline" label="时间"  />
-                        <el-table-column prop="val1" label="温度℃" />
+                        <el-table-column prop="timeline" label="时间(/s)"  />
+                        <el-table-column prop="val1" label="温度(℃)" />
                         <el-table-column prop="val2" label="二氧化碳(%)"  />
                         <el-table-column prop="val3" label="二氧化硫(ppm)"  />
                       </el-table>
@@ -152,7 +152,7 @@
                         style="width: 100%"
                         :row-class-name="tableRowClassName"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
-                        @row-click="handleDelete($event)"
+                        @row-click="handleDeletewotwr($event)"
                         :max-height="tableHeight"
                         :highlight-current-row="currentrow" 
                       >
@@ -161,7 +161,7 @@
                         </template>
                         <el-table-column prop="pname" label="选择巷道"  />
                         <el-table-column prop="site" label="位置"  />
-                        <el-table-column label="操作" >
+                        <!-- <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
                               size="small"
@@ -170,7 +170,7 @@
                               >查看</el-button
                             >
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -449,14 +449,14 @@
                         <el-table-column prop="gfname" label="网格文件"  />
                         <el-table-column prop="bfname" label="边界文件"  />
                         <el-table-column label="操作" >
-                          <template #default="scope">
+                          <!-- <template #default="scope">
                             <el-button
                               size="small"
                               type="success"
                               @click="handlook(scope.$index, scope.row)"
                               >查看</el-button
                             >
-                          </template>
+                          </template> -->
                         </el-table-column>
                       </el-table>
                       <div class="asdis_btn">
@@ -1244,11 +1244,11 @@
           <el-table-column property="name" label="名称" width="70" />
           <el-table-column property="sectionType" label="截面类型" width="120" />
           <el-table-column property="roughCoe" label="粗糙系数" />
-          <el-table-column property="sectionPara1" label="截面参数1" width="90" />
+          <!-- <el-table-column property="sectionPara1" label="截面参数1" width="90" />
           <el-table-column property="sectionPara2" label="截面参数2" width="90" />
           <el-table-column property="sectionPara3" label="截面参数3" width="90" />
           <el-table-column property="sectionPara4" label="截面参数4" width="90" />
-          <el-table-column property="sectionPara5" label="截面参数5" width="90" />
+          <el-table-column property="sectionPara5" label="截面参数5" width="90" /> -->
         </el-table>
         <div class="demo-pagination-block" style="margin-top: 20px">
           <el-config-provider :locale="zhCn">
@@ -1614,7 +1614,23 @@ import selfdialogs from "./SetPipe.vue";
 import vueUploader from "./fileuploads.vue";
 import { NULL } from "sass";
 // import filesload from "./filesloads.vue";
-
+const statusMap = {
+  'CIRCULAR': '圆形',
+  'RECTANGLE': '矩形',
+  'SEMICIRCULAR': '半椭圆形',
+  'SEMIELLIPTICAL': '半圆形',
+  'EGG': '蛋形',
+  'GOTHIC': '哥特形',
+  'MODBASKETHANDLE': '更正蓝形',
+  'ARCH': '拱形',
+  'RECT_ROUND': '弧底矩形',
+  'BASKETHANDLE': '蓝形',
+  'HORSESHOE': '马蹄形',
+  'RECT_TRIANGULAR': '三角底矩形',
+  'VERT_ELLIPSE': '竖向椭圆',
+  'HORZI_ELLIPSE': '水平椭圆',
+  'CATENARY': '悬链式',
+};
 let isActive=ref(0)
 const  changeClass= (i)=>  {
  isActive.value = i;
@@ -1930,17 +1946,23 @@ const handleEditfire = () => {
 };
 //灾情源删除
 const handleDelete = (val) => {
-  console.log("我执行了")
-  
   zqname.value = val.pname;
  tableobj.value=val;
   currentrow.value=true;
   shanchu.value = val;
  sdialog.dialogsgdelect = true;
   firesid.value = val.sid;
-
-    // }
+  handledetection(val);
 };
+const handleDeletewotwr = (val) => {
+  zqname.value = val.pname;
+ tableobj.value=val;
+  currentrow.value=true;
+  shanchu.value = val;
+ sdialog.dialogsgdelect = true;
+  firesid.value = val.sid;
+  handledetection2(val);
+}
 const shanchu = (val) => {
 
   biaoid.value = val;
@@ -2104,19 +2126,25 @@ const pipelinedata = (searchtag) => {
   };
   request(params)
     .then((res) => {
-      tableData2.value = res.rows;
+      tableData2.value = res.rows.map(item => {
+                    return {
+                        ...item,
+                        sectionType: statusMap[item.sectionType] || '未知' // 如果状态不存在，默认设置为'未知'
+                    };
+                    });
+         
       total.value = res.total;
     })
     .catch((err) => {});
 };
 //   灾源检测
-const handledetection = (index, row) => {
+const handledetection = ( row) => {
   sdialog.value.isDisasterfire = true;
   firesid.value = row.sid;
   getinquire();
 };
 //突水灾源检测
-const handledetection2 = (index, row) => {
+const handledetection2 = (row) => {
   sdialog.value.disDisasterwter = true;
   firesid.value = row.sid;
   getinquire();
@@ -2244,7 +2272,7 @@ const handlews=(row)=>{
   console.log(row);
   currentrow.value=true;
   tableobj.value=row;
-
+  handlook(row);
 }
 // 瓦斯的修改
 const wsxiugai= ()=>{
@@ -2303,7 +2331,7 @@ const wsdelete2=()=>{
     });
 }
 //瓦斯的查看
-const handlook=(index,data)=>{
+const handlook=(data)=>{
   console.log(data);
   Gassdialog.value.blast =true;
   Gassdialog.value.gather =true;

src/view/components/MenuCheck.vue

@@ -172,11 +172,11 @@
      <el-table-column property="name" label="名称" width="70"/>
      <el-table-column property="sectionType" label="截面类型" width="120"/>
      <el-table-column property="roughCoe" label="粗糙系数"/>
-     <el-table-column property="sectionPara1" label="截面参数1" width="90"/>
+     <!-- <el-table-column property="sectionPara1" label="截面参数1" width="90"/>
      <el-table-column property="sectionPara2" label="截面参数2" width="90" />
      <el-table-column property="sectionPara3" label="截面参数3" width="90"/>
      <el-table-column property="sectionPara4" label="截面参数4" width="90"/>
-     <el-table-column property="sectionPara5" label="截面参数5" width="90"/>
+     <el-table-column property="sectionPara5" label="截面参数5" width="90"/> -->
      
    </el-table>
      <div class="demo-pagination-block" style="margin-top: 20px;">
@@ -230,6 +230,23 @@ let sdialog=ref({
     dianadddialog:false,
     dialogVisiblenode:false,
 })
+const statusMap = {
+  'CIRCULAR': '圆形',
+  'RECTANGLE': '矩形',
+  'SEMICIRCULAR': '半椭圆形',
+  'SEMIELLIPTICAL': '半圆形',
+  'EGG': '蛋形',
+  'GOTHIC': '哥特形',
+  'MODBASKETHANDLE': '更正蓝形',
+  'ARCH': '拱形',
+  'RECT_ROUND': '弧底矩形',
+  'BASKETHANDLE': '蓝形',
+  'HORSESHOE': '马蹄形',
+  'RECT_TRIANGULAR': '三角底矩形',
+  'VERT_ELLIPSE': '竖向椭圆',
+  'HORZI_ELLIPSE': '水平椭圆',
+  'CATENARY': '悬链式',
+};
 let coolactiveName1 = ref(["1", "2"]);
 let total = ref(1);
 let searchtaggd = ref("");
@@ -396,7 +413,12 @@ const pipelinedata = (searchtag) => {
     }
     request(params)
         .then((res) => {
-            tableData2.value = res.rows;
+           tableData2.value = res.rows.map(item => {
+                    return {
+                        ...item,
+                        sectionType: statusMap[item.sectionType] || '未知' // 如果状态不存在，默认设置为'未知'
+                    };
+                    });
             total.value = res.total;
         })
         .catch((err) => {

src/view/components/MenuPhysics.vue

@@ -29,9 +29,19 @@
                                     <p>暂无数据</p>
                                     </template>
                                     <el-table-column prop="name" label="名称" />
-                                    <el-table-column prop="density" label="密度" />
+                                    <el-table-column prop="density">
+                                        <template v-slot:header>
+                                        <span >密度</span><br>
+                                        <span >(kg/m3)</span>
+                                    </template>
+                                    </el-table-column>
                                     <el-table-column prop="diffcoe" label="扩散系数" />
-                                    <el-table-column prop="speheat" label="比热" />
+                                    <el-table-column prop="speheat" label="比热" >
+                                        <template v-slot:header>
+                                        <span >比热</span><br>
+                                        <span >J/(kg*K)</span>
+                                    </template>
+                                    </el-table-column>
                                 </el-table>
                             </div>
                         </div>

src/view/components/Menupath.vue

@@ -29,7 +29,7 @@
                                     <p>暂无数据</p>
                                     </template>
                                      <el-table-column prop="name" label="路径名称" />
-                                     <el-table-column label="操作"  width="70px">
+                                     <!-- <el-table-column label="操作"  width="70px">
                                         <template #default="scope">
                                             <el-button
                                             size="small"
@@ -38,7 +38,7 @@
                                             >查看</el-button
                                             >
                                         </template>
-                                        </el-table-column>
+                                        </el-table-column> -->
                                  </el-table>
                              </div>
                          </div>
@@ -297,6 +297,7 @@
  const handleDelete = (val) => {
      currentrow.value=true;
      tableobj.value = val;
+     handledetection(val);
  }
  // 删除
  const shanchu = (val) => {
@@ -365,10 +366,9 @@ const faterdelete=()=>{
              ElMessage.error(err.returnMsg)
          })
  }
- const handledetection=(index, row)=>{
+ const handledetection=( row)=>{
     //wuliobj.value=row;
     rowobj.value=row;
-     console.log(  rowobj.value);
     pathshownode.value=true;
     childdata();
  }

src/view/components/PipeIine.vue

@@ -45,11 +45,11 @@
      <el-table-column property="name" label="名称" width="70"/>
      <el-table-column property="sectionType" label="截面类型" width="120"/>
      <el-table-column property="roughCoe" label="粗糙系数"/>
-     <el-table-column property="sectionPara1" label="截面参数1" width="90"/>
+     <!-- <el-table-column property="sectionPara1" label="截面参数1" width="90"/>
      <el-table-column property="sectionPara2" label="截面参数2" width="90" />
      <el-table-column property="sectionPara3" label="截面参数3" width="90"/>
      <el-table-column property="sectionPara4" label="截面参数4" width="90"/>
-     <el-table-column property="sectionPara5" label="截面参数5" width="90"/>
+     <el-table-column property="sectionPara5" label="截面参数5" width="90"/> -->
      
    </el-table>
      <div class="demo-pagination-block" style="margin-top: 20px;">
@@ -90,7 +90,7 @@ let sdialog=ref({
 
 })
 let formLabelWidth5=ref(99)
-let tableHeight=ref(500);
+let tableHeight=ref(530);
  let tableData2 =ref([]);
  const multipleTableRef = ref()
 const multipleSelection = ref([])
@@ -99,6 +99,23 @@ let total = ref(1);
 let searchtaggd = ref("");
 let searchtag=ref("");
 const currentPage4 = ref(1);
+const statusMap = {
+  'CIRCULAR': '圆形',
+  'RECTANGLE': '矩形',
+  'SEMICIRCULAR': '半椭圆形',
+  'SEMIELLIPTICAL': '半圆形',
+  'EGG': '蛋形',
+  'GOTHIC': '哥特形',
+  'MODBASKETHANDLE': '更正蓝形',
+  'ARCH': '拱形',
+  'RECT_ROUND': '弧底矩形',
+  'BASKETHANDLE': '蓝形',
+  'HORSESHOE': '马蹄形',
+  'RECT_TRIANGULAR': '三角底矩形',
+  'VERT_ELLIPSE': '竖向椭圆',
+  'HORZI_ELLIPSE': '水平椭圆',
+  'CATENARY': '悬链式',
+};
 const pageSize4 = ref(5)
     onMounted(()=>{
 
@@ -136,7 +153,12 @@ const pipelinedata = (searchtag) => {
     }
     request(params)
         .then((res) => {
-            tableData2.value = res.rows;
+            tableData2.value = res.rows.map(item => {
+                    return {
+                        ...item,
+                        sectionType: statusMap[item.sectionType] || '未知' // 如果状态不存在，默认设置为'未知'
+                    };
+                    });
             total.value = res.total;
         })
         .catch((err) => {

src/view/index/first-left.vue

@@ -72,7 +72,7 @@
                       </template>
                       <el-table-column  prop="chname" label="监测点"   />
                 
-                      <el-table-column  width="60"
+                      <el-table-column 
                           v-for="(header, index) in dynamicHeaders"
                           :key="index"
                           :prop="header.prop"
@@ -702,7 +702,7 @@ function downloadImg(url, fileName) {
     a.download = fileName;
     a.click();
   };
-  x.send();
+  x.send();dev
 }
 }
 //获取最大值的下标

src/view/index/htmldialog.vue

@@ -138,7 +138,7 @@ const getdatahtml = (val) => {
   jghrfe=url+"static/index.html?camera=1&water="+ water.value;
   jghrfe2=url+"static/index.html?camera=0&water="+ water.value;
   msgval.value = val;
-  }else if(props.classradio=='Fire'||props.classradio=='Gass'){
+  }else if(props.classradio=='Fire'||props.classradio=='Gass'||props.classradio=='Gass1'){
           val.map((item) => {
           item.name=obj2[item.name]
         item.value = item.value.toFixed(2);

src/view/index/index.vue

@@ -51,13 +51,11 @@ let listArray = ref([
 let currentIndex=ref(0);
 let btnlistshow=ref(false);
 const changeColor=(index)=>{
- 
     btnindex.value=index;
-    console.log( btnindex.value+'点击了');
-    emit("vtkshowfuc", index);
+     emit("vtkshowfuc", index);
     currentIndex.value = btnindex.value;
     indexchange(btnindex.value);
-   emit("indexchange", btnindex.value);
+  emit("indexchange", btnindex.value);
     if(btnindex.value==0){
         emit("hiadden", 1);
     }else if(btnindex.value==1){
@@ -75,9 +73,8 @@ const changeColor=(index)=>{
    
 }
 //隐藏所有
-const clearconst=(key,name)=>{
-  claername.value=name;
-  changeColor(key)
+const clearconst=(key)=>{
+
         // emit("hiadden", null);
 }
 // 求解成功后调用右边

src/views/home/index.vue

@@ -186,8 +186,6 @@ function changeCamera(lv){
 }
 //初始化
 function changefunc(){
-  console.log('11111111'+'88888888')
-
   if(props.classradio=='Water'){
       changeCamera(props.neiw)
       changeWater(props.water)
@@ -198,6 +196,9 @@ function changefunc(){
     }else if(props.classradio=='Gass'){
       changeCamera(props.neiw)
       changeGass(props.fire)
+    }else if(props.classradio=='Gass1'){
+      changeCamera(props.neiw)
+      changeGass(props.fire)
     }
 }
 watch(
@@ -216,6 +217,10 @@ watch(
       changeCamera(newVal[0])
       console.log("这是我的温度"+newVal[2])
       changeGass(newVal[2])
+    }else if(props.classradio=='Gass1'){
+      changeCamera(newVal[0])
+      console.log("这是我的温度"+newVal[2])
+      changeGass(newVal[2])
     }
   },
   { deep: true }