From ed9f239c21cf3e4b5f68b0c6ca0cdb6a8a3ec41a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 26 Mar 2021 08:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/parcel/parcelKind.vue | 44 ++++++++++++++++-----
src/views/animalHeat/animalHeat.vue | 7 ---
src/views/home/home.vue | 1
src/views/parcel/parcel.vue | 28 ++++++++-----
4 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 3c89f2b..a7a882e 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -217,9 +217,6 @@
let values = {
...params,
};
- console.log(this.$route.query.status,1);
- console.log(this.$route.query.type,2);
- console.log(this.$route.query,3);
if (this.$route.query.type!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
if (this.$route.query.status != undefined) {
this.page.currentPage = 1;
@@ -227,13 +224,11 @@
status:this.$route.query.status,
type:this.$route.query.type
}
- console.log(params,111);
} else {
this.page.currentPage = 1;
params = {
type:this.$route.query.type
};
- console.log(params,222);
}
}else if(this.$route.query.status != undefined){
params = {
@@ -246,7 +241,6 @@
status:this.$route.query.status,
type:this.$route.query.type
}
- console.log(params,444);
}
if (dateTime) {
@@ -263,7 +257,6 @@
...this.query,
};
}
- console.log(params,555);
this.loading = true;
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index dcc5448..51a5b23 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -69,7 +69,6 @@
//包裹分页数据
handleStartParcel(data){
debugger;
- console.log(data[0]);
this.$router.push({
path: `/parcel/index`,
query: data[0]
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 16d5640..982a230 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -33,17 +33,14 @@
</avue-crud>
<el-dialog
- height="30%"
- top="10%"
:visible.sync="dialogTableVisible"
:append-to-body="true"
:close-on-click-modal="false"
@opened="parcelConversation = true"
@close="(parcelConversation = false), (oldParcelSatart = false)" >
<div>
- <el-image style="width: 60%;height:40%" :src="'data:image/png;base64,'+imgUrl" :preview-src-list="'data:image/png;base64,'+imgUrl">
+ <el-image :src="'data:image/png;base64,'+imgUrl" :preview-src-list="'data:image/png;base64,'+imgUrl">
</el-image>
- <!-- <img v-image-preview src="'data:image/png;base64,'+imgUrl"/> -->
</div>
</el-dialog>
@@ -53,10 +50,6 @@
<script>
import {getList, getDetail, getParcelPic} from "@/api/parcel/parcel";
import {mapGetters} from "vuex";
-// import VueDirectiveImagePreviewer from 'vue-directive-image-previewer';
-// import 'vue-directive-image-previewer/dist/assets/style.css';
-// import Vue from 'vue';
-// Vue.use(VueDirectiveImagePreviewer);
export default {
data() {
@@ -116,6 +109,21 @@
prop: "imgUrl",
hide:true
},
+ // {
+ // label: '包裹图片',
+ // prop: 'imgUrl',
+ // type: 'upload',
+ // width: 300,
+ // listType: 'data:image/png;base64',
+ // span: 24,
+ // propsHttp: {
+ // res: 'data'
+ // },
+ // canvasOption: {
+ // text: 'avue',
+ // ratio: 0.1
+ // }
+ // },
{
label: "安检时间",
prop: "samplingTime",
@@ -238,7 +246,6 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- debugger;
const { dateTime } = this.query;
let values = {
...params,
@@ -294,11 +301,10 @@
});
},
handleParcelPic(row) {
- console.log(row.imgUrl);
getParcelPic(row.imgUrl).then(res => {
this.imgUrl = res.data.data.imgBase64;
});
- this.dialogTableVisible = true;
+ this.dialogTableVisible=true;
}
}
};
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 7eb1424..64fc854 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -31,12 +31,23 @@
</avue-crud>
+ <el-dialog
+ :visible.sync="dialogTableVisible"
+ :append-to-body="true"
+ :close-on-click-modal="false"
+ @opened="parcelConversation = true"
+ @close="(parcelConversation = false), (oldParcelSatart = false)" >
+ <div>
+ <el-image :src="'data:image/png;base64,'+imgUrl" :preview-src-list="'data:image/png;base64,'+imgUrl">
+ </el-image>
+ </div>
+ </el-dialog>
<!-- <template>
- <div>
- <img v-image-preview src="'data:image/png;base64,'+imgUrl"/>
+ <div style="width: 100%; height: 100%;">
+ <el-image ref="image" v-image-preview :src="'data:image/png;base64,'+imgUrl"/>
</div>
- </template> -->
+ </template> -->
</basic-container>
</template>
@@ -46,7 +57,10 @@
import VueDirectiveImagePreviewer from 'vue-directive-image-previewer';
import 'vue-directive-image-previewer/dist/assets/style.css';
import Vue from 'vue';
- Vue.use(VueDirectiveImagePreviewer);
+ Vue.use(VueDirectiveImagePreviewer, {
+ zIndex: 9999, //层级显示
+ previewSize: 3 //三倍图
+ });
export default {
data() {
@@ -54,7 +68,11 @@
form: {},
query: {},
imgUrl:'',
+ isShow:true,
loading: true,
+ dialogTableVisible: false,
+ parcelConversation:false,
+ oldParcelSatart:false,
page: {
pageSize: 10,
currentPage: 1,
@@ -185,11 +203,7 @@
},
methods: {
beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then(res => {
- this.form = res.data.data;
- });
- }
+
done();
},
searchReset() {
@@ -264,12 +278,20 @@
this.selectionClear();
});
},
+ // handleParcelPic(row) {
+ // getParcelPic(row.imgUrl).then(res => {
+ // this.imgUrl = res.data.data.imgBase64;
+ // });
+ // setTimeout(() => {
+ // //代码
+ // this.$refs.image.$el.click();
+ // }, 1000);
+ // },
handleParcelPic(row) {
- console.log(row.imgUrl);
getParcelPic(row.imgUrl).then(res => {
this.imgUrl = res.data.data.imgBase64;
});
- this.dialogTableVisible = true;
+ this.dialogTableVisible=true;
}
}
};
--
Gitblit v1.9.3