kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

Browse Source
This commit is contained in:
yanran200730
2023-04-24 17:49:57 +08:00
parent 090d15dda1 c3fa9b8d79
commit dfc9a1cb03
7 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
packages/bigscreen/designer/components/form/componentConfig.vue
View File

@@ -39,10 +39,10 @@
<div class="layout-config__item--right">
<el-select size="mini" v-model="config.border" placeholder="请选择边框" clearable>
<el-option
v-for="(item, index) in borderList"
:key="index"
:label="item"
:value="item">
v-for="(item, index) in borderList"
:key="index"
:label="item"
:value="item">
</el-option>
</el-select>
</div>
@@ -93,12 +93,12 @@
<div class="layout-config__item--right">
<el-select size="mini" v-model="config.stripe" placeholder="请选择" clearable>
<el-option
label="是"
value="1">
label="是"
value="1">
</el-option>
<el-option
label="否"
value="0">
label="否"
value="0">
</el-option>
</el-select>
</div>
@@ -132,6 +132,15 @@
</el-select>
</div>
</div>
<div class="layout-config__item">
<label>地图图层</label>
<div class="layout-config__item--right">
<el-select size="mini" v-model="config.layers" placeholder="请选择" clearable>
<el-option label="地图" value="vector"/>
<el-option label="卫星" value="satellite"/>
</el-select>
</div>
</div>
<div class="layout-config__item">
<label>选择地区</label>
<div class="layout-config__item--right">
@@ -139,7 +148,7 @@
</div>
</div>
<div class="layout-config__item">
<label>限制显示地区</label>
<label>限制地区</label>
<div class="layout-config__item--right">
<ai-select v-model="config.limitArea" :selectList="dict.getDict('yesOrNo')"/>
</div>
@@ -180,10 +189,10 @@
<div class="layout-config__item--right">
<el-select size="mini" v-model="config.display" placeholder="请选择类型" clearable>
<el-option
v-for="(item, index) in summaryList"
:key="index"
:label="item"
:value="item">
v-for="(item, index) in summaryList"
:key="index"
:label="item"
:value="item">
</el-option>
</el-select>
</div>
@@ -203,11 +212,11 @@ export default {
dict: Object,
},
data () {
data() {
return {
borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6'],//边框待选项
summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5',
'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', 'summary15'],//汇总待选项
'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', 'summary15'],//汇总待选项
//是否显示排名
tableStatus: [
{label: '是', value: '1'},
@@ -219,33 +228,32 @@ export default {
</script>
<style lang="scss" scoped>
.componentConfig {
.table-config {
& > div {
display: flex;
align-items: center;
justify-content: space-between;
width: 232px;
.componentConfig {
.table-config {
& > div {
display: flex;
align-items: center;
justify-content: space-between;
width: 232px;
:deep( .el-select ) {
width: 80px
input {
width: 80px;
}
:deep( .el-select ) {
width: 80px input {
width: 80px;
}
}
.el-select {
.el-select {
width: 100%;
.el-input {
width: 100%;
.el-input {
width: 100%;
:deep( input ) {
width: 80px
}
:deep( input ) {
width: 80px
}
}
}
}
}
}
</style>

1
packages/bigscreen/designer/config.js
View File

@@ -610,6 +610,7 @@ const components = [
thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/map.png',
is3dAround: '0',
limitArea: '0',
layers:'vector'
},
{
type: 'AiDvMap',