From 93becd8d57e767db902ba7cb9adc428745263d9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 24 Mar 2021 08:47:44 +0800
Subject: [PATCH] 体温，健康码页码修改
---
src/views/realTimePolice/real.vue | 8 ++++
src/views/animalHeat/animalHeat.vue | 19 ++++-----
src/views/healthcode/healthcode.vue | 17 +++-----
src/views/security/security.vue | 1
src/api/parcel/parcel.js | 4 +-
src/views/parcel/parcel.vue | 32 ++++++++++++++--
6 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/src/api/parcel/parcel.js b/src/api/parcel/parcel.js
index 0e8a100..c56e68b 100644
--- a/src/api/parcel/parcel.js
+++ b/src/api/parcel/parcel.js
@@ -24,12 +24,12 @@
})
}
-export const getDetail = (id) => {
+export const getDetail = (imgUrl) => {
return request({
url: '/api/blade-jfpts/parcel/parcel/getParcelPic',
method: 'get',
params: {
- id
+ imgUrl
}
})
}
\ No newline at end of file
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 42baa9f..cc2cadc 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -173,16 +173,7 @@
return ids.join(",");
}
},
- created() {
- Recorder.getPermission().then(() => {});
-
- this.recorder = new Recorder({
- sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
- sampleRate: 8000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
- numChannels: 1, // 声道，支持 1 或 2， 默认是1
- // compiling: false,(0.x版本中生效,1.x增加中) // 是否边录边转换，默认是false
- });
- },
+
methods: {
beforeOpen(done, type) {
},
@@ -228,7 +219,7 @@
...params,
};
if (this.$route.query.type && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
- if (this.$route.query.status != undefined && this.$route.query.status != null && this.$route.query.status == "" ) {
+ if (this.$route.query.status != undefined && this.$route.query.status != null && this.$route.query.status != "" ) {
this.activeClass = this.$route.query.type;
this.page.currentPage = 1;
params = {
@@ -242,6 +233,12 @@
type:this.$route.query.type
};
}
+ }else if(this.$route.query.status != undefined && this.$route.query.status != null && this.$route.query.status != "" ){
+ params = {
+ status: this.$route.query.status,
+ beginTime: this.$route.query.startTime,
+ endTime: this.$route.query.endTime
+ }
}else{
params = {
status:this.$route.query.status,
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 500988a..3140694 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -202,16 +202,7 @@
return ids.join(",");
}
},
- created() {
- Recorder.getPermission().then(() => {});
- this.recorder = new Recorder({
- sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
- sampleRate: 8000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
- numChannels: 1, // 声道，支持 1 或 2， 默认是1
- // compiling: false,(0.x版本中生效,1.x增加中) // 是否边录边转换，默认是false
- });
- },
methods: {
beforeOpen(done, type) {
},
@@ -258,7 +249,7 @@
};
if (this.$route.query.status && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
- if (this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type == "" ) {
+ if (this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ) {
this.activeClass = this.$route.query.status;
this.page.currentPage = 1;
params = {
@@ -272,6 +263,12 @@
type:this.$route.query.status
};
}
+ }else if(this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ){
+ params = {
+ type: this.$route.query.type,
+ beginTime: this.$route.query.startTime,
+ endTime: this.$route.query.endTime
+ }
}else{
params = {
status:this.$route.query.status,
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 0daf120..5880aa1 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -18,7 +18,22 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+
+ <template slot="menu">
+ <el-button type="text" @click="dialogVisible=true">点击打开 Dialog</el-button>
+
+ <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+ <span>这是一段信息</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+ </span>
+ </el-dialog>
+ </template>
+
+
</avue-crud>
+
</basic-container>
</template>
@@ -32,6 +47,7 @@
form: {},
query: {},
loading: true,
+ dialogVisible: false,
page: {
pageSize: 10,
currentPage: 1,
@@ -50,7 +66,7 @@
viewBtn: true,
selection: true,
labelWidth:120,
- menuWidth:120,
+ menuWidth:220,
dialogClickModal: false,
headerAlign: 'center',
align: 'center',
@@ -152,7 +168,7 @@
permissionList() {
return {
addBtn: this.vaildData(null, false),
- viewBtn: this.vaildData(this.permission.parcel_pic_view, true),
+ viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
editBtn: this.vaildData(null, false)
};
@@ -167,8 +183,9 @@
},
methods: {
beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then(res => {
+ console.log(type);
+ if (["view"].includes(type)) {
+ getDetail(this.form.imgUrl).then(res => {
this.form = res.data.data;
});
}
@@ -200,6 +217,13 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ handleClose(done) {
+ this.$confirm('确认关闭？')
+ .then(_ => {
+ done();
+ })
+ .catch(_ => {});
+ },
onLoad(page, params = {}) {
debugger;
const { dateTime } = this.query;
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index d9d0c45..a26a4b3 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -852,6 +852,14 @@
endTime: this.dateTime.day.endTime,
};
}
+
+ if(this.$route.query.startTime!=undefined && this.$route.query.startTime!=null && this.$route.query.startTime!=''){
+ params = {
+ waringType: this.$route.query.waringType,
+ beginTime: this.$route.query.startTime,
+ endTime: this.$route.query.endTime
+ }
+ }
}
if (releaseTimeRange) {
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 17e28c7..54210a1 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -54,6 +54,7 @@
currentPage: 1,
total: 0
},
+ dialogVisible: false,
selectionList: [],
option: {
height: 'auto',
--
Gitblit v1.9.3