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

Revert "盘点剩余功能完善"

Browse Source 
This reverts commit 1a2520aa8a.
merge-requests/1/head
张鑫 5 years ago
parent 1a2520aa8a
commit 284d4ac594
7 changed files with 51 additions and 118 deletions
Show Stats Download Patch File Download Diff File

27
src/views/alarmVideos/alarmLog.vue
Unescape Escape View File

@ -15,14 +15,7 @@
</a-col> </a-col>
<a-col :span="10"> <a-col :span="10">
<a-form-item class="ageInput" label="告警时间"> <a-form-item class="ageInput" label="告警时间">
<a-range-picker <a-range-picker @change="onTimeChange" v-model="time">
@change="onTimeChange"
v-model="time"
format="YYYY-MM-DD HH:mm:ss"
:show-time="{
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/> <a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
@ -94,15 +87,11 @@
<script> <script>
import {imgUrl, videoUrl} from "@/api/importExcel"; import {imgUrl, videoUrl} from "@/api/importExcel";
import Model from "./model.vue" import Model from "./model.vue"
import moment from 'moment';
export default { export default {
name: "alarmLog", name: "alarmLog",
data() { data() {
return { return {
queryParam: { queryParam: {},
startTime: moment().subtract(1, "weeks").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个星期时间
endTime: moment().format('YYYY-MM-DD HH:mm:ss')
},
time:[], time:[],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -160,14 +149,6 @@ export default {
console.log(this.imgUrl) console.log(this.imgUrl)
}, },
methods: { methods: {
moment,
range(start, end) {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
},
getStreetList(){ getStreetList(){
this.$api.httpApi.getStreetList({ this.$api.httpApi.getStreetList({
data: { data: {
@ -230,8 +211,8 @@ export default {
this.queryParam.endTime = "" this.queryParam.endTime = ""
}, },
reset() { reset() {
this.queryParam.startTime = moment().subtract(1, "weeks").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个星期时间 this.queryParam.startTime = ""
this.queryParam.endTime = moment().format('YYYY-MM-DD HH:mm:ss') this.queryParam.endTime = ""
this.queryParam.streetId = 0 this.queryParam.streetId = 0
this.time = [] this.time = []
this.handleGetalarmLog() this.handleGetalarmLog()

27
src/views/alarmVideos/index.vue
Unescape Escape View File

@ -5,13 +5,8 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="5" style="text-align: left"> <a-col :span="5" style="text-align: left">
<a-form-item label="时间"> <a-form-item label="时间">
<a-range-picker @change="onTimeChange" <a-range-picker @change="onTimeChange" v-model="time"
v-model="time" format="YYYY-MM-DD HH:mm">
format="YYYY-MM-DD HH:mm"
:show-time="{
defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/> <a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
@ -58,7 +53,6 @@
<script> <script>
import Model from "./model.vue" import Model from "./model.vue"
import {videoUrl} from "@/api/importExcel"; import {videoUrl} from "@/api/importExcel";
import moment from 'moment';
export default { export default {
name: "historyMonitoring", name: "historyMonitoring",
components: { components: {
@ -69,10 +63,7 @@ export default {
return { return {
labelCol: { span: 6 }, labelCol: { span: 6 },
wrapperCol: { span: 18 }, wrapperCol: { span: 18 },
queryParam: { queryParam: {},
startTime: moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个天时间
endTime: moment().format('YYYY-MM-DD HH:mm:ss')
},
time:[], time:[],
pageNum:1, pageNum:1,
pageSize:10, pageSize:10,
@ -118,14 +109,6 @@ export default {
this.handleGetalarmList() this.handleGetalarmList()
}, },
methods: { methods: {
moment,
range(start, end) {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
},
handleSearch(){ handleSearch(){
console.log(this.queryParam) console.log(this.queryParam)
this.handleGetalarmList() this.handleGetalarmList()
@ -176,8 +159,8 @@ export default {
this.vid = data this.vid = data
}, },
reset() { reset() {
this.queryParam.startTime = moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss') this.queryParam.startTime = ""
this.queryParam.endTime = moment().format('YYYY-MM-DD HH:mm:ss') this.queryParam.endTime = ""
this.time = [] this.time = []
this.handleGetalarmList() this.handleGetalarmList()
}, },

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

@ -37,7 +37,7 @@
</a-select> </a-select>
</div> </div>
<div v-if="checkObj.id"> <div v-if="JSON.stringify(checkObj) !== '{}'">
<div v-for="(key,value) in checkList" :key="value"> <div v-for="(key,value) in checkList" :key="value">
<div v-if="checkObj.shelveId == value"> <div v-if="checkObj.shelveId == value">
<!--{{value}}{{key}}--> <!--{{value}}{{key}}-->
@ -160,7 +160,7 @@
<div class="status-btn"> <div class="status-btn">
<a-button class="btn" <a-button class="btn"
type="danger" type="danger"
@click="showModel({},index)" @click="showModel(index)"
>人工复核 >人工复核
</a-button> </a-button>
<a-button class="btn" <a-button class="btn"
@ -318,7 +318,6 @@ export default {
console.log(value) console.log(value)
this.select = value this.select = value
this.id = value this.id = value
console.log(JSON.stringify(this.checkObj))
this.getStreetList() this.getStreetList()
for (var i = 0; i < this.listData.length; i++) { for (var i = 0; i < this.listData.length; i++) {
console.log(this.listData[i]) console.log(this.listData[i])
@ -326,18 +325,18 @@ export default {
if (this.listData[i].leftShelveId) { if (this.listData[i].leftShelveId) {
this.shelveId = this.listData[i].leftShelveId this.shelveId = this.listData[i].leftShelveId
this.selectType = 'left' this.selectType = 'left'
this.selectType2 = 'none' this.selectType2 = 'out'
this.getStockInfo(1, 1, this.shelveId) this.getStockInfo(1, 1, this.listData[i].leftShelveId)
} else if (this.listData[i].leftInsideShelveId) { } else if (this.listData[i].leftInsideShelveId) {
this.shelveId = this.listData[i].leftInsideShelveId this.shelveId = this.listData[i].leftInsideShelveId
this.selectType = 'left' this.selectType = 'left'
this.selectType2 = 'inside' this.selectType2 = 'none'
this.getStockInfo(1, 1, this.shelveId) this.getStockInfo(1, 1, this.listData[i].leftInsideShelveId)
} else if (this.listData[i].leftOutsideShelveId) { } else if (this.listData[i].leftOutsideShelveId) {
this.shelveId = this.listData[i].leftOutsideShelveId this.shelveId = this.listData[i].leftOutsideShelveId
this.selectType = 'left' this.selectType = 'left'
this.selectType2 = 'out' this.selectType2 = 'none'
this.getStockInfo(1, 1, this.shelveId) this.getStockInfo(1, 1, this.listData[i].leftOutsideShelveId)
} }
@ -518,7 +517,6 @@ export default {
flex-direction: column; flex-direction: column;
font-size: 17px; font-size: 17px;
height: 400px; height: 400px;
margin-right: 10px;
img { img {
height: 100% height: 100%
} }

12
src/views/checkManage/index.vue
Unescape Escape View File

@ -1,10 +1,5 @@
<template> <template>
<div class="check-page"> <div class="check-page">
<div style="width:100%;text-align:right;margin-bottom:5px">
<a-button type="primary" @click="exportStock" style="text-align:right">
导出全部巷道
</a-button>
</div>
<div class="title-info"> <div class="title-info">
<span class="explain">颜色说明：</span> <span class="explain">颜色说明：</span>
<span class="info-text"> <span class="info-text">
@ -90,6 +85,9 @@
{{i.name}} {{i.name}}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-button type="primary" @click="exportStock">
导出全部巷道
</a-button>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.name"> <div class="check-content" v-for="item in data" :key="item.name">
<div class="roadway-buttom" v-if="item.id == select"> <div class="roadway-buttom" v-if="item.id == select">
@ -272,12 +270,12 @@ export default {
.roadway-top { .roadway-top {
padding: 20px 0; padding: 20px 0;
width: 90%; width: 1000px;
} }
.roadway-buttom { .roadway-buttom {
padding: 20px 0 20px 0; padding: 20px 0 20px 0;
width: 90%; width: 1000px;
} }
.scroll-box { .scroll-box {

50
src/views/checkManage/model.vue
Unescape Escape View File

@ -94,34 +94,30 @@ export default {
}, },
methods: { methods: {
handleOk() { handleOk() {
if (JSON.stringify(this.mData) !== '{}') { this.confirmLoading = true;
this.confirmLoading = true; setTimeout(() => {
setTimeout(() => { this.form.validateFields((err, values) => {
this.form.validateFields((err, values) => { console.log(values)
console.log(values) if (!err) {
if (!err) { this.$api.httpApi.stockCheckByMan({
this.$api.httpApi.stockCheckByMan({ data: {
data: { ...values,
...values, column: this.mData.column,
column: this.mData.column, row: this.mData.row,
row: this.mData.row, shelveId: this.mData.shelveId,
shelveId: this.mData.shelveId, }
} }).then(res => {
}).then(res => { if (res.code == 200) {
if (res.code == 200) { this.$emit('sure', false, this.i)
this.$emit('sure', false, this.i) this.$message.success('复核成功');
this.$message.success('复核成功'); }
} }).catch(err => {
}).catch(err => {
}); });
} }
}); });
this.confirmLoading = false; this.confirmLoading = false;
}, 500); }, 500);
} else {
this.$message.error('该货位暂时没有记录');
}
}, },
handleCancel() { handleCancel() {
console.log('Clicked cancel button'); console.log('Clicked cancel button');

33
src/views/historyMonitoring/index.vue
Unescape Escape View File

@ -10,14 +10,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item class="ageInput" label="时间"> <a-form-item class="ageInput" label="时间">
<a-range-picker <a-range-picker @change="onTimeChange" v-model="time">
@change="onTimeChange"
v-model="time"
format="YYYY-MM-DD HH:mm"
:show-time="{
defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/> <a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
@ -89,14 +82,11 @@
<script> <script>
import {imgUrl, videoUrl} from "@/api/importExcel"; import {imgUrl, videoUrl} from "@/api/importExcel";
import Model from "./model.vue" import Model from "./model.vue"
import moment from 'moment';
export default { export default {
name: "historyMonitoring", name: "historyMonitoring",
data() { data() {
return { return {
queryParam: { queryParam: {},
orderNum: ''
},
time:[], time:[],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -168,20 +158,8 @@ export default {
mounted() { mounted() {
this.handleGetHistoryList() this.handleGetHistoryList()
console.log(this.imgUrl) console.log(this.imgUrl)
if (this.$route.query.orderNum) {
console.log(this.$route.query.orderNum)
this.queryParam.orderNum = this.$route.query.orderNum
}
}, },
methods: { methods: {
moment,
range(start, end) {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
},
handleSearch() { handleSearch() {
console.log(this.queryParam) console.log(this.queryParam)
this.handleGetHistoryList() this.handleGetHistoryList()
@ -217,8 +195,7 @@ export default {
onTimeChange(date, dateString) { onTimeChange(date, dateString) {
this.handleReset() this.handleReset()
console.log(date) console.log(date)
console.log(dateString) console.log(date[0].format('YYYY-MM-DD HH:mm:ss'))
console.log(date[0].format('YYYY-MM-DD HH:mm'))
this.queryParam.startTimestamp = date[0].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') this.queryParam.endTimestamp = date[1].format('YYYY-MM-DD HH:mm:ss')
}, },
@ -235,8 +212,8 @@ export default {
this.vid = data this.vid = data
}, },
reset() { reset() {
this.queryParam.startTimestamp = "" this.queryParam.startTime = ""
this.queryParam.endTimestamp = "" this.queryParam.endTime = ""
this.queryParam.orderNum = "" this.queryParam.orderNum = ""
this.time = [] this.time = []
this.handleGetHistoryList() this.handleGetHistoryList()

2
vue.config.js
Unescape Escape View File

@ -10,7 +10,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
target: 'http://192.168.66.27:8099', target: 'http://192.168.66.56:9007',
logLevel:'debug', //控制台终端打印代理前的真实地址 logLevel:'debug', //控制台终端打印代理前的真实地址
}, },
}, },

Write Preview
Loading…
Cancel
Save