226bug修改

src/settings.js

@@ -5,3 +5,4 @@ export const UserIdKey = 'CAE_userId';
 export const LoginUrl = 'logUrl';
 export const Caegw_ProUrl="";
 export const Caegw_LogUrl="/login";
+export const loginflag= 'CAE_loginflag';

src/utils/request.ts

@@ -1,12 +1,12 @@
 import axios from 'axios';
 import store from '@/store'
-import { getToken,getUserId,removeToken,removeUserId } from '@/utils/token';
+import { getToken,getUserId,removeToken,removeUserId,setLoginflag,getLoginflag } from '@/utils/token';
 import { DES3 } from '@/utils/3des';
 import router from '@/router/index'
-import { ElMessage } from '../utils/message.js'
+import { ElMessage } from 'element-plus'
 import { Caegw_ProUrl,Caegw_LogUrl } from '@/settings' ;// 引入settings.js
 
-let Message = new ElMessage()
+// let Message = new ElMessage()
 
 const requestList = []; // 请求列表
 const CancelToken = axios.CancelToken;
@@ -62,22 +62,21 @@ axios.interceptors.response.use(res => {
       return Promise.resolve(data)
     } else {
       if (data.returnMsg === "用户验证失败！"|| data.returnMsg == "系统没有登录或会话超时!") {
-        removeToken();
-        removeUserId();
-        router.replace({ path: '/login' });
-        // ElMessageBox.confirm('系统没有登录或会话超时, 是否登录?', '提示', {
-        //   confirmButtonText: '登录',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // })
-        //   .then(() => {
-        //     ElMessageBox.close()
-        //     router.replace({ path: '/login' });
-        //   })
-        //   .catch(() => {
-        //     Message.info('已取消！')
-        //     ElMessageBox.close()
-        //   })
+        // 判断状态，只执行一次，避免多次跳转登录页
+        console.log('loginflag0:',getLoginflag())
+        if(getLoginflag() == '1'||getLoginflag() == undefined){
+          ElMessage.error(data.returnMsg)
+          console.log('loginflag:',getLoginflag())
+          setLoginflag('0')
+          console.log('loginflag1:',getLoginflag())
+          removeToken();
+          removeUserId();
+          router.replace({ path: '/login' });
+        }
+        
+        
+        // 直接返回一个空对象，避免进入 then 或 catch 弹出提示框
+        return new Promise(() => {}); // 不执行任何后续操作
       }
       return Promise.reject(data)
     }
@@ -186,7 +185,7 @@ const uploadFile = (params, channelNo = 'service', callback1) => {
       resolve(res)
     }).catch(err => {
       if (err != 'cancel') {
-        Message.error(err.returnMsg)
+        ElMessage.error(err.returnMsg)
       }
       reject(err)
     })

src/utils/token.js

