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] 修改
---
vue.config.js | 4
package-lock.json | 11
public/index.html | 2
src/router/views/index.js | 15 +
src/views/healthcode/healthcode.vue | 36 ++
src/views/security/security.vue | 1
src/api/parcel/parcel.js | 23 +
src/views/system/tenant.vue | 119 +++++++++
src/views/clientManagement/clientManagement.vue | 49 +++
src/views/parcel/parcel.vue | 130 +++++++++-
src/views/parcel/parcelKind.vue | 250 ++++++++++++++++++++
src/views/realTimePolice/real.vue | 8
src/views/animalHeat/animalHeat.vue | 32 ++
src/views/home/home.vue | 10
package.json | 1
src/api/system/tenant.js | 2
16 files changed, 645 insertions(+), 48 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index db2e0b2..df9eaf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1894,6 +1894,17 @@
"postcss-value-parser": "^4.1.0"
}
},
+ "avue-plugin-map": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/avue-plugin-map/-/avue-plugin-map-1.0.1.tgz",
+ "integrity": "sha512-QpGiCJZxF/DptoJrZnZWwQSxA2oBI7S8Wog3CEh9EhwrAKb+I0Ct8PWO+hBH2Q+tXTv/glhSWMh9aUbQa0/YIg==",
+ "requires": {
+ "axios": "^0.18.0",
+ "element-ui": "^2.4.6",
+ "vue": "^2.5.17",
+ "vue-router": "^3.0.1"
+ }
+ },
"avue-plugin-ueditor": {
"version": "0.1.7",
"resolved": "https://registry.npm.taobao.org/avue-plugin-ueditor/download/avue-plugin-ueditor-0.1.7.tgz",
diff --git a/package.json b/package.json
index 31955c2..9f565d9 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"test:e2e": "vue-cli-service test:e2e"
},
"dependencies": {
+ "avue-plugin-map": "^1.0.1",
"avue-plugin-ueditor": "^0.1.4",
"axios": "^0.18.0",
"babel-polyfill": "^6.26.0",
diff --git a/public/index.html b/public/index.html
index 2b19ee8..b4affd0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -16,6 +16,8 @@
<link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.7.5/index.css">
<script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
+ <script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch'></script>
+ <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
<link rel="icon" href="img/1.jpg">
<title>物联网安保云服务平台</title>
<style>
diff --git a/src/api/parcel/parcel.js b/src/api/parcel/parcel.js
index dc23d8c..c56e68b 100644
--- a/src/api/parcel/parcel.js
+++ b/src/api/parcel/parcel.js
@@ -2,11 +2,8 @@
export const getList = (currentPage, pageSize, params) => {
return request({
- url: '/backstage-temporary-api/machineStat/queryMachineDetailIList',
- method: 'post',
- Headers: {
- "X-AISP-T": 'A3_a10f15e56deefe37913884d98d3e9df31615529561666'
- },
+ url: '/api/blade-jfpts/parcel/parcel/getParcelDetailPage',
+ method: 'get',
params: {
...params,
currentPage,
@@ -15,12 +12,24 @@
})
}
-export const getDetail = (id) => {
+export const getKindList = (currentPage, pageSize, params) => {
+ return request({
+ url: '/api/blade-jfpts/parcel/parcel/getParcelkindDetailPage',
+ method: 'get',
+ params: {
+ ...params,
+ currentPage,
+ pageSize,
+ }
+ })
+}
+
+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/api/system/tenant.js b/src/api/system/tenant.js
index 050c4bb..b0091e6 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: '/api/blade-system/tenant/list',
+ url: '/api/blade-system/tenant/page',
method: 'get',
params: {
...params,
diff --git a/src/router/views/index.js b/src/router/views/index.js
index a13098f..1426f66 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -254,13 +254,26 @@
redirect: '/parcel/index',
children: [{
path: 'index',
- name: '实时警情',
+ name: '安检包裹',
meta: {
i18n: 'parcel'
},
component: () =>
import ( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
}]
+ }, {
+ path: '/parcelKind',
+ component: Layout,
+ redirect: '/parcelKind/index',
+ children: [{
+ path: 'index',
+ name: '违禁品',
+ meta: {
+ i18n: 'parcelKind'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
+ }]
}
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index a08051c..cc2cadc 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -173,6 +173,7 @@
return ids.join(",");
}
},
+
methods: {
beforeOpen(done, type) {
},
@@ -213,9 +214,12 @@
this.onLoad(this.page, params);
},
onLoad(page, params = {}) {
- this.loading = true;
+ const { dateTime } = this.query;
+ let values = {
+ ...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 = {
@@ -229,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,
@@ -236,7 +246,23 @@
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ if (dateTime) {
+ values = {
+ ...params,
+ begTime: 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;
this.page.total = data.total;
this.data = data.records;
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f6c21db..564a515 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -28,7 +28,7 @@
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
- size="mini"
+ size="small"
icon="el-icon-delete"
plain
v-if="permission.clientManagement_delete"
@@ -67,10 +67,10 @@
</el-tag>
</template>
-<!-- <template slot-scope="{ row }" slot="jfzt">-->
-<!-- <i class="el-icon-check client-jf" v-if="row.type == 0"></i>-->
-<!-- <i class="el-icon-close client-qf" v-else-if="row.type == 1"></i>-->
-<!-- </template>-->
+ <template slot-scope="{ row }" slot="jfzt">
+ <i class="el-icon-check client-jf" v-if="row.type == 0"></i>
+ <i class="el-icon-close client-qf" v-else-if="row.type == 1"></i>
+ </template>
</avue-crud>
@@ -272,6 +272,27 @@
trigger: "click"
}
]
+ },
+ {
+ label: "到期时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ searchSpan: 6,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur"
+ }
+ ]
}
,
{
@@ -302,6 +323,13 @@
addDisplay: true,
editDisplay: true,
viewDisplay: true,
+ }, {
+ label: "缴费状态",
+ prop: "jfzt",
+ slot: true,
+ align: "center",
+ addDisplay: false,
+ editDisplay: false,
}, {
label: "布撤防状态",
align: "center",
@@ -422,6 +450,16 @@
prop: "street",
width: 200
}, {
+ label: "到期时间",
+ prop: "expireTime",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130
+ }, {
+ label: "缴费信息",
+ prop: "pay",
+ }, {
label: "安装时间",
prop: "stime",
type: "datetime",
@@ -436,6 +474,7 @@
valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130
},
+
]
},
data: []
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 238d55a..40d1ef0 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -181,7 +181,9 @@
}
]
},
- data: []
+ data: [],
+ isActive: false,
+ recorder: null,
};
},
computed: {
@@ -242,9 +244,13 @@
this.onLoad(this.page, params);
},
onLoad(page, params = {}) {
- this.loading = true;
+ const { dateTime } = this.query;
+ let values = {
+ ...params,
+ };
+
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 = {
@@ -258,6 +264,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,
@@ -265,7 +277,23 @@
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ if (dateTime) {
+ values = {
+ ...params,
+ begTime: 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;
this.page.total = data.total;
this.data = data.records;
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index 4822ab8..dcc5448 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -30,6 +30,7 @@
window.handleStartEquipment = this.handleStartEquipment;
window.handleStartSuser=this.handleStartSuser;
window.handleStartParcel=this.handleStartParcel;
+ window.handleStartParcelKind=this.handleStartParcelKind;
},
methods: {
//体温监测分页数据
@@ -67,10 +68,19 @@
},
//包裹分页数据
handleStartParcel(data){
+ debugger;
+ console.log(data[0]);
this.$router.push({
path: `/parcel/index`,
query: data[0]
});
+ },
+ //违禁品分页数据
+ handleStartParcelKind(data){
+ this.$router.push({
+ path: `/parcelKind/index`,
+ query: data[0]
+ });
}
// getData() {
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();
});
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
new file mode 100644
index 0000000..0738cd0
--- /dev/null
+++ b/src/views/parcel/parcelKind.vue
@@ -0,0 +1,250 @@
+<template>
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+ import {getKindList, getDetail} from "@/api/parcel/parcel";
+ import {mapGetters} from "vuex";
+
+ export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ selectionList: [],
+ option: {
+ height:'auto',
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 4,
+ menuWidth:120,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ labelWidth:150,
+ dialogClickModal: false,
+ headerAlign: 'center',
+ align: 'center',
+ tree:true,
+ column: [
+ {
+ label: '坐标',
+ prop: 'test',
+ hide: true,
+ span: 100,
+ component: "avueMap",
+ clickChild: (obj) => {
+ this.form.jd = obj.latitude
+ this.form.wd = obj.longitude
+ },
+ },
+ {
+ label: "安检机名称",
+ prop: "checkMachineName",
+ },
+ {
+ label: "包裹ID",
+ prop: "packageId",
+ },
+ {
+ label: "包裹图片KEY",
+ prop: "imgUrl",
+ hide:true
+ },
+ {
+ 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: "违禁类型",
+ search: true,
+ searchLabelWidth: 120,
+ searchSpan: 4,
+ hide: true,
+ prop: "decisioDiagramResult",
+ type: "select",
+ dicData: [
+ {
+ label: "是",
+ value: "contraband"
+ },
+ {
+ label: "否",
+ value: "normal"
+ },
+ ]
+ },
+ {
+ label: '违禁品名称',
+ prop: 'objName'
+ },
+ {
+ label: '违禁品编号',
+ prop: 'objCode'
+ },
+ {
+ label: '等级',
+ prop: 'levName',
+ span:120
+ },
+ {
+ label: '坐标',
+ prop: 'coords',
+ span:500
+ }
+ ]
+ },
+ data: []
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(this.permission.parcel_pic_view, true),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ }
+ },
+ methods: {
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then(res => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage){
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize){
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ const { dateTime } = this.query;
+ let values = {
+ ...params,
+ };
+
+ if (this.$route.query.decisioDiagramResult && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
+ 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
+ };
+ }
+ }
+
+ if (dateTime) {
+ values = {
+ ...params,
+ startTime: dateTime[0],
+ endTime: dateTime[1],
+ ...this.query,
+ };
+ values.dateTime = null;
+ } else {
+ values = {
+ ...params,
+ ...this.query,
+ };
+ }
+
+ this.loading = true;
+ getKindList(page.currentPage, page.pageSize,values).then(res => {
+ const data = res.data.data;
+ this.page.total = data.totalSize;
+ this.data = data.data;
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
+ }
+ };
+</script>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 4861120..7e7f7de 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',
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index ceb9a52..e424a1b 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -47,6 +47,10 @@
slot="expireTime">
<el-tag>{{ row.expireTime ? row.expireTime : '不限制' }}</el-tag>
</template>
+ <template slot-scope="{ row }" slot="jfzt">
+ <i class="el-icon-check client-jf" v-if="row.type == '0'"></i>
+ <i class="el-icon-close client-qf" v-else-if="row.type == '1'"></i>
+ </template>
</avue-crud>
<el-dialog title="租户授权配置"
append-to-body
@@ -66,6 +70,7 @@
<script>
import {getList, getDetail, remove, update, add, setting, datasource} from "@/api/system/tenant";
import {mapGetters} from "vuex";
+import AvueMap from 'avue-plugin-map'
export default {
data() {
@@ -95,10 +100,9 @@
dialogClickModal: false,
column: [
{
- label: "租户ID",
+ label: "用户ID",
prop: "tenantId",
width: 100,
- search: true,
addDisplay: false,
editDisplay: false,
span: 24,
@@ -109,10 +113,10 @@
}]
},
{
- label: "租户名称",
+ label: "用户名称",
prop: "tenantName",
search: true,
- width: 180,
+ width: 190,
span: 24,
rules: [{
required: true,
@@ -137,11 +141,25 @@
width: 150,
},
{
- label: "联系地址",
- prop: "address",
+ label: '坐标',
+ prop: 'test',
+ hide: true,
span: 24,
- minRows: 2,
- type: "textarea",
+ component: "avueMap",
+ clickChild: (obj) => {
+ console.log(123,obj)
+ this.form.jd = obj.latitude
+ this.form.wd = obj.longitude
+ },
+ },
+ {
+ label: "经度",
+ prop: "jd",
+ hide: true,
+ },
+ {
+ label: "纬度",
+ prop: "wd",
hide: true,
},
{
@@ -161,11 +179,96 @@
editDisplay: false,
},
{
+ label: "缴费状态",
+ prop: "jfzt",
+ width: 80,
+ slot: true,
+ align: "center",
+ addDisplay: false,
+ editDisplay: false,
+ },
+ {
+ label: "类型",
+ prop: "types",
+ span: 11,
+ width: 60,
+ },
+ {
+ label: "省份",
+ prop: "province",
+ hide: true,
+ search: true,
+ searchSpan: 3,
+ searchLabelWidth: 45,
+ placeholder: "省份",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code"
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 6,
+ className: "cityClass1"
+ },
+ {
+ label: "地市",
+ prop: "city",
+ hide: true,
+ type: "select",
+ searchPlaceholder: "地市",
+ placeholder: "地市",
+ searchLabelWidth: 1,
+ searchSpan: 2,
+ search: true,
+ props: {
+ label: "name",
+ value: "code"
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 3,
+ labelWidth: "0",
+ className: "cityClass2"
+ },
+ {
+ label: "区县",
+ searchSpan: 2,
+ hide: true,
+ searchLabelWidth: 1,
+ searchPlaceholder: "区县",
+ placeholder: "区县",
+ search: true,
+ prop: "district",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code"
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 3,
+ labelWidth: "0",
+ className: "cityClass3"
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ span: 24,
+ minRows: 2,
+ type: "textarea",
+ hide: true,
+ },
+ {
label: "绑定域名",
prop: "domain",
span: 24,
},
{
+ label: "营业信息",
+ prop: "information",
+ hide: true,
+ span: 24,
+ },
+ {
label: "系统背景",
prop: "backgroundUrl",
type: 'upload',
diff --git a/vue.config.js b/vue.config.js
index 87e33bf..96ed321 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,10 +42,6 @@
pathRewrite: {
'^/api': '/'
}
- },
- '/backstage-temporary-api': {
- target: 'http://fengkong.sf-express.com/backstage-temporary-api/', //要访问的源
- changeOrigin: true //允许跨域
}
}
}
--
Gitblit v1.9.3