jianguan
/
supervise-monitor-ui
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

质物检测图片回显

master
yangzongjia 2 years ago
parent
16a2c6fa83
commit
620a223b92
7 changed files with 203 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/api/device/device.js
  2. 92
      src/views/monitor/videos/index.vue
  3. 92
      src/views/shebeitaizhang/shebeitaizhangAdd.vue
  4. 96
      src/views/shebeitaizhang/shebeitaizhangInfo.vue
  5. 3
      src/views/shebeitaizhang/shebeitaizhangList.vue
  6. 2
      src/views/shebeizhuangtai/shebeizhuangtaiList.vue
  7. 11
      src/views/zhiwujiance/zhiwujianceList.vue

9
src/api/device/device.js
View File

@ -52,6 +52,15 @@ export function getWareHouseList() {
return request({ url: '/device/getWareHouseList', method: 'GET' })
}
// 布防
export function sysArm(data) {
return request({ url: '/device/sysArm', method: 'GET', params: data })
}
// 撤防
export function sysDisArm(data) {
return request({ url: '/device/sysDisArm', method: 'GET', params: data })
}

92
src/views/monitor/videos/index.vue
View File

@ -65,7 +65,7 @@
<div class="myiconfont redzibg jingicon shipin_baojing1" v-if="showShipinjiankong_baojing">&#xe644;</div> -->
<div class="shipincss Shipin_yingzi blockDiv" v-if="showShipinjiankong_zhengchang">
<div class="jingicon shipin_zhengchang" :style="{ top: item.topPosition, left: item.leftPosition }"
:id=item.sid v-if="showShipinjiankong_zhengchang">
v-if="showShipinjiankong_zhengchang">
<div class="myiconfont jingicon bluezibg" v-if="showShipinjiankong_zhengchang" @mouseover="enter"
@mouseleave="leave" @click.stop="openshipinShipinjiankong(index)">&#xe644;</div>
<div class="seencons shipin_out noneDiv2" v-if="active == index">
@ -112,54 +112,23 @@
</div>
<!-- 333end -->
<!--444门电子围栏-->
<div class="ruqinbaojingcss" v-if="showDianziweilan">
<div class="myiconfont huizibg jingicon Dianziweilan_lixian1" v-if="showDianziweilan_lixian">&#xe6b8;
</div>
<div class="myiconfont redzibg jingicon Dianziweilan_baojing1" v-if="showDianziweilan_baojing">&#xe6b8;
</div>
<div class="ruqinbaojingcss" v-if="showDianziweilan" v-for="(item, index) in dzwl_list">
<!-- <div class="myiconfont huizibg jingicon Dianziweilan_lixian1" v-if="showDianziweilan_lixian">&#xe6b8;</div>
<div class="myiconfont redzibg jingicon Dianziweilan_baojing1" v-if="showDianziweilan_baojing">&#xe6b8;</div> -->
<div class="Dianziweilancss Dianziweilan_yingzi" v-if="showDianziweilan_zhengchang">
<!-- <div class="myiconfont bluezibg jingicon Dianziweilan_zhengchang1" v-if="showDianziweilan_zhengchang" @click="openshipinDianziweilan()">&#xe6b8;</div> -->
<div class="jingicon Dianziweilan_zhengchang1" v-if="showDianziweilan_zhengchang">
<div class="jingicon Dianziweilan_zhengchang1"
:style="{ top: item.topPosition, left: item.leftPosition }" v-if="showDianziweilan_zhengchang">
<div class="myiconfont jingicon bluezibg" v-if="showDianziweilan_zhengchang"
@click="openshipinDianziweilan()">&#xe6b8;</div>
<!-- 显示文字 -->
<div class="seencons shipin_out" v-if="seenshipinDianziweilan">
<p @click="openshipinDianziweilan()">布防</p>
<p @click="openshipinDianziweilan()">撤防</p>
<p @click="openshipinDianziweilan()">报警确认</p>
<p @click="openshipinDianziweilan()">旁路</p>
@click="openshipinDianziweilan(index)">&#xe6b8;</div>
<div class="seencons shipin_out" v-if="activeDzwl == index">
<p @click="openArm(item.id)">布防</p>
<p @click="disArm(item.id)">撤防</p>
<p @click="noCall(item)">报警确认</p>
</div>
<!-- 鼠标移入显示文字 -->
<!-- <div class="seenconsc shipin_out" v-if="seen_shubiaoShipinjiankong">
<p>设备名称：1号楼1F西侧走廊像头1</p>
<p>设备编号：HK023123</p>
</div> -->
</div>
<div class="myiconfont bluezibg jingicon Dianziweilan_zhengchang2" v-if="showDianziweilan_zhengchang">
&#xe6b8;</div>
<div class="myiconfont bluezibg jingicon Dianziweilan_zhengchang3" v-if="showDianziweilan_zhengchang">
&#xe6b8;</div>
<div class="myiconfont bluezibg jingicon Dianziweilan_zhengchang4" v-if="showDianziweilan_zhengchang">
&#xe6b8;</div>
<div class="myiconfont bluezibg jingicon Dianziweilan_zhengchang5" v-if="showDianziweilan_zhengchang">
&#xe6b8;</div>
<div class="myiconfont bluezibg jingicon Dianziweilan_zhengchang6" v-if="showDianziweilan_zhengchang">
&#xe6b8;</div>
<!-- 显示文字 -->
<!-- <div class="seencons Dianziweilan_zhengchang1b" v-if="seenshipinDianziweilan">
<p @click="toMore()">布防</p>
<p @click="toMore()">撤防</p>
<p @click="toMore()">报警确认</p>
<p @click="toMore()">旁路</p>
</div> -->
</div>
</div>
<!-- 444end -->
</div>
</div>
<div class="sbottombars">
@ -248,7 +217,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { getOtherList } from '@/api/device/device'
import { getOtherList, sysArm, sysDisArm } from '@/api/device/device'
import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage'
// import baojingchaxunAdd from './baojingchaxunAdd'
// import baojingchaxunInfo from './baojingchaxunInfo'
@ -270,10 +239,8 @@ export default {
btnMenjinguanli: [],
btnDianziweilan: [],
btndisabled: false,
zc_list: [
{ name: '左', number: '123', left: '2%', top: '2%' },
{ name: '右', number: 'ABC', left: '20%', top: '20%' }
],
zc_list: [],
dzwl_list: [],
btnList: [
{
type: 'info',
@ -337,6 +304,7 @@ export default {
spUrl: '',
spRecUrl: '',
active: -1,
activeDzwl: -1,
isMute: true,
isPlay: false,
width: '100%', // 设置视频播放器的显示宽度（以像素为单位）
@ -446,12 +414,27 @@ export default {
openshipinMenjinguanli() {
this.seenshipinMenjinguanli = !this.seenshipinMenjinguanli
},
openshipinDianziweilan() {
openshipinDianziweilan(index) {
this.activeDzwl = index
this.seenshipinDianziweilan = !this.seenshipinDianziweilan
},
// 、、、、
openArm(id) {
this.activeDzwl = -1
sysArm({ id: id }).then(res => {
console.log(res)
this.$message({ showClose: true, type: 'success', message: res.msg })
})
},
disArm(id) {
this.activeDzwl = -1
sysDisArm({ id: id }).then(res => {
this.$message({ showClose: true, type: 'success', message: res.msg })
})
},
noCall() {
this.activeDzwl = -1
},
openruqinbaojing() {
this.showRuqinbaojing = !this.showRuqinbaojing
},
openshipinjiankong() {
@ -609,6 +592,13 @@ export default {
this.zc_list = res.data
}
})
getOtherList({ type: 2 }).then((res) => {
if (res.code == 200) {
this.dzwl_list = res.data
}
console.log(this.dzwl_list)
})
},
// 序号
indexMethod(index) {
@ -1176,8 +1166,6 @@ export default {
.shipinstu .Dianziweilan_zhengchang1 {
position: absolute;
top: 0%;
left: 93%;
z-index: 500;
}

92
src/views/shebeitaizhang/shebeitaizhangAdd.vue
View File

@ -85,14 +85,22 @@
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb" v-if="sxtFlag">
<el-col :span="4" class="tleftb" v-if="sxtFlag || dzwlFlag">
<span>上偏移</span>
</el-col>
<el-col :span="8" v-if="sxtFlag">
<el-col :span="8" v-if="sxtFlag || dzwlFlag">
<el-form-item prop="topPosition">
<el-input v-model="addForm.topPosition" maxlength="20" placeholder="请填写上偏移" class="addinputw" clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="dzwlFlag">
<span>所属报警主机子系统</span>
</el-col>
<el-col :span="8" v-if="dzwlFlag">
<el-form-item prop="sysId">
<el-input v-model="addForm.sysId" maxlength="20" placeholder="例如：1,2,3,4" class="addinputw" clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="sxtFlag">
<span>请选择所属Nvr</span>
</el-col>
@ -139,8 +147,27 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="sxtFlag">
<el-row v-if="dzwlFlag">
<el-col :span="4" class="tleftb">
<span>左偏移</span>
</el-col>
<el-col :span="8">
<el-form-item prop="leftPosition">
<el-input v-model="addForm.leftPosition" maxlength="20" placeholder="请填写左偏移" class="addinputw"
clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>请选择报警主机</span>
</el-col>
<el-col :span="8">
<el-form-item prop="bjzjId">
<el-select v-model="addForm.bjzjId" filterable clearable placeholder="请选择报警主机" style="width: 410px;">
<el-option v-for="item in bjzjList" :key="item.id" :label="item.name" :value="item.id"
class="addinputw" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@ -178,6 +205,8 @@ export default {
index: 0,
sxtFlag: false,
ckFlag: false,
dzwlFlag: false,
bjzjList: [],
viewState: 1,
viewTitle: '',
dialogStatus: '',
@ -187,7 +216,7 @@ export default {
{ name: '摄像头', id: '1' },
{ name: '电子围栏', id: '2' },
{ name: '门禁', id: '3' },
{ name: '机器人', id: '4' },
{ name: '报警主机', id: '4' },
{ name: '网络录像机', id: '5' }
],
maintenanceList: [
@ -228,25 +257,15 @@ export default {
changeType(item) {
this.sxtFlag = false
this.ckFlag = false
this.dzwlFlag = false
if (item == '1') {
this.sxtFlag = true
} else if (item == '5') {
} else if (item == '2') {
this.dzwlFlag = true
} else if (item == '5' || item == '4') {
this.ckFlag = true
}
getOtherList({ type: 5 }).then(res => {
if (res.code == 200) {
this.nvrList = res.data
}
})
},
init() {
typeValues({ type: 'supplierType' }).then((res) => {
if (res.success) {
this.supplierType_list = res.data
}
})
},
changeSupplierType(value) {
let bb = null
@ -261,36 +280,57 @@ export default {
this.addForm.supplierType = bb.key
},
showAdd(typeSubmit) {
this.sxtFlag = false
this.dialogStatus = typeSubmit
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
},
showEdit(param) {
this.sxtFlag = false
this.ckFlag = false
getOtherList({ type: 5 }).then(res => {
if (res.code == 200) {
this.nvrList = res.data
console.log(this.nvrList)
}
})
getOtherList({ type: 4 }).then(res => {
if (res.code == 200) {
this.bjzjList = res.data
}
})
this.sxtFlag = false
this.dialogStatus = typeSubmit
},
showEdit(param) {
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
getOtherList({ type: 5 }).then(res => {
if (res.code == 200) {
this.nvrList = res.data
console.log(this.nvrList)
}
})
getOtherList({ type: 4 }).then(res => {
if (res.code == 200) {
this.bjzjList = res.data
}
})
this.sxtFlag = false
this.ckFlag = false
this.dzwlFlag = false
this.dialogStatus = param.typeSubmit
this.addForm = param.info
this.addForm.vCode = param.info.vcode
if (this.addForm.type == '1') {
this.sxtFlag = true
} else if (this.addForm.type == '5') {
} else if (this.addForm.type == '2') {
this.dzwlFlag = true
} else if (this.addForm.type == '5' || this.addForm.type == '4') {
this.ckFlag = true
}
},

96
src/views/shebeitaizhang/shebeitaizhangInfo.vue
View File

@ -57,14 +57,38 @@
<span>{{ infoForm.serialNumber }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="sxtFlag">
<el-col :span="4" class="tleftb">
<span>维修状态</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ getMainTitle(infoForm.maintenance) }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="sxtFlag || dzwlFlag">
<span>上偏移</span>
</el-col>
<el-col :span="8" v-if="sxtFlag">
<el-col :span="8" v-if="sxtFlag || dzwlFlag">
<el-form-item>
<span>{{ infoForm.topPosition }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="dzwlFlag">
<span>所属报警主机</span>
</el-col>
<el-col :span="8" v-if="dzwlFlag">
<el-form-item>
<span>{{ getBjzj(infoForm.bjzjId) }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="sxtFlag">
<span>所属Nvr</span>
</el-col>
<el-col :span="8" v-if="sxtFlag">
<el-form-item>
<span>{{ getNvrTitle(infoForm.nvrId) }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb" v-if="nvrFlag">
<span>仓库</span>
</el-col>
@ -92,13 +116,21 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="sxtFlag">
<el-row v-if="dzwlFlag">
<el-col :span="4" class="tleftb">
<span>所属Nvr</span>
<span>左偏移</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ getNvrTitle(infoForm.nvrId) }}</span>
<span>{{ infoForm.leftPosition }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>所属报警主机子系统</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ infoForm.sysId }}</span>
</el-form-item>
</el-col>
</el-row>
@ -109,15 +141,12 @@
</template>
<script>
import { getOtherList } from '@/api/device/device'
import { getOtherList, getWareHouseList } from '@/api/device/device'
export default {
name: 'shebeitaizhangInfo',
data() {
return {
ckList: [
{ name: '仓库1', id: '1' },
{ name: '仓库2', id: '2' }
],
ckList: [],
// tableKey: 0,
// index: 0,
viewTitle: '',
@ -125,21 +154,21 @@ export default {
{ name: '摄像头', id: '1' },
{ name: '电子围栏', id: '2' },
{ name: '门禁', id: '3' },
{ name: '机器人', id: '4' },
{ name: '报警主机', id: '4' },
{ name: '网络录像机', id: '5' }
],
sxtFlag: false,
nvrFlag: false,
status_list: [
{ title: '已损坏', id: '1' },
{ title: '已维修', id: '2' },
{ title: '完好', id: '3' },
dzwlFlag: false,
maintenanceList: [
{ name: '完好', id: '1' },
{ name: '维修', id: '2' },
{ name: '损坏', id: '3' },
],
bjzjList: [],
infoForm: {
},
// baseManufacturerBankDto: [],
rules: {},
// submitdisabled: false
}
},
methods: {
@ -157,6 +186,14 @@ export default {
}
}
},
getMainTitle(item) {
console.log(item)
for (var i = 0; i < this.maintenanceList.length; i++) {
if (this.maintenanceList[i].id == item) {
return this.maintenanceList[i].name
}
}
},
getNvrTitle(item) {
for (var i = 0; i < this.nvrList.length; i++) {
if (this.nvrList[i].id == item) {
@ -164,6 +201,13 @@ export default {
}
}
},
getBjzj(item) {
for (var i = 0; i < this.bjzjList.length; i++) {
if (this.bjzjList[i].id == item) {
return this.bjzjList[i].name
}
}
},
getSupplierType(item) {
for (var i = 0; i < this.supplierType_list.length; i++) {
if (this.supplierType_list[i].id == item) {
@ -177,7 +221,20 @@ export default {
this.nvrList = res.data
}
})
getOtherList({ type: 4 }).then(res => {
if (res.code == 200) {
this.bjzjList = res.data
}
})
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
this.sxtFlag = false
this.nvrFlag = false
this.dzwlFlag = false
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -185,6 +242,11 @@ export default {
this.infoForm = row.info
if (this.infoForm.type == '1') {
this.sxtFlag = true
} else if (this.infoForm.type == '2') {
this.dzwlFlag = true
} else if (this.infoForm.type == '5' || this.infoForm.type == '4') {
this.nvrFlag = true
}
},
handleReturn() {

3
src/views/shebeitaizhang/shebeitaizhangList.vue
View File

@ -262,7 +262,7 @@ export default {
{ name: '摄像头', id: '1' },
{ name: '电子围栏', id: '2' },
{ name: '门禁', id: '3' },
{ name: '机器人', id: '4' },
{ name: '报警主机', id: '4' },
{ name: '网络录像机', id: '5' }
],
maintenanceList: [
@ -361,7 +361,6 @@ export default {
init() {
this.getList()
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}

2
src/views/shebeizhuangtai/shebeizhuangtaiList.vue
View File

@ -48,7 +48,7 @@
<el-table-column label="当前状态" width="110" align="center">
<template slot-scope="scope">
<span v-if="scope.row.status == '1'" style="color:green">在线</span>
<span v-if="scope.row.status == 2" style="color:red">离线</span>
<span v-if="scope.row.status == '0'" style="color:red">离线</span>
</template>
</el-table-column>
</el-table>

11
src/views/zhiwujiance/zhiwujianceList.vue
View File

@ -56,8 +56,7 @@
<div>
<div class="newslilefts">
<div class="newsli">
<div class="tu"><img :src="require(imgUrl)" alt="" /></div>
<!-- <div class="tu"><img :src="require('D:/resources/download/1/202306081713001.png')" alt="" /></div> -->
<div class="tu"><img :src="fileUrl + row.imgBefore" alt="" /></div>
<div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.createTime }}</div>
</div>
@ -66,7 +65,7 @@
<p>{{ row.similarity }}</p><span>相似度</span>
</div>
<div class="newsli">
<div class="tu"><img :src="row.modifyTime" alt="" /></div>
<div class="tu"><img :src="fileUrl + row.imgAfter" alt="" /></div>
<div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.modifyTime }}</div>
</div>
@ -182,7 +181,8 @@ export default {
},
data() {
return {
imgUrl: 'http://huirong.ybkjyl.com/202306082115011.png',
// imgUrl: 'http://huirong.ybkjyl.com/1.png',
fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/',
wanhao_Chart: wanhao_Chart, // 1.1
weixiu_Chart: weixiu_Chart,
sunhai_Chart: sunhai_Chart,
@ -284,6 +284,9 @@ export default {
}
}
},
parseImg(imgUrl) {
return imgUrl
},
getSupplierType(item) {
for (var i = 0; i < this.supplierType_list.length; i++) {
if (this.supplierType_list[i].id == item) {

Write Preview
Loading…
Cancel
Save