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

Merge branch 'shenzhen-dev' into dev-lhk

Browse Source
This commit is contained in:
kun 2023-12-05 18:36:23 +08:00
commit ab6076486f
16 changed files with 1318 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/assets/images/carPosition/新增.png → src/assets/images/carPosition/add.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

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)

5
src/assets/js/http.js
View File

@ -82,11 +82,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
axios.defaults.baseURL ='http://101.43.164.214:11111/' //广西百色项目
axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址

2
src/assets/style/dialog.less
View File

@ -5,7 +5,7 @@
font-size: 24px;
}
.el-dialog__title,.pageTitle{
font-size: 15px;
font-size: 16px;
font-weight: 500;
position: relative;
padding-left: 13px;

1
src/components/account.vue
View File

@ -314,6 +314,7 @@ export default {
const query = '?&headquartersSn=' + this.$store.state.userInfo.headquartersSn; // 设置要拼接的参数
const loginUrl = `${baseUrl}/login${query}`; // 拼接登录地址
window.open(loginUrl, '_self')
this.$router.go();
}
// this.$router.push('/')
window._paq.push(['trackEvent', '点击', '退出登录', '退出登录'])

66
src/components/header.vue
View File

@ -129,10 +129,13 @@ import account from './account'
import changeTheme from './changeTheme'
import message from './message'
import QRCode from 'qrcodejs2'
import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
export default {
props: ['titleName', 'showR'],
data() {
return {
newBigScreenUrl: null,
headerShow,
LOGO_white: LOGO_white,
headerName: '',
@ -167,10 +170,15 @@ export default {
}
}
},
beforeDestroy() {
this.newBigScreen = null
console.log("当前数据看板地址",this.newBigScreen)
},
created() {
this.company = COMPANY
console.log('this.company', this.company)
console.log('COMPANY', COMPANY)
this.getProjectDetail()
this.loginData = JSON.parse(localStorage.getItem('systemInfo'))
// console.log('信息',this.loginData)\
},
@ -179,7 +187,6 @@ export default {
this.systemInfo = JSON.parse(localStorage.getItem('systemInfo'))
}
console.log('进入页面显示的企业头部名称', this.systemInfo)
this.headerName = this.systemInfo.platformName
if (this.$route.path.indexOf('equipmentCenter/') != -1) {
this.headerName += ' - 设备中台'
@ -203,6 +210,19 @@ export default {
},
methods: {
//获取项目详细(数据看板跳转地址)
getProjectDetail() {
this.newBigScreen = null
let data = {
projectSn: this.$store.state.projectSn,
};
getProjectDetail(data).then((res) => {
if (res.result) {
this.newBigScreen = res.result.newBigScreen
console.log("数据看板地址",this.newBigScreen)
}
});
},
closeAudio() {
this.isShowAudio = false
},
@ -313,17 +333,12 @@ export default {
}
},
toOverview2() {
if (this.company == 'syhy') {
if (this.newBigScreen != null) {
console.log("当前跳转链接",this.newBigScreen)
//-------------------- 跳转新版七参数
this.jumpToken = localStorage.getItem('jumpToken')
window.open('http://101.43.164.214:45022/#/large?token=' + this.jumpToken, '_self') //沈阳和盈
window.open(this.newBigScreen + '?token=' + this.jumpToken, '_self')
// window.open('http://192.168.34.226:8081/#/large?token=' + this.jumpToken, "_self")//这里是后台跳到大屏的操作，携带token过去
} else if (this.company == 'jxwjj') {
this.jumpToken = localStorage.getItem('jumpToken')
window.open('http://183.249.224.118:9003/#/large?token=' + this.jumpToken, '_self') //嘉兴王江泾公用码头项目
} else if (this.company == 'gxbs') {
this.jumpToken = localStorage.getItem('jumpToken')
window.open('http://101.43.164.214:11113/#/large?token=' + this.jumpToken, '_self') //广西百色项目
} else {
//--------------------原版项目后台跳转数据看板
@ -346,6 +361,39 @@ export default {
window.location.href = routeUrl.href
window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板'])
}
// if (this.company == 'syhy') {
// //-------------------- 跳转新版七参数
// this.jumpToken = localStorage.getItem('jumpToken')
// window.open('http://101.43.164.214:45022/#/large?token=' + this.jumpToken, '_self') //沈阳和盈
// // window.open('http://192.168.34.226:8081/#/large?token=' + this.jumpToken, "_self")//这里是后台跳到大屏的操作，携带token过去
// } else if (this.company == 'jxwjj') {
// this.jumpToken = localStorage.getItem('jumpToken')
// window.open('http://183.249.224.118:9003/#/large?token=' + this.jumpToken, '_self') //嘉兴王江泾公用码头项目
// } else if (this.company == 'gxbs') {
// this.jumpToken = localStorage.getItem('jumpToken')
// window.open('http://101.43.164.214:11113/#/large?token=' + this.jumpToken, '_self') //广西百色项目
// } else {
// //--------------------原版项目后台跳转数据看板
// //看看项目看板内有没有菜单
// let arr = this.$store.state.userInfo.menuAuthority.moduleList
// let arr2 = []
// arr.forEach(element => {
// if (element.moduleType == 4) {
// arr2.push(element)
// return
// }
// })
// // 如果数组为空表示该用户没有权限访问
// if (!arr2.length) {
// return this.$message.warning('暂无权限')
// }
// let routeUrl = this.$router.resolve({
// path: arr2[0].modulePath
// })
// window.location.href = routeUrl.href
// window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板'])
// }
},
toOverview3() {
if (COMPANY == 'shenbai') {

50
src/router/index.js
View File

@ -2238,6 +2238,56 @@ const routes2 = [
'@/views/projectFront/waterMixStation/productData.vue',
], resolve),
},
// 智慧梁场
{
path: '/project/smartBeamField/planManage',
name: '智慧梁场-计划管理',
component: (resolve) =>
require([
'@/views/projectFront/smartBeamField/planManage.vue',
], resolve),
},
{
path: '/project/smartBeamField/beamManage',
name: '智慧梁场-梁管理',
component: (resolve) =>
require([
'@/views/projectFront/smartBeamField/beamManage.vue',
], resolve),
},
{
path: '/project/smartBeamField/storageAreaManage',
name: '智慧梁场-存梁区管理',
component: (resolve) =>
require([
'@/views/projectFront/smartBeamField/storageAreaManage.vue',
], resolve),
},
{
path: '/project/smartBeamField/pedestalManage',
name: '智慧梁场-副梁台座管理',
component: (resolve) =>
require([
'@/views/projectFront/smartBeamField/pedestalManage.vue',
], resolve),
},
{
path: '/project/smartBeamField/processList',
name: '智慧梁场-工序列表',
component: (resolve) =>
require([
'@/views/projectFront/smartBeamField/processList.vue',
], resolve),
},
{
path: '/project/smartBeamField/productManage',
name: '智慧梁场-生产管理',
component: (resolve) =>
require([
'@/views/projectFront/smartBeamField/productManage.vue',
], resolve),
},
],
},

4
src/store/index.js
View File

@ -104,8 +104,8 @@ export default new Vuex.Store({
// FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
// UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
// FILEURL: 'http://121.196.214.246/api/image/',//金林湾
// UPLOADURL: 'http://192.168.34.221:28888/upload/image',//郭圣雄本地
// FILEURL: 'http://192.168.34.221:28888/image/',//郭圣雄本地
// UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
// FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益
// FILEURL: 'http://101.43.164.214:45011/image/',//上海优益

436
src/views/projectFront/smartBeamField/beamManage.vue Normal file
View File

@ -0,0 +1,436 @@
<template>
<div class="plan-manage">
<div class="plan-content">
<div class="left-plan">
<div class="input-box">
<el-input placeholder="请输入桥段" suffix-icon="el-icon-search" v-model="input1" size="small" class="plan-search"> </el-input>
<!-- <div class="add-icon">
<img src="@/assets/images/carPosition/add.png" alt="" />
</div> -->
</div>
<div class="bridge-section">
<vue-scroll>
<div class="section-list">
<div
class="section-item"
v-for="(item, index) in bridgeSectionList"
:key="item.id"
:class="{ active: activeBuildIndex == index }"
@click="changeBuildFn(item, index)"
>
<div class="bridge-title">{{ item.name }}</div>
<!-- <div class="bridge-tool">
<img @click.stop="editBuildFn(item)" src="@/assets/images/icon-edit.png" style="margin-right:16px" class="icon" />
<img @click.stop="deleteBuildFn(item)" src="@/assets/images/icon-delete.png" class="icon" />
</div> -->
</div>
</div>
</vue-scroll>
</div>
<div class="add-icon"></div>
</div>
<div class="right-plan">
<div class="fullHeight whiteBlock">
<div style="padding: 15px 15px 0">
<p class="pageTitle">梁列表</p>
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<el-form-item label="梁号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="梁型" style="margin-left:40px">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in beamTypeOption" :key="index" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" style="margin-left:40px">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in nameOptions" :key="index" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{ $t('message.energyManage.waybill.query') }}</el-button>
<el-button type="warning" plain @click="refresh">{{ $t('message.deviceManage.refresh') }}</el-button>
<!-- <el-button type="primary" size="medium" @click="add">新增</el-button> -->
</el-form-item>
</el-form>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" :data="['', '']">
<el-table-column type="index" label="序号" align="center" width="60">
<!-- <template slot-scope="scope">
<div>
{{scope.row}}
</div>
</template> -->
</el-table-column>
<el-table-column prop="institutionalAddress" align="center" label="梁号" width="80"></el-table-column>
<el-table-column prop="institutionalPhone" align="center" label="所属桥段"></el-table-column>
<el-table-column prop="remark" align="center" label="梁板类型"></el-table-column>
<el-table-column prop="remark" align="center" label="制梁状态"></el-table-column>
<el-table-column prop="remark" align="center" label="计划制梁时间"></el-table-column>
<el-table-column prop="remark" align="center" label="计划架梁时间"></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="table-btn">
<div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>二维码</span>
</div>
<!-- <div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>开始生产</span>
</div> -->
<div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>详情</span>
</div>
<!-- <div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>编辑</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
<span>删除</span>
</div> -->
</div>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pagerBox"
@size-change="SizeChange"
@current-change="CurrentChange"
:current-page="pagInfo.pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="pagInfo.pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(pagInfo.total)"
background
></el-pagination>
</div>
<el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px">
<div class="dialog_content">
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
<el-form-item label="机构名称" prop="institutionName">
<el-input v-model="addEditForm.institutionName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="机构地址" prop="institutionalAddress">
<el-input v-model="addEditForm.institutionalAddress" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="机构电话" prop="institutionalPhone">
<el-input v-model="addEditForm.institutionalPhone" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="addEditForm.remark" placeholder="请输入"></el-input>
</el-form-item>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="dialogShow = false" icon="el-icon-circle-close" size="medium"
>{{ $t('message.deviceManage.cancel') }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="submit" size="medium"
>{{ $t('message.deviceManage.save') }}
</el-button>
</div>
</el-form>
</div>
</el-dialog>
</div>
</div>
</div>
</div>
</template>
<script>
import {
addgtMaterialTestingInstitutionApi,
deletgtMaterialTestingInstitutionApi,
editgtMaterialTestingInstitutionApi,
gettgtMaterialTestingInstitutionApi
} from '@/assets/js/api/materialManagement.js'
export default {
mounted() {
this.getList()
},
data() {
return {
beamTypeOption: [
{
label: '梁型1',
value: 1
},
{
label: '梁型2',
value: 2
},
{
label: '梁型3',
value: 3
}
],
nameOptions: [
{
label: '合格',
value: 1
},
{
label: '不合格',
value: 2
},
{
label: '未判定',
value: 3
}
],
bridgeSectionList: [
{
name: '桥段1',
id: 1
},
{
name: '桥段2',
id: 2
},
{
name: '桥段3',
id: 3
},
{
name: '桥段4',
id: 4
}
],
input1: '', // 桥段
currentBridgeInfo: '', //桥段item
activeBuildIndex: '', //当前选中桥段
// 梁列表相关 *************
title: '',
dialogShow: false,
pagInfo: {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
List: [],
addEditForm: {
institutionName: '',
institutionalAddress: '',
institutionalPhone: '',
remark: ''
},
addEditRules: {
institutionName: [
{
required: true,
message: '必填',
trigger: 'blur'
}
]
},
searchForm: {
institutionName: ''
}
}
},
methods: {
// 打开新增桥段弹窗
handle() {
console.log('打开弹窗')
},
changeBuildFn(item, index) {
this.activeBuildIndex = index
this.currentBridgeInfo = item
},
// 编辑桥段弹窗
editBuildFn(item) {
console.log('编辑桥段', item)
},
// 删除桥段
deleteBuildFn(item) {
console.log('删除桥段', item)
},
// 梁列表相关 **************************
getList() {
gettgtMaterialTestingInstitutionApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
institutionName: this.searchForm.institutionName
}).then(result => {
if (result.success) {
this.List = result.result.records
this.pagInfo.total = result.result.total
}
})
},
add() {
this.title = '新增机构'
this.dialogShow = true
this.close()
},
edit(obj) {
this.title = '编辑机构'
this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj))
},
submit() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
params.projectSn = this.$store.state.projectSn
this.$refs.addEditForm.validate(valid => {
if (valid) {
if (this.title == '新增机构') {
addgtMaterialTestingInstitutionApi(params).then(result => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
} else if (this.title === '编辑机构') {
editgtMaterialTestingInstitutionApi(params).then(result => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
}
this.dialogShow = false
} else {
return false
}
})
},
deleteDev(obj) {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
deletgtMaterialTestingInstitutionApi({ id: obj.id }).then(res => {
if (res.success) {
this.getList()
this.$message({
type: 'success',
message: '删除成功!'
})
} else {
this.$message({
type: 'error',
message: res.message
})
}
})
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
close() {
this.addEditForm = {}
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
},
SizeChange(val) {
this.pagInfo.pageSize = val
this.getList()
},
CurrentChange(val) {
this.pagInfo.pageNo = val
this.getList()
},
refresh() {
this.searchForm = {}
this.pagInfo.pageNo = 1 //页数
this.pagInfo.pageSize = 10 //条数
this.getList()
}
}
}
</script>
<style lang="scss" scoped>
.plan-manage {
width: 100%;
height: 100%;
.plan-content {
display: flex;
width: 100%;
height: 100%;
.left-plan {
width: 17%;
margin-right: 1%;
background: #fff;
.input-box {
display: flex;
margin: 20px 0 0px 20px;
.plan-search {
width: 90%;
margin: 0 auto;
}
.add-icon {
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
cursor: pointer;
border: 1px solid #c7d4f8;
img {
width: 75%;
height: 75%;
}
}
}
.bridge-section {
width: 100%;
height: 75%;
.section-list {
width: 100%;
margin-top: 5%;
.section-item {
padding: 10px 20px;
display: flex;
align-items: center;
justify-content: space-between;
&.active {
background: #c7d4f8;
color: #5181f6;
border-left: 4px solid #5181f6;
.bridge-title {
margin-left: 0px;
}
}
.bridge-title {
font-size: 14px;
margin-left: 4px;
}
.bridge-tool {
display: flex;
.icon {
width: 15px;
height: 15px;
cursor: pointer;
}
}
}
}
}
}
.right-plan {
width: 82%;
background: #fff;
}
}
}
.table-btn {
display: flex;
justify-content: center;
}
</style>

6
src/views/projectFront/smartBeamField/pedestalManage.vue Normal file
View File

@ -0,0 +1,6 @@
<template>
<div>制梁台座管理</div>
</template>
<script lang="ts" setup></script>
<style lang="scss" scoped></style>

471
src/views/projectFront/smartBeamField/planManage.vue Normal file
View File

@ -0,0 +1,471 @@
<template>
<div class="plan-manage">
<div class="plan-content">
<div class="left-plan">
<div class="input-box">
<el-input placeholder="请输入桥段" suffix-icon="el-icon-search" v-model="input1" size="small" class="plan-search"> </el-input>
<div class="add-icon">
<img src="@/assets/images/carPosition/add.png" alt="" />
</div>
</div>
<div class="bridge-section">
<vue-scroll>
<div class="section-list">
<div
class="section-item"
v-for="(item, index) in bridgeSectionList"
:key="item.id"
:class="{ active: activeBuildIndex == index }"
@click="changeBuildFn(item, index)"
>
<div class="bridge-title">{{ item.name }}</div>
<div class="bridge-tool">
<img @click.stop="editBuildFn(item)" src="@/assets/images/icon-edit.png" style="margin-right:16px" class="icon" />
<img @click.stop="deleteBuildFn(item)" src="@/assets/images/icon-delete.png" class="icon" />
</div>
</div>
</div>
</vue-scroll>
</div>
<div class="add-icon"></div>
</div>
<div class="right-plan">
<div class="fullHeight whiteBlock">
<div style="padding: 15px 15px 0">
<p class="pageTitle">梁列表</p>
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<el-form-item label="梁号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="梁型" style="margin-left:40px">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in beamTypeOption" :key="index" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" style="margin-left:40px">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in nameOptions" :key="index" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{ $t('message.energyManage.waybill.query') }}</el-button>
<el-button type="warning" plain @click="refresh">{{ $t('message.deviceManage.refresh') }}</el-button>
<el-button type="primary" size="medium" @click="add">新增</el-button>
</el-form-item>
</el-form>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" :data="['', '']">
<el-table-column type="index" label="序号" align="center" width="60">
<!-- <template slot-scope="scope">
<div>
{{scope.row}}
</div>
</template> -->
</el-table-column>
<el-table-column prop="institutionalAddress" align="center" label="梁号" width="80"></el-table-column>
<el-table-column prop="institutionalPhone" align="center" label="所属桥段"></el-table-column>
<el-table-column prop="remark" align="center" label="梁板类型"></el-table-column>
<el-table-column prop="remark" align="center" label="制梁状态"></el-table-column>
<el-table-column prop="remark" align="center" label="计划制梁时间"></el-table-column>
<el-table-column prop="remark" align="center" label="计划架梁时间"></el-table-column>
<el-table-column label="操作" align="center" width="470">
<template slot-scope="scope">
<div class="table-btn">
<div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>二维码</span>
</div>
<div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>开始生产</span>
</div>
<div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>详情</span>
</div>
<div @click="edit(scope.row)" class="operationText" style="margin-right: 30px">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>编辑</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
<span>删除</span>
</div>
</div>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pagerBox"
@size-change="SizeChange"
@current-change="CurrentChange"
:current-page="pagInfo.pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="pagInfo.pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(pagInfo.total)"
background
></el-pagination>
</div>
<el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px">
<div class="dialog_content">
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
<el-form-item label="梁号" prop="institutionName">
<el-input v-model="addEditForm.institutionName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="所属桥段" prop="institutionalAddress">
<el-input v-model="addEditForm.institutionalAddress" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="梁板类型" prop="institutionalPhone">
<el-input v-model="addEditForm.institutionalPhone" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="制梁状态">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in beamTypeOption" :key="index" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="计划制梁时间">
<el-date-picker
v-model="dateSelect"
type="datetime"
placeholder="请选择时间"
:range-separator="$t('message.energyManage.to')"
:start-placeholder="$t('message.energyManage.start')"
:end-placeholder="$t('message.energyManage.end')"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="计划驾梁时间">
<el-date-picker
v-model="dateSelect"
type="datetime"
placeholder="请选择时间"
:range-separator="$t('message.energyManage.to')"
:start-placeholder="$t('message.energyManage.start')"
:end-placeholder="$t('message.energyManage.end')"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="跨" prop="remark">
<el-input v-model="addEditForm.remark" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="幅">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in beamTypeOption" :key="index" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="dialogShow = false" icon="el-icon-circle-close" size="medium"
>{{ $t('message.deviceManage.cancel') }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="submit" size="medium"
>生成二维码
</el-button>
</div>
</el-form>
</div>
</el-dialog>
</div>
</div>
</div>
</div>
</template>
<script>
import {
addgtMaterialTestingInstitutionApi,
deletgtMaterialTestingInstitutionApi,
editgtMaterialTestingInstitutionApi,
gettgtMaterialTestingInstitutionApi
} from '@/assets/js/api/materialManagement.js'
export default {
mounted() {
this.getList()
},
data() {
return {
dateSelect: '',
beamTypeOption: [
{
label: '梁型1',
value: 1
},
{
label: '梁型2',
value: 2
},
{
label: '梁型3',
value: 3
}
],
nameOptions: [
{
label: '合格',
value: 1
},
{
label: '不合格',
value: 2
},
{
label: '未判定',
value: 3
}
],
bridgeSectionList: [
{
name: '桥段1',
id: 1
},
{
name: '桥段2',
id: 2
},
{
name: '桥段3',
id: 3
},
{
name: '桥段4',
id: 4
}
],
input1: '', // 桥段
currentBridgeInfo: '', //桥段item
activeBuildIndex: '', //当前选中桥段
// 梁列表相关 *************
title: '',
dialogShow: false,
pagInfo: {
pageNo: 1, //页数
pageSize: 10, //条数
total: 0 //总条数
},
List: [],
addEditForm: {
institutionName: '',
institutionalAddress: '',
institutionalPhone: '',
remark: ''
},
addEditRules: {
institutionName: [
{
required: true,
message: '必填',
trigger: 'blur'
}
]
},
searchForm: {
institutionName: ''
}
}
},
methods: {
// 打开新增桥段弹窗
handle() {
console.log('打开弹窗')
},
changeBuildFn(item, index) {
this.activeBuildIndex = index
this.currentBridgeInfo = item
},
// 编辑桥段弹窗
editBuildFn(item) {
console.log('编辑桥段', item)
},
// 删除桥段
deleteBuildFn(item) {
console.log('删除桥段', item)
},
// 梁列表相关 **************************
getList() {
gettgtMaterialTestingInstitutionApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
institutionName: this.searchForm.institutionName
}).then(result => {
if (result.success) {
this.List = result.result.records
this.pagInfo.total = result.result.total
}
})
},
add() {
this.title = '新增梁'
this.dialogShow = true
this.close()
},
edit(obj) {
this.title = '编辑机构'
this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj))
},
submit() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
params.projectSn = this.$store.state.projectSn
this.$refs.addEditForm.validate(valid => {
if (valid) {
if (this.title == '新增梁') {
addgtMaterialTestingInstitutionApi(params).then(result => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
} else if (this.title === '编辑机构') {
editgtMaterialTestingInstitutionApi(params).then(result => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
}
this.dialogShow = false
} else {
return false
}
})
},
deleteDev(obj) {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
deletgtMaterialTestingInstitutionApi({ id: obj.id }).then(res => {
if (res.success) {
this.getList()
this.$message({
type: 'success',
message: '删除成功!'
})
} else {
this.$message({
type: 'error',
message: res.message
})
}
})
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
close() {
this.addEditForm = {}
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
},
SizeChange(val) {
this.pagInfo.pageSize = val
this.getList()
},
CurrentChange(val) {
this.pagInfo.pageNo = val
this.getList()
},
refresh() {
this.searchForm = {}
this.pagInfo.pageNo = 1 //页数
this.pagInfo.pageSize = 10 //条数
this.getList()
}
}
}
</script>
<style lang="scss" scoped>
.plan-manage {
width: 100%;
height: 100%;
.plan-content {
display: flex;
width: 100%;
height: 100%;
.left-plan {
width: 17%;
margin-right: 1%;
background: #fff;
.input-box {
display: flex;
margin: 20px 0 0px 20px;
.plan-search {
width: 80%;
margin-right: 5%;
}
.add-icon {
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
cursor: pointer;
border: 1px solid #c7d4f8;
img {
width: 75%;
height: 75%;
}
}
}
.bridge-section {
width: 100%;
height: 75%;
.section-list {
width: 100%;
margin-top: 5%;
.section-item {
padding: 10px 20px;
display: flex;
align-items: center;
justify-content: space-between;
&.active {
background: #c7d4f8;
color: #5181f6;
border-left: 4px solid #5181f6;
.bridge-title {
margin-left: 0px;
}
}
.bridge-title {
font-size: 14px;
margin-left: 4px;
}
.bridge-tool {
display: flex;
.icon {
width: 15px;
height: 15px;
cursor: pointer;
}
}
}
}
}
}
.right-plan {
width: 82%;
background: #fff;
}
}
}
.table-btn {
display: flex;
justify-content: center;
}
</style>

6
src/views/projectFront/smartBeamField/processList.vue Normal file
View File

@ -0,0 +1,6 @@
<template>
<div>工序列表</div>
</template>
<script lang="ts" setup></script>
<style lang="scss" scoped></style>

5
src/views/projectFront/smartBeamField/productManage.vue Normal file
View File

@ -0,0 +1,5 @@
<template>
<div>生产管理</div>
</template>
<script lang="ts" setup></script>
<style lang="scss" scoped></style>

6
src/views/projectFront/smartBeamField/storageAreaManage.vue Normal file
View File

@ -0,0 +1,6 @@
<template>
<div>存梁区管理</div>
</template>
<script lang="ts" setup></script>
<style lang="scss" scoped></style>

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

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

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