diff --git a/src/components/panel/layers.vue b/src/components/panel/layers.vue index b8723ed..61f7777 100644 --- a/src/components/panel/layers.vue +++ b/src/components/panel/layers.vue @@ -8,7 +8,7 @@ :type="layer === activeElement?'':'info'" @click="(e) => {activeLayer(e, layer)}" @close="(e) => {dele(e, layer)}" - >{{ layer.value }} + >{{ layer.title }} diff --git a/src/components/panel/options/index.vue b/src/components/panel/options/index.vue index ffa3371..ecc72d6 100644 --- a/src/components/panel/options/index.vue +++ b/src/components/panel/options/index.vue @@ -12,7 +12,7 @@ - {{ col.title }} + {{ col.name }} @@ -74,7 +74,7 @@ export default { defaultValue: "属性", dragable: true, height: 40, - id: 335, + id: 336, isEdit: 1, left: 50, lodopStyle: null, @@ -106,7 +106,7 @@ export default { defaultValue:"CK-1234567890", dragable:true, height:40, - id:338, + id:337, isEdit:1, left:50, lodopStyle: { @@ -134,7 +134,40 @@ export default { type:"bar-code", value:"{单号}", width:120 - } + }, + { + columnsAttr:null, + defaultValue:"http://192.168.1.83:9100/iamge/666.jpg", + dragable:true, + height:40, + id:338, + isEdit:1, + left:50, + lodopStyle: { + id:5, + qrCodeErrorlevel:"L", + qrCodeVersion:"1", + site:null, + supplierId:338 + }, + name:"图片", + remark:null, + resizable:true, + site:null, + status:null, + style: { + ItemType:0, + zIndex:0, + height: 100, + width: 100 + }, + supplierId:1, + title:"图片", + top:0, + type:"braid-image", + value:"", + width:120 + }, ] } }, diff --git a/src/components/panel/style.vue b/src/components/panel/style.vue index 8408902..c8cc935 100644 --- a/src/components/panel/style.vue +++ b/src/components/panel/style.vue @@ -160,29 +160,68 @@ - + - - + + - + + + + + + + + + + + + + + + +