From f5aca8b44e00a441830b5c73245cb2c249e4c024 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Feb 2021 23:39:46 +0800
Subject: [PATCH] 客户列表
---
src/views/realTimePolice/real.vue | 24 +++++---
vue.config.js | 6 +-
src/api/client/client.js | 7 ++
src/views/clientManagement/clientManagement.vue | 106 ++++++++++++++++++++++++++++++++++-
src/page/index/logo.vue | 12 ++--
5 files changed, 133 insertions(+), 22 deletions(-)
diff --git a/src/api/client/client.js b/src/api/client/client.js
index 5f0b6d9..b7b9aeb 100644
--- a/src/api/client/client.js
+++ b/src/api/client/client.js
@@ -13,6 +13,13 @@
})
}
+export const getAll = () => {
+ return request({
+ url: '/api/blade-jfpts/equipment/equipment/listAll',
+ method: 'get'
+ })
+}
+
export const remove = (ids) => {
return request({
url: '/api/blade-jfpts/equipment/equipment/remove',
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 217996f..e34c975 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -128,7 +128,7 @@
};
},
created() {
- this.getData();
+ // this.getData();
},
computed: {
...mapGetters(["website", "keyCollapse"])
@@ -138,7 +138,7 @@
var that = this;
axios({
- url: 'http://192.168.0.103:1888/api/blade-jfpts/alarm/alarm/page?current=1&size=1',
+ url: 'http://192.168.0.102:1888/api/blade-jfpts/alarm/alarm/page?current=1&size=1',
method: 'get',
}).then(function (response) {
that.deviceId = response.data.data.records[0].id;
@@ -152,7 +152,7 @@
window.clearTimeout(window.realTimeQuery);
window.realTimeQuery = setInterval(function () {
axios({
- url: 'http://192.168.0.103:1888/api/blade-jfpts/alarm/alarm/selecttx?id='+that.deviceId,
+ url: 'http://192.168.0.102:1888/api/blade-jfpts/alarm/alarm/selecttx?id='+that.deviceId,
method: 'post',
}).then(function (response) {
if (response.data.data.length > 0){
@@ -181,7 +181,7 @@
});
}else{
axios({
- url: 'http://192.168.0.103:1888/api/blade-jfpts/jingdan/jingdan/submit',
+ url: 'http://192.168.0.102:1888/api/blade-jfpts/jingdan/jingdan/submit',
method: 'post',
data: {
rName: row.rname,
@@ -224,7 +224,7 @@
revoke(row){
var that = this;
axios({
- url: 'http://192.168.0.103:1888/api/blade-jfpts/alarm/alarm/deletejj?id='+row.id,
+ url: 'http://192.168.0.102:1888/api/blade-jfpts/alarm/alarm/deletejj?id='+row.id,
method: 'post',
}).then(function () {
that.dialogTableVisible = false;
@@ -236,7 +236,7 @@
},updateJtyep(row){
var that = this;
axios({
- url: 'http://192.168.0.103:1888/api/blade-jfpts/alarm/alarm/updateJtype?id='+row.id+"&czTime="+row.czTime+"&bz="+row.bz,
+ url: 'http://192.168.0.102:1888/api/blade-jfpts/alarm/alarm/updateJtype?id='+row.id+"&czTime="+row.czTime+"&bz="+row.bz,
method: 'post',
}).then(function () {
});
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f81a888..f5254a7 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -52,16 +52,29 @@
</template>
</avue-crud>
+
</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-table>
+ </el-dialog>
</el-row>
</template>
<script>
- import {getList, remove, update, add, getclient, getDeptLazyTree} from "@/api/client/client";
+ import {getList, remove, update, add, getclient, getDeptLazyTree,getAll} from "@/api/client/client";
import {mapGetters} from "vuex";
export default {
+ created() {
+ this.payWin();
+ },
data() {
return {
form: {},
@@ -72,6 +85,8 @@
currentPage: 1,
total: 0
},
+ dialogTableVisible: false,
+ gridData:null,
selectionList: [],
treeDeptId: '',
treeData: [],
@@ -105,6 +120,7 @@
calcHeight: 80,
labelWidth: '100',
dialogWidth: 950,
+ menuWidth: 160,
tip: false,
searchShow: true,
searchMenuSpan: 4,
@@ -112,7 +128,7 @@
border: true,
index: true,
viewBtn: true,
- selection: true,
+ selection: false,
dialogClickModal: false,
column: [
{
@@ -128,9 +144,57 @@
width: 130
},
{
- label: "行政区",
- prop: "addvcd",
+ label: "省份",
+ prop: "province",
search: true,
+ searchSpan: 3,
+ searchLabelWidth: 60,
+ placeholder: "省份",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code"
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 6,
+ className: "cityClass1"
+ },
+ {
+ label: "地市",
+ prop: "city",
+ type: "select",
+ searchPlaceholder: "地市",
+ placeholder: "地市",
+ searchLabelWidth: 1,
+ searchSpan: 2,
+ search: true,
+ props: {
+ label: "name",
+ value: "code"
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 3,
+ labelWidth: "0",
+ className: "cityClass2"
+ },
+ {
+ label: "区县",
+ searchSpan: 2,
+ searchLabelWidth: 1,
+ searchPlaceholder: "区县",
+ placeholder: "区县",
+ search: true,
+ prop: "district",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code"
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 3,
+ labelWidth: "0",
+ className: "cityClass3"
}, {
label: "布撤防状态",
prop: "devicestate",
@@ -333,6 +397,11 @@
...this.query
};
values.releaseTimeRange = null;
+ }else{
+ values = {
+ ...params,
+ ...this.query
+ };
}
this.loading = true;
getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
@@ -358,9 +427,38 @@
};
}
},
+ payWin(){
+ var that = this;
+ getAll().then(res => {
+ var data =res.data.data;
+ var lists = [];
+ var xb = 0;
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].type == "1") {
+ xb++;
+ data[i].xb = xb;
+ lists.push(data[i]);
+ }
+ }
+ if (lists.length > 0){
+ that.gridData = lists;
+ that.dialogTableVisible = true;
+ }
+ });
+
+ }
}
};
</script>
<style>
+ .payWin{
+ overflow-y: auto;
+ height: 350px;
+ }
+
+ .payWin .el-dialog__body{
+ padding-top: 0px !important;
+ }
+
</style>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 944fcc7..136d15b 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -65,28 +65,28 @@
<template slot-scope="{ type, size, row }" slot="menu">
<el-button
- icon="el-icon-check"
+ icon="el-icon-s-order"
:size="size"
:type="type"
@click.stop="handleHistory(row)"
>历史</el-button
>
<el-button
- icon="el-icon-check"
+ icon="el-icon-video-camera-solid"
:size="size"
:type="type"
@click.stop="handleStart(row)"
>视频</el-button
>
<el-button
- icon="el-icon-check"
+ icon="el-icon-edit"
:size="size"
:type="type"
@click.stop="handleManage(row)"
>处置</el-button
>
<el-button
- icon="el-icon-check"
+ icon="el-icon-location-outline"
:size="size"
:type="type"
@click.stop="handleAdd11()"
@@ -323,7 +323,7 @@
indexLabel: "序号",
calcHeight: 30,
labelWidth: "100",
- menuWidth: 300,
+ menuWidth: 240,
dialogWidth: 950,
tip: false,
searchShow: true,
@@ -331,7 +331,7 @@
border: true,
index: true,
viewBtn: true,
- selection: true,
+ selection: false,
dialogClickModal: false,
column: [
{
@@ -426,12 +426,12 @@
]
},
{
- label: "行政区",
+ label: "省份",
prop: "province",
search: true,
searchSpan: 3,
searchLabelWidth: 60,
- placeholder: "行政区",
+ placeholder: "省份",
type: "select",
props: {
label: "name",
@@ -489,7 +489,7 @@
permissionList() {
return {
addBtn: this.vaildData(this.permission.real_add, false),
- viewBtn: this.vaildData(this.permission.real_view, false),
+ viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(this.permission.real_delete, false),
editBtn: this.vaildData(this.permission.real_edit, false)
};
@@ -613,6 +613,7 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ debugger
const { releaseTimeRange } = this.query;
let values = {
...params
@@ -625,6 +626,11 @@
...this.query
};
values.releaseTimeRange = null;
+ }else{
+ values = {
+ ...params,
+ ...this.query
+ };
}
this.loading = true;
getList(page.currentPage, page.pageSize, values).then(res => {
diff --git a/vue.config.js b/vue.config.js
index 651299b..1edcbff 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,6 @@
/*
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @version:
* @Author: song
* @Date: 2021-01-26 08:56:34
* @LastEditors: song
@@ -34,7 +34,7 @@
proxy: {
'/api': {
//本地服务接口地址
- target: 'http://192.168.0.103:82',
+ target: 'http://192.168.0.102:82/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3