Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/common/commonMap.vue

@@ -64,8 +64,8 @@
     methods: {
       // 初始化地图
       initMap() {
-        let self = this;
-        let center = new qq.maps.LatLng(self.latitude, self.longitude); // 默认坐标
+        let self = this
+        let center = new qq.maps.LatLng(self.latitude?self.latitude:39.961627, self.longitude?self.longitude:116.294625); // 默认坐标
         self.map = new qq.maps.Map(
           document.getElementById("container"), {
             center: center,

src/components/tradePavilion/BuildingManager.vue

@@ -52,7 +52,7 @@
               top: 1px;
             "></span>
         </div> -->
-        <!-- <div class="searchInput" style="width: 250px; margin-bottom: 10px">
+        <div class="searchInput" style="width: 250px; margin-bottom: 10px">
           <el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
             style="display: inline-block; width: 225px; height: 30px" @keyup.native="checkInteger(msg, 'MetroNum')"
             placeholder="地铁线路" v-model="msg.MetroNum" size="small" clearable>
@@ -75,7 +75,7 @@
               position: relative;
               top: 1px;
             "></span>
-        </div> -->
+        </div>
         <!-- <div class="searchInput" style="width: 200px; margin-bottom: 10px">
           <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable
             @change="(msg.pageIndex = 1), getList()" placeholder="请选择">
@@ -133,7 +133,7 @@
         </el-table-column>
         <el-table-column prop="OpenTime" width="180" label="开业时间">
         </el-table-column>
-        <el-table-column prop="ProjectType" label="项目分类">
+        <el-table-column prop="ProjectType" min-width="200" label="项目分类">
           <template slot-scope="scope">
             {{ scope.row.CategoryName }}
           </template>
@@ -151,7 +151,7 @@
         <el-table-column prop="SupportingFacilities" width="100" label="水电气及配套"></el-table-column>
         <el-table-column prop="ManagementCompany" width="100" label="管理公司及管理费"></el-table-column>
         <el-table-column prop="BrandDemand" width="200" label="目标招商业态及品牌需求"></el-table-column> -->
-        <el-table-column label="操作" width="100" fixed="right">
+        <el-table-column label="操作" width="100">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="修改" placement="top">
               <img @click="CommonJump('editVehicle', { ID: scope.row.ID,isCarrier:isCarrier?1:0 })"

src/components/tradePavilion/editVehicle.vue

@@ -437,7 +437,7 @@
           >
           </el-input>
         </el-form-item> -->
-        <!-- <el-form-item label="地铁信息">
+        <el-form-item label="地铁信息">
           <div
             v-for="(item, index) in MetroList"
             :key="index"
@@ -477,7 +477,7 @@
             icon="el-icon-plus"
             circle
           ></el-button>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="分类" prop="CategoryId">
           <el-select
             v-model="addMsg.CategoryId"
@@ -867,12 +867,12 @@ export default {
     baiduMap,
   },
   created() {
+    this.isCarrier = this.$route.query.isCarrier
+    this.addMsg.BuildingCarrierType = this.isCarrier?this.isCarrier:2
     if (this.$route.query.ID) {
       this.ID = this.$route.query.ID;
       this.getData();
     }
-    this.isCarrier = this.$route.query.isCarrier
-    this.addMsg.BuildingCarrierType = this.isCarrier?this.isCarrier:2
     this.getTypeEnumList();
     this.GetAuthenticationCategoryEnumList();
   },