158分站操作记录提交

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -108,7 +108,7 @@ function getMonitor(flag?) {
         timer = null;
       }
       getMonitor(false);
-    }, 1000)
+    }, flag ? 0 : 1000)
 }
 //返回首页
 function getBack() {

src/views/vent/safetyList/common/detail.vue

@@ -174,7 +174,8 @@
           <!-- <a-button preIcon="ant-design:sync-outlined" @click="visibleModalEdit1 = true">重置</a-button> -->
           <a-table size="small" :scroll="{ y: 710 }" :columns="columnsDetail" :data-source="tableData1">
             <template #action="{ record }">
-              <a-button  v-if="hasPermission('operateRecord:return')" type="primary" size="small" @click="handleEdit(record)">编辑</a-button>
+              <a-button v-if="hasPermission('operateRecord:return')" type="primary" size="small"
+                @click="handleEdit(record)">编辑</a-button>
             </template>
             <template #bodyCell="{ column, text }"></template>
           </a-table>
@@ -336,7 +337,7 @@
         </div>
         <!-- 操作记录 -->
         <div class="detail-content" v-if="activeKey == 'operationRecord'">
-          <operateRecord></operateRecord>
+          <operateRecord :operationData="operationData" @getSearchRecord="getSearchRecord"></operateRecord>
         </div>
       </div>
     </div>
@@ -358,7 +359,8 @@ import {
   set158StationData,
   get158StationDevices,
   set158StationRead,
-  remove158Substation
+  remove158Substation,
+  get158SetLog
 } from '../safetyList.api';
 import { historyColumns } from '../historyLsit.data';
 import { columnsDetail, columns } from '../safetyList.data';
@@ -468,7 +470,7 @@ let stationId = ref('');
 const scroll = reactive({
   y: 680,
 });
-
+let operationData = ref<any[]>([])//操作记录列表
 //定时刷新左侧分站数据
 let timer: null | NodeJS.Timeout = null;
 function getMonitor(flag = false) {
@@ -528,11 +530,11 @@ async function onChangeTab(tab) {
     await getSubStationList();
     await getStationList();
     getMonitor()
-  } else if(activeKey.value == 'manageAuto') {
+  } else if (activeKey.value == 'manageAuto') {
     await getStationList();
     getMonitor1();
-  }else if(activeKey.value == 'operationRecord'){
-
+  } else if (activeKey.value == 'operationRecord') {
+    await getSearchRecord({ stationId: '', deviceId: '' })
   }
 }
 
@@ -989,6 +991,14 @@ async function handleDelStation() {
 }
 //取消删除左侧分站
 function handleCancelDelStation() { }
+
+//操作记录查询
+async function getSearchRecord(param) {
+  let res = await get158SetLog({ ...param })
+  if (res && res.length != 0) {
+    operationData.value = res.records
+  }
+}
 onMounted(async () => {
   await getSubStationList();
   await getStationList1();
@@ -1385,12 +1395,14 @@ onUnmounted(() => {
     }
   }
 }
+
 .down-btn {
   line-height: 15px;
   height: 20px;
   padding: 0px 17px;
   font-size: 12px;
 }
+
 .zxm-form {
   width: 50%;
   height: 100%;
@@ -1423,14 +1435,14 @@ onUnmounted(() => {
 
 // ::v-deep(.zxm-form-item-label > label) {
 //   color: #fff !important;
-// }
-</style>
+// }</style>
 <style>
 div[aria-hidden='true'] {
   display: none !important;
 }
 </style>
-// <style lang="less" scoped>
+//
+<style lang="less" scoped>
 // .search-area {
 //   width: 100%;
 //   padding: 5px;

src/views/vent/safetyList/common/operateRecord.vue

@@ -2,37 +2,40 @@
     <div class="operateRecord">
         <div class="search-content">
             <a-row>
-                <a-col :span="4">
+                <!-- <a-col :span="4">
                     <div class="area-item">
                         <div class="item-text">填报日期：</div>
                         <a-date-picker style="width: 220px" :showTime="false" valueFormat="YYYY-MM-DD"
                             v-model:value="searchData.reportTime" placeholder="请选择填报日期" />
                     </div>
-                </a-col>
+                </a-col> -->
                 <a-col :span="4">
                     <div class="area-item">
-                        <div class="item-text">上报地点：</div>
-                        <a-select v-model:value="searchData.strInstallPos" style="width: 220px" placeholder="请选择上报地点">
-                            <a-select-option v-for="item in addressList" :key="item" :value="item.value">{{ item.label
+                        <div class="item-text">所选分站：</div>
+                        <a-select v-model:value="searchData.stationId" style="width: 220px" placeholder="请选择分站">
+                            <a-select-option v-for="(item, index) in stationList" :key="index" :value="item.value">{{
+                                item.label
                                 }}</a-select-option>
                         </a-select>
                     </div>
                 </a-col>
                 <a-col :span="4">
                     <div class="area-item">
-                        <div class="item-text">上报地点：</div>
-                        <a-select v-model:value="searchData.strInstallPos" style="width: 220px" placeholder="请选择上报地点">
-                            <a-select-option v-for="item in addressList" :key="item" :value="item.value">{{ item.label
+                        <div class="item-text">所选设备：</div>
+                        <a-select v-model:value="searchData.deviceId" style="width: 220px" placeholder="请选择设备">
+                            <a-select-option v-for="(item, index) in deviceList" :key="index" :value="item.value">{{
+                                item.label
                                 }}</a-select-option>
                         </a-select>
                     </div>
                 </a-col>
 
-                <a-button type="primary" preIcon="ant-design:search-outlined">查询</a-button>
-                <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="getSearchRecord">查询</a-button>
+                <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px"
+                    @click="getResetRecord">重置</a-button>
             </a-row>
         </div>
-        <a-table size="small" :scroll="{ y: 710 }" :columns="columnsDetail" :data-source="tableData">
+        <a-table size="small" :scroll="{ y: 710 }" :columns="columnsOperate" :data-source="tableData">
             <!-- <template #action="{ record }">
                 <a-button type="primary" size="small" @click="handleEdit(record)">编辑</a-button>
             </template> -->
@@ -42,18 +45,74 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { columnsDetail } from '../safetyList.data';
+import { ref, reactive,watch, onMounted } from 'vue'
+import { columnsOperate } from '../safetyList.data';
+import { subStationList, get158StationDevices } from '../safetyList.api'
 
+let props=defineProps({
+    operationData:{
+        type:Array,
+        default:()=>{
+            return []
+        }
+    }
+})
 //操作记录
 let searchData = reactive({
-    reportTime: '',
-    sbr: '',
-    strInstallPos: '',
+    stationId: '',
+    deviceId: '',
 })
-let addressList = ref<any[]>([])
+let stationList = ref<any[]>([])
+let deviceList = ref<any[]>([])
 
-let tableData = ref<[]>([])
+let tableData = ref<any[]>([])
+let $emit = defineEmits(['getSearchRecord'])
+
+//获取分站信息
+async function getSubStationList() {
+    let res = await subStationList({ strtype: 'modbus' });
+    if (res.length != 0) {
+        stationList.value = res.map(el => {
+            return {
+                label: el.strname,
+                value: el.id,
+            }
+        })
+    }
+}
+//获取设备信息
+async function get158StationDevicesList() {
+    let res = await get158StationDevices({ stationId: searchData.stationId });
+    console.log(res, '分站下设备下拉选项-------------');
+    if (res && res.length != 0) {
+        deviceList.value = res.map(el => {
+            return {
+                label: el.strinstallpos,
+                value: el.id,
+            }
+        })
+    }
+}
+//查询
+function getSearchRecord() {
+    $emit('getSearchRecord', searchData)
+}
+//重置
+function getResetRecord() {
+    searchData.deviceId = ''
+    searchData.stationId = ''
+    $emit('getSearchRecord', searchData)
+}
+
+watch(()=>props.operationData,(newO,oldO)=>{
+    tableData.value=newO || []
+})
+onMounted(() => {
+    //获取分站列表
+    getSubStationList()
+    //获取设备列表
+    get158StationDevicesList()
+})
 </script>
 
 <style lang="less" scoped>

src/views/vent/safetyList/safetyList.api.ts

@@ -11,7 +11,8 @@ enum Api {
   set158StationData = '/safety/ventanalyDeviceInfo/set158StationData',
   get158StationDevices = '/safety/ventanalyDeviceInfo/get158StationDevices',
   set158StationRead = '/safety/ventanalyDeviceInfo/set158StationRead',
-  remove158Substation='/safety/ventanalyDeviceInfo/remove158Substation'//删除158分站及其关联传感器
+  remove158Substation='/safety/ventanalyDeviceInfo/remove158Substation',//删除158分站及其关联传感器
+  get158SetLog='/safety/ventanalySubStation/get158SetLog',//操作记录
 }
 
 // 分站查询接口
@@ -38,3 +39,5 @@ export const get158StationDevices = (params) => defHttp.post({ url: Api.get158St
 export const set158StationRead = (params) => defHttp.post({ url: Api.set158StationRead, params }, { joinParamsToUrl: true });
 //删除158分站及其关联传感器
 export const remove158Substation = (params) => defHttp.post({ url: Api.remove158Substation, params }, { joinParamsToUrl: true });
+//158分站操作记录
+export const get158SetLog = (params) => defHttp.post({ url: Api.get158SetLog,params });

src/views/vent/safetyList/safetyList.data.ts

@@ -177,3 +177,56 @@ export const columnsDetail: BasicColumn[] = [
     slots: { customRender: 'action' },
   },
 ];
+
+export const columnsOperate: BasicColumn[] = [
+  {
+    title: '分站名称',
+    dataIndex: 'stationName',
+    key: 'stationName',
+    align: 'center',
+  },
+  {
+    title: '设备名称',
+    dataIndex: 'deviceName',
+    key: 'deviceName',
+    align: 'center',
+  },
+  {
+    title: '点位Key',
+    dataIndex: 'plcCode',
+    key: 'plcCode',
+    align: 'center',
+  },
+  {
+    title: '点位名称',
+    dataIndex: 'plcCodeName',
+    key: 'plcCodeName',
+    align: 'center',
+  },
+  {
+    title: '下发值',
+    dataIndex: 'value',
+    key: 'value',
+    align: 'center',
+  },
+  {
+    title: '操作结果',
+    dataIndex: 'resultValue',
+    key: 'resultValue',
+    align: 'center',
+  },
+  {
+    title: '描述',
+    dataIndex: 'remark',
+    key: 'remark',
+    align: 'center',
+  },
+  {
+    title: '操作时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+  },
+
+];
+