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

flx:提交高速进度对接

Browse Source
This commit is contained in:
Rain_ 2025-12-02 16:25:22 +08:00
parent 52934e580c
commit cf89b8967f
5 changed files with 356 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/assets/js/api/progressManagement.js
View File

@ -1,7 +1,7 @@
/**
* api接口统一管理
*/
import {post,get} from '../http'
import { post, get } from '../http'
//甘特图-列表查询任务进度
export const getParentChildTaskListApi = data => post('xmgl/taskProgress/getParentChildList', data);
@ -78,4 +78,50 @@ export const editXzMilestoneApi = data => post('xmgl/xzMilestone/edit', data);
export const deleteXzMilestoneApi = data => post('xmgl/xzMilestone/delete', data);
export const xzMilestoneDataApi = data => post('xmgl/xzTaskProgress/statsByEnterprise', data);
// 板单元生产信息
// 分页列表查询板单元生产信息信息
export const getXzPlateUnitPageApi = data => get('xmgl/gsBoardUnitInformation/page', data);
// 添加板单元生产信息信息
export const addXzPlateUnitApi = data => post('xmgl/gsBoardUnitInformation/add', data);
// 修改板单元生产信息信息
export const editXzPlateUnitApi = data => post('xmgl/gsBoardUnitInformation/edit', data);
// 删除板单元生产信息信息
export const deleteXzPlateUnitApi = data => post('xmgl/gsBoardUnitInformation/delete', data);
// 批量删除板单元生产信息信息
export const batchDeleteXzPlateUnitApi = data => post('xmgl/gsBoardUnitInformation/deleteBatch', data);
// 导入模板下载
export const downloadXzPlateUnitApi = data => post('xmgl/gsBoardUnitInformation/downloadExcel', data);
// 模板批量导入
export const importXzPlateUnitApi = data => post('xmgl/gsBoardUnitInformation/importExcel', data);
// 块体生产信息
// 分页列表查询块体生产信息信息
export const getBlockProductionInformationPageApi = data => get('xmgl/gsBlockProductionInformation/page', data);
// 添加块体生产信息信息
export const addBlockProductionInformationApi = data => post('xmgl/gsBlockProductionInformation/add', data);
// 修改块体生产信息信息
export const editBlockProductionInformationApi = data => post('xmgl/gsBlockProductionInformation/edit', data);
// 删除块体生产信息信息
export const deleteBlockProductionInformationApi = data => post('xmgl/gsBlockProductionInformation/delete', data);
// 批量删除块体生产信息信息
export const batchDeleteBlockProductionInformationApi = data => post('xmgl/gsBlockProductionInformation/deleteBatch', data);
// 导入模板下载
export const downloadBlockProductionInformationApi = data => post('xmgl/gsBlockProductionInformation/downloadExcel', data);
// 模板批量导入
export const importBlockProductionInformationApi = data => post('xmgl/gsBlockProductionInformation/importExcel', data);
// 桥位环缝列表
// 分页列表查询桥位环缝信息
export const getBridgeSitePageApi = data => get('xmgl/gsBridgeSite/page', data);
// 添加桥位环缝信息
export const addBridgeSiteApi = data => post('xmgl/gsBridgeSite/add', data);
// 修改桥位环缝信息
export const editBridgeSiteApi = data => post('xmgl/gsBridgeSite/edit', data);
// 删除桥位环缝信息
export const deleteBridgeSiteApi = data => post('xmgl/gsBridgeSite/delete', data);
// 批量删除桥位环缝信息
export const batchDeleteBridgeSiteApi = data => post('xmgl/gsBridgeSite/deleteBatch', data);
// 导入模板下载
export const downloadBridgeSiteApi = data => post('xmgl/gsBridgeSite/downloadExcel', data);
// 模板批量导入
export const importBridgeSiteApi = data => post('xmgl/gsBridgeSite/importExcel', data);

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

