diff --git a/ruoyi-ui/src/api/camera/camera.js b/ruoyi-ui/src/api/camera/camera.js new file mode 100644 index 00000000..bae3cf72 --- /dev/null +++ b/ruoyi-ui/src/api/camera/camera.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 查询附近相机 +export function getNearbyCameraByPileNum(pileNum) { + return request({ + url: '/video/nearCamListPileNum', + method: 'get', + params: { + pileNum + } + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/assets/jihe/images/button/btnClose.svg b/ruoyi-ui/src/assets/jihe/images/button/btnClose.svg new file mode 100644 index 00000000..b0d8c7f6 --- /dev/null +++ b/ruoyi-ui/src/assets/jihe/images/button/btnClose.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/delete.png b/ruoyi-ui/src/assets/jihe/images/button/delete.png deleted file mode 100644 index f2497677..00000000 Binary files a/ruoyi-ui/src/assets/jihe/images/button/delete.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/jihe/images/button/delete.svg b/ruoyi-ui/src/assets/jihe/images/button/delete.svg new file mode 100644 index 00000000..67e8b429 --- /dev/null +++ b/ruoyi-ui/src/assets/jihe/images/button/delete.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit.png b/ruoyi-ui/src/assets/jihe/images/button/edit.png deleted file mode 100644 index 64b27b06..00000000 Binary files a/ruoyi-ui/src/assets/jihe/images/button/edit.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit.svg b/ruoyi-ui/src/assets/jihe/images/button/edit.svg new file mode 100644 index 00000000..687f676a --- /dev/null +++ b/ruoyi-ui/src/assets/jihe/images/button/edit.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit2.png b/ruoyi-ui/src/assets/jihe/images/button/edit2.png deleted file mode 100644 index fcffeb4a..00000000 Binary files a/ruoyi-ui/src/assets/jihe/images/button/edit2.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit4.png b/ruoyi-ui/src/assets/jihe/images/button/edit4.png deleted file mode 100644 index 26a56067..00000000 Binary files a/ruoyi-ui/src/assets/jihe/images/button/edit4.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/jihe/images/button/toLeft.png b/ruoyi-ui/src/assets/jihe/images/button/toLeft.png deleted file mode 100644 index 6483e78e..00000000 Binary files a/ruoyi-ui/src/assets/jihe/images/button/toLeft.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/jihe/images/button/toLeft.svg b/ruoyi-ui/src/assets/jihe/images/button/toLeft.svg new file mode 100644 index 00000000..d5adc9d8 --- /dev/null +++ b/ruoyi-ui/src/assets/jihe/images/button/toLeft.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/toLeft2.png b/ruoyi-ui/src/assets/jihe/images/button/toLeft2.png deleted file mode 100644 index 3dce1fad..00000000 Binary files a/ruoyi-ui/src/assets/jihe/images/button/toLeft2.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index b07d258c..663ba31b 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -43,10 +43,11 @@ color: $textColor; } &[disabled] { - color: #667 !important; + color: #9dd !important; } } + // 多选框组 .el-checkbox-group { .el-checkbox__label { color: $textColor; @@ -75,7 +76,7 @@ } } } - +//数字输入框 .el-input-number { margin-right: 10px; height: $inputHeight; @@ -100,7 +101,7 @@ margin: 0; } } - +// 单选按钮 .el-radio-button { margin-right: 10px; @@ -188,4 +189,41 @@ .el-menu--popup-bottom-start { margin-top: 16px; } + + .el-button--add, .el-button--publish { + color: #fff; + width: 96px; + height: 24px; + padding: 0; + border-radius: 50px; + line-height: 23px; + &.is-disabled { + background-color: #AAA; + color: #DDD; + + &:hover { + background-color: #AAA; + color: #DDD; + } + } + } + + .el-button--add { + background-color: #00B3CC; + border: none; + transition: all linear 0.3s; + &:hover{ + background-color: #008bbb; + } + } + + .el-button--publish { + background-color: #C87800; + border: none; + transition: all linear 0.3s; + &:hover { + background-color: #A86600; + } + } + } diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 1a3fcd09..b1f83ea0 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -124,7 +124,7 @@ h6 { padding-bottom: 5px; } .el-form-item__label{ - font-size: 0.7vw; + // font-size: 0.7vw; } // .el-form-item--medium .el-form-item__label{ // line-height: 4vh; diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index fe5e221b..01793689 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -81,6 +81,9 @@ if (process.env.NODE_ENV == 'development'){ window.IS_TESTING = false; } +import Empty from "@screen/components/empty"; +Vue.component("Empty", Empty); + // 全局方法挂载 Vue.prototype.dayjs = dayjs; Vue.prototype.getDicts = getDicts diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue new file mode 100644 index 00000000..20959107 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg new file mode 100644 index 00000000..c2f714eb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg new file mode 100644 index 00000000..bfc60815 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg new file mode 100644 index 00000000..dba61caf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg new file mode 100644 index 00000000..b6470c01 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg new file mode 100644 index 00000000..18cd3dcf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg new file mode 100644 index 00000000..ec7f2a0d --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue new file mode 100644 index 00000000..0310662e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue index b5f06766..882414be 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue @@ -1,8 +1,8 @@ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js index 29d0aa38..e862ef7f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js @@ -64,7 +64,11 @@ export async function setMarkerCluster(map, points, markerFun) { const offset = new AMap.Pixel(0, 0); context.marker.setContent(content); context.marker.setAnchor("bottom-center"); - + // console.log( + // "%c [ context.marker ]-62-「map.js」", + // "font-size:15px; background:#7d477f; color:#c18bc3;", + // context.marker + // ); context.marker.setOffset(offset); context.marker.setExtData(extData); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue index b6669549..0bfcca83 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -3,11 +3,12 @@
-
- -
情报板列表
- -
+ + + + + + @@ -47,20 +48,21 @@
-
{{ selectedDevice.deviceName }}
+ +
待下发信息
【 {{ selectedSize }}】
- 添加信息 - 发布信息 + 添加信息 + 发布信息
- +
@@ -75,7 +77,7 @@
-

请从设备回读或从模板添加信息...

+
@@ -84,14 +86,15 @@
-
信息模板[{{ selectedSize }}]
+
信息模板【{{ selectedSize }}】
- 添加模板 + 添加模板 +
@@ -168,34 +171,12 @@ import infoBoardUtils from "@screen/utils/infoBoard.js" import testDeviceList from "@screen/testData/deviceList.js" import testDeviceInfo from "@screen/testData/infoBoard.js" -// 对象深拷贝 -export const deepClone = data => { - // 封装的判断数据类型的方法 - var type = typeof data - var obj - if (type === 'array') { - obj = [] - } else if (type === 'object') { - obj = {} - } else { - // 不再具有下一层次 - return data - } - if (type === 'array') { - for (var i = 0, len = data.length; i < len; i++) { - obj.push(deepClone(data[i])) - } - } else if (type === 'object') { - for (var key in data) { - obj[key] = deepClone(data[key]) - } - } - return obj -} +import WgtTitle from "@screen/pages/perception/widgets/title"; export default { name: 'Device', components: { + WgtTitle, BoardInfoEditor, editInfo, BoardPreview, @@ -255,7 +236,8 @@ export default { tpl: {} }, scrollOptions, - boardItemEdtingIndex: -1 + boardItemEdtingIndex: -1, + isHideCtt:false } }, watch: { @@ -442,16 +424,22 @@ export default { if (IS_TESTING) { + this.selectedBdMsg = []; this.selectedBdMsg = _.cloneDeep(testDeviceInfo.data["3A"].content); } else{ if (!deviceFrom.iotDeviceId) { + this.$message.warning("该设备缺少iotDeviceId字段！") return; } - + this.selectedBdMsg = []; getBoardDeviceInfo(deviceFrom.iotDeviceId).then(res => { this.selectedBdMsg = res.data["3A"].content; + this.isHideCtt = true; + this.$nextTick(()=>{ + this.isHideCtt = false; + }) }).catch(err => { }) @@ -1085,7 +1073,6 @@ export default { }