diff --git a/src/api/alarm/alarmCode.js b/src/api/alarm/alarmCode.js new file mode 100644 index 0000000..e0645ec --- /dev/null +++ b/src/api/alarm/alarmCode.js @@ -0,0 +1,44 @@ +import request from "@/utils/request"; + +// 查询报警编码列表 +export function alarmCodeList(query) { + return request({ + url: "/alarm/ac/list", + method: "get", + params: query, + }); +} + +// 根据id查询编码信息 +export function getAlarmCode(acId) { + return request({ + url: "/alarm/ac/" + acId, + method: "get", + }); +} + +// 新增报警编码 +export function addAlarmCode(data) { + return request({ + url: "/alarm/ac", + method: "post", + data: data, + }); +} + +// 修改报警编码信息 +export function updateAlarmCode(data) { + return request({ + url: "/alarm/ac", + method: "put", + data: data, + }); +} + +// 删除报警编码信息 +export function delAlarmCode(acIds) { + return request({ + url: "/alarm/ac/" + acIds, + method: "delete", + }); +} diff --git a/src/api/alarm/alarmRecord.js b/src/api/alarm/alarmRecord.js new file mode 100644 index 0000000..74e2707 --- /dev/null +++ b/src/api/alarm/alarmRecord.js @@ -0,0 +1,18 @@ +import request from "@/utils/request"; + +// 查询报警记录列表 +export function alarmRecordList(query) { + return request({ + url: "/alarm/ard/list", + method: "get", + params: query, + }); +} + +// 根据id查询报警记录信息 +export function getAlarmRecord(ardId) { + return request({ + url: "/alarm/ard/" + ardId, + method: "get", + }); +} \ No newline at end of file diff --git a/src/api/alarm/alarmRule.js b/src/api/alarm/alarmRule.js new file mode 100644 index 0000000..9cda9a2 --- /dev/null +++ b/src/api/alarm/alarmRule.js @@ -0,0 +1,44 @@ +import request from "@/utils/request"; + +// 查询仪表报警规则列表 +export function alarmRuleList(query) { + return request({ + url: "/alarm/ar/list", + method: "get", + params: query, + }); +} + +// 根据id查询报警规则信息 +export function getAlarmRule(arId) { + return request({ + url: "/alarm/ar/" + arId, + method: "get", + }); +} + +// 新增报警规则 +export function addAlarmRule(data) { + return request({ + url: "/alarm/ar", + method: "post", + data: data, + }); +} + +// 修改报警规则信息 +export function updateAlarmRule(data) { + return request({ + url: "/alarm/ar", + method: "put", + data: data, + }); +} + +// 删除报警编码信息 +export function delAlarmRule(arIds) { + return request({ + url: "/alarm/ar/" + arIds, + method: "delete", + }); +} diff --git a/src/api/device/comm.js b/src/api/device/comm.js index 08d6833..0fe44a6 100644 --- a/src/api/device/comm.js +++ b/src/api/device/comm.js @@ -9,10 +9,10 @@ export function cmpList(query) { }) } -// 根据id查询网关信息 -export function getCMP(cpmId) { +// 根据id查询设备参数信息 +export function getCMP(cmpId) { return request({ - url: '/device/cmp/' + cpmId, + url: '/device/cmp/' + cmpId, method: 'get' }) } @@ -36,9 +36,9 @@ export function updateCMP(data) { } // 删除设备参数 -export function delCMP(cpmIds) { +export function delCMP(cmpIds) { return request({ - url: '/device/cmp/' + cpmIds, + url: '/device/cmp/' + cmpIds, method: 'delete' }) } diff --git a/src/api/device/gather.js b/src/api/device/gather.js index 8b33fd5..9834a82 100644 --- a/src/api/device/gather.js +++ b/src/api/device/gather.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' +import request from "@/utils/request"; -// 查询网关列表 -export function gatewayList(query) { +// 查询设备采集参数列表 +export function cpmList(query) { return request({ - url: '/device/gateway/list', - method: 'get', - params: query - }) + url: "/device/cpm/list", + method: "get", + params: query, + }); } -// 根据id查询网关信息 -export function getGateway(gwId) { +// 根据id查询设备采集参数信息 +export function getCPM(cpmId) { return request({ - url: '/device/gateway/' + gwId, - method: 'get' - }) + url: "/device/cpm/" + cpmId, + method: "get", + }); } -// 新增网关参数 -export function addGateway(data) { +// 新增设备采集参数 +export function addCPM(data) { return request({ - url: '/device/gateway', - method: 'post', - data: data - }) + url: "/device/cpm", + method: "post", + data: data, + }); } -// 修改网关参数 -export function updateGateway(data) { +// 修改设备采集参数 +export function updateCPM(data) { return request({ - url: '/device/gateway', - method: 'put', - data: data - }) + url: "/device/cpm", + method: "put", + data: data, + }); } -// 删除网关参数 -export function delGateway(gwIds) { +// 删除设备采集参数 +export function delCPM(cpmIds) { return request({ - url: '/device/gateway/' + gwIds, - method: 'delete' - }) + url: "/device/cpm/" + cpmIds, + method: "delete", + }); } diff --git a/src/api/device/qrCode.js b/src/api/device/qrCode.js index 8b33fd5..0a12f88 100644 --- a/src/api/device/qrCode.js +++ b/src/api/device/qrCode.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' +import request from "@/utils/request"; -// 查询网关列表 -export function gatewayList(query) { +// 批量创建二维码 +export function createCode(query) { return request({ - url: '/device/gateway/list', - method: 'get', - params: query - }) + url: "/device/qr/create", + method: "get", + params: query, + }); } -// 根据id查询网关信息 -export function getGateway(gwId) { +//获取二维码列表数据 +export function codeList(query) { return request({ - url: '/device/gateway/' + gwId, - method: 'get' - }) + url: "/device/qr/list", + method: "get", + params: query, + }); } -// 新增网关参数 -export function addGateway(data) { +// 根据id查询二维码数据信息 +export function getCode(qrId) { return request({ - url: '/device/gateway', - method: 'post', - data: data - }) + url: "/device/qr/" + qrId, + method: "get", + }); } -// 修改网关参数 -export function updateGateway(data) { +// 修改二维码 +export function updateCode(data) { return request({ - url: '/device/gateway', - method: 'put', - data: data - }) + url: "/device/qr", + method: "put", + data: data, + }); } -// 删除网关参数 -export function delGateway(gwIds) { +// 删除二维码 +export function delCode(qrIds) { return request({ - url: '/device/gateway/' + gwIds, - method: 'delete' - }) + url: "/device/qr/" + qrIds, + method: "delete", + }); } diff --git a/src/api/device/spare.js b/src/api/device/spare.js new file mode 100644 index 0000000..9093e3b --- /dev/null +++ b/src/api/device/spare.js @@ -0,0 +1,44 @@ +import request from "@/utils/request"; + +// 查询备件库存列表 +export function spareList(query) { + return request({ + url: "/device/spare/list", + method: "get", + params: query, + }); +} + +// 根据id查询备件库存信息 +export function getSpare(spareId) { + return request({ + url: "/device/spare/" + spareId, + method: "get", + }); +} + +// 新增备件库存 +export function addSpare(data) { + return request({ + url: "/device/spare", + method: "post", + data: data, + }); +} + +// 修改备件库存 +export function updateSpare(data) { + return request({ + url: "/device/spare", + method: "put", + data: data, + }); +} + +// 删除备件库存 +export function delSpare(spareIds) { + return request({ + url: "/device/spare/" + spareIds, + method: "delete", + }); +} diff --git a/src/api/device/spareInOut.js b/src/api/device/spareInOut.js new file mode 100644 index 0000000..da95cd9 --- /dev/null +++ b/src/api/device/spareInOut.js @@ -0,0 +1,19 @@ +import request from "@/utils/request"; + +// 查询出入库列表 +export function spareInOutList(query) { + return request({ + url: "/device/spareInOut/list", + method: "get", + params: query, + }); +} + +// 添加出入库信息 +export function addSpareInOut(data) { + return request({ + url: "/device/spareInOut", + method: "post", + data: data, + }); +} \ No newline at end of file diff --git a/src/assets/icons/svg/Inbound.svg b/src/assets/icons/svg/Inbound.svg new file mode 100644 index 0000000..c049abb --- /dev/null +++ b/src/assets/icons/svg/Inbound.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/Outbound.svg b/src/assets/icons/svg/Outbound.svg new file mode 100644 index 0000000..2646d02 --- /dev/null +++ b/src/assets/icons/svg/Outbound.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/alarm.svg b/src/assets/icons/svg/alarm.svg new file mode 100644 index 0000000..bfbc011 --- /dev/null +++ b/src/assets/icons/svg/alarm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/alarmCode.svg b/src/assets/icons/svg/alarmCode.svg new file mode 100644 index 0000000..0af1805 --- /dev/null +++ b/src/assets/icons/svg/alarmCode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/alarmRecord.svg b/src/assets/icons/svg/alarmRecord.svg new file mode 100644 index 0000000..1a3c4e0 --- /dev/null +++ b/src/assets/icons/svg/alarmRecord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/alarmRule.svg b/src/assets/icons/svg/alarmRule.svg new file mode 100644 index 0000000..35e2c19 --- /dev/null +++ b/src/assets/icons/svg/alarmRule.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/spare.svg b/src/assets/icons/svg/spare.svg new file mode 100644 index 0000000..149d36a --- /dev/null +++ b/src/assets/icons/svg/spare.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/spareInOut.svg b/src/assets/icons/svg/spareInOut.svg new file mode 100644 index 0000000..c3c1c4b --- /dev/null +++ b/src/assets/icons/svg/spareInOut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/global.js b/src/utils/global.js new file mode 100644 index 0000000..5503d2f --- /dev/null +++ b/src/utils/global.js @@ -0,0 +1,8 @@ + +// 图片url +export const imgUrl = "http://192.168.1.222:8080"; + + +export default { + imgUrl, +}; diff --git a/src/views/alarm/alarmCode/index.vue b/src/views/alarm/alarmCode/index.vue new file mode 100644 index 0000000..6feb127 --- /dev/null +++ b/src/views/alarm/alarmCode/index.vue @@ -0,0 +1,495 @@ + + + diff --git a/src/views/alarm/alarmRecord/index.vue b/src/views/alarm/alarmRecord/index.vue new file mode 100644 index 0000000..25972b1 --- /dev/null +++ b/src/views/alarm/alarmRecord/index.vue @@ -0,0 +1,379 @@ + + + diff --git a/src/views/alarm/alarmRule/index.vue b/src/views/alarm/alarmRule/index.vue new file mode 100644 index 0000000..c7bd942 --- /dev/null +++ b/src/views/alarm/alarmRule/index.vue @@ -0,0 +1,812 @@ + + + + diff --git a/src/views/device/comm/index.vue b/src/views/device/comm/index.vue index 59a7826..7c456d9 100644 --- a/src/views/device/comm/index.vue +++ b/src/views/device/comm/index.vue @@ -375,10 +375,22 @@ export default { this.form = { id: response.data.id, mtType: response.data.mtType, - baudRate: response.data.baudRate.toString(), - dataBit: response.data.dataBit.toString(), - stopBit: response.data.stopBit.toString(), - parity: response.data.parity.toString(), + baudRate: + response.data.baudRate !== null + ? response.data.baudRate.toString() + : null, + dataBit: + response.data.dataBit !== null + ? response.data.dataBit.toString() + : null, + stopBit: + response.data.stopBit !== null + ? response.data.stopBit.toString() + : null, + parity: + response.data.parity !== null + ? response.data.parity.toString() + : null, remark: response.data.remark, }; this.open = true; diff --git a/src/views/device/gateway/index.vue b/src/views/device/gateway/index.vue index f382135..78d930e 100644 --- a/src/views/device/gateway/index.vue +++ b/src/views/device/gateway/index.vue @@ -437,8 +437,14 @@ export default { port: response.data.port, collectionLoop: response.data.collectionLoop, internetCard: response.data.internetCard, - operatorType: response.data.operatorType.toString(), - communicationType: response.data.communicationType.toString(), + operatorType: + response.data.operatorType !== null + ? response.data.operatorType.toString() + : null, + communicationType: + response.data.communicationType !== null + ? response.data.communicationType.toString() + : null, remark: response.data.remark, }; this.open = true; diff --git a/src/views/device/gather/index.vue b/src/views/device/gather/index.vue index fd667ee..b785e9d 100644 --- a/src/views/device/gather/index.vue +++ b/src/views/device/gather/index.vue @@ -1,4 +1,871 @@ - \ No newline at end of file +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ 搜索 +
+
+ 重置 +
+
+
+ + + +
+ 新增 +
+ + +
+ 修改 +
+ + +
+ 删除 +
+ + +
+ 导出 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ +
+ + + diff --git a/src/views/device/ledger/index.vue b/src/views/device/ledger/index.vue index 7c793b5..247d000 100644 --- a/src/views/device/ledger/index.vue +++ b/src/views/device/ledger/index.vue @@ -172,6 +172,14 @@ 停用 + + + - - - - - - - + + - - + + - - + + - - - - - + + + + @@ -362,10 +366,9 @@ import { addLedger, updateLedger, } from "@/api/device/ledger"; - export default { name: "ledger", - dicts: ["sys_device_type"], + dicts: ["sys_device_type", "sys_type"], data() { return { timeArr: [], @@ -493,7 +496,7 @@ export default { this.reset(); this.form.id = ""; const ledgerId = row.id || this.ids; - console.log(""); + console.log("row", row); getLedger(ledgerId).then((response) => { // this.form = response.data; this.form = { @@ -507,9 +510,22 @@ export default { techParams: response.data.techParams, techDoc: response.data.techDoc, installTime: response.data.installTime, - isCollection: response.data.isCollection.toString(), - isCalcEnergy: response.data.isCalcEnergy.toString(), - status: response.data.status.toString(), + isCollection: + response.data.isCollection !== null + ? response.data.isCollection.toString() + : null, + isCalcEnergy: + response.data.isCalcEnergy !== null + ? response.data.isCalcEnergy.toString() + : null, + status: + response.data.status !== null + ? response.data.status.toString() + : null, + systemType: + response.data.systemType !== null + ? response.data.systemType.toString() + : null, remark: response.data.remark, }; this.open = true; diff --git a/src/views/device/maintenance/index.vue b/src/views/device/maintenance/index.vue index 9f4f319..0ebfa32 100644 --- a/src/views/device/maintenance/index.vue +++ b/src/views/device/maintenance/index.vue @@ -583,9 +583,15 @@ export default { // this.form = response.data; this.form = { id: response.data.id, - maintainType: response.data.maintainType.toString(), + maintainType: + response.data.maintainType !== null + ? response.data.maintainType.toString() + : null, maintainPeople: response.data.maintainPeople, - deviceType: response.data.deviceType.toString(), + deviceType: + response.data.deviceType !== null + ? response.data.deviceType.toString() + : null, cost: response.data.cost, execTime: response.data.execTime, spendTimes: response.data.spendTimes, diff --git a/src/views/device/qrCode/index.vue b/src/views/device/qrCode/index.vue index f86135e..96039ae 100644 --- a/src/views/device/qrCode/index.vue +++ b/src/views/device/qrCode/index.vue @@ -1,3 +1,555 @@ \ No newline at end of file +
+
+
+ + + + + + + +
+ 搜索 +
+
+ 重置 +
+
+
+ + + +
+ 批量生成二维码 +
+ + +
+ 修改 +
+ + +
+ 删除 +
+ + +
+ 导出 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ + + +
+ Base64 Image +
+ + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ +
+ + + + diff --git a/src/views/device/spare/index.vue b/src/views/device/spare/index.vue new file mode 100644 index 0000000..cb702d3 --- /dev/null +++ b/src/views/device/spare/index.vue @@ -0,0 +1,461 @@ + + + diff --git a/src/views/device/spareInOut/index.vue b/src/views/device/spareInOut/index.vue new file mode 100644 index 0000000..bbfce9e --- /dev/null +++ b/src/views/device/spareInOut/index.vue @@ -0,0 +1,436 @@ + + +