成品发货
This commit is contained in:
parent
14d426b020
commit
5695c3db90
4
.env.dev
4
.env.dev
@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统
|
|||||||
|
|
||||||
# 芋道管理系统/开发环境
|
# 芋道管理系统/开发环境
|
||||||
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
|
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
|
||||||
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
|
VUE_APP_BASE_API = 'http://192.168.4.173:48080'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
|
# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
|
# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
|
# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
|
||||||
|
@ -35,34 +35,39 @@
|
|||||||
<el-tabs v-model="activeName" @tab-click="toggleTab">
|
<el-tabs v-model="activeName" @tab-click="toggleTab">
|
||||||
<el-tab-pane label="数据列表" name="dataList">
|
<el-tab-pane label="数据列表" name="dataList">
|
||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<base-table
|
<div v-if="activeName === 'dataList'">
|
||||||
:page="queryParams.pageNo"
|
<base-table
|
||||||
:limit="queryParams.pageSize"
|
:page="queryParams.pageNo"
|
||||||
:table-props="tableProps"
|
:limit="queryParams.pageSize"
|
||||||
:table-data="tableData"
|
:table-props="tableProps"
|
||||||
:max-height="tableH"
|
:table-data="tableData"
|
||||||
>
|
:max-height="tableH"
|
||||||
<method-btn
|
>
|
||||||
v-if="tableBtn.length"
|
<method-btn
|
||||||
slot="handleBtn"
|
v-if="tableBtn.length"
|
||||||
:width="150"
|
slot="handleBtn"
|
||||||
label="操作"
|
:width="150"
|
||||||
:method-list="tableBtn"
|
label="操作"
|
||||||
@clickBtn="viewDetDetail"
|
:method-list="tableBtn"
|
||||||
|
@clickBtn="viewDetDetail"
|
||||||
|
/>
|
||||||
|
</base-table>
|
||||||
|
<pagination
|
||||||
|
:page.sync="queryParams.pageNo"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
:total="total"
|
||||||
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
</base-table>
|
</div>
|
||||||
<pagination
|
|
||||||
:page.sync="queryParams.pageNo"
|
|
||||||
:limit.sync="queryParams.pageSize"
|
|
||||||
:total="total"
|
|
||||||
@pagination="getList"
|
|
||||||
/>
|
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="环形图" name="barChart">
|
<el-tab-pane label="环形图" name="barChart">
|
||||||
<div
|
<div v-if="activeName === 'barChart'">
|
||||||
id="logDetPieBar"
|
<div
|
||||||
style="width: 182px; height: 180px;"
|
id="logDetPieBar"
|
||||||
></div>
|
style="width: 100%"
|
||||||
|
:style="{ height: chartHeight + 'px' }"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</div>
|
</div>
|
||||||
@ -110,6 +115,8 @@
|
|||||||
<script>
|
<script>
|
||||||
import { deliveryLogPage, deliveryLogDetPage } from '@/api/base/delivery'
|
import { deliveryLogPage, deliveryLogDetPage } from '@/api/base/delivery'
|
||||||
import { parseTime } from '@/utils/ruoyi'
|
import { parseTime } from '@/utils/ruoyi'
|
||||||
|
import * as echarts from 'echarts'
|
||||||
|
import resize from '@/utils/chartMixins/resize'
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: 'deliveryTime',
|
prop: 'deliveryTime',
|
||||||
@ -182,6 +189,7 @@ const tableProps2 = [
|
|||||||
]
|
]
|
||||||
export default {
|
export default {
|
||||||
name: 'DeliveryLogDetDetail',
|
name: 'DeliveryLogDetDetail',
|
||||||
|
mixins: [resize],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
centervisible: false,
|
centervisible: false,
|
||||||
@ -195,6 +203,7 @@ export default {
|
|||||||
orderMsg: {},
|
orderMsg: {},
|
||||||
tableProps,
|
tableProps,
|
||||||
tableData: [],
|
tableData: [],
|
||||||
|
total: 0,
|
||||||
tableH: this.tableHeight(350),
|
tableH: this.tableHeight(350),
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:group-team:update')
|
this.$auth.hasPermi('base:group-team:update')
|
||||||
@ -215,9 +224,18 @@ export default {
|
|||||||
tableData2: [],
|
tableData2: [],
|
||||||
tableH2: this.tableHeight(275),
|
tableH2: this.tableHeight(275),
|
||||||
total2: 0,
|
total2: 0,
|
||||||
logCode: ''
|
logCode: '',
|
||||||
|
// 图
|
||||||
|
chartDom: '',
|
||||||
|
chart: '',
|
||||||
|
chartHeight: this.tableHeight(300)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// watch: {
|
||||||
|
// chartData: function () {
|
||||||
|
// this.getChart()
|
||||||
|
// }
|
||||||
|
// },
|
||||||
mounted() {
|
mounted() {
|
||||||
window.addEventListener('resize', () => {
|
window.addEventListener('resize', () => {
|
||||||
this.tableH = this.tableHeight(350)
|
this.tableH = this.tableHeight(350)
|
||||||
@ -225,6 +243,9 @@ export default {
|
|||||||
window.addEventListener('resize', () => {
|
window.addEventListener('resize', () => {
|
||||||
this.tableH2 = this.tableHeight(275)
|
this.tableH2 = this.tableHeight(275)
|
||||||
})
|
})
|
||||||
|
window.addEventListener('resize', () => {
|
||||||
|
this.chartHeight = this.tableHeight(300)
|
||||||
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
init(params) {
|
init(params) {
|
||||||
@ -236,13 +257,87 @@ export default {
|
|||||||
getList() {
|
getList() {
|
||||||
deliveryLogPage({...this.queryParams}).then(res => {
|
deliveryLogPage({...this.queryParams}).then(res => {
|
||||||
this.tableData = res.data.list || []
|
this.tableData = res.data.list || []
|
||||||
|
this.taotal = res.data.total || 0
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
toggleTab() {
|
toggleTab() {
|
||||||
|
if (this.activeName === 'barChart') {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.getBar()
|
||||||
|
})
|
||||||
|
}
|
||||||
},
|
},
|
||||||
getBar() {
|
getBar() {
|
||||||
|
if (
|
||||||
|
this.chart !== null &&
|
||||||
|
this.chart !== '' &&
|
||||||
|
this.chart !== undefined
|
||||||
|
) {
|
||||||
|
this.chart.dispose() // 页面多次刷新会出现警告,Dom已经初始化了一个实例,这是销毁实例
|
||||||
|
}
|
||||||
|
this.chartDom = document.getElementById('logDetPieBar')
|
||||||
|
this.chart = echarts.init(this.chartDom)
|
||||||
|
let seriesData = []
|
||||||
|
let sumData = 0
|
||||||
|
this.tableData && this.tableData.map(item =>{
|
||||||
|
let obj = {}
|
||||||
|
obj.value = item.rate
|
||||||
|
obj.name = item.name
|
||||||
|
seriesData.push(obj)
|
||||||
|
sumData+=item.rate
|
||||||
|
})
|
||||||
|
if (sumData < 100) {
|
||||||
|
let obj = {}
|
||||||
|
obj.value = 100 - sumData
|
||||||
|
obj.name = "未发货"
|
||||||
|
seriesData.push(obj)
|
||||||
|
}
|
||||||
|
var option = {
|
||||||
|
color: ['#B0EB42', '#FF9747', '#FF6860', '#7164FF', '#288AFF', '#63BDFF', '#73DE93', '#FFCE6A'],
|
||||||
|
tooltip: {
|
||||||
|
trigger: 'item',
|
||||||
|
formatter: function(params) {
|
||||||
|
let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${params.color};"></span>`
|
||||||
|
return `<span>
|
||||||
|
<span style="color:rgba(0,0,0,0.85);">${str}${params.name}</span>
|
||||||
|
<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${params.percent}</span>
|
||||||
|
</span>`
|
||||||
|
}
|
||||||
|
},
|
||||||
|
legend: {
|
||||||
|
bottom: '5%',
|
||||||
|
left: 'center',
|
||||||
|
icon: 'rect',
|
||||||
|
itemHeight: 8,
|
||||||
|
itemWidth: 8
|
||||||
|
},
|
||||||
|
series: [
|
||||||
|
{
|
||||||
|
type: 'pie',
|
||||||
|
radius: ['60%', '80%'],
|
||||||
|
avoidLabelOverlap: false,
|
||||||
|
label: {
|
||||||
|
show: false,
|
||||||
|
position: 'center'
|
||||||
|
},
|
||||||
|
emphasis: {
|
||||||
|
label: {
|
||||||
|
show: true,
|
||||||
|
fontSize: 40,
|
||||||
|
fontWeight: 'bold'
|
||||||
|
},
|
||||||
|
scale: true ,
|
||||||
|
scaleSize: 20 ,
|
||||||
|
},
|
||||||
|
labelLine: {
|
||||||
|
show: false
|
||||||
|
},
|
||||||
|
data: seriesData
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
option && this.chart.setOption(option);
|
||||||
},
|
},
|
||||||
viewDetDetail(val) {
|
viewDetDetail(val) {
|
||||||
this.logCode = val.data.code
|
this.logCode = val.data.code
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
|
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="关联表名">
|
<el-form-item label="关联表名">
|
||||||
@ -94,6 +94,7 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
|
drawerTitle: '',
|
||||||
tableProps,
|
tableProps,
|
||||||
tableData: [],
|
tableData: [],
|
||||||
tableBtn: [],
|
tableBtn: [],
|
||||||
@ -131,9 +132,11 @@ export default {
|
|||||||
this.objName = data.objName
|
this.objName = data.objName
|
||||||
this.getList()
|
this.getList()
|
||||||
if (title === 'detail') {
|
if (title === 'detail') {
|
||||||
|
this.drawerTitle = '查看参数'
|
||||||
this.showBtn = false
|
this.showBtn = false
|
||||||
this.tableBtn = []
|
this.tableBtn = []
|
||||||
} else {
|
} else {
|
||||||
|
this.drawerTitle = '参数绑定'
|
||||||
this.showBtn = true
|
this.showBtn = true
|
||||||
this.tableBtn = [
|
this.tableBtn = [
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
|
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="方案名称">
|
<el-form-item label="方案名称">
|
||||||
@ -85,6 +85,7 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
|
drawerTitle: '',
|
||||||
tableProps,
|
tableProps,
|
||||||
tableData: [],
|
tableData: [],
|
||||||
tableBtn: [],
|
tableBtn: [],
|
||||||
@ -125,9 +126,11 @@ export default {
|
|||||||
this.energyTypeId = data.energyTypeId
|
this.energyTypeId = data.energyTypeId
|
||||||
this.getList()
|
this.getList()
|
||||||
if (title === 'detail') {
|
if (title === 'detail') {
|
||||||
|
this.drawerTitle = '查看参数'
|
||||||
this.showBtn = false
|
this.showBtn = false
|
||||||
this.tableBtn = []
|
this.tableBtn = []
|
||||||
} else {
|
} else {
|
||||||
|
this.drawerTitle = '参数绑定'
|
||||||
this.showBtn = true
|
this.showBtn = true
|
||||||
this.tableBtn = [
|
this.tableBtn = [
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user