Merge branch 'master' into test

.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/views/modules/base/community/buildTable.vue

@@ -590,12 +590,12 @@ export default {
           if (data.code === 0 && data.msg == 'success') {
             // this.$message.success('导入成功')
           } else {
-            this.$message({
+            // this.$message({
-              showClose: true,
+            //   showClose: true,
-              message: rspMsg,
+            //   message: rspMsg,
-              duration: 0,
+            //   duration: 0,
-              type: "error"
+            //   type: "error"
-            })
+            // })
             // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')

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

@@ -624,12 +624,12 @@ export default {
           if (data.code === 0 && data.msg == 'success') {
             // this.$message.success('导入成功')
           } else {
-            this.$message({
+            // this.$message({
-              showClose: true,
+            //   showClose: true,
-              message: rspMsg,
+            //   message: rspMsg,
-              duration: 0,
+            //   duration: 0,
-              type: "error"
+            //   type: "error"
-            })
+            // })
             // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')

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

@@ -553,12 +553,12 @@ export default {
           if (data.code === 0 && data.msg == 'success') {
             // this.$message.success('导入成功')
           } else {
-            this.$message({
+            // this.$message({
-              showClose: true,
+            //   showClose: true,
-              message: rspMsg,
+            //   message: rspMsg,
-              duration: 0,
+            //   duration: 0,
-              type: "error"
+            //   type: "error"
-            })
+            // })
             // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')

src/views/modules/shequ/index.vue

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