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/ViewGdsData.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="1200">
<p slot="header">{{modalTitle}}</p>
<Row>
<Col span="24">
<div style="overflow-y: auto">
<table class="tableClass">
<tbody>
<tr>
<th colspan="6" class="tableClass_back">GDS信息</th>
</tr>
<tr>
<th>初始高度</th>
<td>{{gdsData.initialHeight}}</td>
<th>初始直径</th>
<td>{{gdsData.initialDiameter}}</td>
<th>比重(kN/m3)</th>
<td>{{gdsData.specificGravityKn}}</td>
</tr>
<tr>
<th>工作参考</th>
<td>{{gdsData.jobReference}}</td>
<th>钻孔名称</th>
<td>{{gdsData.borehole}}</td>
<th>样品名称</th>
<td>{{gdsData.sampleName}}</td>
</tr>
<tr>
<th>深度</th>
<td>{{gdsData.depth}}</td>
<th>样品日期</th>
<td>{{gdsData.sampleDate}}</td>
<th>样品描述</th>
<td>{{gdsData.descriptionOfSample}}</td>
</tr>
<tr>
<th>初始质量</th>
<td>{{gdsData.initialMass}}</td>
<th>初始干质量</th>
<td>{{gdsData.initialDryMass}}</td>
<th>比重(ass/meas)</th>
<td>{{gdsData.specificGravityAss}}</td>
</tr>
<tr>
<th>试验条款</th>
<td>{{gdsData.testClause}}</td>
<th>测试开始日期</th>
<td>{{gdsData.dateTestStarted}}</td>
<th>测试结束日期</th>
<td>{{gdsData.dateTestFinished}}</td>
</tr>
<tr>
<th>试样类型</th>
<td>{{gdsData.specimenType}}</td>
<th>最终质量</th>
<td>{{gdsData.finalMass}}</td>
<th>最终干质量</th>
<td>{{gdsData.finalDryMass}}</td>
</tr>
<tr>
<th>设备编号</th>
<td>{{gdsData.machineNo}}</td>
<th>Cell No</th>
<td>{{gdsData.cellNo}}</td>
<th>工作地点</th>
<td>{{gdsData.jobLocation}}</td>
</tr>
<tr>
<th>重复数据开始</th>
<td>{{gdsData.startOfRepeatedData}}</td>
</tr>
</tbody>
</table>
</div>
</Col>
<Col span="24">
<Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="阶段编号:">
<Input v-model="formObj.stageNumber" @on-enter="_formSearch" placeholder="请输入阶段编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<Col span="24">
<div>
<PTVXETable
ref="pageTable"
:form-id="formId"
:table-height="500"
:get-page="getPage"
@on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:width="item.width"
:min-width="150"
:fixed="item.fixed?item.fixed:undefined"
sortable
>
<template slot-scope="scope">
<div v-if="item.key==='siteNo'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.siteNo" blur placeholder="请输入现场编号"
></el-input>
</div>
<div v-else-if="item.key==='experiments'" @click.stop="_handleRow(scope)">
<span @click="_removeItem(scope.row)">{{scope.row[item.key]}}</span>
</div>
<span v-else> {{ scope.row[item.key] }}</span>
</template>
</vxe-table-column>
</PTVXETable>
</div>
</Col>
</Row>
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
</div>
</template>
<script>
/**
* 添加编辑分包商
*/
import { soilTest } from '../../../api'
export default {
components: {},
data() {
return {
formId: 'viewGdsDataId',
getPage: {},
height: 300,
gdsData: {},
edit: false,
selectData: [],
searchOpen: true,
iconMsg: [
{
type: 'md-trash',
id: '',
name: '删除'
}
],
pageColumns: [
{ title: '阶段编号', key: 'stageNumber' },
{ title: '试验开始后的时间', key: 'timeSinceStartOfTest' },
{ title: '阶段开始后的时间', key: 'timeSinceStartOfStage' },
{ title: '轴向位移（mm）', key: 'axialDisplacement' },
{ title: '轴向载荷（kN）', key: 'axialLoad' },
{ title: '水平位移（mm）', key: 'horizontalDisplacement' },
{ title: '水平荷载（kN）', key: 'horizontalLoad' },
{ title: '孔隙水压力（kPa）', key: 'poreWaterPressure' },
{ title: '背压（kPa）', key: 'backPressure' },
{ title: '回流量（mm3）', key: 'backVolume' },
{ title: '未定义传感器1', key: 'undefinedTransducerOne' },
{ title: '未定义传感器2', key: 'undefinedTransducerTwo' },
{ title: '环剪切扭矩（Nm）', key: 'ringShearTorqueNm' },
{ title: '环剪切角（degs）', key: 'ringShearTorqueDegs' },
{ title: '下腔压力（kPa）', key: 'lowerChamberPr' },
{ title: '下腔容积（mm3）', key: 'lowerChamberVol' },
{ title: '轴向位移2（mm）', key: 'axialDisplacementTwo' },
{ title: '水平位移2（mm）', key: 'horizontalDisplacementTwo' },
{ title: '环向剪切荷载1（kN）', key: 'ringShearLoadOne' },
{ title: '环向剪切荷载2（kN）', key: 'ringShearLoadTwo' },
{ title: '轴向载荷2（kN）', key: 'axialLoadTwo' },
{ title: '水平荷载2（kN）', key: 'horizontalLoadTwo' },
{ title: '水平荷载3（kN）', key: 'horizontalLoadThree' },
{ title: '轴向行程（mm）', key: 'axialStroke' },
{ title: '水平行程（mm）', key: 'horizontalStroke' },
{ title: '孔隙气压（kPa）', key: 'poreAirPressure' },
{ title: '孔隙气压2（kPa）', key: 'poreAirPressureTwo' },
{ title: '大气压力（kPa）', key: 'atmosphericPressure' },
{ title: '背压差（kPa）', key: 'backToAirDifferential' },
{ title: '围压', key: 'cellPressure' },
{ title: 'Cell Volume (mm3)', key: 'cellVolume' },
{ title: '孔隙风量（mm3）', key: 'poreAirVolume' },
{ title: '轴向应变（%）', key: 'axialStrain' },
{ title: '正应力（kPa）', key: 'normalStress' },
{ title: '环剪机水平应变（%）或水平环位移（mm）', key: 'hsohrdfrsm' },
{ title: '环剪机的水平应力（kPa）或剪切应力（kPa）', key: 'hsossfrsm' },
{ title: '水平有效应力（kPa）', key: 'horizontalEffStress' },
{ title: '有效面积（mm2）', key: 'effectiveArea' },
{ title: '法向有效应力（kPa）', key: 'normalEffectiveStress' },
{ title: '平均环向剪切荷载（kN）', key: 'averageRingShearLoad' }
],
currentIndex: -1,
id: '',
modalTitle: '',
formObj: {},
selectIds: [],
showModal: false,
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '关闭', type: 'primary' }
],
aptitudeData: []
}
},
methods: {
/** *modal-footer */
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '关闭':
this._cancel()
break
}
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
},
_cancel() {
this.showModal = false
this.$refs.footerModal._hideLoading()
},
_openEdit(id) {
this.edit = true
this.showBtn = false
this.showModal = true
this.getPage.records = []
this.id = ''
this.gdsData = []
this._getGdsMainInfo(id)
this.modalTitle = '查看GDS数据'
},
_getGdsInfo: async function() {
if (this.formObj.gdsId) {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilTest.dataGdsDetail(
this.$serializeForm(this.formObj)
)
if (result) {
this.getPage = result
this.$refs.pageTable._hideLoading()
}
} else {
this.$refs.pageTable._hideLoading()
}
},
_tableResultChange(msg, data) {
switch (msg) {
case 'changeSize':
this._getGdsInfo()
break
}
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_getGdsMainInfo: async function(id) {
const result = await soilTest.gdsGetMainInfo(id)
if (result) {
this.gdsData = result
this.formObj.gdsId = this.gdsData.id
this._getGdsInfo()
}
},
_showTime(formObj) {
if (this.formObj.entrustDate === undefined) {
this.formObj.entrustDate = ''
} else {
this.formObj.entrustDate = new Date(formObj.entrustDate)
}
if (this.formObj.tabulateDate === undefined) {
this.formObj.tabulateDate = ''
} else {
this.formObj.tabulateDate = new Date(formObj.tabulateDate)
}
},
_visibleChange(data) {
this.$forceUpdate()
console.log('清空')
this.formObj.client = ''
this.formObj = {}
}
}
}
</script>
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