From a4e06ccd3cd976fbe4eef99e188d42ec9f3ad054 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 08 Apr 2021 09:32:05 +0800
Subject: [PATCH] 样式修改
---
src/views/parcel/parcel.vue | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 6d30f8a..3746049 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -12,6 +12,7 @@
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
+ @row-click="rowClick"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -19,8 +20,8 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
-
- <template slot-scope="{ type, size, row }" slot="menu">
+
+ <!-- <template slot-scope="{ type, size, row }" slot="menu">
<el-button
v-if="row.imgUrl != null || row.imgUrl != ''"
@@ -30,18 +31,19 @@
@click.stop="handleParcelPic(row)"
>查看包裹图片
</el-button>
- </template>
-
+ </template> -->
+
</avue-crud>
<template>
<div>
- <el-image-viewer
- v-if="showViewer"
- :on-close="closeViewer"
+ <el-image-viewer
+ class="img"
+ v-if="showViewer"
+ :on-close="closeViewer"
:url-list="['data:image/png;base64,'+imgUrl]" />
</div>
</template>
-
+
</basic-container>
</template>
@@ -60,9 +62,6 @@
showViewer: false, // 显示查看器
imgUrl:'',
loading: true,
- dialogTableVisible: false,
- parcelConversation:false,
- oldParcelSatart:false,
page: {
pageSize: 10,
currentPage: 1,
@@ -70,13 +69,15 @@
},
selectionList: [],
option: {
+ menu:false,
height:'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
activeClass: 3,
- border: true,
+ border: false,
+ stripe:true,
index: true,
viewBtn: true,
selection: true,
@@ -138,6 +139,7 @@
valueFormat: "yyyy-MM-dd HH:mm:ss",
searchRange: true,
searchSpan: 8,
+ searchValue:[this.getStartTime(),this.getEndTime()],
hide: true,
addDisplay: false,
editDisplay: false,
@@ -168,6 +170,7 @@
{
label: "是否违禁",
search: true,
+ searchValue: this.getIsKindParams(),
searchLabelWidth: 120,
searchSpan: 4,
hide: true,
@@ -213,7 +216,6 @@
},
methods: {
beforeOpen(done, type) {
- console.log(type);
if (["view"].includes(type)) {
getDetail(this.form.imgUrl).then(res => {
this.form = res.data.data;
@@ -231,6 +233,13 @@
this.onLoad(this.page, params);
done();
},
+ rowClick(row){
+ var that=this;
+ getParcelPic(row.imgUrl).then(res => {
+ that.imgUrl = res.data.data.imgBase64;
+ this.showViewer = true
+ });
+ },
selectionChange(list) {
this.selectionList = list;
},
@@ -247,6 +256,23 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getStartTime(){
+ if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+ return this.$route.query.startTime
+ }
+ },
+ getEndTime(){
+ if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
+ return this.$route.query.endTime
+ }
+ },
+ getIsKindParams(){
+ if(this.$route.query.decisioDiagramResult && this.$route.query!='' && this.$route.query!=null && this.$route.query!=undefined){
+ //回显
+ return this.$route.query.decisioDiagramResult
+ }
+ },
+ //给行加颜色
rowStyle({row, column, rowIndex}){
if(row.mechineMark==1){
return {
@@ -284,7 +310,6 @@
}
}
-
if (dateTime) {
values = {
...params,
@@ -309,14 +334,6 @@
this.selectionClear();
});
},
- handleParcelPic(row) {
- var that=this;
- getParcelPic(row.imgUrl).then(res => {
- that.imgUrl = res.data.data.imgBase64;
- //that.$refs.preview.clickHandler();
- this.showViewer = true
- });
- },
// 关闭查看器
closeViewer() {
this.showViewer = false
@@ -324,3 +341,10 @@
}
};
</script>
+<style lang="scss">
+ .img {
+ .el-icon-circle-close {
+ color: white;
+ }
+ }
+</style>
--
Gitblit v1.9.3