From 4f11d6a54ade61ba7daf8ba856014d2f8994badf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 08:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/parcel/parcelKind.vue | 19 ++++++
src/views/animalHeat/animalHeat.vue | 16 ++++-
src/views/healthcode/healthcode.vue | 23 +++++--
src/views/security/security.vue | 48 ++++++++--------
src/views/parcel/parcel.vue | 21 ++++++
5 files changed, 91 insertions(+), 36 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 5938672..b05232b 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -81,6 +81,7 @@
form: {},
query: {},
showViewer:false,
+ activeClass: 0,
imgUrl:'',
loading: true,
page: {
@@ -98,7 +99,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- activeClass: 0,
index: true,
viewBtn: true,
selection: true,
@@ -211,11 +211,12 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ //清空后默认查当日的数据
+ this.activeClass=0;
this.onLoad(this.page);
},
//搜索按钮
searchChange(params, done) {
- console.log(params,222);
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -284,7 +285,6 @@
rowClick(row){
var that = this;
that.imgUrl = row.picture;
- console.log(that.imgUrl,111);
this.showViewer = true
},
// 关闭查看器
@@ -308,6 +308,7 @@
}
},
onLoad(page, params = {}) {
+ // debugger;
const { dateTime } = this.query;
let values = {
...params,
@@ -325,12 +326,14 @@
type:this.$route.query.type
};
}
+ this.activeClass=4;
}else if(this.$route.query.status != undefined){
params = {
status: this.$route.query.status,
begTime: this.$route.query.startTime,
endTime: this.$route.query.endTime
}
+ this.activeClass=4;
}else{
params = {
status:this.$route.query.status,
@@ -338,7 +341,14 @@
}
}
+ if(this.activeClass==0 && this.query.dateTime==null){
+ params = {
+ type:this.activeClass
+ }
+ }
+
if (dateTime) {
+ this.activeClass=4;
values = {
...params,
begTime: dateTime[0],
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index ae02016..16406b3 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -71,6 +71,7 @@
query: {},
search:{},
loading: true,
+ activeClass: 0,
page: {
pageSize: 10,
currentPage: 1,
@@ -86,7 +87,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- activeClass: 0,
index: true,
viewBtn: true,
selection: true,
@@ -236,6 +236,7 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ this.activeClass=0;
this.onLoad(this.page);
},
searchChange(params, done) {
@@ -321,37 +322,43 @@
let values = {
...params,
};
-
+ debugger;
if (this.$route.query.status!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
if (this.$route.query.type != undefined) {
- this.activeClass = this.$route.query.status;
this.page.currentPage = 1;
params = {
status:this.$route.query.status,
type:this.$route.query.type
}
} else {
- this.activeClass = 0;
this.page.currentPage = 1;
params = {
type:this.$route.query.status
};
}
+ this.activeClass =4;
}else if(this.$route.query.type != undefined){
params = {
type: this.$route.query.type,
begTime: this.$route.query.startTime,
endTime: this.$route.query.endTime
}
+ this.activeClass =4;
}else{
- params = {
- status:this.$route.query.status,
- type:this.$route.query.type
- }
+ params = {
+ status:this.$route.query.status,
+ type:this.$route.query.type
+ }
+ }
+ if(this.activeClass == 0 && this.query.dateTime==null){
+ params = {
+ status:this.activeClass,
+ }
}
if (dateTime) {
+ this.activeClass =4;
values = {
...params,
begTime: dateTime[0],
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index ca1be49..f7ffd8d 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -76,6 +76,7 @@
form: {},
query: {},
showViewer: false, // 显示查看器
+ activeClass: 0,
imgUrl:'',
loading: true,
page: {
@@ -91,7 +92,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- activeClass: 3,
border: false,
stripe:true,
index: true,
@@ -239,6 +239,7 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ this.activeClass=0;
this.onLoad(this.page);
},
searchChange(params, done) {
@@ -335,6 +336,7 @@
decisioDiagramResult:this.$route.query.decisioDiagramResult
};
}
+ this.activeClass=4;
}else{
if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
this.page.currentPage = 1;
@@ -342,6 +344,23 @@
startTime:this.$route.query.startTime,
endTime:this.$route.query.endTime
}
+ this.activeClass=4;
+ }
+
+ if(this.activeClass==0){
+ this.page.currentPage = 1;
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ params = {
+ startTime:Y + "-" + M + "-" + D + " 00:00:00",
+ endTime:Y +"-" +M +"-" + D + " 23:59:59"
+ }
}
}
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 98481e5..523d5d3 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -77,6 +77,7 @@
form: {},
query: {},
showViewer: false, // 显示查看器
+ activeClass:0,
imgUrl:'',
loading: true,
page: {
@@ -221,6 +222,7 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ this.activeClass=0;
this.onLoad(this.page);
},
searchChange(params, done) {
@@ -310,6 +312,23 @@
decisioDiagramResult:this.$route.query.decisioDiagramResult
};
}
+ this.activeClass=4;
+ }
+
+ if(this.activeClass==0){
+ this.page.currentPage = 1;
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ params = {
+ startTime:Y + "-" + M + "-" + D + " 00:00:00",
+ endTime:Y +"-" +M +"-" + D + " 23:59:59"
+ }
}
if (dateTime) {
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 25f33f5..503ef84 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -60,7 +60,7 @@
form: {},
query: {},
loading: true,
- showMap: true,
+ showMap: false,
page: {
pageSize: 10,
currentPage: 1,
@@ -201,9 +201,6 @@
return ids.join(",");
}
},
- mounted() {
- this.showMap = false;
- },
methods: {
rowSave(row, done, loading) {
add(row).then(() => {
@@ -251,6 +248,7 @@
//打开地图
handleMap(row) {
var that =this;
+ this.showMap=true;
if(row.jd=="" || row.jd=="0.0"){
var rwjd = "115.862321";
var rwwd = "28.591108";
@@ -258,28 +256,30 @@
}else{
that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
}
- this.showMap=true;
- this.$refs.securityMap.onload = () => {
- if (window.frames[1].init) {
- if(row.jd=="" || row.jd=="0.0"){
- //如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
- window.frames[1].init("SecurityMap", {
- x: rwjd,
- y: rwwd,
- code:row.code
- });
- }else{
- window.frames[1].init("SecurityMap", {
- x: row.jd,
- y: row.wd,
- code:row.code
- });
+
+ this.$nextTick(() => {
+ this.$refs.securityMap.onload = () => {
+ if (window.frames[0].init) {
+ if(row.jd=="" || row.jd=="0.0"){
+ //如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
+ window.frames[0].init("SecurityMap", {
+ x: rwjd,
+ y: rwwd,
+ code:row.code
+ });
+ }else{
+ window.frames[0].init("SecurityMap", {
+ x: row.jd,
+ y: row.wd,
+ code:row.code
+ });
+ }
+
+ } else {
+ console.log(`没有找到到window.frames[0].init`)
}
-
- } else {
- console.log(`没有找到到window.frames[1].init`)
}
- }
+ });
},
handleDelete() {
if (this.selectionList.length === 0) {
--
Gitblit v1.9.3