From 8aa3edd56c279100c9053576f3e90fa55459fe77 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 16 Jan 2023 16:15:55 +0800
Subject: [PATCH] 修改
---
src/views/clientManagement/clientManagement.vue | 373 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 280 insertions(+), 93 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 39418a2..b80cc8f 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -28,7 +28,9 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
- @on-load="onLoad">
+ @on-load="onLoad"
+ @row-click="rowClick">
+
<template slot="menuLeft">
<el-button type="danger"
size="mini"
@@ -41,7 +43,6 @@
<Legend :datas="datalistLIU"></Legend>
</span>
</template>
-
<template slot-scope="{ row }" slot="devicestate">
<el-tag>{{
@@ -66,16 +67,33 @@
<!-- </el-button>-->
<!-- </template>-->
- <template slot-scope="{ row }" slot="dxzt">
- <el-tag>{{
- row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "在线" : "无"
+ <template class="tdtype" slot-scope="{ row }" slot="dxzt">
+ <el-tag class="dtype">
+ {{
+ row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "正常" :row.dxzt == "2" ? "预警":row.dxzt == "3" ? "故障":"无"
}}
+ <i class="dx" v-if="row.dxzt == '0' "></i>
+ <i class="zc" v-if="row.dxzt == '1' "></i>
+ <i class="yj" v-if="row.dxzt == '2' "></i>
+ <i class="gz" v-if="row.dxzt == '3' "></i>
</el-tag>
+
</template>
- <template slot-scope="{ row }" slot="jfzt">
- <i class="el-icon-check client-jf" v-if="row.type == 0"></i>
- <i class="el-icon-close client-qf" v-else-if="row.type == 1"></i>
+ <template slot-scope="{ row }" slot="type">
+ <i class="el-icon-check client-jf" v-if="row.type == '0' "></i>
+ <i class="el-icon-close client-qf" v-else-if="row.type == '1' "></i>
+ </template>
+
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ v-if="row.dtype == 2"
+ icon="el-icon-s-order"
+ :size="size"
+ :type="type"
+ @click.stop="updateDtype(row)"
+ >办结
+ </el-button>
</template>
</avue-crud>
@@ -86,6 +104,7 @@
<li class="menu_item" @click.stop="handleMap">定位</li>
</ul>
</div>
+
<el-drawer
title="电子地图"
@@ -140,14 +159,15 @@
</el-form-item>
</el-col>
</el-form>
-
+
</el-dialog>
<el-table
:data="gridData"
border
- style="width: 100%">
+ style="width: 100%"
+ >
<el-table-column
fixed
prop="xb"
@@ -195,10 +215,12 @@
<script>
import {getList, remove, update, add, getclient, getDeptLazyTree, getAll, updates,getBaTree} from "@/api/client/client";
+ // import {getDeptTree} from "@/api/system/dept";
import {mapGetters} from "vuex";
import axios from "axios";
import Legend from '../../components/liu-legend/Legend'
import AvueMap from "avue-plugin-map";
+ import website from '@/config/website';
export default {
components:{
@@ -209,17 +231,28 @@
},
data() {
return {
+ dataLIU:{
+ color:"#DFDFDF"
+ },
//legend-liu数据
datalistLIU:[
{
- color: 'rgb(236, 83, 37)',
+ color: "#DFDFDF",
text: '掉线'
},
{
- color: 'rgb(49, 49, 49)',
- text: '在线'
+ color: "#29C093",
+ text: '正常'
+ },
+ {
+ color: "#F34A4A",
+ text: '预警'
+ },
+ {
+ color: "#F48F57",
+ text: '故障'
}
- ],
+ ],
form: {},
query: {},
showMap: false,
@@ -227,6 +260,7 @@
initFlag: true,
loading: true,
menuVisible:false,
+ isEdit:false,
page: {
pageSize: 10,
currentPage: 1,
@@ -265,10 +299,10 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
+ calcHeight: 54,
labelWidth: '125',
- dialogWidth: 960,
- menuWidth: 150,
+ dialogWidth: 1150,
+ menuWidth: 200,
align:"center",
size: "mini",
tip: false,
@@ -331,14 +365,29 @@
]
},
{
+ label: "设备类型",
+ prop: "deviceType",
+ width: 150,
+ rules: [{
+ required: true,
+ message: "请输入设备类型",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "使用方",
+ prop: "deptName",
+ display: false
+ },
+ {
label: "使用方",
prop: "deptId",
width: 200,
- type: "tree",
+ type: "cascader",
dicUrl: "/api/blade-system/dept/trees",
- multiple: true,
dicData: [],
checkStrictly:true,
+ hide:true,
props: {
label: "title"
},
@@ -357,6 +406,7 @@
// type: "cascader",
// dicUrl: "/api/blade-system/dept/trees",
// multiple: true,
+ // checkStrictly:true,
// dicData: [],
// props: {
// label: "title"
@@ -396,10 +446,30 @@
}],
}, {
label: "缴费状态",
- prop: "jfzt",
+ prop: "type",
slot: true,
+ sortable:true,
addDisplay: false,
editDisplay: false,
+ }, {
+ label: "设备厂商",
+ prop: "manufacturers",
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ searchSpan: 3,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=manufacturers",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ search:true,
+ type:"select",
+ rules: [{
+ required: true,
+ message: "请选择设备厂商",
+ trigger: "blur"
+ }],
}, {
label: "布撤防状态",
prop: "devicestate",
@@ -426,6 +496,7 @@
label: "设备状态",
prop: "dxzt",
slot: true,
+ sortable:true,
addDisplay: false,
editDisplay: false,
},
@@ -433,7 +504,8 @@
label: "故障状态",
prop: "state",
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ hide:true
},
{
label: "故障原因",
@@ -441,13 +513,12 @@
addDisplay: false,
editDisplay: false
},
-
{
label: "省份",
prop: "province",
search: true,
searchSpan: 2,
- labelWidth: '112',
+ labelWidth: '110',
searchLabelWidth: 45,
placeholder: "省份",
type: "select",
@@ -457,7 +528,7 @@
},
cascaderItem: ["city", "district"],
dicUrl: "/api/blade-system/region/select",
- span: 6,
+ span: 8,
className: "city1",
hide: true,
addDisplay: true,
@@ -478,7 +549,7 @@
value: "code"
},
dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 3,
+ span: 2,
labelWidth: "0",
className: "city2",
hide: true,
@@ -500,7 +571,7 @@
value: "code"
},
dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 3,
+ span: 2,
labelWidth: "0",
className: "city3",
hide: true,
@@ -510,10 +581,7 @@
}, {
label: "地址",
prop: "street",
- // type:"map",
span:10,
- labelWidth: '142',
- width:100,
hide: true,
},
{
@@ -532,6 +600,8 @@
hide: true,
prop: "jd",
searchSpan:2,
+ width:"100",
+ labelWidth: "120",
formatter: (row,value,label,column)=>{
return value = value.substring(0,11);
},
@@ -539,7 +609,7 @@
},
{
label: "纬度",
- labelWidth:50,
+ labelWidth: "45",
hide: true,
prop: "wd",
formatter: (row,value,label,column) => {
@@ -547,20 +617,9 @@
},
span:5,
},
- {
- label: "心跳时间",
- prop: "heartbeat",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 130,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- },
+
{
- label: "负责人1",
+ label: "主要负责人",
prop: "oneId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -574,12 +633,12 @@
viewDisplay: true,
rules: [{
required: true,
- message: "请选择负责人",
+ message: "请选择主要负责人",
trigger: "blur"
}],
},
{
- label: "负责人1电话",
+ label: "主要负责人电话",
prop: "onePhone",
width: 110,
hide: true,
@@ -592,7 +651,7 @@
trigger: "blur"
}],
}, {
- label: "负责人2",
+ label: "负责人1",
prop: "twoId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -606,7 +665,7 @@
viewDisplay: true,
},
{
- label: "负责人2电话",
+ label: "负责人1电话",
prop: "twoPhone",
width: 110,
hide: true,
@@ -614,7 +673,7 @@
editDisplay: true,
viewDisplay: true,
}, {
- label: "负责人3",
+ label: "负责人2",
prop: "threeId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -628,7 +687,7 @@
viewDisplay: true,
},
{
- label: "负责人3电话",
+ label: "负责人2电话",
prop: "threePhone",
width: 110,
hide: true,
@@ -665,6 +724,18 @@
editDisplay: true,
viewDisplay: true,
},
+ {
+ label: "心跳时间",
+ prop: "heartbeat",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ }
]
},
@@ -676,22 +747,19 @@
// form是表单或者表格绑定的数据集，v-model='form'
handler(val) {
if (val) {
- console.log(val,111);
- this.form.wd = val.latitude.toString().substring(0,10);
- this.form.jd = val.longitude.toString().substring(0,11);
+ var that = this;
+ //经纬度替换
+ this.form.wd = val.latitude;
+ this.form.jd = val.longitude;
//地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
var address = val.formattedAddress.toString();
- if(address.search("县") != -1){
- this.form.street = address.substring(address.indexOf("县")+1,address.length);
- }
- if(address.search("区") != -1){
- this.form.street = address.substring(address.indexOf("区")+1,address.length);
- }
-
- // this.form.province = val.addressComponent.province;
- // console.log( val.addressComponent.city,123456)
- // this.form.city = val.addressComponent.city;
- // this.form.district = val.addressComponent.district;
+ this.form.street = address;
+ // if(address.search("县") != -1){
+ // this.form.street = address.substring(address.indexOf("县")+1,address.length);
+ // }
+ // if(address.search("区") != -1){
+ // this.form.street = address.substring(address.indexOf("区")+1,address.length);
+ // }
}
},
immediate: true,
@@ -734,8 +802,15 @@
});
}
},
- }
-
+ },
+
+ //随意一个
+ // 'form.deviceName'() {
+ // if (this.initFlag) {
+ // this.initData();
+ // }
+ // }
+
},
computed: {
...mapGetters(["permission"]),
@@ -755,6 +830,11 @@
return ids.join(",");
}
},
+ mounted(){
+ // 租户模式默认加载管理组数据
+ // var that = this;
+ //that.tenantId = website.tenantId;
+ },
methods: {
generate(row) {
updates(row.expireTime, row.deviceNumber).then(() => {
@@ -769,12 +849,20 @@
window.console.log(error);
});
},
-
+
+ //初始化数据
+ // initData() {
+ // //部门tree数据
+ // getDeptTree().then(res => {
+ // const column = this.findObject(this.option.column, "deptId");
+ // column.dicData = res.data.data;
+ // });
+ // },
+
handleClick(row) {
this.form = row;
this.dialogTableVisible = true;
this.realjf = true;
-
},
nodeClick(data) {
this.treeDeptId = data.id;
@@ -782,6 +870,7 @@
this.onLoad(this.page);
},
rowSave(row, done, loading) {
+ row.deptId = row.deptId.join(",");
add(row).then(() => {
this.onLoad(this.page);
this.$message({
@@ -795,10 +884,11 @@
});
},
rowUpdate(row, index, done, loading) {
- debugger;
- row.jd=row.map.latitude;
- row.wd=row.map.longitude;
+ if(Array.isArray(row.deptId)){
+ row.deptId = row.deptId.join(",");
+ }
update(row).then(() => {
+ // this.initFlag = false;
this.onLoad(this.page);
this.$message({
type: "success",
@@ -808,6 +898,20 @@
}, error => {
window.console.log(error);
loading();
+ });
+ },
+ updateDtype(row){
+ row.dtype = "0";
+ update(row).then(() => {
+ // this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.onLoad(this.page);
+ }, error => {
+ window.console.log(error);
});
},
rowDel(row) {
@@ -833,6 +937,7 @@
this.onLoad(this.page);
},
searchChange(params, done) {
+ console.log(params,done)
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -871,8 +976,13 @@
if (["edit", "view"].includes(type)) {
getclient(this.form.id).then(res => {
this.form = res.data.data;
+ this.isEdit=true;
});
}
+ if (["add"].includes(type)) {
+ this.isEdit=false;
+ }
+ // this.initFlag = true;
done();
},
currentChange(currentPage) {
@@ -915,7 +1025,6 @@
this.loading = true;
getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
- debugger;
const data = res.data.data;
this.page.total = data.total;
@@ -923,37 +1032,61 @@
for (var i = 0; i < data.records.length; i++) {
var date = new Date(data.records[i].heartbeat).getTime();
- if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
- data.records[i].dxzt = 0;
- } else if (data.records[i].heartbeat == "") {
- data.records[i].dxzt = 0;
- } else {
- data.records[i].dxzt = 1;
- }
+ if(data.records[i].dtype==1){
+ data.records[i].dxzt = 1;
+ }
+ if(data.records[i].dtype==2){
+ data.records[i].dxzt = 2;
+ }
+ if(data.records[i].dtype==3){
+ data.records[i].dxzt = 3;
+ }
+ if(data.records[i].dtype=="" || data.records[i].dtype==0){
+ data.records[i].dxzt = 0;
+ }
}
-
- data.records.sort((a, b) => {
- return a.dxzt - b.dxzt;
- });
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}, rowStyle({row, column, rowIndex}) {
- if (row.heartbeat != null && row.heartbeat != "") {
- var date = new Date(row.heartbeat).getTime();
- var Dqdate = new Date().getTime();
- if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
+ // if (row.heartbeat != null && row.heartbeat != "") {
+ // var date = new Date(row.heartbeat).getTime();
+ // var Dqdate = new Date().getTime();
+ // if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
+ // return {
+ // color: "#fe1515"
+ // };
+ // }
+
+ // } else if (row.heartbeat == "") {
+ // return {
+ // color: "#fe1515"
+ // };
+ // }
+
+ if(row.dtype!=null && row.dtype!=""){
+ // if(row.dtype=='0'){
+ // return {
+ // color: "#DFDFDF"
+ // };
+ // }
+ // if(row.dtype=='1'){
+ // return {
+ // color: "#29C093"
+ // };
+ // }
+ if(row.dtype=='2'){
return {
- color: "#fe1515"
+ color: "#F34A4A"
};
}
-
- } else if (row.heartbeat == "") {
- return {
- color: "#fe1515"
- };
+ // if(row.dtype=='3'){
+ // return {
+ // color: "#F48F57"
+ // };
+ // }
}
},
handleManage(row) {
@@ -980,14 +1113,19 @@
});
}, handleStart(row) {
+
+ console.log(row,11111111111);
row = this.selectRow;
+ console.log(row,22222222222);
var arr = [];
+ console.log(this.$store.state.tags.tagList,3333333);
this.$store.state.tags.tagList.forEach(item => {
if (item.label != "视频") {
arr.push(item);
}
});
this.$store.state.tags.tagList = arr;
+ console.log(arr,444444444444);
this.$router.push({
path: `/real/video/`, query: row
});
@@ -996,7 +1134,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ window.frames[1].init("equipment", {x: row.jd, y: row.wd});
};
})
},rightClick(row, event) {
@@ -1022,6 +1160,10 @@
}
menu.style.left = event.clientX + 10 - (60) + 'px'
document.addEventListener('click', this.foo); // 给整个document新增监听鼠标事件，点击任何位置执行foo方法
+ },
+ rowClick(val){//行点击事件
+ // console.log(val);
+ this.$router.push({ path: "/dataL/dataL", query: val });
}
}
};
@@ -1127,6 +1269,51 @@
color: red;
}
+ .dtype{
+ width: 80px;
+ }
+
+ .dx{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #DFDFDF;
+ }
+ .zc{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #29C093;
+ }
+ .yj{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #F34A4A;
+ }
+ .gz{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #F48F57;
+ }
+
.tabFontSize{
font-size: 15px;
}
--
Gitblit v1.9.3