Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/aps/ai/index.vue

@@ -417,14 +417,6 @@ export default {
       this.list.splice(b, 0, tempArray);
     },
 
-    getUserDepart() {
-      alert("5656565");
-      // Api.getUserDepart().then(res=>{
-      //   console.log("11111",res)
-      //   return res
-      // })
-    },
-
     l(key) {
       let vkey = "mes_part_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
@@ -453,7 +445,6 @@ export default {
         arryIds.push(objIds);
       });
       parmsOrderpriority.alls = arryIds;
-      // alert(JSON.stringify(parmsOrderpriority));
       Api.orderpriority(parmsOrderpriority)
         .then((res) => {
           if (res.success) {
@@ -463,8 +454,6 @@ export default {
               Api.apsdatachecked()
                 .then((res1) => {
                   if (res1.success) {
-                    // this.result=res1.result;
-                    // this.resultModal=true;
                     this.checkOk();
                   } else {
                     // this.circleModal = false;

plugins/request/index.js

@@ -134,7 +134,7 @@ service.interceptors.response.use(
   },
   error => {
     const token = sessionStorage.getItem('token');
-    if (!token&&!error && !error.response) {
+    if (!token&&!error.response) {
       window.location.href = '/account/login';
       return;
     }