12.5修改bug

src/style/style.css

@@ -287,7 +287,7 @@ color: #fff;
   }
   .dialog_class .my-header h4 {
     font-weight: bold;
-    font-size: 12px;
+    font-size: 14px;
     color: #fff;
     line-height: 14px;
     text-align: left;
@@ -326,7 +326,7 @@ color: #fff;
   
   .my_content1 .el-table .cell {
     font-weight: 400;
-    font-size: 12px;
+    font-size: var(--el-form-label-font-size);
     color: #FFFFFF !important;
     line-height: 14px;
     text-align: left;
@@ -589,7 +589,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
 }
 .my_content1 .el-table .cell {
     font-weight: 400;
-    font-size: 12px;
+    font-size: var(--el-form-label-font-size);
     color: #FFFFFF !important;
     line-height: 14px;
     text-align: left;
@@ -958,7 +958,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
 }
 
 .delecttitle {
-    font-size: 18px;
+    font-size: 14px;
     font-weight: bold;
     color: #fff;
 }
@@ -966,6 +966,22 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
 .el-select__input {
     font-size: 12px;
 }
+.guand_1 .asdis_btn .btns{
+  width: 70px;
+  height: 30px;
+  line-height: 30px;
+  margin-top: -1px;
+  font-size: 14px;
+  background-image: url(../assets/img/Rectangle399.png);
+  background-repeat: no-repeat;
+  background-size: cover;
+  overflow: hidden;
+  text-align: center;
+  border: 1px solid #1A8CFE;
+}
+.guand_1 .btns .spantext{
+  font-size: 12px;
+}
 .btns {
     width: .3125rem;
     background-image: url(../assets/img/Rectangle399.png);
@@ -1124,6 +1140,7 @@ ol {
 
 .classtab .el-tabs--card>.el-tabs__header .el-tabs__item {
   position: relative;
+  font-size: var(--el-form-label-font-size);
   /* border-top: 1px solid;
   border-left: 1px solid;
   border-bottom: 1px solid;
@@ -1191,6 +1208,7 @@ ol {
 
 .classtab .el-tabs--card>.el-tabs__header .el-tabs__item {
   border: none !important;
+  font-size: var(--el-form-label-font-size);
 }
 
 .classtab .el-tabs__content {
@@ -2067,6 +2085,20 @@ background-color: rgba(0, 0, 0, 0);
 /* .no-wrap .cell {
   white-space: nowrap;
 } */
+.el-table__header-wrapper .el-table-column--selection .el-checkbox{
+  display: none !important;
+}
+.inputnuber  span{
+  display:none;
+}
+.inputnuber  .el-input-number .el-input__wrapper{
+  padding-left:15 !important;
+  padding-right:15 !important;
+
+}
+.inputnuber .el-input-number{
+  width: 100% !important;
+}
 @media screen and (max-width:1650px){
   .headMenu_2 .el-col{
     transform:scale(0.9);

src/view/InfoDialoges.vue

@@ -55,7 +55,7 @@
                                 @change="getRadioRow(scope.row)"></el-radio>
                         </template>
                     </el-table-column>
-                    <el-table-column type="index" label="序号" width="50" />
+                    <el-table-column type="index" label="序号" width="70" />
                     <el-table-column prop="name" label="名称" />
                     <el-table-column prop="name" label="来源" />
                     <el-table-column prop="time" label="时间"  />

src/view/components/InfoAnimation.vue

@@ -1219,7 +1219,7 @@ defineExpose({ monitor, accident5 });
 
 .my_content1 .el-table .cell {
   font-weight: 400;
-  font-size: 12px;
+  font-size: var(--el-form-label-font-size);
   color: #ffffff !important;
   line-height: 14px;
   text-align: left;
@@ -1531,7 +1531,7 @@ defineExpose({ monitor, accident5 });
 
 .jc_padding .el-table .cell {
   font-weight: 400;
-  font-size: 13px;
+  font-size: .0677rem;
   color: #ffffff;
   line-height: 14px;
   text-align: left;
@@ -1586,7 +1586,7 @@ defineExpose({ monitor, accident5 });
 }
 
 .delecttitle {
-  font-size: 22px;
+  font-size: 14px;
   font-weight: bold;
   color: #fff;
 }

src/view/components/InfoBoundary.vue

@@ -652,7 +652,7 @@ const bounadd = () => {
 };
 const xiudelete = () => {
   if (JSON.stringify(xiugaiobj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    ElMessage.error("你还没有选中删除的项目");
   } else {
     sdialog.value.dialogsgdelect = true
 }

src/view/components/MenuCheck.vue

@@ -25,8 +25,8 @@
                                     :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
-                                    <el-table-column type="index" label="编号"  />
-                                    <el-table-column prop="chcode" label="监测点编号"  width="90" />
+                                    <el-table-column type="index" label="编号"  width="70" />
+                                    <el-table-column prop="chcode" label="监测点编号"  width="100" />
                                     <el-table-column prop="chname" label="名称" />
                                     <el-table-column prop="pname" label="所在巷道" />
                                     <el-table-column prop="site" label="位置" />
@@ -266,7 +266,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中修改的项目")
+        ElMessage.error("你还没有选中删除的项目")
     } else {
         zqname.value = tableobj.value.pname;
         dialogsgdelect.value = true;

src/view/components/MenuMine.vue

@@ -95,10 +95,8 @@
                                                   <el-table-column property="id" label="序号"  />
                                             <el-table-column property="snId" label="开始节点" />
                                             <el-table-column property="enId" label="结束节点" />
-                                      
                                             <el-table-column property="code" label="编号" />
                                             <el-table-column property="name" label="名称" width="150" />
-                                            
                                             <el-table-column property="sectionType" label="截面类型" width="120" />
                                             <el-table-column property="roughCoe" label="粗糙系数" width="120"/>
                                             <el-table-column property="sectionPara1" label="截面参数1" width="90" />
@@ -106,7 +104,6 @@
                                             <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>
                                         <div class="demo-pagination-block pagination" style="margin-top: 20px;">
                                             <el-config-provider :locale="zhCn">
@@ -245,7 +242,7 @@
         </div>
     </div>
     <el-form-item label="粗糙系数" :label-width="formLabelWidth7">
-        <el-input v-model="guandaoobj.roughCoe" class="w-50 m-2" placeholder="请输入" />
+        <el-input v-model="guandaoobj.roughCoe" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
     <div class="demo-input-suffix firsttitle magintop guand_1">
         <el-form-item label="截面类型" :label-width="formLabelWidth7">
@@ -280,19 +277,19 @@
         </el-form-item>
     </div>
     <el-form-item label="截面参数1" :label-width="formLabelWidth7">
-        <el-input v-model="guandaoobj.sectionPara1" class="w-50 m-2" placeholder="请输入" />
+        <el-input v-model="guandaoobj.sectionPara1"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
     <el-form-item label="截面参数2" :label-width="formLabelWidth7">
-        <el-input v-model="guandaoobj.sectionPara2" class="w-50 m-2" placeholder="请输入" />
+        <el-input v-model="guandaoobj.sectionPara2"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
     <el-form-item label="截面参数3" :label-width="formLabelWidth7">
-        <el-input v-model="guandaoobj.sectionPara3" class="w-50 m-2" placeholder="请输入" />
+        <el-input v-model="guandaoobj.sectionPara3" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
     <el-form-item label="截面参数4" :label-width="formLabelWidth7">
-        <el-input v-model="guandaoobj.sectionPara4" class="w-50 m-2" placeholder="请输入" />
+        <el-input v-model="guandaoobj.sectionPara4" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
     <el-form-item label="截面参数5" :label-width="formLabelWidth7">
-        <el-input v-model="guandaoobj.sectionPara5" class="w-50 m-2" placeholder="请输入" />
+        <el-input v-model="guandaoobj.sectionPara5" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"   class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
     <div class=" btncolor tablefocus">
                       <vue-uploader
@@ -378,8 +375,8 @@
   import zhCn from 'element-plus/es/locale/lang/zh-cn'
   import icon from "@/assets/img/icon.png";
   import g from "@/assets/img/g.jpg";
-  import j from "@/assets/img/j.png";
-  import y from "@/assets/img/y.png";
+  import j from "@/assets/img/j2.png";
+  import y from "@/assets/img/y2.png";
   import m1 from "@/assets/img/m1.png";
   import m2 from "@/assets/img/m2.png";
   import m3 from "@/assets/img/m3.png";
@@ -634,7 +631,7 @@ let bfname=ref("");
   const nodedelete = () => {
       console.log(nodedata.value);
       if (JSON.stringify(nodedata.value) == '{}') {
-          ElMessage.error("你还没有选中修改的项目")
+          ElMessage.error("你还没有选中删除的项目")
       } else {
           sdialog.value.dialogsgdelect = true;
           zqname.value = nodedata.value.name;
@@ -736,6 +733,7 @@ let bfname=ref("");
   // 管道增加修改的接口
   const guandaoapi = () => {
       if(guandaoobj.value.snId<guandaoobj.value.enId){
+       // console.log(params);
       const params = {
           transCode: 'D10002',
           code: guandaoobj.value.code,
@@ -753,6 +751,7 @@ let bfname=ref("");
           gfid:gfid.value,
          bfid:bfid.value,
       }
+      console.log(params);
       request(params)
           .then((res) => {
               sdialog.value.gdadddialog = false;
@@ -763,9 +762,11 @@ let bfname=ref("");
               guandaodata();
           })
           .catch((err) => {
+           // sdialog.value.gdadddialog = true;
               ElMessage.error(err.returnMsg)
           })
       } else{
+       // sdialog.value.gdadddialog = true;
           ElMessage.error("结束节点要大于开始节点")
       }
   }
@@ -774,7 +775,7 @@ let bfname=ref("");
   const nodedelete2 = () => {
       console.log(gddata.value);
       if (JSON.stringify(gddata.value) == '{}') {
-          ElMessage.error("你还没有选中修改的项目")
+          ElMessage.error("你还没有选中删除的项目")
       } else {
           sdialog.value.guddialogsgdelect = true;
           zqname.value = gddata.value.name;
@@ -846,12 +847,29 @@ const fileboolen=(val)=>{
   let msg=gfx.value.msg;
   let msg2=inp.value.msg;
   console.log(msg2);
+
   if(msg=="上传中"||msg2=="上传中"){
     ElMessage.error("上传中不能关闭");
   }else{
-    sdialog.value.gdadddialog=false;
-    if(val=='confirm'&&msg=="已上传"||val=='confirm'&&msg2=="已上传"||msg==undefined||msg2==undefined){
-     guandaoapi();
+    if(val=='cancel'){
+        sdialog.value.gdadddialog=false;
+    }else{
+    
+    }
+   // sdialog.value.gdadddialog=false;
+    if(val=='confirm'&&msg=="已上传"||val=='confirm'&&msg2=="已上传"||val=='confirm'&&msg==undefined||val=='confirm'&&msg2==undefined){
+        //sdialog.value.gdadddialog=false;
+        if(guandaoobj.value.code==''){
+            ElMessage.error("编号不能为空");
+     }else if(guandaoobj.value.name==''){
+
+        ElMessage.error("名称不能为空");
+     }
+     else{
+        console.log(333333)
+        guandaoapi();
+     }
+
   }
  // guandaoapi();
   }

src/view/components/MenuPhysics.vue

@@ -65,20 +65,20 @@
                 </div>
             </template>
             <el-form class="demo-form-inline" :inline="true" :model="wuliobj">
-                <el-form-item label="编号" :label-width="formLabelWidth6">
+                <el-form-item label="编号" :label-width="formLabelWidth6" width="70">
                     <el-input v-model="wuliobj.code" maxlength="15" 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="请输入" />
                 </el-form-item>
                 <el-form-item label="密度" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.density" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model.number="wuliobj.density" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="扩散系数" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.diffcoe" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model.number="wuliobj.diffcoe" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" @input="formatInput"   class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="比热" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.speheat" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model.number="wuliobj.speheat" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
             </el-form>
             <div class="dialog-footer footer_div l_btn">
@@ -162,6 +162,9 @@ const tableRowClassName = ({ row, rowIndex }) => {
     return 'oddRow';
 
 }
+// function formatInput(){
+// console.log(wuliobj.value.diffcoe)
+// }
 // 选中一行
 const handleDelete = (val) => {
     currentrow.value=true;
@@ -171,7 +174,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中修改的项目")
+        ElMessage.error("你还没有选中删除的项目")
     } else {
         dialogsgdelect.value = true
         zqname.value = tableobj.value.name;

src/view/components/MenuSensor.vue

@@ -26,7 +26,7 @@
                                 :highlight-current-row="currentrow"  :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
-                                    <el-table-column type="index" label="编号" />
+                                    <el-table-column type="index" label="编号"  width="70"/>
                                     <el-table-column prop="type" label="类型" />
                                     <el-table-column prop="pname" label="所在巷道" />
                                     <el-table-column prop="site" label="位置" />
@@ -179,7 +179,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中修改的项目")
+        ElMessage.error("你还没有选中删除的项目")
     } else {
         dialogsgdelect.value = true
         zqname.value = tableobj.value.type;

src/view/components/Menudisaster.vue

@@ -72,7 +72,7 @@
                                             <el-table-column   prop="grade"  label="预警" >
                                             <template #default="scope">
                                                 <el-image v-if="scope.row.grade=='1'" style="height: 100%" :src="bt1" fit="contain"></el-image>
-                                                <el-image v-if="scope.row.grade=='2'" style="height: 100%" :src="bt2" fit="contain"></el-image>
+                                                <el-image v-if="scope.row.grade=='2'" style="height: 100%" :src="huoz" fit="contain"></el-image>
                                                 <el-image v-if="scope.row.grade=='3'"  style="height: 100%" :src="bt3" fit="contain"></el-image>
                                                 <el-image v-if="scope.row.grade=='4'" style="height: 100%" :src="bt4" fit="contain"></el-image>
                                             </template>
@@ -110,7 +110,7 @@
                                             <el-table-column   prop="grade"  label="预警" >
                                             <template #default="scope">
                                                 <el-image v-if="scope.row.grade=='1'" style="height: 100%" :src="bt1" fit="contain"></el-image>
-                                                <el-image v-if="scope.row.grade=='2'" style="height: 100%" :src="bt2" fit="contain"></el-image>
+                                                <el-image v-if="scope.row.grade=='2'" style="height: 100%" :src="baozha" fit="contain"></el-image>
                                                 <el-image v-if="scope.row.grade=='3'"  style="height: 100%" :src="bt3" fit="contain"></el-image>
                                                 <el-image v-if="scope.row.grade=='4'" style="height: 100%" :src="bt4" fit="contain"></el-image>
                                             </template>
@@ -156,7 +156,7 @@
          <h4 :id="titleId" :class="titleClass">{{ desw.add }}</h4>
      </div>
  </template>
- <el-form class="demo-form-inline" :inline="true" :model="desw">
+ <el-form class="demo-form-inline inputnuber" :inline="true" :model="desw">
   <!-- <el-form-item label="等级:" v-if="props.classradio == 'Fire'">
                 <el-select
                   v-model="des.region"
@@ -173,12 +173,12 @@
               </el-form-item> -->
         <div v-if="resultactiveName=='Water'">
      <el-form-item label="水位" :label-width="formLabelWidth6">
-         <el-input v-model="desw.height"   oninput ="value=value.replace(/[^0-9.]/g,'')"  maxlength="15" class="w-50 m-2" placeholder="请输入" />
+         <el-input-number v-model.number="desw.height"   :precision="1" :step="0.1" :max="10"    maxlength="15" class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
     </div>
     <div v-if="resultactiveName=='Fire'||resultactiveName=='Gass'">
       <el-form-item label="温度" :label-width="formLabelWidth6">
-         <el-input v-model="desw.temperature" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+         <el-input v-model="desw.temperature" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
      <el-form-item label="co2" :label-width="formLabelWidth6">
          <el-input v-model="desw.co2"   oninput ="value=value.replace(/[^0-9.]/g,'')"  maxlength="15" class="w-50 m-2" placeholder="请输入" />
@@ -213,7 +213,8 @@ import bt1 from "@/assets/img/Group1377.png"
 import bt2 from "@/assets/img/Group1396.png"
 import bt3 from "@/assets/img/Group1395.png"
 import bt4 from "@/assets/img/Group1376.png"
-
+import huoz from "@/assets/img/huoz.png"
+import baozha from "@/assets/img/baozha.png"
   import { timestampToTime } from '@/js/lindex.js';
   import NodeSelect from "./NodeLine.vue";
   let dialogVisible=ref(false);
@@ -248,6 +249,25 @@ let gessobj=ref();
     wgetdisaster();
 
 });
+// function formatInput(value){
+ 
+//       desw.value.height = Number(value).toFixed(1);
+//             // 使用正则表达式匹配整数或保留一位小数
+//             const regex = /[^0-9.]/g;
+//       if (!regex.test(value)) {
+//         // 如果输入不符合规则，则设置为上一个合法的值
+//         desw.value.height =   desw.value.height.substring(0, desw.value.height.length - 1);
+//       }
+//  }
+function formatInput(data){
+// const result = desw.value.height
+// .replace(/[^0-9.]/g,'') // 移除非数字和非小数点的字符
+// .replace(/(\.\d).*/g,'$1') // 保留第一个小数点及其后的数字
+// .replace(/(\.\d)\d+/g,'$1') // 如果有多余的小数，只保留一位
+// .replace(/^0+(\d)/,'$1'); // 移除数字前面的0
+// desw.value.height = result;
+// console.log(desw.value.height );
+}
 const handleClick = (Tab, val) => {
   waterobj.value={};
   currentrow.value=false;
@@ -336,4 +356,5 @@ const Eiedre=()=>{
 }
   defineExpose({ dialogVisible, });
   </script>
+
   

src/view/components/Menupath.vue

@@ -296,14 +296,14 @@
     delt.value=val;
     if(val=='1'){
         if (JSON.stringify( tableobj.value ) == '{}') {
-         ElMessage.error("你还没有选中修改的项目")
+         ElMessage.error("你还没有选中删除的项目")
      } else {
          dialogsgdelect.value = true;
          zqname.value = tableobj.value.name;
      }
     }else{
         if ( JSON.stringify(childnodeobj.value) == '{}') {
-         ElMessage.error("你还没有选中修改的项目")
+         ElMessage.error("你还没有选中删除的项目")
      } else {
          dialogsgdelect.value = true;
          zqname.value = childnodeobj.value.nname;

src/view/components/NodeLine.vue

@@ -25,6 +25,7 @@
 
                 <el-table :row-class-name="tableRowClassName" :max-height="tableHeight" ref="multipleTableRef"
                     :data="tableData2" style="width: 100%" @selection-change="projectsSelectionChange"  @select="projectsSelectionSelect"
+                    show-header="false"
                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
                     <el-table-column type="selection" width="55" />
                     <el-table-column property="id" label='节点编号' />
@@ -398,4 +399,10 @@ defineExpose({ dialogVisiblenode, pipelinedata,searchtaggd });
     border: 1px solid;
     border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255, 0.48)) 1 1;
 }
-</style>
+ .el-table__fixed-header-wrapper .el-table-column--selection{
+    display: none;
+// border: 1px solid red;
+// text-indent:-999999px;
+}
+
+</style>

src/view/components/PipeIine.vue

@@ -14,7 +14,7 @@
           </div>
           </template>
    <div class="demo-input-suffix firsttitle leftbgimg2 my_content1">
-      <div class="guand_1">
+      <div class="guand_1" >
          <el-form-item label="节点选择" :label-width="formLabelWidth5">
        <el-input  v-model="searchtaggd"
          class="w-50 m-2"
@@ -22,7 +22,7 @@
          />
      </el-form-item>
      <div class="asdis_btn">
-      <div class="flex_a"><div class="btns"  @click="searchgd"><span class="spantext">搜索</span></div></div>
+      <div class="flex_a"><div class="btns"  @click="searchgd" style="margin-top: 10px;"><span class="spantext" >搜索</span></div></div>
   </div>
   </div>
 

src/view/index/htmldialog.vue

@@ -181,6 +181,7 @@ watch(
 
     } else {
       htmldialogshow.value = false;
+      iframeshow.value=false;
       console.log(2222)
     }
   },

src/views/home/index.vue

@@ -107,14 +107,14 @@ onMounted(() => {
 
       var script = document.createElement("script");
       script.src = loaderUrl;
-      script.onload = () => {
+       script.onload = () => {
         createUnityInstance(canvas, config, (progress) => {
           progressBarFull.style.width = 100 * progress + "%";
         }).then((unityInstance) => {
-          loadingBar.style.display = "none";
-        
            setTimeout(function(){
-            changefunc();
+            loadingBar.style.display = "none";
+           changefunc();
+            
           },100)
        
         }).catch((message) => {