Browse Source

对接仓库接口

master
yangzongjia 2 years ago
parent
commit
079b6cd7f4
  1. 32
      src/views/monitor/videos/index.vue
  2. 2
      src/views/shebeitaizhang/shebeitaizhangAdd.vue
  3. 5
      src/views/shebeitaizhang/shebeitaizhangList.vue
  4. 3
      src/views/zhiwujiance/zhiwujianceList.vue

32
src/views/monitor/videos/index.vue

@ -6,8 +6,8 @@
<div class="shipinlisttop">
<el-form ref="" :inline="true" label-width="110px" class="tab-header">
<el-form-item label="选择仓库">
<el-select v-model="ckId" filterable placeholder="请选择仓库" @change="ckChange">
<el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
<el-select v-model="ckId" filterable placeholder="请选择仓库" @change="ckChange" style="width:200px">
<el-option v-for="item in ckList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<el-button v-if="moreFlag" type="button" @click="moreShow(ckId)">多屏展示
@ -26,9 +26,8 @@
</div>
<div class="shipinscons">
<div class="shipinscon">
<div class="shipinstu" style="height:400px">
<img src="/image/cangkutu.png" style="height:400px;width:800px"/>
<img src="/image/cangku2.png" style="height:600px;width:1000px" />
<!-- 入侵报警 -->
<!-- <div class="ruqinbaojingcss" style="z-index: 10;" v-if="showRuqinbaojing">
<div class="myiconfont bluezibg jingicon ruqin_zhengchang1" v-if="showRuqinbaojing_zhengchang" @click="openshipinRuqinbaojing()">&#xe608;</div>
@ -192,7 +191,6 @@
</div>
<!-- 列表结束 -->
</div>
</div>
</div>
@ -400,6 +398,10 @@ export default {
}
console.log(this.dzwl_list)
})
getStatusCount({ deviceType: null, statusType: null, ckId: item }).then(res => {
this.statusData = res.data
})
},
bodyCloseMenus() {
this.active = -1
@ -640,26 +642,30 @@ export default {
}
},
init() {
getOtherList({ type: 1 }).then((res) => {
getWareHouseList().then(res => {
if (res.code == 200) {
this.ckList = res.data
this.ckId = res.data[0].sid
}
getOtherList({ type: 1, ckId: this.ckId }).then((res) => {
if (res.code == 200) {
this.zc_list = res.data
}
})
getOtherList({ type: 2 }).then((res) => {
getOtherList({ type: 2, ckId: this.ckId }).then((res) => {
if (res.code == 200) {
this.dzwl_list = res.data
}
console.log(this.dzwl_list)
})
getStatusCount({ deviceType: null, statusType: null }).then(res => {
getStatusCount({ deviceType: null, statusType: null, ckId: this.ckId }).then(res => {
this.statusData = res.data
})
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
},
//
indexMethod(index) {

2
src/views/shebeitaizhang/shebeitaizhangAdd.vue

@ -118,7 +118,7 @@
<el-col :span="8" v-if="ckFlag">
<el-form-item prop="ckId">
<el-select v-model="addForm.ckId" filterable clearable placeholder="请选择仓库" style="width: 410px;">
<el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id"
<el-option v-for="item in ckList" :key="item.sid" :label="item.name" :value="item.sid"
class="addinputw" />
</el-select>
</el-form-item>

5
src/views/shebeitaizhang/shebeitaizhangList.vue

@ -39,7 +39,7 @@
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="选择仓库">
<el-select v-model="listQuery.ckId" filterable clearable placeholder="请选择仓库">
<el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
<el-option v-for="item in ckList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<el-form-item label="设备类型">
@ -309,7 +309,7 @@ export default {
},
getCkTitle(item) {
for (var i = 0; i < this.ckList.length; i++) {
if (this.ckList[i].id == item) {
if (this.ckList[i].sid == item) {
return this.ckList[i].name
}
}
@ -414,6 +414,7 @@ export default {
getDevicePage(this.listQuery).then((response) => {
this.listLoading = false
if (response.code == '200') {
console.log("jddkz",response)
this.list = response.data.records
this.listQuery.total = response.data.total
} else {

3
src/views/zhiwujiance/zhiwujianceList.vue

@ -18,7 +18,7 @@
</el-form-item> -->
<el-form-item label="选择仓库">
<el-select v-model="listQuery.ckId" filterable clearable placeholder="请选择仓库">
<el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
<el-option v-for="item in ckList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
</el-form>
@ -332,7 +332,6 @@ export default {
},
init() {
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}

Loading…
Cancel
Save