Commit f34695aa by lichengming

修改了试验检测打开新页面查看GDS数据

parent 781227c5
<template> <template>
<div> <div>
<Modal v-model="showModal" :mask-closable="false" width="1200">
<p slot="header">{{modalTitle}}</p>
<Row> <Row>
<Col span="24"> <Col span="24">
<div style="overflow-y: auto"> <div style="overflow-y: auto">
...@@ -119,10 +117,6 @@ ...@@ -119,10 +117,6 @@
</div> </div>
</Col> </Col>
</Row> </Row>
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
</div> </div>
</template> </template>
<script> <script>
...@@ -131,6 +125,7 @@ ...@@ -131,6 +125,7 @@
*/ */
import { soilTest } from '../../../api' import { soilTest } from '../../../api'
export default { export default {
layout: 'blank-layout',
components: {}, components: {},
data() { data() {
return { return {
...@@ -226,6 +221,10 @@ export default { ...@@ -226,6 +221,10 @@ export default {
aptitudeData: [] aptitudeData: []
} }
}, },
mounted() {
console.log(this.$route.query.id)
this._openEdit(this.$route.query.id)
},
methods: { methods: {
/** *modal-footer */ /** *modal-footer */
_footerResult(name) { _footerResult(name) {
......
...@@ -240,8 +240,15 @@ export default { ...@@ -240,8 +240,15 @@ export default {
} }
}) })
}, },
// _viewGdsData(id) {
// this.$refs.viewGds._openEdit(id)
// },
_viewGdsData(id) { _viewGdsData(id) {
this.$refs.viewGds._openEdit(id) const routeData = this.$router.resolve({
path: '/blank/GdsData',
query: { id: id }
})
window.open(routeData.href, '_blank')
}, },
_operationRecord(id) { _operationRecord(id) {
this.$refs.Operation._open(id) this.$refs.Operation._open(id)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* 地址路由 * 地址路由
*/ */
import Lock from '../pages/Lock.vue' // 锁屏 import Lock from '../pages/Lock.vue' // 锁屏
import workbench from '../pages/soil-sample-manage/sample-preparation/PreparationOther' import viewGdsData from '../pages/soil-test-manage/test-input/ViewGdsData'
import Index from '~/pages/index' import Index from '~/pages/index'
import Blank from '~/pages/blank' import Blank from '~/pages/blank'
import SoilRouters from '~/router/soil-routes' import SoilRouters from '~/router/soil-routes'
...@@ -26,8 +26,8 @@ export default [ ...@@ -26,8 +26,8 @@ export default [
meta: { title: '土工试验LIMS' } meta: { title: '土工试验LIMS' }
}, },
{ {
path: '/blank/item_by_method', path: '/blank/GdsData',
component: workbench component: viewGdsData
}, },
{ path: '*', redirect: '/' } { path: '*', redirect: '/' }
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment