Commit 533b350d authored by yuanchongyou's avatar yuanchongyou

初步完成

parent 44a337f3
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
</template> </template>
<script> <script>
import { mapState} from 'vuex';
import SimpleColor from './colorpage/SimpleColor'; import SimpleColor from './colorpage/SimpleColor';
import SizeInput from './colorpage/SizeInput' import SizeInput from './colorpage/SizeInput'
export default { export default {
...@@ -43,6 +44,9 @@ export default { ...@@ -43,6 +44,9 @@ export default {
mounted() { mounted() {
this.textStyle() this.textStyle()
}, },
computed:{
...mapState(['layerStyle']),
},
methods: { methods: {
hide() { hide() {
this.visible = false; this.visible = false;
...@@ -58,7 +62,6 @@ export default { ...@@ -58,7 +62,6 @@ export default {
this.$emit('styleLayer', this.subObj); this.$emit('styleLayer', this.subObj);
}, },
InputChange(item){ InputChange(item){
console.log(item,'注记')
if(item.type === 'size'){ if(item.type === 'size'){
this.layerstroke.msg = item.msg this.layerstroke.msg = item.msg
}else{ }else{
...@@ -77,6 +80,22 @@ export default { ...@@ -77,6 +80,22 @@ export default {
let d = "true" let d = "true"
let obj2 = {[[c]]:d} let obj2 = {[[c]]:d}
Object.assign(this.subObj,obj2) Object.assign(this.subObj,obj2)
if((this.layerStyle.id === 'agnp') || (this.layerStyle.id === 'agnp_shcs')){
let c = 'et_content'
let d = "[NAME]"
let obj2 = {[[c]]:d}
Object.assign(this.subObj,obj2)
}else if(this.layerStyle.id === 'mark') {
let c = 'et_content'
let d = "[TextString]"
let obj2 = {[[c]]:d}
Object.assign(this.subObj,obj2)
}else {
let c = 'et_content'
let d = "[XZNAME]"
let obj2 = {[[c]]:d}
Object.assign(this.subObj,obj2)
}
this.$emit('styleLayer', this.subObj); this.$emit('styleLayer', this.subObj);
} }
}, },
......
...@@ -172,8 +172,8 @@ export default { ...@@ -172,8 +172,8 @@ export default {
layerStyle(val){ layerStyle(val){
this.drawerTitle = val this.drawerTitle = val
this.styleVisible = true; this.styleVisible = true;
console.log(val,'val')
this.getlayerstyle(val) this.getlayerstyle(val)
}, },
afterVisibleChange(val) { afterVisibleChange(val) {
console.log('visible', val); console.log('visible', val);
......
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