12.14

package-lock.json

@@ -23,6 +23,7 @@
         "sass": "^1.71.1",
         "sass-loader": "^13.3.3",
         "snabbdom": "^3.6.2",
+        "v-fit-columns": "^0.2.0",
         "v-scale-screen": "^2.2.0",
         "vtk.js": "^31.0.0",
         "vue": "^3.3.4",
@@ -7281,6 +7282,11 @@
       "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/v-fit-columns": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/v-fit-columns/-/v-fit-columns-0.2.0.tgz",
+      "integrity": "sha512-xR0jIFmTyJeg4VZgEx7z8BIijZnHQegtbwAhG3L3TmyAoq/TXk7H6vzFLNxAVzOj9pSpO/0B2mf7jmuO2nE4Ag=="
+    },
     "node_modules/v-scale-screen": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/v-scale-screen/-/v-scale-screen-2.2.0.tgz",

package.json

@@ -26,6 +26,7 @@
     "sass": "^1.71.1",
     "sass-loader": "^13.3.3",
     "snabbdom": "^3.6.2",
+    "v-fit-columns": "^0.2.0",
     "v-scale-screen": "^2.2.0",
     "vtk.js": "^31.0.0",
     "vue": "^3.3.4",

src/main.js

@@ -15,6 +15,7 @@ import '@/utils/flexible'
 // import '../public/static/Build/Build.data'
 import directive from '@/utils/directive'
 import './style/style.css'
+import Plugin from 'v-fit-columns';
 
 
 // import mitt from 'mitt'
@@ -27,6 +28,7 @@ createApp(App)
     .use(createPinia)
     .use(VScaleScreen)
     .use(directive)
+     .use(Plugin)
     // .use(mitt)
     //.use(Vuex)
     .mount('#app')

src/main.ts

@@ -1,4 +1,5 @@
 import { createApp } from 'vue'
+
 import './style.css'
 import App from './App.vue'
 //1、route
@@ -17,7 +18,7 @@ import '@/js/lindex.js'
 //4、引入echarts
 import * as echarts from 'echarts'
 import './style/style.css'
-
+ import  Plugin  from 'v-fit-columns';
 const app = createApp(App)
 
 //1、route
@@ -26,7 +27,9 @@ app.use(router)
 app.use(pinia)
 //3、element-plus
 app.use(ElementPlus)
+app.use(Plugin)
 //4、放入全局
