Compare commits

...

10 Commits

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 榄菊管理系统
VUE_APP_TITLE = 榄菊生产管理系统
# 开发环境配置
ENV = 'development'

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 榄菊管理系统
VUE_APP_TITLE = 榄菊生产管理系统
NODE_ENV = production

@ -6,7 +6,7 @@
"license": "MIT",
"scripts": {
"###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"dev": "vue-cli-service serve",
"dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
@ -46,14 +46,12 @@
"highlight.js": "9.18.5",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsbarcode": "^3.11.6",
"jsencrypt": "3.0.0-rc.1",
"less": "^3.9.0",
"less-loader": "^5.0.0",
"moment": "^2.29.4",
"nprogress": "0.2.0",
"print-js": "^1.6.0",
"qrcode": "^1.5.4",
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
@ -64,7 +62,6 @@
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vue-seamless-scroll": "^1.1.23",
"vuedraggable": "2.24.3",
"vuex": "3.6.0",
"xlsx": "^0.17.0"

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验节点维护列表
export function listCpkUpdown(query) {
return request({
url: '/quality/cpkUpdown/list',
method: 'get',
params: query
});
}
// 查询检验节点维护详细
export function getCpkUpdown(id) {
return request({
url: '/quality/cpkUpdown/' + id,
method: 'get'
});
}
// 新增检验节点维护
export function addCpkUpdown(data) {
return request({
url: '/quality/cpkUpdown',
method: 'post',
data: data
});
}
// 修改检验节点维护
export function updateCpkUpdown(data) {
return request({
url: '/quality/cpkUpdown',
method: 'put',
data: data
});
}
// 删除检验节点维护
export function delCpkUpdown(id) {
return request({
url: '/quality/cpkUpdown/' + id,
method: 'delete'
});
}

@ -167,4 +167,4 @@ export function getIncomeChartList(query) {
method: 'post',
data: query
});
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 915 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 829 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 263 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 364 KiB

@ -35,8 +35,8 @@ export default {
},
data() {
return {
title: '管理系统',
logo: logoImg
title: '榄菊生产管理系统',
// logo: logoImg
}
}
}

