Browse Source

视频中心数量对接,

首页视频监控、电子围栏对接
设备类别及状态进行操作功能时好时不好修复
添加任务信息模块
统计图里面数据变化无标签标识,有歧义已修复
去掉新增、提交、编辑、删除、导入功能
统一完成所有的页面重置功能
master
yangzongjia 2 years ago
parent
commit
b2b277eac5
  1. 15
      src/api/device copy/device.js
  2. 7
      src/api/device/device.js
  3. 3
      src/views/baojingchaxun/baojingchaxunList.vue
  4. 8
      src/views/echarts/components/PieChartrenyuan.vue
  5. 8
      src/views/echarts/components/PieChartrenyuanb.vue
  6. 80
      src/views/index.vue
  7. 91
      src/views/monitor/videos/index.vue
  8. 13
      src/views/shebeirizhi/shebeirizhiList.vue
  9. 23
      src/views/shebeitaizhang/shebeitaizhangList.vue
  10. 1
      src/views/shebeizhuangtai/shebeizhuangtaiList.vue
  11. 143
      src/views/xiaoxi/xiaoxiInfo.vue
  12. 694
      src/views/xiaoxi/xiaoxiList.vue
  13. 7
      src/views/zhiwujiance/zhiwujianceInfo.vue
  14. 5
      src/views/zhiwujiance/zhiwujianceList.vue

15
src/api/device copy/device.js

@ -0,0 +1,15 @@
import request from '@/utils/request'
// eslint-disable-next-line no-unused-vars
import qs from 'qs'
// 获取设备列表
export function getInfoPage(data) {
return request({ url: '/yInfo/getInfoPage', method: 'GET', params: data })
}
// 单条获取设备
export function getInfoById(data) {
return request({ url: '/yInfo/getInfoById', method: 'GET', params: data })
}

7
src/api/device/device.js

@ -62,6 +62,13 @@ export function sysDisArm(data) {
return request({ url: '/device/sysDisArm', method: 'GET', params: data }) return request({ url: '/device/sysDisArm', method: 'GET', params: data })
} }
// 获取设备状态数量
export function getStatusCount(data) {
return request({ url: '/device/getStatusCount', method: 'GET', params: data })
}
/******************************************************************************************************************************************** */ /******************************************************************************************************************************************** */

3
src/views/baojingchaxun/baojingchaxunList.vue

