项目基本信息(全景计划,标段计划):新增接口联调

This commit is contained in:
骆乐 2022-10-10 16:47:09 +08:00
parent 19a74b487c
commit 254778bb13
4 changed files with 39 additions and 12 deletions

View File

@ -14,4 +14,5 @@ export const addPanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/a
export const deletePanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/delete', data); //删除
export const editPanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/edit', data); //编辑
export const queryPanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/list', data); //分页查询
export const queryByIdPanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/queryById', data); //根据id查询
export const queryByIdPanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/queryById', data); //根据id查询
export const getprojectfNameListApi = data => post('/xmgl/progressPlanBidSection/selectProgressPlanBidSectionList', data); //获取所有的标段名称

View File

@ -40,7 +40,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
// axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@ -49,7 +49,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //

View File

@ -10,7 +10,7 @@
<!-- 请选择标段: -->
{{$t('message.projectInfo.pleaseChooseSection')+':'}}
</div>
<el-select style="margin-left: 5%;margin-bottom:20px;width: 90%" @change="changeAlarmType" v-model="alarmType"class="alarmTypeBox">
<el-select style="margin-left: 5%;margin-bottom:20px;width: 90%" @change="changeAlarmType" v-model="alarmType" class="alarmTypeBox">
<el-option v-for="(item,index) in ProgressPlanBidSectionList" :key="index" :value="item.id" :label="item.projectfName"></el-option>
</el-select>
<el-menu
@ -45,11 +45,11 @@
<img style="margin: 40px;" v-else src="@/assets/images/noData2.png"/>
</el-menu>
</vue-scroll>
<!-- <div class="flex2 btn_pack">-->
<!-- <el-button size="small" type="primary" @click="newTowerBtn">-->
<!-- <i class="el-icon-plus" style="margin-right: 6px"></i>新增楼栋-->
<!-- </el-button>-->
<!-- </div>-->
<div class="flex2 btn_pack">
<el-button size="small" type="primary" @click="newTowerBtn">
<i class="el-icon-plus" style="margin-right: 6px"></i>新增楼栋
</el-button>
</div>
<el-dialog
class="dialog"
:title="dialogTitle"
@ -355,10 +355,11 @@ export default {
if(valid){
let data = this.dialogdata
data.projectSn = this.projectSn
console.log(data)
data.bidSectionId = this.alarmType
// console.log('',data)
if(this.formType == 1){
addBuildingPlanApi(data).then(res=>{
console.log(res)
// console.log('',res)
if(res.code == 200){
this.$message.success(this.$t('message.projectInfo.addSuccess')+'!')
this.progressBuildingPlanList()

View File

@ -31,6 +31,7 @@
<div class="table-box">
<vue-scroll style="height: 668px">
<el-table :data="tableData">
<!-- 标段名称 -->
<el-table-column align="center" prop="projectfName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
<!-- 节点编号 -->
<el-table-column align="center" prop="nodeCode" :label="$t('message.projectInfo.nodeNumber')"></el-table-column>
@ -111,6 +112,18 @@
label-width="130px"
size="medium"
class="dialogFormBox">
<!-- 标段名称 -->
<el-form-item :label="$t('message.projectInfo.sectionName')" prop="projectfName" required>
<el-select v-model="dialogdata.projectfName" :placeholder="$t('message.projectInfo.pleaseChoose')">
<el-option
v-for="(item , index ) in projectfNameList"
:key="index"
:label="item.projectfName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- 节点编码 -->
<el-form-item :label="$t('message.projectInfo.nodeCode')" prop="nodeCode" required>
<el-input
v-model="dialogdata.nodeCode"
@ -240,7 +253,8 @@ import {
editPanoramaNodePlan,
deletePanoramaNodePlan,
queryPanoramaNodePlan,
queryByIdPanoramaNodePlan
queryByIdPanoramaNodePlan,
getprojectfNameListApi
} from "@/assets/js/api/projectSummary.js";
import {
selectProgressPlanBidSectionListApi
@ -255,6 +269,7 @@ export default {
tableData:[],
dialogVisible: false,
dialogdata:{
projectfName:'',
nodeCode: '',
nodeName: '',
levelName: '',
@ -268,6 +283,7 @@ export default {
chargerName: '',
},
rules:{
projectfName:{ required: true, message: this.$t('message.projectInfo.pleaseChoose')+this.$t('message.projectInfo.projectfName')},
nodeCode: { required: true, message: this.$t('message.projectInfo.placeholder')+this.$t('message.projectInfo.nodeNumber')},
nodeName: { required: true, message: this.$t('message.projectInfo.placeholder')+this.$t('message.projectInfo.nodeName')},
levelName: { required: true, message: this.$t('message.projectInfo.placeholder')+this.$t('message.projectInfo.nodeType')},
@ -279,6 +295,7 @@ export default {
chargerName: { required: true, message: this.$t('message.projectInfo.placeholder')+this.$t('message.projectInfo.nodeResponsiblePerson')},
},
options:this.$t('message.projectInfo.nodeStatusList'),
projectfNameList:[],
pageNo: 1,
pageSize: 10,
total: 0,
@ -291,8 +308,15 @@ export default {
this.projectSn = this.$store.state.projectSn;
this.loadData()
this.selectProgressPlanBidSectionList()
this.getprojectfNameList()
},
methods:{
getprojectfNameList(){
getprojectfNameListApi({projectSn: this.$store.state.projectSn}).then((res)=>{
console.log('标段名',res)
this.projectfNameList = res.result
})
},
Refresh(){
nodeName: this.nodeName = ''
this.pageNo = 1
@ -337,6 +361,7 @@ export default {
if(valid){
let data = this.dialogdata
data.projectSn = this.projectSn
data.bidSectionId = this.dialogdata.projectfName
console.log(data)
if(this.formType == 1){
addPanoramaNodePlan(data).then(res=>{