From fa31b988a2153011d26d4d28e764b0213ad7794c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Tue, 6 Aug 2024 10:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A6=85=E9=81=93BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../180全景摄像机.svg | 0 .../360全景摄像机.svg | 0 .../桥下球机.svg | 0 .../站前悬臂式可变信息标志.svg | 0 .../雨棚可变信息标志.svg | 0 .../Cards/DisposalProcess/index.vue | 8 +++- .../AddControlEventInfoDialog/index.vue | 13 ++++-- .../dispatch/EventDispatchDialog/index.vue | 41 +++++++++++++++++-- .../pages/control/event/dispatch/data.js | 2 +- .../pages/control/manual/events/data.js | 2 +- .../components/deviceSummary/index.vue | 10 ++--- .../eventDetection/statistics/data.js | 2 +- .../JiHeExpressway/pages/safe/files/index.vue | 1 + .../src/views/event/event/dispatchYuan.vue | 2 +- ruoyi-ui/vue.config.js | 4 +- 15 files changed, 65 insertions(+), 20 deletions(-) rename ruoyi-ui/src/views/JiHeExpressway/images/{layer/路测设备 => deviceType}/180全景摄像机.svg (100%) rename ruoyi-ui/src/views/JiHeExpressway/images/{layer/路测设备 => deviceType}/360全景摄像机.svg (100%) rename ruoyi-ui/src/views/JiHeExpressway/images/{layer/路测设备 => deviceType}/桥下球机.svg (100%) rename ruoyi-ui/src/views/JiHeExpressway/images/{layer/路测设备 => deviceType}/站前悬臂式可变信息标志.svg (100%) rename ruoyi-ui/src/views/JiHeExpressway/images/{layer/路测设备 => deviceType}/雨棚可变信息标志.svg (100%) diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/180全景摄像机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/180全景摄像机.svg similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/180全景摄像机.svg rename to ruoyi-ui/src/views/JiHeExpressway/images/deviceType/180全景摄像机.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/360全景摄像机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/360全景摄像机.svg similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/360全景摄像机.svg rename to ruoyi-ui/src/views/JiHeExpressway/images/deviceType/360全景摄像机.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/桥下球机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/桥下球机.svg similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/桥下球机.svg rename to ruoyi-ui/src/views/JiHeExpressway/images/deviceType/桥下球机.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/站前悬臂式可变信息标志.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/站前悬臂式可变信息标志.svg similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/站前悬臂式可变信息标志.svg rename to ruoyi-ui/src/views/JiHeExpressway/images/deviceType/站前悬臂式可变信息标志.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/雨棚可变信息标志.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/雨棚可变信息标志.svg similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/雨棚可变信息标志.svg rename to ruoyi-ui/src/views/JiHeExpressway/images/deviceType/雨棚可变信息标志.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue index 37303cda..755bc93d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue @@ -224,7 +224,8 @@ export default { '重要事件已报送' ], linkEvent:[], - linkEventIndex:0 + linkEventIndex:0, + remark: '' }; }, @@ -380,6 +381,8 @@ export default { if (!isLt2M) { this.$message.error('上传图片或视频大小不能超过 20MB'); } + this.remark = `${file.name} ${(file.size/1024/1024).toFixed(1)}MB` + console.log(this.remark,file,3334) return isLt2M; }, // 上传成功 @@ -402,10 +405,12 @@ export default { if (this.context || this.imageUrl) { let content = ""; + let remark = ""; if (this.testRadio == "input") { content = this.context; } else { content = this.imageUrl; + remark = this.remark; } let type = this.containsArrayElement(this.imageUrl, this.fileType); let data = { @@ -413,6 +418,7 @@ export default { processId: this.processId, processName: this.processName, context: content, + remark, // file: this.imageUrl, type: type && type.length > 0 ? type.join(",") : "text", source: 1, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue index ed1962cb..65574a78 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue @@ -50,7 +50,10 @@ export default { modelVisible: { get() { if (this.visible) { - this.initData() + if(!this.fData.eventSubclass){ + this.initData() + } + } return this.visible; }, @@ -65,11 +68,11 @@ export default { methods: { async initData() { let config = _.cloneDeep(configList['交通管制']); - config[config.length-1].options.options = config[config.length-1].options.options.slice(0,7) const value = this.eventSubclass; - config[0].default = value; + + let facilityType = 1; if (value == "3-2") { facilityType = 1; @@ -80,7 +83,7 @@ export default { } //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 if (value && value != "3-1") { - getFacilities(facilityType, config) + await getFacilities(facilityType, config) } config[1].default = this.controlType; if(value === '3-4'){ @@ -156,6 +159,8 @@ export default { ], }; config[13].options.options = cs[this.controlType] + + config[0].default = value; this.formConfigList = config; }, onSubmit() { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue index 9ba215de..46b1013b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue @@ -3,18 +3,23 @@
-
+

调度记录

{{ startTime }} 至 {{ endTime }}
-
+
{{ beautifyOperationTime(item.operationTime) }}
{{ item.operatorName }}
+
【{{ item.processName }}】
- +
+
{{ item.remark }}
+ +
+
【{{ item.processName }}】 {{ item.context }}
@@ -73,7 +78,35 @@ export default { }, methods: { print(){ - window.print(); + var printContent = document.getElementById('printbody').innerHTML; + var l=(screen.availWidth-1080)/2; + var t=(screen.availHeight-400)/2; + + var printWindow = window.open('', '_blank', 'height=400,width=1080,top='+t+',left='+l+',toolbar=no,menubar=no,location=no,status=yes'); + + + printWindow.document.write('打印区域'); + + + printWindow.document.write(''); + + printWindow.document.write(`

调度记录

${ this.startTime } 至 ${ this.endTime }

`); + printWindow.document.write(``); + printContent = printContent.replace(/width: 130px;/g,'width: 170px;') + printContent = printContent.replace(/class="el-image__inner el-image__preview"/g,'style="width:400px;height:auto"') + printContent = printContent.replace(/display: flex; gap: 10px;/g,'display: flex; gap: 10px;margin-bottom:10px') + printContent = printContent.replace(/width: 200px; height: 160px;/g,'display: none; width: 200px; height: 160px;') + + console.log(printContent) + printWindow.document.write(printContent); + + + printWindow.document.write(''); + + + + + printWindow.print(); }, initData() { request({ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js index 861cd96e..b7333ba3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js @@ -41,7 +41,7 @@ export const searchFormList = [ label: "济南方向", }, { - key: "2", + key: "", label: "双向", }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js index b93a91e5..61bad433 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js @@ -77,7 +77,7 @@ export const searchFormList = [ label: "济南方向", }, { - key: "2", + key: "", label: "双向", }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue index c3d57ac6..35c4292c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue @@ -24,11 +24,11 @@ v-if="item.title.includes('雷达')" /> 是否确认执行?
-
+
取 消
确 认
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 8a6938ed..e28791c7 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -37,13 +37,13 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://127.0.0.1:8087`, - target:`http://10.0.111.11:8097`, + // target:`http://10.0.111.11:8097`, // target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟凡峰 // target: `http://10.168.79.46:8089`, //王家宝 - // target: `http://10.168.77.128:8087`, //王兴琳 + target: `http://10.168.77.128:8087`, //王兴琳 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",