@ -221,6 +221,9 @@ export default {
this.getList() this.getList()
}, },
handleReset() { handleReset() {
this.listQuery.name = null
this.listQuery.startTime = null
this.listQuery.endTime = null
// this.listQuery = { // this.listQuery = {
// params: { // params: {
// manufacturerName: '', // manufacturerName: '',

8
src/views/echarts/components/PieChartrenyuan.vue

@ -113,12 +113,12 @@ export default {
containLabel: true, containLabel: true,
}, },
tooltip: { tooltip: {
show: false, show: true,
trigger: 'item', trigger: 'item',
formatter: '{b} : {c} ' + unit + ' ({d}%)', formatter: '{b} : {c} ' + ' ({d}%)',
// formatter: '{a} <br/>{b} : {c} ({d}%)'
}, },
legend: {show: false, legend: {
show: false,
// right: '10', // right: '10',
bottom: '0', bottom: '0',
data: legend, // ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts'] data: legend, // ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']

8
src/views/echarts/components/PieChartrenyuanb.vue

@ -113,12 +113,12 @@ export default {
containLabel: true, containLabel: true,
}, },
tooltip: { tooltip: {
show: false, show: true,
trigger: 'item', trigger: 'item',
formatter: '{b} : {c} ' + unit + ' ({d}%)', formatter: '{b} : {c} ' + ' ({d}%)',
// formatter: '{a} <br/>{b} : {c} ({d}%)'
}, },
legend: {show: false, legend: {
show: true,
// right: '10', // right: '10',
bottom: '0', bottom: '0',
data: legend, // ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts'] data: legend, // ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']

80
src/views/index.vue

@ -109,8 +109,10 @@
<div class="icon myiconfont iconbox iconbox_blue">&#xe64a;</div> <div class="icon myiconfont iconbox iconbox_blue">&#xe64a;</div>
</div> </div>
<div class="rights"> <div class="rights">
<div class="note">正常<span class="bluezi">36</span></div> <div class="note">正常<span class="bluezi">{{ statusDataSp.online }}</span></div>
<div class="note">离线<span class="huizi">16</span></div> <div class="note">离线<span class="huizi">{{ statusDataSp.offline == null ? 0 : statusDataSp.offline
}}</span>
</div>
<div class="note"><span class="redzi"></span></div> <div class="note"><span class="redzi"></span></div>
</div> </div>
<div class="bar"> <div class="bar">
@ -147,9 +149,10 @@
<div class="icon myiconfont iconbox iconbox_red">&#xe9f7;</div> <div class="icon myiconfont iconbox iconbox_red">&#xe9f7;</div>
</div> </div>
<div class="rights"> <div class="rights">
<div class="note">正常<span class="bluezi">26</span></div> <div class="note">正常<span class="bluezi">{{ statusDataWl.online }}</span></div>
<div class="note">离线<span class="huizi">12</span></div> <div class="note">离线<span class="huizi">{{ statusDataWl.offline == null ? 0 : statusDataWl.offline
<div class="note">报警<span class="redzi">11</span></div> }}</span></div>
<!-- <div class="note">报警<span class="redzi">11</span></div> -->
</div> </div>
<div class="bar"> <div class="bar">
<pie-chartrenyuan :chart-data="dianziweilan_Chart"></pie-chartrenyuan> <pie-chartrenyuan :chart-data="dianziweilan_Chart"></pie-chartrenyuan>
@ -170,6 +173,8 @@ import * as echarts from "echarts";
import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan' import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
import HomeMap from '@/views/dashboard/components/HomeMap' import HomeMap from '@/views/dashboard/components/HomeMap'
import { getCallPolicePage } from '@/api/callPolice/callPolice' import { getCallPolicePage } from '@/api/callPolice/callPolice'
import { getInfoPage } from '@/api/yInfo/yInfo'
import { getStatusCount } from '@/api/device/device'
import { init } from 'events'; import { init } from 'events';
// 1.1 // 1.1
const ruqinbaojing_Chart = { const ruqinbaojing_Chart = {
@ -196,7 +201,7 @@ const ruqinbaojing_Chart = {
const shipinjiankong_Chart = { const shipinjiankong_Chart = {
// seriesName: '', // seriesName: '',
unit: '次', unit: '次',
color: ['#fe7f02', '#049f51', '#fdc004'], color: ['#fe7f02', '#049f51'],
Data: { Data: {
seriesData: [ seriesData: [
{ value: 39, name: '正常' }, { value: 39, name: '正常' },
@ -222,19 +227,18 @@ const menjinguanli_Chart = {
'#C1232B'], '#C1232B'],
Data: { Data: {
seriesData: [ seriesData: [
{ value: 28, name: '正常' }, { value: 38, name: '正常' },
{ value: 22, name: '离线' }, { value: 15, name: '离线' },
{ value: 18, name: '报警' } { value: 12, name: '报警' }
] ]
}, },
label: { label: {
normal: { normal: {
position: 'inner', position: 'inner',
show: false show: false,
layoutAnimation: false
} }
}, },
// radius: ['50%', '55%']
} }
// 1.4 // 1.4
const dianziweilan_Chart = { const dianziweilan_Chart = {
@ -303,24 +307,48 @@ export default {
dianziweilan_Chart: dianziweilan_Chart, dianziweilan_Chart: dianziweilan_Chart,
dianzixungeng_Chart: dianzixungeng_Chart, dianzixungeng_Chart: dianzixungeng_Chart,
token: '', token: '',
Datalista: [ statusDataSp: {},
{ title: '您有新任务了', createTime: '2023-05-23' }, statusDataWl: {},
{ title: '您有新任务了', createTime: '2023-05-23' }, Datalista: [],
{ title: '您有新任务了', createTime: '2023-05-23' },
{ title: '您有新任务了', createTime: '2023-05-23' },
{ title: '您有新任务了', createTime: '2023-05-23' },
],
Datalist: [], Datalist: [],
} }
}, },
methods: { methods: {
init() { init() {
getStatusCount({ deviceType: 1 }).then(res => {
this.statusDataSp = res.data
this.shipinjiankong_Chart.Data.seriesData = []
var offline = this.statusDataSp.offline == null ? 0 : this.statusDataSp.offline
var online = this.statusDataSp.online == null ? 0 : this.statusDataSp.online
var obj = { name: '正常', value: online }
var obj1 = { name: '离线', value: offline }
this.shipinjiankong_Chart.Data.seriesData.push(obj)
this.shipinjiankong_Chart.Data.seriesData.push(obj1)
})
getStatusCount({ deviceType: 2 }).then(res => {
this.statusDataWl = res.data
this.dianziweilan_Chart.Data.seriesData = []
var offline = this.statusDataWl.offline == null ? 0 : this.statusDataWl.offline
var online = this.statusDataWl.online == null ? 0 : this.statusDataWl.online
var obj = { name: '正常', value: online }
var obj1 = { name: '离线', value: offline }
this.dianziweilan_Chart.Data.seriesData.push(obj)
this.dianziweilan_Chart.Data.seriesData.push(obj1)
})
getCallPolicePage({ current: 1, size: 5 }).then((res) => { getCallPolicePage({ current: 1, size: 5 }).then((res) => {
console.log(res) console.log(res)
if (res.code == 200) { if (res.code == 200) {
this.Datalist = res.data.records this.Datalist = res.data.records
} else { } else {
this.list = [] this.Datalist = []
}
})
getInfoPage({ current: 1, size: 5 }).then((res) => {
this.listLoading = false
if (res.code == 200) {
this.Datalista = res.data.records
} else {
this.Datalista = []
} }
}) })
}, },
@ -329,6 +357,11 @@ export default {
path: '/baojingchaxun/baojingchaxunList', path: '/baojingchaxun/baojingchaxunList',
}) })
}, },
toMoreb() {
this.$router.push({
path: '/xiaoxi/xiaoxiList',
})
},
getMessage() { getMessage() {
this.$notify({ this.$notify({
@ -340,11 +373,12 @@ export default {
message: " <div style='display: flex;flex-direction: row;flex-wrap: nowrap;justify-content: flex-start;align-items:center;margin: 0 auto;height:60px;line-height: 60px;'><img style='width:40px;height:40px;margin: 0 10px 0 0;' src='/image/yujing.png'>" + "<span style='display: inline-block;margin: 0 0px 0 0;height:40px;line-height: 40px;font-weight: bold;'>新的报警待处理</span></div>", message: " <div style='display: flex;flex-direction: row;flex-wrap: nowrap;justify-content: flex-start;align-items:center;margin: 0 auto;height:60px;line-height: 60px;'><img style='width:40px;height:40px;margin: 0 10px 0 0;' src='/image/yujing.png'>" + "<span style='display: inline-block;margin: 0 0px 0 0;height:40px;line-height: 40px;font-weight: bold;'>新的报警待处理</span></div>",
position: 'bottom-right', position: 'bottom-right',
onClick: () => { onClick: () => {
alert("这是一条新订单") this.$router.push({
path: '/xiaoxi/xiaoxiList',
})
// alert("")
// this.playText('') // this.playText('')
// this.getServicePageLists() // this.getServicePageLists()
}, },
duration: 3000, duration: 3000,
}) })

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

@ -7,7 +7,7 @@
<div class="shipinlisttop"> <div class="shipinlisttop">
<el-form ref="" :inline="true" label-width="110px" class="tab-header"> <el-form ref="" :inline="true" label-width="110px" class="tab-header">
<el-form-item label="选择仓库"> <el-form-item label="选择仓库">
<el-select v-model="ckId" filterable clearable placeholder="请选择仓库" @change="ckChange"> <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-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -80,35 +80,29 @@
</div> </div>
<!-- 2222end --> <!-- 2222end -->
<!-- 333门禁管理 --> <!-- 333门禁管理 -->
<div class="ruqinbaojingcss" v-if="showMenjinguanli"> <!-- <div class="ruqinbaojingcss" v-if="showMenjinguanli">
<div class="Menjincss Menjin_yingzi" v-if="showMenjinguanli_zhengchang"> <div class="Menjincss Menjin_yingzi" v-if="showMenjinguanli_zhengchang">
<!-- <div class="myiconfont bluezibg jingicon menjin_zhengchang1" v-if="showMenjinguanli_zhengchang" @click="openshipinMenjinguanli()">&#xe60b;</div> --> <div class="myiconfont bluezibg jingicon menjin_zhengchang1" v-if="showMenjinguanli_zhengchang" @click="openshipinMenjinguanli()">&#xe60b;</div>
<div class="myiconfont bluezibg jingicon menjin_zhengchang2" v-if="showMenjinguanli_zhengchang">&#xe60b; <div class="myiconfont bluezibg jingicon menjin_zhengchang2" v-if="showMenjinguanli_zhengchang">&#xe60b;
</div> </div>
<div class="jingicon menjin_zhengchang1" v-if="showMenjinguanli_zhengchang"> <div class="jingicon menjin_zhengchang1" v-if="showMenjinguanli_zhengchang">
<div class="myiconfont jingicon bluezibg" v-if="showMenjinguanli_zhengchang" <div class="myiconfont jingicon bluezibg" v-if="showMenjinguanli_zhengchang"
@click="openshipinMenjinguanli()">&#xe60b;</div> @click="openshipinMenjinguanli()">&#xe60b;</div>
<!-- 显示文字 -->
<div class="seencons shipin_out" v-if="seenshipinMenjinguanli"> <div class="seencons shipin_out" v-if="seenshipinMenjinguanli">
<p @click="openshipinMenjinguanli()">开门</p> <p @click="openshipinMenjinguanli()">开门</p>
</div> </div>
<!-- 鼠标移入显示文字 --> <div class="seenconsc shipin_out" v-if="seen_shubiaoShipinjiankong">
<!-- <div class="seenconsc shipin_out" v-if="seen_shubiaoShipinjiankong">
<p>设备名称1号楼1F西侧走廊像头1</p> <p>设备名称1号楼1F西侧走廊像头1</p>
<p>设备编号HK023123</p> <p>设备编号HK023123</p>
</div> --> </div>
</div> </div>
</div> </div>
<div class="myiconfont huizibg jingicon menjin_lixian1" v-if="showMenjinguanli_lixian">&#xe60b;</div> <div class="myiconfont huizibg jingicon menjin_lixian1" v-if="showMenjinguanli_lixian">&#xe60b;</div>
<div class="myiconfont redzibg jingicon menjin_baojing1" v-if="showMenjinguanli_baojing">&#xe60b;</div> <div class="myiconfont redzibg jingicon menjin_baojing1" v-if="showMenjinguanli_baojing">&#xe60b;</div>
<!-- 显示文字 --> <div class="seencons menjin_zhengchang1b" v-if="seenshipinMenjinguanli">
<!-- <div class="seencons menjin_zhengchang1b" v-if="seenshipinMenjinguanli">
<p @click="toMore()">开门</p> <p @click="toMore()">开门</p>
</div> --> </div>
</div> </div> -->
<!-- 333end --> <!-- 333end -->
<!--444门电子围栏--> <!--444门电子围栏-->
<div class="ruqinbaojingcss" v-if="showDianziweilan" v-for="(item, index) in dzwl_list"> <div class="ruqinbaojingcss" v-if="showDianziweilan" v-for="(item, index) in dzwl_list">
@ -135,17 +129,14 @@
<div class="tabhead"> <div class="tabhead">
<el-checkbox-group v-model="departmentTypeArray"> <el-checkbox-group v-model="departmentTypeArray">
<!-- <el-checkbox-button label="1" checked><div @click="openruqinbaojing()"><span class="iconfontyuan myiconfont redziyuan icon-intruder-alarm"></span>入侵报警</div></el-checkbox-button> --> <!-- <el-checkbox-button label="1" checked><div @click="openruqinbaojing()"><span class="iconfontyuan myiconfont redziyuan icon-intruder-alarm"></span>入侵报警</div></el-checkbox-button> -->
<el-checkbox-button checked label="2"> <el-checkbox-button checked label="2" @change="openshipinjiankong()">
<div @click="openshipinjiankong()"><span <div><span class="iconfontyuan myiconfont greenziyuan icon-shipin1"></span>视频监控</div>
class="iconfontyuan myiconfont greenziyuan icon-shipin1"></span>视频监控</div>
</el-checkbox-button> </el-checkbox-button>
<el-checkbox-button checked label="3"> <el-checkbox-button checked label="3" @change="openmenjinguanli()">
<div @click="openmenjinguanli()"><span <div><span class="iconfontyuan myiconfont yellowziyuan icon-menjin"></span>门禁管理</div>
class="iconfontyuan myiconfont yellowziyuan icon-menjin"></span>门禁管理</div>
</el-checkbox-button> </el-checkbox-button>
<el-checkbox-button checked label="4"> <el-checkbox-button checked label="4" @change="opendianziweilan()">
<div @click="opendianziweilan()"><span <div><span class="iconfontyuan myiconfont blueziyuan icon-dianziweilan2"></span>电子围栏</div>
class="iconfontyuan myiconfont blueziyuan icon-dianziweilan2"></span>电子围栏</div>
</el-checkbox-button> </el-checkbox-button>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
@ -154,26 +145,26 @@
<!-- 视频监控按钮组 --> <!-- 视频监控按钮组 -->
<div class="mores"> <div class="mores">
<el-checkbox-group size="mini" v-model="btnShipinjiankong"> <el-checkbox-group size="mini" v-model="btnShipinjiankong">
<el-checkbox-button checked label="备选项1" border> <el-checkbox-button checked label="备选项1" border @change="open_zhengchang()">
<div class="more" @click="open_zhengchang()"> <div class="more">
<p class="bluezi">正常</p> <p class="bluezi">正常</p>
<span class="myiconfont iconbox bluezibg">&#xe651;</span><span class="numzi bluezi">{{
<span class="myiconfont iconbox bluezibg">&#xe651;</span><span class="numzi bluezi">216</span> statusData.online }}</span>
<!-- <span class="myiconfont iconbox bluezibg">&#xe644;</span><span class="numzi bluezi">216</span> -->
</div> </div>
</el-checkbox-button> </el-checkbox-button>
<el-checkbox-button checked label="备选项2" border> <el-checkbox-button checked label="备选项2" border @change="open_lixian()">
<div class="more" @click="open_lixian()"> <div class="more">
<p class="huizi">离线</p> <p class="huizi">离线</p>
<span class="myiconfont iconbox huizibg">&#xe651;</span><span class="numzi huizi">23</span> <span class="myiconfont iconbox huizibg">&#xe651;</span><span class="numzi huizi">{{
statusData.offline == null ? 0 : statusData.offline }}</span>
</div> </div>
</el-checkbox-button> </el-checkbox-button>
<el-checkbox-button checked label="备选项3" border> <!-- <el-checkbox-button checked label="备选项3" border>
<div class="more" @click="open_baojing()"> <div class="more" @click="open_baojing()">
<p class="redzi">报警</p> <p class="redzi">报警</p>
<span class="myiconfont iconbox redzibg">&#xe651;</span><span class="numzi redzi">38</span> <span class="myiconfont iconbox redzibg">&#xe651;</span><span class="numzi redzi">38</span>
</div> </div>
</el-checkbox-button> </el-checkbox-button> -->
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</div> </div>
@ -216,8 +207,9 @@
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import { getOtherList, sysArm, sysDisArm, getWareHouseList } from '@/api/device/device' import { getOtherList, sysArm, sysDisArm, getWareHouseList, getStatusCount } from '@/api/device/device'
import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage' import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage'
import { getCounty } from '@/api/Common/areaPicker'
// import baojingchaxunAdd from './baojingchaxunAdd' // import baojingchaxunAdd from './baojingchaxunAdd'
// import baojingchaxunInfo from './baojingchaxunInfo' // import baojingchaxunInfo from './baojingchaxunInfo'
// import req from '@/api/baojingchaxun/baojingchaxun' // import req from '@/api/baojingchaxun/baojingchaxun'
@ -237,6 +229,7 @@ export default {
btnShipinjiankong: [], btnShipinjiankong: [],
btnMenjinguanli: [], btnMenjinguanli: [],
btnDianziweilan: [], btnDianziweilan: [],
statusData: {},
btndisabled: false, btndisabled: false,
zc_list: [], zc_list: [],
dzwl_list: [], dzwl_list: [],
@ -282,16 +275,7 @@ export default {
], ],
supplierType_list: [{ dictValue: '一层', dictKey: '1' }], supplierType_list: [{ dictValue: '一层', dictKey: '1' }],
Datalista: [ Datalista: [],
{ xiaoqu: '和平家园小区南门出口', tuUrl: './image/ren1.jpg', weizhi: '南门出口', createTime: '2023-05-03', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-08', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区西门出口', tuUrl: './image/ren1.jpg', weizhi: '西门出口', createTime: '2023-05-12', createTime2: '19:32:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-23', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区南门出口', tuUrl: './image/ren1.jpg', weizhi: '南门出口', createTime: '2023-05-03', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-08', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区西门出口', tuUrl: './image/ren1.jpg', weizhi: '西门出口', createTime: '2023-05-12', createTime2: '19:32:38', shijian: '社区户主', name: '李明华' },
{ xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-23', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
],
dialogImage: false, dialogImage: false,
dialogImageJK: false, dialogImageJK: false,
dialogImageJKRec: false, dialogImageJKRec: false,
@ -451,6 +435,9 @@ export default {
openruqinbaojing() { openruqinbaojing() {
this.showRuqinbaojing = !this.showRuqinbaojing this.showRuqinbaojing = !this.showRuqinbaojing
}, },
abc() {
alert(1)
},
openshipinjiankong() { openshipinjiankong() {
this.showShipinjiankong = !this.showShipinjiankong this.showShipinjiankong = !this.showShipinjiankong
}, },
@ -601,24 +588,26 @@ export default {
} }
}, },
init() { init() {
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
getOtherList({ type: 1 }).then((res) => { getOtherList({ type: 1 }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.zc_list = res.data this.zc_list = res.data
} }
}) })
getOtherList({ type: 2 }).then((res) => { getOtherList({ type: 2 }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.dzwl_list = res.data this.dzwl_list = res.data
} }
console.log(this.dzwl_list) console.log(this.dzwl_list)
}) })
getStatusCount({ deviceType: null, statusType: null }).then(res => {
this.statusData = res.data
})
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
}, },
// //
indexMethod(index) { indexMethod(index) {

13
src/views/shebeirizhi/shebeirizhiList.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar view-title="设备日志" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <!-- <button-bar view-title="设备日志" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" /> -->
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -108,7 +108,7 @@ export default {
listLoading: false, listLoading: false,
listQuery: { listQuery: {
current: 1, current: 1,
size: 5, size: 10,
total: 0 total: 0
}, },
supplierType_list: [ supplierType_list: [
@ -177,9 +177,10 @@ export default {
getMessageInfoPage(this.listQuery).then((res) => { getMessageInfoPage(this.listQuery).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.list = res.data.records this.list = res.data.records
this.total = res.total this.listQuery.total = res.data.total
} else { } else {
this.list = [] this.list = []
this.listQuery.total = res.data.total
} }
}) })
}, },
@ -194,9 +195,10 @@ export default {
getMessageInfoPage(this.listQuery).then((res) => { getMessageInfoPage(this.listQuery).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.list = res.data.records this.list = res.data.records
this.total = res.total this.listQuery.total = res.data.total
} else { } else {
this.list = [] this.list = []
this.listQuery.total = res.data.total
} }
}) })
}, },
@ -206,6 +208,9 @@ export default {
this.getList() this.getList()
}, },
handleReset() { handleReset() {
this.listQuery.startTime = null
this.listQuery.name = null
this.listQuery.position = null
// this.listQuery = { // this.listQuery = {
// params: { // params: {
// manufacturerName: '', // manufacturerName: '',

23
src/views/shebeitaizhang/shebeitaizhangList.vue

@ -10,7 +10,7 @@
<pie-chartrenyuan :chart-data="wanhao_Chart"></pie-chartrenyuan> <pie-chartrenyuan :chart-data="wanhao_Chart"></pie-chartrenyuan>
<!-- <div class="zhongzi">75%</div> --> <!-- <div class="zhongzi">75%</div> -->
</div> </div>
<div class="title"><span class="iconfont icon-jiating greenzi"></span>完好率</div> <div class="title"><span class="iconfont icon-jiating greenzi"></span></div>
</div> </div>
<!-- 第1个图表 --> <!-- 第1个图表 -->
<div class="tbar"> <div class="tbar">
@ -19,7 +19,7 @@
<pie-chartrenyuan :chart-data="weixiu_Chart"></pie-chartrenyuan> <pie-chartrenyuan :chart-data="weixiu_Chart"></pie-chartrenyuan>
<!-- <div class="zhongzi">15%</div> --> <!-- <div class="zhongzi">15%</div> -->
</div> </div>
<div class="title"><span class="iconfont icon-jiating greenzi"></span>维修率</div> <div class="title"><span class="iconfont icon-jiating greenzi"></span></div>
</div> </div>
<!-- 第1个图表 --> <!-- 第1个图表 -->
<div class="tbar"> <div class="tbar">
@ -27,7 +27,7 @@
<pie-chartrenyuan :chart-data="sunhai_Chart"></pie-chartrenyuan> <pie-chartrenyuan :chart-data="sunhai_Chart"></pie-chartrenyuan>
<!-- <div class="zhongzi">10%</div> --> <!-- <div class="zhongzi">10%</div> -->
</div> </div>
<div class="title"><span class="iconfont icon-jiating greenzi"></span>损害率</div> <div class="title"><span class="iconfont icon-jiating greenzi"></span></div>
</div> </div>
</div> </div>
<div class="webye"> <div class="webye">
@ -150,7 +150,6 @@ import * as echarts from "echarts";
import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb' import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
// 1.1 // 1.1
const wanhao_Chart = { const wanhao_Chart = {
unit: '次',
color: ['#30e9ff', '#d9d9d9'], color: ['#30e9ff', '#d9d9d9'],
Data: { Data: {
seriesData: [ seriesData: [
@ -167,8 +166,7 @@ const wanhao_Chart = {
} }
// 1.2 // 1.2
const weixiu_Chart = { const weixiu_Chart = {
unit: '次', color: ['#d9d9d9', '#fdc004'],
color: ['#fe7f02', '#fdc004'],
Data: { Data: {
seriesData: [ seriesData: [
{ value: 15, name: '维修' }, { value: 15, name: '维修' },
@ -184,8 +182,7 @@ const weixiu_Chart = {
} }
// 1.3 // 1.3
const sunhai_Chart = { const sunhai_Chart = {
unit: '次', color: ['#d9d9d9', '#ff0202'],
color: ['#ff0202', '#d2cece'],
Data: { Data: {
seriesData: [ seriesData: [
{ value: 10, name: '损害' }, { value: 10, name: '损害' },
@ -374,6 +371,7 @@ export default {
var item = res.data[i]; var item = res.data[i];
// 1 2 3 // 1 2 3
if (item.maintenance == '1') { if (item.maintenance == '1') {
console.log('完好', item.maintenanceCount)
var bad = 100 - item.maintenanceCount; var bad = 100 - item.maintenanceCount;
var obj = { name: '完好', value: item.maintenanceCount } var obj = { name: '完好', value: item.maintenanceCount }
var obj1 = { name: '不完好', value: bad } var obj1 = { name: '不完好', value: bad }
@ -383,18 +381,20 @@ export default {
// 1 2 3 // 1 2 3
if (item.maintenance == '2') { if (item.maintenance == '2') {
console.log('维修', item.maintenanceCount)
var bad = 100 - item.maintenanceCount; var bad = 100 - item.maintenanceCount;
var obj = { name: '维修', value: item.maintenanceCount } var obj = { name: '维修', value: item.maintenanceCount }
var obj1 = { name: '维修', value: bad } var obj1 = { name: '维修', value: bad }
this.weixiu_Chart.Data.seriesData.push(obj1) this.weixiu_Chart.Data.seriesData.push(obj1)
this.weixiu_Chart.Data.seriesData.push(obj) this.weixiu_Chart.Data.seriesData.push(obj)
} }
// 1 2 3 // 1 2 3
if (item.maintenance == '3') { if (item.maintenance == '3') {
console.log('损害', item.maintenanceCount)
var bad = 100 - item.maintenanceCount; var bad = 100 - item.maintenanceCount;
var obj = { name: '损害', value: item.maintenanceCount } var obj = { name: '损害', value: item.maintenanceCount }
var obj1 = { name: '损害', value: bad } var obj1 = { name: '损害', value: bad }
this.sunhai_Chart.Data.seriesData.push(obj1) this.sunhai_Chart.Data.seriesData.push(obj1)
this.sunhai_Chart.Data.seriesData.push(obj) this.sunhai_Chart.Data.seriesData.push(obj)
} }
@ -428,6 +428,9 @@ export default {
this.getList() this.getList()
}, },
handleReset() { handleReset() {
this.listQuery.ckId = null
this.listQuery.type = null
this.listQuery.name = null
}, },
// //
toAdd() { toAdd() {

1
src/views/shebeizhuangtai/shebeizhuangtaiList.vue

@ -201,6 +201,7 @@ export default {
this.getList() this.getList()
}, },
handleReset() { handleReset() {
this.listQuery.type = null
// this.listQuery = { // this.listQuery = {
// params: { // params: {
// manufacturerName: '', // manufacturerName: '',

143
src/views/xiaoxi/xiaoxiInfo.vue

@ -13,20 +13,12 @@
<div>详情信息</div> <div>详情信息</div>
</div> </div>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<span>类型</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ getSupplierType(infoForm.manufacturerCode) }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>时间</span> <span>时间</span>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="15">
<el-form-item> <el-form-item>
<span>2023-05-23 08:16:26</span> <span>{{ infoForm.createTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -34,34 +26,24 @@
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>标题</span> <span>标题</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="15">
<el-form-item> <el-form-item>
<span>标题标题标题标题标题标题标题标题标题标题标题标题</span> <span>{{ infoForm.title }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" class="tleftb">
<span>安装时间</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ infoForm.supplierTypeValue }}</span>
</el-form-item>
</el-col> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>内容</span> <span>内容</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="15">
<el-form-item> <el-form-item>
<span> <span>
内容内容内容内容内容内容内容内容内容内容 {{ infoForm.content }}
</span> </span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
@ -69,71 +51,68 @@
</template> </template>
<script> <script>
// import req from '@/api/xiaoxi/xiaoxi' // import req from '@/api/xiaoxi/xiaoxi'
import { getInfoById } from '@/api/yInfo/yInfo'
export default { export default {
name: 'xiaoxiInfo', name: 'xiaoxiInfo',
data() { data() {
return { return {
// tableKey: 0, // tableKey: 0,
// index: 0, // index: 0,
viewTitle: '', viewTitle: '',
supplierType_list: [ supplierType_list: [
{ title: '任务', id: '1' }, { title: '任务', id: '1' },
], ],
status_list: [ status_list: [
{ title: '已读', id: '1' }, { title: '已读', id: '1' },
{ title: '未读', id: '2' }, { title: '未读', id: '2' },
], ],
infoForm: { infoForm: {
manufacturerName: 'KD-22', manufacturerName: 'KD-22',
manufacturerAs: '2F金陵文脉', manufacturerAs: '2F金陵文脉',
manufacturerCode: '1', manufacturerCode: '1',
supplierTypeValue: '2023-02-26 16:00:00', supplierTypeValue: '2023-02-26 16:00:00',
manufacturerAddress: '大华', manufacturerAddress: '大华',
manufacturer: '2023-02-26 12:00:00', manufacturer: '2023-02-26 12:00:00',
manufacturerTelePhone: '大华科技', manufacturerTelePhone: '大华科技',
manufacturerFax: '2023-05-23', manufacturerFax: '2023-05-23',
status:'1' status: '1'
}, },
// baseManufacturerBankDto: [], rules: {},
rules: {}, // submitdisabled: false
// submitdisabled: false }
},
methods: {
getStatus(item) {
for (var i = 0; i < this.status_list.length; i++) {
if (this.status_list[i].id == item) {
return this.status_list[i].title
}
} }
}, },
methods: { getSupplierType(item) {
getStatus(item) { for (var i = 0; i < this.supplierType_list.length; i++) {
for (var i = 0; i < this.status_list.length; i++) { if (this.supplierType_list[i].id == item) {
if (this.status_list[i].id == item) { return this.supplierType_list[i].title
return this.status_list[i].title
}
}
},
getSupplierType(item) {
for (var i = 0; i < this.supplierType_list.length; i++) {
if (this.supplierType_list[i].id == item) {
return this.supplierType_list[i].title
}
} }
},
showInfo(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '设备台账详情'
// req.fetchBySid(row.sid).then(resp => {
// this.infoForm = resp.data.infoForm
// this.baseManufacturerBankDto = resp.data.baseManufacturerBankDto
// }).catch(e => {
// this.formobj = row
// })
},
handleReturn() {
this.$emit('doback')
} }
},
showInfo(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '设备台账详情'
getInfoById({ id: row.id }).then(resp => {
this.infoForm = resp.data
}).catch(e => {
this.formobj = row
})
},
handleReturn() {
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped></style>
</style>

694
src/views/xiaoxi/xiaoxiList.vue

@ -1,28 +1,28 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar view-title="消息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <!-- <button-bar view-title="消息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" /> -->
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="消息类型"> <!-- <el-form-item label="消息类型">
<el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择消息类型"> <el-select v-model="listQuery.supplierType" filterable clearable placeholder="请选择消息类型">
<el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id" /> <el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="选择楼层"> <el-form-item label="选择楼层">
<el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择楼层"> <el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择楼层">
<el-option v-for="item in floor_list" :key="item.id" :label="item.title" :value="item.id" /> <el-option v-for="item in floor_list" :key="item.id" :label="item.title" :value="item.id" />
</el-select> </el-select>
</el-form-item> -->
<!-- <el-form-item label="厂商办公电话">
<el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder="" class="addinputw" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="联系人"> <el-form-item label="厂商办公电话">
<el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw" clearable/> <el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder="" class="addinputw" clearable/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="消息">
<el-input v-model="listQuery.content" maxlength="125" placeholder="" class="addinputw" clearable />
</el-form-item>
</el-form> </el-form>
<div class="btn"> <div class="btn">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button> <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -43,34 +43,35 @@
<el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" /> <el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width"> <el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width">
<template slot-scope="{row}"> <template slot-scope="{row}">
<!-- <el-button size="mini" type="primary"
:disabled="!row.isShow && (row.supplierTypeValue === '主机厂' || row.supplierTypeValue === '分公司')"
@click="handleEdit(row)">编辑</el-button> -->
<el-button size="mini" type="primary" @click="handleCheck(row)">详情</el-button> <el-button size="mini" type="primary" @click="handleCheck(row)">详情</el-button>
<!-- <el-button size="mini" type="primary">处理</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="类型" width="110" align="center"> <!-- <el-table-column label="类型" width="110" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getSupplierType(scope.row.supplierTypeValue) }}</span> <span>{{ getSupplierType(scope.row.supplierTypeValue) }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="标题" width="" header-align="center" align="center"> <el-table-column label="标题" width="" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.biaoti }}</span> <span>{{ scope.row.title }}</span>
</template>
</el-table-column>
<el-table-column label="消息" width="" header-align="center" align="center">
<template slot-scope="scope">
<span>{{ scope.row.content }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="时间" align="center"> <el-table-column label="时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.time }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center"> <!-- <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == 1" style="color:green">{{ getStatus(scope.row.status) }}</span> <span v-if="scope.row.status == 1" style="color:green">{{ getStatus(scope.row.status) }}</span>
<span v-if="scope.row.status == 2" style="color:red">{{ getStatus(scope.row.status) }}</span> <span v-if="scope.row.status == 2" style="color:red">{{ getStatus(scope.row.status) }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -79,357 +80,329 @@
:limit.sync="listQuery.size" class="pagination" @pagination="getList" /> :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> </div>
</div> </div>
<!-- <xiaoxiAdd v-show="viewState == 2" ref="divadd" @doback="resetState" @reloadlist="handleFilter" /> --> <!-- <xiaoxiAdd v-show="viewState == 2" ref="divadd" @doback="resetState" @reloadlist="handleFilter" /> -->
<xiaoxiInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" /> <xiaoxiInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" />
</div> </div>
</template> </template>
<script> <script>
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
// import { typeValues, getOrgSidByPath } from '@/api/cheliang/dictcommons' import { getInfoPage } from '@/api/yInfo/yInfo'
// import xiaoxiAdd from './xiaoxiAdd' // import { typeValues, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import xiaoxiInfo from './xiaoxiInfo' // import xiaoxiAdd from './xiaoxiAdd'
// import req from '@/api/xiaoxi/xiaoxi' import xiaoxiInfo from './xiaoxiInfo'
export default { // import req from '@/api/xiaoxi/xiaoxi'
name: 'xiaoxiList', export default {
components: { name: 'xiaoxiList',
Pagination, components: {
pageye, Pagination,
ButtonBar, pageye,
// xiaoxiAdd, ButtonBar,
xiaoxiInfo // xiaoxiAdd,
}, xiaoxiInfo
data() { },
return { data() {
return {
btndisabled: false, btndisabled: false,
btnList: [ btnList: [
// { // {
// type: 'primary', // type: 'primary',
// size: 'small', // size: 'small',
// icon: 'plus', // icon: 'plus',
// btnKey: 'toAdd', // btnKey: 'toAdd',
// btnLabel: '' // btnLabel: ''
// }, // },
{ {
type: 'danger', type: 'danger',
size: 'small', size: 'small',
icon: 'del', icon: 'del',
btnKey: 'doDel', btnKey: 'doDel',
btnLabel: '删除' btnLabel: '删除'
},
// {
// type: 'primary',
// size: 'small',
// icon: '',
// btnKey: 'toChangShang',
// btnLabel: ''
// },
// {
// type: 'primary',
// size: 'small',
// icon: '',
// btnKey: 'toGain',
// btnLabel: ''
// },
// {
// type: 'success',
// size: 'small',
// icon: 'export',
// btnKey: 'import',
// btnLabel: ''
// },
// {
// type: 'success',
// size: 'small',
// icon: 'export',
// btnKey: 'build',
// btnLabel: ''
// },
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
viewState: 1,
isSearchShow: false,
searchxianshitit: '显示查询条件',
sids: [],
// -----------
tableKey: 0,
list: [
{ supplierTypeValue: '1', biaoti: '您有新消息了', time: '2023-02-26 12:00:00', status: '2' },
{ supplierTypeValue: '1', biaoti: '您有新消息了', time: '2023-02-26 12:00:00', status: '2' },
],
listLoading: false,
listQuery: {
params: {
manufacturerName: '',
supplierType: '',
useOrgSid: '',
createOrgSid: '',
manufacturerTelePhone: '',
contactName: ''
},
current: 1,
size: 5,
total: 0
}, },
supplierType_list: [ // {
{ title: '任务', id: '1' }, // type: 'primary',
], // size: 'small',
floor_list: [ // icon: '',
{ title: '一层', id: '1' }, // btnKey: 'toChangShang',
{ title: '二层', id: '2' }, // btnLabel: ''
{ title: '三层', id: '3' }, // },
{ title: '四层', id: '4' }, // {
], // type: 'primary',
status_list: [ // size: 'small',
{ title: '已读', id: '1' }, // icon: '',
{ title: '未读', id: '2' }, // btnKey: 'toGain',
], // btnLabel: ''
rules: {} // },
// {
// type: 'success',
// size: 'small',
// icon: 'export',
// btnKey: 'import',
// btnLabel: ''
// },
// {
// type: 'success',
// size: 'small',
// icon: 'export',
// btnKey: 'build',
// btnLabel: ''
// },
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
viewState: 1,
isSearchShow: false,
searchxianshitit: '显示查询条件',
sids: [],
// -----------
tableKey: 0,
list: [],
listLoading: false,
listQuery: {
current: 1,
size: 10,
total: 0
},
supplierType_list: [
{ title: '任务', id: '1' },
],
floor_list: [
{ title: '一层', id: '1' },
{ title: '二层', id: '2' },
{ title: '三层', id: '3' },
{ title: '四层', id: '4' },
],
status_list: [
{ title: '已读', id: '1' },
{ title: '未读', id: '2' },
],
rules: {}
}
},
mounted() {
// this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
//
this.init()
},
methods: {
getStatus(item) {
for (var i = 0; i < this.status_list.length; i++) {
if (this.status_list[i].id == item) {
return this.status_list[i].title
}
} }
}, },
mounted() { getSupplierType(item) {
this.$refs['btnbar'].setButtonList(this.btnList) for (var i = 0; i < this.supplierType_list.length; i++) {
if (this.supplierType_list[i].id == item) {
return this.supplierType_list[i].title
}
}
}, },
created() { resetState() {
// this.viewState = 1
// this.init()
}, },
methods: { btnHandle(btnKey) {
getStatus(item) { console.log('XXXXXXXXXXXXXXX ' + btnKey)
for (var i = 0; i < this.status_list.length; i++) { switch (btnKey) {
if (this.status_list[i].id == item) { case 'toAdd':
return this.status_list[i].title this.toAdd()
} break
} case 'doDel':
}, this.doDel()
getSupplierType(item) { break
for (var i = 0; i < this.supplierType_list.length; i++) { case 'toChangShang':
if (this.supplierType_list[i].id == item) { this.toChangShang()
return this.supplierType_list[i].title break
} case 'toGain':
} this.toGain()
}, break
resetState() { case 'doExport':
this.viewState = 1 this.doExport()
}, break
btnHandle(btnKey) { case 'doClose':
console.log('XXXXXXXXXXXXXXX ' + btnKey) this.doClose()
switch (btnKey) { break
case 'toAdd': default:
this.toAdd() break
break }
case 'doDel': },
this.doDel() //
break clicksearchShow() {
case 'toChangShang': this.isSearchShow = !this.isSearchShow
this.toChangShang() if (this.isSearchShow) {
break this.searchxianshitit = '隐藏查询条件'
case 'toGain': } else {
this.toGain() this.searchxianshitit = '显示查询条件'
break }
case 'doExport': },
this.doExport() init() {
break getInfoPage(this.listQuery).then((res) => {
case 'doClose': if (res.code == 200) {
this.doClose() this.list = res.data.records
break this.listQuery.total = res.data.total
default:
break
} }
}, })
// },
clicksearchShow() { //
this.isSearchShow = !this.isSearchShow indexMethod(index) {
if (this.isSearchShow) { var pagestart = (this.listQuery.current - 1) * this.listQuery.size
this.searchxianshitit = '隐藏查询条件' var pageindex = index + 1 + pagestart
} else { return pageindex
this.searchxianshitit = '显示查询条件' },
//
getList() {
this.listLoading = true
getInfoPage(this.listQuery).then((res) => {
this.listLoading = false
if (res.code == 200) {
this.list = res.data.records
this.listQuery.total = res.data.total
} }
}, })
// init() { },
// getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { //
// if (res.success) { handleFilter() {
// this.listQuery.params.createOrgSid = res.data this.listQuery.current = 1
// this.getType() this.getList()
// this.getList() },
// } handleReset() {
// }) this.listQuery.content = null
// }, },
// getType() { //
// typeValues({ toAdd() {
// type: 'supplierType' this.viewState = 2
// }).then((res) => { this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
// if (res.code === '200') { },
// this.supplierType_list = res.data
// console.log('', this.supplierType_list)
// }
// })
// },
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
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
// }
// })
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
// this.listQuery = {
// params: {
// manufacturerName: '',
// supplierType: '',
// useOrgSid: '',
// createOrgSid: '',
// manufacturerTelePhone: '',
// contactName: ''
// },
// current: 1,
// size: 5
// }
// this.init()
},
//
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
},
handleSelectionChange(row) { handleSelectionChange(row) {
const aa = [] const aa = []
row.forEach((element) => { row.forEach((element) => {
aa.push(element.sid) aa.push(element.sid)
}) })
this.sids = aa this.sids = aa
}, },
// ID // ID
doDel() { doDel() {
if (this.sids.length > 0) { if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', { this.$confirm(tip, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
const loading = this.$loading({ const loading = this.$loading({
lock: true, lock: true,
text: 'Loading', text: 'Loading',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}) })
req.delBySids(this.sids.toString()).then(resp => { req.delBySids(this.sids.toString()).then(resp => {
if (resp.success) { if (resp.success) {
loading.close()
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.getList()
} else {
loading.close()
}
}).catch(e => {
loading.close() loading.close()
}) this.$message({ type: 'success', message: resp.msg, showClose: true })
}).catch(() => { this.getList()
} else {
loading.close()
}
}).catch(e => {
loading.close()
}) })
} else { }).catch(() => {
this.$message({ type: 'error', message: '没有选择!!', showClose: true }) })
return } else {
} this.$message({ type: 'error', message: '没有选择!!', showClose: true })
}, return
// toChangShang() {
// req.saveGysByOrgSid(this.listQuery.params.createOrgSid).then((resp) => {
// if (resp.success) {
// this.$message({ showClose: true, type: 'success', message: '' })
// this.getList()
// }
// })
// },
// toGain() {
// req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => {
// if (resp.success) {
// this.$message({ showClose: true, type: 'success', message: '' })
// this.getList()
// }
// })
// },
handleEdit(row) {
// this.viewState = 3
// this.$refs['divadd'].showEdit(row)
this.viewState = 2
this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
// if (row.supplierTypeValue !== '' && row.supplierTypeValue !== '') {
// this.viewState = 3
// this.$refs['divadd'].showEdit(row)
// } else {
// this.viewState = 5
// this.$refs['divHosts'].showInfo(row)
// }
},
//
handleCheck(row) {
this.viewState = 4
this.$refs['divinfo'].showInfo(row)
},
//
// doExport() {
// basefinbankExportExcel(this.sids).then((res) => {
// const blob = new Blob([res], {
// type: 'application/vnd.ms-excel'
// })
// const objectUrl = URL.createObjectURL(blob)
// window.location.href = objectUrl
// this.$notify({
// title: '',
// message: '',
// type: 'success',
// duration: 2000
// })
// })
// },
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
} }
},
// toChangShang() {
// req.saveGysByOrgSid(this.listQuery.params.createOrgSid).then((resp) => {
// if (resp.success) {
// this.$message({ showClose: true, type: 'success', message: '' })
// this.getList()
// }
// })
// },
// toGain() {
// req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => {
// if (resp.success) {
// this.$message({ showClose: true, type: 'success', message: '' })
// this.getList()
// }
// })
// },
handleEdit(row) {
// this.viewState = 3
// this.$refs['divadd'].showEdit(row)
this.viewState = 2
this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
// if (row.supplierTypeValue !== '' && row.supplierTypeValue !== '') {
// this.viewState = 3
// this.$refs['divadd'].showEdit(row)
// } else {
// this.viewState = 5
// this.$refs['divHosts'].showInfo(row)
// }
},
//
handleCheck(row) {
this.viewState = 4
this.$refs['divinfo'].showInfo(row)
},
//
// doExport() {
// basefinbankExportExcel(this.sids).then((res) => {
// const blob = new Blob([res], {
// type: 'application/vnd.ms-excel'
// })
// const objectUrl = URL.createObjectURL(blob)
// window.location.href = objectUrl
// this.$notify({
// title: '',
// message: '',
// type: 'success',
// duration: 2000
// })
// })
// },
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.app-containerb{ .app-containerb {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: flex-start;align-items: flex-start; justify-content: flex-start;
align-items: flex-start;
}
.webye {
flex: 1;
text-align: left;
} }
.webye{flex: 1;text-align: left;}
/* 饼图部分 */ /* 饼图部分 */
.tbars {width: 250px;height: 100%; .tbars {
width: 250px;
height: 100%;
/* display: flex; /* display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -437,8 +410,10 @@
margin: 0 20px 0 0; margin: 0 20px 0 0;
padding: 10px; padding: 10px;
background-color: #fff; background-color: #fff;
box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px; box-shadow: 0px 0px 10px #E9E9E9;
border-radius: 5px;
} }
.tbar { .tbar {
/* width: 25%; */ /* width: 25%; */
margin: 0 0px 0 0; margin: 0 0px 0 0;
@ -446,22 +421,31 @@
box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px; */ box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px; */
padding: 10px; padding: 10px;
} }
.tbar:last-of-type { .tbar:last-of-type {
margin: 0; margin: 0;
} }
.tbar0 { .tbar0 {
border-bottom: 0px solid #032ab8; border-bottom: 0px solid #032ab8;
} }
.tbar .title { .tbar .title {
font-size: 20px; font-size: 20px;
padding: 0px 20px;text-align: center; padding: 0px 20px;
font-weight: bold; color: #333;font-size: 16px; text-align: center;
font-weight: bold;
color: #333;
font-size: 16px;
/* border-bottom: 1px solid #ececee; */ /* border-bottom: 1px solid #ececee; */
} }
.tbar .title span { .tbar .title span {
padding: 0 10px 0 0; padding: 0 10px 0 0;
} }
.tbar .bar {position: relative;
.tbar .bar {
position: relative;
/* display: flex; /* display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -470,7 +454,17 @@
padding: 0px; padding: 0px;
height: 190px; height: 190px;
} }
.tbar .bar .zhongzi {position: absolute;top:0;bottom: 0;left: 0;right: 0;line-height: 240px;text-align: center;
font-weight: bold; color: #333;font-size: 18px; .tbar .bar .zhongzi {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
line-height: 240px;
text-align: center;
font-weight: bold;
color: #333;
font-size: 18px;
} }
</style> </style>

7
src/views/zhiwujiance/zhiwujianceInfo.vue

@ -68,11 +68,11 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>拍照图片</span> <span>拍照图片{{ infoForm.imgAfter }}</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item> <el-form-item>
<span><img class="tus" :src="infoForm.imgAfter" alt="" /></span> <span><img class="tus" :src="fileUrl + infoForm.imgAfter" alt="" /></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -93,6 +93,8 @@ export default {
// tableKey: 0, // tableKey: 0,
// index: 0, // index: 0,
viewTitle: '', viewTitle: '',
// fileUrl: 'http://8.130.39.13:7003/upload/monitor/',
fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/',
supplierType_list: [ supplierType_list: [
{ title: '摄像头', id: '1' }, { title: '摄像头', id: '1' },
], ],
@ -127,6 +129,7 @@ export default {
}) })
this.viewTitle = '质物台账详情' this.viewTitle = '质物台账详情'
getDeviceImageById({ id: row.id }).then(resp => { getDeviceImageById({ id: row.id }).then(resp => {
console.log('resp', resp)
this.infoForm = { this.infoForm = {
cangkuname: '仓库1', huohao: '1025632', ren: 'sun', tel: '138330025635', cangkuname: '仓库1', huohao: '1025632', ren: 'sun', tel: '138330025635',
bianma: '02124623', name: '矿泉水', num: '500', weizhi: '仓库1F3', bianma: '02124623', name: '矿泉水', num: '500', weizhi: '仓库1F3',

5
src/views/zhiwujiance/zhiwujianceList.vue

@ -182,8 +182,8 @@ export default {
data() { data() {
return { return {
// imgUrl: 'http://huirong.ybkjyl.com/1.png', // imgUrl: 'http://huirong.ybkjyl.com/1.png',
// fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/', fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/',
fileUrl: 'http://8.130.39.13:7003/upload/monitor/', // fileUrl: 'http://8.130.39.13:7003/upload/monitor/',
wanhao_Chart: wanhao_Chart, // 1.1 wanhao_Chart: wanhao_Chart, // 1.1
weixiu_Chart: weixiu_Chart, weixiu_Chart: weixiu_Chart,
sunhai_Chart: sunhai_Chart, sunhai_Chart: sunhai_Chart,
@ -361,6 +361,7 @@ export default {
this.getList() this.getList()
}, },
handleReset() { handleReset() {
this.listQuery.ckId = null
}, },
// //
toAdd() { toAdd() {

Loading…
Cancel
Save