From d45fffd06613a6f0984aa8b6da669a8b618199fc Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Thu, 9 May 2024 17:23:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=83=85=E6=8A=A5?=
=?UTF-8?q?=E6=9D=BF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/service/boardRecord/index.vue | 27 ++++++++++++-------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
index 3c45b286..061b54d9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -22,18 +22,23 @@
<!-- 内容 -->
<div class="body">
<Table :data="tableData" height="100%">
- <el-table-column label="序号" type="index" :index="indexMethod" width="100" />
- <ElTableColumn label="发布时间" prop="operTime" width="280">
+ <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
+ header-align="center" />
+ <ElTableColumn label="发布时间" prop="operTime" width="280" align="center" header-align="center">
<template slot-scope="scope">
{{ moment(scope.row.operTime).format("yyyy/MM/DD hh:mm") }}
</template>
</ElTableColumn>
- <ElTableColumn label="设备ID" prop="dcDeviceId" width="120">
+ <ElTableColumn label="设备ID" prop="dcDeviceId" width="120" align="center" header-align="center">
<template slot-scope="scope">
{{ JSON.parse(scope.row.dcDeviceId).join("、") }}
</template>
</ElTableColumn>
- <ElTableColumn label="设备名称" prop="dcDeviceName" />
+ <ElTableColumn label="设备名称" prop="dcDeviceName" align="center" header-align="center">
+ <template slot-scope="scope">
+ {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
+ </template>
+ </ElTableColumn>
<ElTableColumn label="内容" prop="operParam" width="400" header-align="center">
<template slot-scope="scope">
<el-carousel direction="horizontal" :autoplay="false" indicator-position="inside" height="80px"
@@ -45,13 +50,18 @@
</el-carousel>
</template>
</ElTableColumn>
- <ElTableColumn label="状态" prop="status" width="140" :formatter="formatterStatus" />
- <ElTableColumn label="用户名" prop="operName" width="160" />
- <ElTableColumn label="用户IP" prop="operIp" width="200">
+ <ElTableColumn label="用户名" prop="operName" width="160" align="center" header-align="center" />
+ <ElTableColumn label="用户IP" prop="operIp" width="200" align="center" header-align="center">
<template slot-scope="scope">
{{ ["unknown"].includes(scope.row.operIp) ? "" : scope.row.operIp }}
</template>
</ElTableColumn>
+ <ElTableColumn label="发布结果" prop="status" width="140" align="center" header-align="center">
+ <template slot-scope="scope">
+ <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 1"></i>
+ <i class="el-icon-error" style="font-size: 24px; color:#BBB;" v-else></i>
+ </template>
+ </ElTableColumn>
</Table>
</div>
@@ -149,9 +159,6 @@ export default {
formatterDirection(row, column) {
return DirectionTypes[row.direction];
},
- formatterStatus(row, column) {
- return ["失败", "成功"][row.releaseStatus];
- },
initData() {
request({
url: `/business/dcOperLog/list`,
From 4845af1c934493638f62e2869a5a2cbf0b31007b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Thu, 9 May 2024 17:25:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
=?UTF-8?q?=E6=8E=A7=E5=88=B6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../images/shareWith/message-active.svg | 12 +++++++-----
.../images/shareWith/message-active2.svg | 9 +++++++++
.../pages/Home/components/HomeFrameControl/index.vue | 7 +++++--
3 files changed, 21 insertions(+), 7 deletions(-)
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
index e07f38e9..53329e6a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
@@ -1,9 +1,11 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="短信">
-<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814973">
+<g id="短信-灰">
+<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
<g id="Group 1142814681">
-<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
+<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
+</g>
</g>
</g>
</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
new file mode 100644
index 00000000..e07f38e9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
@@ -0,0 +1,9 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="短信">
+<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
+<g id="Group 1142814681">
+<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index 7b231d2a..fea8dc43 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -408,8 +408,7 @@ export default {
},
methods: {
onHide(){
- this.data['deviceType']=deviceTypeDefault;
- changeHandle(this.data, this.formList);
+ // TODO
},
submitClick() {
this.$refs.ControlComponent?.handleSubmit();
@@ -430,6 +429,10 @@ export default {
},
handleClick(type) {
this.activeIcon = this.activeIcon === type ? null : type;
+ if(this.activeIcon){
+ this.data['deviceType']=deviceTypeDefault;
+ changeHandle(this.data, this.formList);
+ }
},
filterEnd(data) {
this.activeIcon = null;
From 33e841743ccf88c1a2ae824628c7ef03f1672537 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Thu, 9 May 2024 17:28:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E8=A6=81=E4=BA=8B=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/Dialog/index.vue | 40 ++-
.../DisposalProcess/DialogVisible/index.vue | 289 +++++++++++++++++-
.../Cards/DisposalProcess/index.vue | 2 +-
.../components/Eventfiltering/index.vue | 22 +-
.../components/Sitefiltering/index.vue | 20 +-
.../components/infoWarning/index.vue | 24 +-
.../pages/perception/topology/index.vue | 2 +-
.../changesIndicators/assets/charts3.js | 156 +++++-----
.../components/AddNEditDialog.vue | 20 +-
9 files changed, 443 insertions(+), 132 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index da63a7db..1506a111 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -1,23 +1,41 @@
<template>
<Teleport>
<Transition name="fade">
- <div :class="['mask-layer', { 'none-mask': noneMask }]" v-if="modelVisible">
- <BackgroundClip class="dialog"
+ <div
+ :class="['mask-layer', { 'none-mask': noneMask }]"
+ v-if="modelVisible"
+ >
+ <BackgroundClip
+ class="dialog"
clipPath="polygon(calc(100% - var(--clip-width)) 0, 100% var(--clip-width), 100% 100%, var(--clip-width) 100%, 0 calc(100% - var(--clip-width)), 0 0)"
borderColor="linear-gradient(180deg, rgba(78, 174, 204, .9), rgba(78, 174, 204, 0))"
bgColor="linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%)"
- ref="DialogContentRef" :width="width" :top="top" :right="right">
+ ref="DialogContentRef"
+ :width="width"
+ :top="top"
+ :right="right"
+ >
<div class="dialog-title">
- <img class="title-icon" src="@screen/images/dialog/title-icon.svg" />
+ <img
+ class="title-icon"
+ src="@screen/images/dialog/title-icon.svg"
+ />
<span>{{ title }}</span>
- <img class="icon-close" @click.stop="close()" src="@screen/images/dialog/icon-close.svg" />
+ <img
+ class="icon-close"
+ @click.stop="close()"
+ src="@screen/images/dialog/icon-close.svg"
+ />
</div>
<div class="dialog-content">
<slot />
</div>
- <img class="bottom-right" src="@screen/images/dialog/right-bottom.svg" />
+ <img
+ class="bottom-right"
+ src="@screen/images/dialog/right-bottom.svg"
+ />
<div class="footer" v-if="$slots.footer">
<slot name="footer"></slot>
@@ -86,9 +104,9 @@ export default {
},
},
methods: {
- close(){
- console.log('------')
- this.modelVisible = false
+ close() {
+ console.log("------");
+ this.modelVisible = false;
},
updateDialogVisible(bool) {
this.modelVisible = bool;
@@ -195,7 +213,7 @@ export default {
.dialog-content {
padding: 9px 21px 27px 21px;
- max-height: 75vh;
+ max-height: 95vh;
overflow-y: auto;
}
@@ -215,7 +233,7 @@ export default {
padding: 0 27px;
::v-deep {
- >div {
+ > div {
min-width: 96px;
}
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
index be554ad2..6db2d81a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
@@ -37,7 +37,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="初报" name="second">
- <div class="file" ref="file">
+ <div class="file" ref="file" id="export-box">
<div class="file-box">
<el-form>
<div class="file-title">重要事件</div>
@@ -103,6 +103,234 @@
</el-tab-pane>
<el-tab-pane label="续报" name="third"> </el-tab-pane>
<el-tab-pane label="终报" name="fourth"> </el-tab-pane>
+ <Dialog style="" v-model="showDocx" width="1085px" top="60px">
+ <div class="docx-wrapper">
+ <section
+ ref="initFile"
+ class="docx"
+ style="
+ padding: 72pt 90.15pt;
+ width: 595.3pt;
+ min-height: 741.9pt;
+ column-count: 1;
+ column-gap: 36pt;
+ "
+ >
+ <article>
+ <p
+ style="
+ line-height: 1;
+ text-align: center;
+ vertical-align: baseline;
+ margin-bottom: 10px;
+ "
+ >
+ <span
+ lang="en-US"
+ style="
+ font-family: 方正小标宋简体;
+ color: rgb(255, 0, 0);
+ min-height: 44pt;
+ font-size: 44pt;
+ font-weight: bold;
+ "
+ >重要事件</span
+ >
+ </p>
+ <p
+ style="
+ margin-bottom: 2pt;
+ min-height: 15pt;
+ line-height: 15pt;
+ text-align: center;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ lang="null"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ min-height: 10.5pt;
+ font-size: 10.5pt;
+ "
+ >报送单位：</span
+ ><span
+ lang="en-US"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ min-height: 10.5pt;
+ font-size: 10.5pt;
+ "
+ >山东高速青岛发展有限公司运营管理事业部 </span
+ ><span
+ lang="null"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ min-height: 10.5pt;
+ font-size: 10.5pt;
+ "
+ >报送时间：</span
+ ><span
+ lang="en-US"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ min-height: 10.5pt;
+ font-size: 10.5pt;
+ "
+ >2024年05月09日15时40分</span
+ >
+ </p>
+ <p
+ style="
+ margin-bottom: 1pt;
+ min-height: 10pt;
+ line-height: 10pt;
+ text-align: center;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ style="
+ font-family: 'Times New Roman';
+ font-weight: bold;
+ color: rgb(255, 0, 0);
+ min-height: 22pt;
+ font-size: 22pt;
+ "
+ >——————————————————</span
+ >
+ </p>
+ <p
+ style="
+ margin-bottom: 6pt;
+ min-height: 25pt;
+ line-height: 25pt;
+ text-align: center;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ lang="en-US"
+ style="
+ font-family: 方正小标宋简体;
+ min-height: 22pt;
+ font-size: 22pt;
+ font-weight: bold;
+ "
+ >关于G15沈海高速K502+222交通事故的初报</span
+ >
+ </p>
+ <p
+ style="
+ text-indent: 0pt;
+ text-align: left;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ lang="en-US"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ color: black;
+ min-height: 16pt;
+ font-size: 16pt;
+ "
+ >智慧管理中心：</span
+ >
+ </p>
+ <p
+ style="
+ line-height: 1.5;
+ text-indent: 0pt;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ lang="en-US"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ color: black;
+ min-height: 16pt;
+ font-size: 16pt;
+ "
+ >
+ 2024年05月09日11时02分，G15沈海高速K502+222沈阳方向发生侧翻事故，行1车道、行2车道、应急车道正常通行，无压车。</span
+ ><span><br /></span
+ ><span
+ lang="en-US"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ color: black;
+ min-height: 16pt;
+ font-size: 16pt;
+ "
+ >
+ 未到达现场的情况：路管、交警、消防、医疗等单位正在赶往现场，具体情况稍后报告。</span
+ >
+ </p>
+ <p style="vertical-align: baseline"><span id="_GoBack"></span></p>
+ <p style="vertical-align: baseline"></p>
+ <p style="vertical-align: baseline"></p>
+ <p style="vertical-align: baseline"></p>
+ <p
+ style="
+ line-height: 1;
+ text-indent: 0pt;
+ vertical-align: baseline;
+ "
+ ></p>
+ <p style="vertical-align: baseline"></p>
+ <p
+ style="
+ margin-bottom: 1pt;
+ min-height: 10pt;
+ line-height: 10pt;
+ text-align: center;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ style="
+ font-family: 'Times New Roman';
+ font-weight: bold;
+ color: rgb(255, 0, 0);
+ min-height: 22pt;
+ font-size: 22pt;
+ "
+ >——————————————————</span
+ >
+ </p>
+ <p
+ class="docx-num-0-0"
+ style="
+ margin-top: 0pt;
+ text-align: center;
+ vertical-align: baseline;
+ "
+ >
+ <span
+ lang="en-US"
+ style="
+ font-family: 仿宋_GB2312;
+ font-weight: normal;
+ min-height: 14pt;
+ font-size: 14pt;
+ "
+ >填报人:智慧高速菜单 联系电话:18678866677 签发人：郭璐明</span
+ >
+ </p>
+ </article>
+ </section>
+ <button @click="handleDownload">下载</button>
+ </div>
+ </Dialog>
</el-tabs>
</Dialog>
</template>
@@ -144,6 +372,7 @@ export default {
data() {
return {
// formList,
+ showDocx: false,
fData: {},
formConfigList: [],
reportList,
@@ -345,16 +574,19 @@ export default {
});
},
handlePreview() {
- const fileContent = this.$refs.file.innerHTML;
- console.log(77777);
- console.log(fileContent);
- // 将HTML转换为DOCX
+ this.showDocx = true;
+ },
+ handleDownload() {
+ console.log("下载");
+ // 获取HTML内容
+ const fileContent = this.$refs.initFile.innerHTML;
+ // // 将HTML转换为DOCX
const doc = htmlDocx.asBlob(fileContent);
-
- // 下载生成的文档
- FileSaver.saveAs(doc, "document.docx");
+ // // 下载生成的文档
+ FileSaver.saveAs(doc, "初报.docx");
},
},
+
mounted() {
this.initData();
this.getReportData();
@@ -513,9 +745,50 @@ export default {
}
.footer {
display: flex;
+ width: 35%;
+ margin: auto;
+ margin-top: 30px;
+ justify-content: space-around;
+ // display: flex;
+ // flex-flow: row-reverse;
+ div {
+ margin-left: 20px;
+ }
}
::v-deep .el-tabs__content {
overflow: auto;
position: relative;
}
+.docx-wrapper {
+ background: #fff;
+ padding: 30px;
+ display: flex;
+ flex-flow: column;
+ align-items: center;
+ > section.docx {
+ background: white;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+ margin-bottom: 30px;
+ }
+ .docx p,
+ p.docx_1 span {
+ font-family: var(--docx-minorHAnsi-font);
+ color: #00000a;
+ min-height: 11pt;
+ font-size: 11pt;
+ }
+ button {
+ cursor: pointer;
+ width: 100px;
+ height: 35px;
+ line-height: 35px;
+ color: #fff;
+ background: #00b3cc;
+ border-radius: 48px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border: none;
+ }
+}
</style>
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 c1a15cd8..5ed1dc2d 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
@@ -212,7 +212,7 @@ export default {
time: item.operationTime
? new Date(item.operationTime).toLocaleString()
: null,
- name: item.operator,
+ name: item.operatorName,
desc: item.context,
source: item.source,
// posts: '淄博发展公司管理员'
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
index 21e8bfc2..9e44e29f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
@@ -158,17 +158,17 @@ export default {
gr.addColorStop(1, "rgba(92,197,255,0)");
gr.addColorStop(0, "rgba(92,197,255,0.5)");
context.lineWidth = 1; // 设置线段宽度
- drawRoundRect(context, 410, 134, 380, 24, 12, gr);
- drawRoundRect(context, 410, 168, 320, 24, 10, gr);
- drawRoundRect(context, 410, 202, 320, 24, 10, gr);
- drawRoundRect(context, 410, 236, 320, 24, 10, gr);
- drawRoundRect(context, 410, 270, 320, 24, 10, gr);
- drawRoundRect(context, 410, 304, 320, 24, 10, gr);
- drawRoundRect(context, 410, 338, 320, 24, 10, gr);
- drawRoundRect(context, 410, 372, 320, 24, 10, gr);
- drawRoundRect(context, 410, 406, 320, 24, 10, gr);
- drawRoundRect(context, 410, 440, 320, 24, 10, gr);
- drawRoundRect(context, 410, 474, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 128, 380, 24, 12, gr);
+ drawRoundRect(context, 410, 162, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 196, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 230, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 264, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 298, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 332, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 366, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 400, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 434, 320, 24, 10, gr);
+ drawRoundRect(context, 410, 468, 320, 24, 10, gr);
console.log("this.formData", this.formData);
await this.getNonAutomaticWarningType(this.formData);
// drawRoundRect(context, 410, 508, 320, 24, 10, gr);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
index 804e76cc..1f087745 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
@@ -181,16 +181,16 @@ export default {
gr.addColorStop(1, "rgba(92,197,255,0)");
gr.addColorStop(0, "rgba(92,197,255,0.5)");
context.lineWidth = 1; // 设置线段宽度
- drawRoundRect(context, 385, 134, 320, 24, 12, gr);
- drawRoundRect(context, 385, 168, 320, 24, 10, gr);
- drawRoundRect(context, 385, 202, 320, 24, 10, gr);
- drawRoundRect(context, 385, 236, 320, 24, 10, gr);
- drawRoundRect(context, 385, 270, 320, 24, 10, gr);
- drawRoundRect(context, 385, 304, 320, 24, 10, gr);
- drawRoundRect(context, 385, 338, 320, 24, 10, gr);
- drawRoundRect(context, 385, 372, 320, 24, 10, gr);
- drawRoundRect(context, 385, 406, 320, 24, 10, gr);
- drawRoundRect(context, 385, 440, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 128, 320, 24, 12, gr);
+ drawRoundRect(context, 385, 162, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 196, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 230, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 264, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 298, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 332, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 366, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 400, 320, 24, 10, gr);
+ drawRoundRect(context, 385, 434, 320, 24, 10, gr);
// drawRoundRect(context, 385, 474, 320, 24, 10, gr);
// drawRoundRect(context, 385, 510, 320, 24, 10, gr);
await this.getNonAutomaticWarningFacility(this.formData);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
index 8c12fbdb..14cf0f62 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
@@ -123,21 +123,21 @@ export default {
val === "Blue" &&
["White", "Blue", "Green"].includes(item.severityColor)
) {
- item.severityColorText = "蓝色";
+ // item.severityColorText = "蓝色";
this.warningList.push(item);
} else if (
val === "Red" &&
["Red", "Black"].includes(item.severityColor)
) {
- item.severityColorText = "红色";
+ // item.severityColorText = "红色";
this.warningList.push(item);
} else if (val === "Yellow" && item.severityColor === "Yellow") {
- item.severityColorText = "黄色";
+ // item.severityColorText = "黄色";
this.warningList.push(item);
} else if (val === "Orange" && item.severityColor === "Orange") {
- item.severityColorText = "橙色";
+ // item.severityColorText = "橙色";
this.warningList.push(item);
- } else if (!["Blue", "Red", "Yellow", "Orange"].includes(val)) {
+ } else if (val === "all") {
// 确保只有当val不是预定义颜色时才推送
this.warningList.push(item);
}
@@ -157,6 +157,18 @@ export default {
}
}
this.warningData = data;
+ this.warningData.forEach((item) => {
+ if (["White", "Blue", "Green"].includes(item.severityColor)) {
+ item.severityColorText = "蓝色";
+ } else if (["Red", "Black"].includes(item.severityColor)) {
+ item.severityColorText = "红色";
+ } else if (item.severityColor === "Yellow") {
+ item.severityColorText = "黄色";
+ } else if (item.severityColor === "Orange") {
+ item.severityColorText = "橙色";
+ }
+ });
+
this.warningList = this.warningData;
});
},
@@ -207,6 +219,7 @@ export default {
flex-direction: column;
width: 100%;
height: calc(100% - 40px);
+ overflow-y: auto;
> div::after {
content: "";
@@ -317,6 +330,7 @@ export default {
.right-text {
color: #fff;
+ overflow-y: auto;
}
}
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
index 77bfa3c2..2bdd5b33 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
@@ -443,7 +443,7 @@ export default {
position: absolute;
display: flex;
justify-content: space-around;
- height: 310px;
+ height: 307px;
padding: 0 20px;
overflow-y: hidden;
overflow-x: auto;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
index 3504726a..7cde73b1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
@@ -180,32 +180,32 @@ let options = {
},
data: data2,
},
- {
- name: null,
- type: "scatter",
- emphasis: {
- scale: false,
- },
- symbol:
- "image://data:image/png;base64,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",
- symbolSize: [20, 20],
- symbolOffset: ["-115%", 0],
- itemStyle: {
- color: "#E2BA74",
- shadowColor: "#E2BA74",
- shadowBlur: 5,
- borderWidth: 1,
- opacity: 1,
- },
- z: 1,
- zlevel: 10,
- left: "-100%",
- data: data2,
- animationDelay: 100,
- tooltip: {
- show: false,
- },
- },
+ // {
+ // name: null,
+ // type: "scatter",
+ // emphasis: {
+ // scale: false,
+ // },
+ // symbol:
+ // "image://data:image/png;base64,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",
+ // symbolSize: [20, 20],
+ // symbolOffset: ["-115%", 0],
+ // itemStyle: {
+ // color: "#E2BA74",
+ // shadowColor: "#E2BA74",
+ // shadowBlur: 5,
+ // borderWidth: 1,
+ // opacity: 1,
+ // },
+ // z: 1,
+ // zlevel: 10,
+ // left: "-100%",
+ // data: data2,
+ // animationDelay: 100,
+ // tooltip: {
+ // show: false,
+ // },
+ // },
// 下半截柱状图linear-gradient(180deg, #61D8FF 0%, #003B4E 100%); linear-gradient(180deg, #06D7B1 0%, #003B4E 100%)
{
name: "交通特征",
@@ -267,32 +267,32 @@ let options = {
data: data1,
},
// 进度条的小圆圈
- {
- name: "",
- type: "scatter",
- emphasis: {
- scale: false,
- },
- symbol:
- "image://data:image/png;base64,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",
- symbolSize: [20, 20],
- symbolOffset: ["1%", 0],
- itemStyle: {
- color: "#FFF",
- shadowColor: "#00E4BB53",
- shadowBlur: 5,
- borderWidth: 1,
- opacity: 1,
- },
- z: 2,
- zlevel: 10,
- left: 10,
- data: data1,
- animationDelay: 500,
- tooltip: {
- show: false,
- },
- },
+ // {
+ // name: "",
+ // type: "scatter",
+ // emphasis: {
+ // scale: false,
+ // },
+ // symbol:
+ // "image://data:image/png;base64,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",
+ // symbolSize: [20, 20],
+ // symbolOffset: ["1%", 0],
+ // itemStyle: {
+ // color: "#FFF",
+ // shadowColor: "#00E4BB53",
+ // shadowBlur: 5,
+ // borderWidth: 1,
+ // opacity: 1,
+ // },
+ // z: 2,
+ // zlevel: 10,
+ // left: 10,
+ // data: data1,
+ // animationDelay: 500,
+ // tooltip: {
+ // show: false,
+ // },
+ // },
{
name: "拥挤度",
type: "bar",
@@ -351,32 +351,32 @@ let options = {
},
data: data2,
},
- {
- name: "",
- type: "scatter",
- emphasis: {
- scale: false,
- },
- symbol:
- "image://data:image/png;base64,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",
- symbolSize: [20, 20],
- symbolOffset: ["110%", 0],
- itemStyle: {
- color: "#FCBE39",
- shadowColor: "#FCBE3953",
- shadowBlur: 5,
- borderWidth: 1,
- opacity: 1,
- },
- z: 1,
- zlevel: 10,
- left: "-100%",
- data: data2,
- animationDelay: 100,
- tooltip: {
- show: false,
- },
- },
+ // {
+ // name: "",
+ // type: "scatter",
+ // emphasis: {
+ // scale: false,
+ // },
+ // symbol:
+ // "image://data:image/png;base64,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",
+ // symbolSize: [20, 20],
+ // symbolOffset: ["110%", 0],
+ // itemStyle: {
+ // color: "#FCBE39",
+ // shadowColor: "#FCBE3953",
+ // shadowBlur: 5,
+ // borderWidth: 1,
+ // opacity: 1,
+ // },
+ // z: 1,
+ // zlevel: 10,
+ // left: "-100%",
+ // data: data2,
+ // animationDelay: 100,
+ // tooltip: {
+ // show: false,
+ // },
+ // },
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
index b1ae798c..aec8da58 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
@@ -216,6 +216,7 @@ export default {
this.formList[0].options.disabled = true;
} else {
this.formData = null;
+ this.formList[0].options.disabled = false;
}
},
immediate: true,
@@ -230,19 +231,24 @@ export default {
// }
this.$refs.FormConfigRef.validate().then((data) => {
this.submitting = true;
- let params = {
- ...this.formData,
- id: this.data.id,
- publishChannels: publishChannels.toString(),
- };
- if (this.data.id) {
+
+ if (this.data && this.data.id) {
+ let params = {
+ ...this.formData,
+ id: this.data.id,
+ publishChannels: this.formData.publishChannels.toString(),
+ };
editChannels(params).then((res) => {
this.modelVisible = false;
this.submitting = false;
this.$parent.handleSearch();
});
} else {
- addChannels(this.formData).then((res) => {
+ let params = {
+ ...this.formData,
+ publishChannels: this.formData.publishChannels.toString(),
+ };
+ addChannels(params).then((res) => {
this.modelVisible = false;
this.submitting = false;
this.$parent.handleSearch();