From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 252 ++++++++++++++++++++++++++-----------------------
1 files changed, 133 insertions(+), 119 deletions(-)
diff --git a/src/main.js b/src/main.js
index 51638df..856d2ce 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,39 +1,41 @@
-import Vue from 'vue'
-import ElementUI from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css';
-import VueAxios from 'vue-axios'
-import $ from 'jquery'
-import qs from 'qs'
-import App from './App'
+import Vue from "vue";
+import ElementUI from "element-ui";
+import "element-ui/lib/theme-chalk/index.css";
+import VueAxios from "vue-axios";
+import $ from "jquery";
+import qs from "qs";
+import App from "./App";
import VueRouter from "vue-router";
-import router from './router/index'
-import axios from 'axios'
-import api from './assets/api/controller.js'
-import swal from 'sweetalert'
-import Big from 'big.js'
+import router from "./router/index";
+import axios from "axios";
+import api from "./assets/api/controller.js";
+import swal from "sweetalert";
+import Big from "big.js";
import VueBarcode from "vue-barcode";
+import Moment from "moment";
Vue.prototype.$Big = Big;
// 椤圭洰鍒囨崲
-Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+Vue.prototype.PROJECT = "妫�娴嬩腑蹇�";
// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://172.20.10.5:8001';
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+const javaApi = "http://127.0.0.1:8001";
+// const javaApi = "http://192.168.0.170:8001";
//閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-// const javaApi = 'http://10.1.13.77:8001';
+// const javaApi = "http://10.1.13.77:8001";
// 閫氫俊姝ｅ紡搴�
-Vue.prototype.LOCATIONVUE = "http://10.193.45.63:8080";
-const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// Vue.prototype.LOCATIONVUE = "http://192.168.22.29:8080";
+// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// const javaApi = 'http://192.168.22.29:8001/lims/';
-//浜�
+// //浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
-// const javaApi = 'http://10.1.13.77/:1234';
+// const javaApi = 'http://114.132.189.42:1234';
// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
@@ -44,121 +46,133 @@
// const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://192.168.92.249:8001';
-Vue.prototype.HaveJson = (val) => {
- return JSON.parse(JSON.stringify(val))
-}
-Vue.prototype.javaApi = javaApi
+Vue.prototype.HaveJson = val => {
+ return JSON.parse(JSON.stringify(val));
+};
+Vue.prototype.javaApi = javaApi;
+Vue.prototype.$moment = Moment;
-Vue.use(VueAxios, axios)
-Vue.config.productionTip = false
+Vue.use(VueAxios, axios);
+Vue.config.productionTip = false;
Vue.config.performance = true;
Vue.use(VueRouter);
Vue.use(ElementUI);
-Vue.component('barcode', VueBarcode)
+Vue.component("barcode", VueBarcode);
Vue.use(qs);
Vue.use(api);
-axios.defaults.baseURL = javaApi
-axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
-axios.defaults.withCredentials = true
-axios.defaults.crossDomain = true
-Vue.prototype.$axios = axios
+axios.defaults.baseURL = javaApi;
+axios.defaults.headers.post["Content-Type"] =
+ "application/x-www-form-urlencoded;charset=UTF-8";
+axios.defaults.withCredentials = true;
+axios.defaults.crossDomain = true;
+Vue.prototype.$axios = axios;
-import {
- Message
-} from 'element-ui';
-axios.interceptors.request.use(function(config) {
- let tk = sessionStorage.getItem("token")
- let token;
- if (tk != undefined && tk != '') {
- token = tk
- }
- if (token) {
- config.headers['token'] = "" + token
- // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
- // config.headers['Content-Type'] = 'application/json'
- }
- if ((config.method === 'post' || config.method === 'put')&&!config.noQs) {
- config.data = qs.stringify(config.data)
- }
- if (config.headers['Content-Type'] == 'application/json'&&!config.noQs) {
- config.data = qs.parse(config.data)
- }
- return config
-}, function(error) {
- return Promise.reject(error)
-})
+import { Message } from "element-ui";
+axios.interceptors.request.use(
+ function(config) {
+ let tk = sessionStorage.getItem("token");
+ let token;
+ if (tk != undefined && tk != "") {
+ token = tk;
+ }
+ if (token) {
+ config.headers["token"] = "" + token;
+ // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+ // config.headers['Content-Type'] = 'application/json'
+ }
+ if ((config.method === "post" || config.method === "put") && !config.noQs) {
+ config.data = qs.stringify(config.data);
+ }
+ if (config.headers["Content-Type"] == "application/json" && !config.noQs) {
+ config.data = qs.parse(config.data);
+ }
+ return config;
+ },
+ function(error) {
+ return Promise.reject(error);
+ }
+);
-axios.interceptors.response.use(res => {
- if(res.data.code === 201){
- Message({
- type: 'error',
- dangerouslyUseHTMLString: true,
- message: `${res.data.message}`
- })
- }
- return res.data
-}, async function(err) {
- if (JSON.stringify(err).indexOf('timeout of') > -1) {
- Message.error('璇锋眰瓒呮椂锛岃妫�鏌ョ綉缁滆缃�')
- } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
- 'Network Error') > -1) {
- Message.error('缃戠粶杩炴帴閿欒')
- } else if (err.response.status == "503") {
- Message.error('鏈嶅姟鏈搷搴�')
- } else if (err.response.status == "404") {
- Message.error('璇锋眰澶辫触锛岄摼鎺ュ湴鍧�涓嶅瓨鍦�')
- } else if (err.response.status == "403") {
- Message.error('token涓嶅瓨鍦�')
- } else if (err.response.status == "402") {
- Message.error('鏃犳晥绛惧悕锛岃閲嶆柊鐧诲綍')
- localStorage.removeItem('autoenter')
- window.location.href = '/enter'
- } else if (err.response.status == "401") {
- await axios.post("/user/refresh", {
- reToken: sessionStorage.getItem('reToken')
- }).then(res => {
- if (res.data.code == 201) {
- Message.error('璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�')
- localStorage.removeItem('autoenter')
- next({
- path: '/enter'
- })
- return Promise.reject(err)
- }
- sessionStorage.setItem('token', res.data.token)
- sessionStorage.setItem('reToken', res.data.reToken)
- })
- return axios(err.config)
- } else if (err.response.status == "500") {
- Message.error('鏈嶅姟绔嚭鐜伴敊璇�')
- }
- return Promise.reject(err)
-})
+axios.interceptors.response.use(
+ res => {
+ if (res.data.code === 201) {
+ Message({
+ type: "error",
+ dangerouslyUseHTMLString: true,
+ message: `${res.data.message}`
+ });
+ }
+ return res.data;
+ },
+ async function(err) {
+ if (JSON.stringify(err).indexOf("timeout of") > -1) {
+ Message.error("璇锋眰瓒呮椂锛岃妫�鏌ョ綉缁滆缃�");
+ } else if (
+ JSON.stringify(err).indexOf("ERR_CONNECTION_RESET") > -1 ||
+ JSON.stringify(err).indexOf("Network Error") > -1
+ ) {
+ Message.error("缃戠粶杩炴帴閿欒");
+ } else if (err.response.status == "503") {
+ Message.error("鏈嶅姟鏈搷搴�");
+ } else if (err.response.status == "404") {
+ Message.error("璇锋眰澶辫触锛岄摼鎺ュ湴鍧�涓嶅瓨鍦�");
+ } else if (err.response.status == "403") {
+ Message.error("token涓嶅瓨鍦�");
+ } else if (err.response.status == "402") {
+ Message.error("鏃犳晥绛惧悕锛岃閲嶆柊鐧诲綍");
+ localStorage.removeItem("autoenter");
+ window.location.href = "/enter";
+ } else if (err.response.status == "401") {
+ await axios
+ .post("/user/refresh", {
+ reToken: sessionStorage.getItem("reToken")
+ })
+ .then(res => {
+ if (res.data.code == 201) {
+ Message.error("璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�");
+ localStorage.removeItem("autoenter");
+ next({
+ path: "/enter"
+ });
+ return Promise.reject(err);
+ }
+ sessionStorage.setItem("token", res.data.token);
+ sessionStorage.setItem("reToken", res.data.reToken);
+ });
+ return axios(err.config);
+ } else if (err.response.status == "500") {
+ Message.error("鏈嶅姟绔嚭鐜伴敊璇�");
+ }
+ return Promise.reject(err);
+ }
+);
router.beforeEach((to, from, next) => {
- if(to.path.indexOf('/test') == 0){
- next()
- return
- }
- if (to.path.indexOf('/enter') != 0) {
- if (sessionStorage.getItem('token') == null || sessionStorage.getItem('token') == '' || sessionStorage.getItem(
- 'token') == undefined) {
+ if (to.path.indexOf("/test") == 0) {
+ next();
+ return;
+ }
+ if (to.path.indexOf("/enter") != 0) {
+ if (
+ sessionStorage.getItem("token") == null ||
+ sessionStorage.getItem("token") == "" ||
+ sessionStorage.getItem("token") == undefined
+ ) {
next({
- path: '/enter'
- })
+ path: "/enter"
+ });
}
}
- next()
+ next();
});
new Vue({
- el: '#app',
- router,
- render: h => h(App),
+ el: "#app",
+ router,
+ render: h => h(App),
beforeCreate() {
- // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
- Vue.prototype.$bus = this
+ // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
+ Vue.prototype.$bus = this;
}
});
-
--
Gitblit v1.9.3