Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/disaster_web3

src/style/index.css

@@ -46,4 +46,9 @@ input[type="text"], input[type="password"] {
 img{
     vertical-align: middle; 
 }
+.inputnuber  .el-input-number .el-input__wrapper{
+    padding-left:15 !important;
+    padding-right:15 !important;
+  
+  }
 /* 改 el-dialog的默认样式*/

src/style/style.css

@@ -1650,11 +1650,12 @@ font-size: .0833rem;
   width: .4271rem;
   height: .2708rem;
   line-height: .3542rem;
-  font-size: .0729rem;
+  font-size:0.0833rem;
   color: #fff;
   position: relative;
   padding: 0 0.0925rem;
   text-align: left;
+  font-weight: bold;
 
 }
 .zongjili span{
@@ -1768,7 +1769,7 @@ justify-content: space-between;
 
 }
 .duijc .zongjili{
-  margin-top: 5px;
+  /* margin-top: 5px; */
 }
 .jccolor{
 color: #FFF500 ;
@@ -1912,11 +1913,24 @@ background-color: #52C6FF  !important;
 }
 .zongji .img4{
   line-height: 1.5;
-  font-size: 10px;
+    font-size: 10px;
+    width: 85px;
+    height: 60px;
+    padding-top: 3px;
+
+}
+.zongji .img3{
+ 
+    font-size: 16px;
+    width: 85px;
+    height: 60px;
+    line-height: 66px;
+    padding-top: 0.0310rem;
+
 }
 .zongji .jcshijian{
   line-height: 1.2;
-  font-size:0.0521rem;
+  font-size:12px;
   text-align: center;
   white-space:nowrap;
 }
@@ -2092,13 +2106,21 @@ background-color: rgba(0, 0, 0, 0);
   display:none;
 }
 .inputnuber  .el-input-number .el-input__wrapper{
-  padding-left:15 !important;
-  padding-right:15 !important;
+  padding-left:10px !important;
+  padding-right: 10px !important;
 
 }
+
 .inputnuber .el-input-number{
   width: 100% !important;
 }
