Просмотр исходного кода

解决冲突修改了筛选日期显示

newStyle
douzhuo 2 лет назад
Родитель
Сommit
93b4cca374
15 измененных файлов: 115 добавлений и 150 удалений
  1. +2
    -2
      src/App.vue
  2. +3
    -4
      src/page/wel.vue
  3. +1
    -3
      src/views/Customer/index.vue
  4. +6
    -7
      src/views/Equipment/equipmentDetailList.vue
  5. +5
    -5
      src/views/Equipment/equipmentOnlineRecordList.vue
  6. +4
    -8
      src/views/Scheduling/index.vue
  7. +6
    -9
      src/views/Statistics/BuildingContrast.vue
  8. +5
    -8
      src/views/Statistics/ConsultantBrand.vue
  9. +1
    -1
      src/views/Statistics/EmployeesReceive.vue
  10. +31
    -24
      src/views/Statistics/MentoringAbility.vue
  11. +4
    -8
      src/views/Statistics/ReceptionOverview.vue
  12. +7
    -11
      src/views/Statistics/ReceptionStatistical.vue
  13. +4
    -11
      src/views/Statistics/TheTeamCompared.vue
  14. +6
    -7
      src/views/Statistics/TrendAnalysis.vue
  15. +30
    -42
      src/views/Statistics/index.vue

+ 2
- 2
src/App.vue Просмотреть файл

@@ -51,8 +51,8 @@ export default {
}
}

