diff --git a/index.html b/index.html index 810d822..a8fdeda 100644 --- a/index.html +++ b/index.html @@ -8,3 +8,18 @@
+ + \ No newline at end of file diff --git a/src/assets/js/getData1.js b/src/assets/js/getData1.js new file mode 100644 index 0000000..8e3f01e --- /dev/null +++ b/src/assets/js/getData1.js @@ -0,0 +1,5 @@ +import {post} from '@js/http.js' + +export const workScreen = (wflag) => post('api/bigScreenScreen/workScreen', { + web_flag: wflag +}) diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js new file mode 100644 index 0000000..5a6345f --- /dev/null +++ b/src/assets/js/getData2.js @@ -0,0 +1,10 @@ +import {post} from '@js/http.js' + +export const screenZK = (id, cid) => post('api/bigScreenScreen/zk', { + accountId: id, + center_id: cid +}) +export const query3Dcartoon = (id, cid) => post('api/bigScreenScreen/query3Dcartoon', { + accountId: id, + center_id: cid +}) diff --git a/src/assets/js/http.js b/src/assets/js/http.js new file mode 100644 index 0000000..4960031 --- /dev/null +++ b/src/assets/js/http.js @@ -0,0 +1,78 @@ +import axios from 'axios' +import { Dialog, toast } from './mUtils.js' +import store from '../../vuex/store' +import router from '@/router' + +axios.defaults.timeout = 50000 +axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8' + +axios.interceptors.request.use( + config => { + if (config.method === 'post') { + if (!config.data.flag) { + config.data = config.data + } else { + config.data = config.data.formData + } + } + return config + }, + error => { + Dialog('错误的传参') + return Promise.reject(error) + } +) + +axios.interceptors.response.use( + response => { + if (response.status === 200) { + return Promise.resolve(response) + } else { + return Promise.reject(response) + } + }, + error => { + if (error && error.response) { + switch (error.response.status) { + case 401: + toast(error.response.data.message) + store.dispatch('setSignOut') + router.push('/login') + break + } + return Promise.reject(error.response.data) + } else { + return Promise.reject(error) + } + } +) + +export const post = (sevmethod, params) => { + return new Promise((resolve, reject) => { + axios.post(`${store.getters.baseUrl}/` + sevmethod, params) + .then(response => { + resolve(response.data) + }, error => { + Dialog(error.message) + reject(error.message) + }) + .catch((error) => { + reject(error) + }) + }) +} + +export const post1 = (sevmethod, params) => { + return new Promise((resolve, reject) => { + axios.post(sevmethod, params) + .then(response => { + resolve(response.data) + }, error => { + Dialog(error.message) + reject(error.message) + }) + .catch((error) => { + reject(error) + }) + }) +} diff --git a/src/main.js b/src/main.js index 1bb713c..0ab7a4b 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,7 @@ import store from './vuex/store' import _ from 'lodash' import '@css/reset.css' import '@css/layout.styl' -import '@js/rem.js' +// import '@js/rem.js' import filter from '@js/filter.js' import { Dialog, toast } from '@js/mUtils.js' import {post} from '@fetch/api.js' diff --git a/src/pages/Animation.vue b/src/pages/Animation.vue index 5d5c016..5b0def6 100644 --- a/src/pages/Animation.vue +++ b/src/pages/Animation.vue @@ -44,6 +44,7 @@