From e4bfc5b5c350a372d0d50589c0fe146821974751 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 24 Mar 2021 09:33:12 +0800
Subject: [PATCH] 修改
---
src/views/parcel/parcel.vue | 130 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 115 insertions(+), 15 deletions(-)
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index eda5e8d..4321237 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -18,6 +18,16 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+
+ <template slot="menu">
+ <el-button type="text" @click="dialogVisible=true">查看包裹图片</el-button>
+
+ <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+ <span>这是一段信息</span>
+ </el-dialog>
+ </template>
+
+
</avue-crud>
</basic-container>
</template>
@@ -32,6 +42,7 @@
form: {},
query: {},
loading: true,
+ dialogVisible: false,
page: {
pageSize: 10,
currentPage: 1,
@@ -44,20 +55,23 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
+ activeClass: 3,
border: true,
index: true,
viewBtn: true,
selection: true,
labelWidth:120,
+ menuWidth:220,
dialogClickModal: false,
headerAlign: 'center',
align: 'center',
+ tree:true,
column: [
{
label: '坐标',
prop: 'test',
hide: true,
- span: 24,
+ span: 50,
component: "avueMap",
clickChild: (obj) => {
this.form.jd = obj.latitude
@@ -75,25 +89,69 @@
{
label: "包裹图片KEY",
prop: "imgUrl",
+ hide:true
},
{
- label: "过包裹时间",
+ label: "安检时间",
prop: "samplingTime",
},
{
+ label: "安检时间",
+ prop: "dateTime",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ searchRange: true,
+ searchSpan: 8,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
label: "是否违禁",
- prop: "sex",
+ prop: "mechineMark",
+ dicData: [
+ {
+ label: "是",
+ value: 1
+ },
+ {
+ label: "否",
+ value: 0
+ },
+ ]
+ },
+ {
+ label: "是否违禁",
+ search: true,
+ searchLabelWidth: 120,
+ searchSpan: 4,
+ hide: true,
+ prop: "decisioDiagramResult",
type: "select",
dicData: [
{
label: "是",
- value: "1"
+ value: "contraband"
},
{
label: "否",
- value: "0"
+ value: "normal"
},
]
+ },
+ {
+ label: "违禁包裹物品",
+ prop: "decisioDiagramResultDetails",
}
]
},
@@ -105,7 +163,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)
};
@@ -120,8 +178,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;
});
}
@@ -154,16 +213,57 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- this.loading = true;
- params ={
- status:this.$route.query.status,
- type:this.$route.query.type
+ debugger;
+ const { dateTime } = this.query;
+ let values = {
+ ...params,
+ };
+
+ if (this.$route.query.decisioDiagramResult && this.$route.query!='' && this.$route.query!=null && this.$route.query!=undefined ) {
+ if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+ this.page.currentPage = 1;
+ params = {
+ startTime:this.$route.query.startTime,
+ endTime:this.$route.query.endTime,
+ decisioDiagramResult:this.$route.query.decisioDiagramResult
+ }
+ } else {
+ this.page.currentPage = 1;
+ params = {
+ decisioDiagramResult:this.$route.query.decisioDiagramResult
+ };
+ }
+ }else{
+ if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+ this.page.currentPage = 1;
+ params = {
+ startTime:this.$route.query.startTime,
+ endTime:this.$route.query.endTime
+ }
+ }
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+
+
+ if (dateTime) {
+ values = {
+ ...params,
+ startTime: dateTime[0],
+ endTime: dateTime[1],
+ ...this.query,
+ };
+ values.dateTime = null;
+ } else {
+ values = {
+ ...params,
+ ...this.query,
+ };
+
+ }
+ this.loading = true;
+ getList(page.currentPage, page.pageSize,values).then(res => {
const data = res.data.data;
- console.log(data,111);
this.page.total = data.totalSize;
- this.data = data.records;
+ this.data = data.data;
this.loading = false;
this.selectionClear();
});
--
Gitblit v1.9.3