.cen-tab,.booxtop,.app-top{
border-radius: 4px;
.cen-tab,.booxtop,.app-top,.tablebox{
border-radius: 4px !important;
}

</style>

+ 3
- 4
src/page/wel.vue Просмотреть файл

@@ -1871,9 +1871,8 @@ export default {
<style scoped="scoped" lang="scss">
.box-center {
width: 100%;
padding: 15px;
padding: 20px 15px;
min-width: 1000px;
padding-bottom: 100px;
}

.house-only {
@@ -2226,7 +2225,7 @@ export default {
margin-top: 15px;

.zuo {
padding: 0 15px;
padding: 0 15px 15px;
margin-right: 15px;
background: #ffffff;
border-radius: 4px;
@@ -2258,7 +2257,7 @@ export default {
width: 49%;
background: #ffffff;
border-radius: 4px;
padding: 0 15px;
padding: 0 15px 15px;

.title {
width: 100%;


+ 1
- 3
src/views/Customer/index.vue Просмотреть файл

@@ -878,7 +878,7 @@ export default {
height: 30px;
display: flex;
align-items: center;
margin-left: 20px;
margin: 0 20px;
}
.toptimeqhuan div {
padding-left: 20px;
@@ -894,9 +894,7 @@ export default {
padding-left: 20px;
padding-right: 20px;
text-align: center;
// line-height: 30px;
font-size: 14px;
margin-right: 15px;
border-radius: 4px;
border: 1px solid #e0e0e0;
}


+ 6
- 7
src/views/Equipment/equipmentDetailList.vue Просмотреть файл

@@ -467,7 +467,7 @@
</div>
<div class="tablebox" v-if="!selectTime1">
<template>
<el-table :data="tableData" style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
<el-table :data="tableData" style="width: 100%" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
<el-table-column prop="createTime" label="日期" width="100" align="center">
</el-table-column>
<el-table-column prop="equipmentQuantity" label="设备总数" align="center">
@@ -596,7 +596,7 @@ export default {
flag: false,
page: {
pageNum: 1,
pageSize: 30,
pageSize: 10,
openTime: "",
closeTime: "",
houseName: "",
@@ -1581,9 +1581,8 @@ export default {
<style lang='less' scoped>
.box-center {
width: 100%;
padding: 20px 15px;
padding: 5px 15px 20px;
min-width: 1000px;
padding-bottom: 100px;
}

.toptimeqhuan {
@@ -1638,8 +1637,8 @@ export default {
background: #ffffff;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
border-radius: 8px;
margin-top: 20px;
padding: 18px;
margin-top: 10px;
padding: 15px;
}

.kapiannox {
@@ -1770,7 +1769,7 @@ export default {
padding-bottom: 20px;
background: #ffffff;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
border-radius: 8px;
border-radius: 4px;
}

.zgutteruo-tit {


+ 5
- 5
src/views/Equipment/equipmentOnlineRecordList.vue Просмотреть файл

@@ -63,13 +63,13 @@
>
<span style="line-height: 40px" class="demonstration">领用人:</span>
<div style="width: 200px">
<el-input maxlength="10" clearable v-model="page.accountName"></el-input>
<el-input maxlength="10" clearable placeholder="领用人" v-model="page.accountName"></el-input>
</div>
<span class="demonstration" style="margin-left: 18px; line-height: 40px"
>设备编号:</span
>
<div style="width: 200px">
<el-input maxlength="20" clearable v-model="page.imei"></el-input>
<el-input maxlength="20" placeholder="设备编号" clearable v-model="page.imei"></el-input>
</div>
</div>
<div
@@ -97,7 +97,7 @@
</div>
<div class="tablebox" v-if="activeTotal == 0">
<template>
<el-table :data="tableData" style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
<el-table :data="tableData" style="width: 100%" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
<el-table-column prop="index" label="序号" width="100" align="center">
</el-table-column>
<el-table-column prop="imei" label="设备编号" align="center">
@@ -226,7 +226,7 @@
</div>
<div class="tablebox" v-if="activeTotal == 1">
<template>
<el-table :data="tableData" style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
<el-table :data="tableData" style="width: 100%" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
<el-table-column prop="index" label="序号" width="100" align="center">
</el-table-column>
<el-table-column prop="imei" label="设备编号" align="center">
@@ -297,7 +297,7 @@ export default {
flag: false,
page: {
pageNum: 1,
pageSize: 30,
pageSize: 10,
openTime: "",
closeTime: "",
houseName: "",


+ 4
- 8
src/views/Scheduling/index.vue Просмотреть файл

@@ -22,7 +22,7 @@
</div>
<div class="label">顾问名:</div>
<div>
<el-input maxlength="10" clearable v-model="name"></el-input>
<el-input maxlength="10" placeholder="顾问名" clearable v-model="name"></el-input>
</div>
<div class="label">工作状态:</div>
<div>
@@ -85,8 +85,6 @@
<el-table
:data="tableData"
stripe
height="390"

@selection-change="handleSelectionChange"
style="width: 100%"
:header-cell-style="{ textAlign: 'center' }"
@@ -218,7 +216,7 @@ export default {
],
schedulingoptseid: "",
Page: 1,
size: 30,
size: 10,
total: 0,
roleId:'',
arr1:[],
@@ -644,9 +642,8 @@ export default {
<style scoped="scoped" lang="scss" >
.box-center {
width: 100%;
padding: 15px;
padding: 5px 15px 20px;
min-width: 1000px;
padding-bottom: 100px;
}
.cen-tab {
width: 100%;
@@ -670,11 +667,10 @@ export default {
display: flex;
align-items: center;
.label {
font-size: 14px;
font-size: 16px;
font-weight: 400;
color: #32363d;
line-height: 14px;
margin-left: 15px;
min-width: 100px;
text-align: right;
}


+ 6
- 9
src/views/Statistics/BuildingContrast.vue Просмотреть файл

@@ -67,7 +67,7 @@

<!-- 表格 -->
<div class="cen-tab">
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
<el-table-column prop="batchId" label="序号" align="center">
<template slot-scope="scope">
{{
@@ -312,7 +312,7 @@ export default {
houseId: "",
orgCode: "",
page: 1,
pagesize: 30,
pagesize: 10,
buildingoptions: [],
TimetoAhoose: 4,
customtime: [],
@@ -752,14 +752,14 @@ export default {
position: fixed;
box-shadow: 0px 0px 10px 0px #dadada;
z-index: 999;
margin-top: -16px;
margin-top: -10px;

.titel-text {
height: 100%;
font-size: 18px;
font-size: 16px;
color: #32363d;
line-height: 70px;
margin-left: 30px;
margin-left: 15px;
}

.toptimeqhuan {
@@ -861,11 +861,8 @@ export default {

.hejisan {
width: 92%;
margin: 15px auto;
margin: 0 auto;
display: flex;
// padding-top: 10px;
// padding-bottom: 10px;

.text1-1 {
color: #666666;
}


+ 5
- 8
src/views/Statistics/ConsultantBrand.vue Просмотреть файл

@@ -113,7 +113,7 @@
<el-button @click="downLoad" icon="el-icon-download">导出</el-button>
</div>
</div>
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
<el-table-column prop="batchId" label="序号" align="center">
<template slot-scope="scope">
{{
@@ -650,7 +650,7 @@ export default {
dateType: 2,
tabFlag: 0,
current: 1,
size: 30,
size: 10,
total: 20,
customtime: [],
tablist: [],
@@ -1127,13 +1127,12 @@ export default {
}
.box-center {
width: 100%;
padding: 15px;
padding: 20px 15px;
min-width: 1000px;
padding-bottom: 100px;
}
.cen-tab {
width: 100%;
padding: 15px;
padding: 0 15px 15px;
background: #ffffff;
margin-top: 15px;
}
@@ -1288,10 +1287,8 @@ export default {

.hejisan {
width: 92%;
margin: 15px auto;
margin: 0 auto;
display: flex;
// padding-top: 10px;
// padding-bottom: 10px;
.text1-1 {
color: #666666;
}


+ 1
- 1
src/views/Statistics/EmployeesReceive.vue Просмотреть файл

@@ -407,7 +407,7 @@ export default {
height: 477px;
background: #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
border-radius: 8px;
border-radius: 4px;
}
.zgutteruo-tit{
width: 100%;


+ 31
- 24
src/views/Statistics/MentoringAbility.vue Просмотреть файл

@@ -86,7 +86,7 @@
</div>
<div class="app-titel">
<div style="margin-left: 26px; margin-top: 12px" class="div-lab">
<div class="label">顾问</div>
<div class="label">顾问</div>
<el-select
v-model="consultantlistid"
@change="consultanttap"
@@ -103,7 +103,7 @@
</el-select>
</div>
<div style="margin-left: 26px" class="div-lab">
<div class="label">对比</div>
<div class="label">对比</div>
<el-select
v-model="Pklistid"
@change="packtap"
@@ -122,10 +122,7 @@
</div>
</div>

<div
:style="{ 'margin-top': role != 3 ? '170px' : '120px' }"
v-if="consultantlistid"
>
<div :style="{'margin-top':role != 3?'150px':'110px'}" v-if="consultantlistid">
<div class="app-box-san">
<div class="zuo">
<div class="title">
@@ -336,13 +333,28 @@
>
</div>
</div>
<div style="padding: 10px; background: #fff">
<el-table
:header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
:data="tableData"
stripe
style="width: 100%"
height="640"
<div style="padding:10px;background: #fff;">
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
<el-table-column prop="statDate" label="日期" align="center">
<template slot-scope="scope">
{{
scope.$index == tableData.length - 1
? "合计/平均"
: scope.row.statDate.substring(0, 10)
}}
<!-- {{scope.$index}} -->
</template>
</el-table-column>
<el-table-column prop="activeCustomer" label="接待量" align="center">
<template slot-scope="{ row }">
{{ row.activeCustomer }}次
</template>
</el-table-column>
<el-table-column
v-if="tabFlag == 1"
prop="prohibitedCustomer"
label="违禁接待次数"
align="center"
>
<el-table-column prop="statDate" label="日期" align="center">
<template slot-scope="scope">
@@ -489,7 +501,7 @@ export default {
customtime: [],
tableData: [],
current: 1,
size: 30,
size: 10,
total: 20,
statDateStart: "",
statDateEnd: "",
@@ -1307,15 +1319,13 @@ export default {
<style scoped="scoped" lang="scss" >
.box-center {
width: 100%;
padding: 15px;
padding: 20px 15px;
min-width: 1000px;
padding-bottom: 100px;
}
.cen-tab {
width: 99%;
// padding: 15px;
// background: #ffffff;
margin-top: 15px;
padding-bottom: 15px;
}
.tophove {
color: #ffffff;
@@ -1332,7 +1342,7 @@ export default {
padding-top: 10px;
.titel-text {
height: 100%;
font-size: 18px;
font-size: 16px;
color: #32363d;
line-height: 70px;
margin-left: 30px;
@@ -1468,10 +1478,8 @@ export default {

.hejisan {
width: 92%;
margin: 15px auto;
margin: 0 auto;
display: flex;
// padding-top: 10px;
// padding-bottom: 10px;
.text1-1 {
color: #666666;
}
@@ -1530,11 +1538,10 @@ export default {
width: 200px;
}
.label {
font-size: 14px;
font-size: 16px;
font-weight: 400;
color: #32363d;
line-height: 32px;
margin-left: 15px;
min-width: 40px;
}
.noData {


+ 4
- 8
src/views/Statistics/ReceptionOverview.vue Просмотреть файл

@@ -479,9 +479,7 @@
overflow-y: auto;
height: 320px;
width: 94%;
margin: 0 auto;
margin-top: 15px;
margin-bottom: 16px;
margin: -18px auto 16px;
"
>
<div class="jinbox" v-for="(item, i) in Zxllist" :key="i">
@@ -598,9 +596,7 @@
overflow-y: auto;
height: 320px;
width: 94%;
margin: 0 auto;
margin-top: 15px;
margin-bottom: 16px;
margin: -18px auto 16px;
"
>
<div class="jinbox" v-for="(item, i) in Zxllistchildren" :key="i">
@@ -2096,7 +2092,7 @@ export default {
background: #ffffff;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
border-radius: 4px;
margin-top: 110px;
margin-top: 100px;
padding: 15px;
}

@@ -2150,7 +2146,7 @@ export default {
position: fixed;
z-index: 999;
box-shadow: 0px 0px 10px 0px #dadada;
margin-top: -16px;
margin-top: -10px;
}

.app-titel {


+ 7
- 11
src/views/Statistics/ReceptionStatistical.vue Просмотреть файл

@@ -21,7 +21,7 @@
</div>
</div>
<div class="app-titel">
<div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
<div class="titel-text">接待时间:</div>
<div class="toptimeqhuan">
<div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
近7天
@@ -49,7 +49,7 @@
</div>
<div class="app-titel" style="margin-top: 15px" v-show="isOpen">
<div class="div-lab">
<div style="margin-right: 20px" class="label">团队:</div>
<div style="margin-right: 20px" class="titel-text">团队:</div>
<el-select
v-model="deptId"
filterable
@@ -67,7 +67,7 @@
</el-select>
</div>
<div style="margin-left: 26px" class="div-lab">
<div style="margin-right: 20px" class="label">置业顾问:</div>
<div style="margin-right: 20px" class="titel-text">置业顾问:</div>
<el-select
v-model="accountId"
filterable
@@ -108,7 +108,7 @@
</div>
<!-- 表格 -->
<div class="cen-tab">
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" style="width: 100%" height="640">
<el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" style="width: 100%">
<el-table-column prop="batchId" label="序号" align="center">
<template slot-scope="scope">
{{
@@ -236,7 +236,6 @@
<el-dialog title="详情" :visible.sync="dialogVisible" width="80%">
<div class="cen-tab">
<el-table
max-height="300"
:data="detailData"
stripe
style="width: 100%"
@@ -332,9 +331,9 @@ export default {
current: 1,
current1: 1,
accountId: "",
size: 30,
size: 10,
total: 20,
size1: 30,
size1: 10,
total1: 20,
customtime: [],
tablist: [],
@@ -615,9 +614,8 @@ export default {
<style scoped="scoped" lang="scss" >
.box-center {
width: 100%;
padding: 15px;
padding: 5px 15px 20px;
min-width: 1000px;
padding-bottom: 100px;
}
.cen-tab {
width: 100%;
@@ -646,8 +644,6 @@ export default {
font-weight: 400;
color: #32363d;
line-height: 32px;
margin-left: 15px;
// min-width: 100px;
text-align: right;
}
.titel-text {


+ 4
- 11
src/views/Statistics/TheTeamCompared.vue Просмотреть файл

@@ -81,10 +81,7 @@
</div>
</div>
<!-- 表格 -->
<div
class="cen-tab"
:style="{ 'margin-top': role != 3 ? '110px' : '70px' }"
>
<div class="cen-tab" :style="{'margin-top':role != 3?'100px':'60px'}">
<div style="overflow: auto">
<table>
<tbody>
@@ -1247,9 +1244,8 @@ tbody tr {

.box-center {
width: 100%;
padding: 15px;
padding: 20px 15px;
min-width: 1000px;
padding-bottom: 100px;
}

.cen-tab {
@@ -1393,11 +1389,8 @@ tbody tr {

.hejisan {
width: 92%;
margin: 15px auto;
margin: 0auto;
display: flex;
// padding-top: 10px;
// padding-bottom: 10px;

.text1-1 {
color: #666666;
}
@@ -1461,7 +1454,7 @@ tbody tr {
border-bottom: 1px solid #e0e0e0;
text-align: center;
line-height: 48px;
font-size: 16px;
font-size: 14px;
color: #32363d;
}



+ 6
- 7
src/views/Statistics/TrendAnalysis.vue Просмотреть файл

@@ -2,7 +2,7 @@
<div class="box-center">
<!-- 头 -->
<div class="app-top" style="display:flex;padding:10px 16px;flex-direction: column;">
<div class="app-titel" v-if="role != 3" style="width:27%;">
<div class="app-titel" v-if="role != 3" style="width:27%;margin-bottom: 15px;">
<div class="titel-text">项目选择:</div>
<div style="margin-left: 26px">
<el-select v-model="houseId" placeholder="请选择" filterable @change="houseChange">
@@ -11,8 +11,8 @@
</el-select>
</div>
</div>
<div style="display: flex;align-items: center;margin-top: 15px;">
<div class="titel-text" style="font-size: 14px;font-weight: 600;">筛选日期:</div>
<div style="display: flex;align-items: center">
<div class="titel-text">筛选日期:</div>
<div style="margin-left: 16px;">
<el-button :class="{ 'el-button--primary': timeType == 4 }" @click="tabtimetap(4)">近7天</el-button>
<el-button :class="{ 'el-button--primary': timeType == 5 }" @click="tabtimetap(5)">近15天</el-button>
@@ -96,7 +96,7 @@
</div>

<!-- //卡片 -->
<div class="kapian-box" :style="{'margin-top':role != 3?'110px':'70px'}">
<div class="kapian-box" :style="{'margin-top':role != 3?'100px':'50px'}">
<div class="kayi">
<div class="shang">
<div class="zuo">
@@ -1322,9 +1322,8 @@ export default {

.box-center {
width: 100%;
padding: 15px;
padding: 20px 15px;
min-width: 1000px;
padding-bottom: 100px;
}

.table {
@@ -1521,7 +1520,7 @@ export default {

.titel-text {
height: 100%;
font-size: 14px;
font-size: 16px;
color: #32363d;
}



+ 30
- 42
src/views/Statistics/index.vue Просмотреть файл

@@ -23,8 +23,8 @@
</div>

<div class="app-titel2">
<div style="text-indent: 30px; font-weight: bold">接待时间:</div>
<div style="margin-left: 38px">
<div style="text-indent: 30px;">接待时间:</div>
<div style="margin-left: 38px;">
<!-- <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
今日
</div>
@@ -67,20 +67,9 @@
</div>

<!-- 中间 -->
<div
style="display: flex; justify-content: space-between"
:style="{ 'margin-top': orgType != 3 ? '110px' : '70px' }"
>
<el-card
style="
width: 33%;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
"
>
<div @click="goTo(1)">{{ efficient || "-" }}</div>
<div style="display: flex;justify-content: space-between" :style="{ 'margin-top': orgType != 3 ? '110px' : '60px' }">
<el-card style="width: 33%;display: flex;flex-direction: column;align-items: center;text-align: center">
<div @click="goTo(1)">{{ efficient || '-' }}</div>
<div @click="goTo(1)" style="margin-top: 10px">有效接待</div>
</el-card>
<el-card
@@ -174,27 +163,17 @@
display: flex;
align-items: center;
justify-content: center;
"
>
<img
v-if="inde == 0"
style="width: 30px; height: 30px"
src="/img/ranking1.png"
alt=""
/>
<img
v-else-if="inde == 1"
style="width: 30px; height: 30px"
src="/img/ranking2.png"
alt=""
/>
<img
v-else-if="inde == 2"
style="width: 30px; height: 30px"
src="/img/ranking3.png"
alt=""
/>
<div v-else class="indeclass">{{ inde + 1 }}</div>
">
<span class="sequenceNum" :style="{
'background': inde + 1 == 1 ? 'linear-gradient(180deg, #FFA395 0%, #F54D3F 100%)' : inde + 1 == 2 ? 'linear-gradient(180deg, #FFBE70 0%, #FF981E 100%)' : inde + 1 == 3 ? 'linear-gradient(180deg, #FFE683 0%, #FFCC00 100%)' : '#E5F0FF',
'color': inde + 1 == 1 ? '#FFF' : inde + 1 == 2 ? '#FFF' : inde + 1 == 3 ? '#FFF' : '#333',
'box-shadow': inde + 1 == 1 ? '0px 0px 6px 1px #F54D3F' : inde + 1 == 2 ? '0px 0px 6px 1px #FF981E' : inde + 1 == 3 ? '0px 0px 6px 1px #FFCC00' : '#E5F0FF',
'border': inde + 1 == 1 ? '1px solid #FFCAC6' : inde + 1 == 2 ? '1px solid #FFD6AA' : inde + 1 == 3 ? '1px solid #FFEEAC' : 'none',
}">{{ inde + 1 }}</span>
<!-- <img v-if="inde == 0" style="width: 30px; height: 30px" src="/img/ranking1.png" alt="" />
<img v-else-if="inde == 1" style="width: 30px; height: 30px" src="/img/ranking2.png" alt="" />
<img v-else-if="inde == 2" style="width: 30px; height: 30px" src="/img/ranking3.png" alt="" />
<div v-else class="indeclass">{{ inde + 1 }}</div> -->
</div>
<div v-if="index == 2">
{{ itcen.name + "-" + itcen.endName + "㎡" }}({{ itcen.total }})
@@ -564,9 +543,8 @@ export default {

.box-center {
width: 100%;
padding: 15px;
padding:20px 15px;
min-width: 1000px;
padding-bottom: 100px;
}

.tophove {
@@ -738,10 +716,20 @@ export default {

.table-cent {
width: 100%;
height: 20px;
line-height: 20px;
height: 40px;
line-height: 40px;
display: flex;
margin-top: 18px;
margin-top: 6px;
}
.sequenceNum {
display: flex;
width: 26px;
height: 24px;
justify-content: center;
align-items: center;
background: #E5F0FF;
border-radius: 15px;
color: #333333;
}

.table-cent > div:nth-of-type(1) {


Загрузка…
Отмена
Сохранить