Administrator
/
FenXiNspBackControl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端逻辑调整

This commit is contained in:
zhangyue 2026-05-27 16:36:37 +08:00
parent 81a3070b26
commit fea20ad408
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/appmana/deploy/SurvDeviceDeploy.api.ts
View File

@ -5,24 +5,25 @@ const { createConfirm } = useMessage();
enum Api { enum Api {
list = '/appmana/survDeviceDeploy/list', list = '/appmana/survDeviceDeploy/list',
save='/appmana/survDeviceDeploy/add', save = '/appmana/survDeviceDeploy/add',
edit='/appmana/survDeviceDeploy/edit', edit = '/appmana/survDeviceDeploy/edit',
deleteOne = '/appmana/survDeviceDeploy/delete', deleteOne = '/appmana/survDeviceDeploy/delete',
deleteBatch = '/appmana/survDeviceDeploy/deleteBatch', deleteBatch = '/appmana/survDeviceDeploy/deleteBatch',
importExcel = '/appmana/survDeviceDeploy/importExcel', importExcel = '/appmana/survDeviceDeploy/importExcel',
exportXls = '/appmana/survDeviceDeploy/exportXls', exportXls = '/appmana/survDeviceDeploy/exportXls',
getYsToken = '/appmana/bigScreen/stationInfoWithCamera', getYsToken = '/appmana/bigScreen/stationInfoWithCamera',
getValveStatus = '/appmana/survDeviceDeploy/getValveStatus', getValveStatus = '/appmana/survDeviceDeploy/getValveStatus',
sendDeviceCmd= '/appmana/survDeviceDeploy/sendDeviceCmd', sendDeviceCmd = '/appmana/survDeviceDeploy/sendDeviceCmd',
initDevice = '/appmana/survDeviceDeploy/initDevice', initDevice = '/appmana/survDeviceDeploy/initDevice',
getDeviceData='/appmana/fDictDeviceDetail/getDeviceData', getDeviceData = '/appmana/fDictDeviceDetail/getDeviceData',
getCamraInfo = '/appmana/survDeviceDeploy/stationInfoWithCamera', getCamraInfo = '/appmana/survDeviceDeploy/stationInfoWithCamera',
cameraStartApi = '/appmana/survDeviceDeploy/cameraStart', cameraStartApi = '/appmana/survDeviceDeploy/cameraStart',
cameraStopApi = '/appmana/survDeviceDeploy/cameraStop', cameraStopApi = '/appmana/survDeviceDeploy/cameraStop',
getDeviceCateList = '/appmana/fDictDeviceCate/getDeviceCateList', getDeviceCateList = '/appmana/fDictDeviceCate/getDeviceCateList',
getDeviceList='/appmana/survDeviceDeploy/getDeviceList', getDeviceList = '/appmana/survDeviceDeploy/getDeviceList',
syncRelays = '/api/farm/fDeviceDeployRelay/syncRelays', syncRelays = '/api/farm/fDeviceDeployRelay/syncRelays',
getRelayList = '/appmana/survDeviceDeploy/getRelayList', getRelayList = '/appmana/survDeviceDeploy/getRelayList',
queryRelay = '/appmana/survDeviceDeploy/queryRelay',
} }
/** /**
@ -211,3 +212,14 @@ export const relaySync = (params, handleSuccess) => {
export const getRelayList = (params) => { export const getRelayList = (params) => {
return defHttp.get({ url: Api.getRelayList,params}, { isTransformResponse: false }); return defHttp.get({ url: Api.getRelayList,params}, { isTransformResponse: false });
} }
/**
* 查询所有继电器
* @param params
* @param isUpdate
*/
export const sendRelayQuery = (params) => {
return defHttp.get({ url: Api.queryRelay, params }, { isTransformResponse: false });
}

11
src/views/appmana/deploy/components/ControlModal.vue
View File

@ -61,7 +61,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, onUnmounted, ref, reactive, nextTick, defineExpose } from 'vue'; import { onMounted, onUnmounted, ref, reactive, nextTick, defineExpose } from 'vue';
import type { UnwrapRef } from 'vue'; import type { UnwrapRef } from 'vue';
import { getValveStatus, sendDeviceCmd, getRelayList } from '../SurvDeviceDeploy.api'; import { getValveStatus, sendDeviceCmd, getRelayList, sendRelayQuery } from '../SurvDeviceDeploy.api';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import { usePageMqtt } from '/@/components/mqtt/usePageMqtt'; import { usePageMqtt } from '/@/components/mqtt/usePageMqtt';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
@ -180,7 +180,6 @@
} }
console.log('check-----', formState.moduleList); console.log('check-----', formState.moduleList);
deviceData.temperature = data.temperature; deviceData.temperature = data.temperature;
} }
} catch (e) { } catch (e) {
// 非 JSON 格式，直接作为文本处理 // 非 JSON 格式，直接作为文本处理
@ -296,8 +295,8 @@
}, },
}); });
} }
//重新刷新整个Mqtt数据 //重新查询所有参数
// relayData(formState.deployInfo.deployId); fetchRelayStatus(formState.deployInfo.deployId);
}, 6000); }, 6000);
// if (checked === true) { // if (checked === true) {
@ -392,6 +391,10 @@
}); });
} }
function fetchRelayStatus(deployIds) {
sendRelayQuery({ deployId: deployIds }).then((res) => {});
}
// getValveStatus({ deployCode: record.deployCode }).then((res) => { // getValveStatus({ deployCode: record.deployCode }).then((res) => {
// if (res.code == 200) { // if (res.code == 200) {
// formState.dataTime=res.result.dataTime // formState.dataTime=res.result.dataTime