From 254778bb136594a4666aeb2742358c45d426cfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 10 Oct 2022 16:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF(=E5=85=A8=E6=99=AF=E8=AE=A1=E5=88=92,=E6=A0=87?=
 =?UTF-8?q?=E6=AE=B5=E8=AE=A1=E5=88=92):=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/projectSummary.js           |  3 ++-
 src/assets/js/http.js                         |  4 +--
 .../projectSummary/buildingPlan.vue           | 17 ++++++------
 .../projectSummary/panoramaPlan.vue           | 27 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/assets/js/api/projectSummary.js b/src/assets/js/api/projectSummary.js
index 0853f295..388bf6ff 100644
--- a/src/assets/js/api/projectSummary.js
+++ b/src/assets/js/api/projectSummary.js
@@ -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查询
\ No newline at end of file
+export const queryByIdPanoramaNodePlan = data => post('xmgl/progressPanoramaNodePlan/queryById', data); //根据id查询
+export const getprojectfNameListApi = data => post('/xmgl/progressPlanBidSection/selectProgressPlanBidSectionList', data); //获取所有的标段名称
\ No newline at end of file
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index a24a8d7c..0c074036 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -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/'; //
diff --git a/src/views/projectFront/projectSummary/buildingPlan.vue b/src/views/projectFront/projectSummary/buildingPlan.vue
index 6ef2fa7d..03f93fe9 100644
--- a/src/views/projectFront/projectSummary/buildingPlan.vue
+++ b/src/views/projectFront/projectSummary/buildingPlan.vue
@@ -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()
diff --git a/src/views/projectFront/projectSummary/panoramaPlan.vue b/src/views/projectFront/projectSummary/panoramaPlan.vue
index f0ff3fcb..3368612a 100644
--- a/src/views/projectFront/projectSummary/panoramaPlan.vue
+++ b/src/views/projectFront/projectSummary/panoramaPlan.vue
@@ -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=>{