Skip to content

肖康 / cloudSystem

Go to a project
Commit 05fbed2d by 肖康
Options

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem 

# Conflicts:
#	src/ajax/index.js
parents d8f645ed ef219290
Expand all
Inline Side-by-side
Showing with 65 additions and 56 deletions
src/assets/css/index/index.less
......@@ -190,10 +190,11 @@
padding-left: 10px;
cursor: pointer;
transition: all 0.4s ease;
display: block;
}
&:hover {
.wrap{
.wrap {
transform: translateY(-8px);
}
......@@ -216,20 +217,22 @@
border: 1px solid #E5EBF6;
padding: 10px 10px 12px 12px;
position: relative;
&:hover{
&::after{
&:hover {
&::after {
content: "";
position: absolute;
width:231px;
height:58px;
width: 231px;
height: 58px;
background: url(../../images/tips.png) no-repeat;
background-size: 100% 100%;
left:50%;
top:50%;
left: 50%;
top: 50%;
margin-top: -29px;
margin-left: -115px;
}
}
.top {
.title {
font-size: 16px;
......@@ -238,7 +241,6 @@
}
.tab {
width: 160px;
height: 28px;
background: #F1F4FA;
border-radius: 2px;
......@@ -246,6 +248,8 @@
text-align: center;
li {
width: 52px;
box-sizing: border-box;
font-size: 12px;
color: #646b78;
text-align: center;
......@@ -310,20 +314,22 @@
.box {
flex: 0 0 49.5%;
position: relative;
&:hover{
&::after{
&:hover {
&::after {
content: "";
position: absolute;
width:231px;
height:58px;
width: 231px;
height: 58px;
background: url(../../images/tips.png) no-repeat;
background-size: 100% 100%;
left:50%;
top:50%;
left: 50%;
top: 50%;
margin-top: -29px;
margin-left: -115px;
}
}
.head {
padding-right: 100px;
......@@ -363,6 +369,7 @@
.list {
width: 100%;
border: 1px solid #E5EBF6;
tr {
th {
height: 44px;
......@@ -378,7 +385,8 @@
background: #FFFFFF;
font-size: 12px;
color: #333333;
&.first{
&.first {
text-align: center;
}
}
......@@ -438,7 +446,6 @@
.params-wrap {
.tabs {
margin-right: 9px;
width: 160px;
height: 28px;
background: #F1F4FA;
border-radius: 2px;
......@@ -446,6 +453,8 @@
text-align: center;
li {
width: 40px;
box-sizing: border-box;
font-size: 12px;
color: #646b78;
text-align: center;
......@@ -481,16 +490,17 @@
.box1 {
width: 80%;
position: relative;
&:hover{
&::after{
&:hover {
&::after {
content: "";
position: absolute;
width:231px;
height:58px;
width: 231px;
height: 58px;
background: url(../../images/tips.png) no-repeat;
background-size: 100% 100%;
left:50%;
top:50%;
left: 50%;
top: 50%;
margin-top: -89px;
margin-left: -115px;
}
......
src/views/Index/index.vue
<template>
<div class="home-index boxsiz">
<Menu />
<Menu/>
<ul class="survey-top row bothSide">
<li class="boxsiz">
<p class="top row bothSide verCenter">
......@@ -61,46 +61,46 @@
</li>
</ul>
<ul class="survey-show row avarage boxsiz">
<li class="column boxsiz">
<a class="wrap" href="/#/enter">
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/enter">
<i class="iconfont iconjinzhi"></i>
<p class="t1">未通过SKU</p>
</a>
<span class="color1 rowCenter verCenter">{{data.reject_sku_count}}</span>
</li>
<li class="column boxsiz">
<a class="wrap" href="/#/list">
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/list">
<i class="iconfont iconclose"></i>
<p class="t1">下架SKU</p>
</a>
<span class="color2">{{data.off_shelf_sku_count}}</span>
</li>
<li class="column boxsiz">
<a class="wrap" href="/#/inquire">
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/inquire">
<i class="iconfont iconjinzhi1"></i>
<p class="t1">待报价</p>
</a>
<span class="color3">{{data.weekly_inquiry_ready_count}}</span>
</li>
<li class="column boxsiz">
<a class="wrap" href="/#/quote">
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/quote">
<i class="iconfont iconjinzhi2"></i>
<p class="t1">已选中报价</p>
</a>
<span class="color4">{{data.weekly_quote_selected_count}}</span>
</li>
<li class="column boxsiz">
<a class="wrap" href="/#/quote">
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/quote">
<i class="iconfont iconjinzhi2"></i>
<p class="t1">已成单报价</p>
</a>
<span class="color5">{{data.weekly_quote_deal_count}}</span>
</li>
<li class="column rowCenter verCenter boxsiz">
<div class="wrap">
<li class="boxsiz">
<a class="wrap boxsiz">
<i class="iconfont iconjinzhi3 "></i>
<p class="t2">未完待续</p>
</div>
</a>
</li>
</ul>
<div class="rate-box boxsiz">
......@@ -165,7 +165,7 @@
<td>3</td>
</tr>
<tr>
<td class="first" >1</td>
<td class="first">1</td>
<td>NRF51822-QFAA-NRF51822</td>
<td>NORDIC</td>
<td>3</td>
......@@ -207,7 +207,7 @@
</div>
<div class="box2">
<p class="t1">单个型号询报价总数分析</p>
<input type="text" placeholder="请输入型号" class="inp boxsiz" />
<input type="text" placeholder="请输入型号" class="inp boxsiz"/>
<div id="echarts_box2" style="width: 100%;height:200px;"></div>
</div>
</div>
......@@ -225,7 +225,8 @@
Message,
DatePicker
} from 'element-ui';
Vue.prototype.$message=Message
Vue.prototype.$message = Message
Vue.use(Form).use(FormItem).use(DatePicker);
......@@ -239,9 +240,9 @@
"weekly_spu_count": 100,
"all_sku_count": 100,
"reject_sku_count": 100,
"weekly_quote_deal_count":100,
"weekly_quote_deal_count": 100,
"off_shelf_sku_count": 100,
"weekly_quote_count":100,
"weekly_quote_count": 100,
"brand_count": 100,
"weekly_sku_count": 100,
"all_spu_count": 100,
......@@ -253,9 +254,19 @@
},
watch: {},
created() {
this.getData()
},
mounted() {
var self = this;
this.getData();
window.onresize = function () {
console.log('test')
self.getData();
};
},
methods: {
getData() {
var myChart = echarts.init(document.getElementById('echarts_box'));
var myChart1 = echarts.init(document.getElementById('echarts_box1'));
var myChart2 = echarts.init(document.getElementById('echarts_box2'));
......@@ -333,18 +344,6 @@
myChart.setOption(option);
myChart1.setOption(option);
myChart2.setOption(option1);
},
methods: {
getData() {
this.$http('get', "/api/statistics/index", {}).then(res => {
if (res.err_code === 0) {
this.data = res.data
} else {
this.$message(res.err_msg);
}
})
}
},
components: {
......
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 sign in to comment