From 1a30736631d3393917ba71877c4fca9788560188 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 2 Sep 2021 14:45:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E7=99=BB=E9=99=86?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=88=B7=E6=96=B0=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 15 ++ package.json | 3 + src/assets/scss/global.scss | 6 + src/element-ui/index.js | 156 +++++++++--------- src/main.js | 3 +- src/views/common/home.vue | 4 +- src/views/common/login.vue | 2 + src/views/main-navbar-update-language.vue | 6 +- src/views/modules/factory/tblbasedata.vue | 6 +- .../purchaseorder/procurementReview.vue | 2 +- src/views/modules/sys/language/common.vue | 2 +- src/views/modules/sys/log.vue | 45 ++++- src/views/modules/sys/user-add-or-update.vue | 5 +- 13 files changed, 162 insertions(+), 93 deletions(-) diff --git a/package-lock.json b/package-lock.json index a93bf88..ee44224 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3545,6 +3545,11 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "decimal.js": { + "version": "10.3.1", + "resolved": "https://r.cnpmjs.org/decimal.js/download/decimal.js-10.3.1.tgz", + "integrity": "sha1-2MOkRKnGd0umDKatcmHDqU/V54M=" + }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", @@ -16349,6 +16354,11 @@ "safe-buffer": "^5.1.2" } }, + "pubsub-js": { + "version": "1.9.3", + "resolved": "https://r.cnpmjs.org/pubsub-js/download/pubsub-js-1.9.3.tgz", + "integrity": "sha1-Z07qTVaNBALgUnzbEOKqt7VWIdI=" + }, "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", @@ -19470,6 +19480,11 @@ "integrity": "sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==", "dev": true }, + "vue-i18n": { + "version": "8.25.0", + "resolved": "https://r.cnpmjs.org/vue-i18n/download/vue-i18n-8.25.0.tgz", + "integrity": "sha1-EDfZKV+ihFojC3cd5HNIHtss/Ew=" + }, "vue-jest": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.0.2.tgz", diff --git a/package.json b/package.json index e368a41..3d17a3b 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "0.17.1", "babel-plugin-component": "0.10.1", "babel-polyfill": "6.26.0", + "decimal.js": "^10.3.1", "element-ui": "2.8.2", "file-saver": "^2.0.5", "gulp": "4.0.2", @@ -27,10 +28,12 @@ "lodash": "4.17.5", "node-sass": "4.13.1", "npm": "^6.9.0", + "pubsub-js": "^1.9.3", "sass-loader": "6.0.6", "svg-sprite-loader": "3.7.3", "vue": "2.5.16", "vue-cookie": "1.1.4", + "vue-i18n": "^8.25.0", "vue-json-excel": "^0.3.0", "vue-router": "3.0.1", "vuex": "3.0.1", diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 221378b..f41f2b6 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -105,6 +105,7 @@ display: inline-block; text-align: left; padding: 0px 0 0px; + } /* el-form-item 间距 end*/ @@ -122,4 +123,9 @@ } /* el-form-item 间距 end*/ +/* 提示消息 start */ +.el-message{ + margin-top: 20%; +} +/* end */ diff --git a/src/element-ui/index.js b/src/element-ui/index.js index 7ab1f10..c5df5ab 100644 --- a/src/element-ui/index.js +++ b/src/element-ui/index.js @@ -1,13 +1,6 @@ -/** - * UI组件, 统一使用饿了么桌面端组件库(https://github.com/ElemeFE/element） - * - * 使用: - * 1. 项目中需要的组件进行释放(解开注释) - * - * 注意: - * 1. 打包只会包含释放(解开注释)的组件, 减少打包文件大小 - */ -import Vue from 'vue' +import Vue from 'vue'; +import Element from 'element-ui'; +Vue.use(Element, { size: 'small', zIndex: 1000 }); import { Pagination, Dialog, @@ -76,81 +69,80 @@ import { MessageBox, Message, Notification -} from 'element-ui' +} from 'element-ui'; -Vue.use(Pagination) -Vue.use(Dialog) -Vue.use(Autocomplete) -Vue.use(Dropdown) -Vue.use(DropdownMenu) -Vue.use(DropdownItem) -Vue.use(Menu) -Vue.use(Submenu) -Vue.use(MenuItem) -Vue.use(MenuItemGroup) -Vue.use(Input) -Vue.use(InputNumber) -Vue.use(Radio) -Vue.use(RadioGroup) -Vue.use(RadioButton) -Vue.use(Checkbox) -Vue.use(CheckboxButton) -Vue.use(CheckboxGroup) -Vue.use(Switch) -Vue.use(Select) -Vue.use(Option) -Vue.use(OptionGroup) -Vue.use(Button) -Vue.use(ButtonGroup) -Vue.use(Table) -Vue.use(TableColumn) -Vue.use(DatePicker) -Vue.use(TimeSelect) -Vue.use(TimePicker) -Vue.use(Popover) -Vue.use(Tooltip) -Vue.use(Breadcrumb) -Vue.use(BreadcrumbItem) -Vue.use(Form) -Vue.use(FormItem) -Vue.use(Tabs) -Vue.use(TabPane) -Vue.use(Tag) -Vue.use(Tree) -Vue.use(Alert) -Vue.use(Slider) -Vue.use(Icon) -Vue.use(Row) -Vue.use(Col) -Vue.use(Upload) -Vue.use(Progress) -Vue.use(Badge) -Vue.use(Card) -Vue.use(Rate) -Vue.use(Steps) -Vue.use(Step) -Vue.use(Carousel) -Vue.use(CarouselItem) -Vue.use(Collapse) -Vue.use(CollapseItem) -Vue.use(Cascader) -Vue.use(ColorPicker) -Vue.use(Transfer) -Vue.use(Container) -Vue.use(Header) -Vue.use(Aside) -Vue.use(Main) -Vue.use(Footer) +Vue.use(Pagination); +Vue.use(Dialog); +Vue.use(Autocomplete); +Vue.use(Dropdown); +Vue.use(DropdownMenu); +Vue.use(DropdownItem); +Vue.use(Menu); +Vue.use(Submenu); +Vue.use(MenuItem); +Vue.use(MenuItemGroup); +Vue.use(Input); +Vue.use(InputNumber); +Vue.use(Radio); +Vue.use(RadioGroup); +Vue.use(RadioButton); +Vue.use(Checkbox); +Vue.use(CheckboxButton); +Vue.use(CheckboxGroup); +Vue.use(Switch); +Vue.use(Select); +Vue.use(Option); +Vue.use(OptionGroup); +Vue.use(Button); +Vue.use(ButtonGroup); +Vue.use(Table); +Vue.use(TableColumn); +Vue.use(DatePicker); +Vue.use(TimeSelect); +Vue.use(TimePicker); +Vue.use(Popover); +Vue.use(Tooltip); +Vue.use(Breadcrumb); +Vue.use(BreadcrumbItem); +Vue.use(Form); +Vue.use(FormItem); +Vue.use(Tabs); +Vue.use(TabPane); +Vue.use(Tag); +Vue.use(Tree); +Vue.use(Alert); +Vue.use(Slider); +Vue.use(Icon); +Vue.use(Row); +Vue.use(Col); +Vue.use(Upload); +Vue.use(Progress); +Vue.use(Badge); +Vue.use(Card); +Vue.use(Rate); +Vue.use(Steps); +Vue.use(Step); +Vue.use(Carousel); +Vue.use(CarouselItem); +Vue.use(Collapse); +Vue.use(CollapseItem); +Vue.use(Cascader); +Vue.use(ColorPicker); +Vue.use(Container); +Vue.use(Header); +Vue.use(Aside); +Vue.use(Main); +Vue.use(Footer); -Vue.use(Loading.directive) +Vue.use(Loading.directive); -Vue.prototype.$loading = Loading.service -Vue.prototype.$msgbox = MessageBox -Vue.prototype.$alert = MessageBox.alert -Vue.prototype.$confirm = MessageBox.confirm -Vue.prototype.$prompt = MessageBox.prompt -Vue.prototype.$notify = Notification -Vue.prototype.$message = Message +Vue.prototype.$loading = Loading.service; +Vue.prototype.$msgbox = MessageBox; +Vue.prototype.$alert = MessageBox.alert; +Vue.prototype.$confirm = MessageBox.confirm; +Vue.prototype.$prompt = MessageBox.prompt; +Vue.prototype.$notify = Notification; +Vue.prototype.$message = Message; Vue.prototype.$ELEMENT = { size: 'medium' } diff --git a/src/main.js b/src/main.js index b3159c4..d17428e 100644 --- a/src/main.js +++ b/src/main.js @@ -15,9 +15,8 @@ import i18n from '@/i18n/i18n' import './directives' import decimalUtil from '@/utils/decimalUtil.js' -Vue.component('downloadExcel', JsonExcel) - +Vue.component('downloadExcel', JsonExcel) Vue.use(VueCookie) Vue.config.productionTip = false diff --git a/src/views/common/home.vue b/src/views/common/home.vue index f61110c..aa8fbb0 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -17,8 +17,8 @@ languageRefresh(){ let bool = localStorage.getItem('refresh') if (bool == '0'){ - this.$router.go(0); - localStorage.setItem('refresh','1') + // this.$router.go(0); + // localStorage.setItem('refresh','1') } } }, diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 30f4531..0830dab 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -4,6 +4,7 @@
+ @@ -26,6 +27,7 @@ export default { data () { return { + src: 'http://192.168.1.83/upload/ifs.png', dataForm: { userName: '', password: '', diff --git a/src/views/main-navbar-update-language.vue b/src/views/main-navbar-update-language.vue index efb4a0b..4247d82 100644 --- a/src/views/main-navbar-update-language.vue +++ b/src/views/main-navbar-update-language.vue @@ -27,6 +27,7 @@