蒋珅 hai 1 ano
pai
achega
8dde86a48d
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      src/views/WindSite/components/boosterstation/ak.vue

+ 4 - 0
src/views/WindSite/components/boosterstation/ak.vue

@@ -4965,7 +4965,11 @@
       custom-class="modal"
       :close-on-click-modal="false"
     >
+<<<<<<< HEAD
       <nbq-screen :nbqIndex="nbqIndex" :datas="ajaxData" />
+=======
+      <nbq-screen :datas="ajaxData" :nbq-index="nbqIndex"/>
+>>>>>>> e312d8e426b12733a5b2d4394ab47f9cc7d9d90c
     </el-dialog>
     <!-- agc信息图 -->
     <el-dialog