admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 水稳拌合站页面编写和静态对接

Browse Source
This commit is contained in:
cjp 2023-12-04 09:10:16 +08:00
parent 222532953a
commit a76022de86
3 changed files with 274 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/assets/js/api/waterMixStation.js Normal file
View File

@ -0,0 +1,25 @@
/**
* api接口统一管理
*/
import { post, get } from '../http'
//水稳拌合站 —— 设备信息
export const stableWaterMixDevAdd = data => post('xmgl/stableWaterMixStationDev/add', data) //添加
export const stableWaterMixDevEdit = data => post('xmgl/stableWaterMixStationDev/edit', data) //编辑
export const stableWaterMixDevDelete = data => post('xmgl/stableWaterMixStationDev/delete', data) //删除
export const stableWaterMixDevPage = data => get('xmgl/stableWaterMixStationDev/page', data) //查询列表数据
//查询设备列表（下拉）
export const stableWaterMixDevList = data => get('xmgl/stableWaterMixStationDev/list', data)
// 获取负责人
export const getCrewListDataApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data) // 查询 所有整改人员
//分页列表查询水稳拌合站 数据信息
export const stableWaterMixDataPage = data => get('xmgl/stableWaterMixStationData/page', data)
//分页列表查询水稳拌合站 原材数据信息
export const stableWaterMixMaterialDataPage = data => get('xmgl/stableWaterMixStationRawMaterialData/page', data)
//分页列表查询水稳拌合站 盘次数据信息
export const stableWaterMixSetDataPage = data => get('xmgl/stableWaterMixStationSetData/page', data)

91
src/views/projectFront/waterMixStation/devManagement.vue
View File

