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

盘点管理首页接口联调

Browse Source
merge-requests/1/head
张鑫 5 years ago
parent 4fa236ed08
commit 43819d68c4
4 changed files with 105 additions and 56 deletions
Show Stats Download Patch File Download Diff File

3
README.md
Unescape Escape View File

@ -27,7 +27,8 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
#### 1、项目git地址：https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git #### 1、项目git地址：https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
#### 2、简介：垛机监控系统是一款TOB的项目，由哲合科技有限公司承担研发，主要为甲方在仓储方面的出入库过程中，提供拍照取证，实时录像，盘点管理等功能。项目主要涵盖实时视频流、历史数据、盘点管理、巷道管理、球机管理、个人中心等。基于vue-cli3.x + Ant Design Vue搭建,rtsp视频流采用VLC插件结合Firefox火狐浏览器运行的方式播放，因VLC支持性问题需回退Firefox火狐浏览器版本至51版之前，详情请见 [VLC开发文档](https://wiki.videolan.org/Documentation:WebPlugin/#Introduction:_Building_Web_pages_with_Video) #### 2、简介：
垛机监控系统是一款TOB的项目，由哲合科技有限公司承担研发，主要为甲方在仓储方面的出入库过程中，提供拍照取证，实时录像，盘点管理等功能。项目主要涵盖实时视频流、历史数据、盘点管理、巷道管理、球机管理、个人中心等。基于vue-cli3.x + Ant Design Vue搭建,rtsp视频流采用VLC插件结合Firefox火狐浏览器运行的方式播放，因VLC支持性问题需回退Firefox火狐浏览器版本至51版之前，详情请见 [VLC开发文档](https://wiki.videolan.org/Documentation:WebPlugin/#Introduction:_Building_Web_pages_with_Video)
#### 3、测试环境地址：暂无(详情请看下面注释) 测试环境账号：暂无(详情请看下面注释) #### 3、测试环境地址：暂无(详情请看下面注释) 测试环境账号：暂无(详情请看下面注释)

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

@ -116,5 +116,15 @@ export default {
name: '编辑分类', name: '编辑分类',
method: 'PUT' method: 'PUT'
}, },
getStockList: {
url: '/stock/list',
name: '获取盘点列表',
method: 'GET'
},
getStreetDetail: {
url: '/street',
name: '获取巷道详情',
method: 'GET'
},
} }

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

