Commit 801a6138 authored by 黄奎's avatar 黄奎

页面修改

parent bd908ab0
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
margin: 25px 0 0 80px; margin: 25px 0 0 80px;
color: #E95252; color: #E95252;
} }
</style> </style>
<template> <template>
...@@ -53,35 +52,35 @@ ...@@ -53,35 +52,35 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="el-col-div ownScrollbarStyle PersonalData_l"> <div class="el-col-div ownScrollbarStyle PersonalData_l">
<!-- <rightHead :pagesTitle="1"></rightHead> -->
<div class="l_top" style="position: relative;"> <div class="l_top" style="position: relative;">
<img v-if="data.icon !=null && data.icon !='' " :src="data.icon" alt="" class="tx_img" <img v-if="data.icon !=null && data.icon !='' " :src="data.icon" alt="" class="tx_img"
:onerror='defaultHeadImg'> :onerror='defaultHeadImg'>
<img v-else src="../../assets/img/default_head_img.jpg" alt="" alt="" class="tx_img"> <img v-else src="../../assets/img/default_head_img.jpg" alt="" class="tx_img">
<div class="p_name"> <div class="p_name">
<span>{{data.emName}}</span> <span>{{data.emName}}</span>
<span>{{data.postName}}</span> <span>{{data.postName}}</span>
<div @click="goAnticipate(5)" style="cursor: pointer;"> <div @click="goAnticipate(5)" style="cursor: pointer;">
<div v-if="SumPreferPrice" style="padding: 2px 0 0 0;"><a style="color: #666666;font-size: 14px;font-weight: bold;">{{SumPreferPrice}}</a></div> <div v-if="SumPreferPrice" style="padding: 2px 0 0 0;"><a
style="color: #666666;font-size: 14px;font-weight: bold;">{{SumPreferPrice}}</a></div>
<div style="font-size: 14px;color: #333333;" v-if="rankingNum"> <div style="font-size: 14px;color: #333333;" v-if="rankingNum">
<a style="color: #FF8C00;margin-left: 3px;margin-right: 3px; <a style="color: #FF8C00;margin-left: 3px;margin-right: 3px;
font-size: 18px;font-weight: bold;">{{rankingNum}}</a font-size: 18px;font-weight: bold;">{{rankingNum}}</a>
>
</div> </div>
</div> </div>
</div> </div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<!-- <img style="cursor: pointer;" src="../../assets/img/jinbin@2x.png" alt="" class="img" @click="goAnticipate(1)"> --> <div style="cursor: pointer;cursor: pointer;position: relative;" class="royalty"
<div style="cursor: pointer;cursor: pointer;position: relative;" class="royalty" @click="goAnticipate(1)"> @click="goAnticipate(1)">
<div class="tc"> <div class="tc">
<p> <p>
<span></span> <span></span>
<span>{{data.totalCommission}}</span> <span>{{data.totalCommission}}</span>
</p> </p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}<el-tag <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}<el-tag
v-if="data.peopelBonus" size="mini" type="danger" v-if="data.peopelBonus" size="mini" type="danger" effect="dark"
effect="dark" style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">奖+{{data.peopelBonus}}</el-tag></p> style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
奖+{{data.peopelBonus}}</el-tag>
</p>
</div> </div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;"> <div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
<span>出境提成</span> <span>出境提成</span>
...@@ -93,7 +92,6 @@ ...@@ -93,7 +92,6 @@
</div> </div>
</div> </div>
<div style="border-left: 1px solid #eeeeee;width: 1px;"> </div> <div style="border-left: 1px solid #eeeeee;width: 1px;"> </div>
<!-- <img style="cursor: pointer;" src="../../assets/img/jinbin@2x.png" alt="" class="img" @click="goAnticipate(2)"> -->
<div style="cursor: pointer;margin-left: 0;" class="royalty" @click="goAnticipate(2)"> <div style="cursor: pointer;margin-left: 0;" class="royalty" @click="goAnticipate(2)">
<div class="tc"> <div class="tc">
<p> <p>
...@@ -107,7 +105,6 @@ ...@@ -107,7 +105,6 @@
</div> </div>
</div> </div>
<div style="border-left: 1px solid #eeeeee;width: 1px;"> </div> <div style="border-left: 1px solid #eeeeee;width: 1px;"> </div>
<!-- <img style="cursor: pointer;" src="../../assets/img/jinbin@2x.png" alt="" class="img" @click="goAnticipate(3)"> -->
<div style="cursor: pointer;margin-left: 0;" class="royalty" @click="goAnticipate(3)"> <div style="cursor: pointer;margin-left: 0;" class="royalty" @click="goAnticipate(3)">
<div class="tc"> <div class="tc">
<p> <p>
...@@ -149,10 +146,7 @@ ...@@ -149,10 +146,7 @@
</div> </div>
<div style="width: 100%;margin-top: 20px;text-align: center" <div style="width: 100%;margin-top: 20px;text-align: center"
v-show="data.orderInfo ==null || data.orderInfo.length == 0">暂无数据</div> v-show="data.orderInfo ==null || data.orderInfo.length == 0">暂无数据</div>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -174,7 +168,6 @@ ...@@ -174,7 +168,6 @@
</div> </div>
<i class="iconfont icon-tuoyuan" /> <i class="iconfont icon-tuoyuan" />
</div> </div>
<div class="c_view view_t"> <div class="c_view view_t">
<div class="semicircle_t"></div> <div class="semicircle_t"></div>
<div class="view_c"> <div class="view_c">
...@@ -186,7 +179,6 @@ ...@@ -186,7 +179,6 @@
</div> </div>
<i class="iconfont icon-xingzhuang2" /> <i class="iconfont icon-xingzhuang2" />
</div> </div>
<div class="c_view view_t"> <div class="c_view view_t">
<div class="semicircle_t"></div> <div class="semicircle_t"></div>
<div class="view_c"> <div class="view_c">
...@@ -198,7 +190,6 @@ ...@@ -198,7 +190,6 @@
<i class="iconfont icon-xingzhuang4" id="xzts" /> <i class="iconfont icon-xingzhuang4" id="xzts" />
</div> </div>
</div> </div>
<div class="r_box_b"> <div class="r_box_b">
<div class="c_view view_b"> <div class="c_view view_b">
<div class="semicircle_b"></div> <div class="semicircle_b"></div>
...@@ -224,7 +215,6 @@ ...@@ -224,7 +215,6 @@
</div> </div>
<div class="c_view view_b"> <div class="c_view view_b">
<div class="semicircle_b"></div> <div class="semicircle_b"></div>
<div class="view_c"> <div class="view_c">
<span>今日询单</span> <span>今日询单</span>
<div class="view-f"> <div class="view-f">
...@@ -377,7 +367,6 @@ ...@@ -377,7 +367,6 @@
</div> </div>
<div class="r_name"> <div class="r_name">
<span>待处理发票</span> <span>待处理发票</span>
<el-badge class="tishi" :value="data.invoiceApplyCount?data.invoiceApplyCount:'0'" /> <el-badge class="tishi" :value="data.invoiceApplyCount?data.invoiceApplyCount:'0'" />
</div> </div>
</div> </div>
...@@ -387,9 +376,7 @@ ...@@ -387,9 +376,7 @@
</div> </div>
<div class="r_name"> <div class="r_name">
<span>公告</span> <span>公告</span>
<el-badge class="tishi" :value="data.noticeCount?data.noticeCount:'0'" /> <el-badge class="tishi" :value="data.noticeCount?data.noticeCount:'0'" />
</div> </div>
</div> </div>
</div> </div>
...@@ -410,7 +397,6 @@ ...@@ -410,7 +397,6 @@
<span>今日总收客人数</span> <span>今日总收客人数</span>
<span>{{groupdata.toDayGuestCount}}<span class="p_dw"></span></span> <span>{{groupdata.toDayGuestCount}}<span class="p_dw"></span></span>
</div> </div>
<div class="g_icon g_bms"> <div class="g_icon g_bms">
<i class="iconfont icon-clipboard" style="color: #00B26F"></i> <i class="iconfont icon-clipboard" style="color: #00B26F"></i>
</div> </div>
...@@ -418,7 +404,6 @@ ...@@ -418,7 +404,6 @@
<span>今日总报名单数</span> <span>今日总报名单数</span>
<span>{{groupdata.toDayOrderCount}}<span class="p_dw"></span></span> <span>{{groupdata.toDayOrderCount}}<span class="p_dw"></span></span>
</div> </div>
<div class="g_icon g_skuan"> <div class="g_icon g_skuan">
<i class="iconfont icon-graph" style="color: #FF7B8A"></i> <i class="iconfont icon-graph" style="color: #FF7B8A"></i>
</div> </div>
...@@ -660,7 +645,6 @@ ...@@ -660,7 +645,6 @@
components: { components: {
leftNav, leftNav,
}, },
watch: { watch: {
screenWidth(val) { screenWidth(val) {
this.screenWidth = val; this.screenWidth = val;
...@@ -670,18 +654,18 @@ ...@@ -670,18 +654,18 @@
}, },
methods: { methods: {
// 销售预期提成 // 销售预期提成
goAnticipate(type){ goAnticipate(type) {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let name let name
if(type==1){//出境 if (type == 1) { //出境
name = 'TradeTicketUserDetails' name = 'TradeTicketUserDetails'
}else if(type==2){//国内 } else if (type == 2) { //国内
name = 'domesticCommissionUser' name = 'domesticCommissionUser'
}else if(type==3){//历史单项 } else if (type == 3) { //历史单项
name = 'ServiceCommissionUser' name = 'ServiceCommissionUser'
}else if(type==4){//预期提成 } else if (type == 4) { //预期提成
name = 'saleExpectedCommission' name = 'saleExpectedCommission'
}else if(type==5){//排名 } else if (type == 5) { //排名
name = 'salesVolumeRank' name = 'salesVolumeRank'
this.$router.push({ this.$router.push({
name: name, name: name,
...@@ -691,7 +675,7 @@ ...@@ -691,7 +675,7 @@
} }
}); });
} }
if(type!=5&&name){ if (type != 5 && name) {
this.$router.push({ this.$router.push({
name: name, name: name,
query: { query: {
...@@ -701,41 +685,30 @@ ...@@ -701,41 +685,30 @@
} }
}); });
} }
}, },
settStartDates() { settStartDates() {
let nowdays = new Date() let nowdays = new Date()
let Year = new Date().getFullYear() let Year = new Date().getFullYear()
let MonthTime = new Date().getMonth() + 1 let MonthTime = new Date().getMonth() + 1
let MonthDayNum = new Date(Year, 12, 0).getDate(); let MonthDayNum = new Date(Year, 12, 0).getDate();
let date = Year+'-12-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum) let date = Year + '-12-' + (MonthDayNum > 10 ? MonthDayNum : '0' + MonthDayNum)
let start = Year+'-01-01' let start = Year + '-01-01'
this.PMMsg.tStartDates = [start, date] this.PMMsg.tStartDates = [start, date]
}, },
initData() { initData() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let param = { let param = {
RB_Branch_Id: RB_Branch_Id: this.PMMsg.RB_Branch_Id == -1 ? null : this.PMMsg.RB_Branch_Id,
this.PMMsg.RB_Branch_Id == -1 ? null : this.PMMsg.RB_Branch_Id, RB_Department_Id: this.PMMsg.RB_Department_Id == 0 ? null : this.PMMsg.RB_Department_Id,
RB_Department_Id: EnterID: this.PMMsg.EnterID == 0 ? null : this.PMMsg.EnterID, //Number(userInfo.EmployeeId)
this.PMMsg.RB_Department_Id == 0 ? null : this.PMMsg.RB_Department_Id, QStartDate: this.PMMsg.tStartDates && this.PMMsg.tStartDates.length == 2 ?
EnterID: this.PMMsg.EnterID == 0 ? null : this.PMMsg.EnterID,//Number(userInfo.EmployeeId) this.PMMsg.tStartDates[0] : null,
QStartDate: QEndDate: this.PMMsg.tStartDates && this.PMMsg.tStartDates.length == 2 ?
this.PMMsg.tStartDates && this.PMMsg.tStartDates.length == 2 this.PMMsg.tStartDates[1] : null,
? this.PMMsg.tStartDates[0] CStartDate: this.PMMsg.qStartDates && this.PMMsg.qStartDates.length == 2 ?
: null, this.PMMsg.qStartDates[0] : null,
QEndDate: CEndDate: this.PMMsg.qStartDates && this.PMMsg.qStartDates.length == 2 ?
this.PMMsg.tStartDates && this.PMMsg.tStartDates.length == 2 this.PMMsg.qStartDates[1] : null,
? this.PMMsg.tStartDates[1]
: null,
CStartDate:
this.PMMsg.qStartDates && this.PMMsg.qStartDates.length == 2
? this.PMMsg.qStartDates[0]
: null,
CEndDate:
this.PMMsg.qStartDates && this.PMMsg.qStartDates.length == 2
? this.PMMsg.qStartDates[1]
: null,
GroupBy: this.PMMsg.GroupBy, GroupBy: this.PMMsg.GroupBy,
QueryType: this.PMMsg.QueryType, QueryType: this.PMMsg.QueryType,
}; };
...@@ -749,18 +722,16 @@ ...@@ -749,18 +722,16 @@
x.avgPrice = parseFloat(x.avgPrice); x.avgPrice = parseFloat(x.avgPrice);
}); });
tableData = r.data.data; tableData = r.data.data;
tableData.forEach((item,index)=>{ tableData.forEach((item, index) => {
if(item.EnterID==Number(userInfo.EmployeeId)){ if (item.EnterID == Number(userInfo.EmployeeId)) {
this.rankingNum = index+1 this.rankingNum = index + 1
this.SumPreferPrice = item.SumPreferPrice this.SumPreferPrice = item.SumPreferPrice
} }
}) })
}); });
}, },
//过滤除开标点符号的字数
//锅炉除开标点符号的字数
getFilteredNum(val) { getFilteredNum(val) {
//var pattern=new RegExp("[`~%!@#$^=''?~!@#¥……&——‘”“'?*()(),,。.、<>《》\\[\\]【】\\“\\”{}=+-|\/:;;:]");
var pattern = new RegExp("[`~%!@#$^=''?~!@#¥……&——‘”“'?*()(),,。.、<>《》:;; +-=\\s]"); var pattern = new RegExp("[`~%!@#$^=''?~!@#¥……&——‘”“'?*()(),,。.、<>《》:;; +-=\\s]");
//[]内输入你要过滤的字符,这里基本包含全部的标点符号,\\是转义字符 //[]内输入你要过滤的字符,这里基本包含全部的标点符号,\\是转义字符
var rs = ""; var rs = "";
...@@ -821,9 +792,10 @@ ...@@ -821,9 +792,10 @@
item['fen'] = 'S' item['fen'] = 'S'
} }
}) })
let evaluate = this.$echarts.init(document.getElementById('evaluate')) var evaluateObj = document.getElementById('evaluate');
if (evaluateObj) {
let evaluate = this.$echarts.init(evaluateObj)
evaluate.setOption({ evaluate.setOption({
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { // 坐标轴指示器,坐标轴触发有效 axisPointer: { // 坐标轴指示器,坐标轴触发有效
...@@ -902,6 +874,7 @@ ...@@ -902,6 +874,7 @@
radius: 60 radius: 60
}, ] }, ]
}); });
}
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -923,7 +896,9 @@ ...@@ -923,7 +896,9 @@
}, },
drawLine(OrderList) { drawLine(OrderList) {
// 基于准备好的dom,初始化echarts实例 // 基于准备好的dom,初始化echarts实例
let myChart = this.$echarts.init(document.getElementById('myChart')) var chatObj = document.getElementById('myChart');
if (chatObj) {
let myChart = this.$echarts.init(chatObj)
let dataname = []; let dataname = [];
let bzdata = []; let bzdata = [];
let szdata = []; let szdata = [];
...@@ -997,6 +972,7 @@ ...@@ -997,6 +972,7 @@
} }
] ]
}); });
}
}, },
Financial_post_GetNotDealCount() { Financial_post_GetNotDealCount() {
this.apipost( this.apipost(
...@@ -1055,5 +1031,4 @@ ...@@ -1055,5 +1031,4 @@
this.Financial_post_GetNotDealCount(); //待处理财务单据的个数 this.Financial_post_GetNotDealCount(); //待处理财务单据的个数
}, },
} }
</script> </script>
\ No newline at end of file
<style> <style>
.informationList { .informationList {
position: absolute; position: absolute;
left: 330px; left: 330px;
right: 0px; right: 0px;
top: 30px; top: 30px;
bottom: 30px; bottom: 30px;
} }
.informationList .LeftSide { .informationList .LeftSide {
float: left; float: left;
width: 45%; width: 45%;
position: relative; position: relative;
height: 100%; height: 100%;
} }
.informationList .rightSide { .informationList .rightSide {
float: left; float: left;
margin-left: 30px; margin-left: 30px;
width: 50%; width: 50%;
position: relative; position: relative;
height: 100%; height: 100%;
} }
.informationList .TopList { .informationList .TopList {
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
background-color: #fff; background-color: #fff;
box-shadow: 2px 0px 10px rgba(217, 217, 217, 1); box-shadow: 2px 0px 10px rgba(217, 217, 217, 1);
min-width: 466px; min-width: 466px;
} }
.informationList .todayOrder { .informationList .todayOrder {
color: #333333; color: #333333;
padding-top: 25px; padding-top: 25px;
padding-bottom: 15px; padding-bottom: 15px;
...@@ -37,18 +37,18 @@ ...@@ -37,18 +37,18 @@
margin: 0 20px; margin: 0 20px;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
} }
.informationList .orderList { .informationList .orderList {
text-align: center; text-align: center;
width: 78px; width: 78px;
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
.informationList .circle { .informationList .circle {
width: 70px; width: 70px;
height: 70px; height: 70px;
text-align: center; text-align: center;
...@@ -57,57 +57,57 @@ ...@@ -57,57 +57,57 @@
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
margin-bottom: 20px; margin-bottom: 20px;
} }
.informationList .circleList { .informationList .circleList {
width: 100%; width: 100%;
margin: 20px 0 20px 27px; margin: 20px 0 20px 27px;
} }
.informationList .cirHotel { .informationList .cirHotel {
border: 4px solid #4cc0fc; border: 4px solid #4cc0fc;
color: #2aaef2; color: #2aaef2;
background-color: #f1faff; background-color: #f1faff;
} }
.informationList .cirRes { .informationList .cirRes {
border: 4px solid #8fecf9; border: 4px solid #8fecf9;
color: #6edbea; color: #6edbea;
background-color: #f3feff; background-color: #f3feff;
} }
.informationList .cirPiao { .informationList .cirPiao {
border: 4px solid #69d5a7; border: 4px solid #69d5a7;
color: #47bf8c; color: #47bf8c;
background-color: #f2fff9; background-color: #f2fff9;
} }
.informationList .cirPiaojuan { .informationList .cirPiaojuan {
border: 4px solid #ffc748; border: 4px solid #ffc748;
color: #ffba1f; color: #ffba1f;
background-color: #fff8e9; background-color: #fff8e9;
} }
.informationList .cirCar { .informationList .cirCar {
border: 4px solid #fe9466; border: 4px solid #fe9466;
color: #ff793e; color: #ff793e;
background-color: #fff2ec; background-color: #fff2ec;
} }
.informationList .cirLeader { .informationList .cirLeader {
border: 4px solid #fc7979; border: 4px solid #fc7979;
color: #e85252; color: #e85252;
background-color: #ffefef; background-color: #ffefef;
} }
.informationList .charts { .informationList .charts {
height: 330px; height: 330px;
border: 1px solid #e8eae7; border: 1px solid #e8eae7;
box-shadow: 2px 0px 10px rgba(217, 217, 217, 1); box-shadow: 2px 0px 10px rgba(217, 217, 217, 1);
background-color: #fff; background-color: #fff;
} }
.informationList .demandState { .informationList .demandState {
height: 470px; height: 470px;
min-width: 466px; min-width: 466px;
border: 1px solid #e8eae7; border: 1px solid #e8eae7;
...@@ -119,97 +119,97 @@ ...@@ -119,97 +119,97 @@
left: 0px; left: 0px;
top: 238px; top: 238px;
bottom: 0px; bottom: 0px;
} }
.informationList .damandType { .informationList .damandType {
display: inline-block; display: inline-block;
color: #333333; color: #333333;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin: 20px 0 0 30px; margin: 20px 0 0 30px;
} }
.informationList .damandBtn { .informationList .damandBtn {
float: right; float: right;
margin: 20px 30px 0 0; margin: 20px 30px 0 0;
} }
.informationList .demandState table { .informationList .demandState table {
height: calc(100% - 115px); height: calc(100% - 115px);
} }
.informationList table tbody { .informationList table tbody {
display: block; display: block;
overflow-y: scroll; overflow-y: scroll;
height: calc(100% - 40px); height: calc(100% - 40px);
} }
.informationList table thead, .informationList table thead,
.informationList tbody tr { .informationList tbody tr {
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed; table-layout: fixed;
} }
/* .informationList table thead {width: calc( 100% - 1em )} */ /* .informationList table thead {width: calc( 100% - 1em )} */
.informationList table thead th { .informationList table thead th {
background: #f2f2f2; background: #f2f2f2;
} }
.informationList table tbody::-webkit-scrollbar { .informationList table tbody::-webkit-scrollbar {
width: 4px; width: 4px;
height: 8px; height: 8px;
} }
.informationList table tbody::-webkit-scrollbar-thumb { .informationList table tbody::-webkit-scrollbar-thumb {
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9; background: #c9c9c9;
} }
/* .informationList table tbody::-webkit-scrollbar-track {-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;} */ /* .informationList table tbody::-webkit-scrollbar-track {-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;} */
.informationList .el-radio-button__inner { .informationList .el-radio-button__inner {
font-size: 12px; font-size: 12px;
padding: 5px 9px; padding: 5px 9px;
} }
.botmList { .botmList {
text-align: right; text-align: right;
font-size: 12px; font-size: 12px;
margin: 30px 0 20px 0; margin: 30px 0 20px 0;
} }
.botmList > div { .botmList>div {
display: inline-block; display: inline-block;
margin-right: 20px; margin-right: 20px;
} }
.informationList .commonSty { .informationList .commonSty {
display: inline-block; display: inline-block;
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 50%; border-radius: 50%;
margin-right: 10px; margin-right: 10px;
} }
.informationList .cirOne { .informationList .cirOne {
background-color: #e85252; background-color: #e85252;
} }
.informationList .cirTwo { .informationList .cirTwo {
background-color: #ff793e; background-color: #ff793e;
} }
.informationList .cirThr { .informationList .cirThr {
background-color: #47bf8c; background-color: #47bf8c;
} }
.informationList .cirFou { .informationList .cirFou {
background-color: #cccccc; background-color: #cccccc;
} }
.informationList .StatusTitle { .informationList .StatusTitle {
width: 150px; width: 150px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -218,40 +218,40 @@ ...@@ -218,40 +218,40 @@
padding-left: 10px; padding-left: 10px;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
text-align: left; text-align: left;
} }
.test-1::-webkit-scrollbar { .test-1::-webkit-scrollbar {
width: 0px; width: 0px;
height: 0px; height: 0px;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.test-1::-webkit-scrollbar-track { .test-1::-webkit-scrollbar-track {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.test-1::-webkit-scrollbar-thumb { .test-1::-webkit-scrollbar-thumb {
border-radius: 20px; border-radius: 20px;
background-color: #aaa; background-color: #aaa;
margin-bottom: 24px; margin-bottom: 24px;
} }
.informationList .singeRowTable { .informationList .singeRowTable {
margin: 0 4px 30px 0; margin: 0 4px 30px 0;
} }
.informationList .circleAll { .informationList .circleAll {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 50%; border-radius: 50%;
} }
.informationList .el-button + .el-button { .informationList .el-button+.el-button {
margin-left: -5px; margin-left: -5px;
} }
.informationList .inventory { .informationList .inventory {
border: 1px solid #e8eae7; border: 1px solid #e8eae7;
background-color: #fff; background-color: #fff;
position: absolute; position: absolute;
...@@ -260,22 +260,22 @@ ...@@ -260,22 +260,22 @@
top: 358px; top: 358px;
bottom: 0px; bottom: 0px;
height: 350px; height: 350px;
} }
.informationList .lastD > div { .informationList .lastD>div {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
font-size: 12px; font-size: 12px;
} }
.informationList .inventoryBtm { .informationList .inventoryBtm {
display: flex; display: flex;
padding: 20px; padding: 20px;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
.informationList .inventoryBtm > div { .informationList .inventoryBtm>div {
border: 1px solid #eeeeee; border: 1px solid #eeeeee;
background-color: #fff; background-color: #fff;
text-align: center; text-align: center;
...@@ -283,21 +283,21 @@ ...@@ -283,21 +283,21 @@
flex: 1; flex: 1;
min-height: 260px; min-height: 260px;
border-right: 0; border-right: 0;
} }
.informationList .inventoryBtm > div:last-child { .informationList .inventoryBtm>div:last-child {
border-right: 1px solid #eeeeee; border-right: 1px solid #eeeeee;
} }
.informationList .invnTitle { .informationList .invnTitle {
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
margin-top: 20px; margin-top: 20px;
} }
.informationList .invenCircle { .informationList .invenCircle {
width: 104px; width: 104px;
height: 104px; height: 104px;
border-radius: 50%; border-radius: 50%;
...@@ -306,37 +306,37 @@ ...@@ -306,37 +306,37 @@
color: #fff; color: #fff;
text-align: center; text-align: center;
line-height: 95px; line-height: 95px;
} }
.informationList .inventOne { .informationList .inventOne {
background-color: #ef5e5e; background-color: #ef5e5e;
border: 6px solid #ffd0d0; border: 6px solid #ffd0d0;
} }
.informationList .inventTwo { .informationList .inventTwo {
background-color: #ff793e; background-color: #ff793e;
border: 6px solid #ffc2a7; border: 6px solid #ffc2a7;
} }
.informationList .inventThr { .informationList .inventThr {
background-color: #47bf8c; background-color: #47bf8c;
border: 6px solid #84ecc0; border: 6px solid #84ecc0;
} }
.informationList .EveryDayCount { .informationList .EveryDayCount {
margin-left: 5px; margin-left: 5px;
} }
.informationList .lastDiv { .informationList .lastDiv {
font-size: 14px; font-size: 14px;
} }
.informationList .dataTable { .informationList .dataTable {
width: 100%; width: 100%;
height: 400px; height: 400px;
} }
.informationList .damandBtnDay li { .informationList .damandBtnDay li {
width: 60px; width: 60px;
height: 24px; height: 24px;
font-size: 12px; font-size: 12px;
...@@ -347,24 +347,25 @@ ...@@ -347,24 +347,25 @@
border-radius: 4px; border-radius: 4px;
border: 1px solid #e3e3e3; border: 1px solid #e3e3e3;
cursor: pointer; cursor: pointer;
} }
.informationList .damandBtnDay li:nth-child(1) { .informationList .damandBtnDay li:nth-child(1) {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.informationList .damandBtnDay li:nth-child(2) { .informationList .damandBtnDay li:nth-child(2) {
position: relative; position: relative;
left: -6px; left: -6px;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.informationList .damandBtnDay_active { .informationList .damandBtnDay_active {
background-color: #e8eae7; background-color: #e8eae7;
} }
@media (max-width: 1366px) {
@media (max-width: 1366px) {
.informationList .orderList { .informationList .orderList {
width: auto; width: auto;
} }
...@@ -385,7 +386,7 @@ ...@@ -385,7 +386,7 @@
height: 80px; height: 80px;
line-height: 70px; line-height: 70px;
} }
} }
</style> </style>
<template> <template>
...@@ -399,7 +400,9 @@ ...@@ -399,7 +400,9 @@
</div> </div>
<div class="circleList clearfix"> <div class="circleList clearfix">
<div class="orderList" v-for="(item,index) in TodayData" :key="item.subCode"> <div class="orderList" v-for="(item,index) in TodayData" :key="item.subCode">
<div class="circle" :class="{'cirHotel':index==0,'cirRes':index==1,'cirPiao':index==2,'cirPiaojuan':index==3,'cirCar':index==4,'cirLeader':index==5}">{{item.OrderCount}}</div> <div class="circle"
:class="{'cirHotel':index==0,'cirRes':index==1,'cirPiao':index==2,'cirPiaojuan':index==3,'cirCar':index==4,'cirLeader':index==5}">
{{item.OrderCount}}</div>
<span>{{item.OrderTypeStr}}</span> <span>{{item.OrderTypeStr}}</span>
</div> </div>
</div> </div>
...@@ -432,17 +435,30 @@ ...@@ -432,17 +435,30 @@
</thead> </thead>
<tbody> <tbody>
<tr v-for="item in needStatus" :key="item.subCode"> <tr v-for="item in needStatus" :key="item.subCode">
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start"
popper-class="max-w250">
<td class="StatusTitle"> <td class="StatusTitle">
<span class="roomName">{{item.Title}}</span> <span class="roomName">{{item.Title}}</span>
</td> </td>
</el-tooltip> </el-tooltip>
<td width='50'><span class="circleAll" :class="{'cirOne':item.Hotel==4,'cirTwo':item.Hotel==3,'cirThr':item.Hotel==2,'cirFou':item.Hotel==1}"></span></td> <td width='50'><span class="circleAll"
<td width='50'><span class="circleAll" :class="{'cirOne':item.Dining==4,'cirTwo':item.Dining==3,'cirThr':item.Dining==2,'cirFou':item.Dining==1}"></span></td> :class="{'cirOne':item.Hotel==4,'cirTwo':item.Hotel==3,'cirThr':item.Hotel==2,'cirFou':item.Hotel==1}"></span>
<td width='50'><span class="circleAll" :class="{'cirOne':item.Ticket==4,'cirTwo':item.Ticket==3,'cirThr':item.Ticket==2,'cirFou':item.Ticket==1}"></span></td> </td>
<td width='50'><span class="circleAll" :class="{'cirOne':item.TicketCoupons==4,'cirTwo':item.TicketCoupons==3,'cirThr':item.TicketCoupons==2,'cirFou':item.TicketCoupons==1}"></span></td> <td width='50'><span class="circleAll"
<td width='50'><span class="circleAll" :class="{'cirOne':item.Bus==4,'cirTwo':item.Bus==3,'cirThr':item.Bus==2,'cirFou':item.Bus==1}"></span></td> :class="{'cirOne':item.Dining==4,'cirTwo':item.Dining==3,'cirThr':item.Dining==2,'cirFou':item.Dining==1}"></span>
<td width='50'><span class="circleAll" :class="{'cirOne':item.Leader==4,'cirTwo':item.Leader==3,'cirThr':item.Leader==2,'cirFou':item.Leader==1}"></span></td> </td>
<td width='50'><span class="circleAll"
:class="{'cirOne':item.Ticket==4,'cirTwo':item.Ticket==3,'cirThr':item.Ticket==2,'cirFou':item.Ticket==1}"></span>
</td>
<td width='50'><span class="circleAll"
:class="{'cirOne':item.TicketCoupons==4,'cirTwo':item.TicketCoupons==3,'cirThr':item.TicketCoupons==2,'cirFou':item.TicketCoupons==1}"></span>
</td>
<td width='50'><span class="circleAll"
:class="{'cirOne':item.Bus==4,'cirTwo':item.Bus==3,'cirThr':item.Bus==2,'cirFou':item.Bus==1}"></span>
</td>
<td width='50'><span class="circleAll"
:class="{'cirOne':item.Leader==4,'cirTwo':item.Leader==3,'cirThr':item.Leader==2,'cirFou':item.Leader==1}"></span>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -465,7 +481,8 @@ ...@@ -465,7 +481,8 @@
<div class="inventoryBtm clearfix"> <div class="inventoryBtm clearfix">
<div v-for="item in ThirtyStock" :key="item.subCode"> <div v-for="item in ThirtyStock" :key="item.subCode">
<span class="invnTitle">{{item.OrderTypeStr}}</span> <span class="invnTitle">{{item.OrderTypeStr}}</span>
<div class="invenCircle" :class="{'inventOne':item.RemainingInventory>=0&&item.RemainingInventory<=10,'inventTwo':item.RemainingInventory>10&&item.RemainingInventory<20,'inventThr':item.RemainingInventory>=20}"> <div class="invenCircle"
:class="{'inventOne':item.RemainingInventory>=0&&item.RemainingInventory<=10,'inventTwo':item.RemainingInventory>10&&item.RemainingInventory<20,'inventThr':item.RemainingInventory>=20}">
{{item.RemainingInventory}} {{item.RemainingInventory}}
</div> </div>
<span class="lastDiv">平均每天用量<span class="EveryDayCount">{{item.EveryDayCount}}</span></span> <span class="lastDiv">平均每天用量<span class="EveryDayCount">{{item.EveryDayCount}}</span></span>
...@@ -479,9 +496,9 @@ ...@@ -479,9 +496,9 @@
</template> </template>
<script> <script>
import leftNav from "../public/leftNav.vue"; import leftNav from "../public/leftNav.vue";
import regexUtils from "../../assets/utils/regexUtils"; //引入正则验证 import regexUtils from "../../assets/utils/regexUtils"; //引入正则验证
export default { export default {
data() { data() {
return { return {
loading: true, loading: true,
...@@ -556,8 +573,9 @@ export default { ...@@ -556,8 +573,9 @@ export default {
}); });
}, },
chartsMap() { chartsMap() {
var then = this; var chatMapObj = document.getElementById("chartsMap");
let myChart = this.$echarts.init(document.getElementById("chartsMap")); if (chatMapObj) {
let myChart = this.$echarts.init(chatMapObj);
myChart.setOption({ myChart.setOption({
title: { title: {
text: "近七日订单走势", text: "近七日订单走势",
...@@ -623,8 +641,7 @@ export default { ...@@ -623,8 +641,7 @@ export default {
}, //去除网格线 }, //去除网格线
type: "value" type: "value"
}, },
series: [ series: [{
{
name: "本年", name: "本年",
type: "line", type: "line",
smooth: false, smooth: false,
...@@ -645,8 +662,7 @@ export default { ...@@ -645,8 +662,7 @@ export default {
y: 0, y: 0,
x2: 0, x2: 0,
y2: 1, y2: 1,
colorStops: [ colorStops: [{
{
offset: 0, offset: 0,
color: "rgba(230,230,230,0)" // 0% 处的颜色 color: "rgba(230,230,230,0)" // 0% 处的颜色
}, },
...@@ -658,14 +674,14 @@ export default { ...@@ -658,14 +674,14 @@ export default {
globalCoord: false // 缺省为 false globalCoord: false // 缺省为 false
} }
} }
} }]
]
}); });
} }
}
}, },
mounted() { mounted() {
this.initInfo(); this.initInfo();
this.initStatus(); this.initStatus();
} }
}; };
</script> </script>
\ No newline at end of file
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