From ddd33ae0c7d43c3dbadd7d885e0f2537a1871491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=99=8F=E5=BD=AD?= <995457985@qq.com> Date: Tue, 23 May 2023 17:49:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/layouts/LayoutClassic/index.vue | 23 +++++--- src/styles/element.scss | 3 +- .../AIwarning/accessSituation/index.scss | 9 ++- .../AIwarning/accessSituation/index.vue | 58 +++++++++---------- .../enterprise/notice/myReceive/index.vue | 2 +- .../userManagement/roleManage/index.vue | 4 +- .../goverment/notice/myReceive/index.vue | 2 +- .../notice/newNotification/index.scss | 10 ++-- .../notice/newNotification/index.vue | 4 +- .../departmentManage/index.scss | 8 ++- .../userManagement/roleManage/index.vue | 4 +- src/views/jxjview/menumanage/index.vue | 2 +- .../AIwarning/accessSituation/index.scss | 18 ++++-- .../AIwarning/accessSituation/index.vue | 46 ++++++++------- src/views/project/notice/myReceive/index.vue | 2 +- .../supervision/ProjectSupervision/index.scss | 1 + .../ProjectSupervision/overview.vue | 4 +- .../userManagement/roleManage/index.vue | 4 +- 19 files changed, 110 insertions(+), 96 deletions(-) diff --git a/package.json b/package.json index 9b5d55b..924f1c5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "author": "SpicyBoy <848130454@qq.com>", "license": "MIT", "scripts": { - "dev": "vite --mode development", + "dev": "vite --mode production", "serve": "vite", "build:dev": "vue-tsc --noEmit && vite build --mode development", "build:test": "vue-tsc --noEmit && vite build --mode test", diff --git a/src/layouts/LayoutClassic/index.vue b/src/layouts/LayoutClassic/index.vue index cb51baa..058a53d 100644 --- a/src/layouts/LayoutClassic/index.vue +++ b/src/layouts/LayoutClassic/index.vue @@ -27,6 +27,7 @@ :unique-opened="true" background-color="#ffffff" text-color="#333333 " + style="--el-menu-hover-bg-color: #fff" > @@ -87,15 +88,19 @@ const goHome = () => { .el-menu-item { &.is-active { // background: var(--el-color-primary-light-9); - &::before { - position: absolute; - top: 12px; - bottom: 0; - right: 0; - width: 4px; - height: 38px; - content: ""; - background: var(--el-color-primary); + // &::before { + // position: absolute; + // top: 12px; + // bottom: 0; + // right: 0; + // width: 4px; + // height: 38px; + // content: ""; + // background: var(--el-color-primary); + // } + border-right: 4px solid #008bff; + &.is:hover { + background-color: #fff; } } } diff --git a/src/styles/element.scss b/src/styles/element.scss index 0d9e4a9..66908cb 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -29,6 +29,7 @@ // border: 1px solid var(--el-border-color-light); border-radius: 8px; // box-shadow: 0 0 12px rgb(0 0 0 / 5%); + height: 56px; } // * 不需要 card 卡片样式（在组件内使用 proTable 会使用到） @@ -93,7 +94,7 @@ // table-search 表格搜索样式 .table-search { - padding: 18px 18px 0; + padding: 12px 0 12px 36px; margin-bottom: 10px; border-radius: 8px; .el-form { diff --git a/src/views/enterprise/AIwarning/accessSituation/index.scss b/src/views/enterprise/AIwarning/accessSituation/index.scss index 9f14180..022de52 100644 --- a/src/views/enterprise/AIwarning/accessSituation/index.scss +++ b/src/views/enterprise/AIwarning/accessSituation/index.scss @@ -32,15 +32,14 @@ height: 56px; background-color: #ffffff; border-radius: 8px; - - // display: flex; - // // justify-content: center; - // align-items: center; + height: 56px; } .form { - padding: 16px 0 0 36px; + padding: 6px 0 0 36px; background-color: #ffffff; border-radius: 8px; + line-height: 48px; + margin-top: 10px; } .imgPage { box-sizing: border-box; diff --git a/src/views/enterprise/AIwarning/accessSituation/index.vue b/src/views/enterprise/AIwarning/accessSituation/index.vue index 34ff85a..59922e8 100644 --- a/src/views/enterprise/AIwarning/accessSituation/index.vue +++ b/src/views/enterprise/AIwarning/accessSituation/index.vue @@ -43,40 +43,34 @@
- - - - - - - - - - - - 查询 - - - +
+ + + + + + + + + + + 查询 + + +
-
+
{{ item.typeName }}
@@ -158,6 +152,7 @@ const visible = ref(false); // 搜索用的工程sn const searchSn = ref(""); +const qusLength = ref([]); // 项目或者工程名字 const searchName = ref(""); @@ -332,6 +327,7 @@ const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { pageSize: pageable.value.pageSize }); questList.value = res.result; + qusLength.value = res.result.records; pageable.value.total = +res.result.total; searchSn.value = (params as ResAiEngineerPage).engineeringSn; searchName.value = (params as ResAiEngineerPage).engineeringName; diff --git a/src/views/enterprise/notice/myReceive/index.vue b/src/views/enterprise/notice/myReceive/index.vue index d437dea..c3faf4b 100644 --- a/src/views/enterprise/notice/myReceive/index.vue +++ b/src/views/enterprise/notice/myReceive/index.vue @@ -61,7 +61,7 @@ diff --git a/src/views/enterprise/userManagement/roleManage/index.vue b/src/views/enterprise/userManagement/roleManage/index.vue index 757def6..f060620 100644 --- a/src/views/enterprise/userManagement/roleManage/index.vue +++ b/src/views/enterprise/userManagement/roleManage/index.vue @@ -36,8 +36,8 @@ diff --git a/src/views/goverment/notice/myReceive/index.vue b/src/views/goverment/notice/myReceive/index.vue index 95613ce..af3d3ef 100644 --- a/src/views/goverment/notice/myReceive/index.vue +++ b/src/views/goverment/notice/myReceive/index.vue @@ -61,7 +61,7 @@ diff --git a/src/views/goverment/notice/newNotification/index.scss b/src/views/goverment/notice/newNotification/index.scss index 3d17ac4..5ea6274 100644 --- a/src/views/goverment/notice/newNotification/index.scss +++ b/src/views/goverment/notice/newNotification/index.scss @@ -2,10 +2,10 @@ .topCard { margin-bottom: 20px; border-radius: 8px; - height: 68px; - .noticeForm { - margin-top: 6px; - } + height: 56px; + // .noticeForm { + // margin-bottom: 18px; + // } } .content { display: flex; @@ -15,11 +15,13 @@ padding: 26px 36px 0 0; width: 60%; background-color: #fff; + border-radius: 8px; } .right-content { margin-left: 20px; background-color: #fff; flex: 1; + border-radius: 8px; padding-left: 20px; .book-content { margin: 20px 0; diff --git a/src/views/goverment/notice/newNotification/index.vue b/src/views/goverment/notice/newNotification/index.vue index 84de220..f286390 100644 --- a/src/views/goverment/notice/newNotification/index.vue +++ b/src/views/goverment/notice/newNotification/index.vue @@ -15,7 +15,7 @@
- {{ + {{ item.realName || item.enterpriseName || item.projectName || item.acceptName }}
@@ -338,7 +338,7 @@ onUnmounted(() => {