+.inputnuber .el-input-number .el-input__inner{
+ text-align: left !important;
+}
+.woter{
+  font-size: var(--el-form-label-font-size);
+  padding-bottom: 5px;
+}
 @media screen and (max-width:1650px){
   .headMenu_2 .el-col{
     transform:scale(0.9);

src/view/InfoDialoges.vue

@@ -268,28 +268,28 @@
                                                 <el-input v-model="tuiyanobj.dt" placeholder="时间步长" clearable />
                                                 </el-form-item> -->
                                                 <span class="inputtext_1">时间步长</span>
-                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.dt" />
+                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.dt"   oninput ="value=value.replace(/[^0-9]/g,'')"   />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
                                             <li><span class="inputtext_1">空间步长</span>
-                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.dx" />
+                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.dx"   oninput ="value=value.replace(/[^0-9]/g,'')"  />
                                                     <span class="righttext">m</span>
                                                 </div>
                                             </li>
                                             <li><span class="inputtext_1">模拟时长</span>
-                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.totaltime" />
+                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.totaltime"  oninput ="value=value.replace(/[^0-9]/g,'')"  />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
                                             <li><span class="inputtext_1">输出步长</span>
-                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.reportstep" />
+                                                <div class="inputkuang"> <el-input v-model="tuiyanobj.reportstep"   oninput ="value=value.replace(/[^0-9.]/g,'')"  />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
                                             <li><span class="inputtext_1">交互步长</span>
                                                 <div class="inputkuang"> <el-input
-                                                        v-model="tuiyanobj.interactionstep" />
+                                                        v-model="tuiyanobj.interactionstep"    oninput ="value=value.replace(/[^0-9.]/g,'')"   />
                                                     <span class="righttext">s</span>
                                                 </div>
                                             </li>
@@ -1090,7 +1090,7 @@ defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible ,cha
 }
 </style>
 <style>
- @import '../../src/style/style.css';
+ /* @import '../../src/style/style.css'; */
  .scoperadio .el-radio__label {
     display: none !important;
 }

src/view/components/InfoDisaster.vue

@@ -920,21 +920,27 @@
         </div>
       </template>
       <div>
-        <el-form>
+        <el-form class="demo-form-inline inputnuber">
           <el-form-item label="时间/s" :label-width="formLabelWidth6">
-            <el-input
+            <el-input-number
+            :min="0"
               v-model="Disastersource.timeline"
               class="w-50 m-2"
+              maxlength="15" 
+              :precision="0"
               placeholder="请输入时间秒"
-              oninput ="value=value.replace(/^|[^0-9]/g,'')" 
+              oninput ="value=value.replace(/[^0-9]/g,'')" 
             />
           </el-form-item>
-          <el-form-item label="突水量（m³/s）" :label-width="formLabelWidth6">
-            <el-input
+          <el-form-item label="突水量（m³/s）"   :label-width="formLabelWidth6">
+            <el-input-number
               v-model="Disastersource.val1"
               class="w-50 m-2"
               placeholder="请输入"
-              oninput ="value=value.replace(/[^0-9.]/g,'')"
+              :min="0"
+              maxlength="15"  
+              :precision="0"
+              oninput ="value=value.replace(/[^0-9]/g,'')" 
              
               
             />
@@ -1012,7 +1018,8 @@
         </div>
       </template>
       <h4 class="delecttitle">
-        是否确认删除 <span class="spanclad">{{ zqname }}</span>
+        <!-- //{{ zqname }} -->
+        是否确认删除 <span class="spanclad"></span>
       </h4>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
@@ -1885,14 +1892,14 @@ const handleDelete2 = (val) => {
   console.log(val);
   jiancobj.value = val;
   firesid.value = val.sid;
-  zqname.value = "检测表的一条信息";
+  zqname.value = "监测表的一条信息";
   svid.value = val.svid;
 };
 const handleDelete3 = (val) => {
   currentrow1.value=true;
   jiancobj.value = val;
   firesid.value = val.sid;
-  zqname.value = "检测表的一条信息";
+  zqname.value = "监测表的一条信息";
   svid.value = val.svid;
 };
 const fundeledata3 = () => {
@@ -1938,7 +1945,5 @@ onMounted(() => {
 });
 defineExpose({ sour, accident3, handledisaster,changeModel,Gassgetdata});
 </script>
-<style>
- @import '../../../src/style/style.css';
-</style>
+
 

src/view/components/MenuMine.vue

@@ -294,26 +294,28 @@
     <div class=" btncolor tablefocus">
                       <vue-uploader
                       ref="gfx"
-                      :solverType="'fem'"
                       :accept="'.x'"
                       :upId="'1'"
                       :gfname="gfname"
                       :name="'网格文件上传'"
                       @handfiles="handfiles"
                       @Gassaddgfid="Gassaddgfid"
+                      @clearFiles="clearFiles"
                       style="margin: 20px 0 0 0"
                     >
-
+                    <el-row>
+                </el-row>
                   </vue-uploader>
+
                   <vue-uploader
                       ref="inp"
-                      :solverType="'fem'"
                       :accept="'.inp'"
                       :name="'边界文件'"
                       :upId="'2'"
                       :gfname="bfname"
                       @handfiles="handfiles"
                       @Gassaddbfid="Gassaddbfid"
+                      @clearFiles="clearFiles"
                       style="margin: 20px 0 0 0"
                     >
                   </vue-uploader>
@@ -623,6 +625,7 @@ let bfname=ref("");
   const handleDelete2 = (val) => {
       currentrow1.value = true;
       gddata.value = val;
+      console.log(val);
       gfname.value= gddata.value.gfname
     bfname.value= gddata.value.bfname
   
@@ -760,6 +763,13 @@ let bfname=ref("");
                   type: 'success',
               })
               guandaodata();
+              nextTick(()=>{
+             
+              gfx.value.clearFiles();
+              inp.value.clearFiles();
+            })
+            
+
           })
           .catch((err) => {
            // sdialog.value.gdadddialog = true;
@@ -834,13 +844,23 @@ let bfname=ref("");
 const handfiles = (file) => {
       files.value = "";
      files.value = file;
-     console.log( files.value);
     }
     const Gassaddgfid=(gf)=>{
         gfid.value=gf;
+   
+   
 }
+
 const Gassaddbfid=( bf)=>{
         bfid.value=bf;
+        console.log(11222)
+   
+}
+// 清空文件
+const clearFiles=()=>{
+    console.log(1111888881)
+    // inp.upload.clearFiles();
+    // gfx.upload.clearFiles();
 }
 //判断文件是否上传
 const fileboolen=(val)=>{
@@ -866,7 +886,7 @@ const fileboolen=(val)=>{
         ElMessage.error("名称不能为空");
      }
      else{
-        console.log(333333)
+      
         guandaoapi();
      }
 

src/view/components/MenuPhysics.vue

@@ -64,7 +64,7 @@
 
                 </div>
             </template>
-            <el-form class="demo-form-inline" :inline="true" :model="wuliobj">
+            <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-form-item>
@@ -72,13 +72,13 @@
                     <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.number="wuliobj.density" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                    <el-input-number 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.number="wuliobj.diffcoe" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" @input="formatInput"   class="w-50 m-2" placeholder="请输入" />
+                    <el-input-number 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.number="wuliobj.speheat" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                    <el-input-number 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">

src/view/components/Menudisaster.vue

@@ -178,7 +178,7 @@
     </div>
     <div v-if="resultactiveName=='Fire'||resultactiveName=='Gass'">
       <el-form-item label="温度" :label-width="formLabelWidth6">
-         <el-input v-model="desw.temperature" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+         <el-input-number 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="请输入" />

src/view/components/Menupath.vue

@@ -77,7 +77,7 @@
                         style="width: 100%"
                         :max-height="tableHeight"
                         :row-class-name="tableRowClassName"
-                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
+                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                         @row-click="handleDelete3($event)"
                         :highlight-current-row="currentrow1" 
                       >
@@ -124,7 +124,7 @@
  
                  </div>
              </template>
-             <el-form class="demo-form-inline" :inline="true" :model="wuliobj">
+             <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-form-item>
@@ -184,7 +184,7 @@
         </div>
       </div>
       <el-form-item label="排序" :label-width="formLabelWidth6">
-                     <el-input v-model="seq"   oninput ="value=value.replace(/[^0-9]/g,'')"   maxlength="18" class="w-50 m-2" placeholder="请输入" />
+                     <el-input v-model="seq"   oninput ="value=value.replace(/[^0-9]/g,'')"   maxlength="10" class="w-50 m-2" placeholder="请输入" />
                  </el-form-item>
         <div class="dialog-footer footer_div l_btn">
             <div class="footerbtn flex1">
@@ -264,6 +264,7 @@
  let tableobj = ref({});
  let wnid=ref();
  let zqname = ref();
+ let rowobj=ref([]);
  let wuliobj = ref({
     wid:'',
      code: '',
@@ -323,7 +324,7 @@
 const faterdelete=()=>{
     const params = {
          transCode: 'D10032',
-         wid: wuliobj.value.wid,
+         wid: tableobj.value.wid,
      }
      request(params)
          .then((res) => {
@@ -352,8 +353,9 @@ const faterdelete=()=>{
          })
  }
  const handledetection=(index, row)=>{
-    wuliobj.value=row;
-console.log(wuliobj.value.wid)
+    //wuliobj.value=row;
+    rowobj.value=row;
+     console.log(  rowobj.value);
     pathshownode.value=true;
     childdata();
  }
@@ -361,7 +363,7 @@ console.log(wuliobj.value.wid)
  
      const params = {
          transCode: 'D10033',
-         wid: wuliobj.value.wid
+         wid: rowobj.value.wid
      }
      request(params)
          .then((res) => {
@@ -469,6 +471,7 @@ const cadd=()=>{
     nid.value=null;
     selectstr.value=null;
     wnid.value='';
+    seq.value='';
     childnodeobj.value={};
 
 }
@@ -476,7 +479,7 @@ const cadd=()=>{
 const addnode=(val)=>{
     const params = {
          transCode: 'D10034',
-         wid: wuliobj.value.wid,
+         wid: rowobj.value.wid,
          wnid: wnid.value,
          nid:nid.value,
          seq:seq.value

src/view/components/NodeLine.vue

@@ -17,7 +17,7 @@
                         <el-input v-model="searchtaggd" class="w-50 m-2" placeholder="节点" />
                     </el-form-item>
                     <div class="asdis_btn">
-                        <div class="flex_a">
+                        <div class="flex_a" style="margin-top: 10px;">
                             <div class="btns" @click="searchgd"><span class="spantext">搜索</span></div>
                         </div>
                     </div>

src/view/components/fileuploads.vue

@@ -2,11 +2,9 @@
   <div class="webuploader-container">
         <div :id="'uploader'+upId">
                 <el-row>
-                    <!-- <el-col :span="6"> {{name}}  </el-col>                   
-                    <el-col :span="6"> <div :id="'picker'+upId" class="text_color" >选择文件</div>  </el-col> -->
-                    <!-- <el-button :id="'picker'+upId"> {{name}} </el-button> -->
-                    <div class="btntext upname wenjian" > {{ gfname}}</div>
+                    
                     <div class="btntext upname" :id="'picker'+upId">{{name}}</div>
+                    <div class="btntext upname wenjian" > {{ gfname}}</div>
                 </el-row>
 
                 <el-row v-for="(fileObj,key) in files" :key="key" class="disflex">
@@ -60,13 +58,19 @@ let uuid=ref('');
 let nmlid=ref('');
 let hcfdBoundarys=ref([]);
 onMounted(() => {
-    initup();
+  initup();
 
 });
 const initup=()=>{
     getUUID()
  uuid.value= getUUID()
     initWebUploader();
+}
+const clearFiles=()=>{
+    uploader.value.reset();
+    console.log(files)
+                      
+
 }
 const getUUID=()=> {
           return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
@@ -77,20 +81,20 @@ const getUUID=()=> {
           
      }
       //fembdf绑定
-      const  fembdf=(bfid)=>{
-                let params = {
-                            transCode: "FEM001",
-                            pid: props.projectId,
-                            gridFileId:bfid,
-                            };
+    //   const  fembdf=(bfid)=>{
+    //             let params = {
+    //                         transCode: "FEM001",
+    //                         pid: props.projectId,
+    //                         gridFileId:bfid,
+    //                         };
                       
-                request(params)
-                    .then((res) => {
-                     console.log("绑定成功")
+    //             request(params)
+    //                 .then((res) => {
+    //                  console.log("绑定成功")
                     
-                })
-                .catch((err) => {});
-            }
+    //             })
+    //             .catch((err) => {});
+    //         }
 const  initWebUploader=()=>{
            files.value=[];
            uploader.value=WebUploader.create({
@@ -119,9 +123,11 @@ const  initWebUploader=()=>{
             // 当有文件被添加进队列的时候
       
             uploader.value.on( 'fileQueued', file=> {
-                console.log(2222);
+                fileName.value='';
+                uuid.value= getUUID();
                fileName.value=file.name;
              console.log(fileName.value);
+             console.log(2222);
                 // const fax=fileName.value.slice(-4) 
                 const fax = fileName.value.split(".")[1];
                 console.log(fax)
@@ -158,6 +164,7 @@ const  initWebUploader=()=>{
                 headers {Object}可以扩展此对象来控制上传头部
              */
              uploader.value.on('uploadBeforeSend', (file,data,headers)=> {
+              
                data.chunk=file.chunk;
                data.chunks=file.chunks;
                data.bfid=uuid.value;
@@ -172,6 +179,7 @@ const  initWebUploader=()=>{
                data.userId='5f06c8bc77234f969d13e160b54c27e3';
                headers.Content='multipart';
                headers.Type='form-data';
+             
 
             })
            // 文件上传过程中创建进度条实时显示。
@@ -205,9 +213,11 @@ const  initWebUploader=()=>{
                         if(file.ext=='x'){
                     gfid.value= response.bfid;
                     emit("Gassaddgfid", gfid.value);
+                  
                 }else if(file.ext=='inp'){
                     bfid.value= response.bfid;
                     emit("Gassaddbfid", bfid.value);
+              
                 }
                     });
                     })
@@ -263,7 +273,7 @@ const  initWebUploader=()=>{
             })     
   
         }
-        defineExpose({gfid,bfid,initWebUploader,files,msg})
+        defineExpose({gfid,bfid,initWebUploader,files,msg,uploaderClear,clearFiles})
 </script>
 <style>
 .webuploader-container {
@@ -278,6 +288,7 @@ const  initWebUploader=()=>{
     clip: rect(1px,1px,1px,1px);
 }
 .webuploader-pick {
+    width: 80px;
 	position: relative;
 	display: inline-block;
 	cursor: pointer;
@@ -314,7 +325,7 @@ color: #fff;
 }
 .wenjian{
     color: #fff;  
-    padding-right: 10px;
+    padding-left: 10px;
 }
 .webuploader-container .el-icon{
     color: #fff;

src/view/home.vue

@@ -358,7 +358,7 @@ const handleSelect = (key) => {
 </style>
 
 <style>
- @import '../../src/style/style.css';
+ /* @import '../../src/style/style.css'; */
 body {
   width: 100%;
   height: 100vh;

src/view/result/Wdisaster.vue

@@ -5,7 +5,7 @@
               <div class="jc_content tablecolor">
                 <div class="jc_padding">
                   <div class="re_tele">灾害信息展示
-                    <div class="btn">生成报告</div>
+                    <div class="btn" style="display: none;">生成报告</div>
                   </div >
                   <div class="jiancd">
                   <div class="je_left duijc">

src/view/result/Wdisaster2.vue

@@ -5,7 +5,7 @@
               <div class="jc_content tablecolor">
                 <div class="jc_padding">
                   <div class="re_tele">灾害信息展示
-                    <div class="btn">生成报告</div>
+                    <div class="btn" style="display: none;">生成报告</div>
                   </div >
                   <div class="jiancd">
                   <div class="je_left duijc">