diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts
index 36905b9..21fff1c 100644
--- a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/military/msDeviceInfo/list',
- save='/military/msDeviceInfo/add',
- edit='/military/msDeviceInfo/edit',
- deleteOne = '/military/msDeviceInfo/delete',
- deleteBatch = '/military/msDeviceInfo/deleteBatch',
- importExcel = '/military/msDeviceInfo/importExcel',
- exportXls = '/military/msDeviceInfo/exportXls',
+ list = '/military/dtDeviceInfo/list',
+ save='/military/dtDeviceInfo/add',
+ edit='/military/dtDeviceInfo/edit',
+ deleteOne = '/military/dtDeviceInfo/delete',
+ deleteBatch = '/military/dtDeviceInfo/deleteBatch',
+ importExcel = '/military/dtDeviceInfo/importExcel',
+ exportXls = '/military/dtDeviceInfo/exportXls',
relayCorxSwitch= '/alarm/recv/relayCorx/switch',
}
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts
index 5fb8bf4..2392a27 100644
--- a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts
@@ -7,13 +7,13 @@ export const columns: BasicColumn[] = [
{
title: '设备编号',
align: "center",
- dataIndex: 'deviceNum'
- },
- {
- title: '设备厂商',
- align: "center",
- dataIndex: 'deviceComp_dictText'
+ dataIndex: 'deviceCode'
},
+ // {
+ // title: '设备厂商',
+ // align: "center",
+ // dataIndex: 'deviceComp_dictText'
+ // },
{
title: '设备名称',
align: "center",
@@ -23,24 +23,24 @@ export const columns: BasicColumn[] = [
{
title: '设备IP',
align: "center",
- dataIndex: 'ip'
+ dataIndex: 'deviceIp'
},
{
title: '监听通信端口',
align: "center",
- dataIndex: 'port'
+ dataIndex: 'ipPort'
},
{
title: '设备状态',
align: "center",
- dataIndex: 'state',
+ dataIndex: 'deviceStatus',
slots: { customRender: 'state' },
},
- {
- title: '状态更新时间',
- align: "center",
- dataIndex: 'aliveTime'
- },
+ // {
+ // title: '状态更新时间',
+ // align: "center",
+ // dataIndex: 'aliveTime'
+ // },
];
//查询数据
@@ -49,11 +49,11 @@ export const searchFormSchema: FormSchema[] = [
//表单数据
export const formSchema: FormSchema[] = [
- {
- label: '设备厂商',
- field: 'deviceComp',
- component: 'InputNumber',
- },
+ // {
+ // label: '设备厂商',
+ // field: 'deviceComp',
+ // component: 'InputNumber',
+ // },
{
label: '设备名称',
field: 'deviceName',
@@ -61,33 +61,33 @@ export const formSchema: FormSchema[] = [
},
{
label: '设备编号',
- field: 'deviceNum',
+ field: 'deviceCode',
component: 'Input',
},
- {
+ {
label: '设备IP',
- field: 'ip',
+ field: 'deviceIp',
component: 'Input',
},
{
label: '监听/通信端口',
- field: 'port',
+ field: 'ipPort',
component: 'InputNumber',
},
{
- label: '启用状态',
- field: 'state',
+ label: '设备状态',
+ field: 'deviceStatus',
component: 'InputNumber',
},
- {
- label: '心跳更新时间',
- field: 'aliveTime',
- component: 'DatePicker',
- componentProps: {
- showTime: true,
- valueFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- },
+ // {
+ // label: '心跳更新时间',
+ // field: 'aliveTime',
+ // component: 'DatePicker',
+ // componentProps: {
+ // showTime: true,
+ // valueFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // },
// TODO 主键隐藏字段，目前写死为ID
{
label: '',
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue b/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue
index 5e8e221..a17feaf 100644
--- a/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue
@@ -2,41 +2,41 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -60,13 +60,17 @@
const emit = defineEmits(['register', 'ok']);
const formData = reactive>({
id: '',
- deviceComp: undefined,
+ // deviceComp: undefined,
deviceName: '',
- deviceNum: '',
- ip: '',
- port: undefined,
- state: undefined,
- aliveTime: '',
+ // deviceNum: '',
+ deviceCode:'',
+ // ip: '',
+ deviceIp:'',
+ // port: undefined,
+ ipPort:undefined,
+ // state: undefined,
+ deviceStatus: undefined,
+ // aliveTime: '',
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts
index ac14aa2..c1df3a5 100644
--- a/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/military/msDeviceInfo/list',
- save='/military/msDeviceInfo/add',
- edit='/military/msDeviceInfo/edit',
- deleteOne = '/military/msDeviceInfo/delete',
- deleteBatch = '/military/msDeviceInfo/deleteBatch',
- importExcel = '/military/msDeviceInfo/importExcel',
- exportXls = '/military/msDeviceInfo/exportXls',
+ list = '/military/dtDeviceInfo/list',
+ save='/military/dtDeviceInfo/add',
+ edit='/military/dtDeviceInfo/edit',
+ deleteOne = '/military/dtDeviceInfo/delete',
+ deleteBatch = '/military/dtDeviceInfo/deleteBatch',
+ importExcel = '/military/dtDeviceInfo/importExcel',
+ exportXls = '/military/dtDeviceInfo/exportXls',
relayCorxSwitch= '/alarm/recv/relayCorx/switch',
}
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts
index 7d31d19..2392a27 100644
--- a/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts
@@ -7,14 +7,13 @@ export const columns: BasicColumn[] = [
{
title: '设备编号',
align: "center",
- dataIndex: 'deviceNum'
- },
- {
- title: '设备厂商',
- align: "center",
- // dataIndex: 'deviceComp'
- dataIndex: 'deviceComp_dictText'
+ dataIndex: 'deviceCode'
},
+ // {
+ // title: '设备厂商',
+ // align: "center",
+ // dataIndex: 'deviceComp_dictText'
+ // },
{
title: '设备名称',
align: "center",
@@ -24,24 +23,24 @@ export const columns: BasicColumn[] = [
{
title: '设备IP',
align: "center",
- dataIndex: 'ip'
+ dataIndex: 'deviceIp'
},
{
title: '监听通信端口',
align: "center",
- dataIndex: 'port'
+ dataIndex: 'ipPort'
},
{
title: '设备状态',
align: "center",
- dataIndex: 'state',
+ dataIndex: 'deviceStatus',
slots: { customRender: 'state' },
},
- {
- title: '状态更新时间',
- align: "center",
- dataIndex: 'aliveTime'
- },
+ // {
+ // title: '状态更新时间',
+ // align: "center",
+ // dataIndex: 'aliveTime'
+ // },
];
//查询数据
@@ -50,11 +49,11 @@ export const searchFormSchema: FormSchema[] = [
//表单数据
export const formSchema: FormSchema[] = [
- {
- label: '设备厂商',
- field: 'deviceComp',
- component: 'InputNumber',
- },
+ // {
+ // label: '设备厂商',
+ // field: 'deviceComp',
+ // component: 'InputNumber',
+ // },
{
label: '设备名称',
field: 'deviceName',
@@ -62,33 +61,33 @@ export const formSchema: FormSchema[] = [
},
{
label: '设备编号',
- field: 'deviceNum',
+ field: 'deviceCode',
component: 'Input',
},
- {
+ {
label: '设备IP',
- field: 'ip',
+ field: 'deviceIp',
component: 'Input',
},
{
label: '监听/通信端口',
- field: 'port',
+ field: 'ipPort',
component: 'InputNumber',
},
{
- label: '启用状态',
- field: 'state',
+ label: '设备状态',
+ field: 'deviceStatus',
component: 'InputNumber',
},
- {
- label: '心跳更新时间',
- field: 'aliveTime',
- component: 'DatePicker',
- componentProps: {
- showTime: true,
- valueFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- },
+ // {
+ // label: '心跳更新时间',
+ // field: 'aliveTime',
+ // component: 'DatePicker',
+ // componentProps: {
+ // showTime: true,
+ // valueFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // },
// TODO 主键隐藏字段，目前写死为ID
{
label: '',
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue b/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue
index 1eb0df2..e24cebe 100644
--- a/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue
@@ -2,41 +2,41 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -60,13 +60,17 @@
const emit = defineEmits(['register', 'ok']);
const formData = reactive>({
id: '',
- deviceComp: undefined,
+ // deviceComp: undefined,
deviceName: '',
- deviceNum: '',
- ip: '',
- port: undefined,
- state: undefined,
- aliveTime: '',
+ // deviceNum: '',
+ deviceCode:'',
+ // ip: '',
+ deviceIp:'',
+ // port: undefined,
+ ipPort:undefined,
+ // state: undefined,
+ deviceStatus: undefined,
+ // aliveTime: '',
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts
index 36905b9..21fff1c 100644
--- a/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts
+++ b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/military/msDeviceInfo/list',
- save='/military/msDeviceInfo/add',
- edit='/military/msDeviceInfo/edit',
- deleteOne = '/military/msDeviceInfo/delete',
- deleteBatch = '/military/msDeviceInfo/deleteBatch',
- importExcel = '/military/msDeviceInfo/importExcel',
- exportXls = '/military/msDeviceInfo/exportXls',
+ list = '/military/dtDeviceInfo/list',
+ save='/military/dtDeviceInfo/add',
+ edit='/military/dtDeviceInfo/edit',
+ deleteOne = '/military/dtDeviceInfo/delete',
+ deleteBatch = '/military/dtDeviceInfo/deleteBatch',
+ importExcel = '/military/dtDeviceInfo/importExcel',
+ exportXls = '/military/dtDeviceInfo/exportXls',
relayCorxSwitch= '/alarm/recv/relayCorx/switch',
}
diff --git a/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts
index 5fb8bf4..2392a27 100644
--- a/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts
+++ b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts
@@ -7,13 +7,13 @@ export const columns: BasicColumn[] = [
{
title: '设备编号',
align: "center",
- dataIndex: 'deviceNum'
- },
- {
- title: '设备厂商',
- align: "center",
- dataIndex: 'deviceComp_dictText'
+ dataIndex: 'deviceCode'
},
+ // {
+ // title: '设备厂商',
+ // align: "center",
+ // dataIndex: 'deviceComp_dictText'
+ // },
{
title: '设备名称',
align: "center",
@@ -23,24 +23,24 @@ export const columns: BasicColumn[] = [
{
title: '设备IP',
align: "center",
- dataIndex: 'ip'
+ dataIndex: 'deviceIp'
},
{
title: '监听通信端口',
align: "center",
- dataIndex: 'port'
+ dataIndex: 'ipPort'
},
{
title: '设备状态',
align: "center",
- dataIndex: 'state',
+ dataIndex: 'deviceStatus',
slots: { customRender: 'state' },
},
- {
- title: '状态更新时间',
- align: "center",
- dataIndex: 'aliveTime'
- },
+ // {
+ // title: '状态更新时间',
+ // align: "center",
+ // dataIndex: 'aliveTime'
+ // },
];
//查询数据
@@ -49,11 +49,11 @@ export const searchFormSchema: FormSchema[] = [
//表单数据
export const formSchema: FormSchema[] = [
- {
- label: '设备厂商',
- field: 'deviceComp',
- component: 'InputNumber',
- },
+ // {
+ // label: '设备厂商',
+ // field: 'deviceComp',
+ // component: 'InputNumber',
+ // },
{
label: '设备名称',
field: 'deviceName',
@@ -61,33 +61,33 @@ export const formSchema: FormSchema[] = [
},
{
label: '设备编号',
- field: 'deviceNum',
+ field: 'deviceCode',
component: 'Input',
},
- {
+ {
label: '设备IP',
- field: 'ip',
+ field: 'deviceIp',
component: 'Input',
},
{
label: '监听/通信端口',
- field: 'port',
+ field: 'ipPort',
component: 'InputNumber',
},
{
- label: '启用状态',
- field: 'state',
+ label: '设备状态',
+ field: 'deviceStatus',
component: 'InputNumber',
},
- {
- label: '心跳更新时间',
- field: 'aliveTime',
- component: 'DatePicker',
- componentProps: {
- showTime: true,
- valueFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- },
+ // {
+ // label: '心跳更新时间',
+ // field: 'aliveTime',
+ // component: 'DatePicker',
+ // componentProps: {
+ // showTime: true,
+ // valueFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // },
// TODO 主键隐藏字段，目前写死为ID
{
label: '',
diff --git a/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue b/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue
index 3fb43c7..91d5bbf 100644
--- a/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue
+++ b/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue
@@ -2,41 +2,41 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -60,13 +60,17 @@
const emit = defineEmits(['register', 'ok']);
const formData = reactive>({
id: '',
- deviceComp: undefined,
+ // deviceComp: undefined,
deviceName: '',
- deviceNum: '',
- ip: '',
- port: undefined,
- state: undefined,
- aliveTime: '',
+ // deviceNum: '',
+ deviceCode:'',
+ // ip: '',
+ deviceIp:'',
+ // port: undefined,
+ ipPort:undefined,
+ // state: undefined,
+ deviceStatus: undefined,
+ // aliveTime: '',
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue b/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue
index 2b3927c..4cc58e6 100644
--- a/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue
+++ b/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue
@@ -426,7 +426,7 @@
defHttp
.get(
{
- url: '/military/msDeviceInfo/list',
+ url: '/military/dtDeviceInfo/list',
params: { deviceType: 4 },
},
{ isTransformResponse: false }
@@ -436,10 +436,19 @@
if (res.result.records.length == 0) {
return;
}
+ // device.value = res.result.records;
+ // let ip = device[0].value.ip;
+ // let port = device[0].value.port;
+ // let data = 'ip=' + ip + '&port=' + port;
+ // service.get('/alarm/recv/photovoltaics/status?' + data).then((res) => {
+ // gateway.value = res.data.gateway;
+ // MPPT_CTRLR.value = res.data.MPPT_CTRLR;
+ // AC_POWER_METER1.value = res.data.AC_POWER_METER1;
+ // AC_POWER_METER2.value = res.data.AC_POWER_METER2;
device.value = res.result.records;
- let ip = device[0].value.ip;
- let port = device[0].value.port;
- let data = 'ip=' + ip + '&port=' + port;
+ let deviceIp = device[0].value.deviceIp;
+ let ipPort = device[0].value.ipPort;
+ let data = 'deviceIp=' + deviceIp + '&ipPort=' + ipPort;
service.get('/alarm/recv/photovoltaics/status?' + data).then((res) => {
gateway.value = res.data.gateway;
MPPT_CTRLR.value = res.data.MPPT_CTRLR;
@@ -456,16 +465,16 @@
defHttp
.get(
{
- url: '/military/msDeviceInfo/list',
+ url: '/military/dtDeviceInfo/list',
params: { deviceName: value },
},
{ isTransformResponse: false }
)
// getAction('/military/msDeviceInfo/list?deviceName=' + value)
.then((res) => {
- let ip = res.result.records[0].ip;
- let port = res.result.records[0].port;
- let data = 'ip=' + ip + '&port=' + port;
+ let deviceIp = res.result.records[0].deviceIp;
+ let ipPort = res.result.records[0].ipPort;
+ let data = 'deviceIp=' + deviceIp + '&ipPort=' + ipPort;
service.get('/alarm/recv/photovoltaics/status?' + data).then((res) => {
this.gateway = res.data.gateway;
this.MPPT_CTRLR = res.data.MPPT_CTRLR;