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

src/style/style.css

@@ -260,6 +260,9 @@ color: #fff;
   /* .el-dialog__header{
     padding: 0 20px;
   } */
+  .el-pagination__total{
+    color: #fff !important;
+  }
   .dialog_class .my-header {
     line-height: 10px;
     height: 40px;
@@ -284,6 +287,7 @@ color: #fff;
 }
   .dialog_class .my-header .el-image {
     padding: 0px 10px 0 0;
+    margin-top: -4px;
   }
   .dialog_class .my-header h4 {
     font-weight: bold;
@@ -1799,7 +1803,7 @@ color: #FFF500 ;
   text-align: left;
   background-image: url(../assets/img/Group1275.png);
   background-size: 100% 100%;
-  padding-left: 50px;
+  padding-left: 30px;
 }
 .resultleftxian{
   box-shadow: inset -4px 7 12px 0px rgba(140,198,255,0.01);
@@ -1922,7 +1926,7 @@ background-color: #52C6FF  !important;
 
 }
 .zongji .img3{
-    font-size: 16px;
+    font-size: 18px;
     width: 85px;
     height: 60px;
     line-height: 66px;
@@ -1930,8 +1934,8 @@ background-color: #52C6FF  !important;
 
 }
 .zongji .jcshijian{
-  line-height: 1.2;
-  font-size:12px;
+  line-height: 1.1;
+  font-size:13px;
   text-align: center;
   white-space:nowrap;
 }
