From 569c8e43e0672c137e72693158fae246caac1bac Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Thu, 18 Jan 2024 20:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.DS_Store | Bin 10244 -> 10244 bytes
.../infoBoard}/BoardInfoEditor.vue | 86 ++---
.../infoBoard}/BoardPreview.vue | 0
.../infoBoard}/BoardTplPreview.vue | 0
.../pages/Home/components/InfoBoard/index.vue | 302 ++++++++++++++++--
.../views/JiHeExpressway/pages/Home/index.vue | 26 +-
.../pages/service/board/index.vue | 124 +++----
.../views/JiHeExpressway/utils/infoBoard.js | 9 +-
8 files changed, 409 insertions(+), 138 deletions(-)
rename ruoyi-ui/src/views/JiHeExpressway/{pages/service/board => components/infoBoard}/BoardInfoEditor.vue (91%)
rename ruoyi-ui/src/views/JiHeExpressway/{pages/service/board => components/infoBoard}/BoardPreview.vue (100%)
rename ruoyi-ui/src/views/JiHeExpressway/{pages/service/board => components/infoBoard}/BoardTplPreview.vue (100%)
diff --git a/.DS_Store b/.DS_Store
index 1cc8dd8235f198ece13aad2a0fa42ebd4e9d02ab..8bc7c4ea82a48d00533643d592b56d1fb6779c1e 100644
GIT binary patch
delta 22
dcmZn(XbISmA<1cEV4|a-Yh+}xxlnR49{^7B25bNT
delta 22
dcmZn(XbISmA<1cMW}%~?Yh+@&xlnR49{^8!26g}d
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
similarity index 91%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardInfoEditor.vue
rename to ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
index b00b4288..7870aad5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardInfoEditor.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
@@ -99,8 +99,8 @@
import { getTemplateList, addTemplate, addTemplateContent, editTemplateContent, editTemplate, deleteTemplate, getTemplateContent, getGalleryList, getFontSizeByDevicePixel, uploadBoardEditInfo } from '@/api/board/template'
import { devicessize } from '@/api/information/api.js'
import { checkIotBoardContent } from '@/api/board/vocabulary'
-import BoardPreview from "./BoardPreview.vue"
-import BoardTplPreview from "./BoardTplPreview.vue"
+import BoardPreview from "@screen/components/infoBoard/BoardPreview.vue"
+import BoardTplPreview from "@screen/components/infoBoard/BoardTplPreview.vue"
import infoBoardUtils from "@screen/utils/infoBoard.js"
export default {
data() {
@@ -191,7 +191,39 @@ export default {
templateCategoryList: [],
infoType: '',
devicePixelBoolean: false,
- categoryRules: false
+ categoryRules: false,
+ tplDefault: {
+ "residenceTime": "50",
+ "intonation": "0",
+ "fontSpacing": "1",
+ "screenEntryMethod": "1",
+ "screenOutputMethod": "1",
+ "lineSpacing": "0",
+ "yCoordinate": "0",
+ "whetherToSynchronizePlayback": "0",
+ "whetherToPlayText": "0",
+ "playbackCount": "1",
+ "flashingFrequency": "5",
+ "backgroundColor": "8",
+ "foregroundColor": "FFFF00",
+ "textContent": "",
+ "fontStyle": "0",
+ "displayAreaWidth": "768",
+ "playbackDuration": "50",
+ "displayAreaHeight": "64",
+ "volume": "0",
+ "xCoordinate": "0",
+ "screenEntrySpeed": "1",
+ "horizontalAlignment": "2",
+ "playSpecialEffects": "0",
+ "setUpTheSpeaker": "0",
+ "flickerSpeed": "0",
+ "specialEffectsSpeed": "1",
+ "fontSize": "64",
+ "verticalAlignment": "2",
+ "speechSpeed": "0",
+ "font": "3"
+ }
}
},
props:{
@@ -275,9 +307,9 @@ export default {
// console.log(res.data , "++++++++===========");
// })
if(this.mode=="add"){
- let tplDefault= null;
+ let tempTpl= null;
if(this.type=="template"){
- tplDefault = {
+ tempTpl = {
category: this.templateCategoryList[0].dictValue,
formatStyle: 0,
content: "",
@@ -290,42 +322,11 @@ export default {
}
}
else{
- tplDefault = {
- "residenceTime": "50",
- "intonation": "0",
- "fontSpacing": "1",
- "screenEntryMethod": "1",
- "screenOutputMethod": "1",
- "lineSpacing": "0",
- "yCoordinate": "0",
- "whetherToSynchronizePlayback": "0",
- "whetherToPlayText": "0",
- "playbackCount": "1",
- "flashingFrequency": "5",
- "backgroundColor": "8",
- "foregroundColor": "FFFF00",
- "textContent": "",
- "fontStyle": "0",
- "displayAreaWidth": "768",
- "playbackDuration": "50",
- "displayAreaHeight": "64",
- "volume": "0",
- "xCoordinate": "0",
- "screenEntrySpeed": "1",
- "horizontalAlignment": "2",
- "playSpecialEffects": "0",
- "setUpTheSpeaker": "0",
- "flickerSpeed": "0",
- "specialEffectsSpeed": "1",
- "fontSize": "64",
- "verticalAlignment": "2",
- "speechSpeed": "0",
- "font": "3"
- }
+ tempTpl = this.tplDefault;
}
this.dataForm = infoBoardUtils.dialogSourceFormat(tplDefault, this.type);
}else{
- this.dataForm = infoBoardUtils.dialogSourceFormat(this.tpl, this.type);
+ this.dataForm = infoBoardUtils.dialogSourceFormat(this.tpl, this.type, this.mode, this.tplDefault);
}
},
onClose(){
@@ -424,7 +425,7 @@ export default {
}
})*/
- let data = infoBoardUtils.dialogSaveFormat(this.dataForm, this.type);
+ let data = infoBoardUtils.dialogSaveFormat(this.dataForm, this.type, this.mode);
this.loading = true
// let templateId = "";
@@ -434,11 +435,16 @@ export default {
editTemplate(data).then(res=>{
afterSave("修改");
});
- }else{
+ }else if (this.mode == "toDevice") {
+ this.loading = false
+
+ this.$emit("afterSubmit", { type: this.type, mode: this.mode, data: data });
+ } else {
addTemplate(data).then(res => {
afterSave("新增");
});
}
+
}else{
this.loading = false
// this.dialogVisible = false
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardPreview.vue
rename to ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardTplPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardTplPreview.vue
rename to ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue
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 3371eec7..a1f9358a 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
@@ -9,23 +9,23 @@