dedsudiyu %!s(int64=2) %!d(string=hai) anos
pai
achega
28acd09248

+ 4 - 4
src/layout/components/AppMain.vue

@@ -176,7 +176,7 @@ export default {
     //执行按钮
     buttonClick(){
       let self = this;
-      if(this.$route.path == '/emergencyManagement/evacuation/newPerformEvacuation'){
+      if(this.$route.path == '/emergencyManagement/newPerformEvacuation'){
         return
       }
       const h = this.$createElement;
@@ -193,7 +193,7 @@ export default {
           if (action === 'confirm') {
             //执行
             this.$router.push({
-              path: "/emergencyManagement/evacuation/newPerformEvacuation",
+              path: "/emergencyManagement/newPerformEvacuation",
               query: {
                 buildId: self.buildId,
                 floorId:self.floorId,
@@ -240,11 +240,11 @@ export default {
             if(response.data[i].riskAttribute != '1'&&response.data[i].ifCheck != '1'){
               console.log('跳转2',self.$route.path);
               //如果就在应急预案页面责终止跳转
-              if(self.$route.path == '/emergencyManagement/evacuation/newPerformEvacuation' || self.$route.path == '/newEvacuationBigData'){
+              if(self.$route.path == '/emergencyManagement/newPerformEvacuation' || self.$route.path == '/newEvacuationBigData'){
                 return
               }
               this.$router.push({
-                path: "/emergencyManagement/evacuation/newPerformEvacuation",
+                path: "/emergencyManagement/newPerformEvacuation",
                 query: {
                   buildId: response.data[i].buildId,
                   floorId:response.data[i].floorId,

+ 3 - 3
src/views/newEvacuationBigData.vue

@@ -11,7 +11,7 @@
         <div class="left-big-box-one">
           <div class="big-title-box">
             <img src="@/assets/ZDimages/bigData3_2/icon_znjc_tb.png">
-            <p>智能测</p>
+            <p>智能测</p>
           </div>
           <div class="max-sensor-box scrollbar-box" id="max-sensor-box">
             <div class="sensor-for-max-box" :class="item.type==1?'sensor-alarm-one':'sensor-alarm-two'"
@@ -663,7 +663,7 @@
       goRoute(){
         if(this.routeType){
           this.$router.push({
-            path: "/emergencyManagement/evacuation/newPerformEvacuation",
+            path: "/emergencyManagement/newPerformEvacuation",
             query: {
               buildId: this.$route.query.buildId?this.$route.query.buildId:(this.propsBigData.buildId?this.propsBigData.buildId:''),
               floorId:this.$route.query.floorId?this.$route.query.floorId:(this.propsBigData.floorId?this.propsBigData.floorId:''),
@@ -2381,7 +2381,7 @@
     }
     .left-max-big-box{
       width:462px;
-      /*智能测*/
+      /*智能测*/
       .left-big-box-one{
         margin-left:30px;
         margin-top:70px;

+ 1 - 1
src/views/newEvacuationBigDataHome.vue

@@ -1181,7 +1181,7 @@
       goRoute(){
         if(this.routeType){
           this.$router.push({
-            path: "/emergencyManagement/evacuation/newPerformEvacuation"
+            path: "/emergencyManagement/newPerformEvacuation"
           })
         }else{
           this.$router.push({