@ -168,48 +168,48 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:100/' //演示平台/·
// axios.defaults.baseURL = 'http://192.168.34.221:8111/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址
// 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:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// 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://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
// axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址
// axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工
// axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒
// axios.defaults.baseURL = "https://zm.zhgdyun.com:11111";
// // axios.defaults.baseURL = "http://121.37.106.37:9809";
// axios.defaults.baseURL = "http://139.9.66.234:20628";
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500";
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000/"; // 潮州
// axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌
// axios.defaults.baseURL = "http://112.93.255.85:9840/"; // 广深高速
axios.defaults.baseURL = 'http://192.168.34.221:8111/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址
// 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:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// 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://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
// axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址
// axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工
// axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒
// axios.defaults.baseURL = "https://zm.zhgdyun.com:11111";
// // axios.defaults.baseURL = "http://121.37.106.37:9809";
// axios.defaults.baseURL = "http://139.9.66.234:20628";
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500";
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000/"; // 潮州
// axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌
// axios.defaults.baseURL = "http://112.93.255.85:9840/"; // 广深高速
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") {

166
src/views/projectFront/progressManagement/blockInfo.vue
View File

@ -3,19 +3,19 @@
<div style="padding: 15px 15px 0">
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<el-form-item label="轮次">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.roundNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="大节段号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.largeSectionNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="小节段号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.smallSectionNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="块体号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.blockNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{
<el-button type="primary" plain @click="queryBtn">{{
$t("message.energyManage.waybill.query")
}}</el-button>
<el-button type="warning" plain @click="refresh">{{
@ -46,14 +46,14 @@
class="upload-demo"
name="excelFile"
:action="
$http.defaults.baseURL + 'xmgl/riskListPotentialAccidentType/importExcel'
$http.defaults.baseURL + 'xmgl/gsBlockProductionInformation/importExcel'
"
:on-change="handleChangeE"
:on-success="handleSuccessE"
:on-error="handleErrorE"
:show-file-list="false"
:headers="headers"
:data="{ sn: $store.state.userInfo.sn }"
:data="{ projectSn: $store.state.projectSn }"
:limit="1"
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
:auto-upload="true"
@ -65,7 +65,7 @@
</el-form-item>
<el-form-item label="组装日期">
<el-date-picker
v-model="searchForm.dateRangeArr"
v-model="searchForm.assemblyDateArr"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
@ -77,7 +77,7 @@
</el-form-item>
<el-form-item label="涂装日期">
<el-date-picker
v-model="searchForm.dateRangeArr"
v-model="searchForm.paintingDateArr"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
@ -89,7 +89,7 @@
</el-form-item>
<el-form-item label="发运日期">
<el-date-picker
v-model="searchForm.dateRangeArr"
v-model="searchForm.shippingDateArr"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
@ -100,7 +100,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="searchForm.dateRangeArr" placeholder="请选择">
<el-select v-model="searchForm.condition" placeholder="请选择">
<el-option
v-for="item in stateList"
:key="item.value"
@ -115,43 +115,53 @@
<el-table class="tables" ref="multipleTable" :data="List">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column
prop="institutionName"
prop="roundNumber"
label="轮次"
align="center"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="largeSectionNumber"
align="center"
label="大节段号"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="smallSectionNumber"
align="center"
label="小节段号"
></el-table-column>
<el-table-column
prop="institutionalAddress"
prop="blockNumber"
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 prop="assemblyDate" align="center" label="组装日期"></el-table-column>
<el-table-column prop="weldingDate" align="center" label="焊接日期"></el-table-column>
<el-table-column prop="paintingDate" align="center" label="涂装日期"></el-table-column>
<el-table-column prop="shippingDate" align="center" label="发运日期"></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="weight"
align="center"
label="重量(吨)"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="condition"
align="center"
label="状态"
></el-table-column>
>
<template slot-scope="scope">
{{
scope.row.condition == 1
? "未完成"
: scope.row.condition == 2
? "已完成"
: "--"
}}
</template>
</el-table-column>
<el-table-column width="220" label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="edit(2, scope.row)" class="operationText">
<div @click="isAdd(2, scope.row)" class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>编辑</span>
</div>
@ -191,71 +201,71 @@
label-width="120px"
class="dialogFormBox"
>
<el-form-item label="轮次" prop="institutionName">
<el-form-item label="轮次" prop="roundNumber">
<el-input
v-model="addEditForm.institutionName"
v-model="addEditForm.roundNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="大节段号" prop="institutionName">
<el-form-item label="大节段号" prop="largeSectionNumber">
<el-input
v-model="addEditForm.institutionName"
v-model="addEditForm.largeSectionNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="轮次" prop="institutionName">
<el-form-item label="小节段号" prop="smallSectionNumber">
<el-input
v-model="addEditForm.institutionName"
v-model="addEditForm.smallSectionNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="块体号" prop="institutionalAddress">
<el-form-item label="块体号" prop="blockNumber">
<el-input
v-model="addEditForm.institutionalAddress"
v-model="addEditForm.blockNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="组装日期" prop="remark">
<el-form-item label="组装日期" prop="assemblyDate">
<el-date-picker
v-model="addEditForm.date"
v-model="addEditForm.assemblyDate"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item label="焊接日期" prop="remark">
<el-form-item label="焊接日期" prop="weldingDate">
<el-date-picker
v-model="addEditForm.date"
v-model="addEditForm.weldingDate"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item label="涂装日期" prop="remark">
<el-form-item label="涂装日期" prop="paintingDate">
<el-date-picker
v-model="addEditForm.date"
v-model="addEditForm.paintingDate"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item label="发运日期" prop="remark">
<el-form-item label="发运日期" prop="shippingDate">
<el-date-picker
v-model="addEditForm.date"
v-model="addEditForm.shippingDate"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item label="重量(吨)" prop="remark">
<el-input v-model="addEditForm.remark" placeholder="请输入"></el-input>
<el-form-item label="重量(吨)" prop="weight">
<el-input v-model="addEditForm.weight" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="状态" prop="remark">
<el-select v-model="addEditForm.dateRangeArr" placeholder="请选择">
<el-form-item label="状态" prop="condition">
<el-select v-model="addEditForm.condition" placeholder="请选择">
<el-option
v-for="item in stateList"
:key="item.value"
@ -288,11 +298,12 @@
</template>
<script>
import {
addgtMaterialTestingInstitutionApi,
deletgtMaterialTestingInstitutionApi,
editgtMaterialTestingInstitutionApi,
gettgtMaterialTestingInstitutionApi,
} from "@/assets/js/api/materialManagement.js";
addBlockProductionInformationApi,
deleteBlockProductionInformationApi,
editBlockProductionInformationApi,
getBlockProductionInformationPageApi,
batchDeleteBlockProductionInformationApi,
} from "@/assets/js/api/progressManagement.js";
export default {
mounted() {
this.getList();
@ -308,13 +319,19 @@ export default {
},
List: [],
addEditForm: {
institutionName: "",
institutionalAddress: "",
institutionalPhone: "",
remark: "",
roundNumber: "",
largeSectionNumber: "",
smallSectionNumber: "",
blockNumber: "",
assemblyDate: "",
paintingDate: "",
shippingDate: "",
weldingDate: "",
condition: "",
weight: "",
},
addEditRules: {
institutionName: [
roundNumber: [
{
required: true,
message: "必填",
@ -323,14 +340,21 @@ export default {
],
},
searchForm: {
institutionName: "",
roundNumber: "",
largeSectionNumber: "",
smallSectionNumber: "",
blockNumber: "",
assemblyDateArr: [],
paintingDateArr: [],
shippingDateArr: [],
condition: "",
},
stateList: [{
value: '1',
label: '已完成'
label: '未完成'
}, {
value: '2',
label: '未完成'
label: '已完成'
}]
};
},
@ -364,7 +388,7 @@ export default {
exportBtnTemplateDetail() {
fetch(
this.$http.defaults.baseURL +
`xmgl/riskListDetail/downloadTemplate?sn=${this.$store.state.userInfo.sn}&libraryId=${this.riskListDetailInfo.id}`,
`xmgl/gsBlockProductionInformation/downloadExcel?projectSn=${this.$store.state.userInfo.projectSn}`,
{
method: "get",
headers: {
@ -387,7 +411,7 @@ export default {
// 创建一个<a>元素
const link = document.createElement("a");
link.href = url;
link.download = "风险清单库详情.xlsx"; // 指定下载文件的文件名
link.download = "块体生产信息.xlsx"; // 指定下载文件的文件名
// 模拟点击下载链接
document.body.appendChild(link);
link.click();
@ -414,7 +438,7 @@ export default {
.then(() => {
const ids = this.$refs.multipleTable.selection.map((item) => item.id).join(",");
console.log(this.$refs.multipleTable.selection);
deleteBatchRiskListDetailApi({ ids }).then((res) => {
batchDeleteBlockProductionInformationApi({ ids }).then((res) => {
this.queryBtn();
});
})
@ -422,11 +446,21 @@ export default {
},
//查询仓库数据
getList() {
gettgtMaterialTestingInstitutionApi({
getBlockProductionInformationPageApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
institutionName: this.searchForm.institutionName,
roundNumber: this.searchForm.roundNumber,
largeSectionNumber: this.searchForm.largeSectionNumber,
smallSectionNumber: this.searchForm.smallSectionNumber,
blockNumber: this.searchForm.blockNumber,
assemblyDate_begin: this.searchForm.assemblyDateArr instanceof Array && this.searchForm.assemblyDateArr[0] ? this.searchForm.assemblyDateArr[0] : "" ,
assemblyDate_end: this.searchForm.assemblyDateArr instanceof Array && this.searchForm.assemblyDateArr[1] ? this.searchForm.assemblyDateArr[1] : "" ,
paintingDate_begin: this.searchForm.paintingDateArr instanceof Array && this.searchForm.paintingDateArr[0] ? this.searchForm.paintingDateArr[0] : "" ,
paintingDate_end: this.searchForm.paintingDateArr instanceof Array && this.searchForm.paintingDateArr[1] ? this.searchForm.paintingDateArr[1] : "" ,
shippingDate_begin: this.searchForm.shippingDateArr instanceof Array && this.searchForm.shippingDateArr[0] ? this.searchForm.shippingDateArr[0] : "" ,
shippingDate_end: this.searchForm.shippingDateArr instanceof Array && this.searchForm.shippingDateArr[1] ? this.searchForm.shippingDateArr[1] : "" ,
condition: this.searchForm.condition,
}).then((result) => {
if (result.success) {
this.List = result.result.records;
@ -452,14 +486,14 @@ export default {
this.$refs.addEditForm.validate((valid) => {
if (valid) {
if (this.title == "新增") {
addgtMaterialTestingInstitutionApi(params).then((result) => {
addBlockProductionInformationApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
}
});
} else if (this.title === "编辑") {
editgtMaterialTestingInstitutionApi(params).then((result) => {
editBlockProductionInformationApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -479,7 +513,7 @@ export default {
type: "warning",
})
.then(() => {
deletgtMaterialTestingInstitutionApi({ id: obj.id }).then((res) => {
deleteBlockProductionInformationApi({ id: obj.id }).then((res) => {
if (res.success) {
this.getList();
this.$message({
@ -516,6 +550,10 @@ export default {
this.pagInfo.pageNo = val;
this.getList();
},
queryBtn() {
this.pagInfo.pageNo = 1; //页数
this.getList(); //重新获取数据
},
refresh() {
this.searchForm = {};
this.pagInfo.pageNo = 1; //页数

87
src/views/projectFront/progressManagement/bridgePositionRingJoint.vue
View File

@ -3,10 +3,10 @@
<div style="padding: 15px 15px 0">
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<el-form-item label="桥位环链编号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.bridgeSiteNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="searchForm.dateRangeArr" placeholder="请选择">
<el-select v-model="searchForm.condition" placeholder="请选择">
<el-option
v-for="item in stateList"
:key="item.value"
@ -29,7 +29,7 @@
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{
<el-button type="primary" plain @click="queryBtn">{{
$t("message.energyManage.waybill.query")
}}</el-button>
<el-button type="warning" plain @click="refresh">{{
@ -60,14 +60,14 @@
class="upload-demo"
name="excelFile"
:action="
$http.defaults.baseURL + 'xmgl/riskListPotentialAccidentType/importExcel'
$http.defaults.baseURL + 'xmgl/gsBridgeSite/importExcel'
"
:on-change="handleChangeE"
:on-success="handleSuccessE"
:on-error="handleErrorE"
:show-file-list="false"
:headers="headers"
:data="{ sn: $store.state.userInfo.sn }"
:data="{ projectSn: $store.state.userInfo.projectSn }"
:limit="1"
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
:auto-upload="true"
@ -83,20 +83,30 @@
<el-table class="tables" ref="multipleTable" :data="List">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column
prop="institutionName"
prop="bridgeSiteNumber"
label="桥位环链编号"
align="center"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="condition"
align="center"
label="完成状态"
></el-table-column>
<el-table-column prop="remark" align="center" label="日期"></el-table-column>
>
<template slot-scope="scope">
{{
scope.row.condition == 1
? "未完成"
: scope.row.condition == 2
? "已完成"
: "--"
}}
</template>
</el-table-column>
<el-table-column prop="date" align="center" label="日期"></el-table-column>
<el-table-column width="220" label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="edit(2, scope.row)" class="operationText">
<div @click="isAdd(2, scope.row)" class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>编辑</span>
</div>
@ -136,15 +146,15 @@
label-width="120px"
class="dialogFormBox"
>
<el-form-item label="桥位环链编号" prop="institutionName">
<el-form-item label="桥位环链编号" prop="bridgeSiteNumber">
<el-input
v-model="addEditForm.institutionName"
v-model="addEditForm.bridgeSiteNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="状态" prop="remark">
<el-select v-model="addEditForm.dateRangeArr" placeholder="请选择">
<el-form-item label="状态" prop="condition">
<el-select v-model="addEditForm.condition" placeholder="请选择">
<el-option
v-for="item in stateList"
:key="item.value"
@ -154,7 +164,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="日期" prop="remark">
<el-form-item label="日期" prop="date">
<el-date-picker
v-model="addEditForm.date"
type="datetime"
@ -186,11 +196,12 @@
</template>
<script>
import {
addgtMaterialTestingInstitutionApi,
deletgtMaterialTestingInstitutionApi,
editgtMaterialTestingInstitutionApi,
gettgtMaterialTestingInstitutionApi,
} from "@/assets/js/api/materialManagement.js";
addBridgeSiteApi,
deleteBridgeSiteApi,
editBridgeSiteApi,
getBridgeSitePageApi,
batchDeleteBridgeSiteApi,
} from "@/assets/js/api/progressManagement.js";
export default {
mounted() {
this.getList();
@ -206,13 +217,12 @@ export default {
},
List: [],
addEditForm: {
institutionName: "",
institutionalAddress: "",
institutionalPhone: "",
remark: "",
bridgeSiteNumber: "",
condition: "",
date: "",
},
addEditRules: {
institutionName: [
bridgeSiteNumber: [
{
required: true,
message: "必填",
@ -221,7 +231,9 @@ export default {
],
},
searchForm: {
institutionName: "",
bridgeSiteNumber: "",
condition: "",
dateRangeArr: [],
},
stateList: [
{
@ -265,7 +277,7 @@ export default {
exportBtnTemplateDetail() {
fetch(
this.$http.defaults.baseURL +
`xmgl/riskListDetail/downloadTemplate?sn=${this.$store.state.userInfo.sn}&libraryId=${this.riskListDetailInfo.id}`,
`xmgl/gsBridgeSite/downloadExcel?projectSn=${this.$store.state.userInfo.projectSn}`,
{
method: "get",
headers: {
@ -288,7 +300,7 @@ export default {
// 创建一个<a>元素
const link = document.createElement("a");
link.href = url;
link.download = "风险清单库详情.xlsx"; // 指定下载文件的文件名
link.download = "桥位环缝.xlsx"; // 指定下载文件的文件名
// 模拟点击下载链接
document.body.appendChild(link);
link.click();
@ -315,7 +327,7 @@ export default {
.then(() => {
const ids = this.$refs.multipleTable.selection.map((item) => item.id).join(",");
console.log(this.$refs.multipleTable.selection);
deleteBatchRiskListDetailApi({ ids }).then((res) => {
batchDeleteBridgeSiteApi({ ids }).then((res) => {
this.queryBtn();
});
})
@ -323,11 +335,14 @@ export default {
},
//查询仓库数据
getList() {
gettgtMaterialTestingInstitutionApi({
getBridgeSitePageApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
institutionName: this.searchForm.institutionName,
bridgeSiteNumber: this.searchForm.bridgeSiteNumber,
condition: this.searchForm.condition,
date_begin: this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0] ? this.searchForm.dateRangeArr[0] : "" ,
date_end: this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[1] ? this.searchForm.dateRangeArr[1] : "" ,
}).then((result) => {
if (result.success) {
this.List = result.result.records;
@ -353,14 +368,14 @@ export default {
this.$refs.addEditForm.validate((valid) => {
if (valid) {
if (this.title == "新增") {
addgtMaterialTestingInstitutionApi(params).then((result) => {
addBridgeSiteApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
}
});
} else if (this.title === "编辑") {
editgtMaterialTestingInstitutionApi(params).then((result) => {
editBridgeSiteApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -380,7 +395,7 @@ export default {
type: "warning",
})
.then(() => {
deletgtMaterialTestingInstitutionApi({ id: obj.id }).then((res) => {
deleteBridgeSiteApi({ id: obj.id }).then((res) => {
if (res.success) {
this.getList();
this.$message({
@ -417,6 +432,10 @@ export default {
this.pagInfo.pageNo = val;
this.getList();
},
queryBtn() {
this.pagInfo.pageNo = 1; //页数
this.getList();
},
refresh() {
this.searchForm = {};
this.pagInfo.pageNo = 1; //页数

178
src/views/projectFront/progressManagement/plateElementInfo.vue
View File

@ -3,13 +3,21 @@
<div style="padding: 15px 15px 0">
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<el-form-item label="轮次">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.roundNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="项目内容">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-select v-model="searchForm.projectContent" placeholder="请选择">
<el-option
v-for="item in projectContentList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工单号">
<el-input v-model="searchForm.institutionName" placeholder="请输入"></el-input>
<el-input v-model="searchForm.workOrderNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="上传时间">
<el-date-picker
@ -24,7 +32,7 @@
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{
<el-button type="primary" plain @click="queryBtn">{{
$t("message.energyManage.waybill.query")
}}</el-button>
<el-button type="warning" plain @click="refresh">{{
@ -54,15 +62,13 @@
<el-upload
class="upload-demo"
name="excelFile"
:action="
$http.defaults.baseURL + 'xmgl/riskListPotentialAccidentType/importExcel'
"
:action="$http.defaults.baseURL + 'xmgl/gsBoardUnitInformation/importExcel'"
:on-change="handleChangeE"
:on-success="handleSuccessE"
:on-error="handleErrorE"
:show-file-list="false"
:headers="headers"
:data="{ sn: $store.state.userInfo.sn }"
:data="{ projectSn: $store.state.projectSn }"
:limit="1"
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
:auto-upload="true"
@ -77,46 +83,48 @@
<div class="table_wrap whiteBlock">
<el-table class="tables" ref="multipleTable" :data="List">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column prop="roundNumber" label="轮次" align="center"></el-table-column>
<el-table-column
prop="institutionName"
label="轮次"
align="center"
></el-table-column>
<el-table-column
prop="institutionalAddress"
prop="workOrderNumber"
align="center"
label="工单号"
></el-table-column>
<el-table-column prop="institutionalPhone" align="center" label="项目内容">
<template slot-scope="scope">
{{
scope.row.projectContent == 1
? "板单元"
: scope.row.projectContent == 2
? "下料切割"
: "--"
}}
</template>
</el-table-column>
<el-table-column
prop="institutionalPhone"
align="center"
label="项目内容"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="totalWorkload"
align="center"
label="总工程量(吨)"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="dailyCompletion"
align="center"
label="每日完成(吨)"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="cumulativeCompletion"
align="center"
label="累计完成(吨)"
></el-table-column>
<el-table-column
prop="institutionalPhone"
prop="completionPercentage"
align="center"
label="完成比例(吨)"
></el-table-column>
<el-table-column prop="remark" align="center" label="日期"></el-table-column>
<el-table-column prop="date" align="center" label="日期"></el-table-column>
<el-table-column width="220" label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="edit(2, scope.row)" class="operationText">
<div @click="isAdd(2, scope.row)" class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>编辑</span>
</div>
@ -156,37 +164,48 @@
label-width="120px"
class="dialogFormBox"
>
<el-form-item label="轮次" prop="institutionName">
<el-form-item label="轮次" prop="roundNumber">
<el-input v-model="addEditForm.roundNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="工单号" prop="workOrderNumber">
<el-input
v-model="addEditForm.institutionName"
v-model="addEditForm.workOrderNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="工单号" prop="institutionalAddress">
<el-form-item label="项目内容" prop="projectContent">
<el-select v-model="addEditForm.projectContent" placeholder="请选择">
<el-option
v-for="item in projectContentList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="总工程量(吨)" prop="totalWorkload">
<el-input v-model="addEditForm.totalWorkload" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="每日完成(吨)" prop="dailyCompletion">
<el-input
v-model="addEditForm.institutionalAddress"
v-model="addEditForm.dailyCompletion"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="项目内容" prop="institutionalPhone">
<el-form-item label="累计完成(吨)" prop="cumulativeCompletion">
<el-input
v-model="addEditForm.institutionalPhone"
v-model="addEditForm.cumulativeCompletion"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="总工程量(吨)" prop="remark">
<el-input v-model="addEditForm.remark" placeholder="请输入"></el-input>
<el-form-item label="完成比例(吨)" prop="completionPercentage">
<el-input
v-model="addEditForm.completionPercentage"
placeholder="请输入"
></el-input>
</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="累计完成(吨)" prop="remark">
<el-input v-model="addEditForm.remark" placeholder="请输入"></el-input>
</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="日期" prop="remark">
<el-form-item label="日期" prop="date">
<el-date-picker
v-model="addEditForm.date"
type="datetime"
@ -218,11 +237,12 @@
</template>
<script>
import {
addgtMaterialTestingInstitutionApi,
deletgtMaterialTestingInstitutionApi,
editgtMaterialTestingInstitutionApi,
gettgtMaterialTestingInstitutionApi,
} from "@/assets/js/api/materialManagement.js";
addXzPlateUnitApi,
deleteXzPlateUnitApi,
editXzPlateUnitApi,
getXzPlateUnitPageApi,
batchDeleteXzPlateUnitApi,
} from "@/assets/js/api/progressManagement.js";
export default {
mounted() {
this.getList();
@ -238,13 +258,17 @@ export default {
},
List: [],
addEditForm: {
institutionName: "",
institutionalAddress: "",
institutionalPhone: "",
remark: "",
roundNumber: "",
projectContent: "",
workOrderNumber: "",
totalWorkload: "",
dailyCompletion: "",
cumulativeCompletion: "",
completionPercentage: "",
date: "",
},
addEditRules: {
institutionName: [
roundNumber: [
{
required: true,
message: "必填",
@ -253,8 +277,21 @@ export default {
],
},
searchForm: {
institutionName: "",
roundNumber: "",
projectContent: "",
workOrderNumber: "",
dateRangeArr: [],
},
projectContentList: [
{
value: 1,
label: "板单元",
},
{
value: 2,
label: "下料切割",
},
],
};
},
methods: {
@ -287,7 +324,7 @@ export default {
exportBtnTemplateDetail() {
fetch(
this.$http.defaults.baseURL +
`xmgl/riskListDetail/downloadTemplate?sn=${this.$store.state.userInfo.sn}&libraryId=${this.riskListDetailInfo.id}`,
`xmgl/gsBoardUnitInformation/downloadExcel?projectSn=${this.$store.state.projectSn}`,
{
method: "get",
headers: {
@ -310,7 +347,7 @@ export default {
// 创建一个<a>元素
const link = document.createElement("a");
link.href = url;
link.download = "风险清单库详情.xlsx"; // 指定下载文件的文件名
link.download = "板单元生产信息.xlsx"; // 指定下载文件的文件名
// 模拟点击下载链接
document.body.appendChild(link);
link.click();
@ -337,7 +374,7 @@ export default {
.then(() => {
const ids = this.$refs.multipleTable.selection.map((item) => item.id).join(",");
console.log(this.$refs.multipleTable.selection);
deleteBatchRiskListDetailApi({ ids }).then((res) => {
batchDeleteXzPlateUnitApi({ ids }).then((res) => {
this.queryBtn();
});
})
@ -345,11 +382,16 @@ export default {
},
//查询仓库数据
getList() {
gettgtMaterialTestingInstitutionApi({
getXzPlateUnitPageApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
institutionName: this.searchForm.institutionName,
roundNumber: this.searchForm.roundNumber,
projectContent: this.searchForm.projectContent,
workOrderNumber: this.searchForm.workOrderNumber,
date_begin: this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0] ? this.searchForm.dateRangeArr[0] : "" ,
date_end: this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[1] ? this.searchForm.dateRangeArr[1] : "" ,
}).then((result) => {
if (result.success) {
this.List = result.result.records;
@ -375,14 +417,14 @@ export default {
this.$refs.addEditForm.validate((valid) => {
if (valid) {
if (this.title == "新增") {
addgtMaterialTestingInstitutionApi(params).then((result) => {
addXzPlateUnitApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
}
});
} else if (this.title === "编辑") {
editgtMaterialTestingInstitutionApi(params).then((result) => {
editXzPlateUnitApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -402,7 +444,7 @@ export default {
type: "warning",
})
.then(() => {
deletgtMaterialTestingInstitutionApi({ id: obj.id }).then((res) => {
deleteXzPlateUnitApi({ id: obj.id }).then((res) => {
if (res.success) {
this.getList();
this.$message({
@ -439,6 +481,10 @@ export default {
this.pagInfo.pageNo = val;
this.getList();
},
queryBtn() {
this.pagInfo.pageNo = 1; //页数
this.getList();
},
refresh() {
this.searchForm = {};
this.pagInfo.pageNo = 1; //页数
@ -457,13 +503,13 @@ export default {
</script>
<style lang="less" scoped>
.el-date-editor {
width: 360px;
width: 360px;
}
.pagerBox {
margin-top: 30px;
margin-top: 30px;
}
.table_wrap {
height: calc(100% - 73px);
.table_wrap {
height: calc(100% - 73px);
}
.tables {
min-height: 610px;