From a4e06ccd3cd976fbe4eef99e188d42ec9f3ad054 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 08 Apr 2021 09:32:05 +0800
Subject: [PATCH] 样式修改
---
src/views/clientManagement/clientManagement.vue | 671 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 584 insertions(+), 87 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f5254a7..a8b5b5f 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -18,6 +18,9 @@
@row-update="rowUpdate"
@row-save="rowSave"
:row-style="rowStyle"
+ @contextmenu.prevent.native=""
+ @row-contextmenu="rightClick"
+ row-class-name="tabFontSize"
:before-open="beforeOpen"
@search-change="searchChange"
@search-reset="searchReset"
@@ -28,7 +31,7 @@
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
- size="small"
+ size="mini"
icon="el-icon-delete"
plain
v-if="permission.clientManagement_delete"
@@ -43,50 +46,175 @@
}}
</el-tag>
</template>
+<!-- <template slot-scope="{ type, size, row }" slot="menu">-->
+<!-- <el-button-->
+<!-- icon="el-icon-video-camera-solid"-->
+<!-- :size="size"-->
+<!-- :type="type"-->
+<!-- @click.stop="handleStart(row)"-->
+<!-- >视频-->
+<!-- </el-button>-->
+<!-- <el-button-->
+<!-- icon="el-icon-location-outline"-->
+<!-- :size="size"-->
+<!-- :type="type"-->
+<!-- @click.stop="handleMap(row)"-->
+<!-- >定位-->
+<!-- </el-button>-->
+<!-- </template>-->
- <template slot-scope="{ row }" slot="dtype">
+ <template slot-scope="{ row }" slot="dxzt">
<el-tag>{{
- row.dtype == "0" ? "掉线" : row.dtype == "1" ? "在线" : "无"
+ row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "在线" : "无"
}}
</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>
+
</avue-crud>
+
+ <div v-show="menuVisible">
+ <ul id="menu" class="menu">
+ <li class="menu_item" @click.stop="handleStart">视频</li>
+ <li class="menu_item" @click.stop="handleMap">定位</li>
+ </ul>
+ </div>
+
+ <el-drawer
+ title="电子地图"
+ append-to-body="true"
+ :visible.sync="showMap"
+ >
+ <iframe
+ id="mapDiv"
+ ref="mapDiv"
+ src="/map/index.html?openid=ClientManagement&ISinit=1"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ></iframe>
+ </el-drawer>
</basic-container>
</el-col>
- <el-dialog title="缴费提醒" :visible.sync="dialogTableVisible" custom-class="payWin" append-to-body="true">
- <el-table :data="gridData">
- <el-table-column property="xb" label="序号" width="50"></el-table-column>
- <el-table-column property="deviceName" label="设备名称" width="150"></el-table-column>
- <el-table-column property="deviceNumber" label="设备编号" width="150"></el-table-column>
- <el-table-column property="street" label="所属单位" width="200"></el-table-column>
- <el-table-column property="expireTime" label="到期时间"></el-table-column>
+ <el-dialog title="缴费提醒" :visible.sync="dialogTableVisible" top="280px" custom-class="payWin" append-to-body="true">
+
+
+ <el-dialog
+ class="real-jf-dialog"
+ title="缴费"
+ :visible.sync="realjf"
+ append-to-body="true"
+ :modal="false"
+ >
+ <el-form
+ :model="form"
+ label-position="right"
+ size="mini"
+ label-width="100px"
+ >
+ <el-col span="12">
+ <el-form-item label="到期时间">
+ <el-date-picker
+ v-model="form.expireTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="选择日期时间"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :offset="4">
+ <el-form-item>
+ <el-button type="primary" @click.stop="generate(form)"
+ >缴费
+ </el-button
+ >
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-dialog>
+
+
+ <el-table
+ :data="gridData"
+ border
+ style="width: 100%">
+ <el-table-column
+ fixed
+ prop="xb"
+ label="序号"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="deviceName"
+ label="设备名称"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="deviceNumber"
+ label="设备编码"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="ownership"
+ label="所属单位"
+ width="160">
+ </el-table-column>
+ <el-table-column
+ prop="expireTime"
+ label="到期时间"
+ width="160"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="pay"
+ label="缴费信息"
+ >
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="操作"
+ width="100">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="handleClick(scope.row)">一键缴费</el-button>
+ </template>
+ </el-table-column>
</el-table>
</el-dialog>
</el-row>
</template>
<script>
- import {getList, remove, update, add, getclient, getDeptLazyTree,getAll} from "@/api/client/client";
+ import {getList, remove, update, add, getclient, getDeptLazyTree, getAll, updates} from "@/api/client/client";
import {mapGetters} from "vuex";
+ import axios from "axios";
export default {
created() {
- this.payWin();
+ //this.payWin();
},
data() {
return {
form: {},
query: {},
+ showMap: false,
+ selectRow:null,
+ initFlag: true,
loading: true,
+ menuVisible:false,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
dialogTableVisible: false,
- gridData:null,
+ realjf: false,
+ gridData: null,
selectionList: [],
treeDeptId: '',
treeData: [],
@@ -120,35 +248,167 @@
calcHeight: 80,
labelWidth: '100',
dialogWidth: 950,
- menuWidth: 160,
+ menuWidth: 150,
+ align:"center",
+ size: "mini",
tip: false,
searchShow: true,
searchMenuSpan: 4,
searchSpan: 4,
- border: true,
+ border: false,
+ stripe:true,
index: true,
viewBtn: true,
- selection: false,
+ selection: true,
dialogClickModal: false,
column: [
{
label: "设备名称",
- width: 130,
+ width: 200,
prop: "deviceName",
- searchPlaceholder: "请输入设备名称/编号",
+ searchPlaceholder: "设备名称/编号",
search: true,
+ sortable:true,
},
+ {
+ label: "到期时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ searchSpan: 6,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur"
+ }
+ ]
+ }
+ ,
{
label: "设备编号",
prop: "deviceNumber",
- width: 130
+ width: 130,
+ editDisabled: true,
+ rules: [
+ {
+ required: false,
+ message: "请输入设备编号",
+ trigger: "click"
+ }
+ ]
+ },
+ {
+ label: "使用方",
+ prop: "deptId",
+ width: 200,
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/trees",
+ props: {
+ label: "title"
+ },
+ rules: [
+ {
+ required: false,
+ message: "请选择上级菜单",
+ trigger: "click"
+ }
+ ]
+ },
+ {
+ label: "序列号",
+ prop: "serialNumber",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ },
+ {
+ label: "通道号",
+ prop: "channelNumber",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ }, {
+ label: "缴费状态",
+ prop: "jfzt",
+ slot: true,
+ addDisplay: false,
+ editDisplay: false,
+ }, {
+ label: "布撤防状态",
+ prop: "devicestate",
+ type: "select",
+ slot: true,
+ width: 100,
+ rules: [{
+ required: true,
+ message: "请选择布撤防状态",
+ trigger: "blur"
+ }],
+ dicData: [
+ {
+ label: "撤防",
+ value: "0"
+ },
+ {
+ label: "布防",
+ value: "1"
+ }
+ ]
+ },
+ {
+ label: "设备状态",
+ prop: "dxzt",
+ slot: true,
+ addDisplay: false,
+ editDisplay: false,
+ },
+ {
+ label: "故障状态",
+ prop: "state",
+ addDisplay: false,
+ editDisplay: false
+ },
+ {
+ label: "故障原因",
+ prop: "reason",
+ addDisplay: false,
+ editDisplay: false
+ },
+ {
+ label: "设备类型",
+ prop: "deviceType",
+ width: 100,
+ search: true,
+ searchSpan: 3,
+ searchLabelWidth: 80,
+ searchPlaceholder: "请选择",
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictValue"
+ },
+ dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
},
{
label: "省份",
prop: "province",
search: true,
searchSpan: 3,
- searchLabelWidth: 60,
+ searchLabelWidth: 45,
placeholder: "省份",
type: "select",
props: {
@@ -158,7 +418,11 @@
cascaderItem: ["city", "district"],
dicUrl: "/api/blade-system/region/select",
span: 6,
- className: "cityClass1"
+ className: "cityClass1",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
},
{
label: "地市",
@@ -176,7 +440,11 @@
dicUrl: "/api/blade-system/region/select?code={{key}}",
span: 3,
labelWidth: "0",
- className: "cityClass2"
+ className: "cityClass2",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
},
{
label: "区县",
@@ -194,66 +462,77 @@
dicUrl: "/api/blade-system/region/select?code={{key}}",
span: 3,
labelWidth: "0",
- className: "cityClass3"
- }, {
- label: "布撤防状态",
- prop: "devicestate",
- type: "select",
- slot: true,
- width: 100,
- dicData: [
- {
- label: "撤防",
- value: "0"
- },
- {
- label: "布防",
- value: "1"
- }
- ]
- }, {
- label: "设备状态",
- prop: "dtype",
- search: true,
- slot: true,
- type: "select",
- dicData: [
- {
- label: "掉线",
- value: "0"
- },
- {
- label: "在线",
- value: "1"
- }
- ]
- }, {
- label: "设备类型",
- prop: "deviceType",
- width: 150,
- search: true,
- }, {
- label: "权属",
- prop: "ownership",
+ className: "cityClass3",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
}, {
label: "街道",
prop: "street",
- width: 150
- }, {
- label: "缴费信息",
- prop: "pay",
- }, {
- label: "安装时间",
- prop: "stime",
- width: 130
+ width: 200,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ },
+ {
+ label: "负责人",
+ prop: "oneContacts",
+ width: 72,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ },
+ {
+ label: "负责人电话",
+ prop: "onePhone",
+ width: 110,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
}, {
label: "到期时间",
prop: "expireTime",
- width: 130
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
}, {
- label: "最后上传时间",
+ label: "缴费信息",
+ prop: "pay",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ }, {
+ label: "安装时间",
+ prop: "stime",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ }, {
+ label: "心跳时间",
prop: "heartbeat",
- width: 130
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
},
]
@@ -266,7 +545,7 @@
permissionList() {
return {
addBtn: this.vaildData(this.permission.clientManagement_add, false),
- viewBtn: this.vaildData(this.permission.clientManagement_view, false),
+ viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(this.permission.clientManagement_delete, false),
editBtn: this.vaildData(this.permission.clientManagement_edit, false)
};
@@ -280,6 +559,25 @@
}
},
methods: {
+ generate(row) {
+ updates(row.expireTime, row.deviceNumber).then(() => {
+ this.dialogTableVisible = false;
+ this.realjf = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "缴费成功!"
+ });
+ }, error => {
+ window.console.log(error);
+ });
+ },
+ handleClick(row) {
+ this.form = row;
+ this.dialogTableVisible = true;
+ this.realjf = true;
+
+ },
nodeClick(data) {
this.treeDeptId = data.id;
this.page.currentPage = 1;
@@ -329,6 +627,7 @@
});
},
searchReset() {
+ this.treeDeptId = "";
this.query = {};
this.onLoad(this.page);
},
@@ -392,45 +691,77 @@
if (releaseTimeRange) {
values = {
...params,
- releaseTime_datege: releaseTimeRange[0],
- releaseTime_datelt: releaseTimeRange[1],
+ beginTime: releaseTimeRange[0],
+ endTime: releaseTimeRange[1],
...this.query
};
values.releaseTimeRange = null;
- }else{
+ } else {
values = {
...params,
...this.query
};
}
+
+ //在线设备
+ if(this.$route.query.dxtype != undefined){
+ values = {
+ ...params,
+ dxtype: this.$route.query.dxtype,
+ ...this.query,
+ };
+ }
+
this.loading = true;
getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
const data = res.data.data;
this.page.total = data.total;
+
+ var Dqdate = new Date().getTime();
+
+ 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;
+ }
+ }
+
+ 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 != "" ) {
+ 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: "#15a2fe"
+ color: "#fe1515"
};
}
- }else if(row.heartbeat == ""){
+ } else if (row.heartbeat == "") {
return {
- color: "#15a2fe"
+ color: "#fe1515"
};
}
},
- payWin(){
+ handleManage(row) {
+ this.form;
+ this.dialogTableVisible = true;
+ },
+ payWin() {
var that = this;
getAll().then(res => {
- var data =res.data.data;
+ var data = res.data.data;
var lists = [];
var xb = 0;
for (var i = 0; i < data.length; i++) {
@@ -440,25 +771,191 @@
lists.push(data[i]);
}
}
- if (lists.length > 0){
+ if (lists.length > 0) {
that.gridData = lists;
that.dialogTableVisible = true;
}
});
+ }, handleStart(row) {
+ row = this.selectRow;
+ var arr = [];
+ this.$store.state.tags.tagList.forEach(item => {
+ if (item.label != "视频") {
+ arr.push(item);
+ }
+ });
+ this.$store.state.tags.tagList = arr;
+ this.$router.push({
+ path: `/real/video/`, query: row
+ });
+ }, handleMap(row) {
+ row = this.selectRow;
+ this.showMap = true;
+ this.$nextTick(() => {
+ this.$refs.mapDiv.onload = () => {
+ window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ };
+ })
+ },rightClick(row, event) {
+ this.selectRow = row;
+ this.menuVisible = false; // 先把模态框关死,目的是 第二次或者第n次右键鼠标的时候 它默认的是true
+ this.menuVisible = true; // 显示模态窗口,跳出自定义菜单栏
+ var menu = document.querySelector('#menu');
+ this.styleMenu(menu);
+ },
+ foo() {
+ // 取消鼠标监听事件 菜单栏
+ this.menuVisible = false;
+ document.removeEventListener('click', this.foo); // 要及时关掉监听,不关掉的是一个坑,不信你试试,虽然前台显示的时候没有啥毛病,加一个alert你就知道了
+ },
+ styleMenu(menu) {
+ let cha = document.body.clientHeight - event.clientY
+ //console.log(document.body.clientHeight,event.clientY,cha)
+ // 防止菜单太靠底,根据可视高度调整菜单出现位置
+ if (cha < 150) {
+ menu.style.top = event.clientY -120 - (120) + 'px'
+ } else {
+ menu.style.top = event.clientY -10 - (120) + 'px'
+ }
+ menu.style.left = event.clientX + 10 - (240) + 'px'
+ document.addEventListener('click', this.foo); // 给整个document新增监听鼠标事件,点击任何位置执行foo方法
}
}
};
</script>
<style>
- .payWin{
+ .payWin {
overflow-y: auto;
height: 350px;
}
- .payWin .el-dialog__body{
+ .payWin .el-dialog__body {
padding-top: 0px !important;
}
+
+ /*页面样式*/
+ .el-card__body .cityClass1 {
+ width: 155px;
+ padding-right: 0px !important;
+ }
+
+ .el-card__body .cityClass2 {
+ width: 100px;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+ }
+
+ .el-card__body .cityClass3 {
+ width: 100px;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+ }
+
+ /*新增窗体样式*/
+ .el-dialog .cityClass1 {
+ width: 220px;
+ padding-right: 0px !important;
+ }
+
+ .el-dialog .cityClass2 {
+ width: 110px;
+ padding-left: 5px !important;
+ padding-right: 5px !important;
+ }
+
+ .el-dialog .cityClass3 {
+ width: 110px;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+ }
+
+ .cityClass2 div label {
+ display: none;
+ }
+
+ .cityClass3 div label {
+ display: none;
+ }
+
+ .real-jf-dialog {
+ position: absolute !important;
+ top: 0 !important;
+ left: auto !important;
+ right: 0px !important;
+ bottom: 0 !important;
+ margin: auto !important;
+ height: 100% !important;
+ width: 800px !important;
+ }
+
+ .real-jf-dialog .el-dialog {
+ position: absolute !important;
+ top: 140px !important;
+ left: 245px !important;
+ right: 0px !important;
+ bottom: 0 !important;
+ margin: auto !important;
+ margin-top: 15vh !important;
+ height: 170px;
+ }
+
+ .real-jf-dialog .el-dialog .el-dialog__body {
+ height: calc(100% - 54px);
+ box-sizing: border-box;
+ }
+
+ .client-jf {
+ font-size: 25px;
+ color: green;
+ }
+
+ .client-qf {
+ font-size: 25px;
+ color: red;
+ }
+
+ .tabFontSize{
+ font-size: 15px;
+ }
+
+ .menu_item {
+ cursor:pointer;
+ line-height: 20px;
+ text-align: center;
+ margin-top: 0px;
+ }
+
+ .menu {
+ height: auto;
+ width: 120px;
+ color: #606266;
+ position: absolute;
+ padding: 0px;
+ box-sizing: border-box;
+ /*border: 1px solid #999999;*/
+ text-align: center;
+ background-color: #fff;
+ border-radius: .25rem;
+ box-shadow: 0 .5rem 1rem rgba(0,0,0,.15);
+ }
+ .menu li:hover {
+ background-color: rgba(232,237,250,.6);
+ color: darkslategrey;
+ }
+ .menu li{
+ position: relative;
+ display: flex;
+ font-size: 14px;
+ align-items: center;
+ height: 34px;
+ line-height: 34px;
+ outline: none;
+ margin-top: 0px;
+ padding-left: 20px;
+ padding-right: 5px;
+ }
+
</style>
--
Gitblit v1.9.3