@@ -2119,7 +2123,7 @@ background-color: rgba(0, 0, 0, 0);
  text-align: left !important;
 }
 .woter{
-  font-size: var(--el-form-label-font-size);
+  font-size: 14px;
   padding-bottom: 5px;
 }
 @media screen and (max-width:1650px){

src/view/InfoDialoges.vue

@@ -48,8 +48,10 @@
                 :highlight-current-row="currentrow"
                     element-loading-background="rgba(0, 10, 0,0)" :row-class-name="tableRowClassName"
                     :header-cell-style="{ 'background': 'rgba(0, 10, 0,0)' }" @select="projectsSelectionSelect">
+                    <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                     <el-table-column width="50">
-
                         <template #default="scope">
                             <el-radio v-model="scoperadio" :label="scope.row.aid"
                                 @change="getRadioRow(scope.row)"></el-radio>
@@ -180,9 +182,11 @@
                                                 <div class="demo-datetime-picker">
                                                     <!-- <span class="inputtext_1">选择时间</span> -->
                                                     <div class="block">
+                                                        <el-config-provider :locale="zhCn">
                                                         <el-date-picker v-model="tuiyanobj.pickertime" type="datetime"
-                                                            placeholder="Pick a Date" format="YYYY-MM-DD HH:mm:ss"
+                                                            placeholder="时间选择" format="YYYY-MM-DD HH:mm:ss"
                                                             @change="timeclick()" />
+                                                        </el-config-provider>    
                                                     </div>
                                                 </div>
                                             </li>
@@ -257,10 +261,12 @@
                                                 <div class="demo-datetime-picker">
                                                     <!-- <span class="inputtext_1">选择时间</span> -->
                                                     <div class="block">
+                                                        <el-config-provider :locale="zhCn">
                                                         <el-date-picker v-model="tuiyanobj.pickertime" type="datetime"
-                                                            placeholder="Pick a Date" format="YYYY-MM-DD HH:mm:ss"
+                                                            placeholder="时间选择" format="YYYY-MM-DD HH:mm:ss"
                                                             value-format="YYYY-MM-DD HH:mm:ss" @change="timeclick()" />
-                                                    </div>
+                                                        </el-config-provider>
+                                                        </div>
                                                 </div>
                                             </li>
                                             <li>

src/view/components/InfoAnimation.vue

@@ -111,6 +111,9 @@
                   :max-height="tableHeight"
                   :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
                 >
+                <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                   <el-table-column prop="name" label="监测点名称" />
                   <el-table-column prop="value" label="水位(m)" />
                   <el-table-column prop="value2" label="流量" />
@@ -898,7 +901,7 @@ defineExpose({ monitor, accident5 });
 
     h4 {
       font-weight: bold;
-      font-size: 12px;
+      font-size: 14px;
       color: #68adff;
       line-height: 14px;
       text-align: left;

src/view/components/InfoBoundary.vue

@@ -33,6 +33,9 @@
                         @row-click="handleDelete($event)"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="nname" label="节点选择" />
                         <!-- <el-table-column prop="type" label="边界类型" /> -->
 
@@ -153,6 +156,9 @@
                         @row-click="handleDelete($event)"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="nname" label="节点选择" />
                         <el-table-column prop="type" label="边界类型" />
                       </el-table>
@@ -383,6 +389,9 @@
           @select="projectsSelectionSelect"
            :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
         >
+        <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
           <el-table-column type="selection" width="55" />
           <el-table-column property="id" label="节点编号" />
           <el-table-column property="name" label="名称" />
@@ -729,7 +738,7 @@ const handleDelete = (val) => {
   currentrow.value=true;
   xiugaiobj.value = val;
   bid.value = val.bid;
-  zqname.value = val.nid;
+  zqname.value = val.nname;
 };
 const fundeledata = () => {
   const params = {

src/view/components/InfoDisaster.vue

@@ -24,6 +24,9 @@
                         :max-height="tableHeight"
                         :row-class-name="tableRowClassName"
                       >
+                      <template  v-slot:empty>
+                        <p>暂无数据</p>
+                      </template>
                         <el-table-column prop="pname" label="选择巷道" />
                         <el-table-column prop="site" label="位置" />
                         <el-table-column label="操作" >
@@ -82,6 +85,9 @@
                         @row-click="handleDelete2($event)"
                         :highlight-current-row="currentrow1" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="timeline" label="时间"  />
                         <el-table-column prop="val1" label="温度℃" />
                         <el-table-column prop="val2" label="二氧化碳(%)"  />
@@ -149,6 +155,9 @@
                         :max-height="tableHeight"
                         :highlight-current-row="currentrow" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="pname" label="选择巷道"  />
                         <el-table-column prop="site" label="位置"  />
                         <el-table-column label="操作" >
@@ -207,10 +216,13 @@
                         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" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="timeline" label="时间/s" />
                         <el-table-column prop="val1" label="突水量（m³/s）" />
                       </el-table>
@@ -277,6 +289,9 @@
                         max-height="350px"
                         :highlight-current-row="currentrow" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                       <el-table-column type="index" label="序号" width="100"/>
                         <el-table-column prop="gfname" label="网格文件"  />
                         <el-table-column prop="bfname" label="边界文件"  />
@@ -336,6 +351,9 @@
                         @row-click="handleblastxg($event)"
                         :highlight-current-row="currentrow1" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="pname" label="巷道" />
                         <el-table-column prop="ssite" label="开始位置" />
                         <el-table-column prop="esite" label="结束位置" />>
@@ -388,6 +406,9 @@
                         @row-click="handlegather($event)"
                         :highlight-current-row="currentrow2" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                         <el-table-column prop="name" label="区域名" />
                        
                         <el-table-column
@@ -729,7 +750,6 @@
             <el-button
               @click="
                 handleEditfire();
-                sdialog.dianadddialog = false;
               "
             >
               确定
@@ -777,6 +797,9 @@
           @select="projectsSelectionSelect"
           :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
         >
+        <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
           <el-table-column type="selection" width="55" />
           <el-table-column property="snId" label="开始节点" />
           <el-table-column property="enId" label="结束节点" />
@@ -926,23 +949,23 @@
       <div>
         <el-form class="demo-form-inline inputnuber">
           <el-form-item label="时间/s" :label-width="formLabelWidth6">
-            <el-input-number
+            <el-input
             :min="0"
-              v-model="Disastersource.timeline"
+              v-model.number="Disastersource.timeline"
               class="w-50 m-2"
-              maxlength="15" 
+              :maxlength="8"
               :precision="0"
               placeholder="请输入时间秒"
               oninput ="value=value.replace(/[^0-9]/g,'')" 
             />
           </el-form-item>
           <el-form-item label="突水量（m³/s）"   :label-width="formLabelWidth6">
-            <el-input-number
-              v-model="Disastersource.val1"
+            <el-input
+              v-model.number="Disastersource.val1"
               class="w-50 m-2"
               placeholder="请输入"
               :min="0"
-              maxlength="15"  
+              :maxlength="8"  
               :precision="0"
               oninput ="value=value.replace(/[^0-9]/g,'')" 
              
@@ -1023,7 +1046,7 @@
       </template>
       <h4 class="delecttitle">
         <!-- //{{ zqname }} -->
-        是否确认删除 <span class="spanclad"></span>
+        是否确认删除 <span class="spanclad">{{zqname  }}</span>
       </h4>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
@@ -1268,6 +1291,7 @@ const fireadd = () => {
   tableobj.value={};
   if(firepid.value==null||firepid.value==""){
     ElMessage.error("巷道不能为空")
+    //sdialog.value.dianadddialog = false;
   }else{
   const params = {
     transCode: "D00004",
@@ -1278,10 +1302,12 @@ const fireadd = () => {
   };
   request(params)
     .then((res) => {
+  
       ElMessage({
         message: res.returnMsg,
         type: "success",
       });
+      sdialog.value.dianadddialog = false;
       handledisaster(aid.value);
       fun3D();
     })
@@ -1319,10 +1345,8 @@ const closeDialog=()=>{
 state.value=sessionStorage.getItem("state");
   if(state.value=='1'){
     vtkmodel.clearModeAddJg();
-    console.log(11111);
   }else{
     vtkmodel.selectNoting();
-    console.log(22222);
   }//节点图形
   vtkmodel.clearpipsite();//清除选择巷道的位置
   dialogtrue.value.timintclaer();
@@ -1331,10 +1355,10 @@ state.value=sessionStorage.getItem("state");
 const handleEditfire = () => {
   if (gdadd.value == "1") {
     fireadd();
-    sdialog.value.dianadddialog = false;
+  //  sdialog.value.dianadddialog = false;
   } else if (gdadd.value == "2") {
     if (props.classradio == "Fire") {
-      sdialog.value.dianadddialog = false;
+     // sdialog.value.dianadddialog = false;
     }
   } else if ((gdadd.value = "3")) {
     xiugaiapi();
@@ -1420,6 +1444,7 @@ const handleCurrentChange = (val) => {
 };
 //新建fire
 const newtable = (e) => {
+
   var e = e || window.Event;
   styX.value.left = e.clientX + "px";
   console.log(styX.value.left);
@@ -1430,10 +1455,13 @@ const newtable = (e) => {
   source.site = 0;
   newtable.value = "1";
   gdadd.value = "1";
+
   zhtext.value = "添加";
   vtkmodel.clearJgAddMode() ;
   vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
+
+
 };
 //  修改
 const xiugaitable = () => {
@@ -1627,7 +1655,6 @@ const wanewadd=()=>{
 
 }
 const Gassadd=()=>{
-  Gassdialog.value.wsaddshow=false;
   console.log(firepid.value);
   const params = {
     transCode: "D10021",
@@ -1643,6 +1670,7 @@ console.log(params);
         type: "success",
       });
       Gassdialog.value.wsaddflie= false;
+      Gassdialog.value.wsaddshow=false
       Gassgetdata(aid.value);
       fun3D();
     })
@@ -1674,7 +1702,8 @@ const wsdelete=()=>{
   if (JSON.stringify(tableobj.value) == "{}") {
  ElMessage.error("你还没有选中删除的项目")
  } else {
-      zqname.value= tableobj.value.bfname+"-"+ tableobj.value.gfname;
+      //zqname.value= tableobj.value.bfname+"-"+ tableobj.value.gfname;
+      zqname.value= tableobj.value.pname;
       Gassdialog.value.wsdelete=true;
  }
 }

src/view/components/InfoRun.vue

@@ -48,6 +48,9 @@
                 :highlight-current-row="currentrow"
                     element-loading-background="rgba(0, 10, 0, 0.1)" :row-class-name="tableRowClassName"
                     :header-cell-style="{ 'background': ' #375A88' }" @select="projectsSelectionSelect">
+                    <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                     <el-table-column width="50">
 
                         <template #default="scope">

src/view/components/MenuCheck.vue

@@ -25,6 +25,9 @@
                                     :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
+                                    <template v-slot:empty>
+                                    <p>暂无数据</p>
+                                    </template>
                                     <el-table-column type="index" label="编号"  width="70" />
                                     <el-table-column prop="chcode" label="监测点编号"  width="100" />
                                     <el-table-column prop="chname" label="名称" />
@@ -65,7 +68,7 @@
 
                 </div>
             </template>
-            <h4 class="delecttitle"> 是否确认删除 <span class="spanclad">巷道{{ zqname }}</span></h4>
+            <h4 class="delecttitle"> 是否确认删除 <span class="spanclad">{{ zqname }}</span></h4>
             <div class="dialog-footer footer_div l_btn">
                 <div class="footerbtn flex1">
                     <div class="borderimg"><el-button @click="dialogsgdelect = false">取消</el-button></div>
@@ -157,8 +160,11 @@
      :data="tableData2"
      style="width: 100%"
      @select="projectsSelectionSelect"
-     :header-cell-style="{'background':'rgba(13, 22, 57, 0.96) '}"
+     :header-cell-style="{'background':'rgba(13, 22, 57, 0) '}"
    >
+   <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
      <el-table-column type="selection" width="55" />
      <el-table-column property="snId" label="开始节点"/>
      <el-table-column property="enId" label="结束节点"/>
@@ -217,6 +223,7 @@ const formLabelWidth6 = ref(100);
 const formLabelWidth5=ref(90);
 const multipleTableRef = ref()
 const multipleSelection = ref([])
+let tishi=ref();
 let add = ref("");
 let tableData2=ref([]);
 let sdialog=ref({
@@ -280,6 +287,10 @@ const fundeledata=()=>{
     }
     request(params)
         .then((res) => {
+            ElMessage({
+                message: '删除监测点成功',
+                type: 'success',
+            })
             getsensor();
         })
         .catch((err) => {
@@ -307,6 +318,7 @@ const getsensor = () => {
 //添加
 const addsg = () => {
     add.value = "添加";
+    tishi.value=add.value;
     addVisible.value = true; 
     currentrow.value=false;
     source.value.selectstr='';
@@ -332,7 +344,7 @@ const addEditaip=()=>{
         .then((res) => {
             sdialog.value.dianadddialog=false;
             ElMessage({
-                message: res.returnMsg,
+                message: tishi.value+'监测点成功',
                 type: 'success',
             })
       
@@ -348,6 +360,7 @@ const addEditaip=()=>{
 //修改
 const amend = () => {
     add.value = "修改";
+    tishi.value=add.value;
     if (JSON.stringify(tableobj.value) == '{}') {
         ElMessage.error("你还没有选中修改的项目")
     } else {

src/view/components/MenuMine.vue

@@ -33,6 +33,9 @@
                                             :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                             @row-click="handleDelete($event)"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57,0) ' }">
+                                            <template v-slot:empty>
+                                            <p>暂无数据</p>
+                                            </template>
                                             <el-table-column prop="id"  label="序号" width="80px" />
                                             <el-table-column prop="code" label="节点编号" />
                                             <el-table-column prop="name" label="节点名称" />
@@ -92,6 +95,9 @@
                                             ref="multipleTableRef" :highlight-current-row="currentrow1"
                                             @row-click="handleDelete2($event)" :data="tableData3" style="width: 100%"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
+                                            <template v-slot:empty>
+                                            <p>暂无数据</p>
+                                            </template>
                                                   <el-table-column property="id" label="序号"  />
                                             <el-table-column property="snId" label="开始节点" />
                                             <el-table-column property="enId" label="结束节点" />
@@ -407,6 +413,7 @@ let bfid=ref("");
 let gfname=ref("");
 let bfname=ref("");
 // 
+let tishi=ref('');
   let nodeselect = ref();
   let dialogVisible = ref(false);
   let tableData2 = ref([]);
@@ -571,6 +578,7 @@ let bfname=ref("");
       nodeobj.value.nid = '';
       nodeobj.value.code = '';
       nodedata.value={};
+      tishi.value='保存';
   }
   //节点添加api
   const nodeconfirm = () => {
@@ -586,7 +594,6 @@ let bfname=ref("");
       }else if(nodeobj.value.z==null||nodeobj.value.z==''){
           ElMessage.error("Z不能为空")
       } else if(nodeobj.value.name!=''&&nodeobj.value.x!=''&&nodeobj.value.y!=''&&nodeobj.value.z!=''){
-     
       const params = {
           transCode: 'D10000',
           nid: nodeobj.value.nid,
@@ -603,7 +610,7 @@ let bfname=ref("");
               sdialog.value.adddialog = false;
               pipelinedata();
               ElMessage({
-                  message: res.returnMsg,
+                  message: '节点'+tishi.value+'成功',
                   type: 'success',
               })
   
@@ -649,7 +656,7 @@ let bfname=ref("");
           .then((res) => {
               pipelinedata();
               ElMessage({
-                  message: res.returnMsg,
+                  message: '节点删除成功',
                   type: 'success',
               })
   
@@ -664,6 +671,7 @@ let bfname=ref("");
           ElMessage.error("你还没有选中修改的项目")
       } else {
           zhtext.value = '修改';
+          tishi.value= zhtext.value;
           sdialog.value.adddialog = true;
           nodeobj.value.name = nodedata.value.name;
           nodeobj.value.x = nodedata.value.x;
@@ -711,6 +719,8 @@ let bfname=ref("");
   // 管道的add
   const guandaoadd = () => {
       sdialog.value.gdadddialog = true;
+      zhtext.value = '添加';
+      tishi.value='保存';
       currentrow1.value = false;
       guandaoobj.value.code = '';
       guandaoobj.value.pid = '';
@@ -759,7 +769,7 @@ let bfname=ref("");
           .then((res) => {
               sdialog.value.gdadddialog = false;
               ElMessage({
-                  message: res.returnMsg,
+                  message: '巷道信息'+tishi.value+'成功',
                   type: 'success',
               })
               guandaodata();
@@ -800,7 +810,7 @@ let bfname=ref("");
           .then((res) => {
               guandaodata();
               ElMessage({
-                  message: res.returnMsg,
+                  message: '巷道信息删除成功',
                   type: 'success',
               })
               gddata.value={};
@@ -815,6 +825,7 @@ let bfname=ref("");
           ElMessage.error("你还没有选中修改的项目")
       } else {
           zhtext.value = '修改';
+          tishi.value=zhtext.value;
           sdialog.value.gdadddialog = true;
           guandaoobj.value.code = gddata.value.code;
           guandaoobj.value.pid = gddata.value.id;

src/view/components/MenuPhysics.vue

@@ -25,6 +25,9 @@
                                 :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
+                                    <template v-slot:empty>
+                                    <p>暂无数据</p>
+                                    </template>
                                     <el-table-column prop="name" label="名称" />
                                     <el-table-column prop="density" label="密度" />
                                     <el-table-column prop="diffcoe" label="扩散系数" />
@@ -86,7 +89,7 @@
                     <div class="borderimg"><el-button @click="addVisible = false">取消</el-button></div>
                 </div>
                 <div class="footerbtn flex1">
-                    <div class="borderimg"><el-button @click="addEied(); addVisible = false">
+                    <div class="borderimg"><el-button @click="addEied();">
                             确定
                         </el-button></div>
                 </div>
@@ -142,6 +145,7 @@ let tableHeight = ref(145);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();
+let tishi=ref();
 let wuliobj = ref({
     coid:'',
     code: '',
@@ -190,6 +194,10 @@ const fundeledata = () => {
     request(params)
         .then((res) => {
             getsensor();
+            ElMessage({
+                message: '删除物理属性成功',
+                type: 'success',
+            })
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -216,6 +224,7 @@ const getsensor = () => {
 //添加
 const addsg = () => {
     add.value = "添加";
+    tishi.value= add.value;
     currentrow.value=false;
     addVisible.value = true;
     wuliobj.value.coid = '';
@@ -243,6 +252,11 @@ const addEied = () => {
         .then((res) => {
             tableData.value = res.rows;
             getsensor();
+            ElMessage({
+                message: tishi.value+'物理属性成功',
+                type: 'success',
+            })
+            addVisible.value = false 
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -251,6 +265,7 @@ const addEied = () => {
 //修改
 const amend = () => {
     add.value = "修改";
+    tishi.value= add.value;
     if (JSON.stringify(tableobj.value) == '{}') {
         ElMessage.error("你还没有选中修改的项目")
     } else {

src/view/components/MenuSensor.vue

@@ -26,6 +26,9 @@
                                 :highlight-current-row="currentrow"  :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
+                                    <template v-slot:empty>
+                                    <p>暂无数据</p>
+                                    </template>
                                     <el-table-column type="index" label="编号"  width="70"/>
                                     <el-table-column prop="type" label="类型" />
                                     <el-table-column prop="pname" label="所在巷道" />
@@ -92,7 +95,7 @@
                     <div class="borderimg"><el-button @click="addVisible = false">取消</el-button></div>
                 </div>
                 <div class="footerbtn flex1">
-                    <div class="borderimg"><el-button @click="addEied(); addVisible = false">
+                    <div class="borderimg"><el-button @click="addEied(); ">
                             确定
                         </el-button></div>
                 </div>
@@ -109,7 +112,7 @@
 
                 </div>
             </template>
-            <h4 class="delecttitle"> 是否确认删除类型： <span class="spanclad">{{ zqname }}</span></h4>
+            <h4 class="delecttitle"> 是否确认删除： <span class="spanclad">{{ zqname }}</span></h4>
             <div class="dialog-footer footer_div l_btn">
                 <div class="footerbtn flex1">
                     <div class="borderimg"><el-button @click="dialogsgdelect = false">取消</el-button></div>
@@ -151,6 +154,7 @@ let tableHeight = ref(180);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();
+let tishi=ref();
 let senobj = ref({
     pid: 0,
     seid: 0,
@@ -182,7 +186,7 @@ const shanchu = () => {
         ElMessage.error("你还没有选中删除的项目")
     } else {
         dialogsgdelect.value = true
-        zqname.value = tableobj.value.type;
+        zqname.value = tableobj.value.pname;
     }
 }
 const fundeledata = () => {
@@ -193,6 +197,10 @@ const fundeledata = () => {
     }
     request(params)
         .then((res) => {
+            ElMessage({
+                  message: '传感器信息删除成功',
+                  type: 'success',
+              })
             getsensor();
         })
         .catch((err) => {
@@ -212,7 +220,7 @@ const getsensor = () => {
     request(params)
         .then((res) => {
             tableData.value = res.rows;
-                tableobj.value={};
+             tableobj.value={};
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -221,6 +229,7 @@ const getsensor = () => {
 //添加
 const addsg = () => {
     add.value = "添加";
+    tishi.value= add.value;
     currentrow.value=false;
     addVisible.value = true;
     senobj.value.seid = '';
@@ -229,7 +238,7 @@ const addsg = () => {
     senobj.value.site = 0.0;
     source.value.selectstr = '';
     tableobj.value={};
-
+   
 }
 // 添加修改的接口
 const addEied = () => {
@@ -242,7 +251,12 @@ const addEied = () => {
     }
     request(params)
         .then((res) => {
+            ElMessage({
+                  message:'传感器信息'+tishi.value+'成功',
+                  type: 'success',
+              })
             tableData.value = res.rows;
+            addVisible.value = false;
             getsensor();
         })
         .catch((err) => {
@@ -252,6 +266,7 @@ const addEied = () => {
 //修改
 const amend = () => {
     add.value = "修改";
+    tishi.value= add.value;
     if (JSON.stringify(tableobj.value) == '{}') {
         ElMessage.error("你还没有选中修改的项目")
     } else {

src/view/components/Menudisaster.vue

@@ -34,6 +34,9 @@
                                             :highlight-current-row="currentrow"
                                             @row-click="handleDelete($event)"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57,0) ' }">
+                                            <template v-slot:empty>
+                                          <p>暂无数据</p>
+                                          </template>
                                             <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>
@@ -69,6 +72,9 @@
                                             :highlight-current-row="currentrow"
                                             @row-click="handleDelete($event)"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57,0) ' }">
+                                            <template v-slot:empty>
+                                            <p>暂无数据</p>
+                                            </template>
                                             <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>
@@ -107,6 +113,9 @@
                                             :highlight-current-row="currentrow"
                                             @row-click="handleDelete($event)"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57,0) ' }">
+                                            <template v-slot:empty>
+                                            <p>暂无数据</p>
+                                            </template>
                                             <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>

src/view/components/Menupath.vue

@@ -25,6 +25,9 @@
                                  :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                      @row-click="handleDelete($event)"
                                      :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
+                                     <template v-slot:empty>
+                                    <p>暂无数据</p>
+                                    </template>
                                      <el-table-column prop="name" label="路径名称" />
                                      <el-table-column label="操作"  width="70px">
                                         <template #default="scope">
@@ -81,6 +84,9 @@
                         @row-click="handleDelete3($event)"
                         :highlight-current-row="currentrow1" 
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                       <el-table-column prop="nid" label="节点编号" />
                         <el-table-column prop="nname" label="节点名称" />
                       
@@ -137,7 +143,7 @@
                      <div class="borderimg"><el-button @click="addVisible = false">取消</el-button></div>
                  </div>
                  <div class="footerbtn flex1">
-                     <div class="borderimg"><el-button @click="addEied(); addVisible = false">
+                     <div class="borderimg"><el-button @click="addEied();">
                              确定
                          </el-button></div>
                  </div>
@@ -207,7 +213,7 @@
  
                  </div>
              </template>
-             <h4 class="delecttitle"> 是否确认删除名称 <span class="spanclad">{{ zqname }}</span></h4>
+             <h4 class="delecttitle"> 是否确认删除 <span class="spanclad">{{ zqname }}</span></h4>
              <div class="dialog-footer footer_div l_btn">
                  <div class="footerbtn flex1">
                      <div class="borderimg"><el-button @click="dialogsgdelect = false">取消</el-button></div>
@@ -247,7 +253,7 @@
  let sendialogVisible = ref(false);
  let currentrow=ref(true);
  let currentrow1=ref(false);
- 
+ let tishi=ref();
  let addVisible = ref(false);
  let dialogsgdelect = ref(false)
  let pathshownode=ref(false)
@@ -330,7 +336,10 @@ const faterdelete=()=>{
          .then((res) => {
             pathshownode.value=false;
             getsensor();
-         
+            ElMessage({
+                message: '删除路径成功',
+                type: 'success',
+            })
 
          })
          .catch((err) => {
@@ -395,6 +404,7 @@ const faterdelete=()=>{
  //添加
  const addsg = () => {
      add.value = "添加";
+     tishi.value= add.value;
      currentrow.value=false;
      addVisible.value = true;
      wuliobj.value.wid = '';
@@ -415,7 +425,12 @@ const faterdelete=()=>{
          .then((res) => {
              tableData.value = res.rows;
              currentrow.value=false;
+             addVisible.value=false;
              getsensor();
+             ElMessage({
+                message: tishi.value+'路径成功',
+                type: 'success',
+            })
          })
          .catch((err) => {
              ElMessage.error(err.returnMsg)
@@ -425,6 +440,7 @@ const faterdelete=()=>{
  //修改
  const amend = () => {
      add.value = "修改";
+     tishi.value= add.value;
      if (JSON.stringify(tableobj.value) == '{}') {
          ElMessage.error("你还没有选中修改的项目")
      } else {

src/view/components/NodeLine.vue

@@ -27,6 +27,9 @@
                     :data="tableData2" style="width: 100%" @selection-change="projectsSelectionChange"  @select="projectsSelectionSelect"
                     show-header="false"
                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
+                    <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
                     <el-table-column type="selection" width="55" />
                     <el-table-column property="id" label='节点编号' />
                     <el-table-column property="name" label="名称" />
@@ -167,6 +170,12 @@ defineExpose({ dialogVisiblenode, pipelinedata,searchtaggd });
 </script>
 
 <style lang="scss" scoped>
+ .dialog_class .my-header .el-image {
+    padding: 0px 10px 0 0 !important;
+  }
+  .dialog_class .my-header h4{
+    font-size: 14px;
+  }
 .vtk {
     position: absolute;
     z-index: 150;
@@ -266,29 +275,6 @@ defineExpose({ dialogVisiblenode, pipelinedata,searchtaggd });
         right: 0;
         top: 21px;
     }
-
-    .header_l {
-        line-height: 10px;
-        text-align: left;
-        padding: 0 20px;
-        border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255, 0.48)) 1 1;
-        box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
-        border-radius: 0px 0px 0px 0px;
-
-        .el-image {
-            padding: 10px 10px 0 0;
-        }
-
-        h4 {
-            font-weight: bold;
-            font-size: 12px;
-            color: #68ADFF;
-            line-height: 14px;
-            text-align: left;
-            font-style: normal;
-            text-transform: none;
-        }
-    }
 }
 
 .el-dialog__title {
@@ -319,7 +305,7 @@ defineExpose({ dialogVisiblenode, pipelinedata,searchtaggd });
 
         h4 {
             font-weight: bold;
-            font-size: 12px;
+            font-size: 14px;
             color: #68ADFF;
             line-height: 14px;
             text-align: left;

src/view/components/PipeIine.vue

@@ -35,6 +35,9 @@
      @select="projectsSelectionSelect"
      :header-cell-style="{'background':'rgba(13, 22, 57, 0.96) '}"
    >
+   <template v-slot:empty>
+        <p>暂无数据</p>
+     </template>
      <el-table-column type="selection" width="55" />
      <el-table-column property="snId" label="开始节点"/>
      <el-table-column property="enId" label="结束节点"/>
@@ -50,6 +53,7 @@
      
    </el-table>
      <div class="demo-pagination-block" style="margin-top: 20px;">
+  <el-config-provider :locale="zhCn">
   <el-pagination
   v-model:current-page="currentPage4"
     v-model:page-size="pageSize4"
@@ -60,6 +64,7 @@
   class="mt-4"
   @current-change="handleCurrentChange"
 />
+</el-config-provider>
 </div>
        <div class="dialog-footer footer_div l_btn">
       <div class="footerbtn flex1"><div class="borderimg"><el-button @click="dialogVisiblenode = false">取消</el-button></div></div>
@@ -77,6 +82,7 @@ import {RouterView,RouterLink } from "vue-router"
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
 import icon from "@/assets/img/icon.png";
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 const props= defineProps({ });
 let emit = defineEmits(['pipelineapi'])
 let sdialog=ref({
@@ -324,13 +330,13 @@ const projectsSelectionSelect=(selection, row)=>{
 
         h4 {
             font-weight: bold;
-            font-size: 12px;
+            font-size: 14px;
             color: #fff;
             line-height: 14px;
             text-align: left;
             font-style: normal;
             text-transform: none;
-            margin-top: 8px;
+            margin-top: 14px;
         }
     }
 

src/view/components/SetPipe.vue

@@ -100,7 +100,7 @@ const closeDialog=()=>{
   // }//节点图形
 }
 function timintclaer(){
-  clearInterval(timing.value);
+clearInterval(timing.value);
 }
 onBeforeUnmount(() => {
 
@@ -123,17 +123,14 @@ function jgSelenum(){
 //选择结果定时器
 function jgSelect(){
     timing.value = setInterval(() => {//定时器
-      console.log(111111)
     selectObj.value=vtkmodel.selectObj;
-   // console.log(selectObj.value);
+    console.log(selectObj.value);
     if(selectObj.value==null){
-   // console.log(selectObj.value);
 }else{
-  // console.log(selectObj.value);
    msg.value=selectObj.value;
    vtkmodel.addpipsite(selectObj.value,props.site);
 }
-   }, 12000000);
+   }, 1200);
 }
 
 </script>

src/view/evolutionView.vue

@@ -26,6 +26,9 @@
       
      </div>
    <el-table   v-loading="loading" :data="tableData"  :max-height="tableHeight"  @row-click="rowclick"  style="width: 100%" >
+      <template v-slot:empty>
+        <p>暂无数据</p>
+        </template>
        <el-table-column property="sid" label="编号" width="60"/>
        <el-table-column property="pname" label="管道名称"/>
        <el-table-column property="pid" label="管道编号" width="80" />
@@ -113,6 +116,9 @@
        </template>
      </el-dialog>
     <el-table :data="tableDatafir"  :max-height="tableHeight"   style="width: 100%" >
+      <template v-slot:empty>
+        <p>暂无数据</p>
+        </template>
        <el-table-column property="timeline" label="时间线" width="100"/>
        <el-table-column property="val1" label="v1"/>
        <el-table-column property="val2" label="v2" width="80" />
@@ -164,6 +170,9 @@
        @selection-change="handleSelectionChange"
        @select="projectsSelectionSelect"
      >
+     <template v-slot:empty>
+        <p>暂无数据</p>
+        </template>
        <el-table-column type="selection" width="55" />
        <el-table-column property="snId" label="开始节点"/>
        <el-table-column property="enId" label="结束节点"/>
@@ -214,6 +223,9 @@
       
      </div>
    <el-table   v-loading="loading" :data="tableDataw"  :max-height="tableHeight"  @row-click="rowclick"  style="width: 100%" >
+    <template v-slot:empty>
+        <p>暂无数据</p>
+        </template>
        <el-table-column property="sid" label="编号" width="60"/>
        <el-table-column property="pname" label="管道名称"/>
        <el-table-column property="pid" label="管道编号" width="80" />
@@ -301,6 +313,9 @@
        </template>
      </el-dialog>
     <el-table :data="tableDatawat"  :max-height="tableHeight"  style="width: 100%" >
+      <template v-slot:empty>
+        <p>暂无数据</p>
+        </template>
        <el-table-column property="timeline" label="时间线" width="100"/>
        <el-table-column property="val1" label="v1"/>
        <el-table-column property="val2" label="v2" width="80" />

src/view/index/first-left.vue

@@ -66,6 +66,9 @@
                         :highlight-current-row="currentrow1" 
                         :max-height="tableHeight"
                       >
+                      <template v-slot:empty>
+                          <p>暂无数据</p>
+                      </template>
                       <el-table-column  prop="chname" label="监测点" width="120"  />
                 
                       <el-table-column
@@ -112,7 +115,7 @@
                 <div class="zongjili img3">{{ heightnum }}<span>m</span></div>
                 <div class="zongjili img4">
                   <p class="jcshijian">{{datetime}}</p>
-                  <p style="text-align: center;font-size: 0.0625rem;">{{ maxtime.steptime }}</p></div>
+                  <p style="text-align: center;font-size: 15px">{{ maxtime.steptime }}</p></div>
               </div>
             </div>
             </div>
@@ -295,16 +298,16 @@ let itemcolorlist=ref([
   name:'安全区 ',
   color:'#008003'
 },
+// {
+//   name:'感知区 ',
+//   color:'#6eaa00'
+// },
+// {
+//   name:'二级警告 ',
+//   color:'#d48f00'
+// },
 {
-  name:'感知区 ',
-  color:'#6eaa00'
-},
-{
-  name:'二级警告 ',
-  color:'#d48f00'
-},
-{
-  name:'一级警告 ',
+  name:'警告 ',
   color:'#ff0000'
 },
 ])
@@ -811,10 +814,23 @@ const lineChart=()=>{
  
 let option = {
   tooltip: {
-    trigger: 'axis'
+    trigger: 'axis',
+    formatter: function (params) {
+            var res = '';
+            for (var i = 0, l = params.length; i < l; i++) {
+                res += '<div style="text-align: left;">'+'<span style="float: left;">'+params[i].marker+'</span><span   style=" padding-right: 12px;">' + params[i].seriesName + ' : </span><span style="float: right;">' + params[i].value + '</span></div>';
+            }
+            return res;
+        }
+    // textstyle:{
+    //   width:600,
+    // align:'left'
+    // },
+   
+
   },
   // legend: {
-  //   data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
+  //   x: 'left',
   // },
   grid: {
     left: '3%',
@@ -1114,14 +1130,14 @@ align-items: center;
 }
 .gaojing{
   color: #fff;
-    font-size: 12px;
+    font-size: 15px;
     display: inline-block;
     /* height: 30px; */
     line-height: 35px;
     padding-left: 11px
 }
 .yansekuang{
-  width: 50px;
+  width: 100px;
   height: 18px;
  
 }

src/view/result.vue

@@ -75,9 +75,14 @@
       </div>
     </div>
     <div class="result_left results re_pading">
-      <div class="resu_title reimg" @click="hazardtype('1')">
-        {{ mntext1 }}
-      </div>
+     <div class="resu_title reimg reimgbtn">
+        <!-- <span class="btn">灾情模拟1</span> -->
+        <div class="borderimg">
+            <el-button @click="hazardtype('1')"> 灾情模拟1 </el-button>
+          </div>
+        <span class="nameright">{{ mntext1 }}</span>
+      </div> 
+      
       <div class="resultleftxian">
         <div class="modle">
           <resultLeft ref="setleftAid" :region="formInline.region" :count="newcount" />
@@ -89,9 +94,17 @@
     </div>
     <!-- 第二个 -->
     <div class="result_right r results re_pading">
-      <div class="resu_title reimg" @click="hazardtype('2')">
-        {{ mntext2 }}
-      </div>
+      <!-- <div class="resu_title reimg reimgbtn" @click="hazardtype('2')">
+        <span class="btn">灾情模拟2</span>
+        <span class="nameright">{{ mntext2 }}</span>
+      </div> -->
+      <div class="resu_title reimg reimgbtn">
+        <!-- <span class="btn">灾情模拟1</span> -->
+        <div class="borderimg">
+            <el-button @click="hazardtype('2')"> 灾情模拟2 </el-button>
+          </div>
+        <span class="nameright">{{ mntext2 }}</span>
+      </div> 
       <div class="resultleftxian">
         <div class="modle">
           <!--  :count="formInline.count" -->
@@ -156,8 +169,8 @@ let setrightAid = ref();
 let leftid=ref();
 let rightid=ref();
 let clickflat = ref(true);
-let mntext1 = ref('灾情模拟1');
-let mntext2 = ref('灾情模拟2');
+let mntext1 = ref();
+let mntext2 = ref();
 const formInline = ref({
   region: "",
   count: 60,
@@ -428,6 +441,40 @@ onUnmounted(() => {
 defineExpose({ accident6, initAid, mntext1, mntext2, clickflat, endtime, zdtime, timeline, oldtime,wdiclick });
 </script>
 <style scoped lang="scss">
+.reimgbtn{
+ padding:0 2px 10px;
+position: relative;
+  .borderimg{
+    width: 70px;
+    height: 22px;
+    font-size: 12px;
+    font-weight: bold;
+    margin: 1px;
+    margin-top: 0px;
+    .el-button{
+    width: 100%;
+    height: 100%;
+    border-radius: 4px;
+    color: #fff;
+    background-color: rgba(104, 173, 255, 1);
+    border: none;
+    cursor: pointer;
+    // :hover{
+    //   background-color: rgba(104, 173, 255, 0.1);
+    // }
+}
+  }
+
+}
+.nameright{
+  font-family: 'YouShe';
+    position: absolute;
+    right: 15px;
+    position: absolute;
+    right: 10px;
+    top: 5px;
+    font-size: 14px;
+}
 .heigjie {
   width: 100%;
   height: 40px;

src/view/result/Wdisaster.vue

@@ -19,6 +19,9 @@
                         :highlight-current-row="currentrow1" 
                         :max-height="tableHeight"
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                    </template>
                       <el-table-column prop="chname" label="监测点"  />
                       <el-table-column
                           v-for="(header, index) in dynamicHeaders"
@@ -287,7 +290,15 @@ const lineChart=()=>{
  myChart = echarts.init(document.getElementById('line2'));
  let option = {
   tooltip: {
-    trigger: 'axis'
+    trigger: 'axis',
+    formatter: function (params) {
+            var res = '';
+            for (var i = 0, l = params.length; i < l; i++) {
+                res += '<div style="text-align: left;">'+'<span style="float: left;">'+params[i].marker+'</span><span   style=" padding-right: 12px;">' + params[i].seriesName + ' : </span><span style="float: right;">' + params[i].value + '</span></div>';
+            }
+            return res;
+        }
+
   },
   // legend: {
   //   data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']

src/view/result/Wdisaster2.vue

@@ -19,6 +19,9 @@
                         :highlight-current-row="currentrow1" 
                         :max-height="tableHeight"
                       >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                    </template>
                       <el-table-column prop="chname" label="监测点"  />
                       <el-table-column
                           v-for="(header, index) in dynamicHeaders"
@@ -278,7 +281,14 @@ const lineChart=()=>{
  myChart = echarts.init(document.getElementById('line3'));
  let option = {
   tooltip: {
-    trigger: 'axis'
+    trigger: 'axis',
+    formatter: function (params) {
+            var res = '';
+            for (var i = 0, l = params.length; i < l; i++) {
+                res += '<div style="text-align: left;">'+'<span style="float: left;">'+params[i].marker+'</span><span   style=" padding-right: 12px;">' + params[i].seriesName + ' : </span><span style="float: right;">' + params[i].value + '</span></div>';
+            }
+            return res;
+        }
   },
   // legend: {
   //   data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']

src/view/result/leftcontent.vue

@@ -48,6 +48,9 @@
                 :highlight-current-row="currentrow"
                     element-loading-background="rgba(0, 10, 0, 0.1)" :row-class-name="tableRowClassName"
                     :header-cell-style="{ 'background': ' #375A88' }" @select="projectsSelectionSelect">
+                    <template v-slot:empty>
+                        <p>暂无数据</p>
+                    </template>
                     <el-table-column width="50">
 
                         <template #default="scope">