楼宇 载体列表

index.html

@@ -13,4 +13,6 @@
 </body>
 
 </html>
-<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OV7BZ-ZT3HP-6W3DE-LKHM3-RSYRV-ULFZV"></script>
+<!-- <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OV7BZ-ZT3HP-6W3DE-LKHM3-RSYRV-ULFZV"></script> -->
\ No newline at end of file
+<script type="text/javascript" src="//api.map.baidu.com/api?key=&v=1.1&services=true&s=1"></script>
+<script type="text/javascript" src="https://api.map.baidu.com/getscript?v=2.0&ak=&services=&t=20240731110958"></script>

src/components/common/baiduMap.vue

+<style scoped>
+
+  .card {width: 100vm;
+  height: 320px;
+  border: 1px solid #F0EFEF;
+
+  border-radius: 8px;}
+  </style>
+  <template>
+    <div>
+      <el-form label-width="80px" size="small">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="地址搜索">
+              <el-input placeholder="请输入具体地址" clearable
+              @keyup.enter.native="getLocalSearch" v-model="mapKeyword">
+                <el-button @click="getLocalSearch" slot="append" icon="el-icon-search">
+                </el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="地址">
+              <el-select v-model="AddressId" filterable placeholder="请选择"
+              v-if="searchResults.length>0" @change="getAddress">
+                <el-option
+                  v-for="item in searchResults"
+                  :key="item.uid"
+                  :label="item.address"
+                  :value="item.uid">
+                </el-option>
+              </el-select>
+              <el-input disabled v-model="newAddress" v-else></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="经度">
+              <el-input disabled v-model="Lng">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="纬度">
+              <el-input disabled v-model="Lat">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="card" :id="`baidu-map`"></div>
+    </div>
+  </template>
+  <script>
+  export default {
+      props:[""],
+      data() {
+          return {
+              center:{
+                Lng: 116.294625,
+                Lat: 39.961627,
+              },
+              Lng: '',
+              Lat: '',
+              map: null,
+              mapKeyword: '',
+              newAddress: '',
+              AddressId: '',
+              searchResults: []
+          }
+      },
+    watch: {
+      mapKeyword:{
+        handler(newValue,onldValue) {
+          this.center.Address = newValue
+        },
+      }
+    },
+    created() {
+
+    },
+   mounted() {
+      this.createMap();
+      this.addMarker();
+        this.addLabel()
+    },
+    methods: {
+      getAddress(){
+        let list = this.searchResults.filter(x=>{
+          return x.uid==this.AddressId
+        })
+        console.log(list,'-----222222222')
+        this.newAddress = list[0].address
+      },
+      createMap() {
+        if (this.map) {
+          this.map.clearOverlays()
+        }
+        let map = new BMap.Map(`baidu-map`); // 创建地图实例
+        let point = new BMap.Point(this.center.Lng, this.center.Lat); // 创建点坐标
+        map.centerAndZoom(point, 15); // 初始化地图，设置中心点坐标和地图级别
+        map.enableScrollWheelZoom(true);
+        var marker = new BMap.Marker(point); //标记点
+        map.addOverlay(marker);
+        this.map = map;
+      },
+      addMarker() {
+          let icon = '';
+          var myIcon = new BMap.Icon(icon, new BMap.Size(23, 25), {
+            // 指定定位位置。
+            // 当标注显示在地图上时，其所指向的地理位置距离图标左上
+            // 角各偏移10像素和25像素。您可以看到在本例中该位置即是
+            // 图标中央下端的尖角位置。
+            anchor: new BMap.Size(10, 25),
+            // 设置图片偏移。
+            // 当您需要从一幅较大的图片中截取某部分作为标注图标时，您
+            // 需要指定大图的偏移位置，此做法与css sprites技术类似。
+            // imageOffset: new BMapGL.Size(0, 0 - 25)   // 设置图片偏移
+          });
+          let point = new BMap.Point(this.center.Lng, this.center.Lat); // 创建点坐标
+          // 创建标注对象并添加到地图
+          var marker = new BMap.Marker(point, { icon: myIcon });
+          this.map.addOverlay(marker);
+        },
+        addLabel() {
+          var point = new BMap.Point(this.center.Lng, this.center.Lat);
+          var content = this.center.Address;
+          var label = new BMap.Label(content, {
+            // 创建文本标注
+            position: point, // 设置标注的地理位置
+            offset: new BMap.Size(10, -60), // 设置标注的偏移量
+          });
+          this.map.addOverlay(label); // 将标注添加到地图中
+          label.addEventListener("click", function (e) {
+            // alert("您点击了标注");
+          });
+          label.setStyle({
+            // 设置label的样式
+            color: "#000",
+            fontSize: "18px",
+            border: "0 solid #1E90FF",
+            padding: '0 5px',
+            borderRadius: '3px',
+          });
+        },
+
+      getLocalSearch(){
+        if(this.mapKeyword!='') return
+        let that = this
+        let local =  new BMap.LocalSearch(that.map, {
+          renderOptions: {map: that.map, autoViewport: false},
+          onSearchComplete: (results) => {
+            if(results&&results.as&&results.as.length>0){
+              that.searchResults = results.as;
+              that.center.Lng = results.as[0].point.lng
+              that.center.Lat = results.as[0].point.lat
+              let map = new BMap.Map(`baidu-map`);
+              var point = new BMap.Point(that.center.Lng, that.center.Lat);
+              map.centerAndZoom(point, 15);
+              map.enableScrollWheelZoom(true)
+            }else{
+              console.error('地址搜索失败');
+            }
+         }
+        });
+        local.search(this.mapKeyword);
+        // var point = new BMap.Point(that.center.Lng, that.center.Lat);
+        // local.searchNearby(that.mapKeyword,'',0);
+      },
+
+    },
+  }
+  </script>

