feat:围栏，围栏组，高德

src/views/amap/tool/index.vue

@@ -17,15 +17,17 @@
         <el-form-item label="围栏备注" prop="fenceDescription">
           <el-input v-model="form.fenceDescription" placeholder="请输入围栏备注" />
         </el-form-item>
-        <el-form-item label="围栏猪ID" prop="fenceDescription">
+        <el-form-item label="围栏组">
-          <el-input v-model="form.groupId" placeholder="请输入围栏猪ID" />
+          <el-select v-model="form.groupId" placeholder="请选择围栏组">
+            <el-option v-for="item in groupList" :key="item.id" :label="item.groupName" :value="item.id" ></el-option>
+          </el-select>
         </el-form-item>
 <!--        <el-form-item label="是否删除 0 不删除 1删除" prop="isDelete">-->
 <!--          <el-input v-model="form.isDelete" placeholder="请输入是否删除 0 不删除 1删除" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="围栏状态" prop="fenceState">
+<!--        <el-form-item label="围栏状态" prop="fenceState">-->
-          <el-input v-model="form.fenceState" placeholder="请输入围栏状态" />
+<!--          <el-input v-model="form.fenceState" placeholder="请输入围栏状态" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -39,6 +41,7 @@
 
 <script>
 import {addFence} from "@/api/fence/fence";
