Skip to content

P
patzn-cloud-web-back-soil
Commit 108fad10 by wangweidong
Options

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

parents b39b8be1 5eb23d7b
Showing with 403 additions and 34 deletions
api/soil/soil-test.js
......@@ -69,6 +69,16 @@ export default {
JSON.stringify(data.obj)
)
.then(res => res),
pageExpPrepareBath: data =>
https
.post(
'soil/v1/experiment/page_exp_prepare_bath?page=' +
data.page +
'&rows=' +
data.rows,
JSON.stringify(data.obj)
)
.then(res => res),
pageExpPrepare: data =>
http.post('soil/v1/experiment/page_exp_prepare', data).then(res => res),
zTree: data =>
......@@ -172,5 +182,12 @@ export default {
http.post('soil/v1/exp_report/page', data).then(res => res),
deleteReport: data =>
http.delete('soil/v1/exp_report/?ids=' + data).then(res => res),
reportPage: data => http.post('soil/v1/report/page', data).then(res => res)
reportPage: data => http.post('soil/v1/report/page', data).then(res => res),
dataGds: data => http.get('soil/v1/data_gds/' + data).then(res => res),
gdsGetMainInfo: data =>
http
.post('soil/v1/data_gds/get_main_info?sampleCode=' + data)
.then(res => res),
dataGdsDetail: data =>
http.post('soil/v1/data_gds_detail/page', data).then(res => res)
}
components/file/entrust-file-manage/FilesList.vue
......@@ -61,7 +61,7 @@
fixed="right">
<template slot-scope="scope">
<VXEIconList
:msg="scope.row.type === 'jpg'||scope.row.type === 'pdf' ?iconMsgJpg:iconMsg"
:msg="scope.row.type === 'jpg'||scope.row.type === 'pdf'||scope.row.type === 'png' ?iconMsgJpg:iconMsg"
@on-result-change="_iconClick" :rowData="scope.row"></VXEIconList>
</template>
</vxe-table-column>
......@@ -331,6 +331,12 @@ export default {
case 'pdf':
this.$pdfView(data.objectKey)
break
case 'png':
const pngViewList = []
pngViewList.push(global.baseURL + this.downloadFileUrlFile + data.id)
this.imgViewList = pngViewList
this.imgViewIndex = 0
break
}
// console.log(data)
// if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {
......
components/file/file-manage/FilesList.vue
......@@ -74,7 +74,7 @@
<li v-for="item in getPage.records" :key="item.id">
<div class="thumbnailStyleImg">
<Tooltip placement="top">
<img :src=" bigUrl+item.type+'.png' "/>
<img :class="item.type === 'jpg'||item.type === 'png'?'samllJpg':' ' " :src=" item.type==='jpg'||item.type === 'png'?imgUrl+item.id:bigUrl+item.type+'.png' "/>
<div slot="content" style="white-space: normal">
<p>名称：{{item.fileName}}</p>
</div>
......@@ -126,10 +126,10 @@
</Spin>
</div>
<!--图片预览-->
<!-- <div>-->
<!-- <vue-gallery-slideshow :images="imgViewList" :index="imgViewIndex"-->
<!-- @close="imgViewIndex = null"></vue-gallery-slideshow>-->
<!-- </div>-->
<div>
<vue-gallery-slideshow :images="imgViewList" :index="imgViewIndex"
@close="imgViewIndex = null"></vue-gallery-slideshow>
</div>
</div>
</template>
......@@ -156,6 +156,11 @@ export default {
{ type: 'ios-download', id: '', name: '下载' }
// { type: 'ios-eye', id: '', name: '预览' }
],
iconMsgJpg: [
{ type: 'md-remove-circle', id: '', name: '删除' },
{ type: 'ios-download', id: '', name: '下载' },
{ type: 'ios-eye', id: '', name: '预览' }
],
iconMsgDis: [
{ type: 'trash-a', id: '', name: '删除' },
{ type: 'ios-download', id: '', name: '下载' },
......@@ -188,7 +193,7 @@ export default {
Ids: [],
smallUrl: global.staticURL + '/img/smallfile/',
bigUrl: global.staticURL + '/img/bigfile/',
imgUrl: global.baseURL + '/soil/v1/entrust_annex/download/',
action: '',
dataObj: {
file: ''
......@@ -229,6 +234,7 @@ export default {
this.idsObj = idsObj
this.urlData = data
this.action = global.baseURL + data.uploadFileUrl + data.id
this.downloadFileUrlFile = data.downloadFileUrl
this.$nextTick(() => {
this._page()
})
......@@ -311,17 +317,28 @@ export default {
}
},
// 预览图片（该合同下所有的）
_viewImg: async function(data) {
console.log(data)
if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {
const id = data.entrustId
const result = await meterEntrust.entrustPreview(id)
console.log(result)
} else {
const id = data.contractId
const result = await meterEntrust.attachmentPreview(id)
console.log(result)
_viewImg(data) {
switch (data.type) {
case 'jpg':
const imgViewList = []
imgViewList.push(global.baseURL + this.downloadFileUrlFile + data.id)
this.imgViewList = imgViewList
this.imgViewIndex = 0
break
case 'pdf':
this.$pdfView(data.objectKey)
break
}
// console.log(data)
// if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {
// const id = data.entrustId
// const result = await meterEntrust.entrustPreview(id)
// console.log(result)
// } else {
// const id = data.contractId
// const result = await meterEntrust.attachmentPreview(id)
// console.log(result)
// }
// this.$store.dispatch(this.urlData.uri, this.id).then(() => {
// const viewUri = this.urlData.viewUri
......@@ -439,4 +456,8 @@ export default {
border-radius: 4px !important;
border-left: 1px solid #dddee1 !important;
}
.samllJpg {
width: 15%;
height: auto;
}
</style>
pages/meter-entrust/entrust-register/EntrustRegister.vue
......@@ -38,7 +38,10 @@
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else-if="item.status">{{scope.row[item.key].display}}</span>
<div v-else-if="item.status">
<span v-if="scope.row[item.key].display === '委托单评审驳回'" style="color: red;">{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
<span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
</div>
<span v-else-if="item.key==='backReasons'" style="color: red">{{scope.row[item.key]}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
......
pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordLeftList.vue
......@@ -18,9 +18,9 @@
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" select-data>
@on-result-change="_tableResultChange" :getPage="getPage" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......@@ -52,6 +52,7 @@ export default {
formObj: {
name: undefined
},
selectDataName: [],
tableName: 'food-task-assign-item-left',
// 用户自己选中的列
userColumns: [],
......@@ -116,10 +117,15 @@ export default {
console.log(msg, data)
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodItem.page
this._page()
break
case 'selectData':
this.$emit('on-result-change', data)
this.selectDataName = []
for (let i = 0; i < data.length; i++) {
this.selectDataName.push(data[i].name)
}
console.log('selectDataName', this.selectDataName)
this.$emit('on-result-change', this.selectDataName)
break
case 'singleSelect':
this.$emit('on-result-change', data)
......
pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordRightList.vue
......@@ -90,7 +90,11 @@ export default {
entrustId: '',
name: '',
testMethod: '',
testBasis: ''
testBasis: '',
obj: {
entrustId: '',
nameList: []
}
},
entrustId: '',
envPro: false,
......@@ -152,7 +156,7 @@ export default {
{ title: '检测依据', key: 'testBasis', width: 140 },
{ title: '检测科室', key: 'groupName', width: 150 }
],
leftSelectData: {},
leftSelectData: [],
selectIds: [], // 检测项目id
selectData: [], // 检测项目data
selectSampleIds: [], // 样品ids
......@@ -610,11 +614,13 @@ export default {
return obj
},
_page: async function() {
this.formObj.obj.nameList = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.entrustId
this.formObj.name = this.leftSelectData.name
this.formObj.testMethod = this.leftSelectData.testMethod
const result = await soilTest.pageExpPrepare(
this.formObj.obj.entrustId = this.entrustId
this.formObj.obj.nameList = this.leftSelectData
// this.formObj.entrustId = this.entrustId
// this.formObj.nameList = this.leftSelectData.join(',')
const result = await soilTest.pageExpPrepareBath(
this.$serializeForm(this.formObj)
)
if (result) {
......@@ -623,6 +629,20 @@ export default {
this.getPage = result
}
},
// _page: async function() {
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// this.formObj.entrustId = this.entrustId
// this.formObj.name = this.leftSelectData.name
// this.formObj.testMethod = this.leftSelectData.testMethod
// const result = await soilTest.pageExpPrepare(
// this.$serializeForm(this.formObj)
// )
// if (result) {
// this.$refs.pageTable._hideLoading()
// this.$refs.pageTable._checkAll()
// this.getPage = result
// }
// },
_tableResultChange(msg, data) {
const selectIds = []
switch (msg) {
......
pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue
......@@ -134,11 +134,10 @@ export default {
console.log('selectDataName', this.selectDataName)
this.$emit('on-result-change', this.selectDataName)
break
case 'singleSelect':
this.$emit('on-result-change', data)
break
case 'iconClick':
this.$refs.pageTable._radioChangeItem(data.rowData)
const selcetName = []
selcetName.push(data.rowData.name)
this.$emit('on-result-change', selcetName)
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'changeSize':
......
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
......@@ -58,6 +58,7 @@
<CreateReport ref="createModal" @on-result-change="_certificateSelectExcelBack"></CreateReport>
<Reason ref="reasonModal" @on-result-change="_reasonResult" />
<Operation ref="Operation"></Operation>
<ViewGdsData ref="viewGds"></ViewGdsData>
</div>
</template>
<script>
......@@ -73,6 +74,7 @@ import CollectManage from '../CollectManage'
import CollectFileManage from '../CollectFileManage'
import Reason from '../../../../components/base/Reason'
import Operation from '../../../../components/operation/ItemOperation'
import ViewGdsData from '../ViewGdsData'
import CreateReport from './CreateReport'
export default {
components: {
......@@ -86,7 +88,8 @@ export default {
CollectFileManage,
Reason,
CreateReport,
Operation
Operation,
ViewGdsData
},
data() {
return {
......@@ -141,6 +144,7 @@ export default {
],
iconMsg: [
{ type: 'ios-book', id: '', name: '查看原始记录' },
{ type: 'ios-list-box', id: '', name: '查看GDS数据' },
{ type: 'md-apps', id: '', name: '查看指标' },
{ type: 'ios-bookmarks', id: '', name: '查看采集数据' },
{ type: 'ios-browsers', id: '', name: '查看采集文件' },
......@@ -212,6 +216,9 @@ export default {
// this.$Message.warning('未填写原始记录')
// }
break
case '查看GDS数据':
this._viewGdsData(data.sampleCode)
break
case '查看指标':
this._indexManage(data)
break
......@@ -233,6 +240,9 @@ export default {
}
})
},
_viewGdsData(id) {
this.$refs.viewGds._openEdit(id)
},
_operationRecord(id) {
this.$refs.Operation._open(id)
// 操作日志
......
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