@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie' // 引入js-cookie插件
-import { TokenKey,UserIdKey } from '@/settings' // 引入settings.js
+import { TokenKey,UserIdKey,loginflag } from '@/settings' // 引入settings.js
 
 /**
  * 前端uuid
@@ -55,4 +55,14 @@ export function setUserId(userId) {
 // 移除 userId
 export function removeUserId() {
   return Cookies.remove(UserIdKey)
+}
+
+// 设置 loginflag
+export function setLoginflag(flag) {
+  return Cookies.set(loginflag, flag)
+}
+
+// 获取 loginflag
+export function getLoginflag() {
+  return Cookies.get(loginflag)
 }

src/view/appmian.vue

@@ -373,7 +373,7 @@ const handleSelect = (key) => {
 
 //   });
 
- titleclick();
+  titleclick();
   activeIndeximg.value=key;
   bgk2false.value=true;
   indexref.value.btnlistshow=false;

src/view/components/Menumap.vue

@@ -267,6 +267,15 @@ const addsg = () => {
 }
 // 添加修改的接口
 const addEied = () => {
+    if (senobj.value.ptcode == '') {
+        ElMessage.error("平台编号不能为空")
+        return;
+    }
+    if (source.value.selectstr == '') {
+        ElMessage.error("请选择巷道")
+        return;
+    }
+
    const params = {
        transCode: 'M00007',
        ptid: senobj.value.ptid ,

src/view/components/Menupump.vue

@@ -109,7 +109,7 @@
                             background: 'rgba(13, 22, 57, 0) '
                           }"
                           @row-click="checkhfObjTable($event)"
-                          :highlight-current-row="currentrow"
+                          :highlight-current-row="currentrow1"
                         >
                           <template v-slot:empty>
                             <p>暂无数据</p>
@@ -127,40 +127,18 @@
                             </template>
                           </el-table-column>
                         </el-table>
-                        <div class="asdis_btn">
-                          <div
-                            class="flex_a"
-                          >
-                            <div
-                              class="btns"
-                              @click="addhf()"
-                            >
-                              <span class="spantext">添加</span>
-                            </div>
+                        <div class="dialog-footer footer_div l_btn">
+                          <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="addhf();">添加</el-button></div>
                           </div>
-                          <div class="flex_a">
-                            <div
-                              class="btns"
-                              @click="updatehf()"
-                            >
-                              <span class="spantext"> 修改</span>
-                            </div>
+                          <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="updatehf();"> 修改 </el-button></div>
                           </div>
-                          <div class="flex_a" >
-                            <div
-                              class="btns"
-                              @click="delhf()"
-                            >
-                              <span class="spantext">删除</span>
-                            </div>
+                          <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="shanchu2();"> 删除 </el-button></div>
                           </div>
-                          <div
-                            class="flex_a"
-                            @click="hfShow = false"
-                          >
-                            <div class="btns">
-                              <span class="spantext">确定</span>
-                            </div>
+                          <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="hfShow = false"> 确定 </el-button></div>
                           </div>
                         </div>
                       </div>
@@ -183,7 +161,7 @@
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
           <el-image :src="icon" fit="contain"></el-image>
-          <h4 :id="titleId" :class="titleClass">{{  zhtext  }}</h4>
+          <h4 :id="titleId" :class="titleClass">{{ tishi2 }}</h4>
         </div>
       </template>
       <div>
@@ -356,6 +334,40 @@
               </div>
             </div>
           </el-dialog>
+          <!-- 水位 -->
+          <el-dialog
+            v-model="dialogsgdelect2"
+            align-center
+            :append-to-body="true"
+            width="400"
+            class="dialog_class bgcolor tianjia"
+          >
+            <template #header="{ titleId, titleClass }">
+              <div class="my-header">
+                <el-image :src="icon" fit="contain"></el-image>
+                <h4 :id="titleId" :class="titleClass">删除框</h4>
+              </div>
+            </template>
+            <h4 class="delecttitle">
+              是否确认删除： <span class="spanclad">水位高度：{{ zqname2.hight }} 流速：{{ zqname2.flow }}</span>
+            </h4>
+            <div class="dialog-footer footer_div l_btn">
+              <div class="footerbtn flex1">
+                <div class="borderimg">
+                  <el-button @click="dialogsgdelect2 = false">取消</el-button>
+                </div>
+              </div>
+              <div class="footerbtn flex1">
+                <div class="borderimg">
+                  <el-button
+                    @click="delhf();dialogsgdelect2 = false"
+                  >
+                    确定
+                  </el-button>
+                </div>
+              </div>
+            </div>
+          </el-dialog>
           <!-- 选择管道 -->
           <pipelines
             ref="pipeline"
@@ -382,10 +394,12 @@ import closeimg from "@/assets/img/colse.png";
 
 
 let pipeline = ref()
-let currentrow = ref(true)
+let currentrow = ref(true) //水泵
+let currentrow1 = ref(true) //水位
 let sendialogVisible = ref(false)
 let addVisible = ref(false)
 let dialogsgdelect = ref(false)
+let dialogsgdelect2 = ref(false)
 let classradio1 = ref("Fire")
 const formLabelWidth6 = ref(100)
 let coolactiveName1 = ref(["1", "2"])
@@ -395,7 +409,9 @@ let tableHeight = ref(200)
 let tableData = ref([])
 let tableobj = ref({})
 let zqname = ref()
+let zqname2 = ref({})
 let tishi = ref()
+let tishi2 = ref()
 let senobj = ref({})
 
 //水泵曲线数据
@@ -421,19 +437,21 @@ const handleDelete = (val) => {
 //选中曲线
 const checkhfObjTable=(val)=>{
    hfObj.value =val;
-   currentrow.value = true
+   currentrow1.value = true
 }
 const updatehf=()=>{
   if (JSON.stringify(hfObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    ElMessage.error("你还没有选中修改的项目")
   }else{
+    tishi2.value = "修改"
     hfDShow.value = true;
   }
    
 }
 const addhf=()=>{
+  tishi2.value = "添加";
     hfObj.value ={};
-    currentrow.value = false;
+    currentrow1.value = false;
     hfDShow.value = true;
 }
 const savehf=()=>{
@@ -448,11 +466,28 @@ const savehf=()=>{
         .then((res) => {
          findhfObjs();
         hfDShow.value = false;
+        ElMessage({
+          message: "水位"+ tishi2.value + "成功",
+          type: "success"
+        })
         })
         .catch((err) => {
         ElMessage.error(err.returnMsg)
         })
 }
+
+// 水位
+const shanchu2 = () => {
+  if (JSON.stringify(hfObj.value) == "{}") {
+    ElMessage.error("你还没有选中删除的项目")
+  } else {
+    dialogsgdelect2.value = true
+    zqname2.value.hight = hfObj.value.hight
+    zqname2.value.flow = hfObj.value.flow
+
+  }
+}
+
 const delhf=()=>{
  if (JSON.stringify(hfObj.value) == "{}") {
     ElMessage.error("你还没有选中删除的项目")
@@ -464,6 +499,10 @@ const delhf=()=>{
     request(params)
         .then((res) => {
         findhfObjs();
+        ElMessage({
+          message: "水位删除成功",
+          type: "success"
+        })
         })
         .catch((err) => {
         ElMessage.error(err.returnMsg)
@@ -494,7 +533,7 @@ const shanchu = () => {
     ElMessage.error("你还没有选中删除的项目")
   } else {
     dialogsgdelect.value = true
-    zqname.value = tableobj.value.pname
+    zqname.value = tableobj.value.pumpname
   }
 }
 const fundeledata = () => {

src/view/components/Menuventdoor.vue

@@ -48,25 +48,17 @@
                           </template>
                         </el-table-column>
                       </el-table>
-                      <div class="asdis_btn">
-                        <div class="flex_a">
-                          <div
-                            class="btns"
-                            @click="fmadd()"
-                          >
-                            <span class="spantext">添加</span>
-                          </div>
+                      <div class="dialog-footer footer_div l_btn">
+                        <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="fmadd();">添加</el-button></div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="fmupdate()">
-                            <span class="spantext">修改</span>
-                          </div>
+                        <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="fmupdate();">修改</el-button></div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="fmdel()">
-                            <span class="spantext">删除</span>
-                          </div>
+                        <div class="footerbtn flex1">
+                            <div class="borderimg"><el-button @click="fmdeldialog();">删除</el-button></div>
                         </div>
+                        
                       </div>
                     </div>
                   </div>
@@ -83,7 +75,7 @@
             <template #header="{ titleId, titleClass }">
               <div class="my-header">
                 <el-image :src="icon" fit="contain"></el-image>
-                <h4 :id="titleId" :class="titleClass">风门</h4>
+                <h4 :id="titleId" :class="titleClass">{{ tishi }}</h4>
               </div>
             </template>
             <el-form>
@@ -174,7 +166,28 @@
               </div>
             </div>
           </el-dialog>
+          <!-- 删除框 -->
+          <el-dialog v-model="dialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
 
+           <template #header="{ titleId, titleClass }">
+               <div class="my-header ">
+                   <el-image :src="icon" fit="contain"></el-image>
+                   <h4 :id="titleId" :class="titleClass">删除框</h4>
+
+               </div>
+           </template>
+           <h4 class="delecttitle"> 是否确认删除： <span class="spanclad">{{ fmdelname }}</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>
+               </div>
+               <div class="footerbtn flex1">
+                   <div class="borderimg"><el-button @click="fmdel(); dialogsgdelect = false">
+                           确定
+                       </el-button></div>
+               </div>
+           </div>
+          </el-dialog>
      
           <!-- 选择管道 -->
           <pipelines
@@ -211,6 +224,7 @@ let sendialogVisible=ref(false);
 let fmDShow =ref(false);
 let fmObjs=ref([]);
 let fmObj= ref({});
+let tishi = ref();
 
 const fmtabxz=(val)=>{
   fmObj.value = val;
@@ -218,13 +232,16 @@ const fmtabxz=(val)=>{
 }
 const fmupdate=()=>{
   if (JSON.stringify(fmObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    ElMessage.error("你还没有选中修改的项目")
   }else{
+    tishi.value = "修改";
     fmDShow.value = true;
   }
 }
 const fmadd=()=>{
+  tishi.value = "添加";
   fmObj.value={};
+  currentrow.value = false;
   fmDShow.value = true;
 }
 
@@ -243,11 +260,29 @@ const fmsave=()=>{
     .then((res) => {
      fmfind();
      fmDShow.value = false;
+     ElMessage({
+      message: "风门"+ tishi.value + "成功",
+      type: "success"
+     })
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg)
     })
 }
+
+
+let dialogsgdelect=ref(false);
+let fmdelname=ref("");
+
+const fmdeldialog=()=>{
+  if (JSON.stringify(fmObj.value) == "{}") {
+    ElMessage.error("你还没有选中删除的项目")
+  }else{
+    dialogsgdelect.value = true;
+    fmdelname.value = fmObj.value.doorname;
+  }
+}
+
 const fmdel=()=>{
   if (JSON.stringify(fmObj.value) == "{}") {
     ElMessage.error("你还没有选中删除的项目")
@@ -259,6 +294,7 @@ const fmdel=()=>{
   request(params)
     .then((res) => {
       fmfind();
+      ElMessage.success("风门删除成功")
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg)

src/view/components/Menuventfan.vue

@@ -53,24 +53,16 @@
                           </template>
                         </el-table-column>
                       </el-table>
-                      <div class="asdis_btn">
-                        <div class="flex_a">
-                          <div
-                            class="btns"
-                            @click="femadd()"
-                          >
-                            <span class="spantext">添加</span>
-                          </div>
+                      <div class="dialog-footer footer_div l_btn">
+                        <div class="footerbtn flex1">
+                          <div class="borderimg"><el-button @click="femadd();">添加</el-button></div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="femupdate()">
-                            <span class="spantext">修改</span>
-                          </div>
+                        
+                        <div class="footerbtn flex1">
+                          <div class="borderimg"><el-button @click="femupdate()">修改</el-button></div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="femdel()">
-                            <span class="spantext">删除</span>
-                          </div>
+                        <div class="footerbtn flex1">
+                          <div class="borderimg"><el-button @click="femdeldialog()">删除</el-button></div>
                         </div>
                       </div>
                     </div>
@@ -79,7 +71,27 @@
               </div>
             </el-collapse-item>
           </el-collapse>
+          <el-dialog v-model="dialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
 
+           <template #header="{ titleId, titleClass }">
+               <div class="my-header ">
+                   <el-image :src="icon" fit="contain"></el-image>
+                   <h4 :id="titleId" :class="titleClass">删除框</h4>
+
+               </div>
+           </template>
+           <h4 class="delecttitle"> 是否确认删除： <span class="spanclad">{{ fjdelname }}</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>
+               </div>
+               <div class="footerbtn flex1">
+                   <div class="borderimg"><el-button @click="femdel(); dialogsgdelect = false">
+                           确定
+                       </el-button></div>
+               </div>
+           </div>
+          </el-dialog>
           <!-- 风门的添加 -->
           <el-dialog
             v-model="femDShow"
@@ -88,7 +100,7 @@
             <template #header="{ titleId, titleClass }">
               <div class="my-header">
                 <el-image :src="icon" fit="contain"></el-image>
-                <h4 :id="titleId" :class="titleClass">风机</h4>
+                <h4 :id="titleId" :class="titleClass">{{ tishi }}</h4>
               </div>
             </template>
             <el-form>
@@ -210,6 +222,7 @@ let sendialogVisible=ref(false);
 let femDShow =ref(false);
 let femObjs=ref([]);
 let femObj= ref({});
+let tishi = ref();
 
 const femtabxz=(val)=>{
   femObj.value = val;
@@ -217,17 +230,28 @@ const femtabxz=(val)=>{
 }
 const femupdate=()=>{
   if (JSON.stringify(femObj.value) == "{}") {
-    ElMessage.error("你还没有选中删除的项目")
+    ElMessage.error("你还没有选中修改的项目")
   }else{
+    tishi.value = "修改";
     femDShow.value = true;
   }
 }
 const femadd=()=>{
+  tishi.value = '添加';
   femObj.value={};
+  currentrow.value = false;
   femDShow.value = true;
 }
 
 const femsave=()=>{
+  if (femObj.value.fanname == "" || femObj.value.fanname == undefined) {
+    ElMessage.error("风机名称不能为空")
+    return
+  }
+  if (femObj.value.fancode == "" || femObj.value.fancode == undefined) {
+    ElMessage.error("风机编码不能为空")
+    return
+  }
    const params = {
     transCode: "D50008",
     fanbaseid:femObj.value.fanbaseid,
@@ -242,11 +266,29 @@ const femsave=()=>{
     .then((res) => {
      femfind();
      femDShow.value = false;
+     ElMessage({
+      message: "风机"+ tishi.value + "成功",
+      type: "success"
+     })
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg)
     })
 }
+
+
+let dialogsgdelect=ref(false);
+let fjdelname=ref("");
+
+const femdeldialog=()=>{
+  if (JSON.stringify(femObj.value) == "{}") {
+    ElMessage.error("你还没有选中删除的项目")
+  }else{
+    dialogsgdelect.value = true;
+    fjdelname.value = femObj.value.fanname;
+  }
+}
+
 const femdel=()=>{
   if (JSON.stringify(femObj.value) == "{}") {
     ElMessage.error("你还没有选中删除的项目")
@@ -258,6 +300,7 @@ const femdel=()=>{
   request(params)
     .then((res) => {
       femfind();
+      ElMessage.success("风机删除成功")
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg)

src/view/login.vue

@@ -93,7 +93,7 @@ import b from "@/assets/img/Group1317.png"
 import { timestampToTime, formatTime } from "@/js/lindex.js"
 import emitter from "@/utils/emitter"
 
-import { getToken, setToken, setUserId } from "@/utils/token"
+import { getToken, setToken, setUserId,setLoginflag,getLoginflag } from "@/utils/token"
 import router from "@/router"
 
 // import { vtkmodel2 } from "@/control/vtkModel.js";
@@ -150,6 +150,16 @@ const imageUrl = ref("") // 验证码图片 URL
 
 
 const login = () => {
+  if (loginform.value.username == "" || loginform.value.username == undefined){
+    ElMessage.error("用户名不能为空")
+    return
+  }
+  if (loginform.value.password == "" || loginform.value.password == undefined){
+    ElMessage.error("密码不能为空")
+    return
+  }
+
+
   loading.value = true
   const params = {
     transCode: "A00002",
@@ -164,7 +174,8 @@ const login = () => {
   .then((res) => {
     setToken(res.clientToken)
     setUserId(res.userId)
-
+    setLoginflag('1')
+    console.log('loginflag:',getLoginflag())
     router.push({ path: "/" })
 
   })