Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/src/components/Map.vue

@@ -99,7 +99,7 @@
           </el-row>
           <el-divider></el-divider>
           <el-descriptions :column="1" size="small">
-            <el-descriptions-item label="站点编码">{{
+            <!-- <el-descriptions-item label="站点编码">{{
               info.siteCode
             }}</el-descriptions-item>
             <el-descriptions-item label="站点地址">{{
@@ -115,7 +115,7 @@
             </el-descriptions-item>
             <el-descriptions-item label="创建时间">{{
               formatterDate(info.createTime)
-            }}</el-descriptions-item>
+            }}</el-descriptions-item> -->
           </el-descriptions>
         </el-row></el-amap-info-window
       >
@@ -163,6 +163,7 @@ export default {
         this.center = [exData.extData.lng, exData.extData.lat]
         this.zoom = 8
         this.info = exData.extData;
+        console.log(this.info);
         this.window.position = exData.position;
         if(this.info.children && this.info.children.length>0){
           let children = JSON.parse(JSON.stringify(exData.extData.children))

device-manager-ui/admin/src/views/sitestat/mapDetail.vue

@@ -90,6 +90,7 @@
             class="addclass"
             size="mini"
             icon="el-icon-edit-outline"
+            @click="editSite"
             >编辑站点</el-button
           >
 
@@ -220,6 +221,11 @@ export default {
       this.query = Object.assign({}, this.query, { deviceName: val });
       this.getData();
     },
+    editSite(){
+      this.$confirm('请在基础设置系统修改站点信息','提示',{
+        showCancelButton: false, //是否显示取消按钮
+      })
+    },
     addDevice() {
       let row = {};
       row.siteId = this.info.siteId;