From 26d481299db79af7f38703d99a9733b16491335d Mon Sep 17 00:00:00 2001 From: piexlmax Date: Sat, 18 Sep 2021 12:40:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/resource/template/web/table.vue.tpl | 10 +- web/package-lock.json | 160 +++++++++--------- web/package.json | 1 + web/src/components/warningBar/warningBar.vue | 43 +++++ web/src/store/module/user.js | 30 +--- web/src/style/base.scss | 14 -- web/src/style/main.scss | 107 +++++++++++- web/src/view/example/customer/customer.vue | 4 +- web/src/view/example/excel/excel.vue | 4 +- web/src/view/layout/setting/index.vue | 62 +++---- web/src/view/person/person.vue | 4 +- web/src/view/superAdmin/api/api.vue | 14 +- .../view/superAdmin/authority/authority.vue | 13 +- .../superAdmin/dictionary/sysDictionary.vue | 4 +- .../dictionary/sysDictionaryDetail.vue | 4 +- web/src/view/superAdmin/menu/icon.vue | 31 ++-- web/src/view/superAdmin/menu/menu.vue | 10 +- web/src/view/superAdmin/user/user.vue | 34 ++-- .../autoCode/component/fieldDialog.vue | 137 +++++++-------- web/src/view/systemTools/autoCode/index.vue | 2 +- web/src/view/systemTools/system/system.vue | 4 +- 21 files changed, 389 insertions(+), 303 deletions(-) create mode 100644 web/src/components/warningBar/warningBar.vue diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl index 917a9faa..3c760863 100644 --- a/server/resource/template/web/table.vue.tpl +++ b/server/resource/template/web/table.vue.tpl @@ -96,7 +96,7 @@ {{- end }} {{- if eq .FieldType "int" }} {{- if .DictType}} - + {{- else }} @@ -104,18 +104,18 @@ {{- end }} {{- end }} {{- if eq .FieldType "time.Time" }} - + {{- end }} {{- if eq .FieldType "float64" }} - + {{- end }} {{- end }} diff --git a/web/package-lock.json b/web/package-lock.json index 83bf7462..5f2d573f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1799,12 +1799,69 @@ "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "dotenv": { "version": "8.6.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==", "dev": true }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz", @@ -1813,6 +1870,28 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.5.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", + "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -11631,87 +11710,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-particle-line": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/vue-particle-line/-/vue-particle-line-0.1.4.tgz", diff --git a/web/package.json b/web/package.json index b32113d5..faf96bca 100644 --- a/web/package.json +++ b/web/package.json @@ -8,6 +8,7 @@ "preview": "vite preview" }, "dependencies": { + "@element-plus/icons": "0.0.11", "axios": "^0.19.2", "core-js": "^3.6.5", "echarts": "4.9.0", diff --git a/web/src/components/warningBar/warningBar.vue b/web/src/components/warningBar/warningBar.vue new file mode 100644 index 00000000..e4857522 --- /dev/null +++ b/web/src/components/warningBar/warningBar.vue @@ -0,0 +1,43 @@ + + + diff --git a/web/src/store/module/user.js b/web/src/store/module/user.js index e836a327..9ce95768 100644 --- a/web/src/store/module/user.js +++ b/web/src/store/module/user.js @@ -13,7 +13,7 @@ export const user = { headerImg: '', authority: {}, sideMode: 'dark', - activeColor: '#1890ff', + activeColor: '#0d84ff', baseColor: '#fff' }, token: '', @@ -45,15 +45,9 @@ export const user = { ...userInfo } }, - ChangeActiveColor: async(state, val) => { - state.userInfo.activeColor = val - }, ChangeSideMode: async(state, val) => { state.userInfo.sideMode = val }, - ChangeBaseColor: (state, val) => { - state.userInfo.baseColor = val - } }, actions: { async GetUserInfo({ commit }) { @@ -89,16 +83,6 @@ export const user = { commit('LoginOut') } }, - async changeActiveColor({ commit, state }, data) { - const res = await setUserInfo({ activeColor: data, ID: state.userInfo.ID }) - if (res.code === 0) { - commit('ChangeActiveColor', data) - ElMessage({ - type: 'success', - message: '设置成功' - }) - } - }, async changeSideMode({ commit, state }, data) { const res = await setUserInfo({ sideMode: data, ID: state.userInfo.ID }) if (res.code === 0) { @@ -109,16 +93,6 @@ export const user = { }) } }, - async changeBaseColor({ commit, state }, data) { - const res = await setUserInfo({ baseColor: data, ID: state.userInfo.ID }) - if (res.code === 0) { - commit('ChangeBaseColor', data) - ElMessage({ - type: 'success', - message: '设置成功' - }) - } - } }, getters: { userInfo(state) { @@ -150,7 +124,7 @@ export const user = { }, activeColor(state) { if (state.userInfo.sideMode === 'dark' || state.userInfo.sideMode === 'light') { - return '#1890ff' + return '#0d84ff' } return state.userInfo.activeColor } diff --git a/web/src/style/base.scss b/web/src/style/base.scss index 33bd8922..0f8e5df3 100644 --- a/web/src/style/base.scss +++ b/web/src/style/base.scss @@ -58,17 +58,3 @@ .title-3 { text-align: center; } - -.el-pager li.active { - color: #409EFF !important; - border: 1px solid #409EFF; -} - -.el-pager li.active+li { - border-left: 1px !important; -} - -.el-pager li:hover { - color: #409EFF !important; - border: 1px solid #409EFF; -} \ No newline at end of file diff --git a/web/src/style/main.scss b/web/src/style/main.scss index cb44d7b0..13e491cf 100644 --- a/web/src/style/main.scss +++ b/web/src/style/main.scss @@ -776,6 +776,18 @@ li { .el-input__suffix { margin-top: -3px; } + &.is-disabled{ + .el-input__suffix { + margin-top: 0px; + } + } + } + .el-cascader{ + .el-input { + .el-input__suffix { + margin-top: 0px; + } + } } .el-input__inner { border-color: rgba($color: #000000, $alpha: 0.15); @@ -1070,13 +1082,13 @@ li { z-index: 1; top: 6px !important; width: 42px; - height: 26px; - line-height: 26px; + height: 29px; + line-height: 29px; text-align: center; background: #F5F7FA; color: #606266; cursor: pointer; - font-size: 13px; + font-size: 12px; } $headerHigh: 52px; @@ -1417,6 +1429,64 @@ $mainHight: 100vh; .gva-pagination { display: flex; justify-content: flex-end; + .el-pagination__editor{ + .el-input__inner{ + height: 32px; + } + } + .el-pagination__total{ + line-height: 32px !important; + } + .btn-prev{ + padding-right:6px; + display: inline-flex; + justify-content: center; + align-items: center; + width: 32px; + height: 32px; + } + .number{ + display: inline-flex; + justify-content: center; + align-items: center; + width: 32px; + height: 32px; + } + .btn-quicknext{ + display: inline-flex; + justify-content: center; + align-items: center; + width: 32px; + height: 32px; + } + .btn-next{ + padding-left:6px; + width: 32px; + height: 32px; + display: inline-flex; + justify-content: center; + align-items: center; + } + .active { + background: #4D70FF; + border-radius: 2px; + color: #ffffff !important; + } + .el-pager li.active+li{ + border-left: 1px solid #ddd !important; + } + .el-pagination__sizes{ + .el-input{ + .el-input__suffix { + margin-top: 2px; + } + } + } + .el-pagination__jump{ + .el-pagination__editor{ + + } + } } .el-button--mini { @@ -1429,4 +1499,35 @@ $mainHight: 100vh; &.el-button--text { padding: 8px 0; } +} + +.el-dialog { + padding: 12px; + .el-dialog__body{ + padding: 12px 6px; + } + .el-dialog__header{ + .el-dialog__title{ + font-size: 14px; + font-weight: 500; + } + padding: 2px 20px 12px 20px; + border-bottom: 1px solid #E4E4E4; + } + .el-dialog__headerbtn{ + top:16px; + } + .el-dialog__footer{ + margin-top: -12px; + padding: 0 0 16px 0; + .dialog-footer{ + .el-button{ + padding-left: 24px; + padding-right: 24px; + } + .el-button+.el-button{ + margin-left: 30px; + } + } + } } \ No newline at end of file diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue index 00cd79ee..539a3279 100644 --- a/web/src/view/example/customer/customer.vue +++ b/web/src/view/example/customer/customer.vue @@ -59,8 +59,8 @@ diff --git a/web/src/view/example/excel/excel.vue b/web/src/view/example/excel/excel.vue index 1045f2ee..38a522d7 100644 --- a/web/src/view/example/excel/excel.vue +++ b/web/src/view/example/excel/excel.vue @@ -17,8 +17,8 @@ - - + + - 注：右上角头像下拉可切换角色 +
- - + + - + - + - -
- -
从媒体库选择
-
- - + + +
+ +
从媒体库选择
+
+ + @@ -110,9 +111,10 @@ import infoList from '@/mixins/infoList' import { mapGetters } from 'vuex' import CustomPic from '@/components/customPic/index.vue' import ChooseImg from '@/components/chooseImg/index.vue' +import warningBar from '@/components/warningBar/warningBar.vue' export default { name: 'Api', - components: { CustomPic, ChooseImg }, + components: { CustomPic, ChooseImg, warningBar }, mixins: [infoList], data() { return { diff --git a/web/src/view/systemTools/autoCode/component/fieldDialog.vue b/web/src/view/systemTools/autoCode/component/fieldDialog.vue index c7ea9ef7..3de4f31e 100644 --- a/web/src/view/systemTools/autoCode/component/fieldDialog.vue +++ b/web/src/view/systemTools/autoCode/component/fieldDialog.vue @@ -1,6 +1,6 @@