diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 70e7f16d..9a1cbf94 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -177,12 +177,12 @@ export default [
path: "/service/board",
component: "service/board/index.vue",
},
- // {
- // title: "情报板记录",
- // name: "boardRecord",
- // path: "/service/boardRecord",
- // component: "service/boardRecord/index.vue",
- // },
+ {
+ title: "情报板记录",
+ name: "boardRecord",
+ path: "/service/boardRecord",
+ component: "service/boardRecord/index.vue",
+ },
{
title: "情报板敏感词",
name: "sensitive",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
index 51c3e6da..b3b7d445 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
@@ -74,7 +74,7 @@ export default {
this.boardStyle = {
width: `${arr[0] * scale}px`,
height: `${arr[1] * scale}px`,
- "background-color":`${this.tpl.backgroundColor}px`,
+ "background-color":`${this.tpl.backgroundColor}`,
"align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.verticalAlignment] //模板的字段为为formatStyle
}
let fontSize = 0;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue
new file mode 100644
index 00000000..b4f2cfeb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
\ No newline at end of file
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 a6218c69..bd10cfeb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -1,6 +1,5 @@
-
@@ -22,22 +21,38 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -56,16 +71,20 @@ import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
import Pagination from '@screen/components/Pagination.vue';
import Table from '@screen/components/Table.vue';
import request from "@/utils/request";
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
+import {DirectionTypes} from '@screen/utils/enum.js';
export default {
name: 'boardRecord',
components: {
ButtonGradient,
Pagination,
- Table
+ Table,
+ BoardRecordPreview
},
data() {
return {
+ testData : {"STAY":"30","ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"32","CONTENT":"因改扩建施工 平阴南、梁山收费站出入口封闭","width":"768","height":"64","formatStyle":"2"},
tableData: [],
isShowPhrases: false,
isShowDisposal: false,
@@ -83,9 +102,18 @@ export default {
this.initData();
},
methods: {
+ indexMethod(index) {
+ return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+ },
+ formatterDirection(row, column) {
+ return DirectionTypes[row.direction];
+ },
+ formatterStatus(row, column) {
+ return ["","成功"][row.releaseStatus];
+ },
initData() {
request({
- url: `/business/dcEventType/list`,
+ url: `/business/boardReleaseLog/list`,
method: "get",
params: this.searchData,
}).then((result) => {
@@ -96,44 +124,14 @@ export default {
},
onRefresh() {
this.tableData = [];
- setTimeout(() => {
- this.initData();
- }, 100);
+ this.searchData.pageNum = 1;
+ this.initData();
},
onSizeChange(pageSize) {
+ this.tableData = [];
this.searchData.pageSize = pageSize;
- this.getData();
- },
- showPhrases(data) {
- if (data?.processConfigList.length <= 0) {
- Message.warning('请先配置流程!');
- return;
- }
- let process = []
- data.processConfigList.forEach(it => {
- process.push({
- id: it.id,
- commonPhrases: it.commonPhrases,
- label: it.processNode,
- isActive: false,
- })
- })
- this.process = process;
- this.isShowPhrases = true;
- this.eventType = data.eventType;
- },
- showDisposal(eventType) {
- this.isShowDisposal = true;
- this.eventType = eventType;
- },
- onClosePhrases() {
- this.isShowPhrases = false
- },
- onCloseDisposal() {
- this.isShowDisposal = false;
- },
- onUpdatePhrasesData(phrasesData) {
- this.phrasesData = phrasesData;
+ this.searchData.pageNum = 1;
+ this.initData();
}
}
}
@@ -141,14 +139,11 @@ export default {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 12505ec7..69be49da 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -31,7 +31,7 @@ module.exports = {
devServer: {
host: "0.0.0.0",
port: port,
- https: true,
+ // https: true,
open: true,
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -52,8 +52,8 @@ module.exports = {
// target: `http://10.0.81.204:8087`, //现场后台 刘文阁
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// 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.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+ // target: `http://10.168.68.42:8087`, //王思祥
// target: `http://10.168.65.194:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