diff --git a/src/assets/icons/svg/menuIcon.svg b/src/assets/icons/svg/menuIcon.svg new file mode 100644 index 00000000..fbb3e14d --- /dev/null +++ b/src/assets/icons/svg/menuIcon.svg @@ -0,0 +1,12 @@ + + + 制度流程 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index e3bdd359..6c744c05 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png new file mode 100644 index 00000000..e3bdd359 Binary files /dev/null and b/src/assets/logo/logo1.png differ diff --git a/src/assets/logo/xcac.png b/src/assets/logo/xcac.png new file mode 100644 index 00000000..907e32bd Binary files /dev/null and b/src/assets/logo/xcac.png differ diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index 4df69394..ab43c3a6 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -139,7 +139,7 @@ $base1px: 0.15vh; // 1px / 1080px; .title { margin: 0; - margin-left: calc(28 * 0.12vh); + margin-left: calc(18px * 0.12vh); font-weight: 400; user-select: none; color: #000; @@ -148,8 +148,8 @@ $base1px: 0.15vh; // 1px / 1080px; letter-spacing: calc(2 * 0.12vh); .cnbm_logo { - height: calc(40 * 0.12vh); - width: calc(40 * 0.12vh); + height: calc(160 * 0.12vh); + width: calc(182 * 0.12vh); position: relative; top: calc(8 * 0.12vh); right: calc(8 * 0.12vh); diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 0c4fcff1..3248ce17 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -86,8 +86,8 @@ - + @@ -117,6 +117,7 @@ v-for="file in form[col.prop]" :file="file" :key="file.fileUrl" + :disabled="disabled" @delete="!disabled && handleDeleteFile(file, col.prop)" /> @@ -142,6 +143,9 @@ function findMaxLabelWidth(rows) { if (!opt.label) return 0; if (opt.label.length > max) { max = opt.label.length; + if (opt.label.includes('(')) { + max = max - 3; + } } }); }); @@ -150,7 +154,7 @@ function findMaxLabelWidth(rows) { const uploadedFile = { name: 'UploadedFile', - props: ['file'], + props: ['file', 'disabled'], data() { return {}; }, @@ -195,13 +199,15 @@ const uploadedFile = { display: 'inline-block', }}> {this.file.fileName} - + {!this.disabled && ( + + )} ); }, diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 1e58cd7f..91a437be 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -67,7 +67,7 @@ export default { }, data() { return { - title: '中建材智能化院', + title: '许昌安彩新能科技有限公司', logo: logoImg, }; }, @@ -98,8 +98,8 @@ export default { width: 100%; & .sidebar-logo { - width: 32px; - height: 40px; + width: 67px; + height: 24px; vertical-align: middle; margin-right: 12px; } @@ -108,10 +108,10 @@ export default { display: inline-block; margin: 0; color: #fff; - font-weight: 600; - line-height: 50px; - font-size: 18px; - letter-spacing: 1px; + font-weight: 500; + width: 147px; + letter-spacing: 2px; + font-size: 10px; font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; vertical-align: middle; } diff --git a/src/layout/components/Sidebar/SidebarItem copy.vue b/src/layout/components/Sidebar/SidebarItem copy.vue deleted file mode 100644 index 7880cbba..00000000 --- a/src/layout/components/Sidebar/SidebarItem copy.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - diff --git a/src/layout/components/Sidebar/index copy.vue b/src/layout/components/Sidebar/index copy.vue deleted file mode 100644 index 79f2dc38..00000000 --- a/src/layout/components/Sidebar/index copy.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - diff --git a/src/views/choicePart/components/Navbar.vue b/src/views/choicePart/components/Navbar.vue index fbee3224..50db9d80 100644 --- a/src/views/choicePart/components/Navbar.vue +++ b/src/views/choicePart/components/Navbar.vue @@ -1,8 +1,8 @@