Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-05-13 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645

 src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue

@@ -86,7 +86,9 @@
</template>

<script>
import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'

import ReportPopup from './ReportPopup'

export default {
  name: 'EventQuery',
@@ -97,7 +99,7 @@
        { name: '金陵石化' },
        { name: '南京化学' }
      ],
      subItems: LayerEntEmer.layers,
      subItems: ['事前阶段', '审批阶段', '事件完结'],
      form: {
        pipelineType: '',
        dataType: '',
@@ -128,6 +130,16 @@
    },
    btnAffiliatedFacilities () {
      console.log('item')
      window.$layer.open({
        content: {
          content: ReportPopup, // 组件
          parent: this, // 父组件
          data: { // 传递的参数
            // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
          }
        }
        // title: 'title' // 标题
      })
    }
  }
}