zc

src/views/comprehensive/message/warningNotice/index.vue

@@ -172,6 +172,10 @@
           floorId:this.$route.query.floorId,
           subId:this.$route.query.subId,
         })
+      }else if(this.$route.query.type == 'big'){
+        this.$set(this,'outButtonData',{
+          type:true,
+        })
       }
     },
     mounted(){
@@ -186,14 +190,18 @@
         });
       },
       outButton(){
-        this.$router.push({
-          path: "/emergencyManagement/newPerformEvacuation",
-          query: {
-            buildId: this.outButtonData.buildId,
-            floorId:this.outButtonData.floorId,
-            subId:this.outButtonData.subId,
-          }
-        })
+        if(this.$route.query.type == 'out'){
+          this.$router.push({
+            path: "/emergencyManagement/newPerformEvacuation",
+            query: {
+              buildId: this.outButtonData.buildId,
+              floorId:this.outButtonData.floorId,
+              subId:this.outButtonData.subId,
+            }
+          })
+        }else if(this.$route.query.type == 'big'){
+          window.location.href = (localStorage.getItem('screenUrl') + '?identity=' + localStorage.getItem('identity'));
+        }
       },
       goPage(type){
         if(type != this.pageType){

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecord.vue

@@ -23,6 +23,14 @@
           <p class="inquire-button-one" @click="handleQuery">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
+        <el-form-item style="float: right;" v-if="outButtonData.type">
+          <el-col :span="1.5">
+            <p class="reset-button-one"
+               style="width:100px;"
+               @click="outButton"
+            >返回</p>
+          </el-col>
+        </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData">
         <el-table-column label="预案名称" align="left" prop="groupName"/>
@@ -86,10 +94,28 @@ export default {
       total:0,
       pageData:{},
       tableData:[],
+      //返回按钮
+      outButtonData:{
+        type:false,
+        buildId:"",
+        floorId:"",
+        subId:"",
+      },
     };
   },
+  created(){
+    if(this.$route.query.type == 'big'){
+      this.$set(this,'outButtonData',{
+        type:true,
+      })
+    }
+  },
   methods: {
-
+    outButton(){
+      if(this.$route.query.type == 'big'){
+        window.location.href = (localStorage.getItem('screenUrl') + '?identity=' + localStorage.getItem('identity'));
+      }
+    },
       handleClick(index,row,doType){
 
         let _this=this;