dedsudiyu 5 ヶ月 前
コミット
726df36eb0
共有5 個のファイルを変更した18 個の追加3 個の削除を含む
  1. 9 0
      src/api/index.js
  2. 2 0
      src/utils/auth.js
  3. 1 0
      src/utils/request.js
  4. 1 0
      src/utils/requestYiLi.js
  5. 5 3
      src/views/components/subComponent.vue

+ 9 - 0
src/api/index.js

@@ -65,3 +65,12 @@ export function laboratoryWsBigViewGetUsePerson(query) {
     params: query
   })
 }
+
+//应急处置-结束预案
+export function laboratoryPlanCloseRiskPlan(query) {
+  return request({
+    url: '/laboratory/plan/closeRiskPlan',
+    method: 'get',
+    params: query
+  })
+}

+ 2 - 0
src/utils/auth.js

@@ -36,6 +36,7 @@ export function autoLogin() {
   deleteCookie('rememberMe');
   login().then(res => {
     setToken(res.data.token)
+    window.location.reload();
   });
 }
 
@@ -67,6 +68,7 @@ export function autoLoginYiLi() {
     deleteCookie('JSESSIONID');
     deleteCookie('rememberMe');
     setTokenYiLi(res.access_token);
+    window.location.reload();
   });
 }
 export function deleteCookie(name) {

+ 1 - 0
src/utils/request.js

@@ -37,6 +37,7 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  config.credentials= 'omit';
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?' + tansParams(config.params);

+ 1 - 0
src/utils/requestYiLi.js

@@ -45,6 +45,7 @@ service.interceptors.request.use(config => {
       config.headers['Authorization'] = 'Bearer '+getTokenYiLi()
     }
   }
+  config.credentials= 'omit';
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?' + tansParams(config.params);

+ 5 - 3
src/views/components/subComponent.vue

@@ -168,7 +168,7 @@
 </template>
 <script>
   import H5PlayerVideo from '@/components/H5PlayerVideo/H5PlayerVideo.vue'
-
+  import { laboratoryPlanCloseRiskPlan } from '@/api/index'
   export default {
     name: 'subComponent',
     components: {
@@ -285,8 +285,10 @@
         }, 500);
       },
       offAlarm(){
-        this.$set(this,'alarmType',false);
-        this.$parent.setOffAlarm();
+        laboratoryPlanCloseRiskPlan({eventId:this.newData.alarmData.eventId}).then(response => {
+          this.$set(this,'alarmType',false);
+          this.$parent.setOffAlarm();
+        });
       },
       setOffAlarm(){
         this.$set(this,'alarmType',false);