src/components/tradePavilion/BuildingManager.vue

@@ -14,7 +14,7 @@
 <template>
   <div class="VehicleManagement">
     <div class="head-title">
-      楼宇管理
+      {{isCarrier?'载体管理':'楼宇管理'}}
       <div>
         <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small" type="primary">
           批量导出
@@ -22,7 +22,7 @@
       </div>
       <div>
         <el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small"
-          @click="CommonJump('editVehicle')">新增楼宇</el-button>
+          @click="CommonJump('editVehicle',{isCarrier:isCarrier?1:0})">新增{{isCarrier?'载体':'楼宇'}}</el-button>
       </div>
     </div>
     <div class="content">
@@ -39,7 +39,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" placeholder="开发商" v-model="msg.Developers"
             size="small" clearable>
@@ -50,7 +50,7 @@
               position: relative;
               top: 1px;
             "></span>
-        </div>
+        </div> -->
         <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')"
@@ -75,28 +75,51 @@
               top: 1px;
             "></span>
         </div>
-        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+        <!-- <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="请选择">
             <el-option label="不限" :value="0"></el-option>
             <el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
             </el-option>
           </el-select>
+        </div> -->
+        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+          <el-select size="small" v-model="msg.QShopType" :filter-method="ChangeListName" filterable
+            @change="(msg.pageIndex = 1), getList()" placeholder="请选择首店类型">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in ShopTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
+        </div>
+        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+          <el-select size="small" v-model="msg.CategoryId" :filter-method="ChangeListName" filterable
+            @change="(msg.pageIndex = 1), getList()" placeholder="请选择分类">
+            <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
+            </el-option>
+          </el-select>
+        </div>
+        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+          <el-select size="small" v-model="msg.OpeningStatus" :filter-method="ChangeListName" filterable
+            @change="(msg.pageIndex = 1), getList()" placeholder="请选择开店状态">
+            <el-option v-for="item in OpeningList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
         </div>
         <el-date-picker class="indataPicker" type="daterange" v-model="dateStr" range-separator="至"
           start-placeholder="开业日期" end-placeholder="开业日期" size="small" @change="getList" value-format="yyyy-MM-dd">
         </el-date-picker>
