合并冲突

.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_SERVER =  https://epdc-shibei.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epmet-cloud.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod
 VUE_APP_PUBLIC_PATH=epmet-oper

public/index.html

@@ -64,7 +64,7 @@
               <!-- 生产环境 -->
               <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %>
                 <script>
-                  window.SITE_CONFIG['apiURL'] = 'https://epdc-shibei.elinkservice.cn/api'
+                  window.SITE_CONFIG['apiURL'] = 'https://epmet-cloud.elinkservice.cn/api'
                 </script>
                 <% } %>
 </head>

src/assets/scss/modules/search.scss

@@ -26,13 +26,15 @@
 
             .input {
                 position: relative;
-                select {
+                .select-show {
                     border: none;
+                    display: block;
                     font-size: 16px;
                     width: 90px;
                     line-height: 32px;
                     text-align: center;
                     color: #0082fb;
+                    cursor: default;
                 }
 
                 input {

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;
+    }
   }
 }
 
@@ -399,13 +403,22 @@
   }
   .agency_list {
     .agency_item {
-      height: 50px;
+      // height: 60px;
+      padding: 15px 0;
       font-size: 17px;
       font-family: PingFang SC;
       font-weight: 400;
       color: #ffffff;
-      line-height: 50px;
+      // line-height: 50px;
       padding-left: 12px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      // padding-top: 15px;
+
+      .agency_item_name {
+        // line-height: 20px;
+      }
     }
 
     .agency_item_on {

src/js/dai/request.js

@@ -2,7 +2,6 @@
  |                           请求接口封装                           |
  ---------------------------------------------------------------*/
 import axios from "axios";
-// import message from "dai-js/modules/message/message";
 import curry from "dai-js/tools/curry";
 import { Message } from "element-ui";
 
@@ -37,12 +36,7 @@ const request = curry(
         // 	retData = Vue.$afterRequestHook(retData);
         // }
         if (res.data.code > 8000 && res.data.code < 10000) {
-          // message.error(res.data.msg);
-         Message({
-            showClose: true,
-            message: res.data.msg,
-            duration: 0
-          })
+          // Message.error(res.data.msg);
         }
 
         reslove(retData);

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/importRecord/index.vue

@@ -22,15 +22,19 @@
               >导入中</span
             >
             <span
-              v-else-if="scope.row.processStatus == 'finished'"
+              v-else-if="scope.row.processStatus == 'finished_success'"
               >已完成</span
             >
             <a target="_blank"
               :href="scope.row.resultDescFile"
-              style="color: #00a7a9"
-              v-else-if="scope.row.processStatus == 'finished_fail'"
+              style="color: #00a7a9;cursor:pointer;"
+              v-else-if="scope.row.processStatus == 'finished_fail' && scope.row.resultDescFile"
               >下载失败说明</a
             >
+            <span
+              v-else-if="scope.row.processStatus == 'finished_fail' && !scope.row.resultDescFile"
+              >导入失败，未知错误</span
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -81,7 +85,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 450;
+      return this.clientHeight - 300;
     },
     ...mapGetters(["clientHeight"]),
   },

src/views/modules/shequ/index.vue

@@ -9,11 +9,17 @@
 
           <div class="search">
             <div class="input">
-              <select v-model="searchData.type">
-                <option value="jumin">居民</option>
-                <option value="fangwu">房屋</option>
-                <option value="xuqiu">需求</option>
-              </select>
+              <el-dropdown class="select" 
+                placement="bottom" v-model="searchData.type" @command="type => searchData.type = type">
+                <span class="select-show">
+                  {{{jumin:'居民', fangwu: '房屋', xuqiu:'需求'}[searchData.type]}}<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="jumin">居民</el-dropdown-item>
+                  <el-dropdown-item command="fangwu">房屋</el-dropdown-item>
+                  <el-dropdown-item command="xuqiu">需求</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
 
               <input
                 type="text"

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

@@ -46,6 +46,39 @@
                    :src="iconItem.iconUrl"
                    alt />
             </div>
+
+            <!-- <el-popover v-model="item.showAllUser"
+                        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-popover> -->
+
             <div @click.stop="handleShowAllUser(index)"
                  class="div_user">
 
@@ -100,7 +133,7 @@ export default {
       selBuildingId: '',
       selBuildingName: '',
 
-      roomLoaded: true,
+      roomLoaded: false,
       roomArray: [],
       selHouseId: '',
       selHouseName: '',
@@ -206,6 +239,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+
         this.buildingArray = data
         this.buildingArray.forEach(item => {
           if (!this.buildingArray[0].buildingName) {
@@ -458,4 +492,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/basicInfoMain.vue

@@ -27,7 +27,7 @@
                :key="index"
                @click="clickAgencyItem(item,index)"
                :class="['agency_item',{'agency_item_on':index%2 ==0}]">
-            <div>{{item.name}}</div>
+            <div class="agency_item_name">{{item.name}}</div>
 
           </div>
         </div>

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;
       }