diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index f715bde9..7b0a1767 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -37,6 +37,12 @@ export default [
name: "perceptionTrafficSituation",
component: "perception/trafficSituation/index.vue",
},
+ {
+ title: "网络拓扑",
+ name: "perceptionTopology",
+ path: "/perception/topology",
+ component: "perception/topology/index.vue"
+ }
],
},
{
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
index 67c15ed3..bb072cea 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
@@ -34,6 +34,9 @@
+
onModifyItem(newV, item)">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
index 96827802..cb673be8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
@@ -3,16 +3,17 @@
- 设备类型:{{ deviceTypeDic[editData.deviceType].label }}
+ 设备类型:
+ {{ deviceTypeDic[editData.deviceType].label }}
设备:
-
-
- {{ deviceDic[item.id].deviceName }}
- 等{{ editData.devices.length }}个设备
+
+
+ {{ deviceDic[item.id].deviceName }}
+ 等{{ editData.devices.length }}个
+
-
@@ -81,18 +82,21 @@ export default {
this.initBasicData().then(res=>{
- let temp = JSON.parse(this.propData.callParameter)[0]; //callParameter是个字符串
+ let temp = JSON.parse(this.propData.callParameter || '[{}]')[0]; //callParameter是个字符串
//转成BoardRecordPreview组件需要的格式,用来预览
- temp.functions[1].params.CONTENT = temp.functions[1].params.CONTENT.replaceAll(/\\n/g, '\\\\n').replaceAll(/=/g, '\\=').replaceAll(/,/g, '\\,').replaceAll(/ /g, ' ');
- this.editData = {
- id: this.propData.jobId,
- direction: temp.direction,
- deviceType: temp.deviceType,
- devices: temp.devices,
- params: temp.functions[1].params,
- screenSize: temp.screenSize
- };
- console.log(this.editData , "+++======");
+ if(temp.functions){
+ temp.functions[1].params.CONTENT = temp.functions[1].params.CONTENT.replaceAll(/\\n/g, '\\\\n').replaceAll(/=/g, '\\=').replaceAll(/,/g, '\\,').replaceAll(/ /g, ' ');
+ this.editData = {
+ id: this.propData.jobId,
+ direction: temp.direction,
+ deviceType: temp.deviceType,
+ devices: temp.devices,
+ params: temp.functions[1].params,
+ screenSize: temp.screenSize
+ };
+ }else{
+ this.editData = {};
+ }
this.isCompReady = true;
})
},
@@ -100,7 +104,8 @@ export default {
onModify(){
this.isEditingTask = true;
},
- onSubmit(){
+ onSubmit(para){
+ this.emit("onSubmit");
this.isEditingTask = false;
// let devices = _.filter(this.deviceOptions, item=>{
// this.editData.devices.includes(item.id);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
index 8bddac3c..4e6b8f13 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
@@ -206,12 +206,7 @@ export default {
// { "STAY": 90, "ACTION": "1", "SPEED": "0", "COLOR": "ffff00", "FONT": "3", "FONT_SIZE": "24", "CONTENT": "长清收费站\\\\n出入口封闭", "width": "160", "height": "80", "formatStyle": "2" }
this.editData.type2 = BoardUtils.contentToDeviceItem(this.propData.params);
}else{
- let arr = this.propData.screenSize.split("*");
- this.editData.type2 = {
- displayAreaWidth: +arr[0],
- displayAreaHeight: +arr[1]
- };
- alert(JSON.stringify());
+
}
},
onEditBoard(){
@@ -264,7 +259,7 @@ export default {
this.deviceArr.forEach((item,index)=>{
if (this.editData.devices.includes(item.id)){
let temp = {
- jobId: item.id,
+ id: item.id,
iotDeviceId: item.iotDeviceId,
deviceType: item.deviceType,
direction: item.direction
@@ -277,12 +272,12 @@ export default {
});
let params = this.processParams();
-
-
+
if(this.mode == "add"){
}
- addTaskRequest(this.groupId, devices, params, { deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize }).then(res=>{
+ alert(111)
+ addTaskRequest(this.groupId, this.time, devices, params, { deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize }).then(res=>{
console.log(res)
});
this.$emit("onSubmit")
@@ -325,6 +320,11 @@ export default {
},
resetEditData(){
this.editData.devices = [];
+ let arr = this.filterData.screenSize.split("*");
+ this.editData.type2 = {
+ displayAreaWidth: +arr[0],
+ displayAreaHeight: +arr[1]
+ };
}
}
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
new file mode 100644
index 00000000..48cb73b7
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js b/ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js
index 4e406378..8ed175f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js
@@ -1,7 +1,7 @@
import request from '@/utils/request'
-export function addTaskRequest(jobGroup, devices, params, others) {
+export function addTaskRequest(jobGroup, time, devices, params, others) {
let temp = [{
...others,
devices: devices,
@@ -28,6 +28,7 @@ export function addTaskRequest(jobGroup, devices, params, others) {
}];
let data = {
jobGroup,
+ time,
callParameter: JSON.stringify(temp)
}
// console.log(JSON.stringify(data));
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 584d5215..081017dc 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -48,13 +48,13 @@ module.exports = {
// target: `http://10.168.56.206:8087`, //孟
// target: `http://10.168.78.135:8087`, //孟
// target: `http://10.168.78.135:8087`,
- // target: `http://10.0.81.202:8087`, //现场后台
+ // target: `http://10.0.81.202:8087`, //现场后台s
// target: `http://10.0.81.204:8087`, //现场后台 刘文阁
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// target: `http://10.168.78.135:8087`, //王钦
- target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+ // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
// target: `http://10.168.68.42:8087`, //王思祥
- // target: `http://10.168.72.174:8087`, //赵祥龙
+ target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝
// target: `http://10.168.77.128:8087`, //王兴琳