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

摄像头状态 加状态 

设备日志查询
仓库表 查询
master
yangzongjia 2 years ago
parent
5c4a983d82
commit
16a2c6fa83
7 changed files with 87 additions and 85 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. 7
      src/api/device/device.js
  2. 6
      src/api/deviceLog/deviceLog.js
  3. 57
      src/views/shebeirizhi/shebeirizhiList.vue
  4. 29
      src/views/shebeitaizhang/shebeitaizhangAdd.vue
  5. 26
      src/views/shebeitaizhang/shebeitaizhangList.vue
  6. 41
      src/views/zhiwujiance/zhiwujianceInfo.vue
  7. 6
      src/views/zhiwujiance/zhiwujianceList.vue

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

@ -47,6 +47,13 @@ export function getStatusList(data) {
return request({ url: '/device/getStatusList', method: 'GET' })
}
// 获取仓库列表
export function getWareHouseList() {
return request({ url: '/device/getWareHouseList', method: 'GET' })
}
/******************************************************************************************************************************************** */

6
src/api/deviceLog/deviceLog.js
View File

@ -6,3 +6,9 @@ import qs from 'qs'
export function getDeviceLogPage(data) {
return request({ url: '/deviceLog/getDeviceLogPage', method: 'GET', params: data })
}
// 获取设备日志列表
export function getMessageInfoPage(data) {
return request({ url: '/messageInfo/getMessageInfoPage', method: 'GET', params: data })
}

57
src/views/shebeirizhi/shebeirizhiList.vue
View File

