遥控器后台

ruoyi-ui/src/views/base/addBase/blocks/detailDialog.vue

@@ -69,7 +69,7 @@ export default {
           prop: "repeatCode",
           label:'重发间隔(ms)',
           attrs: {
-            placeholder: "请输入重发间隔(ms)"
+            placeholder: "请输入重发间隔(ms),需大于500"
           },
         },
         {
@@ -77,7 +77,7 @@ export default {
           prop: "bootCode",
           label:'引导码',
           attrs: {
-            placeholder: "请输入引导码"
+            placeholder: "请输入引导码，例:260,1000"
           },
         },
         {
@@ -94,7 +94,7 @@ export default {
           prop: "synchronizeCode",
           label:'同步码',
           attrs: {
-            placeholder: "请输入同步码"
+            placeholder: "请输入同步码，例:260,12000"
           },
         },
         {
@@ -111,7 +111,7 @@ export default {
           prop: "addressCode",
           label:'地址码',
           attrs: {
-            placeholder: "请输入地址码"
+            placeholder: "请输入地址码,例:0x1700"
           },
         },
         // {
@@ -129,7 +129,7 @@ export default {
           prop: "overCode",
           label:'结束码',
           attrs: {
-            placeholder: "请输入结束码"
+            placeholder: "请输入结束码,例:260,1250"
           },
         },
         {
@@ -137,7 +137,7 @@ export default {
           prop: "dateBinary0",
           label:'数据二进制0',
           attrs: {
-            placeholder: "请输入数据二进制0"
+            placeholder: "请输入数据二进制0,例:260,1250"
           },
         },
         {
@@ -145,7 +145,7 @@ export default {
           prop: "dateBinary1",
           label:'数据二进制1',
           attrs: {
-            placeholder: "请输入数据二进制1"
+            placeholder: "请输入数据二进制1,例:260,2500"
           },
         },
         // {

ruoyi-ui/src/views/baseUser/userList/index.vue

@@ -2,7 +2,7 @@
  * @Author: 傅豪杰 18516149270@163.com
  * @Date: 2023-08-02 16:12:43
  * @LastEditors: 傅豪杰 18516149270@163.com
- * @LastEditTime: 2023-08-21 14:00:57
+ * @LastEditTime: 2023-08-23 14:34:35
  * @FilePath: /infrared_remote/admin_web/ruoyi-ui/src/views/baseUser/userList/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -19,18 +19,30 @@
     <div ref="map" style="width:100%;height:800px" />
    
 
-    <f-dialog ref="dialog" @opened="dialogInitData" :isCancel="false" destroy-on-close title="用户定位" width="80%">
+    <f-dialog ref="dialog" @opened="dialogInitData" :isCancel="false" destroy-on-close title="用户列表" width="80%">
       <template #contain>
         <tableList
           ref="table"
           :column="tableConfig"
-          :showOperation="false"
           :checkbox="false"
           :getList="handleGetList"
+          showOperation
+          operationWidth="100px"
         >
+          <template #default="scope">
+            <!-- 已生效只能看详情 -->
+            <f-btn type="text" @click="openMapDialog(scope.row)">查看定位</f-btn>
+          </template>
         </tableList> 
       </template>
     </f-dialog>
+
+
+    <f-dialog ref="mapDialog" @opened="mapDialogInitData" :isCancel="false" destroy-on-close title="用户定位" width="80%">
+      <template #contain>
+        <div id="map" style="width:100%;height:500px"></div>
+      </template>
+    </f-dialog>
   </div>
 </template>
 
@@ -51,7 +63,8 @@ export default {
             {'latitude': '经纬度',formatter:row=>row.latitude?row.longitude+','+row.latitude:'-'}
          ],
          rowData:{},
-         map:''
+         map:'',
+         mapData:{}
     }
   },
   methods: {
@@ -82,6 +95,11 @@ export default {
       this.$refs.dialog.show()
 
     },
+    // 打开百度地图弹窗
+    openMapDialog(row){
+      this.mapData = row
+      this.$refs.mapDialog.show()
+    },
     // 弹窗初始化
     async dialogInitData() {
       this.handleCurrentGetList()
@@ -143,6 +161,25 @@ export default {
 
       this.map.on('click',this.openDialog)
     },
+
+    // 地图数据初始化
+    async mapDialogInitData(){
+      const res = await baseUserApi.userAddress({
+        id:this.mapData.id
+      })
+      console.log(res)
+      let mapData = '上海市'
+
+      var map = new BMapGL.Map("map");
+      map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放
+      if(res.data) {
+        mapData = new BMapGL.Point(Number(res.data.longitude), Number(res.data.latitude))
+        let marker = new BMapGL.Marker(new BMapGL.Point(Number(res.data.longitude), Number(res.data.latitude)));
+        map.addOverlay(marker)
+      }
+      map.centerAndZoom(mapData, 12); // 初始化地图,设置中心点坐标和地图级别
+    }
+
   },
   mounted() {
     // this.handleCurrentGetList()

ruoyi-ui/src/views/template/addTemplate/blocks/config.js

@@ -107,7 +107,7 @@ const btnFormConfig = function(type) {
       prop: 'bandValue',
       label:'波段值',
       attrs: {
-        placeholder: '请输入波段值'
+        placeholder: "请输入波段值，默认38000"
       }
     },
     {
@@ -115,7 +115,7 @@ const btnFormConfig = function(type) {
       prop: 'repeatCode',
       label: '重发间隔(ms)',
       attrs: {
-        placeholder: '请输入重发间隔(ms)'
+        placeholder: "请输入重发间隔(ms),需大于500"
       }
     },
     {
@@ -123,7 +123,7 @@ const btnFormConfig = function(type) {
       prop: 'bootCode',
       label:'引导码',
       attrs: {
-        placeholder: '请输入引导码'
+        placeholder: "请输入引导码，例:260,1000"
       }
     },
     {
@@ -139,7 +139,7 @@ const btnFormConfig = function(type) {
       prop: "synchronizeCode",
       label:'同步码',
       attrs: {
-        placeholder: "请输入同步码"
+        placeholder: "请输入同步码，例:260,12000"
       },
     },
     {
@@ -156,7 +156,7 @@ const btnFormConfig = function(type) {
       prop: 'addressCode',
       label:'地址码',
       attrs: {
-        placeholder: '请输入地址码'
+        placeholder: "请输入地址码,例:0x1700"
       }
     },
     {
@@ -174,7 +174,7 @@ const btnFormConfig = function(type) {
       prop: 'overCode',
       label:'结束码',
       attrs: {
-        placeholder: '请输入结束码'
+        placeholder: "请输入结束码,例:260,1250"
       }
     },
     {
@@ -182,7 +182,7 @@ const btnFormConfig = function(type) {
       prop: "dateBinary0",
       label:'数据二进制0',
       attrs: {
-        placeholder: "请输入数据二进制0"
+        placeholder: "请输入数据二进制0,例:260,1250"
       },
     },
     {
@@ -190,7 +190,7 @@ const btnFormConfig = function(type) {
       prop: "dateBinary1",
       label:'数据二进制1',
       attrs: {
-        placeholder: "请输入数据二进制1"
+        placeholder: "请输入数据二进制1,例:260,2500"
       },
     },
     {