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

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
成润项目页面bug

See merge request !164
This commit is contained in:
袁晶琳 2023-05-15 17:58:20 +08:00
commit 6c48e5d249
18 changed files with 73 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/doc/h52/index.html
View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>过磅预约</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.48293eda.js></script><script src=./static/js/index.6b4b2665.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.48293eda.js></script><script src=./static/js/index.c066cd70.js></script></body></html>

2
public/doc/h52/static/js/index.6b4b2665.js → public/doc/h52/static/js/index.c066cd70.js
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-index.085fc621.js
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-index.9de11076.js Normal file
View File

File diff suppressed because one or more lines are too long

1
src/assets/js/api/equipmentCenter/electricBox.js
View File

@ -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); // 查询 所有整改人员

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

@ -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: 河南

24
src/views/companyAdmin/bigScreen/rightMenu.vue
View File

@ -5,7 +5,7 @@
<div class="list-item" v-if="pageType == 1">
<div class="item-content">
<div class="item-title"><span></span>智能监测</div>
<div class="item-detail">
<div>
<ul class="monitor-list">
<li v-for="(item,index) in statisticsDevCount" :key="index">
<p><b>{{item.devOnline}}</b>/{{item.devNum}}</p>
@ -19,9 +19,9 @@
<div class="list-item" v-if="pageType == 1">
<div class="item-content">
<div class="item-title"><span></span>巡检情况</div>
<div class="item-detail">
<div class="condition-title">检查总数<span>208</span></div>
<div ref="echart1" style="width:100%; height:148px"></div>
<div class="item-detail">暂无数据
<!-- <div class="condition-title">检查总数<span>208</span></div>
<div ref="echart1" style="width:100%; height:148px"></div> -->
</div>
</div>
</div>
@ -29,8 +29,8 @@
<div class="list-item" v-if="pageType == 1">
<div class="item-content">
<div class="item-title"><span></span>累计预警工程排行</div>
<div class="item-detail">
<div ref="echart2" style="width:100%; height:177px"></div>
<div class="item-detail">暂无数据
<!-- <div ref="echart2" style="width:100%; height:177px"></div> -->
</div>
</div>
</div>
@ -723,6 +723,18 @@ export default {
box-sizing: border-box;
padding-bottom: 6px;
}
.item-detail:nth-child(2){
line-height: 180px;
text-align: center;
width: 100%;
height:180px;
}
.item-detail:nth-child(3){
line-height: 180px;
text-align: center;
width: 100%;
height:180px;
}
.monitor-list{
display: flex;
flex-wrap: wrap;

9
src/views/equipmentCenter/electricBox/deviceManage.vue
View File

@ -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;

7
src/views/projectFront/configManage/roleManage.vue
View File

@ -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) => {

2
src/views/projectFront/electricBox/deviceManage.vue
View File

@ -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);
},

5
src/views/projectFront/examination/test.vue
View File

@ -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

2
src/views/projectFront/projectSummary/panoramaPlan.vue
View File

@ -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){

6
src/views/projectFront/quality/material/forwardingUnit.vue
View File

@ -124,7 +124,7 @@ export default {
downloadData: {}, //下载数据
tableList: [],
pageNo: 1,
pageSize: -1,
pageSize:10,
total: 0,
dialogVisibleAdd: false,
dialogVisibleEdit: false,
@ -293,8 +293,8 @@ export default {
},
//查看条数
handleSizeChange(val) {
this.pageNo = val
this.pageSize = 10
this.pageNo = 1
this.pageSize = val
this.getListData()
},
//查看页

6
src/views/projectFront/quality/material/makeAnAppointment.vue
View File

@ -177,7 +177,7 @@ export default {
downloadData: {}, //下载数据
tableList: [],
pageNo: 1,
pageSize: -1,
pageSize: 10,
total: 0,
dialogVisibleAdd: false,
dialogVisibleEdit: false,
@ -254,8 +254,8 @@ export default {
},
//查看条数
handleSizeChange(val) {
this.pageNo = val
this.pageSize = 10
this.pageNo = 1
this.pageSize = val
this.getListData()
},
//查看页

6
src/views/projectFront/quality/material/receivingUnit.vue
View File

@ -124,7 +124,7 @@ export default {
downloadData: {}, //下载数据
tableList: [],
pageNo: 1,
pageSize: -1,
pageSize:10,
total: 0,
dialogVisibleAdd: false,
dialogVisibleEdit: false,
@ -290,8 +290,8 @@ export default {
},
//查看条数
handleSizeChange(val) {
this.pageNo = val
this.pageSize = 10
this.pageNo = 1
this.pageSize = val
this.getListData()
},
//查看页

6
src/views/projectFront/quality/material/tradeName.vue
View File

@ -119,7 +119,7 @@ export default {
downloadData: {}, //下载数据
tableList: [],
pageNo: 1,
pageSize: -1,
pageSize: 10,
total: 0,
dialogVisibleAdd: false,
dialogVisibleEdit: false,
@ -280,8 +280,8 @@ export default {
},
//查看条数
handleSizeChange(val) {
this.pageNo = val
this.pageSize = 10
this.pageNo = 1
this.pageSize = val
this.getListData()
},
//查看页

14
src/views/projectFront/quality/material/weighInfo.vue
View File

@ -21,11 +21,11 @@
<el-table-column prop="goodsName" label="货名" align="center"></el-table-column>
<el-table-column prop="specifications" label="规格" align="center"></el-table-column>
<el-table-column prop="reserve" label="备注 " align="center"></el-table-column>
<el-table-column prop="tare" label="毛重" align="center"></el-table-column>
<el-table-column prop="grossWeight" label="皮重" align="center"></el-table-column>
<el-table-column prop="grossWeight" label="毛重" align="center"></el-table-column>
<el-table-column prop="tare" label="皮重" align="center"></el-table-column>
<el-table-column prop="netWeight" label="净重" align="center"></el-table-column>
<el-table-column prop="tareTime" width="200px" label="毛重时间" align="center"></el-table-column>
<el-table-column prop="grossTime" width="200px" label="皮重时间" align="center"></el-table-column>
<el-table-column prop="grossTime" width="200px" label="毛重时间" align="center"></el-table-column>
<el-table-column prop="tareTime" width="200px" label="皮重时间" align="center"></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns">
@ -105,7 +105,7 @@ export default {
downloadData: {}, //下载数据
tableList: [],
pageNo: 1,
pageSize: -1,
pageSize:10,
total: 0,
dialogVisiblePhone: false,
phoneList: [],
@ -170,8 +170,8 @@ export default {
},
//查看条数
handleSizeChange(val) {
this.pageNo = val
this.pageSize = 10
this.pageNo = 1
this.pageSize = val
this.getListData()
},
//查看页

19
src/views/projectFront/qualitySpringback/electronicPouringOrder.vue
View File

@ -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;