+import {listGroup} from "@/api/group/group";
 
 export default {
   name: 'amapFence',
@@ -56,7 +59,8 @@ export default {
       open: false,
       path: [], // 当前绘制的多边形经纬度数组
       polygonItem: [], // 地图上绘制的所有多边形对象
-      polyEditors: [] ,// 所有编辑对象数组
+      polyEditors: [] ,
+      groupList :[],// 所有编辑对象数组
       reset() {
         this.form = {
           id: null,
@@ -79,7 +83,11 @@ export default {
   props: {
     paths: {} // 编辑
   },
+  created() {
+    this.listGroup();
+  },
   mounted () {
+
     this.intAmap(() => {
       if (this.paths) {
         this.editRectangle(this.paths);
@@ -182,6 +190,11 @@ export default {
         console.log(polygon, '------polygon-----');
       });
     },
+    listGroup() {
+      listGroup(this.queryParams).then(res=>{
+        this.groupList=res.data.rows
+      })
+    },
     // 批量删除多边形
     deleRectangle () {
       // 取消编辑状态
@@ -196,9 +209,9 @@ export default {
       this.title = "添加围栏";
     },
     addRectangle(){
-
       this.form.path=this.path
-      console.log(this.fDorm)
+      console.log(this.form)
+
       addFence(this.form).then(res=>{
         console.log(res)
       })
@@ -207,6 +220,7 @@ export default {
         v.close();
       });
       this.map.clearMap();
+      this.open=false
     }
   }
 }

src/views/business/busin/index.vue

@@ -254,6 +254,11 @@
         <el-form-item label="企业邮箱" prop="businessEmail">
           <el-input v-model="form.businessEmail" placeholder="请输入企业邮箱" />
         </el-form-item>
+        <el-form-item label="围栏组">
+          <el-select v-model="form.groupId" placeholder="请选择围栏组">
+            <el-option v-for="item in groupList" :key="item.id" :label="item.groupName" :value="item.id" ></el-option>
+          </el-select>
+        </el-form-item>
 <!--        <el-form-item label="企业状态" prop="businessStates">-->
 <!--          <el-input v-model="form.businessStates" placeholder="请输入企业状态" />-->
 <!--        </el-form-item>-->
@@ -285,6 +290,7 @@
 
 <script>
 import { listBusiness, getBusiness, delBusiness, addBusiness, updateBusiness } from "@/api/busin/business";
+import {listGroup} from "@/api/group/group";
 
 export default {
   name: "Business",
@@ -332,6 +338,7 @@ export default {
       form: {
         "businessStates": "",
       },
+      groupList:[],
       // 表单校验
       rules: {
       }
@@ -339,8 +346,14 @@ export default {
   },
   created() {
     this.getList();
+    this.listGroup()
   },
   methods: {
+    listGroup(){
+      listGroup(this.queryParams).then(res=>{
+        this.groupList=res.data.rows
+      })
+    },
     /** 查询企业列表 */
     getList() {
       this.loading = true;

src/views/fen/fence/index.vue

@@ -105,13 +105,13 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-<!--          <el-button-->
+          <el-button
-<!--            size="mini"-->
+            size="mini"
-<!--            type="text"-->
+            type="text"
-<!--            icon="el-icon-edit"-->
+            icon="el-icon-edit"
-<!--            @click="handleUpdate(scope.row)"-->
+            @click="handleUpdate(scope.row)"
-<!--            v-hasPermi="['system:fence:edit']"-->
+            v-hasPermi="['system:fence:edit']"
-<!--          >修改</el-button>-->
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -137,18 +137,23 @@
         <el-form-item label="围栏名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入围栏名称" />
         </el-form-item>
+        <el-form-item label="围栏组">
+          <el-select v-model="form.groupId" placeholder="请选择围栏组">
+            <el-option v-for="item in groupList" :key="item.id" :label="item.groupName" :value="item.id" ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="围栏经纬" prop="fenceLongitudeLatitude">
-          <el-input v-model="form.fenceLongitudeLatitude" placeholder="请输入围栏经纬" />
+          <el-input v-model="form.fenceLongitudeLatitude" readonly placeholder="请输入围栏经纬" />
         </el-form-item>
         <el-form-item label="围栏备注" prop="fenceDescription">
           <el-input v-model="form.fenceDescription" placeholder="请输入围栏备注" />
         </el-form-item>
-        <el-form-item label="是否删除 0 不删除 1删除" prop="isDelete">
+<!--        <el-form-item label="是否删除 0 不删除 1删除" prop="isDelete">-->
-          <el-input v-model="form.isDelete" placeholder="请输入是否删除 0 不删除 1删除" />
+<!--          <el-input v-model="form.isDelete" placeholder="请输入是否删除 0 不删除 1删除" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="围栏状态" prop="fenceState">
+<!--        <el-form-item label="围栏状态" prop="fenceState">-->
-          <el-input v-model="form.fenceState" placeholder="请输入围栏状态" />
+<!--          <el-input v-model="form.fenceState" placeholder="请输入围栏状态" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -163,6 +168,7 @@
 
 <script>
 import { listFence, getFence, delFence, addFence, updateFence } from "@/api/fence/fence";
+import {listGroup} from "@/api/group/group";
 
 export default {
   name: "Fence",
@@ -198,15 +204,24 @@ export default {
       },
       // 表单参数
       form: {},
+      // 围栏组表格数据
+      groupList: [],
       // 表单校验
       rules: {
       }
+
     };
   },
   created() {
     this.getList();
+    this.listGroup();
   },
   methods: {
+    listGroup(){
+      listGroup(this.queryParams).then(res=>{
+        this.groupList=res.data.rows
+      })
+    },
     /** 查询围栏列表 */
     getList() {
       this.loading = true;
@@ -272,6 +287,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {

src/views/vehicle/veh/index.vue

@@ -170,8 +170,10 @@
         <el-form-item label="电子围栏ID" prop="electonicId">
           <el-input v-model="form.electonicId" placeholder="请输入电子围栏ID" />
         </el-form-item>
-        <el-form-item label="围栏组ID" prop="electonicId">
+        <el-form-item label="围栏组">
-          <el-input v-model="form.groupId" placeholder="请输入围栏组ID" />
+          <el-select v-model="form.groupId" placeholder="请选择围栏组">
+            <el-option v-for="item in groupList" :key="item.id" :label="item.groupName" :value="item.id" ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="电机厂商" prop="motor">
           <el-input v-model="form.motor" placeholder="请输入电机厂商" />
@@ -202,6 +204,7 @@
 
 <script>
 import { listVehicle, getVehicle, delVehicle, addVehicle, updateVehicle } from "@/api/vehicle/vehicle";
+import {listGroup} from "@/api/group/group";
 
 export default {
   name: "Vehicle",
@@ -241,6 +244,7 @@ export default {
       },
       // 表单参数
       form: {},
+      groupList: [],
       // 表单校验
       rules: {
       }
@@ -248,8 +252,14 @@ export default {
   },
   created() {
     this.getList();
+    this.listGroup();
   },
   methods: {
+    listGroup(){
+      listGroup(this.queryParams).then(res=>{
+        this.groupList=res.data.rows
+      })
+    },
     /** 查询车辆录入列表 */
     getList() {
       this.loading = true;