Merge branch 'master' into dev-youhua0707

# Conflicts:
#	src/views/modules/visual/plugin/power/organization.vue

src/assets/scss/modules/visual/basicInfoMain.scss

@@ -426,6 +426,7 @@
   width: 370px;
   height: 470px;
   overflow: hidden;
+  pointer-events: none;
 
   .wrap {
     display: flex;
@@ -435,6 +436,7 @@
     transform: translateX(-5px);
     transition: all ease 1s;
     border-radius: 4px;
+    pointer-events: auto;
   }
 
   .wrap-hidden {

src/views/modules/cabaseinfo/carotators-binding-house.vue

@@ -4,7 +4,7 @@
       <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;

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)

src/views/modules/visual/plugin/power/organization.vue

@@ -1,11 +1,16 @@
 <template>
   <div class="warning-box">
     <cpt-card>
-      <div class="card-title">
+      <!-- <div class="card-title">
         <img class="title-icon" src="../../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           动力主轴
         </div>
+      </div> -->
+      <div class="title">
+        <img src="../../../../../assets/img/shuju/title-tip.png" />
+        <span>动力主轴</span>
+        <div class="search">
           <div class="second-select cascader">
             <el-cascader  class="customer_cascader"
                           ref="myCascader"
@@ -17,6 +22,20 @@
                           :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
           </div>
         </div>
+        <!-- <div class="second-select ">
+
+          <el-date-picker v-model="dateIdShow"
+                          type="date"
+                          :clearable="false"
+                          @change="handleChangeDate"
+                          :picker-options="pickerOptions"
+                          prefix-icon="el-icon-caret-bottom"
+                          placeholder="选择日期"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+
+        </div> -->
+      </div>
       <div class="card-panel">
         <div class="card-left">
           <!-- <div class="card-item-title">小标题</div> -->
@@ -32,7 +51,7 @@
                           :operate="true"
                           @look="handleLook"></screen-table>
             <div class="pagination">
-              <el-pagination hide-on-single-page :current-page="pageNo"
+              <el-pagination :current-page="pageNo"
                              :page-size="pageSize"
                              background
                              layout="prev, pager, next"
@@ -431,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;
@@ -439,8 +463,6 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
-  margin-bottom: 10px;
-  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -449,8 +471,7 @@ export default {
     margin-right: 6px;
   }
   .title-label {
-    font-size: 22px;
+    font-size: 20px;
-    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;