From 2869f7864d77838f1115dca1286c940bee44af1b Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 03 八月 2022 19:02:15 +0800
Subject: [PATCH] 修改http请求超时为60s
---
src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
index 30dab1d..e984e29 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
@@ -345,8 +345,8 @@
this.allPolygonData.push({
defence_state: polygon.defenceState,
polygonId: polygon.id,
- name: camera.cameraName + ":" + polygon.name,
- cameraId: camera.cameraId,
+ name: camera.camera_name + ":" + polygon.name,
+ cameraId: camera.camera_id,
});
});
});
@@ -500,7 +500,6 @@
},
validateArgVal(sdkArgItem, e) {
- console.log(sdkArgItem);
if (
typeof sdkArgItem.sdk_arg_value == "string" &&
sdkArgItem.sdk_arg_value == ""
@@ -734,6 +733,8 @@
setOptArgValueOptions(optArg) {
let alias = optArg.alias;
+ console.log(121212);
+ console.log(alias);
optArg.valueOptions = this.VideoManageData.Dictionary[alias].map((r) => {
return {
name: r.name,
@@ -893,6 +894,11 @@
}
});
let optArgDesc = " ";
+
+ //鏂板
+
+ //鏂板
+
this.sdkItem.optArg.forEach((arg) => {
let val = "";
let valRange = "";
@@ -934,9 +940,16 @@
optArgDesc.substring(optArgDesc.length - 1, optArgDesc.length);
optArgDesc += ")";
tempObj.sdk_set = defaultArgs.concat(optArgs);
+ tempObj.ruleDes = defaultArgDesc + optArgDesc;
+ console.log(tempObj.ruleDes);
if (this.editSdk) {
tempObj.icon_blob = this.editSdk.icon_blob;
+ tempObj.group_id = this.editSdk.group_id;
+ tempObj.sort = this.editSdk.sort;
+ tempObj.id = this.editSdk.id;
+ tempObj.icon_blob = this.editSdk.icon_blob;
+ tempObj.icon_blob2 = this.editSdk.icon_blob2;
this.$emit("getEditSdk", tempObj);
} else {
tempObj.icon_blob = this.$store.state.newSdk.iconBlob;
@@ -1080,17 +1093,17 @@
}
.el-input ::v-deep {
- width: 50px;
+ width: 100px;
height: 32px;
input {
- width: 50px;
+ width: 100px;
height: 32px;
}
}
.el-select {
- width: 68px;
+ width: 100px;
}
.font {
@@ -1117,7 +1130,7 @@
.btns {
position: absolute;
display: flex;
- justify-content: end;
+ justify-content: flex-end;
align-items: center;
left: 0;
right: 0;
--
Gitblit v1.8.0