From a4831debee63c7071a261c5f6ecfa62fd535b2ab Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 25 Jan 2024 16:21:18 +0800
Subject: [PATCH] 分页修改
---
src/views/list/devicesBasic.vue | 180 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 123 insertions(+), 57 deletions(-)
diff --git a/src/views/list/devicesBasic.vue b/src/views/list/devicesBasic.vue
index 62b48f1..2da62a4 100644
--- a/src/views/list/devicesBasic.vue
+++ b/src/views/list/devicesBasic.vue
@@ -1089,7 +1089,6 @@
import { jsonp } from 'vue-jsonp'
import any = jasmine.any;
-
const statusMap = ["default", "processing", "success", "error"];
const status = ["������", "���������", "���������", "������"];
@@ -1206,12 +1205,15 @@
private createForm: any = null;
private editRecord: any = {};
+
private pagination: any = {
total: 0,
current: 1,
- pageSize: 5,
- showSizeChanger: false,
- showQuickJumper: false
+ pageSize: 10,
+ showSizeChanger: true,
+ showQuickJumper: true,
+ pageSizeOptions: ["10", "30", "60", "100"],
+ showTotal: (total: number) => `������ ${this.pagination.total} ���������`, //���������������������������
};
private updateRecord1: any = {};
@@ -1288,16 +1290,22 @@
]
private changesen:number=0
private handleChangevalue1(value: string){
+ console.log(this.changesen);
if(this.changesen===1){
this.handleChange2(this.reskey);
}
- this.changesen=1;
}
private AQIhandleChange(value: string){
- this.handleChange2(this.reskey);
+ console.log(this.changesen);
+ if(this.changesen===1){
+ this.handleChange2(this.reskey);
+ }
}
private ceAQIhandleChange(value: string){
- this.handleChange2(this.reskey);
+ console.log(this.changesen);
+ if(this.changesen===1){
+ this.handleChange2(this.reskey);
+ }
}
private tablecolumns:TableColumnType<datatable>=[
{
@@ -1342,9 +1350,9 @@
// agehou:''
// }
]
-
+
private rowSelectionChange(selectedRowKeys: string[], selectedRows: DataType[]){
- console.log(selectedRows);
+ // console.log(selectedRows);
this.selectedtable=selectedRows
}
private selectedtable:any[]=[]
@@ -1375,6 +1383,14 @@
}
private columns: any[] = [
+ {
+ title: "������",
+ dataIndex: "key",
+ key: "key",
+ align: "center",
+ customRender: (text:any, record:any, index:any) => `${index + 1}`,
+ width: 60,
+ },
{
title: "������",
dataIndex: "name"
@@ -1506,6 +1522,7 @@
this.addMapFlag = true
}
private showMap2() {
+ this.typeOperation = 'upa'
this.editMapFlag = true
}
// ������������������
@@ -1635,6 +1652,9 @@
private current: number = 1
private handlerTableChange(pagination: any, filter: any, sorter: any): void {
this.current = pagination.current
+ this.pagination.current = pagination.current;
+ this.pagination.pageSize = pagination.pageSize;
+ this.pagination.total = pagination.total;
this.loadRuleData(pagination.current)
}
@@ -1654,7 +1674,6 @@
//���������������������
private handleChange1(selectedItems:any) {
-
if (selectedItems === undefined) {
this.selectMt = null
}else {
@@ -1678,9 +1697,10 @@
this.datatable=[]
this.datatable=res.data.data
if(this.selectvalue1==='a99054'){
+ console.log(21323);
for(var i=0;i<this.datatable.length;i++){
if(this.ceAQIvalue==='+'){
- this.datatable[i].cel=Number((this.datatable[i].cel + this.ceAQIvaluein).toFixed(2))
+ this.datatable[i].cel=((this.datatable[i].cel-0) + (this.ceAQIvaluein-0)).toFixed(2)
}else if(this.ceAQIvalue==='-'){
this.datatable[i].cel=Number((this.datatable[i].cel - this.ceAQIvaluein).toFixed(2))
}else if(this.ceAQIvalue==='*'){
@@ -1696,28 +1716,27 @@
// this.datatable[i].cel=parseFloat(this.datatable[i].cel+this.ceAQIvaluein).toFixed(2)
// this.datatable[i].agehou='aqi*'+this.datatable[i].aqi+'+'+'ce1*'+this.datatable[i].cel
if(this.AQIvalue1==='+'){
- // console.log(this,'+++');
- this.datatable[i].aqi=Number((this.datatable[i].aqi + this.AQIvalue).toFixed(2))
+ this.datatable[i].aqi=((this.datatable[i].aqi-0) + (this.AQIvalue-0)).toFixed(2)
}else if(this.AQIvalue1==='-'){
- this.datatable[i].aqi=Number((this.datatable[i].aqi - this.AQIvalue).toFixed(2))
+ this.datatable[i].aqi=Number((this.datatable[i].aqi - this.AQIvalue)).toFixed(2)
} else if(this.AQIvalue1==='*'){
- this.datatable[i].aqi=Number((this.datatable[i].aqi * this.AQIvalue).toFixed(2))
+ this.datatable[i].aqi=Number((this.datatable[i].aqi * this.AQIvalue)).toFixed(2)
}else if(this.AQIvalue1==='/'){
- this.datatable[i].aqi=Number((this.datatable[i].aqi / this.AQIvalue).toFixed(2))
- }
+ this.datatable[i].aqi=Number((this.datatable[i].aqi / this.AQIvalue).toFixed(3))
+ }
if(this.ceAQIvalue==='+'){
- this.datatable[i].cel=Number((this.datatable[i].cel + this.ceAQIvaluein).toFixed(2))
+ this.datatable[i].cel=((this.datatable[i].cel-0) + (this.ceAQIvaluein-0)).toFixed(2)
}else if(this.ceAQIvalue==='-'){
- this.datatable[i].cel=Number((this.datatable[i].cel - this.ceAQIvaluein).toFixed(2))
+ this.datatable[i].cel=Number((this.datatable[i].cel - this.ceAQIvaluein)).toFixed(2)
}else if(this.ceAQIvalue==='*'){
- this.datatable[i].cel=Number((this.datatable[i].cel * this.ceAQIvaluein).toFixed(2))
+ this.datatable[i].cel=Number((this.datatable[i].cel * this.ceAQIvaluein)).toFixed(2)
}else if(this.ceAQIvalue==='/'){
this.datatable[i].cel=Number((this.datatable[i].cel / this.ceAQIvaluein).toFixed(3))
}
this.datatable[i].agehou='aqi*'+this.datatable[i].aqi+'+'+'ce1*'+this.datatable[i].cel
}
}
-
+ this.changesen=1;
})
}
@@ -1946,11 +1965,11 @@
// ���������������������id
private selectMt: any = null
-
+
private loading: boolean=false
-
+
private handleCancel(){
-
+
}
//������������
private handleCreateModalOk() {
@@ -2046,10 +2065,10 @@
}
private handleCreateModalCancel1():any{
+ this.datatable=[];
+ this.selectvalue1='���������������';
+ this.changesen=0;
this.visibleCreateModal1=false;
- this.datatable=[]
- this.selectvalue1='���������������'
- this.changesen=0
}
private handlerSelectChange(arr1: any, arr2: any) {
@@ -2092,7 +2111,7 @@
name: this.serch.name,
mac: this.serch.name,
page: pageSize,
- size: 8
+ size: this.pagination.pageSize,
})
.then(res => {
if(res.data.code === 0) {
@@ -2190,48 +2209,95 @@
}
private receiveFlag2(flag: boolean){
+ console.log('receiveFlag2');
this.editMapFlag = flag
}
// ������������������������
private receiveLomLat(lonLat: any) {
+
this.addLL = lonLat
this.getTownData(lonLat)
}
private getTownData(lonLat: any) {
- // jsonp('/proxy/reverse_geocoding/v3/', {
- jsonp('https://api.map.baidu.com/reverse_geocoding/v3/', {
- ak: 'e5ig9Z7AKFjv8wbkqDbuLkUMzBev0tgT',
- output: 'json',
- coordtype: 'wgs8411',
- extensions_town: true,
- location: lonLat.lat+ ',' + lonLat.lng
- }).then((res: any) => {
- if(this.typeOperation === 'add') {
- this.town_code = res.result.addressComponent.town_code
- this.form.setFieldsValue({
- jingdu: this.addLL.lng,
- weidu: this.addLL.lat,
- town: res.result.addressComponent.town
- })
- } else {
- console.log(res);
- if (!(res.result.addressComponent.town === '' && res.result.addressComponent.town_code === '')){
- this.editBeforeData.town.townName = res.result.addressComponent.town
- this.editBeforeData.town.townCode = res.result.addressComponent.town_code
- } else {
- this.editBeforeData.town.townName = res.result.addressComponent.town
- this.editBeforeData.town.townCode = res.result.addressComponent.town_code
- this.$message.warning('������������������������')
- }
+ console.log(lonLat,'dsasa');
+ let self=this
+ var geocoder = new AMap.Geocoder({
+ // city ������������������������������������������������������������adcode ��� citycode
+ city: '010'
+ })
+ geocoder.getAddress(lonLat, function(status, result) {
+ console.log(result,'result');
+ if (status === 'complete' && result.info === 'OK') {
+ // self.formattedAddress=result.regeocode.formattedAddress
+ // console.log(result,'321312');
+ if(self.typeOperation === 'add') {
+ if(result.regeocode.addressComponent.towncode.length>9){
+ self.town_code=result.regeocode.addressComponent.towncode.slice(0,9)
+ }else{
+ self.town_code = result.regeocode.addressComponent.towncode
+ }
+ self.form.setFieldsValue({
+ jingdu: self.addLL[0],
+ weidu: self.addLL[1],
+ town: result.regeocode.addressComponent.township
+ })
+ console.log(self.town_code);
+ } else {
+ if (!(result.regeocode.addressComponent.township === '' && result.regeocode.addressComponent.towncode === '')){
+ self.editBeforeData.town.townName = result.regeocode.addressComponent.township
+ if(result.regeocode.addressComponent.towncode.length>9){
+ self.editBeforeData.town.townCode = result.regeocode.addressComponent.towncode.slice(0,9)
+ }else{
+ self.editBeforeData.town.townCode = result.regeocode.addressComponent.towncode
+ }
+ // console.log(self.editBeforeData.town.townName,self.editBeforeData.town.townCode,'222');
+ } else {
+ self.editBeforeData.town.townName = result.regeocode.addressComponent.town
+ self.editBeforeData.town.townCode = result.regeocode.addressComponent.towncode
+ self.$message.warning('������������������������')
+ }
- }
- })
+ }
+ // result������������������������������������
+ }
+ })
+
+ // jsonp('/proxy/reverse_geocoding/v3/', {
+ // jsonp('https://api.map.baidu.com/reverse_geocoding/v3/', {
+ // ak: 'e5ig9Z7AKFjv8wbkqDbuLkUMzBev0tgT',
+ // output: 'json',
+ // coordtype: 'wgs8411',
+ // extensions_town: true,
+ // location: lonLat.lat+ ',' + lonLat.lng
+ // }).then((res: any) => {
+ // console.log(res,'res');
+ // if(this.typeOperation === 'add') {
+ // this.town_code = res.result.addressComponent.town_code
+ // this.form.setFieldsValue({
+ // jingdu: this.addLL.lng,
+ // weidu: this.addLL.lat,
+ // town: res.result.addressComponent.town
+ // })
+ // } else {
+ // console.log(res,'555');
+ // if (!(res.result.addressComponent.town === '' && res.result.addressComponent.town_code === '')){
+ // this.editBeforeData.town.townName = res.result.addressComponent.town
+ // this.editBeforeData.town.townCode = res.result.addressComponent.town_code
+ // } else {
+ // this.editBeforeData.town.townName = res.result.addressComponent.town
+ // this.editBeforeData.town.townCode = res.result.addressComponent.town_code
+ // this.$message.warning('������������������������')
+ // }
+
+ // }
+ // })
}
// ������������������������
private receiveLomLat1(lonLat: any) {
- this.editBeforeData.longitude = lonLat.lng
- this.editBeforeData.latitude = lonLat.lat
+ console.log(lonLat,'lonLat');
+ this.editBeforeData.longitude = lonLat[0]
+ this.editBeforeData.latitude = lonLat[1]
this.getTownData(lonLat)
}
--
Gitblit v1.8.0