@ -30,6 +30,8 @@ import Layout from '@/layout'
// 公共路由
export const constantRoutes = [
{path: '/cs', component: () => import('@/views/cs/index.vue')},
{path: '/cs2', component: () => import('@/views/cs/index2.vue')},
{
path: '/redirect',
component: Layout,

@ -0,0 +1,694 @@
<template>
<div>
<div class="bg">
<div class="title1">白坯车间生产监控看板</div>
<div class="floorNum floorNum1">1F</div>
<div class="floorNum floorNum2">2F</div>
<div class="floorNum floorNum3">3F</div>
<div class="floorNum floorNum4" @click="$router.push('/cs2')">4F</div>
<div class="floorNum floorNum5">5F</div>
<div class="floorNum floorNum6">6F</div>
<div class="output" v-for="i in outputData" :style="`left:${i.left}%`"><span>产量10</span></div>
<div v-for="i in equipmentData" class="equipment" :style="`left: ${i.left}%`">
<div :class="i.isRight?'equipmentName1':'equipmentName'"><span>设备名称</span></div>
</div>
<div class="arrows" v-for="i in arrowData" v-if="false">
<div class="oneAnR" :style="`left:${i.left-3}%`">
<div class="oneAn">
<div class="wx" :style="`top: -1%;left:49.5%`"></div>
<div class="arrow" :style="`top: 7%;left:49.5%`"></div>
<div class="wx" :style="`top: 29%;left:49.5%`"></div>
<div class="arrow" :style="`top: 37%;left:49.5%`"></div>
<div class="wx" :style="`top: 59%;left:49.5%`"></div>
<div class="arrow" :style="`top: 67%;left:49.5%`"></div>
<div class="wx" :style="`top: 89%;left:49.5%`"></div>
</div>
</div>
<div class="twoAnR" :style="`left:${i.left-3}%`">
<div class="twoAn">
<div class="wxh" :style="`top: -0.9%;left:49%`"></div>
<div class="arrow" :style="`top: 6%;left:49%`"></div>
<div class="wxh" :style="`top: 15.2%;left:49%`"></div>
<div class="arrow" :style="`top: 22.1%;left:49%`"></div>
<div class="wxh" :style="`top: 31.3%;left:49%`"></div>
<div class="arrow" :style="`top:38.2%;left:49%`"></div>
<div class="wxh" :style="`top: 47.4%;left:49%`"></div>
<div class="arrow" :style="`top: 54.3%;left:49%`"></div>
<div class="wxh" :style="`top: 63.5%;left:49%`"></div>
<div class="arrow" :style="`top: 70.4%;left:49%`"></div>
<div class="wxh" :style="`top: 79.6%;left:49%`"></div>
<div class="arrow" :style="`top: 86.5%;left:49%`"></div>
<div class="wxh" :style="`top: 95.7%;left:49%`"></div>
</div>
</div>
<div class="box" :style="`top: 74.5%;left:${i.left}%`"></div>
<div class="box" :style="`top: 78.8%;left:${i.left}%`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(1)">
<div class="arrow" :style="`top: 38.5%;left: 35.2%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 42%;left: 35%;transform: rotate(0deg)`"></div>
<div class="arrow" :style="`top: 48%;left: 34.5%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 52%;left: 34.2%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 57%;left: 34%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 62%;left: 33.8%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 66%;left: 33.1%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(2)">
<div class="arrow" :style="`top: 38.5%;left: 39.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 39%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 39.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 39.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 39%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 38.7%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 39%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(3)">
<div class="arrow" :style="`top: 38.5%;left: 46.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 46.3%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 46.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 45.8%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 45.8%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 45.9%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 45.4%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(4)">
<div class="arrow" :style="`top: 38.5%;left: 50.5%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 50.5%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 50.9%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 51.1%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 51.1%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 51.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 51.7%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(5)">
<div class="arrow" :style="`top: 38.5%;left: 57.2%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 57.5%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 57.5%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 57.5%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 57.8%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 58%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 57.7%;transform: rotate(358deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(6)">
<div class="arrow" :style="`top: 38.5%;left: 61.2%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 61.5%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 62.2%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 62.5%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 62.8%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 63.1%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 63.9%;transform: rotate(355deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(7)">
<div class="arrow" :style="`top: 38.5%;l;left: 68%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 68.5%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 68.8%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 69%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 69.5%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 70%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 70%;transform: rotate(350deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(8)">
<div class="arrow" :style="`top: 38.5%;left: 72.2%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 72.7%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 73.5%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 74.1%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 74.8%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 75.3%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 76.1%;transform: rotate(345deg);`"></div>
</div>
<div class="bottomArrows" v-for="(i,k) in 9">
<div class="arrow" :style="`top: 72.5%;left: ${31.9 + 5.2*k}%;`"></div>
</div>
<div class="bottomArrows" v-for="(i,k) in 5">
<div class="arrow" :style="`top: 73.7%;left: ${50.5 - 5.2*k}%;`"></div>
</div>
<div v-for="i in infoData " class="info"
:style="`top: ${i.top}%;left: ${i.left}%;transform: rotate(${i.rotate}deg);`">
<div :class="i.isRight?'infoModel':'infoModel'" :style="`transform: rotate(${360 -i.rotate}deg);`">
<div class="title">设备名称</div>
<div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div>
<div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
isRun: [1, 2, 3, 4, 5, 6, 7, 8],
infoData: [
{
top: 28,
left: 32.7,
rotate: 7,
isRight: false
},
{
top: 27,
left: 37.1,
rotate: 3,
isRight: true
},
{
top: 26.5,
left: 44.1,
rotate: 2,
isRight: false
},
{
top: 26,
left: 48.8,
rotate: 358,
isRight: true
},
{
top: 25,
left: 55.8,
rotate: 355,
isRight: false
},
{
top: 24,
left: 60.2,
rotate: 351,
isRight: true
},
{
top: 24,
left: 66.8,
rotate: 351,
isRight: false
},
{
top: 22.5,
left: 71.6,
rotate: 346,
isRight: false
},
],
equipmentData: [
// {
// left: 16,
// isRight: false,
// },
// {
// left: 23.5,
// isRight: true,
// },
// {
// left: 38,
// isRight: false,
// },
// {
// left: 45.3,
// isRight: true,
// },
// {
// left: 59.3,
// isRight: false,
// },
// {
// left: 66.6,
// isRight: true,
// },
// {
// left: 81.2,
// isRight: false,
// },
// {
// left: 88.5,
// isRight: false,
// },
],
outputData: [
{
left: 33.3,
},
{
left: 37.7,
},
{
left: 43.9,
},
{
left: 48.5,
},
{
left: 54.5,
},
{
left: 59,
},
{
left: 65,
},
{
left: 69.5,
},
],
arrowData: [
{
left: 17.93,
},
{
left: 25.23,
},
{
left: 39.8,
},
{
left: 47.13,
},
{
left: 61.13,
},
{
left: 68.43,
},
{
left: 83.03,
},
{
left: 90.33,
},
]
}
},
methods: {},
mounted() {
}
}
</script>
<style lang="less" scoped>
.bg {
background-image: url("~@/assets/board/车间监控系统 - 02.jpg");
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
width: 100%;
height: 100%;
overflow: hidden;
}
.title1 {
position: absolute;
top: 1%;
left: 50%;
font-weight: 700;
letter-spacing: 0.1vw;
font-size: 2.1vw;
color: #fff;
transform: translateX(-50%);
}
.floorNum {
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
top: 96.2%;
width: 4.6%;
height: 2.4%;
color: #fff6;
text-align: center;
line-height: 2.4vh;
font-size: 1.5vh;
}
.floorNum1 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 35.5%;
}
.floorNum2 {
background-image: url("~@/assets/board/楼层-左背景 选中.png");
left: 39.9%;
color: #fff;
}
.floorNum3 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 44.3%;
}
.floorNum4 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 51%;
}
.floorNum5 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 55.4%;
}
.floorNum6 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 59.8%;
}
@keyframes example {
from {
bottom: 7%
}
to {
bottom: -30%
}
}
@keyframes example1 {
from {
bottom: 0%;
}
to {
bottom: -18.5%
}
}
.arrows {
.oneAnR {
position: absolute;
width: 6%;
height: 10.5%;
top: 25.6%;
left: 15%;
overflow: hidden;
.oneAn {
position: absolute;
width: 100%;
height: 13vh;
bottom: 7%;
animation-name: example;
animation-duration: 4s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.twoAnR {
position: absolute;
width: 6%;
height: 34.5%;
top: 37.5%;
left: 15%;
overflow: hidden;
.twoAn {
position: absolute;
width: 100%;
height: 40vh;
bottom: 0;
animation-name: example1;
animation-duration: 4s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.arrow, .wx, .wxh, .box {
position: absolute;
background-repeat: no-repeat;
background-size: 100% 100%;
width: 0.5vw;
}
.wxh {
width: 0.6vw;
}
.arrow {
background-image: url("~@/assets/board/箭头 下2.png");
height: 2.5vh;
}
.wx {
background-image: url("~@/assets/board/蚊香1.png");
height: 0.5vw;
}
.wxh {
background-image: url("~@/assets/board/蚊香盒.png");
height: 0.6vw;
}
.box {
background-image: url("~@/assets/board/箱子.png");
transform: translateX(-0.15vw);
width: 0.82%;
height: 0.82vw;
}
}
.output {
background-image: url("~@/assets/board/弹窗3-产量2.png");
position: absolute;
background-repeat: no-repeat;
background-size: 100% 100%;
width: 4.3%;
height: 3.1%;
top: 27%;
span {
display: inline-block;
width: 100%;
height: 2.4vh;
color: #fff;
text-align: center;
line-height: 2.4vh;
font-size: 0.7vw;
}
}
.info {
position: absolute;
width: 4%;
height: 50%;
&:hover .infoModel, &:hover .infoModel1 {
display: inline-block;
}
.infoModel, .infoModel1 {
position: absolute;
top: 0%;
left: -295%;
width: 14.1vw;
height: 14.7vh;
color: #fff;
display: none;
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗1-设备信息.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.title {
position: absolute;
top: 7%;
font-size: 1vw;
letter-spacing: 3px;
}
.equipmentOutput {
color: #fff;
position: absolute;
top: 45%;
font-size: 0.9vw;
letter-spacing: 3px;
}
.equipmentInfo {
color: #fff;
position: absolute;
top: 70%;
font-size: 0.9vw;
letter-spacing: 3px;
}
}
.infoModel {
.title {
left: 7%;
}
.equipmentOutput {
left: 7%;
}
.equipmentInfo {
left: 7%;
}
}
.infoModel1 {
left: 60%;
.title {
right: 7%;
}
.equipmentOutput {
left: 25%;
}
.equipmentInfo {
left: 25%;
}
&::before {
transform-style: preserve-3d;
transform: rotateY(180deg)
}
}
}
.equipment {
position: absolute;
top: 72%;
width: 4%;
height: 6%;
&:hover .equipmentName, &:hover .equipmentName1 {
display: inline-block;
}
.equipmentName, .equipmentName1 {
position: absolute;
width: 12.7vw;
height: 4.4vh;
display: none;
span {
position: absolute;
line-height: 4.4vh;
color: #fff;
font-size: 1vw;
letter-spacing: 3px;
}
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗2-名称.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
}
.equipmentName {
top: -10%;
left: -255%;
span {
left: 5%;
}
}
.equipmentName1 {
top: -10%;
left: 45%;
span {
right: 5%;
}
&::before {
transform-style: preserve-3d;
transform: rotateY(180deg)
}
}
}
@keyframes arrowAn1 {
from {
top: -100%;
}
to {
top: 100%;
}
}
.arrows1 {
.arrow {
position: absolute;
width: 0.5vw;
height: 2.5vh;
overflow: hidden;
&::after {
content: "";
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url("~@/assets/board/箭头 下2.png");
animation-name: arrowAn1;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
}
.bottomArrows {
.arrow {
position: absolute;
width: 0.5vw;
height: 2.5vh;
overflow: hidden;
transform: rotate(90deg);
&::after {
content: "";
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url("~@/assets/board/箭头 下2.png");
animation-name: arrowAn1;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
}
</style>

@ -0,0 +1,472 @@
<template>
<div>
<div class="bg">
<div class="title1">白坯车间生产监控看板</div>
<div class="subTitle" style="left: 27%">成型区</div>
<div class="subTitle" style="left: 48.9%;">烘房区</div>
<div class="subTitle" style="left: 70.8%;">收坯区</div>
<div class="floorNum floorNum1">1F</div>
<div class="floorNum floorNum2" @click="$router.push('/cs')">2F</div>
<div class="floorNum floorNum3">3F</div>
<div class="floorNum floorNum4">4F</div>
<div class="floorNum floorNum5">5F</div>
<div class="floorNum floorNum6">6F</div>
<div v-if="isRun.includes(1)">
<div class="arrow" style="top: 34%;left: 22.1%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 39.6%;left: 21.3%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 39.6%;left: 14.1%;transform: rotate(15deg);"></div>
</div>
<div v-if="isRun.includes(2)">
<div class="arrow" style="top: 57.4%;left: 18.6%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 57.4%;left: 10.9%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 66.4%;left: 17.3%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 66.4%;left: 9.2%;transform: rotate(15deg);"></div>
</div>
<div v-if="isRun.includes(3)">
<div class="arrow" style="top: 36.3%;left: 68.2%;transform: rotate(348deg);"></div>
<div class="arrow" style="top: 36.6%;left: 74.2%;transform: rotate(348deg);"></div>
<div class="arrow1" style="top: 42%;left: 68.7%;transform: rotate(348deg);"></div>
<div class="arrow1" style="top: 41.7%;left: 74.8%;transform: rotate(348deg);"></div>
</div>
<div v-if="isRun.includes(4)">
<div class="arrow" style="top: 54.9%;left: 70.1%;transform: rotate(348deg);"></div>
<div class="arrow" style="top: 54.7%;left: 76.6%;transform: rotate(348deg);"></div>
<div class="arrow1" style="top: 61.5%;left: 70.7%;transform: rotate(348deg);"></div>
</div>
<div class="box" style="top: 24.3%;left: 7.7%;"></div>
<div class="box" style="top: 30.6%;left: 7.7%;"></div>
<div class="box" style="top: 39.1%;left: 7.7%;"></div>
<div class="box" style="top: 45.4%;left: 7.7%;"></div>
<div class="box" style="top: 24.3%;left: 16.8%;"></div>
<div class="box" style="top: 30.6%;left: 16.8%;"></div>
<div class="box" style="top: 39.1%;left: 16.8%;"></div>
<div class="box" style="top: 45.4%;left: 16.8%;"></div>
<div class="box" style="top: 64%;left: 7.7%;"></div>
<div class="box" style="top: 70.3%;left: 7.7%;"></div>
<div class="box" style="top: 78.8%;left: 7.7%;"></div>
<div class="box" style="top: 85.1%;left: 7.7%;;"></div>
<div class="box" style="top: 64%;left: 16.8%;"></div>
<div class="box" style="top: 70.3%;left: 16.8%;"></div>
<div class="box" style="top: 78.8%;left: 16.8%;"></div>
<div class="box" style="top: 85.1%;left: 16.8%;"></div>
<div class="box" style="top: 26.8%;left: 78.5%;"></div>
<div class="box" style="top: 33.1%;left: 78.5%;"></div>
<div class="box" style="top: 38.8%;left: 78.5%;"></div>
<div class="box" style="top: 45.1%;left: 78.5%;"></div>
<div class="box" style="top: 26.8%;left: 85.3%;"></div>
<div class="box" style="top: 33.1%;left: 85.3%;"></div>
<div class="box" style="top: 38.8%;left: 85.3%;"></div>
<div class="box" style="top: 45.1%;left: 85.3%;"></div>
<div class="box" style="top: 64.3%;left: 78.5%;"></div>
<div class="box" style="top: 70.6%;left: 78.5%;"></div>
<div class="box" style="top: 76.3%;left: 78.5%;"></div>
<div class="box" style="top: 82.6%;left: 78.5%;"></div>
<div class="box" style="top: 64.3%;left: 85.3%;"></div>
<div class="box" style="top: 70.6%;left: 85.3%;"></div>
<div v-for="(i,k) in hfData" :class="i.isProd? 'hf1':'hf'" :style="`top: ${i.top}%;`">{{ k + 1 }} 10
<div v-if="i.isProd" class="inProd">
<svg t="1723106843182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
p-id="1501">
<path
d="M148.361503 873.076215a33.27639 33.27639 0 0 1 0.204778-47.150084 33.583556 33.583556 0 0 1 47.354862 0.204778A444.316592 444.316592 0 0 0 511.944454 957.291078c104.436669 0 203.293143-35.938501 280.852728-99.317224l35.580139-32.81564a33.583556 33.583556 0 0 1 47.303668 1.791806 33.27639 33.27639 0 0 1-1.791806 47.09889l-37.064778 34.146695A511.176537 511.176537 0 0 1 511.944454 1023.99744a511.43251 511.43251 0 0 1-363.582951-150.921225z m863.49671-248.497838a33.481167 33.481167 0 0 1-65.426501-14.385639 443.139119 443.139119 0 0 0-299.129144-518.394954A33.327584 33.327584 0 1 1 667.575568 28.265477a509.58951 509.58951 0 0 1 344.180256 596.3129zM275.374922 138.640701a443.036731 443.036731 0 0 0-198.788032 467.456481 33.481167 33.481167 0 0 1-65.52889 13.771306A509.999065 509.999065 0 0 1 279.624061 59.596478C328.821923 31.439533 431.415591-4.191801 507.336954 0.620477c8.549472-1.689417 17.96925 0 25.597223 5.938555 6.4505 5.119445 9.982917 12.081889 11.109194 20.273001 0.255972 2.713306-0.409556 5.221833-1.023889 8.037528a22.832723 22.832723 0 0 1-7.781555 12.133083L341.262173 263.759926a28.208139 28.208139 0 0 1-29.999945 6.91125 30.204723 30.204723 0 0 1-20.836139-23.703028l-15.051167-108.378641z m-4.965861 785.322793c-2.969278-0.46075-7.269611 31.740556-34.402668 17.918056-48.225168-24.624528-138.225003-97.781391-174.93142-168.736892a31.331001 31.331001 0 0 1-8.037528-24.931695c1.023889-8.191111 5.221833-14.846389 11.62114-19.965834 2.201361-1.638222 4.658695-2.354944 7.423194-3.276444a22.832723 22.832723 0 0 1 14.385639 0.409555l285.7162 54.675668c10.392472 1.945389 18.839556 10.750834 21.399278 22.116a30.204723 30.204723 0 0 1-9.573361 30.102334l-113.651669 91.689252z m716.671041-436.688619c1.126278 2.815694 30.921445-10.085306 33.020417 20.273 3.737195 54.061334-12.542639 168.890475-54.522084 236.825504a31.331001 31.331001 0 0 1-17.201334 19.812251 29.999945 29.999945 0 0 1-23.139889 0.307167c-2.559722-1.023889-4.402722-2.815694-6.655278-4.709889a22.832723 22.832723 0 0 1-7.013639-12.54264l-100.341113-273.071171a28.208139 28.208139 0 0 1 7.986333-29.692779 30.204723 30.204723 0 0 1 30.716668-7.320805l137.149919 50.170556z"
fill="#fff" p-id="1502">
</path>
</svg>
生产中
</div>
<div class="infoModel">
<div class="title">设备名称</div>
<div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div>
<div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
</div>
</div>
<div class="equipment" v-for="i in equipmentData" :style="`top: ${i.top}%;left: ${i.left}%;`">
<div :class="i.isRight?`equipmentName1`:`equipmentName`"><span>设备名称</span></div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
hfData: [
{
top: 27.5,
isProd: false
},
{
top: 29.1,
isProd: false
},
{
top: 30.6,
isProd: false
},
{
top: 33.6,
isProd: false
},
{
top: 35.1,
isProd: false
},
{
top: 36.8,
isProd: false
},
{
top: 40.1,
isProd: false
},
{
top: 41.8,
isProd: false
},
{
top: 45.3,
isProd: true
},
{
top: 48.9,
isProd: true
},
{
top: 50.8,
isProd: false
},
{
top: 54.7,
isProd: false
},
{
top: 58.7,
isProd: false
},
{
top: 60.7,
isProd: false
},
{
top: 62.7,
isProd: false
},
{
top: 67.1,
isProd: false
},
],
isRun: [1, 2, 3, 4],
equipmentData: [
{
top: 25.5,
left: 8.4,
isRight: true
},
{
top: 50,
left: 5.5,
isRight: true
},
{
top: 29,
left: 62.5,
isRight: false
},
{
top: 49,
left: 64,
isRight: false
},
]
}
},
methods: {},
mounted() {
}
}
</script>
<style scoped lang="less">
.bg {
background-image: url("~@/assets/board/车间监控系统 - 04.jpg");
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
width: 100%;
height: 100%;
}
.title1 {
position: absolute;
top: 1%;
left: 50%;
font-weight: 700;
letter-spacing: 0.1vw;
font-size: 2.1vw;
color: #fff;
transform: translateX(-50%);
}
.subTitle {
position: absolute;
top: 14%;
letter-spacing: 0.1vw;
font-size: 1.1vw;
color: #fff;
transform: translateX(-50%);
}
.floorNum {
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
top: 96.2%;
width: 4.6%;
height: 2.4%;
color: #fff6;
text-align: center;
line-height: 2.4vh;
font-size: 1.5vh;
}
.floorNum1 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 35.5%;
}
.floorNum2 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 39.9%;
}
.floorNum3 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 44.3%;
}
.floorNum4 {
background-image: url("~@/assets/board/楼层-右背景 选中.png");
left: 51%;
color: #fff;
}
.floorNum5 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 55.4%;
}
.floorNum6 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 59.8%;
}
@keyframes arrowAn1 {
from {
top: -100%;
}
to {
top: 100%;
}
}
.arrow, .arrow1 {
position: absolute;
width: 0.5%;
height: 2.5%;
overflow: hidden;
&::after {
content: "";
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-repeat: no-repeat;
background-size: 100% 100%;
animation-name: arrowAn1;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.arrow {
&::after {
background-image: url("~@/assets/board/箭头 下.png");
}
}
.arrow1 {
&::after {
animation-direction: reverse;
background-image: url("~@/assets/board/箭头 上.png");
}
}
.box {
position: absolute;
background-image: url("~@/assets/board/货架.png");
background-repeat: no-repeat;
background-size: 100% 100%;
width: 1.2%;
height: 2.3%;
display: none;
}
.hf, .hf1 {
position: absolute;
left: 48%;
transform: translateX(-50%);
width: 30.6%;
height: 1%;
text-align: center;
font-size: 0.5vw;
line-height: 1vh;
&:hover .infoModel {
display: inline-block;
}
.infoModel {
position: absolute;
width: 14.1vw;
height: 14.7vh;
left: -10%;
top: -365%;
color: #fff;
display: none;
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗1-设备信息.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.title {
position: absolute;
top: 7%;
left: 7%;
font-size: 1vw;
letter-spacing: 3px;
}
.equipmentOutput {
color: #fff;
position: absolute;
top: 45%;
left: 7%;
font-size: 0.9vw;
letter-spacing: 3px;
}
.equipmentInfo {
color: #fff;
position: absolute;
top: 70%;
left: 7%;
font-size: 0.9vw;
letter-spacing: 3px;
}
//display: none;
}
}
.hf {
color: #000;
}
.hf1 {
color: #4e9b6d;
.inProd {
svg {
width: 0.4vw;
height: 0.4vw;
}
position: absolute;
left: 33%;
height: 100%;
top: 0%;
color: #fff;
padding: 0 0.2vw;
font-size: 0.4vw;
line-height: 1vh;
background-color: #559e70;
border-radius: 0.5vh;
}
}
.equipment {
position: absolute;
width: 25%;
height: 35%;
&:hover .equipmentName, &:hover .equipmentName1 {
display: inline-block;
}
.equipmentName, .equipmentName1 {
position: absolute;
width: 12.7vw;
height: 4.4vh;
display: none;
span {
position: absolute;
left: 5%;
line-height: 4.4vh;
color: #fff;
font-size: 0.9vw;
letter-spacing: 3px;
}
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗2-名称.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
}
.equipmentName {
top: 4%;
left: -37%;
}
.equipmentName1 {
top: 9%;
left: 73%;
span {
text-align: right;
right: 5%;
}
&::before {
transform-style: preserve-3d;
transform: rotateY(180deg)
}
}
}
</style>

@ -480,6 +480,7 @@
<el-input-number
v-model="form.itemLoop"
label=""
@change="changeVal"
></el-input-number>
</el-form-item>
</el-col>
@ -823,6 +824,11 @@ export default {
this.getList();
},
methods: {
//
changeVal() {
this.$forceUpdate();//
},
// List-穿
setTransfer() {
getEquipmentList().then((response) => {

@ -25,7 +25,7 @@
</el-col>
</el-row>
</div>
</template>

@ -76,7 +76,6 @@ export default {
width: calc(~"100% + 10px");
height: 100%;
margin: 0 -5px;
.border-box-content {
padding: 20px;

@ -161,7 +161,7 @@ export default {
justify-content: end;
align-items: center;
height: 100%;
background-image: url("../assets/images/login-background.jpg");
background-image: url("../assets/images/login-background-none.jpg");
background-size: cover;
}
.title {

@ -85,13 +85,13 @@
>
<el-table-column prop="factoryCode" label="工厂" width="90"/>
<el-table-column prop="workshopCode" label="车间编码" width="90"/>
<el-table-column prop="workshopName" label="车间名称" width="90"/>
<!--<el-table-column prop="workshopName" label="车间名称" width="90"/>-->
<el-table-column prop="productDate" label="日期" width="100"/>
<el-table-column prop="sapCode" label="产线编码" width="90"/>
<el-table-column prop="sapName" label="产线名称" width="160"/>
<!--<el-table-column prop="sapName" label="产线名称" width="160"/>-->
<el-table-column prop="equipmentName" label="组别" width="90"/>
<el-table-column prop="prodType" label="品类" width="80"/>
<el-table-column prop="teamLeaderName" label="组长" width="100"/>
<el-table-column prop="teamLeaderName" label="组长" width="100" :formatter="teamLeaderFormate"/>
<el-table-column prop="workorderCode" label="工单号" width="150"/>
<el-table-column prop="productCode" label="产品编码" width="120" :formatter="productCodeFormate"/>
<el-table-column prop="productName" label="产品名称" width="200"/>
@ -251,6 +251,11 @@ export default {
return cellValue.slice(7,18); //
}
},
teamLeaderFormate(row, column, cellValue){
if(cellValue != null){
return cellValue.split("-")[0]; //
}
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

@ -27,8 +27,7 @@
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
type="number"
placeholder="请输入标准用人"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
@ -36,8 +35,7 @@
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="queryParams.productName"
type="number"
placeholder="请输入标准效率"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -305,8 +303,8 @@ export default {
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
pageNum: null,
pageSize: null,
lineCode: null,
lineName: null,
useMan: null,

@ -13,7 +13,19 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:scrap:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-tabs type="border-card" @tab-click="handleTabClick">
<el-tab-pane label="当月产线产量汇总" >
<el-table :data="tableData" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
@ -326,6 +338,12 @@ export default {
handleQuery() {
this.getList();
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/reportWork/getmonthProductionSut/export', {
...this.queryParams
}, `汇总报表_${new Date().getTime()}.xlsx`)
}
}
};

@ -272,7 +272,7 @@
<el-table-column prop="routeCode" width="75" label="实发"></el-table-column>
<el-table-column prop="routeCode" width="75" label="数量2"></el-table-column>
</el-table>
<!-- 底部 -->
<el-row class="my-print-foot0">
@ -508,7 +508,7 @@ export default {
// this.printData.workTable
for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
// 使slicei1010
let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
// chunkedArray
@ -656,16 +656,16 @@ export default {
</script>
<style>
.my-print-table .el-table {
border-collapse: collapse;
border-spacing: 0;
border-collapse: collapse;
border-spacing: 0;
}
.my-print-table .el-table__header-wrapper th {
border: 1px solid black !important;
border: 1px solid black !important;
}
.my-print-table .el-table__body-wrapper td {
border: 1px solid black !important;
border: 1px solid black !important;
}
.my-print-head {
@ -686,16 +686,17 @@ export default {
}
.my-print-foot {
margin-top: 10px;
}
.my-print-foot0 {
margin-top: -1px;
padding-top:2px;
border-top: 1px solid black;
width: 94%;
margin-top: 20px;
}
@media print {
body {
font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */
font-size: 14px; /* 设置字体大小 */
}
.my-print-table .el-table {
border-collapse: collapse; /* 合并表格边框 */
}
}
.fy{

@ -0,0 +1,34 @@
<template>
<div>
<!-- <u-action-sheet :actions="list" :title="title" :show="show"></u-action-sheet>-->
<!-- <u-button @click="show = true">打开ActionSheet</u-button>-->
<el-button>默认按钮</el-button>
</div>
</template>
<script>
export default {
data() {
return {
title:'标题',
list: [
{
name:'选项一',
subname:"选项一描述",
color:'#ffaa7f',
fontSize:'20'
},
{
name: '选项二禁用',
disabled:true
},
{
name: '开启load加载', //
loading:true
}
],
show: false
};
}
};
</script>

@ -0,0 +1,442 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="检验类型" prop="typeCode">
<el-select
v-model="queryParams.typeCode"
clearable
placeholder="请选择检验类型"
@change="getCheckTypeList"
>
<el-option
v-for="dict in dict.type.check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检验节点" prop="checkType">
<el-select
v-model="queryParams.checkType"
clearable
placeholder="检验节点"
>
<el-option
v-for="dict in checkTypeList"
:key="dict.checkType"
:label="dict.checkName"
:value="dict.checkType"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检测项" prop="ruleName">
<el-input
v-model="queryParams.ruleName"
placeholder="请输入检测项名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['quality:cpkUpDowConfig:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['quality:cpkUpDowConfig:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['quality:cpkUpDowConfig:remove']"
>删除
</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['mes:mesLine:export']"
>导入
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"></el-button>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="updownList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="物料号" width="150" align="center" prop="materialCode" :formatter="productCodeFormate"/>
<el-table-column label="物料名称" align="center" prop="materialName"/>
<el-table-column label="检验类型" width="140" align="center" prop="typeCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_type" :value="scope.row.typeCode"/>
</template>
</el-table-column>
<el-table-column label="检验节点" width="140" align="center" prop="checkType"/>
<el-table-column label="检测项编码" width="140" align="center" prop="ruleCode"/>
<el-table-column label="检测项名称" width="140" align="center" prop="ruleName"/>
<el-table-column label="上限" width="120" align="center" prop="upVal"/>
<el-table-column label="下限" width="120" align="center" prop="downVal"/>
<el-table-column label="创建时间" width="150" align="center" prop="createTime"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改物料CPK上下限维护对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="检验类型" prop="typeCode">
<el-select
v-model="form.typeCode"
clearable
style="width:100%"
placeholder="请选择检验类型"
@change="getCheckTypeList"
>
<el-option
v-for="dict in dict.type.check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检验类型" prop="checkType">
<el-select
v-model="form.checkType"
clearable
style="width:100%"
placeholder="检验节点"
@change="getProjectListFunc"
>
<el-option
v-for="dict in checkTypeList"
:key="dict.checkType"
:label="dict.checkName"
:value="dict.checkType"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料号" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料号">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="选择检测项" prop="ruleCode">
<el-select
v-model="form.ruleCode"
clearable
style="width:100%"
placeholder="检验节点"
filterable
@change="getProjectNameFunc"
>
<el-option
v-for="item in projectNoOptions"
:key="item.recordId"
:label="item.ruleName"
:value="item.recordId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检测项名称" prop="ruleName" >
<el-input v-model="form.ruleName" placeholder="请输入物料名称" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上限" prop="upVal">
<el-input v-model="form.upVal" type="number" placeholder="请输入上限" min="0"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下限" prop="downVal">
<el-input v-model="form.downVal" type="number" placeholder="请输入下限" min="0"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<ItemSelectMaterial
ref="itemSelectMaterial"
@onSelected="onSelectMaterial"
></ItemSelectMaterial>
</div>
</template>
<script>
import {listCpkUpdown,getCpkUpdown, delCpkUpdown,addCpkUpdown,updateCpkUpdown } from "@/api/quality/cpkUpdown";
import ItemSelectMaterial from "@/views/quality/cpkUpDowConfig/selectMaterial";
import {getCheckTypeList,getProjectOptionList} from "@/api/quality/qcTable";
export default {
name: "Updown",
dicts: ["check_type"],
components: {ItemSelectMaterial},
data() {
return {
//
loading: true,
//
ids: [],
checkTypeList: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// CPK
updownList: [],
projectNoOptions: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
typeCode: null,
checkType: null,
factoryCode: null,
materialCode: null,
materialName: null,
upVal: null,
downVal: null
},
//
form: {downVal:0,upVal:0},
//
rules: {
typeCode: [{ required: true, message: "检验类型", trigger: "blur" }],
checkType: [{ required: true, message: "检验节点", trigger: "blur" }],
materialCode: [{ required: true, message: "物料名称", trigger: "blur" }],
ruleName: [{ required: true, message: "检测项名称", trigger: "blur" }],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询物料CPK上下限维护列表 */
getList() {
this.loading = true;
listCpkUpdown(this.queryParams).then(response => {
this.updownList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
typeCode: null,
checkType: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null,
delFlag: null,
materialCode: null,
materialName: null,
upVal: null,
downVal: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加物料CPK上下限维护";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id =
row.id || this.ids
getCpkUpdown(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改物料CPK上下限维护";
this.getCheckTypeList(this.form.typeCode);
this.getProjectListFunc(this.form.checkType)
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateCpkUpdown(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCpkUpdown(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除数据项?').then(function() {
return delCpkUpdown(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/cpkUpdown/export', {
...this.queryParams
}, `cpkUpDow_${new Date().getTime()}.xlsx`)
},
getCheckTypeList(val) {
getCheckTypeList(val).then((response) => {
this.checkTypeList = response;
});
},
//
productCodeFormate(row, column, cellValue) {
if (cellValue != null) {
return cellValue.slice(7, 18); //
}
},
//
handleSelectProduct() {
this.$refs.itemSelectMaterial.showFlag = true;
},
//
onSelectMaterial(obj) {
this.form.materialName = obj[0].productName;
this.form.materialCode = obj[0].productCode;
},
//
getProjectListFunc(val) {
getProjectOptionList(val).then((response) => {
this.projectNoOptions = response;
});
},
getProjectNameFunc(value){
const selectedOption = this.projectNoOptions.find(option => option.recordId === value);
if (selectedOption) {
this.form.ruleName = selectedOption.ruleName;
}
}
}
};
</script>

@ -0,0 +1,153 @@
<template>
<el-dialog title="BOM物料选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="1000px"
>
<el-row :gutter="20">
<!--BOM数据-->
<el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
<el-form-item label="物料编码" prop="itemCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入物料编码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="itemName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
<el-table-column width="50" align="center" type="selection">
</el-table-column>
<!-- 序号 -->
<el-table-column type="index" width="90" align="center" label="序号"></el-table-column>
<el-table-column label="BOM物料组件编码" align="left" key="productCode" prop="productCode" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="BOM物料组件名称" align="left" key="productName" prop="productName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitBomForm"> </el-button>
<el-button @click="showFlag=false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import {getProductListBom } from "@/api/mes/mesLine";
export default {
name: "itemSelectMaterial",
data() {
return {
showFlag:false,
//
selectedRows: {},
//
single: true,
//
multiple: false,
//
showSearch: true,
selectedList: [],
//
total: 0,
// BOM
itemList: [],
productList:[],
//
bomCode: undefined,
defaultProps: {
id: "id",
label: "label"
},
//
queryParams: {
pageNum: 1,
pageSize: 10,
productCode: '',
productName: ''
},
//
columns: [
{ key: 0, label: `BOM物料编码`, visible: true },
{ key: 1, label: `产品名称`, visible: true },
{ key: 2, label: `BOM物料组件编码`, visible: true },
{ key: 3, label: `BOM物料组件名称`, visible: true }
]
};
},
created() {
this.getList();
},
methods: {
handleEquipmentSelectionChange (val) {
this.itemList = val
},
/** 查询BOM列表*/
getList() {
this.loading = true;
getProductListBom(this.queryParams).then(response => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleBomSelectionChange(selection) {
if(selection.length==1){
this.productList = selection;
}else{
this.$modal.msgSuccess("请选择一个产品");
}
},
submitBomForm() {
this.$emit('onSelected', this.productList);
this.showFlag = false;
}
}
};
</script>

@ -656,7 +656,13 @@
<el-row>
<el-col :span="20">
<el-form-item label="综合结论:" label-width="160px">
<el-input type="textarea" disabled/>
<el-col :span="6">
<span v-if="this.checkResult=='Y'"></span>
<span label="N" v-else>×</span>
</el-col>
<el-col :span="8">
备注:判定合格打不合格打×
</el-col>
</el-form-item>
</el-col>
</el-row>
@ -739,6 +745,7 @@ export default {
validateRules: [],
checkList: [],
standardNo: null,
checkResult: 'Y',
printData: {
printable: 'printForm',
ignore: ['no-print'],
@ -960,6 +967,7 @@ export default {
this.form.ignore = ['no-print'];//
this.firstReportOpen = true;
this.title = "首检检验报告";
this.checkResult = response.data.checkResult;
})
this.queryParams.recordId = recordId;
this.getCheckedProjectList();

@ -544,7 +544,7 @@ export default {
this.checkProjectList0 = itemType0s;
this.total = response.total;
this.loading = false;
this.form.standardNo = this.checkProjectList[0].standardNo;
//this.form.standardNo = this.checkProjectList[0].standardNo;
this.rowspan()
});

@ -9,10 +9,19 @@
<el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
<el-form-item label="单号">
<el-form-item label="物料名称">
<el-input
v-model="queryParams.orderNo"
placeholder="单号"
v-model="queryParams.materialName"
placeholder="物料名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-input
v-model="queryParams.materialCode"
placeholder="物料编码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
@ -27,8 +36,8 @@
<el-table-column width="50" align="center" type="selection"/>
<el-table-column label="单号" align="left" prop="orderNo" width="120"/>
<el-table-column label="产品编码" align="left" prop="materialCode" width="180" />
<el-table-column label="产品名称" align="left" prop="materialName" width="180"/>
<el-table-column label="物料编码" align="left" prop="materialCode" width="180" />
<el-table-column label="物料名称" align="left" prop="materialName" width="180"/>
<el-table-column label="数量" align="left" prop="quality" width="100" />
<el-table-column label="仓库编码" align="left" prop="supplierCode"/>
<el-table-column label="仓库编名称" align="left" prop="supplierName" width="120"/>

@ -2,6 +2,18 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="送货单号" prop="userDefined5">
<el-input
v-model="queryParams.userDefined5"
placeholder="请输入送货单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购单号" prop="procureCode">
<el-input
v-model="queryParams.procureCode"

@ -35,7 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080`,
// target: `http://192.168.202.20:8080`,
target: `http://localhost:8080`,
// target: `http://192.168.3.93:8080`,
// target: `http://192.168.3.158:8080`,
// target: `http://192.168.202.34:30000`,

Loading…
Cancel
Save