Merge remote-tracking branch 'refs/remotes/origin/dev_New' into dev_tide_mi...

zouyu

2 天以前 1c0863efe062af3ebcdecb8c10568d779f5c8295

 src/main.js

@@ -52,6 +52,8 @@
import DictTag from "@/components/DictTag";

// 表格组件

import PIMTable from "@/components/PIMTable/PIMTable.vue";

// 页面头部组件
import PageHeader from "@/components/PageHeader/index.vue";


import { getToken } from "@/utils/auth";

import {

@@ -76,7 +78,7 @@
app.config.globalProperties.addDateRange = addDateRange;

app.config.globalProperties.selectDictLabel = selectDictLabel;

app.config.globalProperties.selectDictLabels = selectDictLabels;

app.config.globalProperties.javaApi = "http://114.132.189.42:7004";

app.config.globalProperties.javaApi = __BASE_API__;
app.config.globalProperties.HaveJson = (val) => {

  return JSON.parse(JSON.stringify(val));

};

@@ -93,6 +95,7 @@
app.component("RightToolbar", RightToolbar);

app.component("Editor", Editor);

app.component("PIMTable", PIMTable);

app.component("PageHeader", PageHeader);


app.use(router);

app.use(store);