diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/ProgressBar.vue b/ruoyi-ui/src/views/JiHeExpressway/components/ProgressBar.vue new file mode 100644 index 00000000..d3b9e270 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/ProgressBar.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue index 9149ed8d..82d803f2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue @@ -27,10 +27,7 @@ {{ item.label }} -
雨刷 - - -
+ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue index 6c78bec1..38e6dd62 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue @@ -22,6 +22,25 @@ /> +
+ + 雨刷: + + + +
摄相机参数 @@ -58,6 +77,8 @@ import { getRoadInfoByStakeMark, getOrganizationName, } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"; +import { controlCamera } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"; +import { throttle } from "lodash"; import { dialogDelayVisible } from "./../mixin"; @@ -108,12 +129,12 @@ export default { label: "设备状态", key: "deviceState", enum: "DeviceTypeEnum", - gridColumn: 2, + // gridColumn: 2, }, { label: "状态更新时间", key: "updateTime", - gridColumn: 2, + // gridColumn: 2, // enum: "CameraDirectionEnum" }, // { @@ -137,6 +158,9 @@ export default { console.log(this.data, "this.data"); }, methods: { + controlClick: throttle(function (type) { + controlCamera(this.deviceId, type); + }, 150), visibleClose(bool) { if (bool) return; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue index 5ac87cd3..7744cec7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue @@ -84,27 +84,7 @@ - - - + @@ -135,7 +115,7 @@ - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue index 4f3a5163..63c90b81 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue @@ -1,148 +1,139 @@ - - - - - \ No newline at end of file +} + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 408183dc..76fd75fd 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -54,9 +54,9 @@ module.exports = { // target: `http://10.168.78.135:8087`, //王钦 // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 // target: `http://10.168.68.42:8087`, //王思祥 - // target: `http://10.168.65.194:8087`, //赵祥龙 + target: `http://10.168.65.194:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟 - target: `http://10.168.76.181:8087`, //王家宝 + // target: `http://10.168.76.181:8087`, //王家宝 // target: `http://10.168.65.103:8097`, changeOrigin: true, pathRewrite: {