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

flx：提交绿色施工页面

Browse Source
This commit is contained in:
X_Rian 2024-08-26 10:42:55 +08:00
parent 2649736345
commit b89598407b
10 changed files with 784 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/assets/js/api/carManage.js
View File

@ -1,7 +1,7 @@
/**
* api接口统一管理
*/
import {post, get} from '../http'
import { post, get } from '../http'
//车辆进出闸门信息
export const addCarPassGateApi = data => post('xmgl/carPassGate/add', data);
@ -14,7 +14,7 @@ export const getCarPassGateListApi = data => post('xmgl/carPassGate/selectCarPas
export const addCarCameraApi = data => post('xmgl/carCamera/add', data);
export const editCarCameraApi = data => post('xmgl/carCamera/edit', data);
export const deleteCarCameraApi = data => post('xmgl/carCamera/delete', data);
export const getCarCameraListApi = data => post('xmgl/carCamera/list', data,'false');
export const getCarCameraListApi = data => post('xmgl/carCamera/list', data, 'false');
//车辆黑白名单管理信息
@ -31,19 +31,19 @@ export const getcarTypeListApi = data => post('xmgl/carType/list', data);
//车辆数据统计
export const getCarPassRecordStatistics = data => post('xmgl/carPassRecord/getCarPassRecordStatistics', data,'false');//车辆通行记录统计
export const getCarPassRecordStatistics = data => post('xmgl/carPassRecord/getCarPassRecordStatistics', data, 'false'); //车辆通行记录统计
// export const openGate = data => post('xmgl/carPassGate/openGate', data);//车辆进出闸门开闸操作
export const openGate = data => post('xmgl/carCamera/openGate', data);//车辆进出闸门开闸操作
export const openGate = data => post('xmgl/carCamera/openGate', data); //车辆进出闸门开闸操作
export const selectCarStatisticsNumApi = data => post('xmgl/carInfo/countCarModuleType', data);//根据车辆统计数量
export const selectCarStatisticsRecordApi = data => get('xmgl/carPassRecord/getTodayOutInNumber', data);//根据车辆统计数据
export const selectCarStatisticsByCameraIdApi = data => post('xmgl/carCamera/selectCarStatisticsByCameraId', data);//根据车辆相机统计数据
export const selectCarPassRecordInOutCountApi = data => post('xmgl/carPassRecord/selectCarPassRecordInOutCount', data);//24小时进出时间段统计
export const getCarPassRecordListApi = data => post('xmgl/carPassRecord/getCarPassRecordList', data);//查询当日车辆通行记录列表
export const selectCarStatisticsNumApi = data => post('xmgl/carInfo/countCarModuleType', data); //根据车辆统计数量
export const selectCarStatisticsRecordApi = data => get('xmgl/carPassRecord/getTodayOutInNumber', data); //根据车辆统计数据
export const selectCarStatisticsByCameraIdApi = data => post('xmgl/carCamera/selectCarStatisticsByCameraId', data); //根据车辆相机统计数据
export const selectCarPassRecordInOutCountApi = data => post('xmgl/carPassRecord/selectCarPassRecordInOutCount', data); //24小时进出时间段统计
export const getCarPassRecordListApi = data => post('xmgl/carPassRecord/getCarPassRecordList', data); //查询当日车辆通行记录列表
export const getCarPassRecordListByPageApi = data => post('xmgl/carPassRecord/list', data);//分页列表查询车辆通行记录信息
export const pullCarDataApi = data => post('xmgl/hikvision/getCrossRecords', data);//同步车辆通行数据
export const getCarPassRecordListByPageApi = data => post('xmgl/carPassRecord/list', data); //分页列表查询车辆通行记录信息
export const pullCarDataApi = data => post('xmgl/hikvision/getCrossRecords', data); //同步车辆通行数据
@ -64,7 +64,7 @@ export const selectCarPassPageApi = data => post('xmgl/carPassRecord/selectCarPa
//车牌识别统计
export const selectCarTotal = data => post('/xmgl/carPassRecord/getCarPassRecordList',data);
export const selectCarTotal = data => post('/xmgl/carPassRecord/getCarPassRecordList', data);
@ -100,4 +100,14 @@ export const deleteBatchVehiclePositionFence = data => post('xmgl/vehiclePositio
export const getFenceTypeTotal = data => post('xmgl/vehiclePositionDev/countVehiclePositionDev', data);
// 查询车辆日行数据
export const getVehiclePositionDayRecord = data => get('xmgl/vehiclePositionDayRecord/list', data);
export const getVehiclePositionDayRecord = data => get('xmgl/vehiclePositionDayRecord/list', data);
// 车辆违规监测
// 分页列表查询车辆违规监测信息
export const getVehicleViolationInfo = data => get('xmgl/vehicleViolationMonitor/page', data);
// 添加车辆违规监测信息
export const addVehicleViolationInfo = data => post('xmgl/vehicleViolationMonitor/add', data);
// 编辑车辆违规监测信息
export const editVehicleViolationInfo = data => post('xmgl/vehicleViolationMonitor/edit', data);
// 删除车辆违规监测信息
export const deleteVehicleViolationInfo = data => post('xmgl/vehicleViolationMonitor/delete', data);

14
src/assets/js/api/greenConstructionManage.js Normal file
View File

@ -0,0 +1,14 @@
/**
* api接口统一管理
*/
import { post, get } from '../http'
// 绿色施工方案管理
// 分页列表查询绿色施工方案管理信息
export const getGreenConstructionManageInfo = data => get('xmgl/greenConstructionScheme/page', data);
// 添加绿色施工方案管理信息
export const addGreenConstructionManageInfo = data => post('xmgl/greenConstructionScheme/add', data);
// 编辑绿色施工方案管理信息
export const editGreenConstructionManageInfo = data => post('xmgl/greenConstructionScheme/edit', data);
// 删除绿色施工方案管理信息
export const deleteGreenConstructionManageInfo = data => post('xmgl/greenConstructionScheme/delete', data);

31
src/router/index.js
View File

@ -683,9 +683,23 @@ const routes2 = [{
import ("@/views/projectFront/operationManage/confinedSpaceWorks.vue"),
},
// 作业管理--起重吊装作业
// {
// path: "/project/operationManage/liftingErectionWorks",
// name: "作业管理_起重吊装作业",
// component: () =>
// import ("@/views/projectFront/operationManage/liftingErectionWorks.vue"),
// },
// // 作业管理--土建工程作业
// {
// path: "/project/operationManage/buildingProjectWorks",
// name: "作业管理_土建工程作业",
// component: () =>
// import ("@/views/projectFront/operationManage/buildingProjectWorks.vue"),
// },
// 作业管理--无损作业
{
path: "/project/operationManage/liftingErectionWorks",
name: "作业管理_起重吊装作业",
name: "作业管理_无损作业",
component: () =>
import ("@/views/projectFront/operationManage/liftingErectionWorks.vue"),
},
@ -1177,6 +1191,21 @@ const routes2 = [{
component: (resolve) =>
require(["@/views/projectFront/carManage/carStatictis.vue"], resolve),
},
{
path: "/project/carManage/violationDetection",
name: "车辆管理_车辆违规检测",
component: (resolve) =>
require(["@/views/projectFront/carManage/violationDetection.vue"], resolve),
},
// 绿色施工管理
// 绿色施工方案管理
{
path: "/project/greenConstructionManage/schemeManage",
name: "绿色施工管理_绿色施工方案管理",
component: (resolve) =>
require(["@/views/projectFront/greenConstructionManage/schemeManage.vue"], resolve),
},
{
path: "/project/carManage/carWashDevManage",
name: "车辆冲洗_设备管理1",

4
src/views/projectAdmin/dataBoard/index.vue
View File

@ -41,7 +41,7 @@
</div>
<video
v-if="projectData.videoUrl && optionListIndex == 1"
:src="$store.state.FILEURL + projectData.videoUrl"
:src="projectData.videoUrl.includes('http://') ? projectData.videoUrl : $store.state.FILEURL + projectData.videoUrl"
class="topInner videos"
autoplay
controls
@ -77,7 +77,7 @@
margin-top: 20px;
height: 345px;
"
:src="fileUrl + imgUrl"
:src="imgUrl.includes('http://') ? imgUrl : fileUrl + imgUrl"
alt=""
/>
<!-- <img style="width: 686px;;margin-left: 113px;margin-top: 16px;height: 430px" src="@/assets/images/aa5cd03a486a3faaeb9cf4b8d06405e.png" alt="">-->

905
src/views/projectFront/buildEquipToolManage/equipmentManage.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/projectFront/constructionManage/schemeLedger.vue
View File

@ -268,7 +268,7 @@
</div>
<div style="width: 100%">
<el-table max-height="450" :data="personnelList">
<el-table-column prop="realName" label="部门或成员" align="center">
<el-table-column prop="realName" label="姓名" align="center">
<template slot-scope="scope">
<div style="display: flex; justify-content: center; align-items: center;">
<!-- <el-avatar size="small" icon="el-icon-user-solid"></el-avatar> -->
@ -762,7 +762,7 @@ export default {
console.log(every);
// this.previewUrl = every ? `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${src}` : row.schemeAttachment[0].url;
let src = row.schemeAttachment[0].url;
this.previewUrl = every ? `https://view.xdocin.com/view?src=${encodeURIComponent(src)}` : row.schemeAttachment[0].url;
this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : row.schemeAttachment[0].url;
console.log(this.previewUrl);
// https://view.xdocin.com/view?src=${encodeURIComponent(src)};
// http://42.180.188.17:9809/image/665e7d0dbe74b65b6b7c0619.docx

2
src/views/projectFront/firstModelManage/firstModelLedger.vue
View File

@ -525,7 +525,7 @@ export default {
});
console.log(every);
let src = row.url.includes('http://') ? row.url : this.$store.state.FILEURL + row.url;
this.previewUrl = every ? `https://view.xdocin.com/view?src=${encodeURIComponent(src)}` : src;
this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : src;
console.log(this.previewUrl);
this.cardDialog = true;
},

6
src/views/projectFront/operationManage/fireWorks.vue
View File

@ -538,7 +538,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="cardForm.level == 2" label="安质环部安全经理批准人" prop="epcSiteManagerReviewer">
<el-select filterable v-model="cardForm.epcSiteManagerReviewer"
<el-select filterable v-model="cardForm.safetyQualityEnvironmentDepartmentManager"
:placeholder="$t('message.personnelPosition.please_select')" filterable>
<el-option :label="item.workerName" :value="item.id" v-for="(item, index) in workerListOptions"
:key="index">
@ -946,7 +946,7 @@
{{ workDetail.projectConstructionManagerName }}
</el-form-item>
<el-form-item v-if="workDetail.level == 2" label="安质环部安全经理批准人：" :label-width="formLabelWidthDetail">
{{ workDetail.epcSiteManagerReviewerName }}
{{ workDetail.safetyQualityEnvironmentDepartmentManagerName }}
</el-form-item>
<el-form-item v-if="workDetail.level == 3" label="承包商施工经理审核人：" :label-width="formLabelWidthDetail">
{{ workDetail.contractorConstructionManagerReviewerName }}
@ -1929,7 +1929,7 @@ export default {
hotFireArea: "",
hotFireContent: "",
number: "",
level: 1,
level: -1,
applicant1: "",
applicant2: "",
guardian1: "",

2
src/views/projectFront/operationManage/liftingErectionWorks.vue
View File

@ -592,7 +592,7 @@
{{ workDetail.safetyEngineerTimeOfSupervisionUnit }}
</el-form-item>
<el-form-item label="总监/总代：" :label-width="formLabelWidthDetail">
{{ workDetail.directorGeneralAgent }}
{{ workDetail.directorGeneralAgentName }}
</el-form-item>
<el-form-item label="总监/总代时间：" :label-width="formLabelWidthDetail">
{{ workDetail.directorGeneralAgentTime }}

4
src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue
View File

@ -95,7 +95,7 @@
scope.row.controlPoint
}}</template>
</el-table-column>
<el-table-column align="center" prop="commonDiseasePreventionMethodPicture" label="通病防治做法图片">
<el-table-column align="center" prop="commonDiseasePreventionMethodPicture" label="整改结果">
<template slot-scope="scope">
<div style="display: flex; align-items: center; justify-content:center">
<!-- <img style="width: 100%; height: 100%" :src="require(@/assets/images/image-pre.png)" alt=""> -->
@ -132,7 +132,7 @@
</div>
<!-- 添加卡片弹框 -->
<el-dialog :destroy-on-close="true" :modal-append-to-body="false" :title="cardDialogTitle"
:visible.sync="cardDialog" width="1100px" :before-close="handleClose">
:visible.sync="cardDialog" width="600px" :before-close="handleClose">
<div class="dialog_content">
<el-form size="medium" :model="cardForm" ref="cardForm" :rules="cardFormRules" label-width="170px"
class="dialogFormBox">