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

update

Browse Source
qianlishi 3 years ago
parent b41a324772
commit 942375b532
12 changed files with 158 additions and 53 deletions
Show Stats Download Patch File Download Diff File

75
report-ui/src/assets/iconfont/demo_index.html
Unescape Escape View File

@ -54,6 +54,24 @@
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe724;</span>
<div class="name">上</div>
<div class="code-name">&amp;#xe724;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6af;</span>
<div class="name">下</div>
<div class="code-name">&amp;#xe6af;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe626;</span>
<div class="name">复制</div>
<div class="code-name">&amp;#xe626;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe738;</span>
<div class="name">中国地图</div>
@ -696,9 +714,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1625038596365') format('woff2'),
url('iconfont.woff?t=1625038596365') format('woff'),
url('iconfont.ttf?t=1625038596365') format('truetype');
src: url('iconfont.woff2?t=1625116809861') format('woff2'),
url('iconfont.woff?t=1625116809861') format('woff'),
url('iconfont.ttf?t=1625116809861') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -724,6 +742,33 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconjinlingyingcaiwangtubiao01"></span>
<div class="name">
上
</div>
<div class="code-name">.iconjinlingyingcaiwangtubiao01
</div>
</li>
<li class="dib">
<span class="icon iconfont iconleft-copy"></span>
<div class="name">
下
</div>
<div class="code-name">.iconleft-copy
</div>
</li>
<li class="dib">
<span class="icon iconfont iconfuzhi1"></span>
<div class="name">
复制
</div>
<div class="code-name">.iconfuzhi1
</div>
</li>
<li class="dib">
<span class="icon iconfont iconzhongguoditu"></span>
<div class="name">
@ -1687,6 +1732,30 @@
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconjinlingyingcaiwangtubiao01"></use>
</svg>
<div class="name">上</div>
<div class="code-name">#iconjinlingyingcaiwangtubiao01</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconleft-copy"></use>
</svg>
<div class="name">下</div>
<div class="code-name">#iconleft-copy</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconfuzhi1"></use>
</svg>
<div class="name">复制</div>
<div class="code-name">#iconfuzhi1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconzhongguoditu"></use>

