Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/iotc

ruoyi-ui-vue3/src/views/alarm/alarmmanager/index.vue

@@ -30,8 +30,8 @@
           </div>
         </div>
         <div>
-          <el-button type="primary" plain>重置</el-button>
-          <el-button type="primary">搜索</el-button>
+          <el-button type="primary" plain @click="initdata">重置</el-button>
+          <el-button type="primary" @click="searchdata">搜索</el-button>
         </div>
       </div>
     </el-card>
@@ -47,20 +47,12 @@
         <el-row>
           <el-col :span="24">
             <el-table :data="tabledata" border>
-              <el-table-column label="告警名称"></el-table-column>
-              <el-table-column label="告警值"></el-table-column>
-              <el-table-column label="告警设备"></el-table-column>
-              <el-table-column label="告警内容"></el-table-column>
-              <el-table-column label="处理人"></el-table-column>
-              <el-table-column label="处理方式"></el-table-column>
-              <el-table-column label="处理时间"></el-table-column>
-              <el-table-column label="状态"></el-table-column>
-              <el-table-column label="告警时间"></el-table-column>
+              <el-table-column v-for="item in cloumdata.filter(i=>i.visible)" :prop="item.prop" :label="item.label" ></el-table-column>
               <el-table-column label="操作">
                 <template #default="scope">
                   <div>
                     <el-button link>
-                      <el-tooltip effect="dark" content="编辑">
+                      <el-tooltip effect="dark" content="处理">
                         <el-icon>
                           <Edit />
                         </el-icon>
@@ -107,17 +99,79 @@
 <script setup lang="ts" name="Units">
 import {ref} from "vue";
 import {useRoute, useRouter} from "vue-router";
+import {listWarn,updateWarn,delWarn} from "@/api/data/warn"
 
 
 const route = useRoute();
 const router = useRouter();
 
+const tabledata = ref([])
 const searchform = ref({
   alarmname: '',
   alarmtime:['','']
 });
 
-const tabledata = ref([1])
+const currentdata = ref({
+     "id": 0,
+    "name": "",
+    "val": 0,
+    "equipmentId": 0,
+    "equipmentName": "",
+    "content": "",
+    "handler": "",
+    "handleWay": "",
+    "handleContent": "",
+    "handleTime": "",
+    "alarmTime": "",
+    "status": "",
+    "remark": "",
+})
+
+const initdata = ()=>{
+  searchform.value = {
+    alarmname: '',
+    alarmtime:['','']
+  }
+  pagedata.value = {
+    total:0,
+    size:10,
+    current:1
+  }
+}
+
+const cloumdata = ref([
+  {label: '告警名称', prop:'name',visible:true},
+  {label: '告警值', prop:'val',visible:true},
+  {label: '告警设备', prop:'equipmentName',visible:true},
+  {label: '告警内容', prop:'content',visible:true},
+  {label: '处理人', prop:'handler',visible:true},
+  {label: '处理方式', prop:'handleWay',visible:true},
+  {label: '处理时间', prop:'handleTime',visible:true},
+  {label: '状态', prop:'status',visible:true},
+  {label: '告警时间', prop:'alarmTime',visible:true},
+]);
+
+
+const pagedata = ref({
+  total:0,
+  size:10,
+  current:1
+});
+
+const getalldata = () => {
+  listWarn({...searchform.value,pageSize:pagedata.value.size,pageNum:pagedata.value.current}).then(res => {
+    const {rows,total,page} = res;
+    pagedata.value = {total:total,current:page, size:10};
+    tabledata.value = rows
+  })
+}
+getalldata()
+
+
+const searchdata= ()=>{
+  pagedata.value = {total:0,size:10,current:1};
+  getalldata();
+}
 
 
 </script>

ruoyi-ui-vue3/src/views/device/device/index.vue

@@ -83,7 +83,7 @@
 </template>
 
 <script setup lang="ts" name="Units">
-import { ref } from "vue";
+import {ref} from "vue";
 import {listEquipment} from "@/api/data/equipment"
 
 
@@ -101,7 +101,8 @@ const devicetabledata = ref([1]);
 
 const getalldata = ()=>{
   listEquipment({}).then((res) => {
-    devicetabledata.value = res.rows;
+    const {rows} = res;
+    devicetabledata.value = rows;
   });
 
 }

ruoyi-ui-vue3/src/views/gateway/modbusrtu/index.vue

@@ -20,7 +20,7 @@
         </div>
         <div>
           <el-button type="primary" plain @click="initdata">重置</el-button>
-          <el-button type="primary" @click="getalldata">搜索</el-button>
+          <el-button type="primary" @click="searchdata">搜索</el-button>
         </div>
       </div>
 
@@ -368,7 +368,7 @@ const cloumdata = ref([
   {label: 'API接口地址', prop:'apiUrl',visible:true},
   {label: 'UUID', prop:'uuid',visible:true},
   {label: '轮询时间(毫秒)', prop:'intervals',visible:true},
-  {label: '描述', prop:'remark',visible:true},
+  {label: '描述', prop:'protocolDesc',visible:true},
 ]);
 const ziduanshow = ref(false);
 
@@ -379,7 +379,7 @@ const pagedata = ref({
 });
 
 const getalldata = () => {
-  listModbusRtu(searchform.value).then(res => {
+  listModbusRtu({...searchform.value,pageSize:pagedata.value.size,pageNum:pagedata.value.current}).then(res => {
     const {rows,total,page,size} = res;
     pagedata.value = {total:total,current:page, size:10};
     tabledata.value = rows
@@ -390,6 +390,11 @@ const goadd = ()=>{
   router.push("/gateway/modbusrtu/add");
 }
 
+const searchdata= ()=>{
+  pagedata.value = {total:0,size:10,current:1};
+  getalldata();
+}
+
 
 </script>
 

ruoyi-ui-vue3/src/views/gateway/modbustcp/index.vue

@@ -20,7 +20,7 @@
         </div>
         <div>
           <el-button type="primary" plain @click="initdata">重置</el-button>
-          <el-button type="primary" @click="getalldata">搜索</el-button>
+          <el-button type="primary" @click="searchdata">搜索</el-button>
         </div>
       </div>
 
@@ -315,7 +315,7 @@ const cloumdata = ref([
   {label: 'API接口地址', prop:'apiUrl',visible:true},
   {label: 'UUID', prop:'uuid',visible:true},
   {label: '轮询时间(毫秒)', prop:'intervals',visible:true},
-  {label: '描述', prop:'remark',visible:true},
+  {label: '描述', prop:'protocolDesc',visible:true},
 ]);
 const pagedata = ref({
   total:0,
@@ -323,14 +323,17 @@ const pagedata = ref({
   current:1
 });
 const getalldata = () => {
-  listModbusTcp(searchform.value).then(res => {
+  listModbusTcp({...searchform.value,pageSize:pagedata.value.size,pageNum:pagedata.value.current}).then(res => {
     const {rows,total,page,size} = res;
     pagedata.value = {total:total,current:page, size:10};
     tabledata.value = rows
   })
 }
 getalldata()
-
+const searchdata= ()=>{
+  pagedata.value = {total:0,size:10,current:1};
+  getalldata();
+}
 
 
 </script>