Merge branch 'dev-20220218' into dev

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

@@ -182,6 +182,11 @@
               }
             }
           }
+
+          ::v-deep .el-popper {
+            padding: 0px;
+          }
+          //
         }
       }
     }
@@ -320,62 +325,61 @@
           color: #ffffff;
           line-height: 30px;
         }
+      }
+    }
+  }
 
-        .user_list {
-          margin-top: 2px;
-          position: relative;
-          z-index: 10;
+  .div_room::after {
+    content: '';
+    flex: 1;
+  }
+}
 
-          background: #020340;
-          border: 1px solid #0a359b;
-          border-radius: 4px;
-          box-shadow: 0 0 10px inset #1a5afd;
+.user_list {
+  position: relative;
+  z-index: 10;
 
-          .user_item {
-            padding: 13px 8px 0 14px;
-            font-size: 16px;
-            font-family: PingFang SC;
-            font-weight: 400;
-            color: #ffffff;
+  background: #020340;
+  border: 1px solid #0a359b;
+  border-radius: 4px;
+  box-shadow: 0 0 10px inset #1a5afd;
 
-            .user_item_content {
-              display: flex;
-              // justify-content: space-between;
-              align-items: center;
+  .user_item {
+    padding: 13px 8px 0 14px;
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
 
-              .name {
-                max-width: 80%;
-                text-align: left;
-              }
+    .user_item_content {
+      display: flex;
+      // justify-content: space-between;
+      align-items: center;
 
-              > img {
-                margin-left: auto;
+      .name {
+        max-width: 80%;
+        text-align: left;
+      }
 
-                margin-top: 4px;
-                width: 8px;
-                height: 12px;
-              }
-            }
+      > img {
+        margin-left: auto;
 
-            .item_line {
-              margin-top: 9px;
-              width: 70px;
-              height: 0px;
-              border: 1px dotted #1797ff31;
-              border-width: 0.5px;
-            }
-            .last_line {
-              border: 1px dotted #1797ff00;
-            }
-          }
-        }
+        margin-top: 4px;
+        width: 8px;
+        height: 12px;
       }
     }
-  }
 
-  .div_room::after {
-    content: '';
-    flex: 1;
+    .item_line {
+      margin-top: 9px;
+      width: 70px;
+      height: 0px;
+      border: 1px dotted #1797ff31;
+      border-width: 0.5px;
+    }
+    .last_line {
+      border: 1px dotted #1797ff00;
+    }
   }
 }
 

src/js/dai/request.js

@@ -2,7 +2,12 @@
  |                           请求接口封装                           |
  ---------------------------------------------------------------*/
 import axios from "axios";
+<<<<<<< HEAD
 // import message from "dai-js/modules/message/message";
+=======
+import message from "dai-js/modules/message/message";
+import { Message } from "element-ui";
+>>>>>>> dev-20220218
 import curry from "dai-js/tools/curry";
 import { Message } from "element-ui";
 

src/views/modules/base/community/buildTable.vue

@@ -587,8 +587,16 @@ export default {
       window.app.ajax.post2(url, fileFormData,
         (data, rspMsg) => {
 
-          if (data.code === 0 || data.code > 8000) {
-
+          if (data.code === 0 && data.msg == 'success') {
+            this.$message.success('导入成功')
+          } else {
+            this.$message({
+              showClose: true,
+              message: rspMsg,
+              duration: 0,
+              type: "error"
+            })
+            // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')
           this.loadTable()

src/views/modules/base/community/communityTable.vue

@@ -621,8 +621,16 @@ export default {
       window.app.ajax.post2(url, fileFormData,
         (data, rspMsg) => {
 
-          if (data.code === 0 || data.code > 8000) {
-
+          if (data.code === 0 && data.msg == 'success') {
+            this.$message.success('导入成功')
+          } else {
+            this.$message({
+              showClose: true,
+              message: rspMsg,
+              duration: 0,
+              type: "error"
+            })
+            // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')
           this.loadTable()

src/views/modules/base/community/roomTable.vue

@@ -550,8 +550,16 @@ export default {
       window.app.ajax.post2(url, fileFormData,
         (data, rspMsg) => {
 
-          if (data.code === 0 || data.code > 8000) {
-
+          if (data.code === 0 && data.msg == 'success') {
+            this.$message.success('导入成功')
+          } else {
+            this.$message({
+              showClose: true,
+              message: rspMsg,
+              duration: 0,
+              type: "error"
+            })
+            // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')
           this.loadTable()

src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@@ -46,7 +46,39 @@
                    :src="iconItem.iconUrl"
                    alt />
             </div>
-            <div @click.stop="handleShowAllUser(index)"
+
+            <el-popover placement="bottom"
+                        width="50"
+                        popper-class="my_popover"
+                        trigger="click">
+              <div class="user_list">
+                <div v-for="(userItem,userIndex) in userArray"
+                     :key="userIndex"
+                     class="user_item"
+                     @click.stop="handleClickUser(userItem.userId)">
+                  <div class="user_item_content">
+                    <div class="name">{{userItem.name}}</div>
+
+                    <img src="../../../../assets/img/jinru.png"
+                         alt />
+
+                  </div>
+                  <div :class="['item_line',{'last_line':userIndex==(userArray.length-1)}]"></div>
+                </div>
+
+              </div>
+              <div slot="reference"
+                   class="div_user"
+                   @click.stop="handleShowAllUser(index)">
+
+                <span>全部成员</span>
+                <img src="../../../../assets/img/xiala.png"
+                     alt />
+              </div>
+              <!-- <el-button slot="reference">click 激活</el-button> -->
+            </el-popover>
+
+            <!-- <div @click.stop="handleShowAllUser(index)"
                  class="div_user">
 
               <span>全部成员</span>
@@ -70,7 +102,7 @@
                 </div>
 
               </div>
-            </div>
+            </div> -->
 
           </div>
 
@@ -458,4 +490,11 @@ export default {
     overflow-x: hidden !important;
   }
 }
-</style>
+</style>
+<style lang="scss" >
+.el-popover.my_popover {
+  padding: 0px;
+  margin-top: 10px;
+  border: 0;
+}
+</style>

src/views/modules/visual/basicinfo/personCategory/recordList.vue

@@ -405,7 +405,7 @@ export default {
       align-items: center;
 
       .name {
-        max-width: 80%;
+        max-width: 100%;
         text-align: left;
       }