diff --git a/jwtech-pc-page/src/assets/image/header/banner.png b/jwtech-pc-page/src/assets/image/header/banner.png new file mode 100644 index 00000000..0420665c Binary files /dev/null and b/jwtech-pc-page/src/assets/image/header/banner.png differ diff --git a/jwtech-pc-page/src/assets/image/home/download-btn.png b/jwtech-pc-page/src/assets/image/home/download-btn.png new file mode 100644 index 00000000..89bd57e8 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/download-btn.png differ diff --git a/jwtech-pc-page/src/assets/image/home/login-btn.png b/jwtech-pc-page/src/assets/image/home/login-btn.png new file mode 100644 index 00000000..a1378c54 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/login-btn.png differ diff --git a/jwtech-pc-page/src/assets/image/home/notice-list-icon.png b/jwtech-pc-page/src/assets/image/home/notice-list-icon.png new file mode 100644 index 00000000..48146d83 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/notice-list-icon.png differ diff --git a/jwtech-pc-page/src/assets/image/home/qiye-icon.png b/jwtech-pc-page/src/assets/image/home/qiye-icon.png new file mode 100644 index 00000000..d01c69c3 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/qiye-icon.png differ diff --git a/jwtech-pc-page/src/assets/image/home/search-item-active.png b/jwtech-pc-page/src/assets/image/home/search-item-active.png new file mode 100644 index 00000000..be8a0de0 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/search-item-active.png differ diff --git a/jwtech-pc-page/src/assets/image/home/search-item.png b/jwtech-pc-page/src/assets/image/home/search-item.png new file mode 100644 index 00000000..9a2711b6 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/search-item.png differ diff --git a/jwtech-pc-page/src/assets/image/home/search-item1.png b/jwtech-pc-page/src/assets/image/home/search-item1.png new file mode 100644 index 00000000..bd54ca7c Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/search-item1.png differ diff --git a/jwtech-pc-page/src/assets/image/home/tongji-icon.png b/jwtech-pc-page/src/assets/image/home/tongji-icon.png new file mode 100644 index 00000000..3ec84050 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/tongji-icon.png differ diff --git a/jwtech-pc-page/src/assets/image/home/xinyong-icon.png b/jwtech-pc-page/src/assets/image/home/xinyong-icon.png new file mode 100644 index 00000000..8127012f Binary files /dev/null and b/jwtech-pc-page/src/assets/image/home/xinyong-icon.png differ diff --git a/jwtech-pc-page/src/assets/image/icon/notice.png b/jwtech-pc-page/src/assets/image/icon/notice.png new file mode 100644 index 00000000..c710c5d4 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/icon/notice.png differ diff --git a/jwtech-pc-page/src/assets/image/人员信息.png b/jwtech-pc-page/src/assets/image/人员信息.png new file mode 100644 index 00000000..2bfa1bae Binary files /dev/null and b/jwtech-pc-page/src/assets/image/人员信息.png differ diff --git a/jwtech-pc-page/src/assets/image/人员信息_at.png b/jwtech-pc-page/src/assets/image/人员信息_at.png new file mode 100644 index 00000000..5bc9e45e Binary files /dev/null and b/jwtech-pc-page/src/assets/image/人员信息_at.png differ diff --git a/jwtech-pc-page/src/assets/image/动态信用.png b/jwtech-pc-page/src/assets/image/动态信用.png new file mode 100644 index 00000000..a86aa80d Binary files /dev/null and b/jwtech-pc-page/src/assets/image/动态信用.png differ diff --git a/jwtech-pc-page/src/assets/image/动态信用_at.png b/jwtech-pc-page/src/assets/image/动态信用_at.png new file mode 100644 index 00000000..ebf238c0 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/动态信用_at.png differ diff --git a/jwtech-pc-page/src/assets/image/工程获奖.png b/jwtech-pc-page/src/assets/image/工程获奖.png new file mode 100644 index 00000000..90889bac Binary files /dev/null and b/jwtech-pc-page/src/assets/image/工程获奖.png differ diff --git a/jwtech-pc-page/src/assets/image/工程获奖_at.png b/jwtech-pc-page/src/assets/image/工程获奖_at.png new file mode 100644 index 00000000..9c0c7f55 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/工程获奖_at.png differ diff --git a/jwtech-pc-page/src/assets/image/资质信息.png b/jwtech-pc-page/src/assets/image/资质信息.png new file mode 100644 index 00000000..d109534f Binary files /dev/null and b/jwtech-pc-page/src/assets/image/资质信息.png differ diff --git a/jwtech-pc-page/src/assets/image/资质信息_at.png b/jwtech-pc-page/src/assets/image/资质信息_at.png new file mode 100644 index 00000000..4bac1904 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/资质信息_at.png differ diff --git a/jwtech-pc-page/src/assets/image/项目业绩.png b/jwtech-pc-page/src/assets/image/项目业绩.png new file mode 100644 index 00000000..ba7b2a0d Binary files /dev/null and b/jwtech-pc-page/src/assets/image/项目业绩.png differ diff --git a/jwtech-pc-page/src/assets/image/项目业绩_at.png b/jwtech-pc-page/src/assets/image/项目业绩_at.png new file mode 100644 index 00000000..aa77c080 Binary files /dev/null and b/jwtech-pc-page/src/assets/image/项目业绩_at.png differ diff --git a/jwtech-pc-page/src/base.css b/jwtech-pc-page/src/base.css index 45bbb017..0cb6a12e 100644 --- a/jwtech-pc-page/src/base.css +++ b/jwtech-pc-page/src/base.css @@ -88,7 +88,7 @@ input:-internal-autofill-selected { * { /*font-family: "PingFangSC-Medium", "PingFangSC", STHeiti, MingLiu;*/ font-family: MicrosoftYaHei; - font-size: 14px; + font-size: 16px; /* font-family: ; */ /* color: #000; */ /*font-weight: 500;*/ @@ -105,30 +105,56 @@ img { vertical-align: middle; } -.el-pagination.is-background .el-pager li:not(.disabled).active { - background: #627de3; - color: #fff; +.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li { + margin: 0 5px; + background-color: #fff; + color: #606266; + min-width: 30px; + border-radius: 5px; + border: 1px solid #DADCE3; + height: 44px; + line-height: 44px; + min-width: 44px; } .el-pagination.is-background .el-pagination__sizes .el-input__inner { - background: #f2f4f7; + background: #fff; + height: 44px; +} + +.el-pagination.is-background .el-pager li:not(.disabled).active { + /* background: #627de3; */ + background: #005EB7; + color: #fff; } .el-pagination.is-background .el-pagination__total { - line-height: 30px; + line-height: 44px; margin-left: 10px; - font-size: 12px; + font-size: 16px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; + color: #333; /* color: rgba(3, 8, 30, 0.46); */ } .el-pagination.is-background .el-pagination__jump { - font-size: 12px; + height: 44px; + line-height: 44px; + font-size: 16px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; } +.el-pagination.is-background .el-pagination__jump .el-input__inner { + height: 44px; + line-height: 44px; +} + +.el-pagination__sizes .el-input .el-input__inner { + font-size: 16px; +} + input::-webkit-input-placeholder { /* WebKit browsers 适配谷歌 */ color: rgba(7, 8, 30, 0.31); diff --git a/jwtech-pc-page/src/components/aerialHeaderMenu.vue b/jwtech-pc-page/src/components/aerialHeaderMenu.vue index edf26e9f..69b1dc41 100644 --- a/jwtech-pc-page/src/components/aerialHeaderMenu.vue +++ b/jwtech-pc-page/src/components/aerialHeaderMenu.vue @@ -1,7 +1,7 @@ @@ -60,7 +68,8 @@ export default { activeIndex: "", menus: this.$partten.menus, subMenus: ["hkdata", "hkknowledge", "service"], - isHome: true + isHome: true, + isNoticeShow: true }; }, watch: { @@ -72,6 +81,17 @@ export default { this.isHome = false; } this.activeIndex = val.matched[1].name; + + // 判断是否显示通知栏 + if (val.path === '/home' + || val.path === '/summarizedInformation' + || val.path === '/enterpriseInformation' + || val.path === '/announcement' + ) { + this.isNoticeShow = true + } else { + this.isNoticeShow = false + } }, // 深度观察监听 deep: true, @@ -154,19 +174,24 @@ export default { diff --git a/jwtech-pc-page/src/router/index.js b/jwtech-pc-page/src/router/index.js index e0966fdb..47f8734c 100644 --- a/jwtech-pc-page/src/router/index.js +++ b/jwtech-pc-page/src/router/index.js @@ -60,6 +60,11 @@ const router = new Router({ component: () => import('@/views/enterpriseInformation/enterpriseInDetail.vue'), name: 'enterpriseInDetail', }, + { + path: '/personDetail', + component: () => import('@/views/enterpriseInformation/personDetail.vue'), + name: 'personDetail', + }, { path: '/projectInformation', component: () => import('@/views/projectInformation/index.vue'), @@ -354,15 +359,15 @@ const router = new Router({ ] }) router.beforeEach((to, from, next) => { - if (!store.state.token) { - axios.post('/login', { + if (!store.state.token) { + axios.post('/login', { username: "admin", password: "Sgcjs@2023" }).then(res => { store.commit("setToken", res.data.token) }) } - + if (to.path === '/') { router.push({ // name: 'login' diff --git a/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue b/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue index 5aa565fe..4b8b3298 100644 --- a/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue +++ b/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue @@ -15,19 +15,44 @@ +
-
- + +
+ + +
+ {{ title + (index + 1) }} +
+ +
+
+
@@ -44,14 +69,16 @@ export default { }, data() { return { - activeName: "first", + activeName: '', + // activeName: this.$route.query.type==='good'?'良好行为公告1':'不良行为公告1', enterpriseObj: {}, enterpriseForm: { enterpriseId: "", type: "0" }, actionList: [], - bonusPointsAll: 0 + bonusPointsAll: 0, + firstName: '', }; }, computed: { @@ -60,6 +87,13 @@ export default { return type === "good" ? "企业良好行为" : "企业不良行为"; } }, + created() { + if (this.$route.query.type==='good') { + this.activeName = '企业良好行为1' + } else { + this.activeName = '企业不良行为1' + } + }, mounted() { this.enterpriseForm.enterpriseId = this.$route.query.enterpriseId; this.getCreditList(); @@ -71,6 +105,7 @@ export default { this.enterpriseForm.type = "1"; getGoodAll(this.enterpriseForm).then(res => { this.enterpriseObj = res.data.data[0]; + this.firstName = this.enterpriseObj.enterpriseName.trim().split("")[0]; this.actionList = res.data.data; this.actionList.forEach(item => { this.bonusPointsAll += Number(item.bonusPoints); @@ -80,6 +115,7 @@ export default { this.enterpriseForm.type = "0"; getBadAll(this.enterpriseForm).then(res => { this.enterpriseObj = res.data.data[0]; + this.firstName = this.enterpriseObj.enterpriseName.trim().split("")[0]; this.actionList = res.data.data; this.actionList.forEach(item => { this.bonusPointsAll += Number(item.bonusPoints); @@ -130,12 +166,44 @@ export default { .main-wrap { width: 1200px; margin: 0 auto; - background: #ffffff; border-radius: 8px; overflow: hidden; - padding: 20px; + // padding: 20px; .descriptions-wrap { + + } + } + + .tabs-wrap { + // width: 1200px; + // margin: 0 auto; + margin-top: 20px; + + /deep/ .tabs { + background: #fff; + border-radius: 8px; + border: none; + overflow: hidden; + // background: #f6f6f6; + .el-tabs__header { + background: #f5f7fa; + .el-tabs__nav { + .el-tabs__item { + height: 60px; + line-height: 60px; + padding-left: 50px; + padding-right: 50px; + &.is-active { + color: #005eb7; + font-weight: 600; + } + } + } + .el-tabs__nav-next, .el-tabs__nav-prev { + line-height: 60px; + } + } } } } diff --git a/jwtech-pc-page/src/views/announcement/components/announcementBasicTable.vue b/jwtech-pc-page/src/views/announcement/components/announcementBasicTable.vue index 0eee0fb7..95f31b6a 100644 --- a/jwtech-pc-page/src/views/announcement/components/announcementBasicTable.vue +++ b/jwtech-pc-page/src/views/announcement/components/announcementBasicTable.vue @@ -1,31 +1,59 @@ \ No newline at end of file + diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseBasicList.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseBasicList.vue index c3532d9c..dce47606 100644 --- a/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseBasicList.vue +++ b/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseBasicList.vue @@ -1,6 +1,6 @@ @@ -88,8 +88,9 @@ export default { diff --git a/jwtech-pc-page/src/views/home/components/statisticsRight.vue b/jwtech-pc-page/src/views/home/components/statisticsRight.vue new file mode 100644 index 00000000..2db95e9f --- /dev/null +++ b/jwtech-pc-page/src/views/home/components/statisticsRight.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/jwtech-pc-page/src/views/home/components/userLogin.vue b/jwtech-pc-page/src/views/home/components/userLogin.vue index 5fc53414..5aaeb03d 100644 --- a/jwtech-pc-page/src/views/home/components/userLogin.vue +++ b/jwtech-pc-page/src/views/home/components/userLogin.vue @@ -1,5 +1,5 @@ + + + diff --git a/jwtech-pc-page/src/views/home/index.vue b/jwtech-pc-page/src/views/home/index.vue index c85f5de8..b5cb2e4b 100644 --- a/jwtech-pc-page/src/views/home/index.vue +++ b/jwtech-pc-page/src/views/home/index.vue @@ -5,18 +5,33 @@ 从业单位企业档案 从业人员人员档案 + 企业资质 + 项目业绩 + 企业不良信息
@@ -28,7 +43,7 @@
-
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+ +
+
+
+