diff --git a/ruoyi-ui/src/assets/images/login-head.png b/ruoyi-ui/src/assets/images/login-head.png index 8332b14a..f8429d7d 100644 Binary files a/ruoyi-ui/src/assets/images/login-head.png and b/ruoyi-ui/src/assets/images/login-head.png differ diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js index 0497590c..d840231d 100644 --- a/ruoyi-ui/src/common/menuData.js +++ b/ruoyi-ui/src/common/menuData.js @@ -50,7 +50,7 @@ export default [ title: "事件管控", name: "controlEvent", path: "/control/event", - redirect: "controlEventPerception", + redirect: "controlEventDispatch", children: [ { title: "调度记录", @@ -105,17 +105,28 @@ export default [ path: "/maintain", children: [ { - title: "收费运营", - name: "chargeableOperations", - path: "/maintain/board", - component: "maintenanceOperations/chargeableOperations/index.vue", - }, - { - title: "统计分析", - name: "statisticalAnalysis", - path: "/maintain/statisticalAnalysis", - component: "maintenanceOperations/statisticalAnalysis/index.vue", - } + title:"收费运营", + name:"fee", + children:[ + { + title: "统计分析", + name: "feeStatistic", + path: "/maintain/fee/statistic", + component: "maintenanceOperations/chargeableOperations/index.vue", + } + ] + },{ + title:"智能养护", + name:"smart", + children:[ + { + title: "统计分析", + name: "smartStatistic", + path: "/maintain/smart/statistic", + component: "maintenanceOperations/statisticalAnalysis/index.vue", + } + ] + } ] }, { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 4a008298..d96d1c7e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -165,7 +165,8 @@ export default { .dialog-content { padding: 9px 21px 27px 21px; - max-height: 96vh; + max-height: 90vh; + overflow-y: auto; } .bottom-right { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue index f0911cab..b060020b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue @@ -15,7 +15,7 @@ - + @@ -90,7 +90,7 @@ @@ -160,6 +160,13 @@ export default { message: '请输入详细内容', trigger: 'blur' } + ], + category: [ + { + required: true, + message: '请选择类别', + trigger: 'blur' + } ] }, screenSizeOptions: [], @@ -271,6 +278,9 @@ export default { if(this.$refs.dataForm){ this.$refs.dataForm.clearValidate(); } + // if(newV){ + // this.initData(); + // } }, immediate:true }, @@ -280,7 +290,8 @@ export default { tpl:{ handler(newV){ // { "id": 3, "category": "0", "content": "保持车距,控制车速", "screenSize": "768*64", "fontColor": "FFFF00", "fontSize": "64", "fontType": "2", "fontSpacing": "0", "rollingSpeed": null, "stopTime": "50", "inScreenMode": "1", "formatStyle": "2", "remark": null, "createTime": "2024-01-06 10:40:19", "updateTime": "2024-01-06 11:04:53" } - if(newV && Object.keys(newV).length>0){ + + if(newV && Object.keys(newV).length>0){ //防止关闭对话框时触发 this.initData(); } }, @@ -290,6 +301,11 @@ export default { handler(newV) { this.initData(); } + }, + "type": { + handler(newV) { + this.initData(); + } } }, mounted() { @@ -313,14 +329,17 @@ export default { }, methods: { initData() { + console.log("调用initData+++++++"); if(this.isLocked){ return } this.isLocked = true; - setTimeout(()=>{this.isLocked = false}, 300); + setTimeout(()=>{this.isLocked = false}, 100); + // getTemplateList({id:this.tpl.id}).then(res=>{ // console.log(res.data , "++++++++==========="); // }) + if (this.mode == "add") { let tempTpl = null; if (this.type == "template") { @@ -351,7 +370,22 @@ export default { this.dialogVisible = false; }, // 表单提交 - async onSubmit() { + async onSubmit(formName) { + + // this.$refs[formName].validate((valid) => { + // if (valid) { + + // } else { + // console.log('格式不正确!!'); + // return false; + // } + // }); + + + if (this.type=="template" && this.dataForm.category == undefined) { + return this.$modal.msgError('请选择分类!') + } + if (!this.dataForm.content.trim()) { return this.$modal.msgError('当前输入内容为空') } diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js index 2bdaa2d8..2784a26e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js +++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js @@ -37,7 +37,7 @@ export default{ displayAreaWidth: +arr[0], displayAreaHeight: +arr[1] } - + this.editDialog = { visible: showDialog == false ? false : true, mode: "toDevice", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue index 4fe40d68..cdf2ba21 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue @@ -289,7 +289,7 @@ export default { ____onDeleteBoardItem(index) { if (index > -1) { this.selectedBdMsg.splice(index, 1) - this.$message.success('删除成功,发布后才效。') + this.$message.success('删除成功。') } }, //编辑机编辑后的回调 diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue index 4501f2db..2d9c992a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue @@ -5,7 +5,9 @@
- + + +
@@ -27,37 +29,20 @@ export default { pictures: { type: Array, default: () => [ - "shareWith/message-active.svg", - "shareWith/message.svg", - "shareWith/website-active.svg", - "shareWith/website.svg", - "shareWith/weChat-active.svg", - "shareWith/weChat-active.svg" + "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", + "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", + // "require('@screen/images/shareWith/message-active.svg')", + // "require('@screen/images/shareWith/message.svg')", + // "require('@screen/images/shareWith/website-active.svg')", + // "require('@screen/images/shareWith/website.svg')", + // "require('@screen/images/shareWith/weChat-active.svg')", + // "require('@screen/images/shareWith/weChat-active.svg')" ] }, }, data() { return { - carouselItems: [ - { - "imageURL": "shareWith/message-active.svg" - }, - { - "imageURL": "shareWith/message.svg" - }, - { - "imageURL": "shareWith/website-active.svg" - }, - { - "imageURL": "shareWith/website.svg" - }, - { - "imageURL": "shareWith/weChat-active.svg" - }, - { - "imageURL": "shareWith/weChat-active.svg" - } - ], + carouselItems: [], settings: { infinite: true, arrows: false, @@ -74,6 +59,7 @@ export default { this.$refs.CarouselRef.prev() }, nextSlide() { + // console.log('pics',this.pictures) this.$refs.CarouselRef.next() }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js index 1342fd92..9cfe7f00 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js @@ -35,7 +35,7 @@ export const tabConfigList = [ }, { label: "地点:", - key: "dcEventAccident.dd", + key: "dcEventAccident.location", isAlone: false, required: true, options: { @@ -71,11 +71,11 @@ export const tabConfigList = [ }, { label: "匝道:", - key: "dcEventAccident.dd", + key: "dcEventAccident.rampId", + type: "select", isAlone: false, required: true, options: { - placeholder: "服务区地点", }, visible:(data) => { if(data?.dcEventAccident?.locationType == 3){ @@ -107,11 +107,22 @@ export const tabConfigList = [ }, { label: "地点:", - key: "dcEventAccident.dd", + key: "dcEventAccident.location", + type: "select", isAlone: false, required: true, options: { - placeholder: "服务区地点", + placeholder: "收费站地点", + options: [ + { + value: "1", + label: "入口车道", + }, + { + value: "2", + label: "出口车道", + }, + ], }, visible:(data) => { if(data?.dcEventAccident?.locationType == 4){ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index 415d5b0b..b48b5391 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -199,8 +199,8 @@ export default { if (this.type == "month") { xData.push(it.day.split("-")[2] + "日"); } - if (this.type == "day") { - xData.push(it.time.split(" ")[1] + "小时"); + if (this.type == "date") { + xData.push(it.time.split(" ")[1] + "时"); } if (this.type == "quarter") { xData.push(it.month + '月'); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue index 5f2d1292..bd26aa99 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue @@ -1,6 +1,6 @@