mt-fe-group/tft-fe
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zjl #30

Merged
juzi merged 2 commits from zjl into master 2023-08-11 16:03:06 +08:00
Conversation 0 Commits 2 Files Changed 97 +155 -159
36 changed files with 155 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b633a703a - Show all commits

BIN
src/assets/reportManagement/reportAll.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 668 B

BIN
src/assets/reportManagement/reportIcon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 965 B

1
src/layout/components/Navbar.vue
View File

@ -97,6 +97,7 @@ export default {
@import '@/styles/variables.module.scss';
.navbar-container {
height: 64px;
min-width: 1300px;
background: #fff;
box-shadow: 0px 1px 4px 0px rgba(0, 21, 41, 0.12);
padding-right: 24px;

7
src/layout/index.vue
View File

@ -8,7 +8,7 @@
<menu-list />
</el-aside>
<el-container class="sectionBox">
<el-header>
<el-header class="el-header" style="height: 64px">
<navbar />
</el-header>
<el-container>
@ -43,16 +43,17 @@ export default {
<style lang="scss" scoped>
@import '@/styles/variables.module.scss';
.itemContainer {
min-width: 1500px;
.el-header {
padding: 0;
overflow-x: auto;
overflow-y: hidden;
}
.sectionBox {
height: 100%;
background-color: $background-color-secondary;
.app-container {
height: calc(100vh - #{$navbarHeight} - #{$footerHeight} - 10px);
margin-top: 7px;
margin-top: 3px;
.app-main {
height: calc(100vh - #{$navbarHeight} - #{$footerHeight} - 50px);
}

2
src/styles/variables.module.scss
View File

@ -44,7 +44,7 @@ $color-success-light-8: mix($color-white, $color-success, 80%) !default;
$color-success-light-9: mix($color-white, $color-success, 90%) !default;
// size
$navbarHeight: 60px; // 导航栏高度
$navbarHeight: 64px; // 导航栏高度
$menuWidth: 160px;
$footerHeight: 30px;

9
src/views/basicConfig/components/accountAdd.vue
View File

@ -114,8 +114,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -125,8 +124,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -135,8 +133,7 @@ export default {
} else {
this.$message({
message: '用户名格式不正确应为数字或者字母，请检查',
type: 'error',
duration: 1500
type: 'error'
})
}
} else {

6
src/views/basicConfig/components/consumablesAdd.vue
View File

@ -94,8 +94,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -105,8 +104,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

6
src/views/basicConfig/components/deviceAdd.vue
View File

@ -302,8 +302,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -313,8 +312,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

6
src/views/basicConfig/components/lineSideLibraryAdd.vue
View File

@ -82,8 +82,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -93,8 +92,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

6
src/views/basicConfig/components/sparePartsAdd.vue
View File

@ -95,8 +95,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -106,8 +105,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

4
src/views/basicConfig/deviceConfig.vue
View File

@ -239,9 +239,7 @@ export default {
updateTreeData(list).then(() => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getTree()
})

3
src/views/consumablesManagement/components/alarmAdd.vue
View File

@ -87,8 +87,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

9
src/views/consumablesManagement/components/inAndOutManagementAdd.vue
View File

@ -321,8 +321,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -332,8 +331,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -344,8 +342,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

3
src/views/deviceManagement/components/productPowerEdit.vue
View File

@ -162,8 +162,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

8
src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue
View File

@ -351,9 +351,7 @@ export default {
console.log(res)
this.$message({
message: '派工成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getList()
})
@ -377,9 +375,7 @@ export default {
console.log(res)
this.$message({
message: '工单删除成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.listQuery.current = 1
this.getList()

6
src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue
View File

@ -214,8 +214,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -225,8 +224,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

6
src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue
View File

@ -297,8 +297,7 @@ export default {
maintainManageConfirm({ ...this.form }).then(() => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
})
@ -306,8 +305,7 @@ export default {
maintainManageUCompleted({ ...this.form }).then(() => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
})

4
src/views/deviceManagement/maintenanceManagement/selfMaintenance.vue
View File

@ -244,9 +244,7 @@ export default {
console.log(res)
this.$message({
message: '工单删除成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.listQuery.current = 1
this.getList()

6
src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue
View File

@ -232,8 +232,7 @@ export default {
autoMaintainUpdate({ ...this.form }).then(() => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
})
@ -241,8 +240,7 @@ export default {
autoMaintainAdd({ ...this.form }).then(() => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
})

3
src/views/deviceManagement/spareParts/sparePartsAdd.vue
View File

@ -188,8 +188,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

3
src/views/deviceManagement/spareParts/sparePartsEdit.vue
View File

@ -191,8 +191,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

3
src/views/deviceManagement/spareParts/sparePartsOut.vue
View File

@ -228,8 +228,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

9
src/views/productionScheduling/components/OffShelfPackagingAdd.vue
View File

@ -135,8 +135,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -146,8 +145,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -157,8 +155,7 @@ export default {
this.$message({
message:
'玻璃架ID与目前是包装或者复投状态的玻璃架ID重复！请重新编辑输入！',
type: 'error',
duration: 1500
type: 'error'
})
}
} else {

3
src/views/productionScheduling/components/OffShelfPackagingContinue.vue
View File

@ -72,8 +72,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit2')
}

6
src/views/productionScheduling/components/WorkOrderAdd.vue
View File

@ -271,8 +271,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -282,8 +281,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

4
src/views/productionScheduling/offShelfPackaging.vue
View File

@ -326,9 +326,7 @@ export default {
unloadPalletFinish({ id: val.data.id }).then(() => {
this.$message({
message: '结束包装成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getList()
})

8
src/views/productionScheduling/reLaunching.vue
View File

@ -311,9 +311,7 @@ export default {
reloadRackEnd({ id: val.data.id }).then(() => {
this.$message({
message: '结束复投成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getList()
})
@ -330,9 +328,7 @@ export default {
reloadRack({ id: val.data.id }).then(() => {
this.$message({
message: '复投上架成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getList()
})

20
src/views/productionScheduling/workOrderManagement.vue
View File

@ -452,9 +452,7 @@ export default {
workOrderRelease({ id: val.data.id }).then(() => {
this.$message({
message: '工单下发成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getList()
})
@ -468,9 +466,7 @@ export default {
workOrderFinish({ id: val.data.id }).then(() => {
this.$message({
message: '工单结束成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.getList()
})
@ -484,9 +480,7 @@ export default {
workOrderDelete({ id: val.data.id }).then(() => {
this.$message({
message: '工单删除成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.listQuery.current = 1
this.getList()
@ -511,9 +505,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '工单导入成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.listQuery.current = 1
this.getList()
@ -523,9 +515,7 @@ export default {
if (err) {
this.$message({
message: '工单导入失败，请检查格式是否正确',
type: 'error',
duration: 1500,
onClose: () => {}
type: 'error'
})
}
}

7
src/views/qualityManagement/components/samplingAdd.vue
View File

@ -196,8 +196,7 @@ export default {
if (this.tableData.length === 0) {
this.$message({
message: '请先到标准设置中添加该检测项目的检测点',
type: 'error',
duration: 2000
type: 'error'
})
return false
}
@ -229,9 +228,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '保存成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.$emit('successSubmit')
this.formClear()

13
src/views/qualityManagement/components/standardSetting.vue
View File

@ -171,8 +171,7 @@ export default {
if (this.tableData.length === 0) {
this.$message({
message: '请点击新增按钮添加标准值后再保存',
type: 'error',
duration: 1500
type: 'error'
})
return false
}
@ -180,8 +179,7 @@ export default {
if (!item.detectItem || !item.detectPoint || !item.detectStandard) {
this.$message({
message: '表格中有数据空缺，请检查',
type: 'error',
duration: 1500
type: 'error'
})
return false
}
@ -193,9 +191,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '保存成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.$emit('successSubmit')
this.formClear()
@ -223,8 +219,7 @@ export default {
if (!this.form.detectItem) {
this.$message({
message: '请先选择检验项目',
type: 'error',
duration: 1500
type: 'error'
})
return false
}

8
src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
View File

@ -231,18 +231,14 @@ export default {
if (this.selectedGlassId.length === 0) {
this.$message({
message: '请先勾选左侧的玻璃',
type: 'error',
duration: 1500,
onClose: () => {}
type: 'error'
})
return false
}
if (this.checkList.length === 0) {
this.$message({
message: '请先勾选缺陷',
type: 'error',
duration: 1500,
onClose: () => {}
type: 'error'
})
return false
}

6
src/views/reportManagement/components/reportClassAdd.vue
View File

@ -49,8 +49,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}
@ -62,8 +61,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

3
src/views/reportManagement/components/reportNameEdit.vue
View File

@ -41,8 +41,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.$emit('successSubmit')
}

4
src/views/reportManagement/reportTools/reportClassification.vue
View File

@ -136,9 +136,7 @@ export default {
reportCategoryDelete({ id: val.data.id }).then(() => {
this.$message({
message: '工单删除成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.listQuery.current = 1
this.getList()

109
src/views/reportManagement/reportTools/reportList.vue
View File

@ -1,24 +1,28 @@
<template>
<div class="reoprtManager">
<div class="report">
<div class="reportBox">
<div class="imgBox">
<img
src="./../../../assets/reportManagement/report.png"
alt=""
width="355px"
height="314px"
/>
<img src="./../../../assets/reportManagement/report.png" alt="" />
</div>
<div class="numBox">
<div>
<div class="reportNum">
<div class="num">{{ totalReports }}</div>
<div class="text">
<p class="font">全部报表</p>
<p class="letter">Reports</p>
<p class="font">
<img
src="./../../../assets/reportManagement/reportAll.png"
alt=""
style="width: 32px; height: 32px"
/>
<span>全部报表</span>
</p>
<p class="letter">
{{ totalReports > 1 ? 'Reports' : 'Report' }}
</p>
</div>
</div>
<div class="detail" @click="toDetail()">了解详情</div>
<div class="detail detail1" @click="toDetail()">了解详情</div>
</div>
</div>
</div>
@ -27,11 +31,21 @@
<div class="reportNum">
<div class="num">{{ item.quantity }}</div>
<div class="text">
<p class="font">{{ item.name }}</p>
<p class="letter">Reports</p>
<p class="font">
<img
src="./../../../assets/reportManagement/reportIcon.png"
alt=""
style="width: 32px; height: 32px"
/>
<span class="title" :title="item.name">{{ item.name }}</span>
<!-- <span class="title" :title="item.name">
测试测试测试测试报表测试报表
</span> -->
</p>
<p class="letter">{{ item.quantity > 1 ? 'Reports' : 'Report' }}</p>
</div>
</div>
<div class="detail" @click="toDetail(item.id)">了解详情</div>
<div class="detail detail2" @click="toDetail(item.id)">了解详情</div>
</div>
</div>
</div>
@ -76,7 +90,7 @@ export default {
}
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.reoprtManager {
padding-left: 16px;
padding-top: 8px;
@ -86,27 +100,39 @@ export default {
align-content: flex-start;
overflow: auto;
.report {
width: 768px;
width: calc(((100vw - 272px) / 2) - 16px);
// width: 808px;
height: 456px;
background: #fff;
border-radius: 4px;
margin: 0 16px 16px 0;
position: relative;
.reportBox {
margin: auto;
width: 685px;
}
.imgBox {
display: inline-block;
width: 480px;
width: 445px;
height: 100%;
padding: 80px 0 0 80px;
padding-top: 80px;
img {
width: 355px;
height: 314px;
}
}
.numBox {
position: absolute;
display: inline-block;
height: 100%;
// padding-top: 120px;
top: 120px;
}
}
.reportDesc {
width: 376px;
position: relative;
width: calc(((100vw - 272px) / 4) - 16px);
// width: 396px;
height: 456px;
background: #fff;
border-radius: 4px;
@ -120,22 +146,36 @@ export default {
font-size: 80px;
font-weight: 600;
color: #161616;
margin-right: 36px;
margin-right: 18px;
}
.text {
display: inline-block;
text-align: left;
.font {
font-size: 18px;
letter-spacing: 2px;
margin-bottom: 5px;
img {
vertical-align: middle;
}
.title {
display: inline-block;
vertical-align: middle;
max-width: 150px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}
.letter {
padding-left: 4px;
font-size: 32px;
font-weight: 300;
}
}
}
.detail {
position: absolute;
width: 200px;
height: 30px;
font-size: 14px;
@ -144,8 +184,37 @@ export default {
color: #fff;
background: #0b58ff;
border-radius: 4px;
margin: 139px auto 0;
cursor: pointer;
}
.detail1 {
position: absolute;
bottom: 200px;
}
.detail2 {
position: absolute;
bottom: 80px;
right: calc((((100vw - 272px) / 4) - 16px - 200px) / 2);
}
}
@media only screen and (max-width: 1600px) {
.reoprtManager {
.report {
.reportBox {
width: 550px;
}
.imgBox {
width: 320px;
height: 100%;
img {
width: 300px;
height: 314px;
}
}
.numBox {
height: 100%;
top: 120px;
}
}
}
}
</style>

7
src/views/reportManagement/reportTools/reportListDetail.vue
View File

@ -204,9 +204,7 @@ export default {
delReportlist({ id: val.data.id }).then(() => {
this.$message({
message: '报表删除成功',
type: 'success',
duration: 1500,
onClose: () => {}
type: 'success'
})
this.listQuery.current = 1
this.getList()
@ -250,8 +248,7 @@ export default {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
type: 'success'
})
this.getList()
}