liuqiao 9 ヶ月 前
コミット
5a033ec9b7

+ 1 - 1
src/components/header.vue

@@ -21,7 +21,7 @@
             </div> -->
             <!-- <span class="title-text">煤矿多种态势推演可视化和智慧应急与救援模型定制开发系统</span> -->
               <!-- <span class="title-text">煤矿典型灾害态势推演</span> -->
-              <span class="title-text">煤矿多种态势推演</span>
+              <span class="title-text">煤矿灾害态势推演</span>
             </div>
           </div>
           

+ 2 - 2
src/view/InfoDialoges.vue

@@ -12,10 +12,11 @@
                 </div>
             </template>
             <div class="my_content">
-                <el-radio-group v-model="classradio1" class="radio-group">
+                <el-radio-group v-model="classradio1" class="radio-group" style="padding: 0 20px 0 0;">
                     <el-radio label="Fire">火灾</el-radio>
                     <el-radio label="Water">突水</el-radio>
                     <el-radio label="Gass">瓦斯爆炸</el-radio>
+                    <el-radio label="Gass1">一维瓦斯爆炸</el-radio>
                 </el-radio-group>
             </div>
 
@@ -998,7 +999,6 @@ function initWebSocket() {
     //初始化weosocket
     // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid; ws://192.168.0.131/diswebsocket?projectId=5
     const wsurl = import.meta.env.VITE_WEBSOCKET_URL + aid.value
-    console.log(wsurl);
     websock = new WebSocket(wsurl);
     websock.onopen = websocketonopen;
     websock.onmessage = websocketonmessage;

+ 3 - 2
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;
@@ -346,7 +346,8 @@ const handleSelect = (key) => {
   // window.location.reload();
  //indexref.value.changeColor("0")
 //  indexref.value.changeColor(0);
-//  indexref.value.clearconst();
+//  indexref.value.clearconst(0,'claer');
+// indexref.value.changeColor(0);
  titleclick();
   activeIndeximg.value=key;
   bgk2false.value=true;

+ 2 - 2
src/view/components/InfoDisaster.vue

@@ -1238,8 +1238,8 @@
                         <p>暂无数据</p>
                         </template>
           <el-table-column type="selection" width="55" />
-          <el-table-column property="snId" label="开始节点" />
-          <el-table-column property="enId" label="结束节点" />
+          <!-- <el-table-column property="snId" label="开始节点" />
+          <el-table-column property="enId" label="结束节点" /> -->
           <el-table-column property="id" label="编号" width="70" />
           <el-table-column property="name" label="名称" width="70" />
           <el-table-column property="sectionType" label="截面类型" width="120" />

+ 0 - 1
src/view/components/InfoRun.vue

@@ -917,7 +917,6 @@ function initWebSocket() {
     //初始化weosocket
     // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid; ws://192.168.0.131/diswebsocket?projectId=5
     const wsurl = import.meta.env.VITE_WEBSOCKET_URL + aid.value
-    console.log(wsurl);
     websock = new WebSocket(wsurl);
     websock.onopen = websocketonopen;
     websock.onmessage = websocketonmessage;

+ 2 - 2
src/view/components/MenuCheck.vue

@@ -166,8 +166,8 @@
                         <p>暂无数据</p>
                         </template>
      <el-table-column type="selection" width="55" />
-     <el-table-column property="snId" label="开始节点"/>
-     <el-table-column property="enId" label="结束节点"/>
+     <!-- <el-table-column property="snId" label="开始节点"/>
+     <el-table-column property="enId" label="结束节点"/> -->
      <el-table-column property="id" label="编号" width="70"/>
      <el-table-column property="name" label="名称" width="70"/>
      <el-table-column property="sectionType" label="截面类型" width="120"/>

+ 2 - 2
src/view/components/PipeIine.vue

@@ -39,8 +39,8 @@
         <p>暂无数据</p>
      </template>
      <el-table-column type="selection" width="55" />
-     <el-table-column property="snId" label="开始节点"/>
-     <el-table-column property="enId" label="结束节点"/>
+     <!-- <el-table-column property="snId" label="开始节点"/>
+     <el-table-column property="enId" label="结束节点"/> -->
      <el-table-column property="id" label="编号" width="70"/>
      <el-table-column property="name" label="名称" width="70"/>
      <el-table-column property="sectionType" label="截面类型" width="120"/>

+ 2 - 2
src/view/evolutionView.vue

@@ -174,8 +174,8 @@
         <p>暂无数据</p>
         </template>
        <el-table-column type="selection" width="55" />
-       <el-table-column property="snId" label="开始节点"/>
-       <el-table-column property="enId" label="结束节点"/>
+       <!-- <el-table-column property="snId" label="开始节点"/>
+       <el-table-column property="enId" label="结束节点"/> -->
        <el-table-column property="id" label="编号" width="70"/>
        <el-table-column property="name" label="名称" width="70"/>
        <el-table-column property="sectionType" label="截面类型" width="120"/>

+ 3 - 2
src/view/index/first-left.vue

@@ -685,18 +685,19 @@ function sliderchange(val) {
 const tableRowClassName=()=>{
 
 }
+//下载报告
 function downloadImg(url, fileName) {
   if(aid.value==null||aid.value==''||aid.value==undefined){
     ElMessage.error('项目不存在');
   }else{
-  let href="http://localhost:5173/api/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
+  let href="/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
-    a.href = href+'aid='+aid.value+"&transCode=D000017&"+'step='+fcon.step;
+    a.href =import.meta.env.VITE_BASE_URL+href+'aid='+aid.value+"&transCode=D20013&"+'step='+fcon.step;
     console.log( a.href );
     a.download = fileName;
     a.click();

+ 4 - 3
src/view/index/index.vue

@@ -38,6 +38,7 @@ const props = defineProps({
   },
 
 });
+let claername=ref('');
 let firstleftref=ref();
 let towrightref=ref();
 let btnindex=ref(0);
@@ -74,8 +75,9 @@ const changeColor=(index)=>{
    
 }
 //隐藏所有
-const clearconst=()=>{
-  firstleftref.value.isshow=false;
+const clearconst=(key,name)=>{
+  claername.value=name;
+  changeColor(key)
         // emit("hiadden", null);
 }
 // 求解成功后调用右边
@@ -91,7 +93,6 @@ const firstshowfuc=()=>{
 const indexchange=(key)=>{
   if(key==0){
     towrightref.value.towshow=false;
-    console.log(props.state);
     if(props.state=='1'){
       firstleftref.value.firstshow=true;
       console.log( firstleftref.value.firstshow);

+ 2 - 2
src/view/result/Wdisaster.vue

@@ -103,14 +103,14 @@ function downloadImg(url, fileName) {
   if(aid.value==null||aid.value==''||aid.value==undefined){
     ElMessage.error('项目不存在');
   }else{
-  let href="http://localhost:5173/api/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
+  let href="/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
-    a.href = href+'aid='+aid.value+"&transCode=D000017&"+'step='+steps.value;
+    a.href =import.meta.env.VITE_BASE_URL+href+'aid='+aid.value+"&transCode=D20013&"+'step='+steps.value;
     console.log( a.href );
     a.download = fileName;
     a.click();

+ 2 - 2
src/view/result/Wdisaster2.vue

@@ -102,14 +102,14 @@ function downloadImg(url, fileName) {
   if(aid.value==null||aid.value==''||aid.value==undefined){
     ElMessage.error('项目不存在');
   }else{
-  let href="http://localhost:5173/api/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
+  let href="/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
-    a.href = href+'aid='+aid.value+"&transCode=D000017&"+'step='+steps.value;
+    a.href =import.meta.env.VITE_BASE_URL+href+'aid='+aid.value+"&transCode=D20013&"+'step='+steps.value;
     console.log( a.href );
     a.download = fileName;
     a.click();

+ 1 - 1
src/view/result/leftcontent.vue

@@ -16,6 +16,7 @@
                     <el-radio label="Fire">火灾</el-radio>
                     <el-radio label="Water">突水</el-radio>
                     <el-radio label="Gass">瓦斯爆炸</el-radio>
+                    <el-radio label="Gass1">一维瓦斯爆炸</el-radio>
                 </el-radio-group>
             </div>
 
@@ -943,7 +944,6 @@ function initWebSocket() {
     //初始化weosocket
     // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid; ws://192.168.0.131/diswebsocket?projectId=5
     const wsurl = import.meta.env.VITE_WEBSOCKET_URL + aid.value
-    console.log(wsurl);
     websock = new WebSocket(wsurl);
     websock.onopen = websocketonopen;
     websock.onmessage = websocketonmessage;