冲突解决

ZZJ

2022-01-27 27f5dec30ee350fa31b1a0b8aaffc11ba0423e28

 src/pages/cameraAccess/components/scene/SlideScene.vue

@@ -30,7 +30,7 @@
                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[0].icon_blob &&item.rules[0].icon_blob.indexOf(',')>0?item.rules[0].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    :src="item.rules[index].icon_blob &&item.rules[index].icon_blob.indexOf(',')>0?item.rules[index].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    alt

                  />

                </div>

@@ -42,7 +42,7 @@
                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[0].icon_blob &&item.rules[0].icon_blob.indexOf(',')>0?item.rules[0].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    :src="item.rules[index].icon_blob &&item.rules[index].icon_blob.indexOf(',')>0?item.rules[index].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    alt

                  />

                </div>

@@ -54,7 +54,7 @@
                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[0].icon_blob && item.rules[0].icon_blob.indexOf(',')>0?item.rules[0].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    :src="item.rules[index].icon_blob && item.rules[index].icon_blob.indexOf(',')>0?item.rules[index].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    alt

                  />

                </div>