Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
5676fff627
|
@ -1,12 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div style="height: 100%">
|
<div style="height: 100%">
|
||||||
<List
|
<List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="BLANKPHD" pageType="ACQ"></List>
|
||||||
:stationList="stationList"
|
|
||||||
:columns="columns"
|
|
||||||
:dataType="dataType"
|
|
||||||
fileName="CALIBPHD"
|
|
||||||
pageType="CALIB"
|
|
||||||
></List>
|
|
||||||
<!-- <a-spin :spinning="spinning">
|
<!-- <a-spin :spinning="spinning">
|
||||||
<a-card v-if="!isDetail" :bordered="false" style="margin-left: 20px">
|
<a-card v-if="!isDetail" :bordered="false" style="margin-left: 20px">
|
||||||
<search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
|
<search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user