Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_int/src/views/base/comp.vue

@@ -27,8 +27,8 @@
             </el-table-column>
             <el-table-column prop="relateCompanyList" :label="$t('basic.assProducer')" sortable>
                 <template slot-scope="scope">
-                    <span class="info" v-for="(item, index) in scope.row.relateCompanyList">
-                        {{item.companyName}}
+                    <span class="info" v-for="(item1, index) in scope.row.relateCompanyList" :key="index">
+                        <span v-if="item1 != null">{{item1.companyName}}</span>
                         <span v-if="index != scope.row.relateCompanyList.length-1">、</span>
                     </span>
                 </template>

ys_int/src/views/map/map.vue

@@ -276,10 +276,10 @@
                         _this.map.setZoomAndCenter(5, [105.205467, 34.907761]);
                     },
                     error => {
-                        _this.$message({
-                            message: error,
-                            type: "error"
-                        });
+                        // _this.$message({
+                        //     message: error,
+                        //     type: "error"
+                        // });
                     })
                 });
                 })
@@ -302,7 +302,6 @@
                 mapStyle: "amap://styles/8016abec658e1132508723183f848f14",
                 features: ['bg']
             });
-
             that.setMap();
         },
 	}

ys_int/src/views/project/staff.vue

@@ -320,7 +320,7 @@
 				this.listLoading = true;
                 this.http.post(this.port.project.userList, {
                     keyName: this.filters.keyName,
-                    currentPage: this.page,
+                    pageNum: this.page,
                     pageSize: this.size,
                     companyId: this.filters.companyId==''?-1:this.filters.companyId,
                     flag: this.filters.flag==this.$t('project.name')?0:this.filters.flag