ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
qianlishi 4 years ago
parent ee658ecd4d
commit 2ba890df07
7 changed files with 325 additions and 237 deletions
Show Stats Download Patch File Download Diff File

5
report-ui/src/mixins/access.js
Unescape Escape View File

@ -88,11 +88,6 @@ export default {
return result
}
},
//深拷贝
deepClone(obj){
var temp = JSON.stringify(obj);
return JSON.parse(temp);
},
//从所有字典中，取某个字典的列表
getDict(dictname){

148
report-ui/src/mixins/common.js
Unescape Escape View File

@ -4,6 +4,14 @@ export default {
}
},
computed: {
// 网页高度
bodyWidth() {
return document.body.clientWidth
},
// 网页宽度
bodyHeight() {
return document.body.clientHeight
},
},
created () {
},
@ -86,18 +94,37 @@ export default {
}
}
},
objToOne (obj) {
var tmpData = {}
for (var index in obj) {
if (typeof obj[index] == 'object') {
var resObj = this.objToOne(obj[index])
Object.assign(tmpData, resObj) // 这里使用对象合并
} else {
tmpData[index] = obj[index]
// 获取对象类型
getObjectType(obj) {
var toString = Object.prototype.toString
var map = {
'[object Boolean]': 'boolean',
'[object Number]': 'number',
'[object String]': 'string',
'[object Function]': 'function',
'[object Array]': 'array',
'[object Date]': 'date',
'[object RegExp]': 'regExp',
'[object Undefined]': 'undefined',
'[object Null]': 'null',
'[object Object]': 'object',
}
if (obj instanceof Element) {
return 'element'
}
return tmpData
return map[toString.call(obj)]
},
isNumber(obj) {
return this.getObjectType(obj) == 'number'
},
isString(obj) {
return this.getObjectType(obj) == 'string'
},
hasOwn(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key)
},
isNotNull(val) {
return !this.isNull(val)
},
@ -125,5 +152,108 @@ export default {
}
return false
},
// 对象深拷贝
deepClone(data) {
var type = this.getObjectType(data)
var obj
if (type === 'array') {
obj = []
} else if (type === 'object') {
obj = {}
} else {
// 不再具有下一层次
return data
}
if (type === 'array') {
for (var i = 0, len = data.length; i < len; i++) {
data[i] = (() => {
if (data[i] === 0) {
return data[i]
}
return data[i]
})()
if (data[i]) {
delete data[i].$parent
}
obj.push(this.deepClone(data[i]))
}
} else if (type === 'object') {
for (var key in data) {
if (data) {
delete data.$parent
}
obj[key] = this.deepClone(data[key])
}
}
return obj
},
// 合并json
mergeObject() {
var target = arguments[0] || {}
var deep = false
var arr = Array.prototype.slice.call(arguments)
var i = 1
var options, src, key, copy
var isArray = false
if (typeof target === 'boolean') {
deep = target
i++
target = arguments[1]
}
for (; i < arr.length; i++) {
// 循环传入的对象数组
if ((options = arr[i]) != null) {
// 如果当前值不是null，如果是null不做处理
for (key in options) {
// for in循环对象中key
copy = options[key]
src = target[key]
// 如果对象中value值任然是一个引用类型
if (deep && (toString.call(copy) === '[object Object]' || (isArray = toString.call(copy) == '[object Array]'))) {
if (isArray) {
// 如果引用类型是数组
// 如果目标对象target存在当前key，且数据类型是数组，那就还原此值，如果不是就定义成一个空数组;
src = toString.call(src) === '[object Array]' ? src : []
} else {
// 如果目标对象target存在当前key，且数据类型是对象，那就还原此值，如果不是就定义成一个空对象;
src = toString.call(src) === '[object Object]' ? src : {}
}
// 引用类型就再次调用extend，递归，直到此时copy是一个基本类型的值。
target[key] = this.mergeObject(deep, src, copy)
} else if (copy !== undefined && copy !== src) {
// 如果这个值是基本值类型，且不是undefined
target[key] = copy
}
}
}
}
return target
},
// 获取dom在屏幕中的top和left
getDomTopLeftById(id) {
var dom = document.getElementById(id)
var top = 0
var left = 0
if (dom != null) {
top = dom.getBoundingClientRect().top
left = dom.getBoundingClientRect().left
}
return { top: top, left: left }
},
objToOne(obj) {
var tmpData = {}
for (var index in obj) {
if (typeof obj[index] == 'object') {
var resObj = this.objToOne(obj[index])
Object.assign(tmpData, resObj) // 这里使用对象合并
} else {
tmpData[index] = obj[index]
}
}
return tmpData
},
}
}

