소스 검색

704message二次封装,全部替换

tangjunhao 2 달 전
부모
커밋
649618c8a5

+ 16 - 15
src/view/InfoDialoges.vue

@@ -464,6 +464,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect, formEmits,ElConfigProvider} from 'element-plus'
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import icon from "@/assets/img/icon.png";
 import Frame2 from "@/assets/img/Frame2.png";
@@ -748,7 +749,7 @@ const handleClose = () => {
 // 事故确定列表
 const accident = () => {
     if (idobj.value.name == '') {
-        ElMessage.error('请选择事故项目')
+        message.error('请选择事故项目')
     } else {
      // router.push({ path: "/appmian" });
         if(props.valzaiqing=='模拟数据'){
@@ -764,12 +765,12 @@ const accident = () => {
                     emitter.emit('step',step);
                 }
                 else if(res.state=='-1'){
-                    ElMessage({
+                    message({
                         message: "项目求解失败,只能求解成功,才能进行项目对比",
                         type: 'error',
                     });
                     }else if(res.state=='0'){
-                    ElMessage({ message: "当前项目未完成求解任务,只能求解成功,才能进行项目对比",  type: 'error',
+                    message({ message: "当前项目未完成求解任务,只能求解成功,才能进行项目对比",  type: 'error',
                     });
                     }
             
@@ -777,12 +778,12 @@ const accident = () => {
             .catch((err) => {
                 if(err.returnMsg=="任务不存在!"){
    
-                    ElMessage({
+                    message({
                     message: "未求解",
                     type: 'error',
                     });
                     }
-            //ElMessage.error(err.returnMsg)
+            //message.error(err.returnMsg)
             
             })
 
@@ -863,7 +864,7 @@ const sgadd = () => {
             scoperadio.value = null;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 // 事故列表的选择
@@ -904,14 +905,14 @@ const sgdelect = () => {
     request(params)
         .then((res) => {
             getdata();
-            ElMessage({
+            message({
                 message: '删除成功',
                 type: 'success',
             })
         })
         .catch((err) => {
             loading.value = false;
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 
 }
@@ -953,7 +954,7 @@ const getdata = () => {
         })
         .catch((err) => {
             loading.value = false;
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 
 }
@@ -972,7 +973,7 @@ const pollute = () => {
 
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //任务求解任务信息
@@ -1018,7 +1019,7 @@ const rewu=()=>{
           //
         })
         .catch((err) => {
-           // ElMessage.error(err.returnMsg)
+           // message.error(err.returnMsg)
            //state.value='0';
            sessionStorage.setItem("state",'0');
            emit('resulysucss');
@@ -1054,7 +1055,7 @@ const stopcompute= ()=>{
     };
  request(params)
         .then((res) => {
-                ElMessage({
+                message({
                     message: "已停止计算",
                     type: "error",
                 });
@@ -1145,7 +1146,7 @@ const selectchange = (val) => {
 //推演的开始计算
 const calculate = () => {
     percentage.value=0;
-    ElMessage.success('开始计算中....')
+    message.success('开始计算中....')
     vtkmodel.clearJgAddMode();
      vtkmodel.renderWindow.render();
      sessionStorage.setItem('state',0)
@@ -1171,7 +1172,7 @@ const calculate = () => {
           //  initWebSocket();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 const projectsSelectionSelect = () => {
@@ -1239,7 +1240,7 @@ async function fetchFileContent() {
             } else {
                 
                 percentage.value=0;
-                ElMessage({
+                message({
                     message: res.returnMsg,
                     type: "error",
                 });

+ 27 - 26
src/view/components/Fengmen.vue

@@ -573,6 +573,7 @@
   import icon from "@/assets/img/icon.png";
   import closeimg from "@/assets/img/colse.png";
   import { ElMessage, ElButton, ElDialog,ElConfigProvider } from "element-plus";
+  import { message } from '@/utils/message';
   import zhCn from 'element-plus/es/locale/lang/zh-cn'
   import { Calendar, Search } from "@element-plus/icons-vue";
   // import selfdialogs from "./SetNode.vue";
@@ -748,7 +749,7 @@ const fjloadclick = () => {
       });
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 
@@ -776,14 +777,14 @@ const fjloadsave = () => {
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "加载成功",
         type: "success",
       });
       getrequest();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 
@@ -810,7 +811,7 @@ const fjclick=()=>{
 const xiugaiclick=()=>{
   zhtext.value='修改';
   if (JSON.stringify(handobj.value) == "{}"|| currentrow.value==false) {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
     sdialog.value.fjdialog = true;
     aid.value=handobj.value.aid;
@@ -832,7 +833,7 @@ const xiugaiclick=()=>{
 //风机删除
 const delonclock=(val)=>{
   if (JSON.stringify(handobj.value) == "{}"|| currentrow.value==false) {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
     delte.value=val;
     sdialog.value.dialogsgdelect=true;
@@ -848,7 +849,7 @@ const deletefun=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:"删除风机成功",
         type: "success",
       });
@@ -857,7 +858,7 @@ const deletefun=()=>{
     })
 
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }else if(delte.value=="风门"){
     const params = {
@@ -866,7 +867,7 @@ const deletefun=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:"删除风门成功",
         type: "success",
       });
@@ -875,7 +876,7 @@ const deletefun=()=>{
     })
 
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }else{
     
@@ -911,22 +912,22 @@ const getrequest=()=>{
         console.log( currentrow.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }
 // 确定添加
 const addrequest=()=>{
   if (isSubmitting) return;
   if(fjobj.value.fancode==null||fjobj.value.fancode==''){
-    ElMessage.error("风机编码不能为空")
+    message.error("风机编码不能为空")
     return
   }
   if(fjobj.value.fanname==null||fjobj.value.fanname==''){
-    ElMessage.error("风机名称不能为空")
+    message.error("风机名称不能为空")
     return
   }
   if(pid.value==null||pid.value==""){
-    ElMessage.error("巷道不能为空")
+    message.error("巷道不能为空")
   }else{
     isSubmitting = true; // 开始提交
   const params = {
@@ -943,7 +944,7 @@ const addrequest=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: zhtext.value+"风机成功",
         type: "success",
       });
@@ -955,7 +956,7 @@ const addrequest=()=>{
     .catch((err) => {
       const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
+         message.error(Msg)
     })
     .finally(() => {
       isSubmitting = false; // 提交结束
@@ -977,7 +978,7 @@ const fmrequest=()=>{
         currentrow.value=false;
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }
 
@@ -1025,7 +1026,7 @@ const fmrequest=()=>{
       });
       })
       .catch((err) => {
-        ElMessage.error(err.returnMsg);
+        message.error(err.returnMsg);
       });
   }
 
@@ -1052,14 +1053,14 @@ const fmrequest=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "加载成功",
         type: "success",
       });
       fmrequest();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 
@@ -1086,7 +1087,7 @@ const fmrequest=()=>{
   const  fmxiugai=()=>{
     zhtext.value='修改';
   if (JSON.stringify(handobjfm.value) == "{}"|| currentrow.value==false) {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
     sdialog.value.fmdialog = true;
     aid.value=handobjfm.value.aid;
@@ -1109,7 +1110,7 @@ const fmrequest=()=>{
  
   const  fmdel=(val)=>{
     if (JSON.stringify(handobjfm.value) == "{}"|| currentrow.value==false) {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
     delte.value=val;
     sdialog.value.dialogsgdelect=true;
@@ -1123,15 +1124,15 @@ const addxiufm = () => {
   if (isSubmitting) return; // 如果正在提交,则不再继续
 
   if (fmobj.value.doorcode == null || fmobj.value.doorcode == "") {
-    ElMessage.error("风门编码不能为空");
+    message.error("风门编码不能为空");
     return;
   }
   if (fmobj.value.doorname == null || fmobj.value.doorname == "") {
-    ElMessage.error("风门名称不能为空");
+    message.error("风门名称不能为空");
     return;
   }
   if (pid.value == null || pid.value == "") {
-    ElMessage.error("巷道不能为空");
+    message.error("巷道不能为空");
     return;
   }
 
@@ -1151,7 +1152,7 @@ const addxiufm = () => {
 
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: zhtext.value + "风门成功",
         type: "success",
       });
@@ -1162,7 +1163,7 @@ const addxiufm = () => {
     .catch((err) => {
       const regex = /字段\d*/g;
       let Msg = err.returnMsg.replace(regex, "");
-      ElMessage.error(Msg);
+      message.error(Msg);
     })
     .finally(() => {
       isSubmitting = false; // 提交结束

+ 6 - 5
src/view/components/InfoAnimation.vue

@@ -143,6 +143,7 @@
 import { computed, ref, onMounted, onBeforeUnmount, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus";
+import { message } from '@/utils/message';
 import icon from "@/assets/img/icon.png";
 import mitts from "@/utils/Bus";
 import closeimg from "@/assets/img/colse.png";
@@ -456,7 +457,7 @@ async function getMonitor() {
           chengeMonitor();
         }
       } else {
-        ElMessage({
+        message({
           message: res.returnMsg,
           type: "error",
         });
@@ -535,16 +536,16 @@ async function readJob() {
         endtime.value= Number(res.totaltime)/Number(res.reportstep);
         console.log( endtime.value);
       }else if(res.state=='-1'){
-        ElMessage({
+        message({
           message: " 求解失败",
           type: 'error',
         });
       }else if(res.state=='0'){
-        ElMessage({ message: "求解未完成",  type: 'error',
+        message({ message: "求解未完成",  type: 'error',
         });
       }
       } else {
-        ElMessage({
+        message({
           message: res.returnMsg,
           type: "error",
         });
@@ -554,7 +555,7 @@ async function readJob() {
       if(err.returnMsg=="任务不存在!"){
         monitor.value=false;
         console.log(1111)
-        ElMessage({
+        message({
           message: "未求解",
           type: 'error',
         });

+ 9 - 8
src/view/components/InfoBoundary.vue

@@ -478,6 +478,7 @@ import { request, uploadFile } from "@/utils/request";
 import icon from "@/assets/img/icon.png";
 import closeimg from "@/assets/img/colse.png";
 import { ElMessage, ElButton, ElDialog,ElConfigProvider } from "element-plus";
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import { Calendar, Search } from "@element-plus/icons-vue";
 import selfdialogs from "./SetNode.vue";
@@ -633,7 +634,7 @@ const pipelinedata = (searchtag) => {
       total.value = res.total;
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
 const selectfun = () => {
@@ -688,7 +689,7 @@ const bounadd = () => {
 };
 const xiudelete = () => {
   if (JSON.stringify(xiugaiobj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
     sdialog.value.dialogsgdelect = true
 }
@@ -699,7 +700,7 @@ const xiugai = () => {
   buntext.value = "修改";
   tishi.value= buntext.value;
   if (JSON.stringify(xiugaiobj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
     if (props.classradio == "Fire") {
       bformInline.value.type = "Pressure";
@@ -745,7 +746,7 @@ const accidentboun = () => {
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: tishi.value+"边界设置成功",
         type: "success",
       });
@@ -757,7 +758,7 @@ const accidentboun = () => {
     .catch((err) => {
       const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
+         message.error(Msg)
     })
     .finally(() => {
       isSubmitting = false; // 提交结束
@@ -786,7 +787,7 @@ const addboundary = (valaid) => {
       
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
 const handleDelete = (val) => {
@@ -804,14 +805,14 @@ const fundeledata = () => {
   console.log(params);
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "边界删除成功",
         type: "success",
       });
       addboundary(aid.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
 // 表格变色

+ 66 - 65
src/view/components/InfoDisaster.vue

@@ -1717,6 +1717,7 @@ import {
   DROPDOWN_COLLECTION_INJECTION_KEY,
   ElConfigProvider
 } from "element-plus";
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import { Calendar, Search } from "@element-plus/icons-vue";
 import Fengmen from "./Fengmen.vue";
@@ -2058,7 +2059,7 @@ const handledisaster = (aidval) => {
        tableobj.value={};
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
 
@@ -2070,7 +2071,7 @@ const fireadd = () => {
   currentrow.value = false;
   tableobj.value={};
   if(firepid.value==null||firepid.value==""){
-    ElMessage.error("巷道不能为空")
+    message.error("巷道不能为空")
     //sdialog.value.dianadddialog = false;
   }else{
     isSubmitting = true; // 开始提交
@@ -2085,7 +2086,7 @@ const fireadd = () => {
   request(params)
     .then((res) => {
   
-      ElMessage({
+      message({
         message: "保存成功",
         type: "success",
       });
@@ -2094,7 +2095,7 @@ const fireadd = () => {
       fun3D();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     })
     .finally(() => {
       isSubmitting = false; // 提交结束
@@ -2178,14 +2179,14 @@ const shanchu = (val) => {
   if(val=='1'){
 
   if (JSON.stringify(tableobj.value) == "{}") {
- ElMessage.error("你还没有选中删除的项目")
+ message.error("你还没有选中删除的项目")
  } else {
     sdialog.value.dialogsgdelect = true;
 
     }
   }else {
     if (JSON.stringify(jiancobj.value) == "{}") {
-      ElMessage.error("你还没有选中删除的项目")
+      message.error("你还没有选中删除的项目")
  } else {
   sdialog.value.dialogsgdelect = true;
   //sdialog.value.dialogsgdelect = true;
@@ -2210,7 +2211,7 @@ const fundeledata2 = () => {
   console.log(params);
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "删除成功",
         type: "success",
       });
@@ -2222,7 +2223,7 @@ const fundeledata2 = () => {
       handledisaster(aid.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
 // 巷道搜索
@@ -2261,7 +2262,7 @@ const xiugaitable = () => {
   gdadd.value = "3";
   zhtext.value = "修改";
   if (JSON.stringify(tableobj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
 
     sdialog.value.dianadddialog = true;
@@ -2294,7 +2295,7 @@ const xiugaiapi = () => {
   request(params)
     .then((res) => {
       handledisaster(aid.value);
-      ElMessage({
+      message({
         message: "修改成功",
         type: "success",
       });
@@ -2357,7 +2358,7 @@ const pumpload = () => {
       });
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
 
@@ -2470,14 +2471,14 @@ const addjiancf = () => {
     };
     request(params)
       .then((res) => {
-        ElMessage({
+        message({
           message: '添加成功',
           type: "success",
         });
         getinquire();
       })
       .catch((err) => {
-        ElMessage.error(err.returnMsg);
+        message.error(err.returnMsg);
       })
       .finally(() => {
       isSubmitting = false; // 提交结束
@@ -2514,7 +2515,7 @@ const Gassgetdata=(aidval)=>{
       tableobj.value={};
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 // 瓦斯爆炸的添加
@@ -2535,7 +2536,7 @@ const wanewadd=()=>{
 const Gassadd=()=>{
   console.log(firepid.value);
   if(firepid.value==null||firepid.value==''||firepid.value==undefined){
-    ElMessage.error('巷道名称不能为空');
+    message.error('巷道名称不能为空');
   }else{
   const params = {
     transCode: "D10021",
@@ -2546,7 +2547,7 @@ const Gassadd=()=>{
 console.log(params);
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:"瓦斯添加成功",
         type: "success",
       });
@@ -2556,7 +2557,7 @@ console.log(params);
       fun3D();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }
 }
@@ -2570,7 +2571,7 @@ const handlews=(row)=>{
 // 瓦斯的修改
 const wsxiugai= ()=>{
   if (JSON.stringify(tableobj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
   zhtext.value = "修改";
   Gassdialog.value.wsaddshow= true;
@@ -2582,7 +2583,7 @@ const wsxiugai= ()=>{
 const wsdelete=()=>{
   wsid.value='0'
   if (JSON.stringify(tableobj.value) == "{}") {
- ElMessage.error("你还没有选中删除的项目")
+ message.error("你还没有选中删除的项目")
  } else {
       //zqname.value= tableobj.value.bfname+"-"+ tableobj.value.gfname;
       zqname.value= tableobj.value.pname;
@@ -2610,7 +2611,7 @@ const wsdelete2=()=>{
 
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "瓦斯删除成功",
         type: "success",
       });
@@ -2620,7 +2621,7 @@ const wsdelete2=()=>{
       Gassgetdata(aid.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 //瓦斯的查看
@@ -2657,7 +2658,7 @@ const wsblastget=()=>{
     
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 // 瓦斯爆炸区域的添加
@@ -2689,7 +2690,7 @@ const wsbalastadd=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: zhtext.value+"瓦斯爆炸区域",
         type: "success",
       });
@@ -2700,18 +2701,18 @@ const wsbalastadd=()=>{
     
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
        
   }else{
-    ElMessage.error("结束位置大于开始位置");
+    message.error("结束位置大于开始位置");
   }
 }
 // 爆炸区域的修改
 
 const wsxiugai2=()=>{
   if (JSON.stringify(wasi.value.blastdata) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
 
 }else{
   zhtext.value='修改';
@@ -2741,7 +2742,7 @@ const handleblastxg=(data)=>{
 // 爆炸区域删除
 const wsblastdelete=()=>{
   if (JSON.stringify(wasi.value.blastdata) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
 
 }else{
   wsid.value='1';
@@ -2757,7 +2758,7 @@ const wsblastdelete1=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:"删除瓦斯爆炸区域成功",
         type: "success",
       });
@@ -2766,7 +2767,7 @@ const wsblastdelete1=()=>{
     
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     })   
   }
   // 积聚
@@ -2781,7 +2782,7 @@ const wsblastdelete1=()=>{
       wasi.value.gatherdata={};
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     })  
   }
   // 积聚的选中
@@ -2796,7 +2797,7 @@ const  gatheruxiugai = () => {
   zhtext.value = "修改";
 
   if (JSON.stringify(wasi.value.gatherdata) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
     Gassdialog.value.wsaddgather=true;
     wasi.value.gasdensity=wasi.value.gatherdata.gasdensity;
@@ -2813,7 +2814,7 @@ const wsgatheradd=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:  zhtext.value+"积聚区成功",
         type: "success",
       });
@@ -2821,7 +2822,7 @@ const wsgatheradd=()=>{
       gatherget()
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     })  
 }
 // 灾害源检测的修改
@@ -2830,7 +2831,7 @@ const zaiyuxiugai = () => {
   zhtext.value='修改';
   console.log( zhtext.value);
   if (JSON.stringify(jiancobj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
     if (props.classradio == "Fire") {
       sdialog.value.adddialog = true;
@@ -2860,14 +2861,14 @@ const zaiyuxiugaiapi = () => {
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:"修改成功",
         type: "success",
       });
       getinquire();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     })
     .finally(() => {
       isSubmitting = false; // 提交结束
@@ -2898,14 +2899,14 @@ const fundeledata3 = () => {
   request(params)
     .then((res) => {
       //console.log(res);
-      ElMessage({
+      message({
         message: "删除成功",
         type: "success",
       });
       getinquire();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 };
     const runstatezt=(res)=>{
@@ -2959,7 +2960,7 @@ const pumpxiugai=(val)=>{
   zhtext.value = "修改";
   tishi.value =zhtext.value;
   if (JSON.stringify( pumpobj.value.xzobj) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
      sdialog.value.addpump = true;
     vtkmodel.clearJgAddMode() ;
@@ -3000,14 +3001,14 @@ const  pumploadsave = () => {
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "加载成功",
         type: "success",
       });
       getrequest(aid.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 
@@ -3016,7 +3017,7 @@ const  pumploadsave = () => {
 const addrequest=()=>{
   if (isSubmitting) return;
   if(firepid.value==null||firepid.value==""){
-    ElMessage.error("巷道不能为空")
+    message.error("巷道不能为空")
   }else{
     isSubmitting = true;
   const params = {
@@ -3033,7 +3034,7 @@ const addrequest=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: zhtext.value+"水泵成功",
         type: "success",
       });
@@ -3044,7 +3045,7 @@ const addrequest=()=>{
     .catch((err) => {
       const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
+         message.error(Msg)
     })
     .finally(() => {
       isSubmitting = false; // 提交结束
@@ -3064,7 +3065,7 @@ const getrequest=(id)=>{
         tableDatpump.value=res.rows;
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }
   // 列表选中
@@ -3103,9 +3104,9 @@ const clineadd=()=>{
 const xnadd=()=>{
   if (isSubmitting) return;
   if(pumpxc.value.hight==''||pumpxc.value.hight==null){
-    ElMessage.error("水位高度不能空")
+    message.error("水位高度不能空")
   }else if(pumpxc.value.flow==''||pumpxc.value.flow==null){
-    ElMessage.error("流量不能为空")
+    message.error("流量不能为空")
   }else{
     isSubmitting = true; 
   const params = {
@@ -3117,7 +3118,7 @@ const xnadd=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message:  tishi.value+"性能曲线",
         type: "success",
       });
@@ -3125,7 +3126,7 @@ const xnadd=()=>{
       sdialog.value.addline=false;
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     })
     .finally(() => {
       isSubmitting = false; // 提交结束
@@ -3144,7 +3145,7 @@ const xngetdata=()=>{
 tableline.value=res.rows;
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 // 性能选中
@@ -3161,7 +3162,7 @@ const xiugailine=()=>{
   zhtext.value = "修改";
   tishi.value =zhtext.value;
   if (JSON.stringify( pumpxc.value.xnobj) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
      sdialog.value.addline= true;
      pumpxc.value.hight=pumpxc.value.xnobj.hight;
@@ -3178,7 +3179,7 @@ const xiugailine=()=>{
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "水泵删除成功",
         type: "success",
       });
@@ -3187,12 +3188,12 @@ const xiugailine=()=>{
       getrequest( aid.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
  }
  const pumpdel=()=>{
     if (JSON.stringify( pumpobj.value.xzobj) == "{}") {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
     sdialog.value.deletedata = true;
     deltext.value='水泵';
@@ -3211,14 +3212,14 @@ if(deltext.value=='性能'){
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "删除成功",
         type: "success",
       });
       xngetdata();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }else if(deltext.value=='水泵'){
   getshuidel()
@@ -3233,7 +3234,7 @@ else{
 const delline=()=>{
  
   if (JSON.stringify(pumpxc.value.xnobj) == "{}") {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
     deltext.value='性能';
     zqname.value= '性能曲线信息';
@@ -3269,7 +3270,7 @@ const yiweiget=(aidval)=>{
       yiweitable.value=res.row;
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 // 添加清空
@@ -3296,7 +3297,7 @@ const yiweixiugai=()=>{
   zhtext.value = "修改";
   tishi.value =zhtext.value;
   if (JSON.stringify(yiweiobj.value.nreobj) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    message.error("你还没有选中修改的项目");
   } else {
     sdialog.value.yiweidialog=true;
     currentrow.value=true;
@@ -3336,7 +3337,7 @@ const yehandleEdit=()=>{
   request(params)
     .then((res) => {
       console.log(res);
-      ElMessage({
+      message({
         message:  tishi.value+"一维灾情源成功",
         type: "success",
       });
@@ -3345,14 +3346,14 @@ const yehandleEdit=()=>{
       dialogtrue.value.timintclaer();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 }
 // 删除
 const yiweidelete=()=>{
 deltext.value='一维瓦斯';
 if (JSON.stringify(yiweiobj.value.nreobj) == "{}") {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
 sdialog.value.deletedata = true;
 zqname.value=yiweiobj.value.nreobj.pname;
@@ -3361,7 +3362,7 @@ zqname.value=yiweiobj.value.nreobj.pname;
 const  delyiwei=()=>{
 console.log(yiweiobj.value.nreobj);
   if (JSON.stringify(yiweiobj.value.nreobj) == "{}") {
-    ElMessage.error("你还没有选中删除的项目");
+    message.error("你还没有选中删除的项目");
   } else {
   const params = {
     transCode: "D30003",
@@ -3369,14 +3370,14 @@ console.log(yiweiobj.value.nreobj);
   };
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "删除成功",
         type: "success",
       });
       yiweiget(aid.value)
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }
 }

+ 14 - 13
src/view/components/InfoRun.vue

@@ -388,6 +388,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect, formEmits,ElConfigProvider } from 'element-plus'
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import icon from "@/assets/img/icon.png";
 import Frame2 from "@/assets/img/Frame2.png";
@@ -585,7 +586,7 @@ const classclick = (val) => {
 // 事故确定列表
 const accident = () => {
     if (idobj.value.name == '') {
-        ElMessage.error('请选择项目')
+        message.error('请选择项目')
     } else {
         if(props.valzaiqing=='模拟数据'){
         const params = {
@@ -598,12 +599,12 @@ const accident = () => {
                     emit("leftsimulation",res,sgdata.value);
                 }
                 else if(res.state=='-1'){
-                    ElMessage({
+                    message({
                         message: " 求解失败",
                         type: 'error',
                     });
                     }else if(res.state=='0'){
-                    ElMessage({ message: "求解未完成",  type: 'error',
+                    message({ message: "求解未完成",  type: 'error',
                     });
                     }
             
@@ -611,12 +612,12 @@ const accident = () => {
             .catch((err) => {
                 if(err.returnMsg=="任务不存在!"){
    
-                    ElMessage({
+                    message({
                     message: "未求解",
                     type: 'error',
                     });
                     }
-            //ElMessage.error(err.returnMsg)
+            //message.error(err.returnMsg)
             
             })
 
@@ -672,7 +673,7 @@ const sgadd = () => {
             scoperadio.value = null;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 // 事故列表的选择
@@ -713,14 +714,14 @@ const sgdelect = () => {
     request(params)
         .then((res) => {
             getdata();
-            ElMessage({
+            message({
                 message: '删除成功',
                 type: 'success',
             })
         })
         .catch((err) => {
             loading.value = false;
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 
 }
@@ -748,7 +749,7 @@ const getdata = () => {
         })
         .catch((err) => {
             loading.value = false;
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 
 }
@@ -766,7 +767,7 @@ const pollute = () => {
 
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //任务求解任务信息
@@ -799,7 +800,7 @@ const rewu=()=>{
       
         })
         .catch((err) => {
-           // ElMessage.error(err.returnMsg)
+           // message.error(err.returnMsg)
            addinitial();
         })
       
@@ -876,7 +877,7 @@ const calculate = () => {
           //  initWebSocket();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 const projectsSelectionSelect = () => {
@@ -904,7 +905,7 @@ async function fetchFileContent() {
             if (res.returnCode == "000000000") {
                   getthislog(res.logs);
             } else {
-                ElMessage({
+                message({
                     message: res.returnMsg,
                     type: "error",
                 });

+ 3 - 2
src/view/components/InfoVtkmodel.vue

@@ -13,6 +13,7 @@ import vtkMapper from "@kitware/vtk.js/Rendering/Core/Mapper";
 import vtkLineSource from "@kitware/vtk.js/Filters/Sources/LineSource";
 import vtkPointSource from "@kitware/vtk.js/Filters/Sources/PointSource";
 import emitter from "@/utils/emitter";
+import { message } from '@/utils/message';
 onBeforeMount(()=>{
  
 })
@@ -45,7 +46,7 @@ async function readNodeAndPipe() {
         nodes.value = res.rows;
         readePipe();
       } else {
-        ElMessage({
+        message({
           message: res.returnMsg,
           type: "error",
         });
@@ -66,7 +67,7 @@ async function readePipe() {
         lineShow();
      
       } else {
-        ElMessage({
+        message({
           message: res.returnMsg,
           type: "error",
         });

+ 9 - 8
src/view/components/MenuCheck.vue

@@ -212,6 +212,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect,ElConfigProvider } from 'element-plus'
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import icon from "@/assets/img/icon.png";
 import { timestampToTime } from '@/js/lindex.js'
@@ -313,7 +314,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中删除的项目")
+        message.error("你还没有选中删除的项目")
     } else {
         zqname.value = tableobj.value.pname;
         dialogsgdelect.value = true;
@@ -327,14 +328,14 @@ const fundeledata=()=>{
     }
     request(params)
         .then((res) => {
-            ElMessage({
+            message({
                 message: '删除监测点成功',
                 type: 'success',
             })
             getsensor();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 
@@ -352,7 +353,7 @@ const getsensor = () => {
             tableobj.value={};
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //添加
@@ -383,7 +384,7 @@ const addEditaip=()=>{
     request(params)
         .then((res) => {
             sdialog.value.dianadddialog=false;
-            ElMessage({
+            message({
                 message: tishi.value+'监测点成功',
                 type: 'success',
             })
@@ -394,7 +395,7 @@ const addEditaip=()=>{
         .catch((err) => {
             const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
+         message.error(Msg)
 
         })
 
@@ -405,7 +406,7 @@ const amend = () => {
     add.value = "修改";
     tishi.value=add.value;
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中修改的项目")
+        message.error("你还没有选中修改的项目")
     } else {
         sdialog.value.dianadddialog= true; 
         cid.value = tableobj.value.cid;
@@ -448,7 +449,7 @@ const pipelinedata = (searchtag) => {
             total.value = res.total;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //选中项

+ 27 - 26
src/view/components/MenuMine.vue

@@ -830,6 +830,7 @@
   import { computed, ref, onMounted, reactive, toRef } from "vue";
   import { request, uploadFile } from "@/utils/request";
   import { ElMessage, ElButton, ElDialog, ElSelect,ElConfigProvider } from 'element-plus'
+  import { message } from '@/utils/message';
   import { ArrowDown, ArrowUp,Crop, Minus, Plus,ArrowRight,ArrowLeft } from '@element-plus/icons-vue'
   import zhCn from 'element-plus/es/locale/lang/zh-cn'
   import icon from "@/assets/img/icon.png";
@@ -1246,7 +1247,7 @@ let options2 = ref([
               nodedata.value={}
           })
           .catch((err) => {
-              ElMessage.error(err.returnMsg)
+              message.error(err.returnMsg)
           })
   }
   //节点的添加
@@ -1266,16 +1267,16 @@ let options2 = ref([
   //节点添加api
   const nodeconfirm = () => {
       if(nodeobj.value.name==null||nodeobj.value.name==''){
-      ElMessage.error('名称不能为空')
+      message.error('名称不能为空')
              
       }else if(nodeobj.value.code==null||nodeobj.value.code==''){
-          ElMessage.error('编号不能为空')
+          message.error('编号不能为空')
       }else if(nodeobj.value.x==null||nodeobj.value.x==''){
-          ElMessage.error('X不能为空')
+          message.error('X不能为空')
       }else if(nodeobj.value.y==null||nodeobj.value.y==''){
-          ElMessage.error('Y不能为空')
+          message.error('Y不能为空')
       }else if(nodeobj.value.z==null||nodeobj.value.z==''){
-          ElMessage.error("Z不能为空")
+          message.error("Z不能为空")
       } else if(nodeobj.value.name!=''&&nodeobj.value.x!=''&&nodeobj.value.y!=''&&nodeobj.value.z!=''){
       const params = {
           transCode: 'D10000',
@@ -1292,17 +1293,17 @@ let options2 = ref([
           .then((res) => {
               sdialog.value.adddialog = false;
               pipelinedata();
-              ElMessage({
+              message({
                   message: '节点'+tishi.value+'成功',
                   type: 'success',
               })
   
           })
           .catch((err) => {
-              ElMessage.error(err.returnMsg)
+              message.error(err.returnMsg)
           })
       }else{
-          ElMessage.error("不能为空")
+          message.error("不能为空")
       }
   
   }
@@ -1452,7 +1453,7 @@ const changejm=(val)=>{
   const nodedelete = () => {
       console.log(nodedata.value);
       if (JSON.stringify(nodedata.value) == '{}') {
-          ElMessage.error("你还没有选中删除的项目")
+          message.error("你还没有选中删除的项目")
       } else {
           sdialog.value.dialogsgdelect = true;
           zqname.value = nodedata.value.name;
@@ -1466,20 +1467,20 @@ const changejm=(val)=>{
       request(params)
           .then((res) => {
               pipelinedata();
-              ElMessage({
+              message({
                   message: '节点删除成功',
                   type: 'success',
               })
   
           })
           .catch((err) => {
-              ElMessage.error(err.returnMsg)
+              message.error(err.returnMsg)
           })
   }
   //节点修改
   const accident = () => {
       if (JSON.stringify(nodedata.value) == '{}') {
-          ElMessage.error("你还没有选中修改的项目")
+          message.error("你还没有选中修改的项目")
       } else {
           zhtext.value = '修改';
           tishi.value= zhtext.value;
@@ -1513,7 +1514,7 @@ const changejm=(val)=>{
               gd.value.total = res.total;
           })
           .catch((err) => {
-              ElMessage.error(err.returnMsg)
+              message.error(err.returnMsg)
           })
   }
   // 节点选中开始结束
@@ -1588,7 +1589,7 @@ const changejm=(val)=>{
       request(params)
           .then((res) => {
               sdialog.value.gdadddialog = false;
-              ElMessage({
+              message({
                   message: '巷道信息'+tishi.value+'成功',
                   type: 'success',
               })
@@ -1604,14 +1605,14 @@ const changejm=(val)=>{
           .catch((err) => {
             const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
+         message.error(Msg)
            // sdialog.value.gdadddialog = true;
-            //  ElMessage.error(err.returnMsg)
+            //  message.error(err.returnMsg)
           })
     //   } 
     //   else{
     //    // sdialog.value.gdadddialog = true;
-    //       ElMessage.error("结束节点要大于开始节点")
+    //       message.error("结束节点要大于开始节点")
     //   }
   }
   // 管道删除
@@ -1619,7 +1620,7 @@ const changejm=(val)=>{
   const nodedelete2 = () => {
       console.log(gddata.value);
       if (JSON.stringify(gddata.value) == '{}') {
-          ElMessage.error("你还没有选中删除的项目")
+          message.error("你还没有选中删除的项目")
       } else {
           sdialog.value.guddialogsgdelect = true;
           zqname.value = gddata.value.name;
@@ -1633,20 +1634,20 @@ const changejm=(val)=>{
       request(params)
           .then((res) => {
               guandaodata();
-              ElMessage({
+              message({
                   message: '巷道信息删除成功',
                   type: 'success',
               })
               gddata.value={};
           })
           .catch((err) => {
-              ElMessage.error(err.returnMsg)
+              message.error(err.returnMsg)
           })
   }
   // 管道修改
   const accident2 = () => {
       if (JSON.stringify(gddata.value) == '{}') {
-          ElMessage.error("你还没有选中修改的项目")
+          message.error("你还没有选中修改的项目")
       } else {
           zhtext.value = '修改';
           tishi.value=zhtext.value;
@@ -1774,7 +1775,7 @@ const fileboolen=(val)=>{
   console.log(msg2);
 
   if(msg=="上传中"||msg2=="上传中"){
-    ElMessage.error("上传中不能关闭");
+    message.error("上传中不能关闭");
   }else{
     if(val=='cancel'){
         sdialog.value.gdadddialog=false;
@@ -1785,10 +1786,10 @@ const fileboolen=(val)=>{
     if(val=='confirm'&&msg=="已上传"||val=='confirm'&&msg2=="已上传"||val=='confirm'&&msg==undefined||val=='confirm'&&msg2==undefined){
         //sdialog.value.gdadddialog=false;
         if(guandaoobj.value.code==''){
-            ElMessage.error("编号不能为空");
+            message.error("编号不能为空");
      }else if(guandaoobj.value.name==''){
 
-        ElMessage.error("名称不能为空");
+        message.error("名称不能为空");
      }
      else{
       
@@ -1943,7 +1944,7 @@ const maoqueding=()=>{
  }else if(radio1.value=='1'){
     guandaoobj.value.roughCoe=zuli.value.jsuan;
  }
- ElMessage({
+ message({
                   message:'系数保存成功',
                   type: 'success',
               })

+ 8 - 7
src/view/components/MenuPhysics.vue

@@ -146,6 +146,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import icon from "@/assets/img/icon.png";
 import { timestampToTime } from '@/js/lindex.js'
 let pipeline = ref();
@@ -195,7 +196,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中删除的项目")
+        message.error("你还没有选中删除的项目")
     } else {
         dialogsgdelect.value = true
         zqname.value = tableobj.value.name;
@@ -211,13 +212,13 @@ const fundeledata = () => {
     request(params)
         .then((res) => {
             getsensor();
-            ElMessage({
+            message({
                 message: '删除物理属性成功',
                 type: 'success',
             })
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 onMounted(() => {
@@ -235,7 +236,7 @@ const getsensor = () => {
             tableobj.value={};
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //添加
@@ -269,7 +270,7 @@ const addEied = () => {
         .then((res) => {
             tableData.value = res.rows;
             getsensor();
-            ElMessage({
+            message({
                 message: tishi.value+'物理属性成功',
                 type: 'success',
             })
@@ -278,7 +279,7 @@ const addEied = () => {
         .catch((err) => {
             const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
+         message.error(Msg)
         })
 }
 //修改
@@ -286,7 +287,7 @@ const amend = () => {
     add.value = "修改";
     tishi.value= add.value;
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中修改的项目")
+        message.error("你还没有选中修改的项目")
     } else {
     addVisible.value = true;
     wuliobj.value.coid = tableobj.value.coid;

+ 9 - 8
src/view/components/MenuSensor.vue

@@ -138,6 +138,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import icon from "@/assets/img/icon.png";
 import pipelines from "./PipeIine.vue"
 import { vtkmodel } from "@/control/vtkModel.js";
@@ -187,7 +188,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中删除的项目")
+        message.error("你还没有选中删除的项目")
     } else {
         dialogsgdelect.value = true
         zqname.value = tableobj.value.pname;
@@ -201,14 +202,14 @@ const fundeledata = () => {
     }
     request(params)
         .then((res) => {
-            ElMessage({
+            message({
                   message: '传感器信息删除成功',
                   type: 'success',
               })
             getsensor();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 onMounted(() => {
@@ -229,7 +230,7 @@ request(params)
    
     })
     .catch((err) => {
-        ElMessage.error(err.returnMsg)
+        message.error(err.returnMsg)
     })
 }
 const getsensor = () => {
@@ -252,7 +253,7 @@ const getsensor = () => {
           
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //添加
@@ -289,7 +290,7 @@ const addEied = () => {
     }
     request(params)
         .then((res) => {
-            ElMessage({
+            message({
                   message:'传感器信息'+tishi.value+'成功',
                   type: 'success',
               })
@@ -300,7 +301,7 @@ const addEied = () => {
         .catch((err) => {
             const regex = /字段\d*/g;
             let Msg=err.returnMsg.replace(regex, '');
-            ElMessage.error(Msg)
+            message.error(Msg)
         })
 }
 
@@ -310,7 +311,7 @@ const amend = () => {
     add.value = "修改";
     tishi.value= add.value;
     if (JSON.stringify(tableobj.value) == '{}') {
-        ElMessage.error("你还没有选中修改的项目")
+        message.error("你还没有选中修改的项目")
     } else {
         senobj.value.seid = tableobj.value.seid
         senobj.value.pid = tableobj.value.pid

+ 4 - 3
src/view/components/Menudisaster.vue

@@ -216,6 +216,7 @@
   import { computed, ref, onMounted, reactive, toRef } from "vue";
   import { request, uploadFile } from "@/utils/request";
   import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+  import { message } from '@/utils/message';
   import icon from "@/assets/img/icon.png";
 
 import bt1 from "@/assets/img/Group1377.png"
@@ -297,7 +298,7 @@ const handleClick = (Tab, val) => {
            console.log(tableData)
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 
@@ -312,7 +313,7 @@ const handleDelete=(val)=>{
 //修改
 const Eidedes=()=>{
   if (currentrow.value == false) {
-        ElMessage.error("你还没有选中修改的项目")
+        message.error("你还没有选中修改的项目")
     } else {
       
       if(resultactiveName.value=='Water'){
@@ -361,7 +362,7 @@ const Eiedre=()=>{
           currentrow.value=false;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
   defineExpose({ dialogVisible, });

+ 10 - 9
src/view/components/Menumap.vue

@@ -142,6 +142,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import icon from "@/assets/img/icon.png";
 import pipelines from "./PipeIine.vue"
@@ -202,7 +203,7 @@ const handleDelete = (val) => {
 // 删除
 const shanchu = () => {
    if (JSON.stringify(tableobj.value) == '{}') {
-       ElMessage.error("你还没有选中删除的项目")
+       message.error("你还没有选中删除的项目")
    } else {
        dialogsgdelect.value = true
        zqname.value = tableobj.value.pname;
@@ -216,14 +217,14 @@ const fundeledata = () => {
    }
    request(params)
        .then((res) => {
-           ElMessage({
+           message({
                  message: '平台管道映射删除成功',
                  type: 'success',
              })
            getsensor();
        })
        .catch((err) => {
-           ElMessage.error(err.returnMsg)
+           message.error(err.returnMsg)
        })
 }
 onMounted(() => {
@@ -248,7 +249,7 @@ request(params)
   
    })
    .catch((err) => {
-       ElMessage.error(err.returnMsg)
+       message.error(err.returnMsg)
    })
 }
 //添加
@@ -268,11 +269,11 @@ const addsg = () => {
 // 添加修改的接口
 const addEied = () => {
     if (senobj.value.ptcode == '') {
-        ElMessage.error("平台编号不能为空")
+        message.error("平台编号不能为空")
         return;
     }
     if (source.value.selectstr == '') {
-        ElMessage.error("请选择巷道")
+        message.error("请选择巷道")
         return;
     }
 
@@ -287,7 +288,7 @@ const addEied = () => {
    console.log(params)
    request(params)
        .then((res) => {
-           ElMessage({
+           message({
                  message:'平台管道映射'+tishi.value+'成功',
                  type: 'success',
              })
@@ -298,7 +299,7 @@ const addEied = () => {
        .catch((err) => {
            const regex = /字段\d*/g;
            let Msg=err.returnMsg.replace(regex, '');
-           ElMessage.error(Msg)
+           message.error(Msg)
        })
 }
 
@@ -308,7 +309,7 @@ const amend = () => {
    add.value = "修改";
    tishi.value= add.value;
    if (JSON.stringify(tableobj.value) == '{}') {
-       ElMessage.error("你还没有选中修改的项目")
+       message.error("你还没有选中修改的项目")
    } else {
 
     senobj.value.ptid = tableobj.value.ptid;

+ 16 - 15
src/view/components/Menupath.vue

@@ -239,6 +239,7 @@
  import { computed, ref, onMounted, reactive, toRef } from "vue";
  import { request, uploadFile } from "@/utils/request";
  import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+ import { message } from '@/utils/message';
  import icon from "@/assets/img/icon.png";
  import selfdialogs from "./SetNode.vue";
  import NodeSelect from "./NodeLine.vue";
@@ -307,14 +308,14 @@
     delt.value=val;
     if(val=='1'){
         if (JSON.stringify( tableobj.value ) == '{}') {
-         ElMessage.error("你还没有选中删除的项目")
+         message.error("你还没有选中删除的项目")
      } else {
          dialogsgdelect.value = true;
          zqname.value = tableobj.value.name;
      }
     }else{
         if ( JSON.stringify(childnodeobj.value) == '{}') {
-         ElMessage.error("你还没有选中删除的项目")
+         message.error("你还没有选中删除的项目")
      } else {
          dialogsgdelect.value = true;
          zqname.value = childnodeobj.value.nname;
@@ -340,14 +341,14 @@ const faterdelete=()=>{
          .then((res) => {
             pathshownode.value=false;
             getsensor();
-            ElMessage({
+            message({
                 message: '删除路径成功',
                 type: 'success',
             })
 
          })
          .catch((err) => {
-             ElMessage.error(err.returnMsg)
+             message.error(err.returnMsg)
          })
  }
  // 子节点的删除
@@ -358,7 +359,7 @@ const faterdelete=()=>{
      }
      request(params)
          .then((res) => {
-            ElMessage({
+            message({
                   message: '预设路径节点删除成功',
                   type: 'success',
               })
@@ -366,7 +367,7 @@ const faterdelete=()=>{
 
          })
          .catch((err) => {
-             ElMessage.error(err.returnMsg)
+             message.error(err.returnMsg)
          })
  }
  const handledetection=( row)=>{
@@ -388,7 +389,7 @@ const faterdelete=()=>{
             childtableData.value=res.rows;
           childnodeobj.value={};
             if (res.rows.length == 0) {
-        ElMessage({
+        message({
           message: "无路径数据!",
           type: "error",
         });
@@ -427,7 +428,7 @@ emitter.off('handleSelect')
               tableobj.value={};
          })
          .catch((err) => {
-             ElMessage.error(err.returnMsg)
+             message.error(err.returnMsg)
          })
  }
  //添加
@@ -456,7 +457,7 @@ emitter.off('handleSelect')
              currentrow.value=false;
              addVisible.value=false;
              getsensor();
-             ElMessage({
+             message({
                 message: tishi.value+'路径成功',
                 type: 'success',
             })
@@ -464,8 +465,8 @@ emitter.off('handleSelect')
          .catch((err) => {
             const regex = /字段\d*/g;
         let Msg=err.returnMsg.replace(regex, '');
-         ElMessage.error(Msg)
-             //ElMessage.error(err.returnMsg)
+         message.error(Msg)
+             //message.error(err.returnMsg)
          })
  }
  
@@ -474,7 +475,7 @@ emitter.off('handleSelect')
      add.value = "修改";
      tishi.value= add.value;
      if (JSON.stringify(tableobj.value) == '{}') {
-         ElMessage.error("你还没有选中修改的项目")
+         message.error("你还没有选中修改的项目")
      } else {
      addVisible.value = true;
      wuliobj.value.wid= tableobj.value.wid;
@@ -538,7 +539,7 @@ const addnode=(val)=>{
      request(params)
          .then((res) => {
             addVisiblenode.value = false;
-            ElMessage({
+            message({
                   message: '预设路径节点'+tishi.value+'成功',
                   type: 'success',
               })
@@ -547,14 +548,14 @@ const addnode=(val)=>{
        
          })
          .catch((err) => {
-             ElMessage.error(err.returnMsg)
+             message.error(err.returnMsg)
          })
 }
 // 修改
 
 const childamend=()=>{
     if(JSON.stringify(childnodeobj.value) == '{}'){
-        ElMessage.error("你还没有选中修改的项目")
+        message.error("你还没有选中修改的项目")
     }else{
         caddname.value='修改'
         tishi.value=caddname.value;

+ 16 - 15
src/view/components/Menupump.vue

@@ -384,6 +384,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue"
 import { request, uploadFile } from "@/utils/request"
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
+import { message } from '@/utils/message';
 import zhCn from "element-plus/es/locale/lang/zh-cn"
 import icon from "@/assets/img/icon.png"
 import pipelines from "./PipeIine.vue"
@@ -441,7 +442,7 @@ const checkhfObjTable=(val)=>{
 }
 const updatehf=()=>{
   if (JSON.stringify(hfObj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目")
+    message.error("你还没有选中修改的项目")
   }else{
     tishi2.value = "修改"
     hfDShow.value = true;
@@ -466,20 +467,20 @@ const savehf=()=>{
         .then((res) => {
          findhfObjs();
         hfDShow.value = false;
-        ElMessage({
+        message({
           message: "水位"+ tishi2.value + "成功",
           type: "success"
         })
         })
         .catch((err) => {
-        ElMessage.error(err.returnMsg)
+        message.error(err.returnMsg)
         })
 }
 
 // 水位
 const shanchu2 = () => {
   if (JSON.stringify(hfObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   } else {
     dialogsgdelect2.value = true
     zqname2.value.hight = hfObj.value.hight
@@ -490,7 +491,7 @@ const shanchu2 = () => {
 
 const delhf=()=>{
  if (JSON.stringify(hfObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   } else {
      const params = {
         transCode: "D50006",
@@ -499,13 +500,13 @@ const delhf=()=>{
     request(params)
         .then((res) => {
         findhfObjs();
-        ElMessage({
+        message({
           message: "水位删除成功",
           type: "success"
         })
         })
         .catch((err) => {
-        ElMessage.error(err.returnMsg)
+        message.error(err.returnMsg)
         })
   }
 }
@@ -523,14 +524,14 @@ const findhfObjs=()=>{
       hfObjs.value = res.rows
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 
 // 删除
 const shanchu = () => {
   if (JSON.stringify(tableobj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   } else {
     dialogsgdelect.value = true
     zqname.value = tableobj.value.pumpname
@@ -543,14 +544,14 @@ const fundeledata = () => {
   }
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "水泵删除成功",
         type: "success"
       })
       getsensor()
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 onMounted(() => {
@@ -567,7 +568,7 @@ const getsensor = () => {
       tableobj.value = {}
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 //添加
@@ -594,7 +595,7 @@ const addEied = () => {
   console.log(params)
   request(params)
     .then((res) => {
-      ElMessage({
+      message({
         message: "水泵" + tishi.value + "成功",
         type: "success"
       })
@@ -605,7 +606,7 @@ const addEied = () => {
     .catch((err) => {
       const regex = /字段\d*/g
       let Msg = err.returnMsg.replace(regex, "")
-      ElMessage.error(Msg)
+      message.error(Msg)
     })
 }
 
@@ -614,7 +615,7 @@ const amend = () => {
   add.value = "修改"
   tishi.value = add.value
   if (JSON.stringify(tableobj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目")
+    message.error("你还没有选中修改的项目")
   } else {
     senobj.value = tableobj.value
     addVisible.value = true

+ 9 - 8
src/view/components/Menuventdoor.vue

@@ -205,6 +205,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue"
 import { request, uploadFile } from "@/utils/request"
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
+import { message } from '@/utils/message';
 import zhCn from "element-plus/es/locale/lang/zh-cn"
 import icon from "@/assets/img/icon.png"
 import pipelines from "./PipeIine.vue"
@@ -232,7 +233,7 @@ const fmtabxz=(val)=>{
 }
 const fmupdate=()=>{
   if (JSON.stringify(fmObj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目")
+    message.error("你还没有选中修改的项目")
   }else{
     tishi.value = "修改";
     fmDShow.value = true;
@@ -260,13 +261,13 @@ const fmsave=()=>{
     .then((res) => {
      fmfind();
      fmDShow.value = false;
-     ElMessage({
+     message({
       message: "风门"+ tishi.value + "成功",
       type: "success"
      })
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 
@@ -276,7 +277,7 @@ let fmdelname=ref("");
 
 const fmdeldialog=()=>{
   if (JSON.stringify(fmObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   }else{
     dialogsgdelect.value = true;
     fmdelname.value = fmObj.value.doorname;
@@ -285,7 +286,7 @@ const fmdeldialog=()=>{
 
 const fmdel=()=>{
   if (JSON.stringify(fmObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   }else{
   const params = {
     transCode: "D50012",
@@ -294,10 +295,10 @@ const fmdel=()=>{
   request(params)
     .then((res) => {
       fmfind();
-      ElMessage.success("风门删除成功")
+      message.success("风门删除成功")
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
   }
 }
@@ -310,7 +311,7 @@ const fmfind=()=>{
       fmObjs.value = res.rows
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 onMounted(() => {

+ 11 - 10
src/view/components/Menuventfan.vue

@@ -203,6 +203,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue"
 import { request, uploadFile } from "@/utils/request"
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
+import { message } from '@/utils/message';
 import zhCn from "element-plus/es/locale/lang/zh-cn"
 import icon from "@/assets/img/icon.png"
 import pipelines from "./PipeIine.vue"
@@ -230,7 +231,7 @@ const femtabxz=(val)=>{
 }
 const femupdate=()=>{
   if (JSON.stringify(femObj.value) == "{}") {
-    ElMessage.error("你还没有选中修改的项目")
+    message.error("你还没有选中修改的项目")
   }else{
     tishi.value = "修改";
     femDShow.value = true;
@@ -245,11 +246,11 @@ const femadd=()=>{
 
 const femsave=()=>{
   if (femObj.value.fanname == "" || femObj.value.fanname == undefined) {
-    ElMessage.error("风机名称不能为空")
+    message.error("风机名称不能为空")
     return
   }
   if (femObj.value.fancode == "" || femObj.value.fancode == undefined) {
-    ElMessage.error("风机编码不能为空")
+    message.error("风机编码不能为空")
     return
   }
    const params = {
@@ -266,13 +267,13 @@ const femsave=()=>{
     .then((res) => {
      femfind();
      femDShow.value = false;
-     ElMessage({
+     message({
       message: "风机"+ tishi.value + "成功",
       type: "success"
      })
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 
@@ -282,7 +283,7 @@ let fjdelname=ref("");
 
 const femdeldialog=()=>{
   if (JSON.stringify(femObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   }else{
     dialogsgdelect.value = true;
     fjdelname.value = femObj.value.fanname;
@@ -291,7 +292,7 @@ const femdeldialog=()=>{
 
 const femdel=()=>{
   if (JSON.stringify(femObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    message.error("你还没有选中删除的项目")
   }else{
   const params = {
     transCode: "D50009",
@@ -300,10 +301,10 @@ const femdel=()=>{
   request(params)
     .then((res) => {
       femfind();
-      ElMessage.success("风机删除成功")
+      message.success("风机删除成功")
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
   }
 }
@@ -316,7 +317,7 @@ const femfind=()=>{
       femObjs.value = res.rows
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg)
+      message.error(err.returnMsg)
     })
 }
 onMounted(() => {

+ 2 - 1
src/view/components/NodeLine.vue

@@ -66,6 +66,7 @@ import { ref, onMounted, reactive, } from "vue";
 import { RouterView, RouterLink } from "vue-router"
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect,ElConfigProvider } from 'element-plus'
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import icon from "@/assets/img/icon.png";
 const props = defineProps({});
@@ -113,7 +114,7 @@ const pipelinedata = () => {
             total.value = res.total;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 function searchgd() {

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

@@ -81,6 +81,7 @@ import { ref, onMounted, reactive, } from "vue";
 import {RouterView,RouterLink } from "vue-router"
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import icon from "@/assets/img/icon.png";
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 const props= defineProps({ });
@@ -184,7 +185,7 @@ const pipelinedata = (searchtag) => {
             total.value = res.total;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //选中项

+ 3 - 2
src/view/components/fileuploads.vue

@@ -25,6 +25,7 @@ import WebUploader from 'webuploader';
 import store from "@/store";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog } from "element-plus";
+import { message } from '@/utils/message';
 import {
   Check,
   Delete,
@@ -133,7 +134,7 @@ const  initWebUploader=()=>{
                 console.log(fax)
                 if(props.accept.indexOf(fax)<0){//判断上传支持文件类型
                     uploader.value.reset();
-                    ElMessage.error("只支持" +props.accept+"格式文件!");
+                    message.error("只支持" +props.accept+"格式文件!");
                     return;
                 }
                 uploader.value.md5File(file)
@@ -235,7 +236,7 @@ const  initWebUploader=()=>{
                if(res.returnCode=="000000000"){
                    return true;
                }else{
-                ElMessage.error(res.returnMsg);
+                message.error(res.returnMsg);
                    return false;
                }
             });

+ 9 - 8
src/view/evolutionView.vue

@@ -360,6 +360,7 @@
    import { request, uploadFile } from "@/utils/request";
    import {RouterView,RouterLink,useRouter } from "vue-router"
    import { ElMessage,ElConfigProvider } from 'element-plus'
+   import { message } from '@/utils/message';
    import zhCn from 'element-plus/es/locale/lang/zh-cn'
    const {currentRouter}=useRouter();
    //let echart=echarts;
@@ -584,14 +585,14 @@ function pipelinedata(searchtag){
         }
         request(params)
           .then((res) => { 
-            ElMessage({
+            message({
             message: res.returnMsg,
             type: 'success',
           })
             getdata();
           })
           .catch((err) => {
-             ElMessage({
+             message({
             message: err.returnMsg,
             type: 'error',
           })
@@ -624,7 +625,7 @@ function pipelinedata(searchtag){
         }
         request(params)
           .then((res) => { 
-            ElMessage({
+            message({
             message: res.returnMsg,
             type: 'success',
           })
@@ -652,7 +653,7 @@ function firstmethod(){
 if(zaiqytabledata.value.length==0){
   fundeledata();
   }else{
-    ElMessage({
+    message({
             message:'有灾源检测,不能删除',
             type: "warning",
           });
@@ -669,7 +670,7 @@ function fundeledata(){
         console.log(params);
         request(params)
           .then((res) => { 
-            ElMessage({
+            message({
             message: '删除成功',
             type: 'success',
           })
@@ -770,7 +771,7 @@ function fundeledata(){
         request(params)
           .then((res) => { 
            //console.log(res);
-           ElMessage({
+           message({
             message: res.returnMsg,
             type: 'success',
           })
@@ -794,7 +795,7 @@ function fundeledata(){
         request(params)
           .then((res) => { 
            //console.log(res);
-           ElMessage({
+           message({
             message: res.returnMsg,
             type: 'success',
           })
@@ -846,7 +847,7 @@ function handleDeletede(index,row){
         request(params)
           .then((res) => { 
            //console.log(res);
-           ElMessage({
+           message({
             message: "删除成功",
             type: 'success',
           })

+ 5 - 4
src/view/home1.vue

@@ -79,6 +79,7 @@
   import Dialoges from "./InfoDialoges.vue";
   import logo from "@/assets/logo.png";
   import { ElMessage, ElButton, ElDialog, ElSelect, formEmits } from 'element-plus'
+  import { message } from '@/utils/message';
   // import myIndex  from "./index"
   import SourceDisaster from "./components/InfoDisaster.vue";
   import InfoBoundary from "./components/InfoBoundary.vue";
@@ -160,22 +161,22 @@
   
       }else{
         if (resultleft.value.coids != resultright.value.coids) {
-      ElMessage.error('污染物不一样,无法进行比较')
+      message.error('污染物不一样,无法进行比较')
       return;
     }
   
     if (resultleft.value.totaltime != resultright.value.totaltime) {
-      ElMessage.error('模拟时长不一样,无法进行比较')
+      message.error('模拟时长不一样,无法进行比较')
       return;
     }
   
     if (resultleft.value.reportstep != resultright.value.reportstep) {
-      ElMessage.error('输出步长不一样,无法进行比较')
+      message.error('输出步长不一样,无法进行比较')
       return;
     }
   
     if (resultleft.value.pickertime != resultright.value.pickertime ) {
-      ElMessage.error('事故时间不一样,无法进行比较')
+      message.error('事故时间不一样,无法进行比较')
       return;
     }
       

+ 10 - 9
src/view/index/first-left.vue

@@ -223,6 +223,7 @@ import { ref, onMounted, reactive, } from "vue";
 import { RouterView, RouterLink } from "vue-router"
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import * as echarts from 'echarts'
 import { createFireControl } from "@/control/fireControl.js";
 import { timestampToTime, timescount } from "@/js/lindex.js";
@@ -443,17 +444,17 @@ await request(params)
 
     }else if(res.state=='-1'){
       firstshow.value=false;
-      // ElMessage({
+      // message({
       //   message: " 求解失败",
       //   type: 'error',
       // });
     }else if(res.state=='0'){
       firstshow.value=false;
-      // ElMessage({ message: "求解未完成",  type: 'error',
+      // message({ message: "求解未完成",  type: 'error',
       // });
     }
     } else {
-      ElMessage({
+      message({
         message: res.returnMsg,
         type: "error",
       });
@@ -462,7 +463,7 @@ await request(params)
   .catch((err) => {
     if(err.returnMsg=="任务不存在!"){
       monitor.value=false;
-      ElMessage({
+      message({
         message: "未求解",
         type: 'error',
       });
@@ -497,7 +498,7 @@ request(params)
     
     })
     .catch((err) => {
-        ElMessage.error(err.returnMsg)
+        message.error(err.returnMsg)
     })
 }
 async  function getMonitor() {
@@ -666,7 +667,7 @@ async  function getMonitor() {
       }
     }) .catch((err) => {
       tableData.value=[];
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
   }
 //回到上一页
@@ -752,13 +753,13 @@ const tableRowClassName=()=>{
 //下载报告
 function downloadImg(url, fileName) {
   if(aid.value==null||aid.value==''||aid.value==undefined){
-    ElMessage.error('项目不存在');
+    message.error('项目不存在');
   }else{
   let href="/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
-  ElMessage.success('正在下载报告');
+  message.success('正在下载报告');
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
@@ -870,7 +871,7 @@ const handleDelete=(event)=>{
       }
       lineChart();
     }) .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 
 }

+ 3 - 2
src/view/index/tow-right.vue

@@ -35,6 +35,7 @@ import { ref, onMounted, reactive } from "vue";
 import { RouterView, RouterLink } from "vue-router";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus";
+import { message } from '@/utils/message';
 import * as echarts from "echarts";
 import { vtkmodel } from "@/control/vtkModel.js";
 
@@ -66,7 +67,7 @@ async function getWayResult() {
     .then((res) => {
       console.log(res.rows);
       if (res.rows.length == 0) {
-        ElMessage({
+        message({
           message: "无路径数据!",
           type: "error",
         });
@@ -77,7 +78,7 @@ async function getWayResult() {
     })
     .catch((err) => {
       if (err.returnMsg == "任务不存在!") {
-        ElMessage({
+        message({
           message: "未求解",
           type: "error",
         });

+ 2 - 1
src/view/result.vue

@@ -125,6 +125,7 @@ import { ref, onMounted, onUnmounted, reactive } from "vue";
 import { RouterView, RouterLink } from "vue-router";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus";
+import { message } from '@/utils/message';
 import resultLeft from "./result/resultLeft.vue";
 import resultRight from "./result/resultRight.vue";
 import wdisaster from "./result/Wdisaster.vue";
@@ -418,7 +419,7 @@ async function getMonitor(leftAid, rightAid) {
           formInline.value.region
         );
       } else {
-        ElMessage({
+        message({
           message: res.returnMsg,
           type: "error",
         });

+ 5 - 4
src/view/result/Wdisaster.vue

@@ -71,6 +71,7 @@ import { request, uploadFile } from "@/utils/request";
 import * as echarts from 'echarts'
 import { createFireControl } from "@/control/fireControl.js";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import bt4 from "@/assets/img/Group1376.png"
 import bt1 from "@/assets/img/Group1377.png"
 import bt3 from "@/assets/img/Group1395.png"
@@ -105,13 +106,13 @@ const tableData2 = ref([
 //下载报告
 function downloadImg(url, fileName) {
   if(aid.value==null||aid.value==''||aid.value==undefined){
-    ElMessage.error('项目不存在');
+    message.error('项目不存在');
   }else{
   let href="/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
-  ElMessage.success('正在下载报告');
+  message.success('正在下载报告');
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
@@ -194,7 +195,7 @@ const handleDelete=(event)=>{
      // console.log( series.value);
       lineChart();
     }) .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 
 }
@@ -315,7 +316,7 @@ request(params)
       console.log( tableData2.value);
     }
   }) .catch((err) => {
-    ElMessage.error(err.returnMsg);
+    message.error(err.returnMsg);
   });
 }
 

+ 5 - 4
src/view/result/Wdisaster2.vue

@@ -71,6 +71,7 @@ import { request, uploadFile } from "@/utils/request";
 import * as echarts from 'echarts'
 import { createFireControl } from "@/control/fireControl.js";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
+import { message } from '@/utils/message';
 import bt4 from "@/assets/img/Group1376.png"
 import bt1 from "@/assets/img/Group1377.png"
 import bt3 from "@/assets/img/Group1395.png"
@@ -104,13 +105,13 @@ const tableData = ref([
 //下载报告
 function downloadImg(url, fileName) {
   if(aid.value==null||aid.value==''||aid.value==undefined){
-    ElMessage.error('项目不存在');
+    message.error('项目不存在');
   }else{
   let href="/TransServlet?channelNo=service&clientToken=e47b87eec69545559d1e81e56626da68&userId=5f06c8bc77234f969d13e160b54c27e3&"
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
-  ElMessage.success('正在下载报告');
+  message.success('正在下载报告');
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
@@ -189,7 +190,7 @@ const handleDelete=(event)=>{
     //  console.log( series.value);
       lineChart();
     }) .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      message.error(err.returnMsg);
     });
 
 }
@@ -305,7 +306,7 @@ request(params)
       tableData.value=res.vals;
     }
   }) .catch((err) => {
-    ElMessage.error(err.returnMsg);
+    message.error(err.returnMsg);
   });
 }
 

+ 14 - 13
src/view/result/leftcontent.vue

@@ -389,6 +389,7 @@
 import { computed, ref, onMounted, reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect, formEmits, ElConfigProvider} from 'element-plus'
+import { message } from '@/utils/message';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import icon from "@/assets/img/icon.png";
 import Frame2 from "@/assets/img/Frame2.png";
@@ -593,7 +594,7 @@ const classclick = (val) => {
 // 事故确定列表
 const accident = () => {
     if (idobj.value.name == '') {
-        ElMessage.error('请选择项目')
+        message.error('请选择项目')
     } else {
     //   router.push({ path: "/appmian" });
       console.log(router.push);
@@ -608,12 +609,12 @@ const accident = () => {
                     emit("leftsimulation",res,sgdata.value);
                 }
                 else if(res.state=='-1'){
-                    ElMessage({
+                    message({
                         message: " 求解失败",
                         type: 'error',
                     });
                     }else if(res.state=='0'){
-                    ElMessage({ message: "求解未完成",  type: 'error',
+                    message({ message: "求解未完成",  type: 'error',
                     });
                     }
             
@@ -621,12 +622,12 @@ const accident = () => {
             .catch((err) => {
                 if(err.returnMsg=="任务不存在!"){
    
-                    ElMessage({
+                    message({
                     message: "未求解",
                     type: 'error',
                     });
                     }
-            //ElMessage.error(err.returnMsg)
+            //message.error(err.returnMsg)
             
             })
 
@@ -695,7 +696,7 @@ const sgadd = () => {
             scoperadio.value = null;
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 // 事故列表的选择
@@ -736,14 +737,14 @@ const sgdelect = () => {
     request(params)
         .then((res) => {
             getdata();
-            ElMessage({
+            message({
                 message: '删除成功',
                 type: 'success',
             })
         })
         .catch((err) => {
             loading.value = false;
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 
 }
@@ -772,7 +773,7 @@ const getdata = () => {
         })
         .catch((err) => {
             loading.value = false;
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 
 }
@@ -790,7 +791,7 @@ const pollute = () => {
 
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 //任务求解任务信息
@@ -822,7 +823,7 @@ const rewu=()=>{
       
         })
         .catch((err) => {
-           // ElMessage.error(err.returnMsg)
+           // message.error(err.returnMsg)
            addinitial();
         })
       
@@ -903,7 +904,7 @@ const calculate = () => {
           //  initWebSocket();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            message.error(err.returnMsg)
         })
 }
 const projectsSelectionSelect = () => {
@@ -931,7 +932,7 @@ async function fetchFileContent() {
             if (res.returnCode == "000000000") {
                   getthislog(res.logs);
             } else {
-                ElMessage({
+                message({
                     message: res.returnMsg,
                     type: "error",
                 });