+
       </div>
       <el-table :data="tableData" v-loading="loading" border style="width: 100%; margin: 20px 0">
         <el-table-column prop="CarrierName" width="200" label="项目名称">
         </el-table-column>
-        <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
+        <!-- <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
           <template slot-scope="scope">
             <div v-for="(item, index) in scope.row.CarrierMetroList" :key="index" class="CarrierList">
               <span>{{ item.MetroNum }}号线</span><span>{{ item.MetroName }}</span><span>{{ item.Distance }}</span>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="Logo" width="100" label="logo">
           <template slot-scope="scope">
             <el-image :src="scope.row.Logo" style="width: 50px" :preview-src-list="scope.row.LogoList">
@@ -109,21 +132,31 @@
         </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" label="项目分类">
           <template slot-scope="scope">
-            {{ getProject(scope.row.ProjectType) }}
+            {{ scope.row.CategoryName }}
           </template>
         </el-table-column>
-        <el-table-column prop="CarrierSize" label="商业体量"> </el-table-column>
+        <!-- <el-table-column prop="CarrierSize" label="商业体量"> </el-table-column> -->
         <el-table-column prop="LayersNum" width="150" label="商业层数"></el-table-column>
-        <el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
-        <el-table-column label="操作" width="100">
+        <!-- <el-table-column prop="UserName" width="100" label="认证用户"></el-table-column> -->
+
+        <!--
+        <el-table-column prop="PropertyComposition" width="100" label="物业构成"></el-table-column>
+        <el-table-column prop="Location" width="200" label="现状及发展定位"></el-table-column>
+        <el-table-column prop="Crowd" width="200" label="周边人群结构特征"></el-table-column>
+        <el-table-column prop="VisitorsFlowrate" width="100" label="人流量参数"></el-table-column>
+        <el-table-column prop="LayersNum" width="100" label="楼层及层高"></el-table-column>
+        <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">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="修改" placement="top">
-              <img @click="CommonJump('editVehicle', { ID: scope.row.ID })" src="../../assets/img/userman/edit.png"
+              <img @click="CommonJump('editVehicle', { ID: scope.row.ID,isCarrier:isCarrier?1:0 })" src="../../assets/img/userman/edit.png"
                 alt="" />
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-tooltip v-if="scope.row.IsChengDu==0" class="item" effect="dark" content="删除" placement="top">
               <img @click="delManage(scope.row)" src="../../assets/img/userman/del.png" alt="" />
             </el-tooltip>
           </template>
@@ -180,11 +213,15 @@
           CarrierName: "", //载体名称
           MetroNum: "", //地铁线路
           Developers: "", //开发商
-          StartOpenTime: "", //开业开始时间
-          EndOpenTime: "", //	开业截止时间
+          QStartDate: "", //开业开始时间
+          QEndDate: "", //	开业截止时间
           ExcelEnumIds: [],
           UserId: 0,
           RandomNum:0,//随机数
