|
@@ -123,7 +123,7 @@
|
|
v-model="lengedName"
|
|
v-model="lengedName"
|
|
allow-clear
|
|
allow-clear
|
|
@change="changeLengedName"
|
|
@change="changeLengedName"
|
|
- :auto-size="{ minRows: 2}"
|
|
|
|
|
|
+ :auto-size="{ minRows: 2}"
|
|
/>
|
|
/>
|
|
<!-- <a-input v-model="lengedName" @change="changeLengedName" />-->
|
|
<!-- <a-input v-model="lengedName" @change="changeLengedName" />-->
|
|
</div>
|
|
</div>
|
|
@@ -558,6 +558,7 @@ export default {
|
|
focusItemList: function(newval) {
|
|
focusItemList: function(newval) {
|
|
console.log('------------')
|
|
console.log('------------')
|
|
console.log(FENGMAP)
|
|
console.log(FENGMAP)
|
|
|
|
+ console.log('newval',newval)
|
|
const Item = newval.itemList[0];
|
|
const Item = newval.itemList[0];
|
|
this.imageNum = 1; //切换item初始化
|
|
this.imageNum = 1; //切换item初始化
|
|
if (Item.data && Item.data.SubType) {
|
|
if (Item.data && Item.data.SubType) {
|
|
@@ -631,8 +632,7 @@ export default {
|
|
this.color = Item.color.value;
|
|
this.color = Item.color.value;
|
|
this.fontSize = Item.font.size;
|
|
this.fontSize = Item.font.size;
|
|
} else if (newval.itemType == "Line") {
|
|
} else if (newval.itemType == "Line") {
|
|
- console.log('line',Item.name)
|
|
|
|
- this.color = Item.color.value;
|
|
|
|
|
|
+ // this.color = Item.color.value;
|
|
this.fillColor = Item.fillColor.value;
|
|
this.fillColor = Item.fillColor.value;
|
|
this.borderColor = Item.strokeColor.value;
|
|
this.borderColor = Item.strokeColor.value;
|
|
this.lineWidth = Item.lineWidth;
|
|
this.lineWidth = Item.lineWidth;
|
|
@@ -657,13 +657,15 @@ export default {
|
|
const assetnumList = [];
|
|
const assetnumList = [];
|
|
let params = {};
|
|
let params = {};
|
|
this.attrCards = [];
|
|
this.attrCards = [];
|
|
- Item.data.AttachObjectIds.map(item => {
|
|
|
|
|
|
+ if(Item.data.AttachObjectIds && Item.data.AttachObjectIds.length ){
|
|
|
|
+ Item.data.AttachObjectIds.map(item => {
|
|
if (item.type == "Zone") {
|
|
if (item.type == "Zone") {
|
|
locationList.push(item.id);
|
|
locationList.push(item.id);
|
|
} else if (item.type == "Image") {
|
|
} else if (item.type == "Image") {
|
|
assetnumList.push(item.id);
|
|
assetnumList.push(item.id);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+ }
|
|
// if(newval.itemType == 'Zone'){
|
|
// if(newval.itemType == 'Zone'){
|
|
this.spinning = true;
|
|
this.spinning = true;
|
|
if (locationList.length) {
|
|
if (locationList.length) {
|