temp submit

ruoyi-ui/src/components/map/index.vue

@@ -347,11 +347,10 @@
             <!-- <div style="margin-top:75rem"><div></div><span class="line_font">支路</span></div> -->
     </div>
 
-    <div class="radio_div" style="display:none">
-          <el-checkbox-group v-model="checkList">
-              <el-checkbox label="热力图"></el-checkbox>
-              <el-checkbox label="设备"></el-checkbox>
-        </el-checkbox-group>
+    <div class="radio_div" style="max-width:44rem">
+          <el-radio-group v-model="caddr" :change="clickcg">
+              <el-radio v-for="item in addrlist" :key="item.name" :label="item.name"></el-radio>
+        </el-radio-group>
     </div>
  </div>
 </template>
@@ -397,31 +396,9 @@ export default {
       tabledatas:[],
 
       d_activeName:'d_first',
-       tableData: [{
-        date: '2016-05-02',
-        name: '南京四桥',
-        address: '上海市普陀区金沙江路 1518 弄',
-        value: 0.19,
-        count: 1.9,
-      }, {
-        date: '2016-05-04',
-        name: '南京四桥',
-        value: 0.1,
-        count: 1.3,
-        address: '上海市普陀区金沙江路 1517 弄'
-      }, {
-        date: '2016-05-01',
-        name: '南京四桥',
-        value: 0.2,
-        count: 2,
-        address: '上海市普陀区金沙江路 1519 弄'
-      }, {
-        date: '2016-05-03',
-        name: '南京四桥',
-        value: 0.08,
-        count: 0.6,
-        address: '上海市普陀区金沙江路 1516 弄'
-      }],
+       tableData: [],
+       addrlist:[{name:"南京四桥",location:[1,1]}],
+       caddr:"南京四桥",
        shipShow: false,
     };
   },
@@ -497,6 +474,15 @@ export default {
       //dd
 
     },
+    clickcg:(value)=>{
+      console.log(this.addrlist)
+
+    },
+    setaddrlist(list){
+      this.addrlist = list;
+      this.caddr = list[0].name;
+    },
+
      handleClick(tab, event) {
       console.log(tab, event);
     },
@@ -802,11 +788,10 @@ export default {
   position: absolute;
   top: 50rem;
   left: 120rem;
-  width: 40rem;
-  height: 30rem;
-  padding-top: 2rem;
+  padding-top: 4rem;
   padding-left: 5rem;
   background-color: white;
+  padding-right: 4rem;
 }
 .radio_div>div{
   line-height: 10rem;

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -252,10 +252,16 @@ export default {
   },
   methods: {
     getdeviceList() {
+      var dlist = [];
       getdeviceList().then(data => {
         console.log(data);
         var deviceList = [];
         for (var key in data.data) {
+          if(data.data[key]!=undefined && data.data[key].length>0){
+              dlist.push({name:key,location:JSON.parse("[["+data.data[key][0].latilongti+"]]")});
+              this.$refs.mapv.setaddrlist(dlist);
+          }
+
           for (var index in data.data[key]) {
             var obj = data.data[key][index]
             //  console.log(data.data[key][index].source);