Merge branch 'master' of https://gitea.qinmian.online/dragon/dragon-web

src/api/system/fence.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询参数列表
+export function list() {
+  return request({
+    url: '/fence/fenceTag/list',
+    method: 'get'
+  })
+}

src/views/electronicFence/InsertFence.vue

@@ -1,33 +1,48 @@
 <template>
   <div>
 
+    <h2>电子围栏</h2>
     <el-table :data="tableData" style="width: 100%">
 
-      <el-table-column label="日期" width="180">
+      <el-table-column label="围栏标签主键id" width="180">
         <template slot-scope="scope">
           <i class="el-icon-time"></i>
-          <span style="margin-left: 10px">{{ scope.row.date }}</span>
+          <span style="margin-left: 10px">{{ scope.row.fenceTagId }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="日期" width="180">
+      <el-table-column label="围栏标签名称" width="180">
         <template slot-scope="scope">
           <i class="el-icon-time"></i>
-          <span style="margin-left: 10px">{{ scope.row.data}}</span>
+          <span style="margin-left: 10px">{{ scope.row.fenceTagName}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="日期" width="180">
+      <el-table-column label="创建人" width="180">
         <template slot-scope="scope">
           <i class="el-icon-time"></i>
-          <span style="margin-left: 10px">{{ scope.row.data }}</span>
+          <span style="margin-left: 10px">{{ scope.row.createdBy }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="日期" width="180">
+      <el-table-column label="创建时间" width="180">
         <template slot-scope="scope">
           <i class="el-icon-time"></i>
-          <span style="margin-left: 10px">{{scope.row.data}}</span>
+          <span style="margin-left: 10px">{{ scope.row.createdTime}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="更新人" width="180">
+        <template slot-scope="scope">
+          <i class="el-icon-time"></i>
+          <span style="margin-left: 10px">{{scope.row.updatedBy}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="更新时间" width="180">
+        <template slot-scope="scope">
+          <i class="el-icon-time"></i>
+          <span style="margin-left: 10px">{{scope.row.updatedTime}}</span>
         </template>
       </el-table-column>
 
@@ -39,8 +54,9 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
+import { list } from "@/api/system/fence";
 
-  export default {
+export default {
     //import引入的组件需要注入到对象中才能使用"
     components: {},
     props: {},
@@ -54,7 +70,8 @@
           status: null,
           alarmType: null,
           fenceTagId: null,
-        }
+        },
+        tableData:[],
       };
     },
     //计算属性 类似于data概念",
@@ -62,9 +79,17 @@
     //监控data中的数据变化",
     watch: {},
     //方法集合",
-    methods: {},
+    methods: {
+      FenceList() {
+        list().then(res => {
+          console.log(res.data.data)
+          this.tableData=res.data.data
+        })
+      },
+    },
     //生命周期 - 创建完成（可以访问当前this实例）",
     created() {
+      this.FenceList();
     },
     //生命周期 - 挂载完成（可以访问DOM元素）",
     mounted() {