Merge remote-tracking branch 'origin/master'

src/views/enterprise/enterprise/index.vue

@@ -192,7 +192,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="EnterpriseUpdate(scope.row)"
+            @click="EnterpriseUpdate(scope.row)" v-if="scope.row.examineStatus==0"
           >认证</el-button>
           <el-button
             size="mini"

src/views/fence/map/index.vue

@@ -138,6 +138,6 @@ export default {
 <style lang="scss" scoped>
 #amapContainer {
   height: 800px;
-  width: 1000px;
+  width: 5000px;
 }
 </style>

src/views/tool/gen/editTable.vue

@@ -183,6 +183,7 @@ export default {
       const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
       const genForm = this.$refs.genInfo.$refs.genInfoForm;
       Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
+        console.log("res:{}",res)
         const validateResult = res.data.every(item => !!item);
         if (validateResult) {
           const genTable = Object.assign({}, basicForm.model, genForm.model);