From 5dc0d282bbd96a449255d81fbcf6deb3734d931a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 10:40:17 +0800
Subject: [PATCH] 地图修改
---
src/views/activitys/real.vue | 59 +++++++++++++----------------
src/views/system/user.vue | 43 +++++++++++++++++++++
2 files changed, 69 insertions(+), 33 deletions(-)
diff --git a/src/views/activitys/real.vue b/src/views/activitys/real.vue
index 7f30a24..cdb2236 100644
--- a/src/views/activitys/real.vue
+++ b/src/views/activitys/real.vue
@@ -306,7 +306,31 @@
// span: 5,
// },
{
+ label: "所属辖区",
+ prop: "jurisdiction",
+ searchLabelWidth: 80,
+ search: true,
+ searchSpan: 4,
+ overHidden: true,
+ parent: false,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ checkStrictly: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属辖区",
+ trigger: "click"
+ }
+ ]
+ },
+ {
label: "省份",
+ hide: true,
prop: "province",
// search: true,
width: 100,
@@ -329,6 +353,7 @@
},
{
label: "地市",
+ hide: true,
prop: "city",
type: "select",
width: 100,
@@ -352,6 +377,7 @@
},
{
label: "区县",
+ hide: true,
searchSpan: 2,
searchLabelWidth: 1,
width: 100,
@@ -376,7 +402,6 @@
label: "任务状态",
prop: "rtype",
type: "select",
- span: 6,
value: "2",
dicData: [
{
@@ -432,7 +457,6 @@
// props: {
// label: "title",
// },
- span: 6,
width: 72,
// hide: true,
minRows: 1,
@@ -451,7 +475,6 @@
// props: {
// label: "title",
// },
- span: 6,
width: 72,
// hide: true,
minRows: 1,
@@ -460,33 +483,6 @@
addDisplay: true,
editDisplay: true,
viewDisplay: true,
- },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- hide: true,
- searchLabelWidth: 80,
- search: true,
- searchSpan: 4,
- overHidden: true,
- span: 9,
- width: 72,
- parent: false,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree",
- props: {
- label: "title",
- value: "id"
- },
- checkStrictly: true,
- slot: true,
- rules: [
- {
- required: true,
- message: "请选择所属辖区",
- trigger: "click"
- }
- ]
},
// {
// label: "巡逻路线",
@@ -504,7 +500,6 @@
label: "请在下方地图中，建立路径！",
labelWidth: "0",
className: "mapClass",
- span: 8,
prop: "haveMap",
hide: true,
display: true,
@@ -839,7 +834,7 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- getList(page.currentPage, page.pageSize).then((res) => {
+ getList(page.currentPage, page.pageSize,params).then((res) => {
const data = res.data.data;
this.page.total = data.total;
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index d894474..ec2096a 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -296,7 +296,7 @@
calcHeight: 54,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 4,
border: true,
index: true,
selection: true,
@@ -308,6 +308,7 @@
label: "登录账号",
prop: "account",
search: true,
+ searchSpan: 5,
display: false,
},
{
@@ -322,6 +323,24 @@
label: "用户姓名",
prop: "realName",
search: true,
+ searchSpan: 5,
+ display: false,
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ search: true,
+ overHidden: true,
+ parent: false,
+ type: "tree",
+ searchLabelWidth: 80,
+ searchSpan: 4,
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ checkStrictly: true,
display: false,
},
{
@@ -349,6 +368,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
+ hide: true,
},
{
label: "用户平台",
@@ -373,6 +393,7 @@
{
label: "用户平台",
type: "select",
+ searchSpan: 5,
dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
@@ -444,6 +465,26 @@
],
},
{
+ label: "所属辖区",
+ prop: "jurisdiction",
+ overHidden: true,
+ parent: false,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ checkStrictly: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属辖区",
+ trigger: "click"
+ }
+ ]
+ },
+ {
label: "登录账号",
prop: "account",
rules: [
--
Gitblit v1.9.3