9
report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue
Unescape Escape View File

@ -1,11 +1,6 @@
<template>
<div v-show="visible"
class="contentmenu"
:style="styleObj">
<div class="contentmenu__item"
@click="deleteLayer">
<!-- <svg-icon icon-class="guanbi" /> -->删除图层
</div>
<div v-show="visible" class="contentmenu" :style="styleObj">
<div class="contentmenu__item" @click="deleteLayer"><svg-icon icon-class="guanbi" /> 删除图层</div>
</div>
</template>
<script>

125
report-ui/src/views/report/bigscreen/designer/form/customColorComponents.vue
Unescape Escape View File

@ -1,121 +1,134 @@
<template>
<div>
<el-button type="primary"
icon="el-icon-plus"
plain
@click="handleAddClick">新增</el-button>
<el-table :data="formData"
style="width: 100%">
<el-table-column prop="color"
label="颜色"
align="center">
<el-button type="primary" icon="el-icon-plus" plain @click="handleAddClick"
>新增</el-button
>
<el-table :data="formData" style="width: 100%">
<el-table-column prop="color" label="颜色" align="center">
<template slot-scope="scope">
<span class="color-box"
:style="{ background: scope.row.color }" />
<span class="color-box" :style="{ background: scope.row.color }" />
</template>
</el-table-column>
<el-table-column label="位置"
align="center">
<el-table-column label="位置" align="center">
<template slot-scope="scope">
<span class="editor"
@click="handleEditorClick(scope.$index, scope.row)"> <i class="el-icon-edit" /> 编辑 </span>
<span
class="editor"
@click="handleEditorClick(scope.$index, scope.row)"
>
<i class="el-icon-edit" /> 编辑
</span>
</template>
</el-table-column>
<el-table-column label="操作"
align="center">
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<span class="editor"
@click="handleDeleteClick(scope.$index, scope.row)"> <i class="el-icon-delete" /> 删除 </span>
<span
class="editor"
@click="handleDeleteClick(scope.$index, scope.row)"
>
<i class="el-icon-delete" /> 删除
</span>
</template>
</el-table-column>
</el-table>
<el-dialog title="新增"
<el-dialog
title="新增"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose">
:before-close="handleClose"
>
<el-form>
<el-form-item label="颜色">
<el-input v-model="colorValue"
<el-input
v-model="colorValue"
style="width: 200px"
placeholder="请输入颜色">
placeholder="请输入颜色"
>
<template slot="append">
<el-color-picker v-model="colorValue"
:predefine="predefineColors" />
<el-color-picker
v-model="colorValue"
:predefine="predefineColors"
/>
</template>
</el-input>
</el-form-item>
</el-form>
<span slot="footer"
class="dialog-footer">
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary"
@click="handleSaveClick">确 定</el-button>
<el-button type="primary" @click="handleSaveClick">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
name: 'CustomColorComponents',
name: "CustomColorComponents",
model: {
prop: 'formData',
event: 'input',
prop: "formData",
event: "input"
},
props: {
formData: Array,
formData: Array
},
data() {
return {
predefineColors: ['#ff4500', '#ff8c00', '#ffd700', '#90ee90', '#00ced1', '#1e90ff', '#c71585'],
colorValue: '',
predefineColors: [
"#ff4500",
"#ff8c00",
"#ffd700",
"#90ee90",
"#00ced1",
"#1e90ff",
"#c71585"
],
colorValue: "",
dialogVisible: false,
flag: true, // true 新增， false 编辑
indexEditor: -1, // 编辑第几个数据
}
indexEditor: -1 // 编辑第几个数据
};
},
mounted() {},
methods: {
// 弹出框关闭
handleClose() {
this.dialogVisible = false
this.colorValue = ''
this.dialogVisible = false;
this.colorValue = "";
},
// 新增
handleAddClick() {
this.colorValue = ''
this.flag = true
this.dialogVisible = true
this.colorValue = "";
this.flag = true;
this.dialogVisible = true;
},
// 确定
handleSaveClick() {
if (this.flag) {
// 新增
const obj = {
color: this.colorValue,
}
this.formData.push(obj)
this.dialogVisible = false
color: this.colorValue
};
this.formData.push(obj);
this.dialogVisible = false;
} else {
// 编辑
this.formData[this.indexEditor].color = this.colorValue
this.dialogVisible = false
this.formData[this.indexEditor].color = this.colorValue;
this.dialogVisible = false;
}
this.$emit('input', this.formData)
this.$emit("input", this.formData);
},
// 编辑
handleEditorClick(index, row) {
this.flag = false
this.colorValue = row.color
this.dialogVisible = true
this.indexEditor = index
this.flag = false;
this.colorValue = row.color;
this.dialogVisible = true;
this.indexEditor = index;
},
// 删除
handleDeleteClick(index) {
this.formData.splice(index, 1)
},
},
this.formData.splice(index, 1);
}
}
};
</script>
<style lang="scss" scoped>
.color-box {

100
report-ui/src/views/report/bigscreen/designer/index.vue
Unescape Escape View File

@ -6,20 +6,15 @@
!-->
<template>
<div class="layout">
<div v-if="toolIsShow"
class="layout-left"
:style="{ width: widthLeftForTools + 'px' }">
<el-tabs type="border-card"
:stretch="true">
<div v-if="toolIsShow" class="layout-left" :style="{ width: widthLeftForTools + 'px' }">
<el-tabs type="border-card" :stretch="true">
<!-- 左侧组件栏-->
<el-tab-pane label="工具栏">
<!-- <el-divider content-position="center">html</el-divider>-->
<draggable v-for="widget in widgetTools"
:key="widget.code"
@end="(evt) => widgetOnDragged(evt, widget.code)">
<draggable v-for="widget in widgetTools" :key="widget.code" @end="(evt) => widgetOnDragged(evt, widget.code)">
<div class="tools-item">
<span class="tools-item-icon">
<!-- <svg-icon :icon-class="widget.icon" /> -->1
<svg-icon :icon-class="widget.icon" />
</span>
<span class="tools-item-text">{{ widget.label }}</span>
</div>
@ -27,11 +22,9 @@
</el-tab-pane>
<!-- 左侧图层-->
<el-tab-pane label="图层">
<div v-for="(item, index) in layerWidget"
:key="index"
class="tools-item">
<div v-for="(item, index) in layerWidget" :key="index" class="tools-item">
<span class="tools-item-icon">
<!-- <svg-icon :icon-class="item.icon" /> -->2
<svg-icon :icon-class="item.icon" />
</span>
<span class="tools-item-text">{{ item.label }}</span>
</div>
@ -39,90 +32,47 @@
</el-tabs>
</div>
<div class="layout-left-fold"
:style="{ width: widthLeftForToolsHideButton + 'px' }"
@click="toolIsShow = !toolIsShow">
<div class="layout-left-fold" :style="{ width: widthLeftForToolsHideButton + 'px' }" @click="toolIsShow = !toolIsShow">
<i class="iconfont iconfold" />
</div>
<div class="layout-middle"
:style="{ width: middleWidth + 'px', height: middleHeight + 'px' }">
<div class="layout-middle" :style="{ width: middleWidth + 'px', height: middleHeight + 'px' }">
<div class="top-button">
<span class="btn">
<el-tooltip class="item"
effect="dark"
content="保存"
placement="bottom">
<!-- <svg-icon icon-class="report" @click="saveData" /> -->3
<el-tooltip class="item" effect="dark" content="保存" placement="bottom">
<svg-icon icon-class="report" @click="saveData" />
</el-tooltip>
</span>
<span class="btn">
<el-tooltip class="item"
effect="dark"
content="预览"
placement="bottom">
<!-- <svg-icon icon-class="eye-open" @click="viewScreen" /> -->4
<el-tooltip class="item" effect="dark" content="预览" placement="bottom">
<svg-icon icon-class="eye-open" @click="viewScreen" />
</el-tooltip>
</span>
</div>
<div class="workbench-container"
:style="{ width: bigscreenWidthInWorkbench + 'px', height: bigscreenHeightInWorkbench + 'px' }">
<vue-ruler-tool v-model="dashboard.presetLine"
class="vueRuler"
:step-length="50"
:parent="true"
:position="'relative'"
:is-scale-revise="true"
:visible.sync="dashboard.presetLineVisible">
<div id="workbench"
class="workbench"
:style="{ transform: workbenchTransform, width: bigscreenWidth + 'px', height: bigscreenHeight + 'px', 'background-color': dashboard.backgroundColor, 'background-image': 'url(' + dashboard.backgroundImage + ')', 'background-position': '0% 0%', 'background-size': '100% 100%', 'background-repeat': 'initial', 'background-attachment': 'initial', 'background-origin': 'initial', 'background-clip': 'initial' }"
@click="setOptionsOnClickScreen">
<widget v-for="(widget, index) in widgets"
:key="index"
v-model="widget.value"
:index="index"
:type="widget.type"
:bigscreen="{ bigscreenWidth, bigscreenHeight }"
@onActivated="setOptionsOnClickWidget"
@contextmenu.prevent.native="rightClick($event, index)" />
<div class="workbench-container" :style="{ width: bigscreenWidthInWorkbench + 'px', height: bigscreenHeightInWorkbench + 'px' }">
<vue-ruler-tool v-model="dashboard.presetLine" class="vueRuler" :step-length="50" :parent="true" :position="'relative'" :is-scale-revise="true" :visible.sync="dashboard.presetLineVisible">
<div id="workbench" class="workbench" :style="{ transform: workbenchTransform, width: bigscreenWidth + 'px', height: bigscreenHeight + 'px', 'background-color': dashboard.backgroundColor, 'background-image': 'url(' + dashboard.backgroundImage + ')', 'background-position': '0% 0%', 'background-size': '100% 100%', 'background-repeat': 'initial', 'background-attachment': 'initial', 'background-origin': 'initial', 'background-clip': 'initial' }" @click="setOptionsOnClickScreen">
<widget v-for="(widget, index) in widgets" :key="index" v-model="widget.value" :index="index" :type="widget.type" :bigscreen="{ bigscreenWidth, bigscreenHeight }" @onActivated="setOptionsOnClickWidget" @contextmenu.prevent.native="rightClick($event, index)" />
</div>
</vue-ruler-tool>
</div>
</div>
<div class="layout-right"
:style="{ width: widthLeftForOptions + 'px' }">
<el-tabs v-model="activeName"
type="border-card"
:stretch="true">
<el-tab-pane v-if="isNotNull(widgetOptions.setup) || isNotNull(widgetOptions.collapse)"
name="first"
label="配置">
<dynamicForm ref="formData"
:options="widgetOptions.setup"
@onChanged="(val) => widgetValueChanged('setup', val)" />
<div class="layout-right" :style="{ width: widthLeftForOptions + 'px' }">
<el-tabs v-model="activeName" type="border-card" :stretch="true">
<el-tab-pane v-if="isNotNull(widgetOptions.setup) || isNotNull(widgetOptions.collapse)" name="first" label="配置">
<dynamicForm ref="formData" :options="widgetOptions.setup" @onChanged="(val) => widgetValueChanged('setup', val)" />
</el-tab-pane>
<el-tab-pane v-if="isNotNull(widgetOptions.data)"
name="second"
label="数据">
<dynamicForm ref="formData"
:options="widgetOptions.data"
@onChanged="(val) => widgetValueChanged('data', val)" />
<el-tab-pane v-if="isNotNull(widgetOptions.data)" name="second" label="数据">
<dynamicForm ref="formData" :options="widgetOptions.data" @onChanged="(val) => widgetValueChanged('data', val)" />
</el-tab-pane>
<el-tab-pane v-if="isNotNull(widgetOptions.position)"
name="third"
label="坐标">
<dynamicForm ref="formData"
:options="widgetOptions.position"
@onChanged="(val) => widgetValueChanged('position', val)" />
<el-tab-pane v-if="isNotNull(widgetOptions.position)" name="third" label="坐标">
<dynamicForm ref="formData" :options="widgetOptions.position" @onChanged="(val) => widgetValueChanged('position', val)" />
</el-tab-pane>
</el-tabs>
</div>
<content-menu :visible.sync="visibleContentMenu"
:style-obj="styleObj"
@deletelayer="deletelayer" />
<content-menu :visible.sync="visibleContentMenu" :style-obj="styleObj" @deletelayer="deletelayer" />
</div>
</template>

60
report-ui/src/views/report/bigscreen/index.vue
Unescape Escape View File

@ -7,9 +7,7 @@
<template>
<div class="main-layout">
<el-row :gutter="20">
<el-col v-for="item in list"
:key="item.id"
:span="6">
<el-col v-for="item in list" :key="item.id" :span="6">
<div class="bg">
<div class="rgba" />
<div class="content">
@ -17,14 +15,18 @@
<footer>
{{ item.time }}
<div class="operation">
<el-button icon="el-icon-view"
<el-button
icon="el-icon-view"
class="view"
type="text"
@click="viewDesign(item.id)" />
<el-button icon="el-icon-edit"
@click="viewDesign(item.id)"
/>
<el-button
icon="el-icon-edit"
class="edit"
type="text"
@click="openDesign(item.id)" />
@click="openDesign(item.id)"
/>
</div>
</footer>
</div>
@ -36,51 +38,57 @@
<script>
export default {
name: 'Login',
name: "Login",
components: {},
data() {
return {
list: [
{
id: 1,
name: '货物在途大屏',
time: '2021-3-19 17:54:00',
name: "货物在途大屏",
time: "2021-3-19 17:54:00"
},
{
id: 2,
name: '仓库库容大屏',
time: '2021-3-19 17:54:00',
name: "仓库库容大屏",
time: "2021-3-19 17:54:00"
},
{
id: 3,
name: '运输时效大屏',
time: '2021-3-19 17:54:00',
name: "运输时效大屏",
time: "2021-3-19 17:54:00"
},
{
id: 4,
name: '运输时效大屏1',
time: '2021-3-19 17:54:00',
name: "运输时效大屏1",
time: "2021-3-19 17:54:00"
},
{
id: 5,
name: '运输时效大屏2',
time: '2021-3-19 17:54:00',
},
],
name: "运输时效大屏2",
time: "2021-3-19 17:54:00"
}
]
};
},
mounted() {},
methods: {
openDesign(reportId) {
var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportId: reportId } })
window.open(routeUrl.href, '_blank')
var routeUrl = this.$router.resolve({
path: "/bigscreen/designer",
query: { reportId: reportId }
});
window.open(routeUrl.href, "_blank");
},
viewDesign(reportId) {
var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportId: reportId } })
window.open(routeUrl.href, '_blank')
},
},
var routeUrl = this.$router.resolve({
path: "/bigscreen/viewer",
query: { reportId: reportId }
});
window.open(routeUrl.href, "_blank");
}
}
};
</script>
<style scoped lang="scss">

5
report-ui/src/views/report/bigscreen/viewer/index.vue
Unescape Escape View File

@ -7,10 +7,7 @@
<template>
<div class="layout">
<div :style="bigScreenStyle">
<widget v-for="(widget, index) in widgets"
:key="index"
v-model="widget.value"
:type="widget.type" />
<widget v-for="(widget, index) in widgets" :key="index" v-model="widget.value" :type="widget.type" />
</div>
</div>
</template>

Write Preview
Loading…
Cancel
Save