Browse Source

模板增删改

wangqin
hui 1 year ago
parent
commit
510629dd24
  1. 13
      ruoyi-ui/src/api/board/board.js
  2. 96
      ruoyi-ui/src/api/board/template.js
  3. 3
      ruoyi-ui/src/assets/styles/JiHeExpressway.scss
  4. 185
      ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardInfoEditor.vue
  5. 31
      ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardPreview.vue
  6. 95
      ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
  7. 23
      ruoyi-ui/src/views/JiHeExpressway/utils/infoBoard.js

13
ruoyi-ui/src/api/board/board.js

@ -10,15 +10,4 @@ export function getBoardList(query) {
deviceType:2
}
})
}
// 查询模板列表
export function getTemplateList(query) {
return request({
url: '/business/boardTemplate/getAllVmsTemplate',
method: 'get',
params: {
...query
}
})
}
}

96
ruoyi-ui/src/api/board/template.js

@ -1,47 +1,49 @@
import request from '@/utils/request'
// 查询情报板模板列表
export function getTemplates(query) {
// 查询模板列表
export function getTemplateList(query) {
return request({
url: '/system/template/list',
url: '/business/boardTemplate/getAllVmsTemplate',
method: 'get',
params: query
})
}
//获取情报板模板详细信息
export function getTemplateInfo(id) {
return request({
url: '/system/template/' + id,
method: 'get',
})
}
//获取情报板模板内容信息
export function getTemplateContent(id) {
return request({
url: '/system/content/list?templateId=' + id,
method: 'get',
})
}
// 新增情报板模板
export function addTemplate(data) {
return request({
url: '/system/template',
url: '/business/boardTemplate',
method: 'post',
data: data
})
}
//新增情报板模板内容
export function addTemplateContent(data) {
//修改情报板模板
export function editTemplate(data) {
return request({
url: '/system/content',
method: 'post',
url: '/business/boardTemplate',
method: 'put',
data: data
})
}
//修改情报板模板内容
export function editTemplateContent(data) {
return request({
@ -51,24 +53,56 @@ export function editTemplateContent(data) {
})
}
//修改情报板模板
export function editTemplate(data) {
// 删除情报板模板
export function deleteTemplate(id) {
return request({
url: '/system/template',
method: 'put',
data: data
url: '/business/boardTemplate/' + id,
method: 'delete'
})
}
// 删除情报板模板
export function deleteTemplate(id) {
//获取情报板模板详细信息
export function getTemplateInfo(id) {
return request({
url: '/system/template/' + id,
method: 'delete'
method: 'get',
})
}
//获取情报板模板内容信息
export function getTemplateContent(id) {
return request({
url: '/system/content/list?templateId=' + id,
method: 'get',
})
}
//新增情报板模板内容
export function addTemplateContent(data) {
return request({
url: '/system/content',
method: 'post',
data: data
})
}
//图片库列表查询
export function getGalleryList() {
return request({

3
ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@ -42,6 +42,9 @@
&::placeholder {
color: $textColor;
}
&[disabled]{
color:#667 !important;
}
}
.el-checkbox-group {

185
ruoyi-ui/src/views/JiHeExpressway/pages/service/board/addinfo.vue → ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardInfoEditor.vue

@ -1,14 +1,18 @@
<template>
<el-dialog :title="mode=='add'?'新增':'编辑'" :visible.sync="dialogVisible" width="43%" append-to-body :close-on-click-modal="false">
<div style="color:#fff">
<p>类型:{{type}} 增删改类型:{{mode}}</p>
<p>模板id:{{ tpl }}</p>
</div>
<div class="dialogStyleBox">
<div class="dialogLine"></div>
<div class="dialogCloseButton"></div>
</div>
<el-card class="box-card">
<BoardPreview :tpl="node"></BoardPreview>
<el-card>
<BoardPreview style="height: 200px; width: 100%;" :boardWH="screenSize" :tpl="dataForm"></BoardPreview>
</el-card>
<el-card>
<el-form :model="dataForm" :rules="dataRule" label-width="90px" ref="dataForm" size="mini">
<el-form :model="dataForm" :rules="dataRule" label-width="110px" ref="dataForm" size="mini">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="所属类别" v-if="type == 'template'">
@ -19,10 +23,10 @@
</el-form-item>
</el-col>
<el-col class="infoBoardButton" :span="16">
<el-radio-group v-model="dataForm.textAlign">
<el-radio-button label="left">左对齐</el-radio-button>
<el-radio-button label="center">中间对齐</el-radio-button>
<el-radio-button label="right">右对齐</el-radio-button>
<el-radio-group v-model="dataForm.formatStyle">
<el-radio-button label="0">左对齐</el-radio-button>
<el-radio-button label="2">中间对齐</el-radio-button>
<el-radio-button label="1">右对齐</el-radio-button>
</el-radio-group>
</el-col>
</el-row>
@ -30,12 +34,12 @@
<el-row :gutter="24" style="display: flex; flex-wrap: wrap;width:100%">
<el-col :span="24">
<el-form-item label="详细内容" prop="content">
<el-input type="textarea" placeholder="详细内容" v-model="dataForm.content"></el-input>
<el-input type="textarea" :rows="6" placeholder="详细内容" v-model="dataForm.content"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="字体颜色">
<el-select v-model="dataForm.color" filterable placeholder="请选择">
<el-select v-model="dataForm.fontColor" filterable placeholder="请选择">
<el-option v-for="item in colorList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
</el-option>
</el-select>
@ -60,7 +64,7 @@
<el-col :span="8">
<el-form-item label="停留时间(秒)">
<el-input-number :min="0" v-model="dataForm.stay" style="width: 100%" />
<el-input-number :min="0" v-model="dataForm.stopTime"/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -90,10 +94,12 @@
</el-dialog>
</template>
<script>
import { getTemplateInfo, addTemplate, addTemplateContent, editTemplateContent, editTemplate, deleteTemplate, getTemplateContent, getGalleryList, getFontSizeByDevicePixel, uploadBoardEditInfo } from '@/api/board/template'
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 infoBoardUtils from "@screen/utils/infoBoard.js"
import { after } from 'lodash'
export default {
data() {
return {
@ -123,7 +129,6 @@ export default {
width: '400',
height: '40',
// content: "",
fontColor: 'FFFF00',
fontSize: '24',
fontType: 'KaiTi',
fontSpacing: 0,
@ -133,12 +138,12 @@ export default {
ispreviewContent: -1,
dataForm: {
category:"",
textAlign:"center",
formatStyle:"",
content:"",
color:"",
fontColor:"",
fontSize:"",
fontFamily:"",
stay:5,
stopTime:"",
inScreenMode:"",
screenSize:""
},
@ -184,16 +189,15 @@ export default {
templateCategoryList: [],
infoType: '',
devicePixelBoolean: false,
categoryRules: false,
node:null
categoryRules: false
}
},
props:{
mode:{
mode:{ //add edit
type:String,
default:""
},
type: {
type: { //template board
type: String,
default: ""
},
@ -234,62 +238,62 @@ export default {
"tpl.id":{
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(this.mode == "edit"){
this.____convertData();
}
this.initData();
}
},
"mode": {
handler(newV) {
this.initData();
}
}
},
mounted() {
this.node = this.tpl;
},
created() {
this.getDicts('iot_device_font_type').then(res => {
this.fontTypeList = res.data
this.dataForm.fontFamily = res.data[0].dictValue;
// console.log(this.fontTypeList, "");
})
this.getDicts('iot_devices_font_color').then(res => {
this.colorList = res.data;
this.dataForm.color = res.data[0].dictValue;
// console.log(this.colorList, "");
})
this.getDicts('iot_device_font_inScreen_mode').then(res => {
this.inScreenModeList = res.data
this.dataForm.inScreenMode = res.data[0].dictValue;
// console.log(this.inScreenModeList, "");
})
this.getDicts('iot_template_category').then(res => {
this.templateCategoryList = res.data;
this.dataForm.category = res.data[0].dictValue;
})
this.getDicts('iot_device_font_size').then(res => {
this.fontSizeList = res.data;
this.dataForm.fontSize = res.data[0].dictValue;
// this.dataForm.FONT_SIZE = res.data[1].dictValue
})
this.getdevicessize()
},
methods: {
____convertData(){
initData(){
// getTemplateList({id:this.tpl.id}).then(res=>{
// console.log(res.data , "++++++++===========");
// })
if (this.mode == "edit") {
this.dataForm = infoBoardUtils.sourceFormat(this.tpl, this.type);
}else{
this.dataForm = {
category : this.templateCategoryList[0].dictValue,
formatStyle : 0,
content : "请输入文字内容",
fontColor : this.colorList[0].dictValue,
fontSize : this.fontSizeList[0].dictValue,
fontFamily : this.fontTypeList[0].dictValue,
stopTime : 5,
inScreenMode : this.inScreenModeList[0].dictValue,
screenSize : this.screenSize
}
}
},
onClose(){
this.dialogVisible = false;
},
getFontSizeList(type) {
//TODO
/*getFontSizeByDevicePixel(this.dataForm.screenSize).then((res) => {
console.log(res, "根据分辨率筛字体大小");
this.fontSizeList = res.data.fontSizeList;
this.dataForm.FONT_SIZE = res.data.defaultFont;
if(type){
this.alignment(2)
}
});*/
},
//
async dataFormSubmitHandle() {
if (!this.dataForm.content.trim()) {
@ -298,7 +302,7 @@ export default {
if (this.dataForm.content.indexOf('\\')>=0) {
return this.$modal.msgError("内容不能含有特殊字符'\\\\'")
}
this.$emit("submit");
//
/*checkIotBoardContent(this.dataForm.CONTENT).then(response => {
if (response.data == 0) {
@ -383,81 +387,30 @@ export default {
}
})*/
let data = infoBoardUtils.saveFormat(this.dataForm, this.type);
this.loading = true
// let templateId = "";
let method = 'put'
if (this.isAdd) {
if (this.infoType == 1) {
//
this.dataForm.STAY = Number(this.dataForm.STAY) * 10
this.$emit('addInfo', this.dataForm)
} else {
//
const params1 = {
applyType: '',
category: this.dataForm.category,
coordinate: '',
height: '',
id: '',
imageUrl: '',
imgSizeFrom: '',
inScreenMode: this.dataForm.ACTION,
remark: '',
screenSize: this.dataForm.screenSize,
stopTime: Number(this.dataForm.STAY) * 10,
vmsType: '',
width: ''
}
const templateContent = []
templateContent.push({
content: this.dataForm.CONTENT,
coordinate: this.dataForm.COORDINATE,
fontColor: this.dataForm.COLOR,
fontSize: this.dataForm.FONT_SIZE.substring(0, 2),
fontSpacing: this.dataForm.SPEED,
fontType: this.getFontStyle(this.dataForm.FONT),
formatStyle: this.dataForm.formatStyle
})
// this.$emit("addInfoMode", this.dataForm);
addTemplate(params1, method).then(data => {
console.log(data, '新增口')
let params2 = {
templateContent: templateContent,
templateId: data
}
addTemplateContent(params2)
.then(res => {
if (res.code == 200) {
this.$emit('getActiveNames')
this.$message.success('添加成功')
}
})
.catch(err => {
throw err
})
})
if(this.type == "template"){
if(this.mode=='edit'){
editTemplate(data).then(res=>{
afterSave("修改");
});
}else{
addTemplate(data).then(res => {
afterSave("新增");
});
}
} else {
// //
// editTemplate(this.dataForm).then((data) => {});
// this.templateContent.forEach((e) => {
// e.img = e.imageName;
// });
// var params = {
// templateContent: this.templateContent,
// templateId: this.dataForm.id,
// templateDelContent: this.templateDelContent,
// };
// editTemplateContent(params).then((response) => {
// // console.log(response, "");
// });
}
this.loading = false
this.dialogVisible = false
this.isAdd = false
this.$emit('refreshDataList', this.dataForm)
var textBoard2 = document.getElementsByClassName('textBoard2')
textBoard2[0].style.position = 'absolute'
const afterSave = (para)=>{
this.$message.success(para + '成功!')
this.loading = false
this.dialogVisible = false
this.$emit("afterSubmit" , {type:this.type, mode:this.mode});
}
},
}
}

31
ruoyi-ui/src/views/JiHeExpressway/pages/service/board/BoardPreview.vue

@ -1,9 +1,8 @@
<template>
<div class="boardPreview" ref="compBox">
<div class="boardBox" :style="boardStyle">
<span class="boardTxt" v-for="item in contentArr" :style="boardTxtStyle">
{{ item }}
</span>
<p class="boardTxt" v-for="item,index in contentArr" :key="index" :style="boardTxtStyle" v-html="item">
</p>
</div>
</div>
</template>
@ -15,7 +14,7 @@ export default {
boardStyle:null,
boardTxtStyle:null,
contentArr:{
type:Object,
type:Array,
default:()=>[]
}
}
@ -43,6 +42,7 @@ export default {
// "createTime": "2024-01-06 10:40:19",
// "updateTime": "2024-01-06 11:04:53"
// }
type: Object,
default: {}
},
@ -50,14 +50,16 @@ export default {
watch:{
boardWH:{
handler(newV){
this.boardScale();
this.setStyle();
},
immediate:true
},
"tpl.id":{
tpl:{
handler(newV){
this.contentArr = this.tpl.content.replace(/\n|\r\n/g, '&&&&&').replace(/ /g, '&nbsp').split('&&&&&');
this.setStyle();
},
deep:true,
immediate:true
}
},
@ -66,7 +68,7 @@ export default {
mounted(){
},
methods:{
boardScale() {
setStyle() {
this.$nextTick(() => {
let boxW = this.$refs["compBox"].offsetWidth;
let boxH = this.$refs["compBox"].offsetHeight;
@ -79,17 +81,14 @@ export default {
}
this.boardStyle = {
width: `${arr[0] * scale}px`,
height: `${arr[1] * scale}px`
height: `${arr[1] * scale}px`,
"align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.formatStyle]
}
this.boardTxtStyle = {
"color": "#" + this.tpl.fontColor,
"font-size": `${this.tpl.fontSize * scale}px`,
"font-size": `${this.tpl.fontSize.replace('px','')*scale}px`,
"font-family": this.fontTypeDic[this.tpl.fontType],
// "fontSpacing": "0",
// "rollingSpeed": null,
// "stopTime": "50",
// "inScreenMode": "1",
// "formatStyle": "2",
"min-height": `${this.tpl.fontSize.replace('px', '') * scale}px`
}
})
}
@ -105,11 +104,13 @@ export default {
.boardBox {
background-color: #000;
display: flex;
overflow: hidden;
flex-direction: column;
justify-content: space-around;
justify-content: flex-start;
.boardTxt{
color: #f00;
line-height: 1;
margin-bottom: 0;
}
}
}

95
ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@ -160,7 +160,7 @@
<p @click="____onEditTemplate(itm)" class="btn btnEdit"></p>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<p @click="handleDelete(itm)" class="btn btnDelete"></p>
<p @click="____onDeleteTemplate(itm)" class="btn btnDelete"></p>
</el-tooltip>
</div>
</div>
@ -185,20 +185,21 @@
</el-col>
</el-row>
</el-dialog>
<addinfo @submit="____onEditSubmit" :mode="editDialog.mode" :type="editDialog.type" :visible.sync="editDialog.visible" :screenSize="selectedSize" :tpl="editDialog.tpl"></addinfo>
<BoardInfoEditor @afterSubmit="____onEditSubmit" :mode="editDialog.mode" :type="editDialog.type" :visible.sync="editDialog.visible" :screenSize="selectedSize" :tpl="editDialog.tpl"></BoardInfoEditor>
<!-- <editInfo :boardEmitItem="this.boardEmitItem" @receiveForm="receiveForm" v-if="this.showEmit" @dialogClose="dialogClose"></editInfo> -->
</div>
</template>
<script>
import Sortable from 'sortablejs'
import addinfo from './addinfo'
import BoardInfoEditor from './BoardInfoEditor'
import editInfo from './editInfo'
import boardData from './boardData'
import { getUserDeptId } from '@/api/system/user'
import { listTunnels, devicessize, information, getBoardInfo, getBoardEditInfo, getboardSizeDic, getBoardContentData, deviceControl } from '@/api/information/api.js'
import { uploadBoardEditInfo, getAllVmsTemplate, addTemplate, addTemplateContent, getBoardContent, deleteTemplate, splicingBoard } from '@/api/board/template'
import { invokedFunction, getDeviceRealtimeProperty } from '@/api/device/device'
import { getBoardList , getTemplateList } from '@/api/board/board'
import { getBoardList } from '@/api/board/board'
import { getTemplateList } from '@/api/board/template'
import BoardPreview from './BoardPreview'
//
@ -229,7 +230,7 @@ export const deepClone = data => {
export default {
name: 'Device',
components: {
addinfo,
BoardInfoEditor,
editInfo,
BoardPreview
},
@ -442,36 +443,14 @@ computed:{
tpl
}
},
____onEditSubmit(){
console.log("提交后外层的回调");
____onEditSubmit(para){
this.____refreshPageData(para);
},
//
getScreenSize(num, type) {
// console.log(num)
let width = num.split('*')[0]
let height = num.split('*')[1]
//
if (width <= 450 && height <= 75) {
if (type == 'width') {
return width
} else if (type == 'height') {
return height
}
____refreshPageData(para){
if (para.type == 'template') {
this.____getAllTemplate().then(this.____onChangeSize)
} else {
//
if (width / 450 > height / 75) {
if (type == 'width') {
return 450
} else if (type == 'height') {
return height / (width / 450)
}
} else {
if (type == 'width') {
return width / (height / 75)
} else if (type == 'height') {
return 75
}
}
}
},
@ -586,51 +565,19 @@ computed:{
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
let content = '是否确认删除选中数据项?'
if (ids == null || ids == undefined || ids == [] || ids == '') {
content = '是否确认删除当前情报板模板?'
}
____onDeleteTemplate(row) {
const id = row.id;
let content = '确认删除?'
this.$confirm(content, '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(function () {
return deleteTemplate(ids)
})
.then(() => {
this.allVmsTemplate('no')
this.$modal.msgSuccess('删除成功')
})
},
//
allVmsTemplate(type) {
const param = {
selectedPixel: this.form.selectedPixel
}
//TODO
getAllVmsTemplate(param).then(res => {
let data = res.data
console.log(res, '情报板管理右侧查询接口')
let jArr = []
for (let j = 0; j < this.tplCategory.length; j++) {
let arr = this.tplCategory[j]
let brr = data[j]
arr.list = brr
jArr.push(j.toString())
}
if (type != 'no') {
this.activeNames = jArr
}
this.$forceUpdate()
console.log(this.tplCategory, '新模板')
})
}).then(()=>{
deleteTemplate(id).then(()=>{
this.$message.success('删除成功!');
this.____refreshPageData({type:"template"});
})
});
},
//

23
ruoyi-ui/src/views/JiHeExpressway/utils/infoBoard.js

@ -0,0 +1,23 @@
export default {
sourceFormat(data, type){
let data1 = _.cloneDeep(data);
data1.stopTime = data1.stopTime*0.1
if(type=='template'){
} else {
}
return data1
},
saveFormat(data, type) {
let data1 = _.cloneDeep(data);
data1.stopTime = data1.stopTime * 10 + "";
if (type == 'template') {
} else {
}
return data1;
}
}
Loading…
Cancel
Save