From 9ec4ad8b02fb8a0e66990a83c15a3a3210dbb194 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 22 May 2024 23:35:21 +0800
Subject: [PATCH] 代码优化

---
 src/components/Approval/Approval.vue       |   14 ++++++++++----
 src/components/cardPopup/cardPopuponce.vue |   15 ++++++++-------
 src/components/cardPopup/cardPopup.vue     |   11 +++++++----
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index fecc4cf..5a58daa 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -140,14 +140,20 @@
             },
             {
               label: "所属社区",
-              prop: "communityName",
+              prop: "communityCode",
               span: 24,
               row: true,
               searchSpan: 4,
               search: true,
               width: 160,
               overHidden: true,
-              align: 'center'
+              align: 'center',
+              dicUrl: "/api/blade-system/region/treeToCommunity?isFiter='1'",
+              defaultExpandedKeys: ["361102"],
+              props: {
+                label: "name",
+                value: "id"
+              },
             },
             {
               label: "派出所",
@@ -245,7 +251,7 @@
       handleCredentials(val) {
         this.openOnceShow = true;
         this.paredData = val;
-        // console.log(val);
+        console.log(val);
       },
       openClose() {
         this.paredData = "";
@@ -306,4 +312,4 @@
   .openOnceCLoce:hover {
     color: red;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/cardPopup/cardPopup.vue b/src/components/cardPopup/cardPopup.vue
index 7c2d908..6536427 100644
--- a/src/components/cardPopup/cardPopup.vue
+++ b/src/components/cardPopup/cardPopup.vue
@@ -299,6 +299,7 @@
     watch: {
       useWhere() {
         var d = [];
+        // console.log("********6666********" + JSON.stringify(this.useWhere))
         // console.log(this.together, "fromWhere");
         for (var i in this.together) {
           if (this.useWhere == this.together[i].fromWhere) {
@@ -317,14 +318,14 @@
             }
           }
           this.cardData = d;
-          console.log(this.cardData);
+          // console.log(this.cardData);
         } else {
           this.see = true;
           // this.openS();
           this.getPatrolGroupTree();
-          this.obj0.noFraudType = this.data[0].type
+          this.obj0.noFraudType = this.useWhere
           console.table(this.data);
-          console.log(this.data[0].type);
+          // console.log(this.data[0].type);
         }
 
         if (this.useWhere == "close") {
@@ -364,6 +365,8 @@
         this.openS(this.choseType, this.cardData);
       },
       openS(chose, datas) {
+        console.log("****111*****" + JSON.stringify(chose))
+        console.log("****222*****" + JSON.stringify(datas))
         var n = chose || this.useWhere;
         this.data = datas || this.data;
         for (var k in this.data) {
@@ -423,7 +426,7 @@
           type: 2
         }
         patrolGroupTree(data).then((res) => {
-          console.log("*****res********" + JSON.stringify(res))
+          // console.log("*****res********" + JSON.stringify(res))
           this.patrolGroup = res.data.data
         });
       },
diff --git a/src/components/cardPopup/cardPopuponce.vue b/src/components/cardPopup/cardPopuponce.vue
index 6ff6599..5378aff 100644
--- a/src/components/cardPopup/cardPopuponce.vue
+++ b/src/components/cardPopup/cardPopuponce.vue
@@ -113,15 +113,15 @@
               slot: true,
               label: "位置",
               prop: "location",
-              type: "map",
+              // type: "map",
               dataType: "string",
               // labelWidth: 120,
               // span: 24,
-              value: [117.96646, 28.431002, ""],
+              // value: [117.96646, 28.431002, ""],
               // cascader: ['houseCodeBinds'],
-              mapChange: (params) => {
-                console.log('高德回调参数', params)
-              },
+              // mapChange: (params) => {
+              //   console.log('高德回调参数', params)
+              // },
               //高德初始化参数
               params: {
                 zoom: 10,
@@ -157,7 +157,8 @@
               searchSpan: 4,
               searchType: 'input',
               type: "tree",
-              dicUrl: "/api/blade-system/region/treeToCommunity",
+              dicUrl: "/api/blade-system/region/treeToCommunity?isFiter='1'",
+              defaultExpandedKeys: ["361102"],
               props: {
                 label: "name",
                 value: "id"
@@ -295,4 +296,4 @@
     width: 100%;
     height: 100%;
   }
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.3