@ -15,60 +15,71 @@
未盘点 未盘点
</span> </span>
</div> </div>
<!--<div v-for="item in checkList" :key="item.id">-->
<!--{{item}}-->
<!--</div>-->
<div class="check-content" v-for="item in data" :key="item.id"> <div class="check-content" v-for="item in data" :key="item.id">
<div class="roadway-top" v-if="item.name == select"> <div v-for="(key,value) in checkList" :key="value">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box"> <div class="roadway-top" v-if="item.name == select && value == streetDetail.leftShelveId">
<div class="roadway-box"> <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
<div class="line" v-for="(f,index) in Number(item.leftColumn)" :key="index"> <div class="roadway-box">
<div <div class="line" v-for="(columnItem,column) in key" :key="columnItem">
class="ele" <div v-for="(rowItem,row) in columnItem" :key="row"
@click="tocheckOperation" class="ele"
:style="{background:i+'-'+f == '4-14'|| i+'-'+f=='8-18'?'#bfbfbf':'#bfbfbf'}" @click="tocheckOperation"
v-for="(i,index) in Number(item.leftRow)" :style="{background:rowItem.status ==0?'#bfbfbf':rowItem.status == 1?'#1afa29':'#d81e06'}"
:key="index">{{i}}-{{f}} >{{rowItem.row}}-{{column}}
</div> </div>
</div>
</div>
</happy-scroll>
<!-- <a-radio-group v-model="size" style="margin:10px 0">-->
<!-- <a-radio-button value="small">-->
<!-- 外-->
<!-- </a-radio-button>-->
<!-- <a-radio-button value="default">-->
<!-- 内-->
<!-- </a-radio-button>-->
<!-- </a-radio-group>-->
</div>
<div class="roadway-buttom" v-if="item.name == select">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
<div class="roadway-box">
<div class="line" v-for="f in Number(item.rightColumn)"
:key="f.rightColumn">
<div class="ele"
:style="{background:i+'-'+f == '5-16'|| i+'-'+f=='9-17'||i+'-'+f=='11-15'?'#bfbfbf':'#bfbfbf'}"
v-for="i in Number(item.rightRow)"
:key="i.rightRow">{{i}}-{{f}}
</div> </div>
</div> </div>
</div> </happy-scroll>
</happy-scroll> <a-radio-group v-model="size" style="margin:10px 0"
<!-- <a-radio-group v-model="size2" style="margin:10px 0">--> v-if="streetDetail.leftInsideShelveId && streetDetail.leftOutsideShelveId">
<!-- <a-radio-button value="small">--> <a-radio-button value="leftOutsideShelveId">
<!-- 外--> >
<!-- </a-radio-button>--> 外
<!-- <a-radio-button value="default">--> </a-radio-button>
<!-- 内--> <a-radio-button value="leftInsideShelveId">
<!-- </a-radio-button>--> 内
<!-- </a-radio-group>--> </a-radio-button>
</a-radio-group>
</div>
</div> </div>
</div> </div>
<a-select v-if="data[0]" :default-value="data[0].name" style="width: 180px" <a-select v-if="data[0]" :default-value="data[0].name" style="width: 180px"
@change="handleChange" class="select-roadway"> @change="handleChange" class="select-roadway">
<a-select-option v-for="i in data" :key="i.name" :value="i.name"> <a-select-option v-for="i in data" :key="i.name" :value="i.id">
{{i.name}} {{i.name}}
</a-select-option> </a-select-option>
</a-select> </a-select>
<div class="check-content" v-for="item in data" :key="item.id">
<div v-for="(key,value) in checkList" :key="value">
<div class="roadway-buttom" v-if="item.name == select && value == streetDetail.rightShelveId">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
<div class="roadway-box">
<div class="line" v-for="(columnItem,column) in key" :key="column">
<div v-for="(rowItem,row) in columnItem" :key="row"
class="ele"
@click="tocheckOperation"
:style="{background:rowItem.status ==0?'#bfbfbf':rowItem.status == 1?'#1afa29':'#d81e06'}"
>{{rowItem.row}}-{{column}}
</div>
</div>
</div>
</happy-scroll>
<a-radio-group v-model="size2" style="margin:10px 0"
v-if="streetDetail.rightInsideShelveId && streetDetail.rightOutsideShelveId">
<a-radio-button value="rightOutsideShelveId">
外
</a-radio-button>
<a-radio-button value="rightInsideShelveId">
内
</a-radio-button>
</a-radio-group>
</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
@ -78,13 +89,17 @@ export default {
size: 'small', size: 'small',
size2: 'small', size2: 'small',
data: [], data: [],
select: '' select: '',
streetId: 0,
streetDetail: {},
checkList: {}
}; };
}, },
mounted() { mounted() {
this.request() this.request()
}, },
methods: { methods: {
//获取巷道列表
request() { request() {
this.$api.httpApi.getStreetList({ this.$api.httpApi.getStreetList({
data: { data: {
@ -94,13 +109,42 @@ export default {
}).then(res => { }).then(res => {
this.data = res.data.list; this.data = res.data.list;
this.select = res.data.list[0].name this.select = res.data.list[0].name
this.getStockList(res.data.list[0].id)
this.getStreetDetail(res.data.list[0].id)
}).catch(err => {
});
},
//获取巷道详情
getStreetDetail(id) {
this.$axios.get('/street/' + id, {
data: {}
}).then(res => {
this.streetDetail = res.data
}).catch(err => {
})
},
//获取盘点列表
getStockList(streetId) {
this.$api.httpApi.getStockList({
params: {
streetId: streetId,
}
}).then(res => {
console.log(88888888888888999999999999999)
console.log(res.data)
this.checkList = res.data
}).catch(err => { }).catch(err => {
}); });
}, },
handleChange(value) { handleChange(value) {
console.log(value) console.log(value)
this.select = value
this.getStreetDetail(value)
this.getStockList(value)
}, },
tocheckOperation() { tocheckOperation() {
this.$router.push({name: 'checkOperation'}) this.$router.push({name: 'checkOperation'})
@ -144,7 +188,7 @@ export default {
} }
.roadway-buttom { .roadway-buttom {
padding: 50px 0 20px 0; padding: 20px 0 20px 0;
width: 1000px; width: 1000px;
} }
@ -169,10 +213,5 @@ export default {
} }
} }
} }
.select-roadway {
position: absolute;
top: 350px;
}
} }
</style> </style>

5
src/views/roadwayManage/model.vue
Unescape Escape View File

@ -22,7 +22,7 @@
</a-form-item> </a-form-item>
<a-form-item label="PLC-ID" :label-col="formItemAcrossLayout.labelCol"> <a-form-item label="PLC-ID" :label-col="formItemAcrossLayout.labelCol">
<a-input <a-input
v-decorator="['plcPort', { rules: [{ required: true, message: '请输入PLC-ID!' }] }]" v-decorator="['plcId', { rules: [{ required: true, message: '请输入PLC-ID!' }] }]"
/> />
</a-form-item> </a-form-item>
</div> </div>
@ -34,7 +34,7 @@
</a-form-item> </a-form-item>
<a-form-item label="端口" :label-col="formItemAcrossLayout.labelCol"> <a-form-item label="端口" :label-col="formItemAcrossLayout.labelCol">
<a-input <a-input
v-decorator="['plcId', { rules: [{ required: true, message: '请输入端口!' }] }]" v-decorator="['plcPort', { rules: [{ required: true, message: '请输入端口!' }] }]"
/> />
</a-form-item> </a-form-item>
</div> </div>
@ -293,7 +293,6 @@ export default {
values.leftRow = Number(values.leftRow) values.leftRow = Number(values.leftRow)
values.leftType = Number(values.leftType) values.leftType = Number(values.leftType)
values.plcPort = Number(values.plcPort) values.plcPort = Number(values.plcPort)
values.plcId = Number(values.plcId)
values.rightColumn = Number(values.rightColumn) values.rightColumn = Number(values.rightColumn)
values.rightRow = Number(values.rightRow) values.rightRow = Number(values.rightRow)
values.rightType = Number(values.rightType) values.rightType = Number(values.rightType)

Write Preview
Loading…
Cancel
Save