+
@@ -166,11 +205,18 @@
>
-
+
@@ -180,7 +226,7 @@
import { updateDevice, resetPssword } from "@/api/iot/device";
export default {
name: "DeviceInfo",
- props: ["infoData"],
+ props: ["infoData", "isTenant"],
data() {
const validatorNull = (rule, value, callback) => {
callback();
@@ -193,22 +239,22 @@ export default {
showDevicePassword: false,
temp: {
deviceName: "",
- deviceId: undefined
+ deviceId: undefined,
},
rules: {
devicePassword: [
{
required: false,
validator: this.devicePassword,
- trigger: "blur"
- }
- ]
+ trigger: "blur",
+ },
+ ],
},
form: {
- devicePassword: ""
+ devicePassword: "",
},
title: "",
- open: false
+ open: false,
};
},
methods: {
@@ -232,15 +278,15 @@ export default {
},
// 修改设备密码 提交
submitForm() {
- this.$refs["form"].validate(valid => {
+ this.$refs["form"].validate((valid) => {
if (valid) {
- resetPssword(this.form).then(response => {
+ resetPssword(this.form).then((response) => {
this.open = false;
if (response.code === 200) {
this.msgSuccess("修改成功");
}
this.$emit("updateInfo", {
- deviceId: this.infoData.deviceId
+ deviceId: this.infoData.deviceId,
});
});
}
@@ -258,28 +304,28 @@ export default {
newTemp() {
this.temp = {
deviceName: "",
- deviceId: undefined
+ deviceId: undefined,
};
},
// 下载本地模拟器 -- 暂未开放
download() {},
submit() {
if (this.temp.deviceName && this.temp.deviceId) {
- updateDevice(this.temp).then(response => {
+ updateDevice(this.temp).then((response) => {
this.updateState = false;
if (response.code === 200) {
this.msgSuccess("修改成功");
}
this.$emit("updateInfo", {
deviceId: this.infoData.deviceId,
- deviceName: this.infoData.deviceName
+ deviceName: this.infoData.deviceName,
});
});
} else {
this.msgError("设备名称不能为空！");
}
- }
- }
+ },
+ },
};
diff --git a/src/views/tenant/alarm/record.vue b/src/views/tenant/alarm/record.vue
index 0b0012c8..12277026 100644
--- a/src/views/tenant/alarm/record.vue
+++ b/src/views/tenant/alarm/record.vue
@@ -125,23 +125,28 @@
width="200px"
prop="typeName"
/>
-
+
-
处理
+ 创建工单
+ >创建工单
@@ -195,6 +200,8 @@ import {
delRecord,
addAlarmRecord,
} from "@/api/alarm/tenantAlarm";
+import { handlerRecord } from "@/api/alarm/record";
+
import Editor from "@/components/Editor";
export default {
@@ -244,6 +251,22 @@ export default {
this.getList();
},
methods: {
+ // 处理告警
+ handleUpdate(row) {
+ const recordId = row.recordId || this.ids;
+ this.$confirm("是否设置此告警为已处理状态?", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(function () {
+ return handlerRecord({ recordIds: recordId.split(",") });
+ })
+ .then(() => {
+ this.getList();
+ this.msgSuccess("处理成功");
+ });
+ },
sortChange(column) {
const sort = {
isAsc: column.order === "descending" ? "desc" : "asc",
@@ -306,7 +329,7 @@ export default {
},
// 转工单处理
handleWork(row) {
- console.log('addWork:', row)
+ console.log("addWork:", row);
this.$confirm("是否创建告警工单?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -324,19 +347,10 @@ export default {
});
})
.then(() => {
- this.msgSuccess("创建成功！");
+ this.msgSuccess("报警工单已创建！");
this.$router.push("/power/maintenancet");
});
},
- // 处理告警
- handleUpdate(row) {
- this.resetFomr();
- getRecord(row.recordId).then((res) => {
- this.form = res.data;
- this.open = true;
- this.title = "告警处理";
- });
- },
resetFomr() {
this.form = {
processResult: "",
diff --git a/src/views/tenant/alarm/warning.vue b/src/views/tenant/alarm/warning.vue
index 453901a8..d5ce18aa 100644
--- a/src/views/tenant/alarm/warning.vue
+++ b/src/views/tenant/alarm/warning.vue
@@ -131,20 +131,19 @@
class-name="small-padding fixed-width"
>
-
处理
+ 创建工单
@@ -201,6 +200,7 @@ import {
addAlarmRecord,
} from "@/api/alarm/tenantAlarm";
import Editor from "@/components/Editor";
+import { handlerRecord } from "@/api/alarm/record";
export default {
name: "Warning",
@@ -303,6 +303,22 @@ export default {
}
});
},
+ // 处理告警
+ handleUpdate(row) {
+ const recordId = row.recordId || this.ids;
+ this.$confirm("是否设置此预警为已处理状态?", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(function () {
+ return handlerRecord({ recordIds: recordId.split(",") });
+ })
+ .then(() => {
+ this.getList();
+ this.msgSuccess("处理成功");
+ });
+ },
// 转工单处理
handleWork(row) {
console.log("addWork:", row);
@@ -327,15 +343,6 @@ export default {
this.$router.push("/power/maintenancet");
});
},
- // 处理预警
- handleUpdate(row) {
- this.resetFomr();
- getRecord(row.recordId).then((res) => {
- this.form = res.data;
- this.open = true;
- this.title = "预警处理";
- });
- },
resetFomr() {
this.form = {
processResult: "",
diff --git a/src/views/tenant/circuitBreaker/index.vue b/src/views/tenant/circuitBreaker/index.vue
index d419858d..3b292e0f 100644
--- a/src/views/tenant/circuitBreaker/index.vue
+++ b/src/views/tenant/circuitBreaker/index.vue
@@ -1,6 +1,6 @@
-
+
-
+
-
@@ -123,6 +123,7 @@ import {
listDeviceTypeList
} from "@/api/tenant/device";
import DetailsWrap from './profile/details'
+import GatewayDetail from '@/views/profile/DeviceDetailsView/index'
const deviceStatusOpt = {
ONLINE: "在线",
OFFLINE: "离线",
@@ -137,7 +138,8 @@ const lineTypeOpt = {
export default {
name: "Device",
components: {
- DetailsWrap
+ DetailsWrap,
+ GatewayDetail
},
data() {
return {
@@ -203,7 +205,8 @@ export default {
},
handleDetails(row) {
this.sourceId = row.deviceId;
- this.componectVal = "DetailsWrap";
+ // this.componectVal = "DetailsWrap";
+ this.componectVal = row.deviceType === 'GATEWAY_CONTROLLER'? 'GatewayDetail' : "DetailsWrap";
},
// 跳转详情页
toTableClick() {
@@ -310,7 +313,7 @@ export default {
height: 20px;
position: absolute;
right: 30px;
- top: 30px;
+ top: 50px;
display: flex;
justify-content: center;
align-items: center;
@@ -335,6 +338,9 @@ export default {
color: #1890ff;
font-size: 30px;
}
+ .gateway-wrap {
+ top: 220px;
+ }
}
.form-params-wrap::-webkit-scrollbar {
/*滚动条整体样式*/