Compare commits
No commits in common. "ea04d55fc1e35232c370143512ce2ed1bbdfb0af" and "bdd14eec703463e00f32c5ce4b92a4f55141cab2" have entirely different histories.
ea04d55fc1
...
bdd14eec70
6
.env.dev
6
.env.dev
@ -25,10 +25,8 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
|||||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
||||||
# socket地址
|
# socket地址
|
||||||
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
|
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
|
||||||
# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
|
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
|
||||||
VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
|
|
||||||
VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080'
|
|
||||||
|
|
||||||
# 积木报表指向地址
|
# 积木报表指向地址
|
||||||
VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
|
VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2023-08-01 14:55:51
|
* @Date: 2023-08-01 14:55:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-08 11:49:33
|
* @LastEditTime: 2024-02-28 10:38:34
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -128,7 +128,7 @@ export default {
|
|||||||
param: 'createTime',
|
param: 'createTime',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:packaging-print-log:query') ? 'button' : '',
|
type: 'button',
|
||||||
btnName: '搜索',
|
btnName: '搜索',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -1,23 +1,24 @@
|
|||||||
|
<!--
|
||||||
|
filename: MaterialCost.vue
|
||||||
|
author: liubin
|
||||||
|
date: 2023-12-06 09:09:27
|
||||||
|
description:
|
||||||
|
-->
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<Container
|
<Container name="原料用量统计" size="middle" style="">
|
||||||
name="原料用量统计"
|
<div style="flex: 1; display: flex; gap: 8px;flex-direction: column;">
|
||||||
size="middle"
|
|
||||||
style="">
|
|
||||||
<div style="flex: 1; display: flex; gap: 8px; flex-direction: column">
|
|
||||||
<div
|
<div
|
||||||
class="absolute"
|
class="absolute"
|
||||||
style="
|
style="
|
||||||
flex: 2;
|
flex:3;
|
||||||
padding: 12px 12px 0 12px;
|
padding: 12px 12px 0 12px;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(2, 1fr);
|
grid-template-columns: repeat(3, 1fr);
|
||||||
grid-auto-rows: repeat(4, 1fr);
|
grid-auto-rows: repeat(4, 1fr);
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
">
|
">
|
||||||
<ShadowRect
|
<ShadowRect v-for="(item, index) in materialMsg1" :key="index" :rounded="false">
|
||||||
v-for="(item, index) in materialMsg"
|
|
||||||
:key="index"
|
|
||||||
:rounded="false">
|
|
||||||
<div
|
<div
|
||||||
class="material"
|
class="material"
|
||||||
style="
|
style="
|
||||||
@ -29,24 +30,43 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
">
|
">
|
||||||
<span
|
<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
|
||||||
style="
|
{{item.materialUsed}}
|
||||||
color: #0ee8e4;
|
|
||||||
font-weight: 500;
|
|
||||||
font-size: 32px;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
">
|
|
||||||
{{ item.materialUsed }}
|
|
||||||
</span>
|
</span>
|
||||||
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
|
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
|
||||||
- {{ item.materialName }}/kg-
|
- {{item.materialName}}/kg-
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</ShadowRect>
|
||||||
|
</div>
|
||||||
|
<div style="flex:1;
|
||||||
|
padding: 0 12px 12px 12px;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
gap: 8px;">
|
||||||
|
<ShadowRect v-for="(item, index) in materialMsg2" :key="index" :rounded="false">
|
||||||
|
<div
|
||||||
|
class="material"
|
||||||
|
style="
|
||||||
|
flex: 1;
|
||||||
|
padding-bottom: 3px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
">
|
||||||
|
<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
|
||||||
|
{{item.materialUsed}}
|
||||||
|
</span>
|
||||||
|
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
|
||||||
|
- {{item.materialName}}/kg-
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</ShadowRect>
|
</ShadowRect>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</Container>
|
</Container>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -61,9 +81,12 @@ export default {
|
|||||||
return {};
|
return {};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
materialMsg() {
|
materialMsg1() {
|
||||||
return this.$store.state.websocket.material;
|
return this.$store.state.websocket.material.slice(0,9)
|
||||||
},
|
},
|
||||||
|
materialMsg2() {
|
||||||
|
return this.$store.state.websocket.material.slice(9)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {},
|
methods: {},
|
||||||
};
|
};
|
||||||
|
|||||||
@ -112,7 +112,7 @@ export default {
|
|||||||
param: 'code',
|
param: 'code',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:process-equ-material-bom:query') ? 'button' : '',
|
type: 'button',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -113,7 +113,7 @@ export default {
|
|||||||
param: 'code',
|
param: 'code',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:process-equ-value-bom:query') ? 'button' : '',
|
type: 'button',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -135,7 +135,7 @@ export default {
|
|||||||
width: 250
|
width: 250
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:quality-hot-material:query') ? 'button' : '',
|
type: 'button',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
@ -144,7 +144,7 @@ export default {
|
|||||||
type: 'separate',
|
type: 'separate',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',
|
type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
color: 'success',
|
color: 'success',
|
||||||
|
|||||||
@ -131,7 +131,7 @@ export default {
|
|||||||
// width: 350,
|
// width: 350,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:quality-isra-statistics:query') ? 'button' : '',
|
type: this.$auth.hasPermi(' base: quality - isra - statistics: query') ? 'button' : '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
@ -207,16 +207,15 @@ export default {
|
|||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
let mapArr= []
|
let mapArr= []
|
||||||
let mapLegendData = []
|
let mapLegendData = []
|
||||||
let obj = {
|
|
||||||
name: '',
|
|
||||||
type: 'line',
|
|
||||||
// stack: 'Total',
|
|
||||||
data: [],
|
|
||||||
mapXAxisData: [],
|
|
||||||
}
|
|
||||||
// let mapXAxisData = []
|
// let mapXAxisData = []
|
||||||
for (let i in res.data) {
|
for (let i in res.data) {
|
||||||
|
let obj = {
|
||||||
|
name: '',
|
||||||
|
type: 'line',
|
||||||
|
// stack: 'Total',
|
||||||
|
data: [],
|
||||||
|
mapXAxisData:[],
|
||||||
|
}
|
||||||
// console.log(i)
|
// console.log(i)
|
||||||
let dataArr = []
|
let dataArr = []
|
||||||
res.data[i].forEach(ele => {
|
res.data[i].forEach(ele => {
|
||||||
@ -228,7 +227,6 @@ export default {
|
|||||||
mapLegendData.push(i)
|
mapLegendData.push(i)
|
||||||
mapArr.push(obj)
|
mapArr.push(obj)
|
||||||
}
|
}
|
||||||
console.log(mapArr);
|
|
||||||
// console.log(res.data[res]);
|
// console.log(res.data[res]);
|
||||||
var chartDom = this.activeName === 'day' ? document.getElementById('mapDayMain') : this.activeName === 'week' ? document.getElementById('mapWeekMain') : document.getElementById('mapMonthMain')
|
var chartDom = this.activeName === 'day' ? document.getElementById('mapDayMain') : this.activeName === 'week' ? document.getElementById('mapWeekMain') : document.getElementById('mapMonthMain')
|
||||||
var myChart = echarts.init(chartDom);
|
var myChart = echarts.init(chartDom);
|
||||||
@ -269,7 +267,6 @@ export default {
|
|||||||
},
|
},
|
||||||
series: mapArr
|
series: mapArr
|
||||||
}
|
}
|
||||||
myChart.clear()
|
|
||||||
option && myChart.setOption(option);
|
option && myChart.setOption(option);
|
||||||
})
|
})
|
||||||
this.$axios({
|
this.$axios({
|
||||||
@ -377,7 +374,6 @@ export default {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
myChart.clear()
|
|
||||||
option && myChart.setOption(option);
|
option && myChart.setOption(option);
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@ -119,7 +119,7 @@ export default {
|
|||||||
// filterable: true
|
// filterable: true
|
||||||
// },
|
// },
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:quality-scrap-det:query') ? 'button' : '',
|
type: 'button',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -218,11 +218,7 @@ export default {
|
|||||||
width: 350,
|
width: 350,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi(
|
type: 'button',
|
||||||
'monitoring:device-parameters:query'
|
|
||||||
)
|
|
||||||
? 'button'
|
|
||||||
: '',
|
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -260,24 +260,17 @@ export default {
|
|||||||
// ],
|
// ],
|
||||||
// },
|
// },
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi(
|
type: 'button',
|
||||||
'monitoring:equipment-traceability:query'
|
|
||||||
)
|
|
||||||
? 'button'
|
|
||||||
: '',
|
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi(
|
type: 'button',
|
||||||
'monitoring:equipment-traceability:export'
|
|
||||||
)
|
|
||||||
? 'button'
|
|
||||||
: '',
|
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
name: 'export',
|
name: 'export',
|
||||||
color: 'warning',
|
color: 'warning',
|
||||||
|
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// type: 'separate',
|
// type: 'separate',
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2023-08-01 14:55:51
|
* @Date: 2023-08-01 14:55:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-07 16:19:18
|
* @LastEditTime: 2024-03-29 14:08:18
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -84,21 +84,21 @@ export default {
|
|||||||
// },
|
// },
|
||||||
tableProps,
|
tableProps,
|
||||||
// tableH: this.tableHeight(260),
|
// tableH: this.tableHeight(260),
|
||||||
// tableBtn: [
|
tableBtn: [
|
||||||
// this.$auth.hasPermi(`base:packaging-print-log:update`)
|
this.$auth.hasPermi(`base:packaging-print-log:update`)
|
||||||
// ? {
|
? {
|
||||||
// type: 'edit',
|
type: 'edit',
|
||||||
// btnName: '编辑',
|
btnName: '编辑',
|
||||||
// }
|
}
|
||||||
// : undefined,
|
: undefined,
|
||||||
// this.$auth.hasPermi(`base:packaging-print-log:delete`)
|
this.$auth.hasPermi(`base:packaging-print-log:delete`)
|
||||||
// ? {
|
? {
|
||||||
// type: 'delete',
|
type: 'delete',
|
||||||
// btnName: '删除',
|
btnName: '删除',
|
||||||
// }
|
}
|
||||||
// : undefined,
|
: undefined,
|
||||||
|
|
||||||
// ].filter((v) => v),
|
].filter((v) => v),
|
||||||
list: [],
|
list: [],
|
||||||
listQuery: {
|
listQuery: {
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
@ -131,7 +131,7 @@ export default {
|
|||||||
width: 250
|
width: 250
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
|
type: 'button',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2023-08-01 14:55:51
|
* @Date: 2023-08-01 14:55:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-07 16:25:19
|
* @LastEditTime: 2024-03-29 14:08:30
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -147,8 +147,7 @@ export default {
|
|||||||
// width: 250
|
// width: 250
|
||||||
// },
|
// },
|
||||||
{
|
{
|
||||||
|
type: 'button',
|
||||||
type: this.$auth.hasPermi('monitoring:rawMaterial-traceability:query') ? 'button' : '',
|
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2023-08-01 14:55:51
|
* @Date: 2023-08-01 14:55:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-07 16:26:56
|
* @LastEditTime: 2024-03-29 15:32:33
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -135,12 +135,7 @@ export default {
|
|||||||
width: 250
|
width: 250
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
type: 'button',
|
||||||
type: this.$auth.hasPermi(
|
|
||||||
'monitoring:process-traceability:query'
|
|
||||||
)
|
|
||||||
? 'button'
|
|
||||||
: '',
|
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -159,11 +159,7 @@ export default {
|
|||||||
// width: 350,
|
// width: 350,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi(
|
type: 'button',
|
||||||
'base:quality-inspection-record:query'
|
|
||||||
)
|
|
||||||
? 'button'
|
|
||||||
: '',
|
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-01-24 15:15:24
|
* @Date: 2024-01-24 15:15:24
|
||||||
* @LastEditTime: 2024-04-08 11:47:39
|
* @LastEditTime: 2024-03-27 09:27:23
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -18,8 +18,8 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
||||||
@click="getDataList">查询</el-button>
|
@click="getDataList">查询</el-button>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('report:glass-day:export')" type="primary" size="small" plain
|
||||||
plain @click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -9,8 +9,8 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
||||||
@click="getDataList">查询</el-button>
|
@click="getDataList">查询</el-button>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
|
||||||
plain @click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
||||||
@click="getDataList">查询</el-button>
|
@click="getDataList">查询</el-button>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('report:glass-weekly:export')" type="primary" size="small" plain
|
||||||
plain @click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -11,8 +11,8 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
|
||||||
@click="getDataList">查询</el-button>
|
@click="getDataList">查询</el-button>
|
||||||
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
|
<el-button v-if="this.$auth.hasPermi('report:glass-year:export')" type="primary" size="small" plain
|
||||||
plain @click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-04-08 11:45:52
|
* @LastEditTime: 2024-03-29 09:48:32
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -12,9 +12,8 @@
|
|||||||
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
|
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
|
<el-button type="primary" @click="getDataList()">查询</el-button>
|
||||||
</el-button>
|
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
|
||||||
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
|
|
||||||
@click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<el-row style="float: right; margin-bottom: 5px">
|
||||||
@ -29,122 +28,122 @@
|
|||||||
<el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center">
|
<el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center">
|
||||||
<el-table-column prop="lineId" label="生产线" align="center">
|
<el-table-column prop="lineId" label="生产线" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.lineName }} </span>
|
<span v-else>{{ scope.row.lineName }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="投入数㎡" align="center">
|
<el-table-column label="投入数㎡" align="center">
|
||||||
<el-table-column prop="inputNow" label="本月" align="center">
|
<el-table-column prop="inputNow" label="本月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputNow }} </span>
|
<span v-else>{{ scope.row.inputNow }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="inputHis" label="上月" align="center">
|
<el-table-column prop="inputHis" label="上月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputHis }} </span>
|
<span v-else>{{ scope.row.inputHis }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
|
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
|
||||||
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
|
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="完成良品产量" align="center">
|
<el-table-column label="完成良品产量" align="center">
|
||||||
<el-table-column prop="goodProductNow" label="本月" align="center">
|
<el-table-column prop="goodProductNow" label="本月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductNow }} </span>
|
<span v-else>{{ scope.row.goodProductNow }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductHis" label="上月" align="center">
|
<el-table-column prop="goodProductHis" label="上月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductHis }} </span>
|
<span v-else>{{ scope.row.goodProductHis }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductTrend" label="增减" align="center">
|
<el-table-column prop="goodProductTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
|
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
|
||||||
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
|
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="原片漏检率" align="center">
|
<el-table-column label="原片漏检率" align="center">
|
||||||
<el-table-column prop="missCheckNow" label="本月" align="center">
|
<el-table-column prop="missCheckNow" label="本月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
|
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="missCheckHis" label="上月" align="center">
|
<el-table-column prop="missCheckHis" label="上月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
|
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="missCheckTrend" label="增减" align="center">
|
<el-table-column prop="missCheckTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
|
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
|
||||||
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
|
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="综合良品率" align="center">
|
<el-table-column label="综合良品率" align="center">
|
||||||
<el-table-column prop="goodProductPassNow" label="本月" align="center">
|
<el-table-column prop="goodProductPassNow" label="本月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
|
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductPassHis" label="上月" align="center">
|
<el-table-column prop="goodProductPassHis" label="上月" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
|
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
|
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
|
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
|
||||||
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
|
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@ -14,9 +14,9 @@
|
|||||||
style="width: 350px" placeholder="选择周">
|
style="width: 350px" placeholder="选择周">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
|
<el-button type="primary" @click="getDataList()">查询</el-button>
|
||||||
</el-button>
|
<!-- <el-button type="primary" @click="getDataList()">查询</el-button> -->
|
||||||
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
|
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
|
||||||
@click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<el-row style="float: right; margin-bottom: 5px">
|
||||||
@ -31,126 +31,126 @@
|
|||||||
<el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
|
<el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
|
||||||
<el-table-column prop="lineId" label="生产线" align="center">
|
<el-table-column prop="lineId" label="生产线" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.lineName }} </span>
|
<span v-else>{{ scope.row.lineName }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="投入数㎡" align="center">
|
<el-table-column label="投入数㎡" align="center">
|
||||||
<el-table-column prop="inputNow" label="本周" align="center">
|
<el-table-column prop="inputNow" label="本周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputNow }} </span>
|
<span v-else>{{ scope.row.inputNow }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="inputHis" label="上周" align="center">
|
<el-table-column prop="inputHis" label="上周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputHis }} </span>
|
<span v-else>{{ scope.row.inputHis }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
|
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
|
||||||
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
|
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="完成良品产量" align="center">
|
<el-table-column label="完成良品产量" align="center">
|
||||||
<el-table-column prop="goodProductNow" label="本周" align="center">
|
<el-table-column prop="goodProductNow" label="本周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductNow }} </span>
|
<span v-else>{{ scope.row.goodProductNow }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductHis" label="上周" align="center">
|
<el-table-column prop="goodProductHis" label="上周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductHis }} </span>
|
<span v-else>{{ scope.row.goodProductHis }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductTrend" label="增减" align="center">
|
<el-table-column prop="goodProductTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
|
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
|
||||||
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
|
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="原片漏检率" align="center">
|
<el-table-column label="原片漏检率" align="center">
|
||||||
<el-table-column prop="missCheckNow" label="本周" align="center">
|
<el-table-column prop="missCheckNow" label="本周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
|
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="missCheckHis" label="上周" align="center">
|
<el-table-column prop="missCheckHis" label="上周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
|
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="missCheckTrend" label="增减" align="center">
|
<el-table-column prop="missCheckTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
|
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
|
||||||
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
|
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="综合良品率" align="center">
|
<el-table-column label="综合良品率" align="center">
|
||||||
<el-table-column prop="goodProductPassNow" label="本周" align="center">
|
<el-table-column prop="goodProductPassNow" label="本周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
|
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductPassHis" label="上周" align="center">
|
<el-table-column prop="goodProductPassHis" label="上周" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
|
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
|
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
|
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
|
||||||
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
|
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-04-08 11:46:49
|
* @LastEditTime: 2024-03-29 09:48:49
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -14,9 +14,8 @@
|
|||||||
style="width: 350px" placeholder="选择年">
|
style="width: 350px" placeholder="选择年">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
|
<el-button type="primary" @click="getDataList()">查询</el-button>
|
||||||
</el-button>
|
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
|
||||||
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
|
|
||||||
@click="handleExport">导出</el-button>
|
@click="handleExport">导出</el-button>
|
||||||
<!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
|
<!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
|
||||||
<el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
|
<el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
|
||||||
@ -34,126 +33,126 @@
|
|||||||
<el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center">
|
<el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center">
|
||||||
<el-table-column prop="lineId" label="生产线" align="center">
|
<el-table-column prop="lineId" label="生产线" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.lineName }} </span>
|
<span v-else>{{ scope.row.lineName }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="投入数㎡" align="center">
|
<el-table-column label="投入数㎡" align="center">
|
||||||
<el-table-column prop="inputNow" label="今年" align="center">
|
<el-table-column prop="inputNow" label="今年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputNow }} </span>
|
<span v-else>{{ scope.row.inputNow }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="inputHis" label="去年" align="center">
|
<el-table-column prop="inputHis" label="去年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputHis }} </span>
|
<span v-else>{{ scope.row.inputHis }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
|
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
|
||||||
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
|
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="完成良品产量" align="center">
|
<el-table-column label="完成良品产量" align="center">
|
||||||
<el-table-column prop="goodProductNow" label="今年" align="center">
|
<el-table-column prop="goodProductNow" label="今年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductNow }} </span>
|
<span v-else>{{ scope.row.goodProductNow }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductHis" label="去年" align="center">
|
<el-table-column prop="goodProductHis" label="去年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductHis }} </span>
|
<span v-else>{{ scope.row.goodProductHis }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductTrend" label="增减" align="center">
|
<el-table-column prop="goodProductTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
|
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
|
||||||
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
|
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="原片漏检率" align="center">
|
<el-table-column label="原片漏检率" align="center">
|
||||||
<el-table-column prop="missCheckNow" label="今年" align="center">
|
<el-table-column prop="missCheckNow" label="今年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
|
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="missCheckHis" label="去年" align="center">
|
<el-table-column prop="missCheckHis" label="去年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
|
||||||
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
|
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="missCheckTrend" label="增减" align="center">
|
<el-table-column prop="missCheckTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
|
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
|
||||||
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
|
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="综合良品率" align="center">
|
<el-table-column label="综合良品率" align="center">
|
||||||
<el-table-column prop="goodProductPassNow" label="今年" align="center">
|
<el-table-column prop="goodProductPassNow" label="今年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
|
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductPassHis" label="去年" align="center">
|
<el-table-column prop="goodProductPassHis" label="去年" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
|
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
|
||||||
100).toFixed(2)) +
|
100).toFixed(2)) +
|
||||||
'%' : null }}
|
'%' : null }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
|
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
|
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
|
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
|
||||||
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
|
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
|
||||||
0 ?
|
0 ?
|
||||||
0 :
|
0 :
|
||||||
null
|
null
|
||||||
}} </span>
|
}} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@ -1,194 +1,82 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
|
<!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
|
||||||
<doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
|
<doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
|
||||||
<!-- 搜索工作栏 -->
|
<!-- 搜索工作栏 -->
|
||||||
<el-form
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
||||||
:model="queryParams"
|
<el-form-item label="菜单名称" prop="name">
|
||||||
ref="queryForm"
|
<el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/>
|
||||||
size="small"
|
</el-form-item>
|
||||||
:inline="true"
|
<el-form-item label="状态" prop="status">
|
||||||
v-show="showSearch">
|
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
|
||||||
<el-form-item
|
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
|
||||||
label="菜单名称"
|
</el-select>
|
||||||
prop="name">
|
</el-form-item>
|
||||||
<el-input
|
<el-form-item>
|
||||||
v-model="queryParams.name"
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||||
placeholder="请输入菜单名称"
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||||
clearable
|
</el-form-item>
|
||||||
@keyup.enter.native="handleQuery" />
|
</el-form>
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
|
||||||
label="状态"
|
|
||||||
prop="status">
|
|
||||||
<el-select
|
|
||||||
v-model="queryParams.status"
|
|
||||||
placeholder="菜单状态"
|
|
||||||
clearable>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in statusDictDatas"
|
|
||||||
:key="parseInt(dict.value)"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="parseInt(dict.value)" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button
|
|
||||||
type="primary"
|
|
||||||
icon="el-icon-search"
|
|
||||||
@click="handleQuery">
|
|
||||||
搜索
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
icon="el-icon-refresh"
|
|
||||||
@click="resetQuery">
|
|
||||||
重置
|
|
||||||
</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
|
|
||||||
<el-row
|
<el-row :gutter="10" class="mb8">
|
||||||
:gutter="10"
|
<el-col :span="1.5">
|
||||||
class="mb8">
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||||
<el-col :span="1.5">
|
v-hasPermi="['system:menu:create']">新增</el-button>
|
||||||
<el-button
|
</el-col>
|
||||||
type="primary"
|
<el-col :span="1.5">
|
||||||
plain
|
<el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
|
||||||
icon="el-icon-plus"
|
</el-col>
|
||||||
size="mini"
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
@click="handleAdd"
|
</el-row>
|
||||||
v-hasPermi="['system:menu:create']">
|
|
||||||
新增
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button
|
|
||||||
type="info"
|
|
||||||
plain
|
|
||||||
icon="el-icon-sort"
|
|
||||||
size="mini"
|
|
||||||
@click="toggleExpandAll">
|
|
||||||
展开/折叠
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
<right-toolbar
|
|
||||||
:showSearch.sync="showSearch"
|
|
||||||
@queryTable="getList"></right-toolbar>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-table
|
<el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll"
|
||||||
v-if="refreshTable"
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
||||||
v-loading="loading"
|
<el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="250"></el-table-column>
|
||||||
:data="menuList"
|
<!-- <el-table-column prop="icon" label="图标" align="center" width="100">
|
||||||
row-key="id"
|
|
||||||
:default-expand-all="isExpandAll"
|
|
||||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
|
|
||||||
<el-table-column
|
|
||||||
prop="name"
|
|
||||||
label="菜单名称"
|
|
||||||
:show-overflow-tooltip="true"
|
|
||||||
width="250"></el-table-column>
|
|
||||||
<!-- <el-table-column prop="icon" label="图标" align="center" width="100">
|
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<svg-icon :icon-class="scope.row.icon" />
|
<svg-icon :icon-class="scope.row.icon" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
<el-table-column
|
<el-table-column prop="sort" label="排序" width="60"></el-table-column>
|
||||||
prop="sort"
|
<el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" />
|
||||||
label="排序"
|
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
|
||||||
width="60"></el-table-column>
|
<el-table-column prop="componentName" label="组件名称" :show-overflow-tooltip="true" />
|
||||||
<el-table-column
|
<el-table-column prop="status" label="状态" width="80">
|
||||||
prop="permission"
|
<template v-slot="scope">
|
||||||
label="权限标识"
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
|
||||||
:show-overflow-tooltip="true" />
|
</template>
|
||||||
<el-table-column
|
</el-table-column>
|
||||||
prop="component"
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
label="组件路径"
|
<template v-slot="scope">
|
||||||
:show-overflow-tooltip="true" />
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||||
<el-table-column
|
v-hasPermi="['system:menu:update']">修改</el-button>
|
||||||
prop="componentName"
|
<el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
|
||||||
label="组件名称"
|
v-hasPermi="['system:menu:create']">新增</el-button>
|
||||||
:show-overflow-tooltip="true" />
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||||
<el-table-column
|
v-hasPermi="['system:menu:delete']">删除</el-button>
|
||||||
prop="status"
|
</template>
|
||||||
label="状态"
|
</el-table-column>
|
||||||
width="80">
|
</el-table>
|
||||||
<template v-slot="scope">
|
|
||||||
<dict-tag
|
|
||||||
:type="DICT_TYPE.COMMON_STATUS"
|
|
||||||
:value="scope.row.status" />
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="操作"
|
|
||||||
align="center"
|
|
||||||
class-name="small-padding fixed-width">
|
|
||||||
<template v-slot="scope">
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-edit"
|
|
||||||
@click="handleUpdate(scope.row)"
|
|
||||||
v-hasPermi="['system:menu:update']">
|
|
||||||
修改
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-plus"
|
|
||||||
@click="handleAdd(scope.row)"
|
|
||||||
v-hasPermi="['system:menu:create']">
|
|
||||||
新增
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-delete"
|
|
||||||
@click="handleDelete(scope.row)"
|
|
||||||
v-hasPermi="['system:menu:delete']">
|
|
||||||
删除
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
|
|
||||||
<!-- 添加或修改菜单对话框 -->
|
<!-- 添加或修改菜单对话框 -->
|
||||||
<el-dialog
|
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||||
:title="title"
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
:visible.sync="open"
|
<el-row>
|
||||||
width="800px"
|
<el-col :span="24">
|
||||||
append-to-body>
|
<el-form-item label="上级菜单">
|
||||||
<el-form
|
<treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true"
|
||||||
ref="form"
|
placeholder="选择上级菜单"/>
|
||||||
:model="form"
|
</el-form-item>
|
||||||
:rules="rules"
|
</el-col>
|
||||||
label-width="100px">
|
<el-col :span="24">
|
||||||
<el-row>
|
<el-form-item label="菜单类型" prop="type">
|
||||||
<el-col :span="24">
|
<el-radio-group v-model="form.type">
|
||||||
<el-form-item label="上级菜单">
|
<el-radio v-for="dict in menuTypeDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
|
||||||
<treeselect
|
{{dict.label}}</el-radio>
|
||||||
v-model="form.parentId"
|
</el-radio-group>
|
||||||
:options="menuOptions"
|
</el-form-item>
|
||||||
:normalizer="normalizer"
|
</el-col>
|
||||||
:show-count="true"
|
<!-- <el-col :span="24">
|
||||||
placeholder="选择上级菜单" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item
|
|
||||||
label="菜单类型"
|
|
||||||
prop="type">
|
|
||||||
<el-radio-group v-model="form.type">
|
|
||||||
<el-radio
|
|
||||||
v-for="dict in menuTypeDictDatas"
|
|
||||||
:key="parseInt(dict.value)"
|
|
||||||
:label="parseInt(dict.value)">
|
|
||||||
{{ dict.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<!-- <el-col :span="24">
|
|
||||||
<el-form-item v-if="form.type !== 3" label="菜单图标">
|
<el-form-item v-if="form.type !== 3" label="菜单图标">
|
||||||
<el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
|
<el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
|
||||||
<IconSelect ref="iconSelect" @selected="selected" />
|
<IconSelect ref="iconSelect" @selected="selected" />
|
||||||
@ -200,414 +88,319 @@
|
|||||||
</el-popover>
|
</el-popover>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="菜单名称" prop="name">
|
||||||
|
<el-input v-model="form.name" placeholder="请输入菜单名称" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="显示排序" prop="sort">
|
||||||
|
<el-input-number v-model="form.sort" controls-position="right" :min="0" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item v-if="form.type !== 3" label="路由地址" prop="path">
|
||||||
|
<span slot="label">
|
||||||
|
<el-tooltip content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头" placement="top">
|
||||||
|
<i class="el-icon-question" />
|
||||||
|
</el-tooltip>
|
||||||
|
路由地址
|
||||||
|
</span>
|
||||||
|
<el-input v-model="form.path" placeholder="请输入路由地址" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type !== 1" label="权限标识">
|
||||||
label="菜单名称"
|
<span slot="label">
|
||||||
prop="name">
|
<el-tooltip content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)" placement="top">
|
||||||
<el-input
|
<i class="el-icon-question" />
|
||||||
v-model="form.name"
|
</el-tooltip>
|
||||||
placeholder="请输入菜单名称" />
|
权限字符
|
||||||
|
</span>
|
||||||
|
<el-input v-model="form.permission" placeholder="请权限标识" maxlength="50" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="12" v-if="form.type === 2">
|
||||||
|
<el-form-item label="组件路径" prop="component">
|
||||||
|
<el-input v-model="form.component" placeholder="例如说：system/user/index" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12" v-if="form.type === 2">
|
||||||
|
<el-form-item label="组件名称" prop="componentName">
|
||||||
|
<el-input v-model="form.componentName" placeholder="例如说：SystemUser" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="菜单状态" prop="status">
|
||||||
|
<span slot="label">
|
||||||
|
<el-tooltip content="选择停用时，路由将不会出现在侧边栏，也不能被访问" placement="top">
|
||||||
|
<i class="el-icon-question" />
|
||||||
|
</el-tooltip>
|
||||||
|
菜单状态
|
||||||
|
</span>
|
||||||
|
<el-radio-group v-model="form.status">
|
||||||
|
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
|
||||||
|
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item v-if="form.type !== 3" label="显示状态">
|
||||||
|
<span slot="label">
|
||||||
|
<el-tooltip content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" placement="top">
|
||||||
|
<i class="el-icon-question" />
|
||||||
|
</el-tooltip>
|
||||||
|
是否显示
|
||||||
|
</span>
|
||||||
|
<el-radio-group v-model="form.visible">
|
||||||
|
<el-radio :key="true" :label="true">显示</el-radio>
|
||||||
|
<el-radio :key="false" :label="false">隐藏</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item v-if="form.type !== 3" label="总是显示">
|
||||||
|
<span slot="label">
|
||||||
|
<el-tooltip content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单" placement="top">
|
||||||
|
<i class="el-icon-question" />
|
||||||
|
</el-tooltip>
|
||||||
|
总是显示
|
||||||
|
</span>
|
||||||
|
<el-radio-group v-model="form.alwaysShow">
|
||||||
|
<el-radio :key="true" :label="true">总是</el-radio>
|
||||||
|
<el-radio :key="false" :label="false">不是</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type === 2" label="是否缓存">
|
||||||
label="显示排序"
|
<span slot="label">
|
||||||
prop="sort">
|
<el-tooltip content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段" placement="top">
|
||||||
<el-input-number
|
<i class="el-icon-question" />
|
||||||
v-model="form.sort"
|
</el-tooltip>
|
||||||
controls-position="right"
|
是否缓存
|
||||||
:min="0" />
|
</span>
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item
|
|
||||||
v-if="form.type !== 3"
|
|
||||||
label="路由地址"
|
|
||||||
prop="path">
|
|
||||||
<span slot="label">
|
|
||||||
<el-tooltip
|
|
||||||
content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
|
||||||
</el-tooltip>
|
|
||||||
路由地址
|
|
||||||
</span>
|
|
||||||
<el-input
|
|
||||||
v-model="form.path"
|
|
||||||
placeholder="请输入路由地址" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item
|
|
||||||
v-if="form.type !== 1"
|
|
||||||
label="权限标识">
|
|
||||||
<span slot="label">
|
|
||||||
<el-tooltip
|
|
||||||
content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
|
||||||
</el-tooltip>
|
|
||||||
权限字符
|
|
||||||
</span>
|
|
||||||
<el-input
|
|
||||||
v-model="form.permission"
|
|
||||||
placeholder="请权限标识"
|
|
||||||
maxlength="200" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col
|
|
||||||
:span="12"
|
|
||||||
v-if="form.type === 2">
|
|
||||||
<el-form-item
|
|
||||||
label="组件路径"
|
|
||||||
prop="component">
|
|
||||||
<el-input
|
|
||||||
v-model="form.component"
|
|
||||||
placeholder="例如说：system/user/index" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col
|
|
||||||
:span="12"
|
|
||||||
v-if="form.type === 2">
|
|
||||||
<el-form-item
|
|
||||||
label="组件名称"
|
|
||||||
prop="componentName">
|
|
||||||
<el-input
|
|
||||||
v-model="form.componentName"
|
|
||||||
placeholder="例如说：SystemUser" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item
|
|
||||||
label="菜单状态"
|
|
||||||
prop="status">
|
|
||||||
<span slot="label">
|
|
||||||
<el-tooltip
|
|
||||||
content="选择停用时，路由将不会出现在侧边栏，也不能被访问"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
|
||||||
</el-tooltip>
|
|
||||||
菜单状态
|
|
||||||
</span>
|
|
||||||
<el-radio-group v-model="form.status">
|
|
||||||
<el-radio
|
|
||||||
v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="parseInt(dict.value)">
|
|
||||||
{{ dict.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item
|
|
||||||
v-if="form.type !== 3"
|
|
||||||
label="显示状态">
|
|
||||||
<span slot="label">
|
|
||||||
<el-tooltip
|
|
||||||
content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
|
||||||
</el-tooltip>
|
|
||||||
是否显示
|
|
||||||
</span>
|
|
||||||
<el-radio-group v-model="form.visible">
|
|
||||||
<el-radio
|
|
||||||
:key="true"
|
|
||||||
:label="true">
|
|
||||||
显示
|
|
||||||
</el-radio>
|
|
||||||
<el-radio
|
|
||||||
:key="false"
|
|
||||||
:label="false">
|
|
||||||
隐藏
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item
|
|
||||||
v-if="form.type !== 3"
|
|
||||||
label="总是显示">
|
|
||||||
<span slot="label">
|
|
||||||
<el-tooltip
|
|
||||||
content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
|
||||||
</el-tooltip>
|
|
||||||
总是显示
|
|
||||||
</span>
|
|
||||||
<el-radio-group v-model="form.alwaysShow">
|
|
||||||
<el-radio
|
|
||||||
:key="true"
|
|
||||||
:label="true">
|
|
||||||
总是
|
|
||||||
</el-radio>
|
|
||||||
<el-radio
|
|
||||||
:key="false"
|
|
||||||
:label="false">
|
|
||||||
不是
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item
|
|
||||||
v-if="form.type === 2"
|
|
||||||
label="是否缓存">
|
|
||||||
<span slot="label">
|
|
||||||
<el-tooltip
|
|
||||||
content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
|
||||||
</el-tooltip>
|
|
||||||
是否缓存
|
|
||||||
</span>
|
|
||||||
<el-radio-group v-model="form.keepAlive">
|
<el-radio-group v-model="form.keepAlive">
|
||||||
<el-radio
|
<el-radio :key="true" :label="true">缓存</el-radio>
|
||||||
:key="true"
|
<el-radio :key="false" :label="false">不缓存</el-radio>
|
||||||
:label="true">
|
|
||||||
缓存
|
|
||||||
</el-radio>
|
|
||||||
<el-radio
|
|
||||||
:key="false"
|
|
||||||
:label="false">
|
|
||||||
不缓存
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div
|
<div slot="footer" class="dialog-footer">
|
||||||
slot="footer"
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
class="dialog-footer">
|
<el-button @click="cancel">取 消</el-button>
|
||||||
<el-button
|
</div>
|
||||||
type="primary"
|
</el-dialog>
|
||||||
@click="submitForm">
|
</div>
|
||||||
确 定
|
|
||||||
</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
|
||||||
listMenu,
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
getMenu,
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
delMenu,
|
import IconSelect from "@/components/IconSelect";
|
||||||
addMenu,
|
|
||||||
updateMenu,
|
|
||||||
} from '@/api/system/menu';
|
|
||||||
import Treeselect from '@riophae/vue-treeselect';
|
|
||||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css';
|
|
||||||
import IconSelect from '@/components/IconSelect';
|
|
||||||
|
|
||||||
import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants';
|
import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants'
|
||||||
import { getDictDatas, DICT_TYPE } from '@/utils/dict';
|
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
|
||||||
import { isExternal } from '@/utils/validate';
|
import {isExternal} from "@/utils/validate";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'SystemMenu',
|
name: "SystemMenu",
|
||||||
components: { Treeselect, IconSelect },
|
components: { Treeselect, IconSelect },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 显示搜索条件
|
// 显示搜索条件
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
// 菜单表格树数据
|
// 菜单表格树数据
|
||||||
menuList: [],
|
menuList: [],
|
||||||
// 菜单树选项
|
// 菜单树选项
|
||||||
menuOptions: [],
|
menuOptions: [],
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: '',
|
title: "",
|
||||||
// 是否显示弹出层
|
// 是否显示弹出层
|
||||||
open: false,
|
open: false,
|
||||||
// 是否展开，默认全部折叠
|
// 是否展开，默认全部折叠
|
||||||
isExpandAll: false,
|
isExpandAll: false,
|
||||||
// 重新渲染表格状态
|
// 重新渲染表格状态
|
||||||
refreshTable: true,
|
refreshTable: true,
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
name: undefined,
|
name: undefined,
|
||||||
visible: undefined,
|
visible: undefined
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
name: [
|
name: [
|
||||||
{ required: true, message: '菜单名称不能为空', trigger: 'blur' },
|
{ required: true, message: "菜单名称不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
sort: [
|
sort: [
|
||||||
{ required: true, message: '菜单顺序不能为空', trigger: 'blur' },
|
{ required: true, message: "菜单顺序不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
path: [
|
path: [
|
||||||
{ required: true, message: '路由地址不能为空', trigger: 'blur' },
|
{ required: true, message: "路由地址不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
|
status: [
|
||||||
},
|
{ required: true, message: "状态不能为空", trigger: "blur" }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
// 枚举
|
// 枚举
|
||||||
MenuTypeEnum: SystemMenuTypeEnum,
|
MenuTypeEnum: SystemMenuTypeEnum,
|
||||||
CommonStatusEnum: CommonStatusEnum,
|
CommonStatusEnum: CommonStatusEnum,
|
||||||
// 数据字典
|
// 数据字典
|
||||||
menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
|
menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
|
||||||
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
|
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 选择图标
|
// 选择图标
|
||||||
// selected(name) {
|
// selected(name) {
|
||||||
// this.form.icon = name;
|
// this.form.icon = name;
|
||||||
// },
|
// },
|
||||||
/** 查询菜单列表 */
|
/** 查询菜单列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
listMenu(this.queryParams).then((response) => {
|
listMenu(this.queryParams).then(response => {
|
||||||
this.menuList = this.handleTree(response.data, 'id');
|
this.menuList = this.handleTree(response.data, "id");
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 转换菜单数据结构 */
|
/** 转换菜单数据结构 */
|
||||||
normalizer(node) {
|
normalizer(node) {
|
||||||
if (node.children && !node.children.length) {
|
if (node.children && !node.children.length) {
|
||||||
delete node.children;
|
delete node.children;
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
id: node.id,
|
id: node.id,
|
||||||
label: node.name,
|
label: node.name,
|
||||||
children: node.children,
|
children: node.children
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
/** 查询菜单下拉树结构 */
|
/** 查询菜单下拉树结构 */
|
||||||
getTreeselect() {
|
getTreeselect() {
|
||||||
listMenu().then((response) => {
|
listMenu().then(response => {
|
||||||
this.menuOptions = [];
|
this.menuOptions = [];
|
||||||
const menu = { id: 0, name: '主类目', children: [] };
|
const menu = { id: 0, name: '主类目', children: [] };
|
||||||
menu.children = this.handleTree(response.data, 'id');
|
menu.children = this.handleTree(response.data, "id");
|
||||||
this.menuOptions.push(menu);
|
this.menuOptions.push(menu);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.reset();
|
this.reset();
|
||||||
},
|
},
|
||||||
// 表单重置
|
// 表单重置
|
||||||
reset() {
|
reset() {
|
||||||
this.form = {
|
this.form = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
parentId: 0,
|
parentId: 0,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
// icon: undefined,
|
// icon: undefined,
|
||||||
type: SystemMenuTypeEnum.DIR,
|
type: SystemMenuTypeEnum.DIR,
|
||||||
sort: undefined,
|
sort: undefined,
|
||||||
status: CommonStatusEnum.ENABLE,
|
status: CommonStatusEnum.ENABLE,
|
||||||
visible: true,
|
visible: true,
|
||||||
keepAlive: true,
|
keepAlive: true,
|
||||||
alwaysShow: true,
|
alwaysShow: true,
|
||||||
};
|
};
|
||||||
this.resetForm('form');
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.resetForm('queryForm');
|
this.resetForm("queryForm");
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
/** 展开/折叠操作 */
|
/** 展开/折叠操作 */
|
||||||
toggleExpandAll() {
|
toggleExpandAll() {
|
||||||
this.refreshTable = false;
|
this.refreshTable = false;
|
||||||
this.isExpandAll = !this.isExpandAll;
|
this.isExpandAll = !this.isExpandAll;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.refreshTable = true;
|
this.refreshTable = true;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
handleAdd(row) {
|
handleAdd(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.getTreeselect();
|
this.getTreeselect();
|
||||||
if (row != null && row.id) {
|
if (row != null && row.id) {
|
||||||
this.form.parentId = row.id;
|
this.form.parentId = row.id;
|
||||||
} else {
|
} else {
|
||||||
this.form.parentId = 0;
|
this.form.parentId = 0;
|
||||||
}
|
}
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = '添加菜单';
|
this.title = "添加菜单";
|
||||||
},
|
},
|
||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
handleUpdate(row) {
|
handleUpdate(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.getTreeselect();
|
this.getTreeselect();
|
||||||
getMenu(row.id).then((response) => {
|
getMenu(row.id).then(response => {
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = '修改菜单';
|
this.title = "修改菜单";
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm: function () {
|
submitForm: function() {
|
||||||
this.$refs['form'].validate((valid) => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
// 若权限类型为目录或者菜单时，进行 path 的校验，避免后续拼接出来的路由无法跳转
|
// 若权限类型为目录或者菜单时，进行 path 的校验，避免后续拼接出来的路由无法跳转
|
||||||
if (
|
if (this.form.type === SystemMenuTypeEnum.DIR
|
||||||
this.form.type === SystemMenuTypeEnum.DIR ||
|
|| this.form.type === SystemMenuTypeEnum.MENU) {
|
||||||
this.form.type === SystemMenuTypeEnum.MENU
|
// 如果是外链，则不进行校验
|
||||||
) {
|
const path = this.form.path
|
||||||
// 如果是外链，则不进行校验
|
if (!isExternal(path)) {
|
||||||
const path = this.form.path;
|
// 父权限为根节点，path 必须以 / 开头
|
||||||
if (!isExternal(path)) {
|
if (this.form.parentId === 0 && path.charAt(0) !== '/') {
|
||||||
// 父权限为根节点，path 必须以 / 开头
|
this.$modal.msgSuccess('前端必须以 / 开头')
|
||||||
if (this.form.parentId === 0 && path.charAt(0) !== '/') {
|
return
|
||||||
this.$modal.msgSuccess('前端必须以 / 开头');
|
} else if (this.form.parentId !== 0 && path.charAt(0) === '/') {
|
||||||
return;
|
this.$modal.msgSuccess('前端不能以 / 开头')
|
||||||
} else if (this.form.parentId !== 0 && path.charAt(0) === '/') {
|
return
|
||||||
this.$modal.msgSuccess('前端不能以 / 开头');
|
}
|
||||||
return;
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 提交
|
// 提交
|
||||||
if (this.form.id !== undefined) {
|
if (this.form.id !== undefined) {
|
||||||
updateMenu(this.form).then((response) => {
|
updateMenu(this.form).then(response => {
|
||||||
this.$modal.msgSuccess('修改成功');
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addMenu(this.form).then((response) => {
|
addMenu(this.form).then(response => {
|
||||||
this.$modal.msgSuccess('新增成功');
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
this.$modal
|
this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() {
|
||||||
.confirm('是否确认删除名称为"' + row.name + '"的数据项?')
|
return delMenu(row.id);
|
||||||
.then(function () {
|
}).then(() => {
|
||||||
return delMenu(row.id);
|
this.getList();
|
||||||
})
|
this.$modal.msgSuccess("删除成功");
|
||||||
.then(() => {
|
}).catch(() => {});
|
||||||
this.getList();
|
}
|
||||||
this.$modal.msgSuccess('删除成功');
|
}
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user