18
report-ui/src/assets/iconfont/iconfont.css
Unescape Escape View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 1513211 */
src: url('iconfont.woff2?t=1625038596365') format('woff2'),
url('iconfont.woff?t=1625038596365') format('woff'),
url('iconfont.ttf?t=1625038596365') format('truetype');
src: url('iconfont.woff2?t=1625116809861') format('woff2'),
url('iconfont.woff?t=1625116809861') format('woff'),
url('iconfont.ttf?t=1625116809861') format('truetype');
}
.iconfont {
@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.iconjinlingyingcaiwangtubiao01:before {
content: "\e724";
}
.iconleft-copy:before {
content: "\e6af";
}
.iconfuzhi1:before {
content: "\e626";
}
.iconzhongguoditu:before {
content: "\e738";
}

2
report-ui/src/assets/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

21
report-ui/src/assets/iconfont/iconfont.json
Unescape Escape View File

@ -5,6 +5,27 @@
"css_prefix_text": "icon",
"description": "",
"glyphs": [
{
"icon_id": "182207",
"name": "上",
"font_class": "jinlingyingcaiwangtubiao01",
"unicode": "e724",
"unicode_decimal": 59172
},
{
"icon_id": "2773923",
"name": "下",
"font_class": "left-copy",
"unicode": "e6af",
"unicode_decimal": 59055
},
{
"icon_id": "4653465",
"name": "复制",
"font_class": "fuzhi1",
"unicode": "e626",
"unicode_decimal": 58918
},
{
"icon_id": "22378736",
"name": "中国地图",

BIN
report-ui/src/assets/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
report-ui/src/assets/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
report-ui/src/assets/iconfont/iconfont.woff2
View File

Binary file not shown.

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

@ -1,57 +1,69 @@
<template>
<div v-show="visible"
class="contentmenu"
:style="styleObj">
<div class="contentmenu__item"
@click="deleteLayer">
<div v-show="visible" class="contentmenu" :style="styleObj">
<div class="contentmenu__item" @click="deleteLayer">
<i class="iconfont iconguanbi"></i> 删除图层
</div>
<div class="contentmenu__item" @click="deleteLayer">
<i class="iconfont iconfuzhi1"></i> 复制图层
</div>
<div class="contentmenu__item" @click="deleteLayer">
<i class="iconfont iconjinlingyingcaiwangtubiao01"></i> 置顶图层
</div>
<div class="contentmenu__item" @click="deleteLayer">
<i class="iconfont iconleft-copy"></i> 置地图层
</div>
<div class="contentmenu__item" @click="deleteLayer">
<i class="iconfont iconjinlingyingcaiwangtubiao01"></i> 上移一层
</div>
<div class="contentmenu__item" @click="deleteLayer">
<i class="iconfont iconleft-copy"></i> 下移一层
</div>
</div>
</template>
<script>
export default {
props: {
styleObj: Object,
visible: Boolean,
visible: Boolean
},
data () {
return {}
data() {
return {};
},
watch: {
visible (value) {
visible(value) {
if (value) {
document.body.addEventListener('click', this.closeMenu)
document.body.addEventListener("click", this.closeMenu);
} else {
document.body.removeEventListener('click', this.closeMenu)
document.body.removeEventListener("click", this.closeMenu);
}
}
},
},
methods: {
closeMenu () {
this.$emit('update:visible', false)
closeMenu() {
this.$emit("update:visible", false);
},
deleteLayer () {
this.$confirm('是否删除所选图层?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
deleteLayer() {
this.$confirm("是否删除所选图层?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$emit('deletelayer')
this.$emit("deletelayer");
this.$message({
type: 'success',
message: '删除成功!',
})
type: "success",
message: "删除成功!"
});
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除',
})
})
},
},
}
type: "info",
message: "已取消删除"
});
});
}
}
};
</script>
<style lang="scss" scoped>
.contentmenu {
@ -72,5 +84,8 @@ export default {
position: relative;
font-size: 12px;
}
.iconfont {
font-size: 12px;
}
}
</style>

5
report-ui/src/views/report/bigscreen/designer/form/customUpload.vue
Unescape Escape View File

@ -34,11 +34,6 @@ export default {
fileList: []
};
},
watch: {
value(val) {
console.log(val);
}
},
created() {
this.fileList = this.value;
},

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

@ -365,6 +365,8 @@ export default {
if (code != 200) return;
const processData = this.handleInitEchartsData(data);
const screenData = this.handleBigScreen(data.dashboard);
console.log(screenData);
console.log(processData);
this.widgets = processData;
this.dashboard = screenData;
},
@ -395,7 +397,6 @@ export default {
obj.value = {
setup: widgets[i].value.setup,
data: widgets[i].value.data,
collapse: widgets[i].value.collapse,
position: widgets[i].value.position
};
const tool = this.deepClone(getToolByCode(widgets[i].type));

11
report-ui/src/views/report/bigscreen/designer/tools.js
Unescape Escape View File

@ -44,20 +44,13 @@ const screenConfig = {
placeholder: '',
value: '#000',
},
// {
// type: 'el-upload-picture',
// label: '背景图片',
// name: 'backgroundImage',
// required: false,
// placeholder: '',
// },
{
type: 'custom-upload',
type: 'el-input-text',
label: '图片地址',
name: 'backgroundImage',
required: false,
placeholder: '',
value: [{url: 'http://10.108.26.197/business/file/download/adfc22ac-ed7f-4141-aeb9-ee81f16ac92d'}],
value: 'http://10.108.26.197/business/file/download/adfc22ac-ed7f-4141-aeb9-ee81f16ac92d',
},
],
data: [],

1
report-ui/src/views/report/bigscreen/designer/widget/widget.vue
Unescape Escape View File

@ -14,7 +14,6 @@
:index="index"
@focus="handleFocus"
@blur="handleBlur"
:z-index="index"
>
<component :is="type" :value="value" />
</avue-draggable>

Write Preview
Loading…
Cancel
Save