+          CategoryId: 0,//分类Id
+          BuildingCarrierType: 1,//(1-载体，2-楼宇)
+          OpeningStatus: -1,// 0-即将开业，1-已开业
+          QShopType: 0,//1-成都首店,2-宜宾商载通
         },
         usermsg: {
           pageIndex: 1,
@@ -211,6 +248,17 @@
         downLoadLoading: false, //导出Loading
         download_timer: null, //下载文件timer
         loadingText: "", //下载文件提示名称
+        isCarrier: true,
+        CategoryList:[],
+        ShopTypeList:[
+          {Name: '成都首店',Id:1},
+          {Name: '宜宾商载通',Id:2},
+        ],
+        OpeningList: [
+          {Name: '不限',Id:-1},
+          {Name: '即将开业',Id:0},
+          {Name: '已开业',Id:1},
+        ]
       };
     },
     created() {
@@ -218,7 +266,35 @@
       this.getTypeEnumList();
       this.getDown();
       this.getuserList()
-      console.log(this.$route.name)
+      this.isCarrier = this.$route.name=='BuildingServiceManager'
+      this.msg.BuildingCarrierType = this.isCarrier?1:2
+    },
+    watch: {
+      $route: {
+        handler(val, oldVal) {
+          this.getList();
+          this.getTypeEnumList();
+          this.isCarrier = val.name=='BuildingServiceManager'
+          this.msg = {
+            MetroName: "", //地铁站名称
+            pageIndex: 1,
+            pageSize: 15,
+            CarrierName: "", //载体名称
+            MetroNum: "", //地铁线路
+            Developers: "", //开发商
+            QStartDate: "", //开业开始时间
+            QEndDate: "", //	开业截止时间
+            ExcelEnumIds: [],
+            UserId: 0,
+            RandomNum:0,//随机数
+            CategoryId: 0,//分类Id
+            BuildingCarrierType: this.isCarrier?1:2,//(1-载体，2-楼宇)
+            OpeningStatus: -1,// 0-即将开业，1-已开业
+            QShopType: 0,//1-成都首店,2-宜宾商载通
+          }
+        },
+        deep: true,
+      },
     },
     methods: {
       ChangeListName(val) {
@@ -236,13 +312,13 @@
       getList() {
         this.loading = true;
         if (this.dateStr && this.dateStr.length > 0) {
-          this.msg.StartOpenTime = this.dateStr[0];
-          this.msg.EndOpenTime = this.dateStr[1];
+          this.msg.QStartDate = this.dateStr[0];
+          this.msg.QEndDate = this.dateStr[1];
         } else {
-          this.msg.StartOpenTime = "";
-          this.msg.EndOpenTime = "";
+          this.msg.QStartDate = "";
+          this.msg.QEndDate = "";
         }
-        this.apipost("/api/Trade/GetCarrierPageList", this.msg, (res) => {
+        this.apipost("/api/Trade/GetBuildingCarrierPage", this.msg, (res) => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
@@ -350,7 +426,7 @@
         let that = this;
         that.Confirm("是否删除?", function () {
           that.apipost(
-            "/api/Trade/RemoveCarrier", {
+            "/api/Trade/RemoveBuildingInfo", {
               CarrierId: obj.ID,
               Status: 1,
             },
@@ -376,6 +452,18 @@
             this.ProjectTypeList = res.data.data;
           }
         });
+        this.apipost("/api/Trade/GetBrandClassList", {
+          BrandCategory: this.isCarrier?1:2
+        }, (res) => {
+          if (res.data.resultCode == 1) {
+            this.CategoryList = res.data.data;
+            let obj = {
+              ClassName: "不限",
+              ID: 0,
+            };
+            this.CategoryList.unshift(obj);
+          }
+        });
       },
 
       //获取项目类型

src/components/tradePavilion/editVehicle.vue

@@ -2,11 +2,11 @@
   <div v-loading="pageloading" class="editVehicle">
     <div class="head-title">
       <span @click="CommonJump('VehicleManagement')" class="blue point"
-        >载体管理</span
+        >{{isCarrier?'载体':'楼宇'}}管理</span
       >
-      / 编辑载体
+      / 编辑{{isCarrier?'载体':'楼宇'}}
     </div>
-    <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
+    <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="170px">
       <el-card shadow="never" style="margin-top: 10px" class="box-card">
         <el-form-item label="项目名称" prop="CarrierName">
           <el-input
@@ -66,7 +66,7 @@
                   >
                   </el-image>
                   <el-button
-                    @click="ClearCarouse(index)"
+                    @click="type=2,ClearCarouse(index)"
                     class="delBtn"
                     type="danger"
                     icon="el-icon-close"
@@ -84,7 +84,7 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label="荣誉徽章">
+        <!-- <el-form-item label="荣誉徽章">
           <div class="nav_Main">
             <div class="nav_IconContent">
               <draggable v-model="addMsg.HonorList">
@@ -121,6 +121,44 @@
               + 添加图片
             </div>
           </div>
+        </el-form-item> -->
+        <el-form-item label="荣誉图">
+          <div class="nav_Main">
+            <div class="nav_IconContent">
+              <draggable v-model="addMsg.Honor">
+                <div
+                  v-for="(item, index) in addMsg.Honor"
+                  :key="index + '2'"
+                  style="
+                    margin-right: 20px;
+                    position: relative;
+                    display: inline-block;
+                  "
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="item"
+                    :preview-src-list="addMsg.Honor"
+                  >
+                  </el-image>
+                  <el-button
+                    @click="type=3,ClearCarouse(index)"
+                    class="delBtn"
+                    type="danger"
+                    icon="el-icon-close"
+                    circle
+                  >
+                  </el-button>
+                </div>
+              </draggable>
+            </div>
+            <div
+              @click="(choicImg = true), (type = 3)"
+              class="add-image-btn 2222"
+            >
+              + 添加图片
+            </div>
+          </div>
         </el-form-item>
         <el-form-item label="开发商" prop="Developers">
           <el-input
@@ -146,9 +184,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="">
+        <!-- <el-form-item label="" prop="">
           <div slot="label">
-            首店类型/数量
+            首店类型/数量 -->
             <!-- <el-tooltip
               class="item"
               effect="dark"
@@ -157,12 +195,12 @@
             >
               <i class="el-icon-plus" @click="addTypeAndNum"></i>
             </el-tooltip> -->
-          </div>
+          <!-- </div>
           <div
             style="width: 690px; display: flex; align-items: center"
             v-for="(item, index) in addMsg.FirstShopNumList"
             :key="index"
-          >
+          > -->
             <!-- <el-select
               v-model="item.Id"
               filterable
@@ -178,7 +216,7 @@
               >
               </el-option>
             </el-select> -->
-            <div
+            <!-- <div
               style="
                 width: 40%;
                 white-space: nowrap;
@@ -194,7 +232,7 @@
               v-model="item.Num"
               size="small"
               placeholder="首店数量"
-            ></el-input>
+            ></el-input> -->
             <!-- <el-tooltip
               class="item"
               effect="dark"
@@ -203,14 +241,14 @@
             >
               <i class="el-icon-delete" @click="delTypeAndNum(index)"></i>
             </el-tooltip> -->
-          </div>
-        </el-form-item>
-        <el-form-item label="载体视频">
+          <!-- </div>
+        </el-form-item> -->
+        <el-form-item :label="`${isCarrier?'载体':'楼宇'}视频`">
           <el-input
             v-model="addMsg.VideoUrl"
             style="width: 690px"
             size="small"
-            placeholder="请输入载体视频"
+            :placeholder="`请输入${isCarrier?'载体':'楼宇'}视频`"
           >
             <el-button @click="changeState1 = true" slot="append"
               >添加视频</el-button
@@ -256,7 +294,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="项目类型" prop="ProjectType">
+        <!-- <el-form-item label="项目类型" prop="ProjectType">
           <el-select
             style="width: 220px"
             v-model="addMsg.ProjectType"
@@ -271,8 +309,8 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="店铺数量" prop="ShopNum">
+        </el-form-item> -->
+        <!-- <el-form-item label="店铺数量" prop="ShopNum">
           <el-input
             v-model="addMsg.ShopNum"
             @keyup.native="checkInteger(addMsg, 'ShopNum')"
@@ -397,8 +435,8 @@
             placeholder="请输入首发、首秀、首展的招引优惠政策"
           >
           </el-input>
-        </el-form-item>
-        <el-form-item label="地铁信息">
+        </el-form-item> -->
+        <!-- <el-form-item label="地铁信息">
           <div
             v-for="(item, index) in MetroList"
             :key="index"
@@ -438,6 +476,113 @@
             icon="el-icon-plus"
             circle
           ></el-button>
+        </el-form-item> -->
+        <el-form-item label="分类" prop="CategoryId">
+          <el-select
+            v-model="addMsg.CategoryId"
+            size="small"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in CategoryList"
+              :key="item.ID"
+              :label="item.ClassName"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资产权属" prop="Ascription">
+          <el-input
+            v-model="addMsg.Ascription"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入资产权属"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="项目面积" prop="CarrierSize">
+          <el-input
+            v-model="addMsg.CarrierSize"
+            @keyup.native="checkPrice(addMsg, 'CarrierSize')"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入项目面积"
+          >
+            <template slot="append">㎡</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="物业构成" prop="PropertyComposition">
+          <el-input
+            v-model="addMsg.PropertyComposition"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入物业构成"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="项目发展及定位" prop="Location">
+          <el-input
+            v-model="addMsg.Location"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入项目发展及定位"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="周边人群结构特征" prop="Crowd">
+          <el-input
+            v-model="addMsg.Crowd"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入周边人群结构特征"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="人流量参数" prop="VisitorsFlowrate">
+          <el-input
+            v-model="addMsg.VisitorsFlowrate"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入人流量参数"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="商业楼层" prop="LayersNum">
+          <el-input
+            v-model="addMsg.LayersNum"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入商业楼层"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="水电气及配套" prop="SupportingFacilities">
+          <el-input
+            v-model="addMsg.SupportingFacilities"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入水电气及配套"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="管理公司及管理费" prop="ManagementCompany">
+          <el-input
+            v-model="addMsg.ManagementCompany"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入管理公司及管理费"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="目标招商业态及品牌需求" prop="BrandDemand">
+          <el-input
+            v-model="addMsg.BrandDemand"
+            style="width: 690px"
+            size="small"
+            placeholder="请输入目标招商业态及品牌需求"
+          >
+          </el-input>
         </el-form-item>
       </el-card>
     </el-form>
@@ -457,6 +602,7 @@
     <!-- 地图选址 -->
     <el-dialog title="地图展示" :visible.sync="isShowMap" width="960px">
       <commonMap @map-submit="mapEvent"></commonMap>
+      <!-- <baiduMap ></baiduMap> -->
     </el-dialog>
   </div>
 </template>
@@ -465,6 +611,7 @@
 import ChooseImg from "@/components/global/ChooseImg.vue";
 import Choosevideo from "@/components/global/Choosevideo.vue";
 import commonMap from "@/components/common/commonMap.vue";
+import baiduMap from "@/components/common/baiduMap.vue";
 import draggable from "vuedraggable";
 
 export default {
@@ -490,7 +637,7 @@ export default {
         ID: 0,
         CarrierName: "", //	载体名称
         Logo: "",
-        BannerList: [], //载体介绍图
+        // BannerList: [], //载体介绍图
         VideoUrl: "", //载体视频
         Address: "", //载体地址
         LatAndLon: "", //载体地址经纬度
@@ -513,7 +660,7 @@ export default {
           //   Num: 0,
           // },
         ],
-        HonorList: [], //载体荣誉
+        // HonorList: [], //载体荣誉
         Discount: "", //招引优惠政策
         StartingInfo: "", //首发政策
         FirstShow: "", //首秀政策
@@ -523,6 +670,20 @@ export default {
         AreaRequirement: "", //可租赁面积
         YeJi: "", //去年业绩
         OpeningStatus: -1,
+        BuildingCarrierType: 1,//(1-载体,2-楼宇)
+        CategoryId: 0,//分类
+        Ascription: '',//资产权属
+        CarrierSize: null,//项目面积
+        PropertyComposition: '',//物业构成
+        Location: '',//项目发展及定位
+        Crowd: '',//周边人群结构特征
+        VisitorsFlowrate: null,//人流量参数
+        LayersNum: null,//商业楼层
+        SupportingFacilities: '',//水电气及配套
+        ManagementCompany: null,//管理公司及管理费
+        BrandDemand: '',//目标招商业态及品牌需求
+        Banner: [],//介绍图
+        Honor: [],//荣誉图
       },
       OpeningStatusList: [
         {
@@ -623,6 +784,8 @@ export default {
       introImgList: [], //介绍图
       LogoList: [],
       shenList: [],
+      isCarrier: true,
+      CategoryList: []
     };
   },
   components: {
@@ -630,12 +793,15 @@ export default {
     Choosevideo,
     commonMap,
     draggable,
+    baiduMap,
   },
   created() {
     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();
   },
@@ -652,6 +818,18 @@ export default {
           this.ProjectTypeList.unshift(obj);
         }
       });
+      this.apipost("/api/Trade/GetBrandClassList", {
+        BrandCategory: this.isCarrier?1:2
+      }, (res) => {
+        if (res.data.resultCode == 1) {
+          this.CategoryList = res.data.data;
+          let obj = {
+            ClassName: "不限",
+            ID: 0,
+          };
+          this.CategoryList.unshift(obj);
+        }
+      });
     },
     //新增地铁信息
     addMetroList() {
@@ -686,13 +864,14 @@ export default {
           //   return;
           // }
           this.addMsg.CarrierMetroList = this.MetroList;
-          this.addMsg.BannerList = this.introImgList;
+          // this.addMsg.BannerList = this.introImgList;
+          this.addMsg.Banner = this.introImgList;
           this.apipost(
-            "/api/Trade/GetSetCarrier",
+            "/api/Trade/SetBuildingCarrier",
             this.addMsg,
             (res) => {
               if (res.data.resultCode === 1) {
-                this.CommonJump("VehicleManagement");
+                this.CommonJump(this.isCarrier?'BuildingServiceManager':'BuildingManager');
                 this.Success(res.data.message);
               } else {
                 this.Error(res.data.message);
@@ -709,7 +888,7 @@ export default {
     getData() {
       this.pageloading = true;
       this.apipost(
-        "/api/Trade/GetCarrierDetails",
+        "/api/Trade/GetBuildingCarrierInfo",
         {
           ID: this.ID,
         },
@@ -724,11 +903,17 @@ export default {
             ) {
               this.MetroList = res.data.data.CarrierMetroList;
             }
+            // if (
+            //   res.data.data.BannerList &&
+            //   res.data.data.BannerList.length > 0
+            // ) {
+            //   this.introImgList = res.data.data.BannerList;
+            // }
             if (
-              res.data.data.BannerList &&
-              res.data.data.BannerList.length > 0
+              res.data.data.Banner &&
+              res.data.data.Banner.length > 0
             ) {
-              this.introImgList = res.data.data.BannerList;
+              this.introImgList = res.data.data.Banner;
             }
             if (res.data.data.OpenTime) {
               this.addMsg.OpenTime = this.addMsg.OpenTime.replace("T", " ");
@@ -750,7 +935,8 @@ export default {
         this.introImgList.push(msg.url);
       }
       if (this.type == 3) {
-        this.addMsg.HonorList.push(msg.url);
+        // this.addMsg.HonorList.push(msg.url);
+        this.addMsg.Honor.push(msg.url);
       }
       this.choicImg = false;
     },
@@ -759,7 +945,8 @@ export default {
         this.introImgList.splice(index, 1);
       }
       if (this.type == 3) {
-        this.addMsg.HonorList.splice(index, 1);
+        // this.addMsg.HonorList.splice(index, 1);
+        this.addMsg.Honor.splice(index, 1);
       }
     },
     Selectvideo(val) {
@@ -780,7 +967,7 @@ export default {
         (res) => {
           if (res.data.resultCode == 1) {
             this.shenList = res.data.data;
-            if (this.addMsg.FirstShopNumList.length === 0) {
+            if (this.addMsg.FirstShopNumList&&this.addMsg.FirstShopNumList.length === 0) {
               this.shenList.map((e) => {
                 let obj = {
                   Id: e.Id,