Skip to content

M
memberTag-web
Commit 70454fbd by member
Options

合并标签配置项

parent a4fdc237
Showing with 200 additions and 24 deletions
package.json
......@@ -21,6 +21,7 @@
"vant": "^1.6.13",
"vue": "^2.5.2",
"vue-clipboard2": "^0.2.0",
"vue-loader": "^13.7.3",
"vue-router": "^3.0.1",
"xlsx": "^0.13.5"
},
......
src/components/tag/tag-config-options.vue
......@@ -9,14 +9,15 @@
<el-checkbox :indeterminate="parent.isIndeterminate" v-model="parent.checkAll" @change="handleCheckAllChange($event, parent)">全选</el-checkbox>
</div>
<div class="checkboxOption-wrap__body__options border-box">
<el-checkbox-group v-model="parent.checkeditems" @change="handleCheckedChange($event, parent)">
<!-- @change="handleCheckedChange($event, parent)" -->
<el-checkbox-group v-model="parent.checkeditems">
<el-checkbox v-for="(item, index) in parent.options" :label="item.key" :key="item.key + index">{{ item.value }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
</template>
<!-- 2.数字范围 -->
<template v-if="parent.templateCode == ''">
<template v-if="parent.templateCode == 'tag003'">
<div class="m-b-20" :key="'tag2' + pindex">
<el-input v-model="parent.numRange[0]" class="select-wrap-input" style="width: 100px;margin-right: 0;" placeholder="请输入数字"></el-input
><!-- @keyup.native="(value) => toInputFrom(value)" -->
......@@ -318,7 +319,8 @@
<el-checkbox :indeterminate="parent.isIndeterminate" v-model="parent.checkAll" @change="handleCheckAllChange($event, parent)">全选</el-checkbox>
</div>
<div class="checkboxOption-wrap__body__options border-box">
<el-checkbox-group v-model="parent.checkeditems" @change="handleCheckedChange($event, parent)">
<!-- @change="handleCheckedChange($event, parent)" -->
<el-checkbox-group v-model="parent.checkeditems">
<el-checkbox v-for="(item, index) in parent.options" :label="item.key" :key="item.key + index">{{ item.value }}</el-checkbox>
</el-checkbox-group>
</div>
......@@ -549,6 +551,14 @@ import qs from 'qs';
import GicSelect from './birth-select';
import { getTagType, findWidget, findOndJson } from '@/request/tagConfig';
// 两个数字区间 numRange [0, 1]
const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018'];
/**
* checkeditems 多选框
*/
const templateCodeKeyWords = ['checkeditems', '', 'numRange', '', '', '', '', '', '', '', '', '', '', '', 'monthDayRange', '', '', ''];
export default {
name: 'tag-config',
......@@ -800,8 +810,17 @@ export default {
/**
* 获取 templateData
*/
transformConfigvalue(item) {
// 通过index来对应
let index = templateCode.findIndex(el => el === item.templateCode);
return item[templateCodeKeyWords[index]];
},
getTemplateData() {
return this.templateData;
console.log(this.templateData);
return this.templateData.map(el => ({
...el,
templateValue: this.transformConfigvalue(el)
}));
},
//查看标签的配置项
......@@ -929,7 +948,9 @@ export default {
/**
* 城市
*/
getcityData() {},
getcityData() {
console.log();
},
/**
* 获取当前标签数据
......@@ -1036,3 +1057,168 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.myTagDetail-wrap__btn {
margin-top: 80px;
}
.relative-range {
width: 526px;
height: 191px;
padding: 19px;
background: #f3f6f9;
}
.label-unit {
font-size: 14px;
color: #606266;
}
.label-tip {
display: inline-block;
vertical-align: middle;
padding-left: 14px;
font-size: 13px;
color: #909399;
}
.w-438 {
width: 438px;
}
.w-526 {
width: 526px;
}
.h-80 {
height: 80px;
}
.border-t-e4e7ed {
border-bottom: 1px solid #e4e7ed;
}
.el-select-dropdown__item.selected:hover {
background-color: #f5f7fa;
}
.fixed-date-picker {
padding: 20px;
}
.bg-f3f6f9 {
background: #f3f6f9;
}
.add-tags-wrap {
width: 380px;
height: 110px;
padding: 0 8px;
overflow-y: auto;
white-space: pre-wrap;
border: 1px solid #dcdfe6;
border-radius: 4px;
.el-tag {
margin-top: 8px;
margin-right: 8px;
/*background: none;
background-color: none;
border: none;
font-size: 14px;
color: #606266;
.el-tag__close {
width: 14px;
height: 14px;
line-height: 14px;
font-size: 12px;
color: #fff;
background: #DCDFE6;
}*/
}
}
.add-search-select {
.el-select {
line-height: 32px;
span {
-webkit-transform: scale(0);
-ms-transform: scale(0);
-o-transform: scale(0);
transform: scale(0);
}
}
}
.all-select-options {
.el-checkbox {
margin-right: 16px;
line-height: 32px;
& + .el-checkbox {
margin-left: 0;
}
}
&.all-select-options__city {
.el-checkbox-group {
max-height: 500px;
overflow-y: auto;
}
}
}
.slected-opyions {
.el-tag {
margin-top: 8px;
margin-right: 8px;
/*background: none;
background-color: none;
border: none;
font-size: 14px;
color: #606266;
.el-tag__close {
width: 14px;
height: 14px;
line-height: 14px;
font-size: 12px;
color: #fff;
background: #DCDFE6;
}*/
}
&.city-slected-opyions {
font-size: 0;
.el-tag {
margin: 0 10px 10px 0;
/*background: #F4F4F5;
border: 1px solid rgba(233,233,235,1);
font-size: 12px;
color: #909399;
.el-tag__close {
width: 14px;
height: 14px;
line-height: 14px;
font-size: 12px;
color: #fff;
background: #DCDFE6;
}*/
}
}
}
.city-checkbox {
position: relative;
height: 50px;
line-height: 50px;
padding: 0 8px;
&.city-checkbox-all {
background: #f1f3f7;
}
}
</style>
src/components/userDefined.vue
......@@ -2,8 +2,7 @@
<!--自定义字段列表-弹框-->
<el-dialog title="自定义字段列表" :visible.sync="showFlag" :before-close="handleClose" width="600px">
<div class="checkwtip mBottom10">
请选择您想显示的列表详细信息，最多勾选8个选项，已经勾选了
<span class="curcheck">{{ checkedFields.length }}</span> 个
请选择您想显示的列表详细信息，最多勾选8个选项，已经勾选了<span class="curcheck">{{ checkedFields.length }}</span> 个
</div>
<el-checkbox-group v-model="checkedFields" :min="0" :max="8">
<div class="checkwrap flex flex-wrap">
......@@ -27,12 +26,8 @@ export default {
name: 'userDefined',
props: {
showUserDefined: Boolean,
selectedData: {
type: Array
},
fieldsData: {
type: Array
}
selectedData:[],
fieldsData: []
},
data() {
return {
......@@ -46,13 +41,11 @@ export default {
* 关闭
*/
handleClose(done) {
const that = this;
this.$emit('hideUserDefined', false);
},
submitFields() {
const that = this;
that.$emit('confirmUserDefined', that.checkedFields);
this.$emit('confirmUserDefined', this.checkedFields);
},
/**
......@@ -72,11 +65,6 @@ export default {
selectedData: function(newData, oldData) {
this.checkedFields = newData;
}
},
mounted() {
this.showFlag = this.showUserDefined;
this.memberFields = this.fieldsData;
this.checkedFields = this.selectedData;
}
};
</script>
......
src/view/myTag/myTagList.vue
......@@ -25,9 +25,9 @@
>
</el-table-column> -->
<el-table-column label="标签名称" show-overflow-tooltip>
<template slot-scope="scope"
><span class="pointer name-hover" @click="addTemporary(scope.row.tagId)">{{ scope.row.tagName }}</span></template
>
<template slot-scope="scope">
<span class="pointer name-hover" @click="addTemporary(scope.row.tagId)">{{ scope.row.tagName }}</span>
</template>
</el-table-column>
<el-table-column prop="tagDescribe" label="标签描述" show-overflow-tooltip> </el-table-column>
<el-table-column label="是否实时">
......
src/view/platformTag/tag-container.vue
......@@ -102,6 +102,7 @@ export default {
methods: {
handleClose() {
this.dialogVisible = false;
this.optionFlag = false;
},
// 添加标签 弹框里面操作
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment