824c8309 by 任超

feat:测试

1 parent 0f706a21
1 { 1 {
2 "TITLE": "汉中市数据上报系统", 2 "TITLE": "汉中市数据上报系统",
3 "THEME": "jg" 3 "THEME": "sb"
4 } 4 }
......
1 import Vue from 'vue' 1 import Vue from 'vue'
2 import request from '@/utils/request' 2 import request from '@/utils/request'
3 console.log(Vue.prototype, Vue.prototype.$BASE_API); 3 console.log(Vue.prototype, Vue.prototype.BASE_API);
4 import SERVER from './config' 4 import SERVER from './config'
5 // 获取用户信息 5 // 获取用户信息
6 export function getUserInfo () { 6 export function getUserInfo () {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-01-16 09:10:12 3 * @Date: 2023-01-16 09:10:12
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-20 13:11:42 5 * @LastEditTime: 2023-03-21 14:15:40
6 * @FilePath: \bdcjg-web\src\main.js 6 * @FilePath: \bdcjg-web\src\main.js
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -51,7 +51,7 @@ Vue.directive('fo', { ...@@ -51,7 +51,7 @@ Vue.directive('fo', {
51 import './image/icons' // icon 51 import './image/icons' // icon
52 import store from './store' 52 import store from './store'
53 import router from './router' 53 import router from './router'
54 import _ from 'lodash' 54 import _, { set } from 'lodash'
55 Vue.use(Element, { size: 'small', zIndex: 1000 }) 55 Vue.use(Element, { size: 'small', zIndex: 1000 })
56 Vue.use(Base) 56 Vue.use(Base)
57 Vue.component('icon', Icon); 57 Vue.component('icon', Icon);
...@@ -61,12 +61,15 @@ axios.get("./config.json") ...@@ -61,12 +61,15 @@ axios.get("./config.json")
61 .then((res) => { 61 .then((res) => {
62 Vue.prototype.BASE_API = res.data 62 Vue.prototype.BASE_API = res.data
63 require('./permission') 63 require('./permission')
64
65 setTimeout(() => {
64 new Vue({ 66 new Vue({
65 el: '#app', 67 el: '#app',
66 router, 68 router,
67 store, 69 store,
68 render: h => h(App) 70 render: h => h(App)
69 }) 71 })
72 }, 20)
70 73
71 }) 74 })
72 75
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-20 14:35:04 4 * @LastEditTime: 2023-03-21 13:52:58
5 */ 5 */
6 import router from "./router"; 6 import router from "./router";
7 import store from "./store"; 7 import store from "./store";
......
1 /* 1 /*
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 15:24:53 3 * @Date: 2023-03-09 15:24:53
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-13 09:03:16 5 * @LastEditTime: 2023-03-21 14:05:43
6 * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js 6 * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 */ 8 */
9 import Vue from 'vue'
9 import { constantRoutes } from '@/router' 10 import { constantRoutes } from '@/router'
10 import asyncRouter from '@/utils/asyncRouter.js' 11 import asyncRouter from '@/utils/asyncRouter.js'
11 const state = { 12 const state = {
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-21 09:27:26 4 * @LastEditTime: 2023-03-21 14:16:48
5 */ 5 */
6 import Layout from '@/layout' 6 import Vue from 'vue'
7 import Layout from '@/layout1'
8 const config = require('/public/config.json')
9 console.log(config, 'Vue.2222222222222.BASE_API');
7 export default function filterAsyncRouter (routers) { 10 export default function filterAsyncRouter (routers) {
8 routers.forEach(item => { 11 routers.forEach(item => {
9 if (!item.children) { 12 if (!item.children) {
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-14 14:39:24 4 * @LastEditTime: 2023-03-21 13:46:56
5 */ 5 */
6 /** 6 /**
7 * 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器 7 * 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器
...@@ -10,7 +10,6 @@ import axios from "axios"; ...@@ -10,7 +10,6 @@ import axios from "axios";
10 import { Message } from "element-ui"; 10 import { Message } from "element-ui";
11 import { endLoadingSubCount } from "./requestLoading"; 11 import { endLoadingSubCount } from "./requestLoading";
12 import router from "../router"; 12 import router from "../router";
13
14 // create an axios instance 13 // create an axios instance
15 const service = axios.create({ 14 const service = axios.create({
16 baseURL: process.env.VUE_APP_BASE_API, 15 baseURL: process.env.VUE_APP_BASE_API,
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-20 16:53:52 4 * @LastEditTime: 2023-03-21 13:42:13
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 export default function getTheme (theme = Vue.prototype.BASE_API.THEME) { 7 export default function getTheme (theme = Vue.prototype.BASE_API.THEME) {
...@@ -9,7 +9,7 @@ export default function getTheme (theme = Vue.prototype.BASE_API.THEME) { ...@@ -9,7 +9,7 @@ export default function getTheme (theme = Vue.prototype.BASE_API.THEME) {
9 'jg': function () { 9 'jg': function () {
10 import("@/styles/jgPublic.scss") 10 import("@/styles/jgPublic.scss")
11 }, 11 },
12 'sjsb': function () { 12 'sb': function () {
13 import("@/styles/sbPublic.scss") 13 import("@/styles/sbPublic.scss")
14 }, 14 },
15 default: function () { 15 default: function () {
......
1 'use strict' 1 'use strict'
2 const path = require('path') 2 const path = require('path')
3 const defaultSettings = require('./src/settings.js') 3 const defaultSettings = require('./src/settings.js')
4
5 function resolve (dir) { 4 function resolve (dir) {
6 return path.join(__dirname, dir) 5 return path.join(__dirname, dir)
7 } 6 }
......