From 2dd6626e2680f7ee0f4c09b2c8ce5d1cc2b05f79 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 27 Dec 2023 10:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/rotation.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
src/views/base/region.vue | 4 ++--
2 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index 8af2bfd..8dd4824 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -57,11 +57,49 @@
search: true,
},
{
- label: "跳转地址",
- prop: "junpUrl",
+ label: "类型",
+ prop: "type",
span: 12,
searchSpan: 4,
search: true,
+ type:"select",
+ dicData:[
+ {
+ label:"系统",
+ value:"1"
+ },
+ {
+ label:"社区",
+ value:"2"
+ }
+ ]
+ },
+ {
+ parent: false,
+ label: "所属社区",
+ prop: "communityCode",
+ search: true,
+ searchSpan: 4,
+ searchType: 'input',
+ width: 150,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "跳转地址",
+ prop: "junpUrl",
+ span: 12,
},
{
label: "图片",
@@ -246,7 +284,7 @@
this.onLoad(this.page, this.query)
},
onLoad (page, params = {}) {
- const { dateTime } = this.query
+ const { dateTime, communityCode } = this.query
let values = {
...params,
}
@@ -259,6 +297,14 @@
}
values.dateTime = null
}
+ if (communityCode) {
+ values = {
+ ...values,
+ communityName: communityCode
+ }
+
+ delete values.communityCode
+ }
this.loading = true
getList(page.currentPage, page.pageSize, values).then((res) => {
const data = res.data.data
diff --git a/src/views/base/region.vue b/src/views/base/region.vue
index a5126e7..62e43bb 100644
--- a/src/views/base/region.vue
+++ b/src/views/base/region.vue
@@ -64,7 +64,7 @@
export default {
data() {
return {
- topCode: '36',
+ topCode: '361102',
treeCode: '',
treeParentCode: '',
treeData: [],
@@ -72,7 +72,7 @@
nodeKey: 'id',
lazy: true,
treeLoad: function (node, resolve) {
- const parentCode = (node.level === 0) ? "36" : node.data.id;
+ const parentCode = (node.level === 0) ? "361102" : node.data.id;
getLazyTree(parentCode).then(res => {
resolve(res.data.data.map(item => {
return {
--
Gitblit v1.9.3