@ -4,7 +4,7 @@
<!-- 智能张拉——设备管理 --> <!-- 智能张拉——设备管理 -->
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium"> <el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<el-form-item label="设备名称"> <el-form-item label="设备名称">
<el-input v-model="searchForm.deviceName" placeholder="请输入"></el-input> <el-input v-model="searchForm.devName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="梁场名称"> <!-- <el-form-item label="梁场名称">
<el-input v-model="searchForm.belongBeamField" placeholder="请输入"></el-input> <el-input v-model="searchForm.belongBeamField" placeholder="请输入"></el-input>
@ -28,13 +28,13 @@
/> />
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="deviceName" align="center" label="设备名称"></el-table-column> <el-table-column prop="devName" align="center" label="设备名称"></el-table-column>
<el-table-column prop="devSn" align="center" label="设备编码"></el-table-column> <el-table-column prop="devSn" align="center" label="设备编码"></el-table-column>
<el-table-column prop="deviceModel" align="center" label="所属拌合站"></el-table-column> <el-table-column prop="belongingMixingStation" align="center" label="所属拌合站"></el-table-column>
<el-table-column prop="manufacturerName" align="center" label="站点编码"></el-table-column> <el-table-column prop="mixingPlantModel" align="center" label="拌合站型号"></el-table-column>
<el-table-column prop="entryTime" align="center" label="拌合站位置"></el-table-column> <el-table-column prop="mixingStationLocation" align="center" label="拌合站位置"></el-table-column>
<el-table-column prop="dutyUserName" align="center" label="负责人"></el-table-column> <el-table-column prop="dutyUserName" align="center" label="负责人"></el-table-column>
<el-table-column prop="belongBeamField" align="center" label="负责人电话"> <el-table-column prop="phoneNumber" align="center" label="负责人电话">
<!-- <template slot-scope="scope">{{scope.row.politicalStatus==2?'中共预备党员':'.'}}</template> --> <!-- <template slot-scope="scope">{{scope.row.politicalStatus==2?'中共预备党员':'.'}}</template> -->
</el-table-column> </el-table-column>
<!-- <el-table-column prop="joinPartyDeclaration" align="center" label="入党誓言"> <!-- <el-table-column prop="joinPartyDeclaration" align="center" label="入党誓言">
@ -78,28 +78,28 @@
<el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px"> <el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px">
<div class="dialog_content"> <div class="dialog_content">
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox"> <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
<el-form-item label="设备名称" prop="deviceName"> <el-form-item label="设备名称" prop="devName">
<el-input :disabled="isDetail" v-model="addEditForm.deviceName" placeholder="请输入"></el-input> <el-input :disabled="isDetail" v-model="addEditForm.devName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备编码" prop="devSn"> <el-form-item label="设备编码" prop="devSn">
<el-input :disabled="isDetail" v-model="addEditForm.devSn" placeholder="请输入"></el-input> <el-input :disabled="isDetail" v-model="addEditForm.devSn" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属拌合站" prop="belongBeamField"> <el-form-item label="所属拌合站" prop="belongingMixingStation">
<el-input :disabled="isDetail" v-model="addEditForm.belongBeamField" placeholder="请输入"></el-input> <el-input :disabled="isDetail" v-model="addEditForm.belongingMixingStation" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="拌合站型号" prop="deviceModel"> <el-form-item label="拌合站型号" prop="mixingPlantModel">
<el-input :disabled="isDetail" v-model="addEditForm.deviceModel" placeholder="请输入"></el-input> <el-input :disabled="isDetail" v-model="addEditForm.mixingPlantModel" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="拌合站位置" prop="manufacturerName"> <el-form-item label="拌合站位置" prop="mixingStationLocation">
<el-input :disabled="isDetail" v-model="addEditForm.manufacturerName" placeholder="请输入"></el-input> <el-input :disabled="isDetail" v-model="addEditForm.mixingStationLocation" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="负责人" prop="dutyUserId"> <el-form-item label="负责人" prop="dutyUserId">
<el-select v-model="addEditForm.dutyUserId" placeholder="请选择" :disabled="isDetail" @change="dutySelectChange"> <el-select v-model="addEditForm.dutyUserId" placeholder="请选择" :disabled="isDetail" @change="dutySelectChange">
<el-option v-for="(item, index) in dutyList" :key="index" :label="item.realName" :value="item.userId"> </el-option> <el-option v-for="(item, index) in dutyList" :key="index" :label="item.realName" :value="item.userId"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="负责人电话" prop="manufacturerName"> <el-form-item label="负责人电话" prop="phoneNumber">
<el-input :disabled="isDetail" v-model="addEditForm.manufacturerName" placeholder="请输入"></el-input> <el-input :disabled="isDetail" v-model="addEditForm.phoneNumber" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="进场时间" prop="entryTime"> <!-- <el-form-item label="进场时间" prop="entryTime">
<el-date-picker <el-date-picker
@ -130,8 +130,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="manufacturerName"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" :disabled="isDetail" v-model="addEditForm.manufacturerName" placeholder="请输入"></el-input> <el-input type="textarea" :disabled="isDetail" v-model="addEditForm.remark" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button class="cancleBtn" @click="dialogShow = false" icon="el-icon-circle-close" size="medium" <el-button class="cancleBtn" @click="dialogShow = false" icon="el-icon-circle-close" size="medium"
@ -148,12 +148,12 @@
</template> </template>
<script> <script>
import { import {
smartTensionDevAdd, stableWaterMixDevAdd,
smartTensionDevDelete, stableWaterMixDevDelete,
smartTensionDevEdit, stableWaterMixDevEdit,
smartTensionDevPage, stableWaterMixDevPage,
getCrewListDataApi // 负责人下拉 getCrewListDataApi // 负责人下拉
} from '@/assets/js/api/intelligentTension.js' } from '@/assets/js/api/waterMixStation.js'
import { checkPhone } from '@/assets/js/util.js' import { checkPhone } from '@/assets/js/util.js'
export default { export default {
mounted() {}, mounted() {},
@ -175,21 +175,20 @@ export default {
}, },
List: [], List: [],
addEditForm: { addEditForm: {
belongBeamField: '', belongingMixingStation: '',
createTime: '', createDate: '',
devName: '',
devSn: '', devSn: '',
deviceModel: '', image: '',
deviceName: '', mixingPlantModel: '',
entryTime: '', mixingStationLocation: '',
equipmentPicture: '',
manufacturerName: '',
dutyUserId: '', dutyUserId: '',
dutyUserName: '', dutyUserName: '',
projectSn: '', phoneNumber: '',
updateTime: '' remark: '',
}, },
addEditRules: { addEditRules: {
deviceName: [ devName: [
{ {
required: true, required: true,
message: '必填', message: '必填',
@ -203,7 +202,7 @@ export default {
trigger: 'blur' trigger: 'blur'
} }
], ],
belongBeamField: [ belongingMixingStation: [
{ {
required: true, required: true,
message: '必填', message: '必填',
@ -212,8 +211,7 @@ export default {
] ]
}, },
searchForm: { searchForm: {
belongBeamField: '', devName: ''
deviceName: ''
} }
} }
}, },
@ -240,12 +238,11 @@ export default {
}, },
//查询列表 //查询列表
getList() { getList() {
smartTensionDevPage({ stableWaterMixDevPage({
pageNo: this.pagInfo.pageNo, pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize, pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
deviceName: this.searchForm.deviceName, devName: this.searchForm.devName,
belongBeamField: this.searchForm.belongBeamField,
}).then(result => { }).then(result => {
if (result.success) { if (result.success) {
// result.result.records.map(item => { // result.result.records.map(item => {
@ -280,14 +277,14 @@ export default {
this.title = '编辑设备' this.title = '编辑设备'
this.dialogShow = true this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj)) this.addEditForm = JSON.parse(JSON.stringify(obj))
this.fileUplodList = JSON.parse(obj.equipmentPicture) this.fileUplodList = JSON.parse(obj.image)
}, },
openDetail(obj) { openDetail(obj) {
this.title = '查看详情' this.title = '查看详情'
this.dialogShow = true this.dialogShow = true
this.isDetail = true this.isDetail = true
this.addEditForm = JSON.parse(JSON.stringify(obj)) this.addEditForm = JSON.parse(JSON.stringify(obj))
this.fileUplodList = JSON.parse(obj.equipmentPicture) this.fileUplodList = JSON.parse(obj.image)
}, },
submit() { submit() {
// if (this.addEditForm.contactNumber) { // if (this.addEditForm.contactNumber) {
@ -298,22 +295,22 @@ export default {
// } // }
let params = JSON.parse(JSON.stringify(this.addEditForm)) let params = JSON.parse(JSON.stringify(this.addEditForm))
params.projectSn = this.$store.state.projectSn params.projectSn = this.$store.state.projectSn
params.equipmentPicture = JSON.stringify(this.fileUplodList) params.image = JSON.stringify(this.fileUplodList)
// if (this.fileUplodList.length > 0) { // if (this.fileUplodList.length > 0) {
// this.$message.error('请上传照片') // this.$message.error('请上传照片')
// return false // return false
// } // }
this.$refs.addEditForm.validate(valid => { this.$refs.addEditForm.validate(valid => {
if (valid) { if (valid) {
if (this.title == '新增') { if (this.title == '新增设备') {
smartTensionDevAdd(params).then(result => { stableWaterMixDevAdd(params).then(result => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)
this.getList() this.getList()
} }
}) })
} else if (this.title == '编辑') { } else if (this.title == '编辑设备') {
smartTensionDevEdit(params).then(result => { stableWaterMixDevEdit(params).then(result => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)
this.getList() this.getList()
@ -333,7 +330,7 @@ export default {
type: 'warning' type: 'warning'
}) })
.then(() => { .then(() => {
smartTensionDevDelete({ id: obj.id }).then(res => { stableWaterMixDevDelete({ id: obj.id }).then(res => {
if (res.success) { if (res.success) {
this.getList() this.getList()
this.$message({ this.$message({

307
src/views/projectFront/waterMixStation/productData.vue
View File

@ -5,12 +5,12 @@
<div class="searchBox whiteBlock"> <div class="searchBox whiteBlock">
<el-form :inline="true" size="medium" :model="queryInfo" class="demo-form-inline"> <el-form :inline="true" size="medium" :model="queryInfo" class="demo-form-inline">
<el-form-item label="设备名称"> <el-form-item label="设备名称">
<el-select v-model="queryInfo.deviceName" placeholder="请选择" clearable> <el-select v-model="queryInfo.devName" placeholder="请选择" clearable>
<el-option v-for="(item, index) in devOptions" :key="index" :label="item.deviceName" :value="item.devSn"> </el-option> <el-option v-for="(item, index) in devOptions" :key="index" :label="item.devName" :value="item.devSn"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="配比编号"> <el-form-item label="配比编号">
<el-input v-model="queryInfo.beamNumber" placeholder="请输入" clearable></el-input> <el-input v-model="queryInfo.pbbh" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态"> <!-- <el-form-item label="状态">
<el-select v-model="queryInfo.status" placeholder="请选择" clearable> <el-select v-model="queryInfo.status" placeholder="请选择" clearable>
@ -38,17 +38,17 @@
<div class="table_wrap whiteBlock"> <div class="table_wrap whiteBlock">
<vue-scroll> <vue-scroll>
<el-table height="650" class="tables" :data="listData" lazy row-key="id"> <el-table height="650" class="tables" :data="listData" lazy row-key="id">
<el-table-column align="center" prop="deviceName" label="设备名称"> </el-table-column> <el-table-column align="center" prop="devName" label="设备名称"> </el-table-column>
<el-table-column align="center" prop="constructionPart" label="任务编号"></el-table-column> <el-table-column align="center" prop="rwbh" label="任务编号"></el-table-column>
<el-table-column align="center" prop="beamNumber" label="强度等级"></el-table-column> <el-table-column align="center" prop="qddj" label="强度等级"></el-table-column>
<el-table-column align="center" prop="beamType" label="配比编号"> </el-table-column> <el-table-column align="center" prop="pbbh" label="配比编号"> </el-table-column>
<el-table-column align="center" prop="beamType" label="塌落度"></el-table-column> <el-table-column align="center" prop="tld" label="塌落度"></el-table-column>
<el-table-column align="center" prop="beamType" label="抗冻等级"></el-table-column> <el-table-column align="center" prop="kddj" label="抗冻等级"></el-table-column>
<el-table-column align="center" prop="beamType" label="抗渗等级"></el-table-column> <el-table-column align="center" prop="ksdj" label="抗渗等级"></el-table-column>
<el-table-column align="center" prop="beamType" label="抗折等级"></el-table-column> <el-table-column align="center" prop="kzdj" label="抗折等级"></el-table-column>
<el-table-column align="center" prop="beamType" label="司机"></el-table-column> <el-table-column align="center" prop="sj" label="司机"></el-table-column>
<el-table-column align="center" prop="beamType" label="材料名称"></el-table-column> <el-table-column align="center" prop="clmc" label="材料名称"></el-table-column>
<el-table-column align="center" prop="beamType" label="材料第三方ID"></el-table-column> <el-table-column align="center" prop="cldsfid" label="材料第三方ID"></el-table-column>
<!-- <el-table-column align="center" prop="status" label="状态"> <!-- <el-table-column align="center" prop="status" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
@ -89,114 +89,121 @@
<div class="detail-form"> <div class="detail-form">
<el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="220px"> <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="220px">
<el-form-item label="设备名称" label-width="100px" style="margin-left: 20px"> <el-form-item label="设备名称" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="设备名称" :disabled="true" style="width: 260px;"></el-input> <el-input v-model="formInline.devName" placeholder="" :disabled="true" style="width: 260px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="材料第三方ID" label-width="100px" style="margin-left: 20px"> <el-form-item label="材料第三方ID" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="材料第三方ID" :disabled="true" style="width: 260px;"></el-input> <el-input v-model="formInline.cldsfid" placeholder="" :disabled="true" style="width: 260px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="机组编号" label-width="100px" style="margin-left: 20px"> <el-form-item label="机组编号" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="机组编号" :disabled="true" style="width: 260px;"></el-input> <el-input v-model="formInline.jzbh" placeholder="" :disabled="true" style="width: 260px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务编号" label-width="100px" style="margin-left: 20px"> <el-form-item label="任务编号" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="任务编号" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.rwbh" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="材料规格型号" label-width="100px" style="margin-left: 20px"> <el-form-item label="材料规格型号" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="材料规格型号" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.clggxh" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="操作员" label-width="100px" style="margin-left: 20px"> <el-form-item label="操作员" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="操作员" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.czy" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="强度等级" label-width="100px" style="margin-left: 20px"> <el-form-item label="强度等级" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="强度等级" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.qddj" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="材料名称" label-width="100px" style="margin-left: 20px"> <el-form-item label="材料名称" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="材料名称" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.clmc" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="同步编码" label-width="100px" style="margin-left: 20px"> <el-form-item label="同步编码" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="同步编码" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.tbbm" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="配比编号" label-width="100px" style="margin-left: 20px"> <el-form-item label="配比编号" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="配比编号" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.pbbh" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="计量单位" label-width="100px" style="margin-left: 20px"> <el-form-item label="计量单位" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="计量单位" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.jldw" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="生产数量" label-width="100px" style="margin-left: 20px"> <el-form-item label="生产数量" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="生产数量" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.scsl" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="塌落度" label-width="100px" style="margin-left: 20px"> <el-form-item label="塌落度" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="塌落度" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.tld" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收料单位" label-width="100px" style="margin-left: 20px"> <el-form-item label="收料单位" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="收料单位" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.sldw" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" label-width="100px" style="margin-left: 20px"> <el-form-item label="创建时间" label-width="100px" style="margin-left: 20px">
<el-date-picker <el-date-picker
:disabled="true" :disabled="true"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
v-model="formInline.entryTime" v-model="formInline.createDate"
type="datetime" type="datetime"
placeholder="请选择时间" placeholder=""
style="width: 260px;" style="width: 260px;"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="抗冻等级" label-width="100px" style="margin-left: 20px"> <el-form-item label="抗冻等级" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="抗冻等级" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.kddj" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" label-width="100px" style="margin-left: 20px"> <el-form-item label="工程名称" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="工程名称" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.gcmc" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="机组" label-width="100px" style="margin-left: 20px"> <el-form-item label="机组" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="机组" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.jzbh" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="抗渗等级" label-width="100px" style="margin-left: 20px"> <el-form-item label="抗渗等级" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="抗渗等级" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.ksdj" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="使用部位" label-width="100px" style="margin-left: 20px"> <el-form-item label="使用部位" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="使用部位" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.sybw" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="删除标识" label-width="100px" style="margin-left: 20px"> <el-form-item label="删除标识" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="删除标识" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.scbzName" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="抗折等级" label-width="100px" style="margin-left: 20px"> <el-form-item label="抗折等级" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="抗折等级" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.kzdj" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="骨粒最大粒径" label-width="100px" style="margin-left: 20px"> <el-form-item label="骨粒最大粒径" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="骨粒最大粒径" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.glzdlj" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="生产/发料时间" label-width="110px" style="margin-left: 10px"> <el-form-item label="生产/发料时间" label-width="110px" style="margin-left: 10px">
<el-date-picker <el-input
:disabled="true" :disabled="true"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请输入内容"
v-model="formInline.entryTime" prefix-icon="el-icon-time"
v-model="formInline.scsj"
style="width: 260px;"
></el-input>
<!-- <el-date-picker
:disabled="true"
value-format="yyyy-MM-dd HH:mm:ss.SSS"
v-model="formInline.scsj"
type="datetime" type="datetime"
placeholder="请选择时间" placeholder=""
style="width: 260px;" style="width: 260px;"
> >
</el-date-picker> </el-date-picker> -->
</el-form-item> </el-form-item>
<el-form-item label="司机" label-width="100px" style="margin-left: 20px"> <el-form-item label="司机" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="司机" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.sj" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="车牌号" label-width="100px" style="margin-left: 20px"> <el-form-item label="车牌号" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="车牌号" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.cph" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="部位第三方ID" label-width="100px" style="margin-left: 20px"> <el-form-item label="部位第三方ID" label-width="100px" style="margin-left: 20px">
<el-input v-model="formInline.user" placeholder="部位第三方ID" style="width: 260px;" :disabled="true"></el-input> <el-input v-model="formInline.bwsfid" placeholder="" style="width: 260px;" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="detail-list"> <div class="detail-list">
<div class="whiteBlock"> <div class="whiteBlock">
<vue-scroll> <vue-scroll>
<el-table class="tables" :data="listData" lazy row-key="id" style="min-height: 350px"> <el-table class="tables" :data="diskOrderList" lazy row-key="id" style="min-height: 350px">
<el-table-column align="center" prop="deviceName" label="盘次"> </el-table-column> <el-table-column align="center" prop="pc" label="盘次"> </el-table-column>
<el-table-column align="center" prop="constructionPart" label="开始时间"></el-table-column> <el-table-column align="center" prop="kssj" label="开始时间"></el-table-column>
<el-table-column align="center" prop="beamNumber" label="结束时间"></el-table-column> <el-table-column align="center" prop="jssj" label="结束时间"></el-table-column>
<el-table-column align="center" prop="beamType" label="搅拌时长"> </el-table-column> <el-table-column align="center" prop="jbsc" label="搅拌时长"> </el-table-column>
<el-table-column align="center" prop="beamType" label="数量"></el-table-column> <el-table-column align="center" prop="sl" label="数量"></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class=""> <div class="">
@ -211,42 +218,42 @@
</vue-scroll> </vue-scroll>
<el-pagination <el-pagination
class="pagerBox" class="pagerBox"
style="position: absolute; top: 85%; left: 40%" style="position: absolute; bottom: 3%; left: 40%"
@size-change="SizeChange" @size-change="diskSizeChange"
@current-change="CurrentChange" @current-change="diskCurrentChange"
:current-page="pagInfo.pageNo" :current-page="diskInfo.pageNo"
:page-sizes="$store.state.PAGESIZRS" :page-sizes="$store.state.PAGESIZRS"
:page-size="pagInfo.pageSize" :page-size="diskInfo.pageSize"
layout="total, sizes, prev, pager, next" layout="total, sizes, prev, pager, next"
:total="Number(pagInfo.total)" :total="Number(diskInfo.total)"
background background
></el-pagination> ></el-pagination>
</div> </div>
</div> </div>
</div> </div>
<el-dialog width="50%" title="原料详情" :visible.sync="showDetailLine" append-to-body :lazy="true" @opened="handleDialogOpen"> <el-dialog width="50%" title="原料详情" :visible.sync="showDetailLine" append-to-body :lazy="true" @close="materialClose">
<div class="line-dialog"> <div class="line-dialog">
<div class="table_wrap whiteBlock"> <div class="table_wrap whiteBlock">
<vue-scroll> <vue-scroll>
<el-table height="650" class="tables" :data="listData" lazy row-key="id"> <el-table height="650" class="tables" :data="materialOrderList" lazy row-key="id">
<el-table-column align="center" prop="deviceName" label="机组原材"> </el-table-column> <el-table-column align="center" prop="jzyc" label="机组原材"> </el-table-column>
<el-table-column align="center" prop="constructionPart" label="材料名"></el-table-column> <el-table-column align="center" prop="clmc" label="材料名"></el-table-column>
<el-table-column align="center" prop="beamNumber" label="材料编码"></el-table-column> <el-table-column align="center" prop="clbm" label="材料编码"></el-table-column>
<el-table-column align="center" prop="beamType" label="材料第三方ID"> </el-table-column> <el-table-column align="center" prop="cldsfid" label="材料第三方ID"> </el-table-column>
<el-table-column align="center" prop="beamType" label="材料规格型号"></el-table-column> <el-table-column align="center" prop="clggxh" label="材料规格型号"></el-table-column>
<el-table-column align="center" prop="beamType" label="计量单位"></el-table-column> <el-table-column align="center" prop="jldw" label="计量单位"></el-table-column>
<el-table-column align="center" prop="beamType" label="标准耗量"></el-table-column> <el-table-column align="center" prop="bzhl" label="标准耗量"></el-table-column>
<el-table-column align="center" prop="beamType" label="实际耗量"></el-table-column> <el-table-column align="center" prop="sjhl" label="实际耗量"></el-table-column>
</el-table> </el-table>
</vue-scroll> </vue-scroll>
<el-pagination <el-pagination
class="pagerBox" class="pagerBox"
style="position: absolute; top: 85%; left: 40%" style="position: absolute; top: 85%; left: 40%"
@size-change="SizeChange" @size-change="materialSizeChange"
@current-change="CurrentChange" @current-change="materialCurrentChange"
:current-page="pagInfo.pageNo" :current-page="materialInfo.pageNo"
:page-sizes="$store.state.PAGESIZRS" :page-sizes="$store.state.PAGESIZRS"
:page-size="pagInfo.pageSize" :page-size="materialInfo.pageSize"
layout="total, sizes, prev, pager, next" layout="total, sizes, prev, pager, next"
:total="Number(pagInfo.total)" :total="Number(pagInfo.total)"
background background
@ -258,8 +265,12 @@
</div> </div>
</template> </template>
<script> <script>
import { smartTensionDataPage, smartTensionSteelBeamList, smartTensionDevList } from '@/assets/js/api/intelligentTension.js' import {
import echarts from 'echarts4' stableWaterMixDataPage,
stableWaterMixSetDataPage,
stableWaterMixDevList,
stableWaterMixMaterialDataPage
} from '@/assets/js/api/waterMixStation.js'
export default { export default {
components: {}, components: {},
mounted() { mounted() {
@ -267,8 +278,11 @@ export default {
}, },
data() { data() {
return { return {
materialDetailId: "",
diskDetailId: "", //ID
materialOrderList: [], //材料列表
section: '', // 断面 section: '', // 断面
steelBeamList: [], diskOrderList: [],
detailData: {}, detailData: {},
dialogShow: false, //详情弹窗 dialogShow: false, //详情弹窗
showDetailLine: false, // 详情内详情弹窗 showDetailLine: false, // 详情内详情弹窗
@ -307,6 +321,17 @@ export default {
pageSize: 10, //条数 pageSize: 10, //条数
total: 0 //总条数 total: 0 //总条数
}, },
diskInfo: {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
materialInfo: {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
radio: 1, radio: 1,
title: '', title: '',
daterange: [], daterange: [],
@ -332,17 +357,33 @@ export default {
seedId: '', seedId: '',
showTime: false, //工期 showTime: false, //工期
queryInfo: { queryInfo: {
deviceName: '', devName: '',
beamNumber: '', pbbh: ''
status: '',
beamType: '',
actualStartDate: '',
actualFinishDate: ''
}, },
formInline: { formInline: {
user: '', bwsfid: ' ',
region: '', clbm: ' ',
entryTime: '2023-12-01 15:07:56' cldsfid: ' ',
clggxh: ' ',
clmc: ' ',
cph: ' ',
createDate: ' ',
czy: ' ',
devSn: ' ',
gcmc: ' ',
glzdlj: ' ',
id: 0,
jldw: ' ',
jzbh: ' ',
kddj: ' ',
ksdj: ' ',
kzdj: ' ',
pbbh: ' ',
qddj: ' ',
rwbh: ' ',
scbz: ' ',
scsj: ' ',
scsl: 0
}, },
dialogImageUrl: '', dialogImageUrl: '',
showBigImg: false, showBigImg: false,
@ -431,31 +472,74 @@ export default {
// 打开列表详情 // 打开列表详情
openDetail(row) { openDetail(row) {
console.log('打开详情', row) console.log('打开详情', row)
this.formInline = row
this.detailData = row this.detailData = row
this.getDetailList(row.id) this.diskDetailId = row.id
}, this.getDetailList()
handleDialogOpen() {
console.log("打开详情内列表详情")
}, },
openDetailList(row) { openDetailList(row) {
console.log('打开详情内列表详情', row) console.log('打开详情内列表详情', row)
this.showDetailLine = true this.showDetailLine = true
this.materialDetailId = row.id
this.getMaterialList()
}, },
close() { close() {
this.diskDetailId = ""
this.diskInfo = {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
this.materialInfo = {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
console.log('弹窗关闭') console.log('弹窗关闭')
}, },
//获取详情 钢束列表数据 materialClose() {
getDetailList(detailId) { this.materialInfo = {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
this.materialDetailId = ""
console.log('材料弹窗关闭')
},
//获取详情 盘次列表详情列表
getMaterialList() {
let data = { let data = {
pageNo: this.materialInfo.pageNo,
pageSize: this.materialInfo.pageSize,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
smartTensionDataId: detailId stableWaterMixStationSetDataId: this.materialDetailId
} }
smartTensionSteelBeamList(data).then(res => { stableWaterMixMaterialDataPage(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log('钢束数据', res.result) console.log('原材料数据(盘次列表详情)', res.result)
this.steelBeamList = res.result this.materialOrderList = res.result.records
this.dialogShow = true this.dialogShow = true
this.materialInfo.total = res.result.total
}
})
},
//获取详情 盘次列表数据
getDetailList() {
let data = {
pageNo: this.diskInfo.pageNo,
pageSize: this.diskInfo.pageSize,
projectSn: this.$store.state.projectSn,
stableWaterMixStationDataId: this.diskDetailId
}
stableWaterMixSetDataPage(data).then(res => {
if (res.code == 200) {
console.log('盘次列表数据', res.result)
this.diskOrderList = res.result.records
this.dialogShow = true
this.diskInfo.total = res.result.total
} }
}) })
}, },
@ -465,14 +549,12 @@ export default {
pageNo: this.pagInfo.pageNo, pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize, pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
devSn: this.queryInfo.deviceName, devSn: this.queryInfo.devName,
beamNumber: this.queryInfo.beamNumber, pbbh: this.queryInfo.pbbh,
status: this.queryInfo.status, scsj_begin: this.queryInfo.actualStartDate,
beamType: this.queryInfo.beamType, scsj_end: this.queryInfo.actualFinishDate
tensionTime_begin: this.queryInfo.actualStartDate,
tensionTime_end: this.queryInfo.actualFinishDate
} }
smartTensionDataPage(data).then(res => { stableWaterMixDataPage(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log('生产数据', res.result) console.log('生产数据', res.result)
this.listData = res.result.records this.listData = res.result.records
@ -485,7 +567,7 @@ export default {
let data = { let data = {
projectSn: this.projectSn projectSn: this.projectSn
} }
smartTensionDevList(data).then(res => { stableWaterMixDevList(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.devOptions = res.result this.devOptions = res.result
console.log('设备下拉', res) console.log('设备下拉', res)
@ -508,6 +590,7 @@ export default {
} }
this.getProgressListData() this.getProgressListData()
}, },
// 生产数据列表
SizeChange(val) { SizeChange(val) {
this.pagInfo.pageSize = val this.pagInfo.pageSize = val
this.getProgressListData() this.getProgressListData()
@ -516,6 +599,26 @@ export default {
this.pagInfo.pageNo = val this.pagInfo.pageNo = val
this.getProgressListData() this.getProgressListData()
}, },
// 详情内盘次列表
diskSizeChange(val) {
this.diskInfo.pageSize = val
this.getDetailList()
},
diskCurrentChange(val) {
this.diskInfo.pageNo = val
this.getDetailList()
},
materialSizeChange(val) {
this.materialInfo.pageSize = val
this.getMaterialList()
},
materialCurrentChange(val) {
this.materialInfo.pageNo = val
this.getMaterialList()
},
//--------------- //---------------
//关闭详请组件 //关闭详请组件
changeDate() { changeDate() {