From c1afd811abb7879a2b7359e419ce99d52235ded9 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期四, 07 八月 2025 10:01:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004 --- src/main.js | 129 +++++++++++++++++++++++------------------- 1 files changed, 71 insertions(+), 58 deletions(-) diff --git a/src/main.js b/src/main.js index 48ee15c..014954c 100644 --- a/src/main.js +++ b/src/main.js @@ -1,68 +1,81 @@ -import { createApp } from 'vue' +import { createApp } from "vue"; -import Cookies from 'js-cookie' +import Cookies from "js-cookie"; -import ElementPlus from 'element-plus' -import 'element-plus/dist/index.css' -import 'element-plus/theme-chalk/dark/css-vars.css' -import locale from 'element-plus/es/locale/lang/zh-cn' +import ElementPlus from "element-plus"; +import "element-plus/dist/index.css"; +import "element-plus/theme-chalk/dark/css-vars.css"; +import locale from "element-plus/es/locale/lang/zh-cn"; -import '@/assets/styles/index.scss' // global css +import "@/assets/styles/index.scss"; // global css -import App from './App' -import store from './store' -import router from './router' -import directive from './directive' // directive +import App from "./App"; +import store from "./store"; +import router from "./router"; +import directive from "./directive"; // directive // 娉ㄥ唽鎸囦护 -import plugins from './plugins' // plugins -import { download } from '@/utils/request' +import plugins from "./plugins"; // plugins +import { download } from "@/utils/request"; // svg鍥炬爣 -import 'virtual:svg-icons-register' -import SvgIcon from '@/components/SvgIcon' -import elementIcons from '@/components/SvgIcon/svgicon' +import "virtual:svg-icons-register"; +import SvgIcon from "@/components/SvgIcon"; +import elementIcons from "@/components/SvgIcon/svgicon"; -import './permission' // permission control +import "./permission"; // permission control -import { useDict } from '@/utils/dict' -import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi' +import { useDict } from "@/utils/dict"; +import { + parseTime, + resetForm, + addDateRange, + handleTree, + selectDictLabel, + selectDictLabels, +} from "@/utils/ruoyi"; // 鍒嗛〉缁勪欢 -import Pagination from '@/components/Pagination' +import Pagination from "@/components/Pagination"; // 鑷畾涔夎〃鏍煎伐鍏风粍浠� -import RightToolbar from '@/components/RightToolbar' +import RightToolbar from "@/components/RightToolbar"; // 瀵屾枃鏈粍浠� -import Editor from "@/components/Editor" +import Editor from "@/components/Editor"; // 鏂囦欢涓婁紶缁勪欢 -import FileUpload from "@/components/FileUpload" +import FileUpload from "@/components/FileUpload"; // 鍥剧墖涓婁紶缁勪欢 -import ImageUpload from "@/components/ImageUpload" +import ImageUpload from "@/components/ImageUpload"; // 鍥剧墖棰勮缁勪欢 -import ImagePreview from "@/components/ImagePreview" +import ImagePreview from "@/components/ImagePreview"; // 瀛楀吀鏍囩缁勪欢 -import DictTag from '@/components/DictTag' +import DictTag from "@/components/DictTag"; // 琛ㄦ牸缁勪欢 import PIMTable from "@/components/PIMTable/PIMTable.vue"; import { getToken } from "@/utils/auth"; -import {calculateTaxExclusiveTotalPrice, summarizeTable,calculateTaxIncludeTotalPrice} from "@/utils/summarizeTable.js"; +import { + calculateTaxExclusiveTotalPrice, + summarizeTable, + calculateTaxIncludeTotalPrice, +} from "@/utils/summarizeTable.js"; -const app = createApp(App) +const app = createApp(App); // 鍏ㄥ眬鏂规硶鎸傝浇 -app.config.globalProperties.useDict = useDict -app.config.globalProperties.download = download -app.config.globalProperties.parseTime = parseTime -app.config.globalProperties.resetForm = resetForm -app.config.globalProperties.summarizeTable = summarizeTable -app.config.globalProperties.calculateTaxExclusiveTotalPrice = calculateTaxExclusiveTotalPrice -app.config.globalProperties.calculateTaxIncludeTotalPrice = calculateTaxIncludeTotalPrice -app.config.globalProperties.handleTree = handleTree -app.config.globalProperties.addDateRange = addDateRange -app.config.globalProperties.selectDictLabel = selectDictLabel -app.config.globalProperties.selectDictLabels = selectDictLabels -app.config.globalProperties.javaApi = 'http://114.132.189.42:8078' +app.config.globalProperties.useDict = useDict; +app.config.globalProperties.download = download; +app.config.globalProperties.parseTime = parseTime; +app.config.globalProperties.resetForm = resetForm; +app.config.globalProperties.summarizeTable = summarizeTable; +app.config.globalProperties.calculateTaxExclusiveTotalPrice = + calculateTaxExclusiveTotalPrice; +app.config.globalProperties.calculateTaxIncludeTotalPrice = + calculateTaxIncludeTotalPrice; +app.config.globalProperties.handleTree = handleTree; +app.config.globalProperties.addDateRange = addDateRange; +app.config.globalProperties.selectDictLabel = selectDictLabel; +app.config.globalProperties.selectDictLabels = selectDictLabels; +app.config.globalProperties.javaApi = "http://114.132.189.42:8099"; app.config.globalProperties.HaveJson = (val) => { return JSON.parse(JSON.stringify(val)); }; @@ -71,29 +84,29 @@ }; // 鍏ㄥ眬缁勪欢鎸傝浇 -app.component('DictTag', DictTag) -app.component('Pagination', Pagination) -app.component('FileUpload', FileUpload) -app.component('ImageUpload', ImageUpload) -app.component('ImagePreview', ImagePreview) -app.component('RightToolbar', RightToolbar) -app.component('Editor', Editor) -app.component('PIMTable', PIMTable) +app.component("DictTag", DictTag); +app.component("Pagination", Pagination); +app.component("FileUpload", FileUpload); +app.component("ImageUpload", ImageUpload); +app.component("ImagePreview", ImagePreview); +app.component("RightToolbar", RightToolbar); +app.component("Editor", Editor); +app.component("PIMTable", PIMTable); -app.use(router) -app.use(store) -app.use(plugins) -app.use(elementIcons) -app.component('svg-icon', SvgIcon) +app.use(router); +app.use(store); +app.use(plugins); +app.use(elementIcons); +app.component("svg-icon", SvgIcon); -directive(app) +directive(app); // 浣跨敤element-plus 骞朵笖璁剧疆鍏ㄥ眬鐨勫ぇ灏� app.use(ElementPlus, { locale: locale, // 鏀寔 large銆乨efault銆乻mall - size: Cookies.get('size') || 'default' -}) -app._context.components.ElDialog.props.closeOnClickModal.default = false + size: Cookies.get("size") || "default", +}); +app._context.components.ElDialog.props.closeOnClickModal.default = false; -app.mount('#app') +app.mount("#app"); -- Gitblit v1.9.3