upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1.plc状态放出，保证手动连接

Browse Source 
2.左右深浅采用上个页面的数据
just-order
LAPTOP-S9HJSOEB\昊天 2 years ago
parent 9c0f8fafea
commit 04ba1fee68
5 changed files with 416 additions and 278 deletions
Show Stats Download Patch File Download Diff File

5
src/api/http/http-api.js
Unescape Escape View File

@ -218,6 +218,11 @@ export default {
name: '人工复核正确',
method: 'POST'
},
stockCheckCorrectErr: {
url: '/stock/checkCorrectErr',
name: '人工复核错误',
method: 'POST'
},
stockCheckByMan: {
url: '/stock/checkByMan',
name: '人工复核',

116
src/layouts/AsideMenu.vue
Unescape Escape View File

@ -1,10 +1,25 @@
<template>
<a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible :style="styles.menu.default">
<div class="logo" :style="styles.title.style">
<a-layout-sider
:class="['aside', collapsed ? 'merge' :'']"
v-model="collapsed"
theme="dark"
:trigger="null"
collapsible
:style="styles.menu.default"
>
<a-layout>
<a-layout-header :style="styles.title.style">
<div
class="logo"
:style="styles.title.style"
>
<!-- <img src="@/assets/logo1.png" alt />-->
<span class="logo-title">{{ styles.title.text }}</span>
</div>
<a-menu :selectedKeys="selectedKeys"
</a-layout-header>
<a-layout-content style="height: 88vh;">
<a-menu
:selectedKeys="selectedKeys"
:openKeys.sync="openKeys"
@click="clickMenu"
mode="inline"
@ -25,10 +40,20 @@
<span>{{ item.meta.name }}</span>
</a-menu-item>
<!-- 存在子路由 -->
<aside-item :key="item.name" :menuInfo="item" v-else></aside-item>
<aside-item
:key="item.name"
:menuInfo="item"
v-else
></aside-item>
</template>
</a-menu>
</a-menu></a-layout-content>
<a-layout-footer :style="styles.title.style"><span style="font-size: 17px;">版本：v1.15.8</span></a-layout-footer>
</a-layout>
</a-layout-sider>
</template>
<script>
@ -37,7 +62,7 @@ export default {
name: "AsideMenu",
computed: {
...mapState(["aside_collapsed", "userInfo"]),
...mapGetters(['getAside_collapsed', 'styles'])
...mapGetters(["getAside_collapsed", "styles"]),
},
watch: {
$route() {
@ -45,8 +70,8 @@ export default {
this.setRoute();
},
getAside_collapsed: function (newValue) {
console.log(newValue)
this.collapsed = newValue
console.log(newValue);
this.collapsed = newValue;
},
},
data() {
@ -60,34 +85,52 @@ export default {
},
methods: {
clickMenu(item) {
this.$router.push({
name: item.key
},onComplete => { }, onAbort => { });
this.$router.push(
{
name: item.key,
},
(onComplete) => {},
(onAbort) => {}
);
},
// 设置路由
setRoute() {
let parents = [];
if (this.userInfo.id) {
parents = this.$router.options.routes[0].children.filter(ele => {
parents = this.$router.options.routes[0].children.filter(
(ele) => {
if (
this.userInfo.permissionList.some(item => {
return item.rights === ele.name && ele.name.indexOf("center") < 0
&& item.rights === ele.name && ele.name.indexOf("ioTable") < 0
&& item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0
&& item.rights === ele.name && ele.name.indexOf("plcStatus") < 0
&& item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0
&& item.rights === ele.name && ele.name.indexOf("checkOperation") < 0;
this.userInfo.permissionList.some((item) => {
return (
item.rights === ele.name &&
ele.name.indexOf("center") < 0 &&
item.rights === ele.name &&
ele.name.indexOf("ioTable") < 0 &&
item.rights === ele.name &&
ele.name.indexOf(
"realTimeMonitoringModel"
) < 0 &&
item.rights === ele.name &&
ele.name.indexOf("plcStatus") < 0 &&
item.rights === ele.name &&
ele.name.indexOf("cameraManageModel") < 0 &&
item.rights === ele.name &&
ele.name.indexOf("checkOperation") < 0
);
})
) {
return ele;
}
});
}
);
// // 递归权限路由
let recursionRoute = parents => {
let recursionRoute = (parents) => {
for (let i = 0; i < parents.length; i++) {
let isAuth = this.userInfo.permissionList.some(item => {
let isAuth = this.userInfo.permissionList.some(
(item) => {
return parents[i].name === item.rights;
});
}
);
parents[i].meta.auth = isAuth;
parents[i].children &&
parents[i].children.length > 0 &&
@ -96,9 +139,19 @@ export default {
};
recursionRoute(parents);
} else {
parents = this.$router.options.routes[0].children.filter(item => {
return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus") && !item.name.startsWith("cameraManageModel") && !item.name.startsWith("checkOperation") && !item.name.startsWith("stockLog") ;
});
parents = this.$router.options.routes[0].children.filter(
(item) => {
return (
!item.name.startsWith("center") &&
!item.name.startsWith("ioTable") &&
!item.name.startsWith("realTimeMonitoringModel") &&
!item.name.startsWith("plcStatus") &&
!item.name.startsWith("cameraManageModel") &&
!item.name.startsWith("checkOperation") &&
!item.name.startsWith("stockLog")
);
}
);
}
this.routes = parents;
@ -111,7 +164,10 @@ export default {
if (this.$route.matched.length > 3) {
this.selectedKeys = [this.$route.matched[2].name];
} else {
this.selectedKeys = [this.$route.matched[this.$route.matched.length - 1].name];
this.selectedKeys = [
this.$route.matched[this.$route.matched.length - 1]
.name,
];
}
} else {
this.selectedKeys = [this.$route.matched[1].name];
@ -130,14 +186,14 @@ export default {
this.mouseItemKey = e.key;
},
menuItemOut() {
this.mouseItemKey = '';
}
this.mouseItemKey = "";
},
},
mounted() {
this.$nextTick(() => {
this.setRoute();
});
}
},
};
</script>
<style lang="scss">

16
src/router/index.js
Unescape Escape View File

@ -180,14 +180,14 @@ const routes = [{
// },
// component: () => import('@/views/center')
// },
// {
// path: 'plcStatus',
// name: 'plcStatus',
// meta: {
// name: 'PLC状态'
// },
// component: () => import('@/views/plcStatus')
// }
{
path: 'plcStatus',
name: 'plcStatus',
meta: {
name: 'PLC状态'
},
component: () => import('@/views/plcStatus')
}
]
},
{

93
src/views/checkManage/checkOperation.vue
Unescape Escape View File

@ -3,18 +3,18 @@
<div>
<div class="carousel-page">
<div class="carousel-page-content" style="margin-bottom: 150px;">
<div class="img-box">
<div class="carousel-page-content" >
<div class="img-box" style="width: 30%;">
<ul>
<li>
<li class="img-box-item">
<span class="img-box-title">
位置:
</span>
<span class="img-box-value">
{{checkObj.streetName}}-{{direction==1?"左":"右"}}-{{side==1?"浅":"深"}}-{{checkObj.column}}列-{{checkObj.row}}层
{{streetName}}-{{direction==1?"左":"右"}}-{{side==1?"浅":"深"}}-{{checkObj.column}}列-{{checkObj.row}}层
</span>
</li >
<li>
<li class="img-box-item">
<span class="img-box-title">
核对状态:
</span>
@ -22,51 +22,35 @@
{{ statusMap[checkObj.status] }}
</span>
</li>
<li v-for="item in params" :key="item.label">
<li class="img-box-item" v-for="item in params" :key="item.label">
<span class="img-box-title">
{{ item.label }}:
</span>
<span class="img-box-value">
{{ checkObj[item.key] ==null? checkObj[item.key]: item.value}}
{{ checkObj[item.key] }}
</span>
</li>
</ul>
</div>
<div class="img-box">
<viewer v-if="checkObj.checkPic" style="height: 600px">
<img src="@/assets/1.jpg" style="background-color: transparent;transform:rotate(270deg);" />
</viewer>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
</div>
<p>盘点图1</p>
</div>
<!-- <div class="img-box">
<viewer v-if="checkObj.preoperationPic" style="height:300px;">
<img :src="imgUrl+checkObj.preoperationPic"/>
</viewer>
<div class="img-box" style="width: 60%;">
<a-carousel autoplay style="width: 100%;height: 100%;" class="carousel-box" dot-position="right">
<div v-else style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
</div>
<p>操作前照片</p>
</div>
<div class="img-box">
<viewer v-if="checkObj.overoperationPic" style="width:100%;height:300px;">
<img :src="imgUrl+checkObj.overoperationPic"/>
</viewer>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
v-for="ite in checkPics"
:key="ite"
style="float:left;"
>
<img style="height:100%; width:100% " :src="ite">
</div>
</a-carousel>
<p>盘点图</p>
</div>
<p>操作后照片</p>
</div> -->
</div>
</div>
<div class="bottom-btn" >
@ -109,7 +93,7 @@ import { message } from 'ant-design-vue';
export default {
data() {
return {
checkPics:[],
upUrl:"",
checkObj: {},
row: 1,
@ -137,13 +121,11 @@ export default {
},
{
label:'品规',
key: 'trayCode',
value: '123'
key: 'category'
},
{
label:'个数',
key: 'trayCode',
value: '24'
key: 'count'
},
{
label:'盘点时间',
@ -205,7 +187,9 @@ export default {
}).then(res => {
if (res.data) {
this.checkObj = res.data;
this.checkObj.checkPic2 = this.checkObj.checkPic + ".jpg"
var pic = this.checkObj.checkPic;
this.checkPics = pic.toString().split(';')
this.$forceUpdate()
//this.shelveId = res.data.shelveId;
//this.getScanAndCheck();
}
@ -243,7 +227,7 @@ export default {
});
},
checkfalse(row, column, shelveId, index) {
this.$api.httpApi.stockCheckCorrect({
this.$api.httpApi.stockCheckCorrectErr({
data: {
row: Number(row),
column: Number(column),
@ -294,7 +278,7 @@ export default {
this.side = res.data.side
this.streetId = res.data.streetId
this.streetName = res.data.streetName
this.checkObj.checkPic2 = this.checkObj.checkPic + ".jpg"
this.checkPics = this.checkObj.checkPic.slpit(';');
}else{
message.info('全部盘点已完成')
@ -308,9 +292,8 @@ export default {
}
</script>
<style lang="scss">
.ant-carousel .slick-slide {
color: #000000;
}
/* For demo */
.checkOperation {
.carousel-page {
@ -336,7 +319,7 @@ export default {
justify-content: center;
flex-direction: column;
font-size: 17px;
height: 700px;
height: 900px;
margin-right: 10px;
img {
height: 100%
@ -350,7 +333,7 @@ export default {
height: 100%;
margin-bottom: 0;
padding-inline-start: 0;
li {
.img-box-item {
background-color: #ffaf11;
margin: 10px 0;
padding: 5px;
@ -358,13 +341,14 @@ export default {
font-weight: 600;
color: #494e52;
.img-box-title {
width: 130px;
width: 80px;
display: inline-block;
}
.img-box-value {
display: inline-block;
width: calc(100% - 130px);
overflow: hidden;
width: 130px;
position: relative;
top: 5px;
}
@ -432,4 +416,13 @@ export default {
height:auto;
}
.carousel-box{
text-align: center;
background: #364d79;
height: 100%;
overflow: hidden;
li{
background-color: #ffffff;
}
}
</style>

268
src/views/historyCheck/index.vue
Unescape Escape View File

@ -1,12 +1,23 @@
<template>
<div class="history bg-white">
<div class="ant-advanced-search-form">
<a-form layout="inline" :form="queryParam">
<a-form
layout="inline"
:form="queryParam"
>
<a-row :gutter="24">
<a-col :span="4">
<a-form-item label="巷道">
<a-select @change="handleChange" :value="select" style="width:100px">
<a-select-option v-for="i in listData" :key="i.name" :value="i.id">
<a-select
@change="handleChange"
:value="select"
style="width:100px"
>
<a-select-option
v-for="i in listData"
:key="i.name"
:value="i.id"
>
{{i.name}}
</a-select-option>
</a-select>
@ -15,7 +26,10 @@
</a-col>
<a-col :span="2">
<a-form-item label="左右">
<a-select v-model="queryParam.leftRight" @change="leftRightChange" >
<a-select
v-model="queryParam.leftRight"
@change="leftRightChange"
>
<a-select-option :value=0>
未选择
</a-select-option>
@ -47,19 +61,41 @@
</a-col> -->
<a-col :span="2" style="text-align: left">
<a-col
:span="2"
style="text-align: left"
>
<a-form-item label="行号">
<a-input v-model="queryParam.row" placeholder="请输入" style="width:50px;" type="number"/>
<a-input
v-model="queryParam.row"
placeholder="请输入"
style="width:50px;"
type="number"
/>
</a-form-item>
</a-col>
<a-col :span="2" style="text-align: left">
<a-col
:span="2"
style="text-align: left"
>
<a-form-item label="列号">
<a-input v-model="queryParam.column" placeholder="请输入" style="width:50px;" type="number"/>
<a-input
v-model="queryParam.column"
placeholder="请输入"
style="width:50px;"
type="number"
/>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: left">
<a-col
:span="4"
style="text-align: left"
>
<a-form-item label="盘点号">
<a-input v-model="queryParam.lotnum" placeholder="请输入" />
<a-input
v-model="queryParam.lotnum"
placeholder="请输入"
/>
</a-form-item>
</a-col>
<a-col :span="4">
@ -73,13 +109,25 @@
//defaultValue: [moment('00:00', 'YYYY-MM-DD HH:mm'), moment('23:59', 'YYYY-MM-DD HH:mm')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/>
<a-icon
slot="suffixIcon"
type="calendar"
/>
</a-range-picker>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: right">
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button style="margin-left: 15px" @click="reset">重置</a-button>
<a-col
:span="4"
style="text-align: right"
>
<a-button
type="primary"
@click="handleSearch"
>搜索</a-button>
<a-button
style="margin-left: 15px"
@click="reset"
>重置</a-button>
</a-col>
</a-row>
</a-form>
@ -92,28 +140,50 @@
:pagination="pagination"
@change="handleGetHistoryList"
>
<span slot="checkNum" slot-scope="text">
<span
slot="checkNum"
slot-scope="text"
>
{{ text }}
</span>
<span slot="goodsLocation" slot-scope="text">
<span
slot="goodsLocation"
slot-scope="text"
>
{{ text.direction }}-{{ text.row}}-{{ text.column}}
</span>
<span slot="status" slot-scope="text">
<span
slot="status"
slot-scope="text"
>
{{ statusMap[text.status] }}
</span>
<span slot="pic" slot-scope="text" style="width:auto">
<span
slot="pic"
slot-scope="text"
style="width:auto"
>
<template>
<span style="height:100%;">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
<viewer>
<img class="historyImg" :src="imgUrl+text.pic"/>
<happy-scroll
color="rgba(100,100,100,0.5)"
size="8"
class="scroll-box"
style="width:320px;height:90px;"
>
<viewer :images="text.pic">
<li
v-for="item in text.pics"
:key="item"
style="float:left"
>
<img style="height:90px" :src="item">
</li>
</viewer>
</happy-scroll>
</span>
</template>
</span>
</a-table>
@ -121,16 +191,21 @@
</template>
<script>
import { imgUrl } from "@/api/importExcel";
import moment from 'moment';
import moment from "moment";
export default {
name: "historyCheck",
data() {
return {
statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"},
statusMap: {
0: "未盘点",
1: "盘点异常",
2: "核对正确",
3: "人工核对正确",
},
queryParam: {
lotnum: '',
side : '',
leftRight : ''
lotnum: "",
side: "",
leftRight: "",
},
listData: [],
time: [],
@ -138,14 +213,15 @@ export default {
pageSize: 10,
data: [],
select: '',
select: "",
pagination: {
total: 0,
defaultPageSize: 10, // 默认每页显示数量
showTotal: total => `共 ${total} 条数据`,// 显示总数
showTotal: (total) => `共 ${total} 条数据`, // 显示总数
showSizeChanger: true, // 显示可改变每页数量
pageSizeOptions: ['10', '20', '30'],
onShowSizeChange: (current, pageSize) => this.pageSize = pageSize // 改变每页数量时更新显示
pageSizeOptions: ["10", "20", "30"],
onShowSizeChange: (current, pageSize) =>
(this.pageSize = pageSize), // 改变每页数量时更新显示
},
imgUrl: imgUrl,
columns: [
@ -159,26 +235,25 @@ export default {
},
{
title: "货位({1:左,2:右}-{行}-{列})",
scopedSlots: {customRender: 'goodsLocation'},
scopedSlots: { customRender: "goodsLocation" },
width: 200,
},
{
title: "盘点状态",
scopedSlots: {customRender: 'status'},
scopedSlots: { customRender: "status" },
},
{
title: "照片",
scopedSlots: {customRender: 'pic'},
scopedSlots: { customRender: "pic" },
width: 320,
},
{
title: "更新时间",
dataIndex: "createTime",
},
],
}
};
},
mounted() {
this.getStreetList();
@ -188,58 +263,63 @@ export default {
moment,
//获取巷道列表
getStreetList() {
this.$api.httpApi.getAllStreet({
}).then(res => {
this.$api.httpApi
.getAllStreet({})
.then((res) => {
this.listData = res.data;
}).catch(err => {
})
.catch((err) => {
console.error(err);
});
},
//获取巷道详情
getStreetDetail(id) {
this.$axios.get('/street/' + id, {
data: {}
}).then(res => {
this.streetDetail = res.data
this.$axios
.get("/street/" + id, {
data: {},
})
.then((res) => {
this.streetDetail = res.data;
this.select = this.streetDetail.name;
this.queryParam.streetId = this.streetDetail.id;
}).catch(err => {
})
.catch((err) => {});
},
handleChange(value) {
this.getStreetDetail(value)
this.queryParam.leftRight = ''
this.queryParam.side = ''
this.getStreetDetail(value);
this.queryParam.leftRight = "";
this.queryParam.side = "";
},
getPics(val) {
return val.split(";");
},
// 左右货架切换
leftRightChange(value) {
if (value == 1) {
//单伸
if (this.streetDetail.leftType == 0) {
this.queryParam.side = ''
this.queryParam.side = "";
} else {
this.queryParam.side = 0
this.queryParam.side = 0;
}
} else if (value == 2) {
if (this.streetDetail.rightType == 0) {
this.queryParam.side = ''
this.queryParam.side = "";
} else {
this.queryParam.side = 0
this.queryParam.side = 0;
}
} else {
this.queryParam.side = ''
this.queryParam.side = "";
}
},
handleSearch() {
console.log(this.queryParam)
this.pageNum = 1
this.request()
console.log(this.queryParam);
this.pageNum = 1;
this.request();
},
handleGetHistoryList(pagination) {
console.log(pagination)
console.log(pagination);
if (pagination) {
this.pagination.current = pagination.current;
this.pagination.pageSize = pagination.pageSize;
@ -249,52 +329,56 @@ export default {
this.request();
},
request() {
this.$api.httpApi.checkLog({
this.$api.httpApi
.checkLog({
data: {
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.queryParam
}
}).then(res => {
console.log(res.data)
...this.queryParam,
},
})
.then((res) => {
console.log(res.data);
const pagination = { ...this.pagination };
pagination.total = res.data.total;
this.pagination = pagination;
this.data = res.data.list
}).catch(err => {
});
this.data = res.data.list;
})
.catch((err) => {});
},
onTimeChange(date, dateString) {
this.handleReset()
console.log(date)
console.log(dateString)
console.log(date[0].format('YYYY-MM-DD HH:mm'))
this.pageNum = 1
this.handleReset();
console.log(date);
console.log(dateString);
console.log(date[0].format("YYYY-MM-DD HH:mm"));
this.pageNum = 1;
this.queryParam.startTimestamp = date[0].format('YYYY-MM-DD HH:mm:ss')
this.queryParam.endTimestamp = date[1].format('YYYY-MM-DD HH:mm:ss')
this.queryParam.startTimestamp = date[0].format(
"YYYY-MM-DD HH:mm:ss"
);
this.queryParam.endTimestamp = date[1].format(
"YYYY-MM-DD HH:mm:ss"
);
},
handleReset() {
this.queryParam.startTimestamp = ""
this.queryParam.endTimestamp = ""
this.pageNum = 1
this.queryParam.startTimestamp = "";
this.queryParam.endTimestamp = "";
this.pageNum = 1;
},
reset() {
this.queryParam.startTimestamp = ""
this.queryParam.endTimestamp = ""
this.queryParam.lotnum = ""
this.queryParam.side = ''
this.queryParam.leftRight = ''
this.queryParam.streetId = 0
this.queryParam.startTimestamp = "";
this.queryParam.endTimestamp = "";
this.queryParam.lotnum = "";
this.queryParam.side = "";
this.queryParam.leftRight = "";
this.queryParam.streetId = 0;
this.select = null;
this.time = []
this.pageNum = 1
this.pageSize = 10
this.queryParam.row = null
this.queryParam.column = null
this.request()
this.time = [];
this.pageNum = 1;
this.pageSize = 10;
this.queryParam.row = null;
this.queryParam.column = null;
this.request();
},
},
};

Write Preview
Loading…
Cancel
Save