From 0f6b5c0c11a8cf998598489b9743d0fb65fac147 Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Mon, 15 May 2023 17:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=B6=A6=E9=A1=B5=E9=9D=A2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/api/equipmentCenter/electricBox.js     |  1 +
 src/assets/js/http.js                         |  4 ++--
 .../electricBox/deviceManage.vue              |  9 +++++----
 src/views/projectAdmin/zjsj/command/index.vue |  2 +-
 .../projectFront/configManage/roleManage.vue  |  7 +++++--
 .../projectFront/electricBox/deviceManage.vue |  2 +-
 src/views/projectFront/examination/test.vue   |  5 +++--
 .../projectSummary/panoramaPlan.vue           |  2 +-
 .../electronicPouringOrder.vue                | 19 +++++++++++++++----
 9 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/assets/js/api/equipmentCenter/electricBox.js b/src/assets/js/api/equipmentCenter/electricBox.js
index d9071145..76d4327c 100644
--- a/src/assets/js/api/equipmentCenter/electricBox.js
+++ b/src/assets/js/api/equipmentCenter/electricBox.js
@@ -22,3 +22,4 @@ export const aiAnalyseHardWareRecordList = data => post('xmgl/aiAnalyseHardWareR
 
 //分页列表查询AI分析硬件设备报警记录信息
 export const aiAnalyseHardWareAlarmRecordApi = data => post('xmgl/aiAnalyseHardWareAlarmRecord/selectPageList', data);
+export const getCrewListDataApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); // 查询 所有整改人员
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index e2d10636..81f2997d 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -87,7 +87,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
-  axios.defaults.baseURL = 'http://182.90.224.147:15551'//港投(成润)项目线上
+  axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
 } else if (process.env.NODE_ENV == 'production') {
@@ -96,7 +96,7 @@ if (process.env.NODE_ENV == 'development') {
   axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
   // axios.defaults.baseURL ='http://192.168.34.216:6023/'
   // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
-  // axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
+  // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
 }
 
 // tag: 河南
diff --git a/src/views/equipmentCenter/electricBox/deviceManage.vue b/src/views/equipmentCenter/electricBox/deviceManage.vue
index 2792fe88..38a5a2ad 100644
--- a/src/views/equipmentCenter/electricBox/deviceManage.vue
+++ b/src/views/equipmentCenter/electricBox/deviceManage.vue
@@ -168,9 +168,9 @@
             >
               <el-option
                 v-for="item in options"
-                :key="item.id"
+                :key="item.userId"
                 :label="item.workerName"
-                :value="item.id"
+                :value="item.userId"
               >
               </el-option>
             </el-select>
@@ -202,7 +202,8 @@ import {
   electricalDevEdit,
   electricalDevDelete,
   electricalDevList,
-  getLaborManagementInfoList
+  getLaborManagementInfoList,
+  getCrewListDataApi
 } from '../../../assets/js/api/equipmentCenter/electricBox'
 
 export default {
@@ -332,7 +333,7 @@ export default {
       })
     },
     getLaborManagementList() {
-      getLaborManagementInfoList({ projectSn: this.$store.state.projectSn, workerName: '' }).then(result => {
+      getCrewListDataApi({ projectSn: this.$store.state.projectSn, workerName: '' }).then(result => {
         if (result.success) {
           console.log('劳务人员', result);
           this.options = result.result;
diff --git a/src/views/projectAdmin/zjsj/command/index.vue b/src/views/projectAdmin/zjsj/command/index.vue
index 3f49b3f8..f41379f4 100644
--- a/src/views/projectAdmin/zjsj/command/index.vue
+++ b/src/views/projectAdmin/zjsj/command/index.vue
@@ -39,7 +39,7 @@
 <script>
 import LeftOne from './leftOne'
 import LeftTwo from './leftTwo'
-import LeftThree from './leftThree'
+import LeftThree from './LeftThree'
 import LeftFour from './leftFour'
 import Center from './center'
 import CenterBOne from './centerBOne'
diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue
index d9bb6324..bd31050c 100644
--- a/src/views/projectFront/configManage/roleManage.vue
+++ b/src/views/projectFront/configManage/roleManage.vue
@@ -293,7 +293,9 @@ export default {
     //获取角色配置的菜单
     getRoleMenu() {
       console.log(this.addEditForm.roleId);
-      getRoleBaseMenuListApi({ roleId: this.addEditForm.roleId }).then(res => {
+      getRoleBaseMenuListApi({ roleId: this.addEditForm.roleId,
+      
+      }).then(res => {
         var arr = res.result;
         // var arr2 = [];
         console.log(arr);
@@ -344,7 +346,8 @@ export default {
     //获取项目下模块及菜单
     getProjectMenu() {
       getProjectModuleGroupMenuListApi({
-        projectSn: this.$store.state.projectSn
+        projectSn: this.$store.state.projectSn,
+        moduleTypes:'2,4',
       }).then(res => {
         var DATA = res.result;
         // DATA.forEach((element,i) => {
diff --git a/src/views/projectFront/electricBox/deviceManage.vue b/src/views/projectFront/electricBox/deviceManage.vue
index cdf5fdfb..8e027186 100644
--- a/src/views/projectFront/electricBox/deviceManage.vue
+++ b/src/views/projectFront/electricBox/deviceManage.vue
@@ -305,7 +305,7 @@ import {
                 console.log('编辑', obj);
                 this.addEditForm = JSON.parse(JSON.stringify(obj));
                 if (typeof obj.alarmPushWorkerId === 'string' && obj.alarmPushWorkerId != '') {
-                    this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId.split(',').map(Number);
+                    this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId.split(',')
                 }
                 this.handle('edit', true);
             },
diff --git a/src/views/projectFront/examination/test.vue b/src/views/projectFront/examination/test.vue
index 46487d83..350b771b 100644
--- a/src/views/projectFront/examination/test.vue
+++ b/src/views/projectFront/examination/test.vue
@@ -36,14 +36,15 @@
           </el-checkbox-group>
 
           <!-- 单选 -->
-          <el-radio-group oup class="optionsBox" v-model="radio" v-else>
+          <el-radio-group   v-for="(data, index2) in item.optionList"    v-model="index2"  class="optionsBox">
             <el-radio
+         
               @change="
                 (e) => {
                   changeChecked(e, item.questionId, index)
                 }
               "
-              v-for="(data, index2) in item.optionList"
+            
               :key="data.optionId"
               :label="data.optionId"
               >{{ indexList[index2] }}、{{ data.optionName }}</el-radio
diff --git a/src/views/projectFront/projectSummary/panoramaPlan.vue b/src/views/projectFront/projectSummary/panoramaPlan.vue
index 93a175ae..55451b33 100644
--- a/src/views/projectFront/projectSummary/panoramaPlan.vue
+++ b/src/views/projectFront/projectSummary/panoramaPlan.vue
@@ -348,7 +348,7 @@ export default {
                 projectSn: this.projectSn,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
-                bidSectionId:this.alarmType
+                bidSectionId:this.alarmType,
             }
             queryPanoramaNodePlan(data).then(res=>{
                 if(res.code == 200){
diff --git a/src/views/projectFront/qualitySpringback/electronicPouringOrder.vue b/src/views/projectFront/qualitySpringback/electronicPouringOrder.vue
index 8f88f193..835c71ca 100644
--- a/src/views/projectFront/qualitySpringback/electronicPouringOrder.vue
+++ b/src/views/projectFront/qualitySpringback/electronicPouringOrder.vue
@@ -354,6 +354,9 @@ export default {
   },
   created() {
     this.getListData();
+    this.loadBuildData();
+
+    
   },
   methods: {
     editTinfo() {
@@ -365,6 +368,7 @@ export default {
       this.buildList.forEach((element) => {
         if (element.id == this.editForm.buildId) {
           this.floorList = element.floorList;
+          console.log('this.floorList------',this.floorList);
           this.editForm.floorId = "";
           return;
         }
@@ -393,9 +397,16 @@ export default {
       this.editDialog = true;
       this.$nextTick(() => {
         this.$refs["editForm"].resetFields();
-        this.editForm = {}
+        // this.editForm = {}
+        this.editForm.buildId=''
+        this.editForm.floorId=''
+        this.editForm.concreteTab=''
+        this.editForm.subpackage=''
+        this.editForm.mixingPlant=''
+        this.editForm.designStrength=''
+        this.editForm.pourTime=''
+        this.editForm.planVolume=''
       });
-      this.loadBuildData();
     },
     deleteFn(item) {
       this.$confirm(
@@ -445,7 +456,7 @@ export default {
       });
       if(item.designStrength){
         if(item.designStrength.indexOf(',')){
-          this.editForm.designStrength=item.designStrength.split(',')
+          this.editForm.designStrength=item.designStrength?item.designStrength.split(','):''
         }else{
           this.editForm.designStrength=[item.designStrength]
         }
@@ -456,7 +467,7 @@ export default {
         if (valid) {
           var json = JSON.parse(JSON.stringify(this.editForm))
           console.log(this.editForm)
-          json.designStrength=this.editForm.designStrength.join(',')
+          json.designStrength=this.editForm.designStrength?this.editForm.designStrength.join(','):''
           if (this.isAdd) {
             addElectronPourOrderApi(json).then((res) => {
               this.editDialog = false;