pull/6/head
dt_2916866708 10 months ago
parent 34c299108c
commit 38a04d24b4
  1. 19
      src/views/product/productAdd/newIndex.vue
  2. 93
      src/views/statistics/searchStatisticsList.vue
  3. 2
      vue.config.js

@ -556,11 +556,17 @@ export default {
}else{
return null
}
// return Boolean(this.formValidate.checkedList.filter(i=>item.id==i.attributeId).length)
}).filter(item=>item)
this.ManyAttrValue = this.ManyAttrValue.map(item=>{
}).filter(item=>item);
setTimeout(() => {
this.ManyAttrValue.forEach((item,index)=>{
let data = this.formValidate.stockList.find(i=>i.attributeJson==JSON.stringify(item.data))
if(data){
Object.assign(item,data);
console.log(data,item,"datadatadatadata")
}
})
}, 1000);
})
},
@ -1127,14 +1133,15 @@ export default {
}
});
let stockList = this.ManyAttrValue.map(item => {
let { marketPrice = "", sellPrice = "", stock = "", integral = "", skuNum = "" } = item;
let { marketPrice = "", sellPrice = "", stock = "", integral = "", skuNum = "",id=""} = item;
return {
attributeJson: JSON.stringify(item.data),
marketPrice,
sellPrice,
stock,
integral,
skuNum
skuNum,
id
}
})
console.log(this.formValidate, "formValidate");

@ -1,5 +1,6 @@
<template>
<div class="article-manager">
<div style="width: 100%; height:500px" id="chart"></div>
<el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
<!-- <div >
<el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent class="mt16">
@ -26,16 +27,8 @@
<el-button type="primary" class="bnt" @click="refresh()">刷新</el-button>
<el-button class="export" @click="exports">导出</el-button>
</div>
<el-table
:data="tableList"
class="ivu-mt mt14"
v-loading="loading"
highlight-current-row
:row-key="getRowKey"
border
@selection-change="handleSelectRow"
empty-text="暂无数据"
>
<el-table :data="tableList" class="ivu-mt mt14" v-loading="loading" highlight-current-row :row-key="getRowKey"
border @selection-change="handleSelectRow" empty-text="暂无数据">
<el-table-column label="商品名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.searchInfo }}</span>
@ -76,15 +69,9 @@
</el-table-column>
</el-table>
<div class="acea-row row-right page">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-sizes="[10, 15, 20, 30]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.totalCount"
/>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page="page.currentPage" :page-sizes="[10, 15, 20, 30]" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="page.totalCount" />
</div>
</el-card>
</div>
@ -92,7 +79,7 @@
<script>
import marketingApi from '@/api/finance/marketing.js'
import echarts from "echarts";
export default {
name: 'product_productList',
@ -130,15 +117,66 @@ export default {
this.getList()
},
activated() {},
mounted() {
this.echartsInit()
},
activated() { },
methods: {
echartsInit() {
var myChart = echarts.init(document.getElementById('chart'));
let option = {
title: {
text: '一级分类商品',
// subtext: 'Fake Data',
left: 'center'
},
tooltip: {
trigger: 'item'
},
legend: {
// orient: 'vertical',
bottom: "20"
},
series: [
{
type: 'pie',
radius: '50%',
center: ['25%', '50%'],
data: [
{ value: 335, name: '彩妆' },
{ value: 310, name: '留学' },
{ value: 310, name: '派遣玉缘轩' },
{ value: 310, name: '法律服务' },
{ value: 310, name: '食品' }
]
},
{
type: 'pie',
radius: '50%',
center: ['75%', '50%'],
data: [
{ value: 310, name: '餐饮' },
{ value: 310, name: '酒水汽车' },
{ value: 310, name: '厨具家电男装' },
{ value: 310, name: '口腔护理洗护' },
{ value: 310, name: '学习' }
]
}
]
};
myChart.setOption(option);
//
window.onresize = function () {
myChart.resize();
};
},
closeLabel(label) {
let index = this.dataLabel.indexOf(this.dataLabel.filter(d => d.id == label.id)[0])
this.dataLabel.splice(index, 1)
},
getPath() {},
getPath() { },
//
async exports() {
let [th, filekey, data, fileName] = [[], [], [], '']
@ -162,7 +200,7 @@ export default {
}
}
},
getExcelData(excelData) {},
getExcelData(excelData) { },
getRowKey(row) {
return row.id
@ -203,7 +241,7 @@ export default {
this.getList()
},
//
exportData: function() {},
exportData: function () { },
//
detail(row) {
@ -232,6 +270,7 @@ export default {
height: 54px !important;
line-height: 54px !important;
}
::v-deep .ivu-modal-mask {
z-index: 999 !important;
}
@ -321,19 +360,23 @@ export default {
font-size: 12px;
}
}
.el-dropdown-link {
cursor: pointer;
color: var(--prev-color-primary);
font-size: 12px;
}
.el-icon-arrow-down {
font-size: 12px;
}
.el-dropdown-menu__item {
a {
color: #606266;
}
}
.label_width {
width: 400px;
}

@ -25,7 +25,7 @@ module.exports = {
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: `cls`,
target: `http://192.168.0.24:38080`,
target: `http://192.168.0.254:38080`,
// target: `http://192.168.0.22:38080`,
// target: `http://192.168.1.83:38080`,
// target: 'http://222.132.26.119:8081',

Loading…
Cancel
Save