From b113449c0c7af284258c428a4b9248f872e1b138 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 12 Jul 2022 10:45:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/basicInfoMain.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 10f44d0a..c57aaef3 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -354,6 +354,7 @@ const vueGis = {
       const { data, code, msg } = await requestPost(url, params)
       this.infoLoading = false
       if (code === 0) {
+
         this.listData = data
         // this.listData = this.listData1
         this.listDatashow = []
@@ -365,6 +366,9 @@ const vueGis = {
 
           if (index % 2 === 0) {//偶数
             itemArray.push(item)
+            if ((index + 1) === this.listData.length) {
+              this.listDatashow.push(itemArray)
+            }
           } else {
             itemArray.push(item)
             this.listDatashow.push(itemArray)

From 30dc20d5086afde63be3c0c528fdc549b340b86c Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 13 Jul 2022 13:38:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/carotators-binding-house.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue
index cdeaf968..276d1eb4 100644
--- a/src/views/modules/cabaseinfo/carotators-binding-house.vue
+++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue
@@ -1,10 +1,10 @@
-<template>
+ <template>
   <div>
     <div v-show="currentPage == 'chaxun'">
       <div v-show="!showedFuncPanel">
         <div class="m-info">
           <div class="wrap">
-            <div class="search">
+            <div class="search house-search">
               <div class="input">
                 <!-- <el-dropdown
                   class="select"
@@ -634,6 +634,10 @@ export default {
 
 <style lang="scss" src="@/assets/scss/modules/search.scss" scoped></style>
 <style lang="scss" scoped>
+.house-search{
+  width: 100% !important;
+  // min-width: 750px;
+}
 .logo {
   font-size: 35px;
   font-weight: bold;

From 53d228a645b86550e522732e132603db121ddf2c Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 13 Jul 2022 15:29:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/plugin/power/organization.vue      | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 0fcc6130..1d4ad26d 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -10,15 +10,17 @@
       <div class="title">
         <img src="../../../../../assets/img/shuju/title-tip.png" />
         <span>动力主轴</span>
-        <div class="second-select cascader">
-          <el-cascader  class="customer_cascader"
-                        ref="myCascader"
-                        placeholder="请选择所属组织"
-                        :options="agencytree"
-                        v-model="agencyId"
-                        :show-all-levels="false"
-                        @change="handleChangeAgencytree"
-                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
+        <div class="search">
+          <div class="second-select cascader">
+            <el-cascader  class="customer_cascader"
+                          ref="myCascader"
+                          placeholder="请选择所属组织"
+                          :options="agencytree"
+                          v-model="agencyId"
+                          :show-all-levels="false"
+                          @change="handleChangeAgencytree"
+                          :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
+          </div>
         </div>
         <!-- <div class="second-select ">
 
@@ -448,6 +450,11 @@ export default {
   src="@/assets/scss/modules/visual/warning.scss"
   scoped
 ></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/search_1.scss"
+  scoped
+></style>
 <style lang="scss" scoped>
 .second-select {
     margin: 0 10px 0 40px !important;

From 1203327a170c3f536224528d75be1218bf77b217 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 14 Jul 2022 16:14:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=A9=BF=E9=80=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/basicInfoMain.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 819f2df3..c21671d6 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -424,6 +424,7 @@
   width: 370px;
   height: 470px;
   overflow: hidden;
+  pointer-events: none;
 
   .wrap {
     display: flex;
@@ -433,6 +434,7 @@
     transform: translateX(-5px);
     transition: all ease 1s;
     border-radius: 4px;
+    pointer-events: auto;
   }
 
   .wrap-hidden {