Skip to content

H
house-type
Commit 59d1f69c authored by super_liu's avatar super_liu
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	src/views/Login.vue
parents c5cc3d58 6fc39822
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 26 deletions
public/index.html
View file @ 59d1f69c
......@@ -4,8 +4,8 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>天友设计院-户型查询系统</title>
<link rel="icon" href="http://yanfa.tenio.com:2020/webApp/images/icon_tianyou.png">
<title>天友设计院-户型地图大数据</title>
</head>
<body>
<noscript>
......
src/components/Layout/index.vue
View file @ 59d1f69c
......@@ -2,8 +2,9 @@
<div class="app-wrapper">
<el-container>
<el-aside :width="isCollapse ? 'auto' : '200px'">
<div class="logon-container">
<div class="logo-title-sign">
<img src="@assets/img/tenio-logo.png" width="21" height="21">
<b>户型地图大数据</b>
</div>
<transition name="fade">
<el-menu
......@@ -30,7 +31,7 @@
class="hamburger-container"
/>
<breadcrumb />
<div style="width: 100%;position: absolute;right: 163px;">
<div style="width: 100%">
<async-search class="main-search"></async-search>
</div>
<el-dropdown class="avatar-container" trigger="click">
......@@ -152,13 +153,16 @@ export default {
display flex
flex-direction column
background:linear-gradient(180deg,rgba(40,102,144,1) 0%,rgba(16,34,68,1) 100%) !important;
.logon-container {
height 120px
width 100%
background url("../../assets/img/logo.png");
background-repeat no-repeat;
background-size 137px 21px;
background-position center;
.logo-title-sign{
width 100%;
display flex
margin 30px 0
justify-content center
align-items center
b {
font-size 18px
margin-left 8px
}
}
.el-menu {
height 100%
......@@ -204,13 +208,14 @@ export default {
height: 50px;
display: inline-block;
margin: 0 15px
position: absolute;
right: 35px;
.avatar-wrapper {
cursor: pointer;
margin-top: 5px;
position: relative;
line-height: initial;
display flex;
align-items flex-end
white-space nowrap
.svg-icon {
width: 40px;
height: 40px;
......@@ -218,12 +223,9 @@ export default {
.user-avatar {
width: 40px;
height: 40px;
border-radius: 10px;
border-radius: 50%;
}
.el-icon-caret-bottom {
position: absolute;
right: -10px;
top: 25px;
font-size: 12px;
}
}
......
src/components/multilHeaderTable/index.vue
View file @ 59d1f69c
......@@ -227,7 +227,7 @@
const pageArr = []
// 每个产品的当前页数与总页数数据
// [
// { page: 1, pages: 2 },
// { page: 1, pages: 2, },
// { page: 1, pages: 2 }
// ]
const pageObjMap = {}
......@@ -240,6 +240,8 @@
if(item.productionProperties && item.productionProperties.length > 0) {
pageArr.push({
page: 1,
rows: 3,
total: item.productionProperties.length, // 总数
pages: Math.ceil(item.productionProperties.length / 3) // 总页数为总数据除每页大小
})
item.productionProperties.forEach((product, index2) => {
......@@ -254,7 +256,9 @@
} else {
pageArr.push({
page: 1,
pages: 1
pages: 1,
rows:3,
total: 0
})
}
})
......
src/router/index.js
View file @ 59d1f69c
......@@ -21,14 +21,14 @@ let routes = [
{
path: '/regionalPlate',
hidden: false,
meta: { title: '板块&区域', icon: 'el-icon-discover' },
meta: { title: '区域板块楼盘', icon: 'el-icon-discover' },
component: Layout,
children: [
{
path: '/regionalPlate',
name: 'regionalPlate',
hidden: false,
meta: { title: '板块&区域' },
meta: { title: '区域板块楼盘' },
component: () => import('@/views/RegionalPlate/index.vue'),
}
]
......@@ -36,13 +36,13 @@ let routes = [
{
path: '/plateSupplyData',
hidden: false,
meta: { title: '板块供求数据', icon: 'el-icon-search' },
meta: { title: '产品供求数据', icon: 'el-icon-search' },
component: Layout,
children: [
{
path: '/plateSupplyData',
name: 'plateSupplyData',
meta: { title: '板块供求数据' },
meta: { title: '产品供求数据' },
hidden: false,
component: () => import('@/views/plateSupplyData/index.vue'),
}
......@@ -51,14 +51,14 @@ let routes = [
{
path: '/ProductAnalysis',
hidden: false,
meta: { title: '板块产品分析', icon: 'el-icon-pie-chart' },
meta: { title: '产品数据分析', icon: 'el-icon-pie-chart' },
component: Layout,
children: [
{
path: '/ProductAnalysis',
name: 'ProductAnalysis',
hidden: false,
meta: { title: '板块产品分析' },
meta: { title: '产品数据分析' },
component: () => import('@/views/ProductAnalysis/index.vue'),
}
]
......
src/views/Login.vue
View file @ 59d1f69c
<template>
<section class="login">
<div class="login-div">
<h3 class="title">天友设计院-户型地图大数据</h3>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="企业登录" name="first">
<iframe :src="wxQrCodeUrl" id="iframeTop" style="border: none;">
</iframe>
<!-- <div id="wxQrCode">-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="用户登录" name="second">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
<el-form v-if="!loginStatus" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
<div align="center" style="margin-bottom: 40px">
<img :src="require('@assets/img/logo.png')" width="150" alt="">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment