xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy

Browse Source
This commit is contained in:
orgin 2023-07-05 13:54:45 +08:00
commit 9565684a00
7 changed files with 28 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/statistics/RouteView.vue
View File

@ -101,6 +101,7 @@ export default {
this.menus = f.children
}
})
console.log("路由信息",this.menus);
this.initDefaultKeys(this.menus[0])
// 将从缓存中取出openKeys
const openKeys = window.sessionStorage.getItem('openKeys')

24
src/views/statistics/blankphd.vue → src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
View File

@ -5,7 +5,7 @@
<search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
<a-space style="float: right" class="btn-group" slot="additional">
<a-button @click="handleEdit" type="primary">
<img src="@/assets/images/global/edit.png" alt="" />
<img class="icon-edit" src="@/assets/images/global/edit.png" alt="" />
Excel
</a-button>
</a-space>
@ -35,7 +35,6 @@ const columns = [
{
title: 'NO',
align: 'left',
width: 50,
scopedSlots: {
customRender: 'index',
},
@ -58,37 +57,32 @@ const columns = [
title: 'STATION',
align: 'left',
dataIndex: 'stationName',
width: 130,
},
{
title: 'DETECTOR CODE',
align: 'left',
width: 100,
dataIndex: 'siteDetCode',
},
{
title: 'SPECTRAL QUALIFIER',
align: 'left',
width: 100,
dataIndex: 'spectralQualifie',
},
{
title: 'ACQUISITION START TIME',
align: 'left',
width: 100,
dataIndex: 'acquisitionStart',
},
{
title: 'ACQUISITION STOP TIME',
align: 'left',
width: 120,
dataIndex: 'acquisitionStop',
},
]
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '../../api/manage'
import dateFormat from '../../components/jeecg/JEasyCron/format-date'
import Detail from "./detail.vue"
import { getAction } from '../../../../../api/manage'
import dateFormat from '../../../../../components/jeecg/JEasyCron/format-date'
import Detail from "../../../detail.vue"
export default {
name: 'menuTree',
mixins: [JeecgListMixin],
@ -248,9 +242,8 @@ export default {
type: 'custom-date-picker',
name: 'startTime',
props: {
showTime: { format: 'HH:mm' },
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD:ss',
valueFormat: 'YYYY-MM-DD',
style: {
minWidth: 'auto',
width: '200px',
@ -265,9 +258,8 @@ export default {
type: 'custom-date-picker',
name: 'endTime',
props: {
showTime: { format: 'HH:mm' },
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD:ss',
valueFormat: 'YYYY-MM-DD',
style: {
minWidth: 'auto',
width: '200px',
@ -283,6 +275,8 @@ export default {
}
</script>
<style lang="less" scoped>
.icon-edit{
margin-right: 10px;
}
</style>

11
src/views/statistics/calibphd.vue → src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
View File

@ -5,14 +5,13 @@
</template>
<script>
import List from "./list.vue"
import { getAction } from '../../api/manage'
import List from "../../../list.vue"
import { getAction } from '../../../../../api/manage'
const columns = [
{
title: 'NO',
align: 'left',
width: 50,
scopedSlots: {
customRender: 'index',
},
@ -35,36 +34,30 @@ const columns = [
title: 'STATION',
align: 'left',
dataIndex: 'stationName',
width: 130,
},
{
title: 'DETECTOR CODE',
align: 'left',
width: 100,
dataIndex: 'siteDetCode',
},
{
title: 'SPECTRAL QUALIFIER',
align: 'left',
width: 100,
dataIndex: 'spectralQualifie',
},
{
title: 'ACQUISITION START TIME',
align: 'left',
width: 100,
dataIndex: 'acquisitionStart',
},
{
title: 'ACQUISITION STOP TIME',
align: 'left',
width: 120,
dataIndex: 'acquisitionStop',
},
{
title: 'CALIB REPORTS',
align: 'left',
width: 120,
dataIndex: 'calibReports',
},
]

10
src/views/statistics/detbkphd.vue → src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
View File

@ -5,14 +5,13 @@
</template>
<script>
import List from "./list.vue"
import { getAction } from '../../api/manage'
import List from "../../../list.vue"
import { getAction } from '../../../../../api/manage'
const columns = [
{
title: 'NO',
align: 'left',
width: 50,
scopedSlots: {
customRender: 'index',
},
@ -35,30 +34,25 @@ const columns = [
title: 'STATION',
align: 'left',
dataIndex: 'stationName',
width: 130,
},
{
title: 'DETECTOR CODE',
align: 'left',
width: 100,
dataIndex: 'siteDetCode',
},
{
title: 'SPECTRAL QUALIFIER',
align: 'left',
width: 100,
dataIndex: 'spectralQualifie',
},
{
title: 'ACQUISITION START TIME',
align: 'left',
width: 100,
dataIndex: 'acquisitionStart',
},
{
title: 'ACQUISITION STOP TIME',
align: 'left',
width: 120,
dataIndex: 'acquisitionStop',
},
]

10
src/views/statistics/qcphd.vue → src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
View File

@ -5,14 +5,13 @@
</template>
<script>
import List from "./list.vue"
import { getAction } from '../../api/manage'
import List from "../../../list.vue"
import { getAction } from '../../../../../api/manage'
const columns = [
{
title: 'NO',
align: 'left',
width: 50,
scopedSlots: {
customRender: 'index',
},
@ -35,30 +34,25 @@ const columns = [
title: 'STATION',
align: 'left',
dataIndex: 'stationName',
width: 130,
},
{
title: 'DETECTOR CODE',
align: 'left',
width: 100,
dataIndex: 'siteDetCode',
},
{
title: 'SPECTRAL QUALIFIER',
align: 'left',
width: 100,
dataIndex: 'spectralQualifie',
},
{
title: 'ACQUISITION START TIME',
align: 'left',
width: 100,
dataIndex: 'acquisitionStart',
},
{
title: 'ACQUISITION STOP TIME',
align: 'left',
width: 120,
dataIndex: 'acquisitionStop',
},
]

18
src/views/statistics/sphdf.vue → src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
View File

@ -5,14 +5,13 @@
</template>
<script>
import List from "./list.vue"
import { getAction } from '../../api/manage'
import List from "../../../list.vue"
import { getAction } from '../../../../../api/manage'
const columns = [
{
title: 'NO',
align: 'left',
width: 50,
scopedSlots: {
customRender: 'index',
},
@ -35,31 +34,26 @@ const columns = [
title: 'STATION',
align: 'left',
dataIndex: 'stationName',
width: 130,
},
{
title: 'DETECTOR CODE',
align: 'left',
width: 100,
dataIndex: 'siteDetCode',
},
{
title: 'SPECTRAL QUALIFIER',
align: 'left',
width: 100,
dataIndex: 'spectralQualifie',
},
{
title: 'ACQUISITION START TIME',
title: 'COLLECTION START TIME',
align: 'left',
width: 100,
dataIndex: 'acquisitionStart',
dataIndex: 'collectStart',
},
{
title: 'ACQUISITION STOP TIME',
title: 'COLLECTION STOP TIME',
align: 'left',
width: 120,
dataIndex: 'acquisitionStop',
dataIndex: 'collectStop',
},
]
export default {

18
src/views/statistics/sphdp.vue → src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
View File

@ -5,14 +5,13 @@
</template>
<script>
import List from "./list.vue"
import { getAction } from '../../api/manage'
import List from "../../../list.vue"
import { getAction } from '../../../../../api/manage'
const columns = [
{
title: 'NO',
align: 'left',
width: 50,
scopedSlots: {
customRender: 'index',
},
@ -35,31 +34,26 @@ const columns = [
title: 'STATION',
align: 'left',
dataIndex: 'stationName',
width: 130,
},
{
title: 'DETECTOR CODE',
align: 'left',
width: 100,
dataIndex: 'siteDetCode',
},
{
title: 'SPECTRAL QUALIFIER',
align: 'left',
width: 100,
dataIndex: 'spectralQualifie',
},
{
title: 'ACQUISITION START TIME',
title: 'COLLECTION START TIME',
align: 'left',
width: 100,
dataIndex: 'acquisitionStart',
dataIndex: 'collectionStart',
},
{
title: 'ACQUISITION STOP TIME',
title: 'COLLECTION STOP TIME',
align: 'left',
width: 120,
dataIndex: 'acquisitionStop',
dataIndex: 'collectionStop',
},
]
export default {