+app.directive('fit-columns', Plugin);
 app.config.globalProperties.$echarts = echarts
 app.mount('#app')
 app.config.errorHandler = function (err, vm, info) {

src/view/components/Fengmen.vue

@@ -261,6 +261,7 @@
   import pipelines from "./PipeIine.vue"
   import { vtkmodel } from "@/control/vtkModel.js";
   let zqname=ref();
+  let tableHeight=ref(200)
   let currentrow=ref();
   let pipeline = ref();
   let sdialog=ref({

src/view/components/InfoBoundary.vue

@@ -483,6 +483,7 @@ const  changeClass= (i)=>  {
   console.log(i);
  isActive.value = i;
 }
+let tishi=ref('');
 let currentrow=ref();
 const changeModel = () => {
   vtkmodel.clearJgAddMode();
@@ -650,6 +651,7 @@ const bounadd = () => {
   bformInline.value.polcon1 = "0";
   bformInline.value.polcon2 = "0";
   buntext.value = "添加";
+  tishi.value= buntext.value;
   xiugaiobj.value={};
   if (props.classradio == "Fire" ||props.classradio == "Gass") {
     bformInline.value.type = "Pressure";
@@ -669,6 +671,7 @@ const xiudelete = () => {
 
 const xiugai = () => {
   buntext.value = "修改";
+  tishi.value= buntext.value;
   if (JSON.stringify(xiugaiobj.value) == "{}") {
     ElMessage.error("你还没有选中修改的项目");
   } else {
@@ -709,6 +712,10 @@ const accidentboun = () => {
   };
   request(params)
     .then((res) => {
+      ElMessage({
+        message: tishi.value+"边界设置成功",
+        type: "success",
+      });
       addboundary(aid.value);
     })
     .catch((err) => {
@@ -748,7 +755,7 @@ const fundeledata = () => {
   request(params)
     .then((res) => {
       ElMessage({
-        message: "删除成功",
+        message: "边界删除成功",
         type: "success",
       });
       addboundary(aid.value);

src/view/components/InfoDisaster.vue

@@ -313,7 +313,7 @@
                           </template>
                         </el-table-column>
                         <!-- <el-table-column prop="site" label="性能曲线数据量"  /> -->
-                        <el-table-column label="操作" >
+                        <!-- <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
                               size="small"
@@ -322,7 +322,7 @@
                               >查看</el-button
                             >
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -1380,7 +1380,7 @@
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
           <el-image :src="icon" fit="contain"></el-image>
-          <h4 :id="titleId" :class="titleClass">添加</h4>
+          <h4 :id="titleId" :class="titleClass">{{ zhtext}}</h4>
         </div>
       </template>
       <div>
@@ -1762,7 +1762,7 @@ let searchtaggd = ref("");
 let total = ref(1);
 let gdadd = ref("0");
 let jcadd = ref();
-let tableHeight = ref(150);
+let tableHeight = ref(200);
 const multipleTableRef = ref();
 const multipleSelection = ref([]);
 const formLabelWidth5 = ref(77);
@@ -2075,9 +2075,10 @@ const xiugaiapi = () => {
     .then((res) => {
       handledisaster(aid.value);
       ElMessage({
-        message: res.returnMsg,
+        message: "保存成功",
         type: "success",
       });
+      sdialog.value.dianadddialog = false
     })
     .catch((err) => {});
 };
@@ -2187,7 +2188,7 @@ const addjiancf = () => {
     request(params)
       .then((res) => {
         ElMessage({
-          message: res.returnMsg,
+          message: '添加成功',
           type: "success",
         });
         getinquire();
@@ -2369,6 +2370,9 @@ const wsaddblast=()=>{
   Gassdialog.value.wsaddarea= true;
   currentrow1.value=false;
   wasi.value.blastdata={};
+  vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
 }
 const wsbalastadd=()=>{
   wasi.value.pid=firepid.value;
@@ -2384,7 +2388,7 @@ const wsbalastadd=()=>{
   request(params)
     .then((res) => {
       ElMessage({
-        message: res.returnMsg,
+        message: zhtext.value+"瓦斯爆炸区域",
         type: "success",
       });
       Gassdialog.value.wsaddarea= false;
@@ -2416,6 +2420,9 @@ const wsxiugai2=()=>{
   selectstr.value =wasi.value.blastdata.pname;
   firepid.value =wasi.value.blastdata.pid;
   Gassdialog.value.wsaddarea= true;
+  vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
 }
 }
 const handleblastxg=(data)=>{
@@ -2443,7 +2450,7 @@ const wsblastdelete1=()=>{
   request(params)
     .then((res) => {
       ElMessage({
-        message:"删除成功",
+        message:"删除瓦斯爆炸区域成功",
         type: "success",
       });
       Gassdialog.value.wsaddarea= false;
@@ -2499,7 +2506,7 @@ const wsgatheradd=()=>{
   request(params)
     .then((res) => {
       ElMessage({
-        message: res.returnMsg,
+        message:  zhtext.value+"积聚区成功",
         type: "success",
       });
       Gassdialog.value.wsaddgather=false;
@@ -2512,7 +2519,8 @@ const wsgatheradd=()=>{
 // 灾害源检测的修改
 const zaiyuxiugai = () => {
   zaihai.value.addEied = "x";
-  zhtext.value = "修改";
+  zhtext.value='修改';
+  console.log( zhtext.value);
   if (JSON.stringify(jiancobj.value) == "{}") {
     ElMessage.error("你还没有选中修改的项目");
   } else {
@@ -2543,7 +2551,7 @@ const zaiyuxiugaiapi = () => {
   request(params)
     .then((res) => {
       ElMessage({
-        message: res.returnMsg,
+        message:"修改成功",
         type: "success",
       });
       getinquire();
@@ -2709,9 +2717,10 @@ const  pumpxz=(val)=>{
   source.site=val.site;
   selectstr.value=val.pname;
   pumpobj.value.onoff=val.onoff;
+  lookpump(val)
 }
 //查看
-const lookpump=(index,row)=>{
+const lookpump=(row)=>{
   sdialog.value.linetable=true;
   pumpobj.value.pumpid=row.pumpid;
   xngetdata();

src/view/components/MenuCheck.vue

@@ -263,7 +263,7 @@ let source=ref({
 })
 let  firepid=ref("")
 const resultactiveName = ref("first");
-let tableHeight = ref(160);
+let tableHeight = ref(200);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();

src/view/components/MenuMine.vue

@@ -105,11 +105,11 @@
                                             <el-table-column property="name" label="名称"/>
                                             <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" />
+                                            <!-- <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 pagination" style="margin-top: 20px;">
                                             <el-config-provider :locale="zhCn">
@@ -264,7 +264,7 @@
 </div>
     <div class="demo-input-suffix firsttitle magintop guand_1">
         <el-form-item label="截面类型" :label-width="formLabelWidth7">
-            <el-select v-model="guandaoobj.sectionType" placeholder="请选择">
+            <el-select v-model="guandaoobj.sectionType" placeholder="请选择" @change="changejm">
                 <el-option v-for="item in options" :key="item.id"
                     :label="item.label"
                     :value="item.value"> 
@@ -296,19 +296,19 @@
             </div>
         </el-form-item>
     </div>
-    <el-form-item label="截面参数1" :label-width="formLabelWidth7">
+    <el-form-item   :label="labelobj.v1" :label-width="formLabelWidth7" v-show="labelobj2.isshow1" >
         <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-form-item  :label="labelobj.v2" :label-width="formLabelWidth7" v-show="labelobj2.isshow2"  >
         <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-form-item  :label="labelobj.v3" :label-width="formLabelWidth7" v-show="labelobj2.isshow3" >
         <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-form-item  :label="labelobj.v4" :label-width="formLabelWidth7" v-show="labelobj2.isshow4" >
         <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-form-item  :label="labelobj.v5" :label-width="formLabelWidth7" v-show="labelobj2.isshow5" >
         <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">
@@ -629,7 +629,25 @@
 //   import Menufile from "./MenuFile.vue"
 //   import upFile from "./upfile.vue";
 // 
-
+// let labelobj=ref(
+//     {v1:"截面信息1"},
+//     {v2:"截面信息2",isshow:true},
+//     {v3:"截面信息3",},
+//     {v4:"截面信息4"},
+//     {v5:"截面信息5",isshow:false},
+//     // {v3:"截面信息3", v4:"截面信息4", v5:"截面信息5",show:true}
+// )
+// let labelobj=ref(
+//     {v1:"截面信息1"},
+//     {v2:"截面信息2"},
+//     {v3:"截面信息3"},
+//     {v4:"截面信息4"},
+//     {v5:"截面信息5"},
+// )
+let labelobj=ref({v1:"截面信息1",v2:"截面信息2",v3:"截面信息3", v4:"截面信息4", v5:"截面信息5"})
+let labelobj2=ref(
+    {isshow1:true,isshow2:false,isshow3:false, isshow4:false, isshow5:false}
+)
 let zuli=ref({
     zidiny:'',
     jsuan:''
@@ -941,6 +959,50 @@ let tishi=ref('');
       }
   
   }
+// 界面
+const changejm=(val)=>{
+console.log(val);
+    if(val=='CIRCULAR'){
+        labelobj.value.v1='直径';
+        labelobj2.value={isshow1:true,isshow2:false,isshow3:false, isshow4:false, isshow5:false}
+    }else if(val=='RECTANGLE'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='顶宽';
+        labelobj2.value={isshow1:true,isshow2:false,isshow3:false, isshow4:false, isshow5:false}
+    }else if(val=='SEMICIRCULAR'||val=='BASKETHANDLE'||val=='HORSESHOE'||val=='CATENARY'||val=='SEMIELLIPTICAL'||val=='EGG'||val=='GOTHIC'){
+        labelobj.value.v1='全高';
+        labelobj2.value={isshow1:true,isshow2:false,isshow3:false, isshow4:false, isshow5:false}
+    }else if(val=='MODBASKETHANDLE'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='底宽';
+        labelobj.value.v3='顶部半径*5';
+        console.log()
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:true, isshow4:false, isshow5:false}
+    }else if(val=='ARCH'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='最大宽度';
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:false, isshow4:false, isshow5:false}
+    }else if(val=='RECT_ROUND'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='顶宽';
+        labelobj.value.v3='底部半径';
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:true, isshow4:false, isshow5:false}
+    }else if(val=='RECT_ROUND'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='顶宽';
+        labelobj.value.v3='底部半径';
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:true, isshow4:false, isshow5:false}
+    }else if(val=='RECT_TRIANGULAR'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='顶宽';
+        labelobj.value.v3='三角形高度';
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:true, isshow4:false, isshow5:false}
+    }else if(val=='VERT_ELLIPSE'||val=='HORZI_ELLIPSE'){
+        labelobj.value.v1='全高';
+        labelobj.value.v2='最大宽度^3';
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:false, isshow4:false, isshow5:false}
+    }
+}
   //选中node节点的一行
   const handleDelete = (val) => {
       currentrow.value = true;
@@ -950,9 +1012,8 @@ let tishi=ref('');
   const handleDelete2 = (val) => {
       currentrow1.value = true;
       gddata.value = val;
-      console.log(val);
-      gfname.value= gddata.value.gfname
-    bfname.value= gddata.value.bfname
+      gfname.value= gddata.value.gfname;
+    bfname.value= gddata.value.bfname;
   
   }
   //node删除
@@ -1058,6 +1119,7 @@ let tishi=ref('');
       guandaoobj.value.sectionPara3 = '';
       guandaoobj.value.sectionPara4 = '';
       guandaoobj.value.sectionPara5 = '';
+      changejm( guandaoobj.value.sectionType);
       gfname.value="";
      bfname.value="";
      gddata.value={};
@@ -1213,7 +1275,9 @@ let tishi=ref('');
           case '悬链式':
           guandaoobj.value.sectionType='CATENARY'
           break;
+
       }
+      changejm(guandaoobj.value.sectionType);
         //   guandaoobj.value.sectionPara4 = gddata.value.sectionPara4;
         //   guandaoobj.value.sectionPara5 = gddata.value.sectionPara5;;
           Gassaddgfid( gddata.value.gfid);

src/view/components/MenuPhysics.vue

@@ -151,7 +151,7 @@ const formLabelWidth6 = ref(100);
 let add = ref("")
 const resultactiveName = ref("first");
 let coolactiveName1 = ref(["1", "2"]);
-let tableHeight = ref(145);
+let tableHeight = ref(200);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();

src/view/components/MenuSensor.vue

@@ -150,7 +150,7 @@ const formLabelWidth6 = ref(100);
 let coolactiveName1 = ref(["1", "2"]);
 let add = ref("")
 const resultactiveName = ref("first");
-let tableHeight = ref(180);
+let tableHeight = ref(200);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();

src/view/components/Menupath.vue

@@ -265,7 +265,7 @@
  let delt=ref();
  const resultactiveName = ref("first");
  let coolactiveName1 = ref(["1", "2"]);
- let tableHeight = ref(145);
+ let tableHeight = ref(200);
  let tableData = ref([]);
  let tableobj = ref({});
  let wnid=ref();

src/view/evolutionView.vue

@@ -180,11 +180,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">

src/view/index/first-left.vue

@@ -66,6 +66,8 @@
                         @row-click="handleDelete($event)"
                         :highlight-current-row="currentrow1" 
                         :max-height="tableHeight"
+                        :fit="true"
+                        v-fit-columns
                       >
                       <template v-slot:empty>
                           <p>暂无数据</p>
@@ -111,7 +113,7 @@
                 <div class="Firetile"><span>压力（Pa）：</span><span class="text2">{{ pa }}</span></div>
               </div>
             <div class="echart">
-            <div id="line" style="width: 1.526rem;height:.9375rem;"></div></div>
+            <div id="line" style="width:1.66649rem;rem;height:.9375rem;"></div></div>
             <div class="zongji"  v-if="props.classradio=='Water'" >
                 <div class="zongjili img3">{{ heightnum }}<span>m</span></div>
                 <div class="zongjili img4">
@@ -233,6 +235,7 @@ import t2 from "@/assets/img/t2.png";
 import t3 from "@/assets/img/t3.png";
 import t4 from "@/assets/img/t4.png";
 import htmldialog from "./htmldialog.vue"
+import VFitColumns from 'v-fit-columns';
 import emitter from "@/utils/emitter";
 let firstshow = ref(false);
 let timeshow=ref(true);
@@ -871,8 +874,9 @@ let option = {
   //   x: 'left',
   // },
   grid: {
-    left: '3%',
-    right: '4%',
+    left: '2%',
+    right: '2%',
+    top:'15%',
     bottom: '3%',
     containLabel: true
   },

src/view/result/Wdisaster.vue

@@ -329,6 +329,7 @@ const lineChart=()=>{
     left: '3%',
     right: '4%',
     bottom: '3%',
+    top:'30%',
     containLabel: true
   },
 

src/view/result/Wdisaster2.vue

@@ -319,6 +319,7 @@ const lineChart=()=>{
     left: '3%',
     right: '4%',
     bottom: '3%',
+    top:'30%',
     containLabel: true
   },