From a3270b5ca0b6cb14a3943af229c94de65d49d112 Mon Sep 17 00:00:00 2001 From: chengyu Date: Fri, 9 May 2025 15:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=83=E5=B1=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package.json | 2 +- web/src/assets/logo/logo.png | Bin 5663 -> 6147 bytes web/src/assets/styles/sidebar.scss | 14 ++++-- web/src/assets/styles/variables.module.scss | 8 ++-- web/src/layout/components/AppMain.vue | 19 ++++++++ web/src/layout/components/LeftRight.vue | 3 +- web/src/layout/components/Navbar.vue | 6 +-- web/src/layout/components/Sidebar/index.vue | 10 ++-- .../construction-report/index.vue | 20 ++++++-- .../construction-report/options.js | 45 +++++++++--------- .../engineering-log/index.vue | 13 ++++- .../engineering-log/options.js | 2 +- web/vite.config.js | 2 +- 13 files changed, 97 insertions(+), 47 deletions(-) diff --git a/web/package.json b/web/package.json index 9aab4348..6c325cdc 100644 --- a/web/package.json +++ b/web/package.json @@ -39,7 +39,7 @@ "quill-image-resize-module": "^3.0.0", "quill-image-uploader": "^1.3.0", "uuid": "^11.0.4", - "vue": "3.2.37", + "vue": "3.2.41", "vue-cropper": "1.0.3", "vue-router": "4.0.14", "vuedraggable": "^4.1.0", diff --git a/web/src/assets/logo/logo.png b/web/src/assets/logo/logo.png index e26376026420542212ed58d90d0ed34f554fa4ae..a5a461022eb04b8590c76a5dabf699354a9d586e 100644 GIT binary patch literal 6147 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 literal 5663 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.el-sub-menu__title, & .theme-dark .el-sub-menu .el-menu-item { - background-color: $base-sub-menu-background !important; + background-color: $base-sub-menu-background; &:hover { background-color: $base-sub-menu-hover !important; + color: white; } } + + .el-menu-item.is-active { + background-color: #027CFB !important; + color: white !important; + } } .hideSidebar { diff --git a/web/src/assets/styles/variables.module.scss b/web/src/assets/styles/variables.module.scss index 5005a031..fc6471ce 100644 --- a/web/src/assets/styles/variables.module.scss +++ b/web/src/assets/styles/variables.module.scss @@ -10,16 +10,16 @@ $panGreen: #30B08F; // 默认菜单主题风格 $base-menu-color: #bfcbd9; -$base-menu-color-active: #f4f4f5; -$base-menu-background: #304156; +$base-menu-color-active: #333333; +$base-menu-background: transparent; $base-logo-title-color: #ffffff; $base-menu-light-color: rgba(0, 0, 0, 0.7); $base-menu-light-background: #ffffff; $base-logo-light-title-color: #001529; -$base-sub-menu-background: #1f2d3d; -$base-sub-menu-hover: #001528; +$base-sub-menu-background: transparent; +$base-sub-menu-hover: #027CFB; // 自定义暗色菜单风格 /** diff --git a/web/src/layout/components/AppMain.vue b/web/src/layout/components/AppMain.vue index 16e5dec9..b0141327 100644 --- a/web/src/layout/components/AppMain.vue +++ b/web/src/layout/components/AppMain.vue @@ -1,5 +1,6 @@ + diff --git a/web/src/views/constructionScheduling/construction-report/options.js b/web/src/views/constructionScheduling/construction-report/options.js index 8c559aab..01eaa066 100644 --- a/web/src/views/constructionScheduling/construction-report/options.js +++ b/web/src/views/constructionScheduling/construction-report/options.js @@ -18,15 +18,15 @@ export const baseModelOptions = () => { { tag: 'BaseSelect', - label: '报告周期:', + label: '报告类型:', key: 'cycle', value: '', default: '', rules: [ - { required: true, message: '请选择报告周期', trigger: 'blur' }, + { required: true, message: '请选择报告类型', trigger: 'blur' }, ], attribute: { //属性 - placeholder: '请选择报告周期', + placeholder: '请选择报告类型', options: [{ value: "日", label: "日" @@ -40,16 +40,17 @@ export const baseModelOptions = () => { }, }, { - tag: 'BaseSelect', - label: '项目名称:', + tag: 'el-input', + label: '报告内容:', key: 'planId', value: '', default: '', rules: [ - { required: true, message: '请选择项目名称', trigger: 'blur' }, + { required: true, message: '请输入报告内容', trigger: 'blur' }, ], attribute: { //属性 - placeholder: '请选择项目名称', + type: 'textarea', + placeholder: '请输入报告内容', options: [] }, }, @@ -111,7 +112,7 @@ export const baseModelOptions = () => { // }, { tag: 'el-input', - label: '建议:', + label: '其他建议:', key: 'advises', value: '', default: '', @@ -143,20 +144,20 @@ export const baseModelOptions = () => { export const baseFilterOptions = () => { return [ - { - tag: 'BaseSelect', - label: '项目名称:', - key: 'planId', - value: '', - default: '', - rules: [ - { required: true, message: '请选择项目名称', trigger: 'blur' }, - ], - attribute: { //属性 - placeholder: '请选择项目名称', - options: [] - }, - }, + // { + // tag: 'BaseSelect', + // label: '项目名称:', + // key: 'planId', + // value: '', + // default: '', + // rules: [ + // { required: true, message: '请选择项目名称', trigger: 'blur' }, + // ], + // attribute: { //属性 + // placeholder: '请选择项目名称', + // options: [] + // }, + // }, // { // tag: 'el-input', // label: '材料使用:', diff --git a/web/src/views/constructionScheduling/engineering-log/index.vue b/web/src/views/constructionScheduling/engineering-log/index.vue index 089668cb..2e4ea388 100644 --- a/web/src/views/constructionScheduling/engineering-log/index.vue +++ b/web/src/views/constructionScheduling/engineering-log/index.vue @@ -51,7 +51,18 @@ onMounted(() => { - + + + diff --git a/web/src/views/constructionScheduling/engineering-log/options.js b/web/src/views/constructionScheduling/engineering-log/options.js index 285c7fbc..8c2711df 100644 --- a/web/src/views/constructionScheduling/engineering-log/options.js +++ b/web/src/views/constructionScheduling/engineering-log/options.js @@ -100,7 +100,7 @@ export const baseModelOptions = () => { value: '', default: '', attribute: {//属性 - type: 'text', + type: 'textarea', placeholder: '请输入施工情况', }, }, diff --git a/web/vite.config.js b/web/vite.config.js index eb2b66e6..f53679f2 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -43,7 +43,7 @@ export default defineConfig(({ mode, command }) => { }, proxy: { '/dev-api': { - target: 'http://192.168.2.39:8080', + target: 'http://192.168.2.223:8080', // target: 'http://39.100.74.100:8080', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '')