From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化

---
 src/views/district/index.vue |   64 +++++++++++++-------------------
 1 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/views/district/index.vue b/src/views/district/index.vue
index c4f0139..18632c6 100644
--- a/src/views/district/index.vue
+++ b/src/views/district/index.vue
@@ -32,13 +32,16 @@
             datetime: "",
             selectionList: [],
             option: {
+                labelWidth: 96,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
+
                 height: "auto",
                 calcHeight: 54,
                 dialogWidth: 950,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 280,
                 border: true,
                 //stripe:true,
                 index: true,
@@ -47,26 +50,18 @@
                 dialogClickModal: false,
                 column: [
                     {
-                        parent: false,
-                        label: "小区名称",
+                        width: 220,
+                        overHidden: true,
+                        label: '小区名称',
                         prop: "name",
                         searchSpan: 4,
                         search: true,
-                        type: 'tree',
-                        dicUrl: `/api/blade-district/district/getDistrictTree`,
-                        props: {
-                            label: "name",
-                            value: "id"
-                        },
-                        defaultExpandedKeys: ["361102003"],
+                        searchLabelWidth: 76,
                         span: 12,
-                        labelWidth: 120,
-                        width: 220,
-                        overHidden: true,
                         rules: [
                             {
                                 required: true,
-                                message: "请选择小区",
+                                message: "请输入小区名称",
                                 trigger: "blur",
                             },
                         ],
@@ -74,27 +69,28 @@
 
 
                     {
+                        width: 110,
+                        label: "所属街道",
                         parent: false,
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
-                        width: 96,
-                        label: "所属街道",
                         prop: "townStreetName",
                         search: true,
                         searchSpan: 4
                     },
 
                     {
-                        parent: false,
+                        width: 156,
+                        overHidden: true,
                         label: "所属社区",
+                        parent: false,
                         prop: "communityCode",
                         search: true,
                         searchSpan: 4,
                         searchType: 'input',
-                        width: 150,
                         type: "tree",
-                        dicUrl: "/api/blade-system/region/tree",
+                        dicUrl: "/api/blade-system/region/treeToCommunity",
                         props: {
                             label: "name",
                             value: "id"
@@ -109,18 +105,19 @@
                     },
 
                     {
+                        width: 110,
+                        overHidden: true,
+                        label: "所属网格",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
-                        width: 96,
-                        label: "所属网格",
                         prop: "gridName",
                     },
 
                     {
+                        width: 110,
                         label: "小区图片",
                         prop: "picUrl",
-                        width: 80,
                         type: "upload",
                         listType: "picture-img",
                         action: "/api/blade-resource/oss/endpoint/put-file",
@@ -151,6 +148,7 @@
                         label: "地址",
                         prop: "address",
                         span: 24,
+                        overHidden: true,
                         rules: [
                             {
                                 required: true,
@@ -319,20 +317,11 @@
             this.onLoad(this.page, this.query)
         },
         onLoad (page, params = {}) {
-            const { dateTime, communityCode } = this.query
-            let values = {
-                ...params,
-            }
+            this.loading = true
 
-            if (dateTime) {
-                values = {
-                    ...params,
-                    startTime: dateTime[0],
-                    endTime: dateTime[1],
-                    ...this.query,
-                }
-                values.dateTime = null
-            }
+            let values = Object.assign(params, this.query)
+
+            const { communityCode } = this.query
 
             if (communityCode) {
                 values = {
@@ -343,7 +332,6 @@
                 delete values.communityCode
             }
 
-            this.loading = true
             getList(page.currentPage, page.pageSize, values).then((res) => {
                 const data = res.data.data
                 this.page.total = data.total

--
Gitblit v1.9.3