@ -12,9 +12,8 @@
maxlength="20"></el-date-picker>
</el-form-item>
<el-form-item label="设备名称">
<el-select v-model="listQuery.name" filterable clearable placeholder="请选择设备名称">
<el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id" />
</el-select>
<el-input v-model="listQuery.name" clearable placeholder="" class="addinputw"
placeholder="请填写设备名称"></el-input>
</el-form-item>
<el-form-item label="地点名称">
<el-input v-model="listQuery.position" clearable placeholder="" class="addinputw"
@ -24,10 +23,10 @@
<el-input v-model="listQuery.params.name" clearable placeholder="" class="addinputw"
placeholder="请填写名称"></el-input>
</el-form-item> -->
<el-form-item label="卡号">
<!-- <el-form-item label="卡号">
<el-input v-model="listQuery.code" clearable placeholder="" class="addinputw"
placeholder="请填写卡号"></el-input>
</el-form-item>
</el-form-item> -->
</el-form>
<div class="btn">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -48,7 +47,7 @@
<el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="jc" label="时间" header-align="center" align="center">
<template slot-scope="scope">
<span>{{ scope.row.time }}</span>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="设备名称" width="" header-align="center" align="center">
@ -61,16 +60,6 @@
<span>{{ scope.row.position }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.name }}</span>
</template>
</el-table-column> -->
<el-table-column label="卡号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.code }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
@ -87,7 +76,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { getDeviceLogPage } from '@/api/deviceLog/deviceLog'
import { getDeviceLogPage, getMessageInfoPage } from '@/api/deviceLog/deviceLog'
export default {
@ -115,17 +104,7 @@ export default {
sids: [],
// 查询 -----------
tableKey: 0,
list: [
{ time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '东岸广场西侧东门', name: '闫永军', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '东岸广场西侧东门', name: '闫永军', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点2', position: '东岸广场西侧走廊', name: '冷柠', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点4', position: '东岸广场东侧东门', name: '冷柠', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点3', position: '2F走廊西侧', name: '冷柠', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点5', position: '2F大厅', name: '冷柠', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点2', position: '2F206控制系统门口', name: '冷柠', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点4', position: '2F206控制系统门口', name: '冷柠', code: 'KTIO00065' },
{ time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '2F走廊西侧', name: '闫阵', code: 'KTIO00065' },
],
list: [],
listLoading: false,
listQuery: {
current: 1,
@ -138,7 +117,6 @@ export default {
{ title: '巡更点3', id: '3' },
{ title: '巡更点4', id: '4' },
{ title: '巡更点5', id: '5' },
],
rules: {}
}
@ -196,7 +174,7 @@ export default {
}
},
init() {
getDeviceLogPage(this.listQuery).then((res) => {
getMessageInfoPage(this.listQuery).then((res) => {
if (res.code == 200) {
this.list = res.data.records
this.total = res.total
@ -213,17 +191,14 @@ export default {
},
// 查询列表信息
getList() {
// this.listLoading = true
// req.gysPagerList(this.listQuery).then((response) => {
// this.listLoading = false
// if (response.code === '200' && response.data && response.data.total > 0) {
// this.list = response.data.records
// this.listQuery.total = response.data.total
// } else {
// this.list = []
// this.listQuery.total = 0
// }
// })
getMessageInfoPage(this.listQuery).then((res) => {
if (res.code == 200) {
this.list = res.data.records
this.total = res.total
} else {
this.list = []
}
})
},
// 查询按钮
handleFilter() {

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

@ -149,7 +149,7 @@
</template>
<script>
import { createDevice, updateDevice, getOtherList } from '@/api/device/device'
import { createDevice, updateDevice, getOtherList, getWareHouseList } from '@/api/device/device'
export default {
name: 'shebeitaizhangAdd',
@ -221,10 +221,7 @@ export default {
},
submitdisabled: false,
nvrList: [],
ckList: [
{ name: '仓库1', id: '1' },
{ name: '仓库2', id: '2' },
]
ckList: []
}
},
methods: {
@ -266,23 +263,36 @@ export default {
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)
}
})
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
this.dialogStatus = param.typeSubmit
this.addForm = param.info
this.addForm.vCode = param.info.vcode
if (this.addForm.type == '1') {
this.sxtFlag = true
} else {
this.sxtFlag = false
} else if (this.addForm.type == '5') {
this.ckFlag = true
}
console.log(this.nvrId)
},
handleSave() {
this.$refs['form_obj'].validate(valid => {
@ -306,6 +316,9 @@ export default {
} else if (this.dialogStatus === 'edit') {
this.addForm.createTime = null
this.addForm.status = null
if (this.addForm.type != '1') {
this.addForm.channelNo = null
}
updateDevice(this.addForm).then(resp => {
this.submitdisabled = false
if (resp.code == 200) {

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

@ -37,11 +37,11 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<!-- <el-form-item label="选择仓库">
<el-select v-model="listQuery.cangku" filterable clearable placeholder="请选择仓库">
<el-option v-for="item in cangku_list" :key="item.id" :label="item.title" :value="item.id" />
<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-select>
</el-form-item> -->
</el-form-item>
<el-form-item label="设备类型">
<el-select v-model="listQuery.type" filterable clearable placeholder="请选择设备类型">
<el-option v-for="item in supplierType_list" :key="item.id" :label="item.name" :value="item.id" />
@ -145,7 +145,7 @@ import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import shebeitaizhangAdd from './shebeitaizhangAdd'
import shebeitaizhangInfo from './shebeitaizhangInfo'
import { getDevicePage, getInfoById, removeDevice, getStatusList } from '@/api/device/device'
import { getDevicePage, getInfoById, removeDevice, getStatusList, getWareHouseList } from '@/api/device/device'
import * as echarts from "echarts";
import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
// 1.1完好率饼图
@ -276,10 +276,7 @@ export default {
{ title: '三层', id: '3' },
{ title: '四层', id: '4' },
],
ckList: [
{ name: '仓库1', id: '1' },
{ name: '仓库2', id: '2' }
],
ckList: [],
status_list: [
{ title: '已损坏', id: '1' },
{ title: '已维修', id: '2' },
@ -363,9 +360,14 @@ export default {
},
init() {
this.getList()
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
getStatusList().then(res => {
if (res.code == 200) {
debugger
this.wanhao_Chart.Data.seriesData = []
this.weixiu_Chart.Data.seriesData = []
this.sunhai_Chart.Data.seriesData = []
@ -385,8 +387,8 @@ export default {
var bad = 100 - item.maintenanceCount;
var obj = { name: '维修', value: item.maintenanceCount }
var obj1 = { name: '不维修', value: bad }
this.weixiu_Chart.Data.seriesData.push(obj)
this.weixiu_Chart.Data.seriesData.push(obj1)
this.weixiu_Chart.Data.seriesData.push(obj)
}
// 1完好 2维修 3损坏
@ -394,8 +396,8 @@ export default {
var bad = 100 - item.maintenanceCount;
var obj = { name: '损害', value: item.maintenanceCount }
var obj1 = { name: '不损害', value: bad }
this.sunhai_Chart.Data.seriesData.push(obj)
this.sunhai_Chart.Data.seriesData.push(obj1)
this.sunhai_Chart.Data.seriesData.push(obj)
}
}
}

41
src/views/zhiwujiance/zhiwujianceInfo.vue
View File

@ -101,23 +101,7 @@ export default {
{ title: '已维修', id: '2' },
{ title: '完好', id: '3' },
],
infoForm: {
cangkuname: '仓库1', huohao: '1025632', ren: 'sun', tel: '138330025635',
bianma: '02124623', name: '矿泉水', num: '500', weizhi: '仓库1F3',
manufacturerName: 'KD-22',
manufacturerAs: '2F金陵文脉',
manufacturerCode: '1',
time: '2023-02-26 16:00:00',
manufacturerAddress: '大华',
manufacturer: '2023-02-26 12:00:00',
manufacturerTelePhone: '大华科技',
manufacturerFax: '2023-05-23',
status: '1',
cangku: '仓库1',
tuUrl: './image/tu1.jpg',
modifyTime: '',
imgAfter: ''
},
infoForm: {},
rules: {},
infoOne: {}
}
@ -143,10 +127,25 @@ export default {
})
this.viewTitle = '质物台账详情'
getDeviceImageById({ id: row.id }).then(resp => {
console.log('resp', resp)
// this.infoForm = resp.data
this.infoOne.modifyTime = resp.data.modifyTime
this.infoOne.imgAfter = resp.data.imgAfter
this.infoForm = {
cangkuname: '仓库1', huohao: '1025632', ren: 'sun', tel: '138330025635',
bianma: '02124623', name: '矿泉水', num: '500', weizhi: '仓库1F3',
manufacturerName: 'KD-22',
manufacturerAs: '2F金陵文脉',
manufacturerCode: '1',
time: '2023-02-26 16:00:00',
manufacturerAddress: '大华',
manufacturer: '2023-02-26 12:00:00',
manufacturerTelePhone: '大华科技',
manufacturerFax: '2023-05-23',
status: '1',
cangku: '仓库1',
tuUrl: './image/tu1.jpg',
modifyTime: '',
imgAfter: ''
}
this.infoForm.modifyTime = resp.data.modifyTime
this.infoForm.imgAfter = resp.data.imgAfter
}).catch(e => {
this.formobj = row
})

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

@ -56,8 +56,8 @@
<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="require(imgUrl)" alt="" /></div>
<!-- <div class="tu"><img :src="require('D:/resources/download/1/202306081713001.png')" alt="" /></div> -->
<div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.createTime }}</div>
</div>
@ -182,7 +182,7 @@ export default {
},
data() {
return {
imgUrl: 'D:/resources/download/1/202306080924311.png',
imgUrl: 'http://huirong.ybkjyl.com/202306082115011.png',
wanhao_Chart: wanhao_Chart, // 1.1
weixiu_Chart: weixiu_Chart,
sunhai_Chart: sunhai_Chart,

Write Preview
Loading…
Cancel
Save