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

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-11 02:53:58 +08:00
commit 8feee43963
16 changed files with 211 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/i18n/langs/cn/carManage/carManage.js
View File

@ -36,7 +36,7 @@ export default {
reserveEndTime: '预约结束时间',
entryAndExitPermit: '允许进出次数',
carType2: '车型',
carTypeArr: ['渣土车辆', '外来车辆', '工作车辆'],//1渣土车辆，2外来车辆，3工作车辆
carTypeArr: ['渣土车辆', '临时车辆', '工作车辆'],//1渣土车辆，2临时车辆，3工作车辆
// createTime: '创建时间',
driverName: '司机姓名',
driverTelephone: '司机电话',

1
src/assets/i18n/langs/cn/dangerousBigProject/index.js
View File

@ -12,6 +12,7 @@ export default {
subpackageUnit: '分包单位',
buildSchedule: '施工进度',
safeStatus: '安全状态',
finalAcceptanceStatus: '最终验收状态',
item: '条',
nothing: '无',
record: '记录于',

2
src/assets/i18n/langs/cn/laborManage/personnelOverview.js
View File

@ -21,7 +21,7 @@ export default {
specialOperation: '特种作业人员',
generalOperator: '一般作业人员',
outsourcedEmployee: '外包工',
lwWorker:'劳务工',
lwWorker:'施工人员',
dayLaborer: '临时工',
registeredNumber: '在册人数',
presentNumber: '在场人数',

2
src/assets/i18n/langs/en/carManage/carManage.js
View File

@ -6,7 +6,7 @@ export default {
carNumber: 'license plate number',
carPhotosUrl: 'Vehicle images',
carType: 'vehicle type',
carTypeArr: ['Residue in the vehicle', 'foreign vehicle', 'operational vehicle'],//1渣土车辆，2外来车辆，3工作车辆
carTypeArr: ['Residue in the vehicle', 'foreign vehicle', 'operational vehicle'],//1渣土车辆，2临时车辆，3工作车辆
// createTime: '创建时间',
driverName: 'DriverName',
driverTelephone: 'The driver phone',

7
src/assets/js/api/dangerousBigProject.js
View File

@ -72,8 +72,12 @@ export const selectDangerousEngineeringProgressRecordApi = data => post('xmgl/da
export const selectDangerousEngineeringSideStationApi = data => post('xmgl/dangerousEngineeringSideStation/selectList', data);
// 分页列表查询危大工程-验收记录信息
export const selectDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/dangerousEngineeringAcceptanceCheck/selectlist', data);
// 分页列表查询危大工程-最终验收记录信息
export const selectFinalDangerousEngineeringAcceptanceCheckApi = data => get('xmgl/xzDangerousEngineeringAcceptance/list', data);
export const deleteFinalDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/xzDangerousEngineeringAcceptance/delete', data);
// 分页列表查询隐患检查记录信息
export const selectHiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/list', data);
export const selectFinalHiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/list', data);
// 删除危大工程-验收记录信息
export const deleteDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/dangerousEngineeringAcceptanceCheck/delete', data);
// 删除现场危大工程-进度记录信息
@ -81,4 +85,5 @@ export const deleteDangerousEngineeringProgressRecordApi = data => post('xmgl/da
// 删除危大工程-旁站记录信息
export const deleteDangerousEngineeringSideStationApi = data => post('xmgl/dangerousEngineeringSideStation/delete', data);
// 删除隐患记录
export const deletehiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/delete', data);
export const deletehiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/delete', data);
export const deleteFinlahiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/delete', data);

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

@ -84,9 +84,9 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目

6
src/store/index.js
View File

@ -48,9 +48,9 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄
FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄
WORKFLOWURL: 'http://localhost:88/#/workspace/forms',//测试工作流地址(本地)
// UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
// FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试

1
src/views/projectFront/aiAnalysis/warningList.vue
View File

@ -67,6 +67,7 @@
v-model="dateRangeArr"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
:range-separator="$t('message.sixComplete.to')"
:start-placeholder="$t('message.sixComplete.start')"
:end-placeholder="$t('message.sixComplete.end')"

12
src/views/projectFront/carManage/carManage.vue
View File

@ -175,13 +175,13 @@
<el-table-column
prop="carModuleType"
align="center"
label="固定/长期/外来车辆"
label="固定/长期/临时车辆"
width="150"
>
<template slot-scope="scope">
<span v-if="scope.row.carModuleType === 1">固定车辆</span>
<span v-else-if="scope.row.carModuleType === 2">长期车辆</span>
<span v-else>外来车辆</span>
<span v-else>临时车辆</span>
</template>
</el-table-column>
@ -469,7 +469,7 @@
<el-radio-group v-model="addEditForm.carModuleType">
<el-radio :label="1">固定车辆</el-radio>
<el-radio :label="2">长期车辆</el-radio>
<el-radio :label="3">外来车辆</el-radio>
<el-radio :label="3">临时车辆</el-radio>
</el-radio-group>
</el-form-item>
@ -898,7 +898,7 @@
<div>司机电话：</div>
<div>是否黑名单：</div>
<div>车辆图片：</div>
<div>固定/长期/外来车辆：</div>
<div>固定/长期/临时车辆：</div>
<div>预约时间：</div>
<div>允许进出次数：</div>
<div>车辆下发状态：</div>
@ -966,10 +966,10 @@
</el-col>
<el-col :span="12">
<div class="grid-content">
<span class="label">固定/长期/外来车辆：</span>
<span class="label">固定/长期/临时车辆：</span>
<span class="value" v-if="entityDetail.carModuleType === 1">固定车辆</span>
<span class="value" v-else-if="entityDetail.carModuleType === 2">长期车辆</span>
<span class="value" v-else>外来车辆</span>
<span class="value" v-else>临时车辆</span>
</div>
</el-col>
</el-row>

42
src/views/projectFront/dangerousBigProject/addPlan.vue
View File

@ -51,7 +51,7 @@
<el-input v-model="addForm.constructionLocation" :disabled="isDisabled" placeholder="请输入施工部位" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="施工时间：" required :label-width="formLabelWidth">
<!-- <el-form-item label="施工时间：" required :label-width="formLabelWidth">
<el-date-picker
:disabled="isDisabled"
v-model="addForm.buildTime"
@ -62,7 +62,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="施工计划" :label-width="formLabelWidth">
<el-input v-model="addForm.people" :disabled="isDisabled" placeholder="请输入施工计划" autocomplete="off"></el-input>
@ -81,19 +81,6 @@
</el-date-picker>
</el-form-item>
<el-form-item label="责任人：" required :label-width="formLabelWidth">
<!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
<el-select v-model="addForm.personLiableId" placeholder="请选择责任人">
<el-option
:label="item.realName"
:value="item.userId"
v-for="(item, index) in personList"
:key="index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="责任分包单位：" required :label-width="formLabelWidth">
<!-- <el-cascader
:disabled="isDisabled"
@ -113,7 +100,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="责任人：" required :label-width="formLabelWidth">
<!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
<el-select v-model="addForm.personLiableId" placeholder="请选择责任人">
<el-option
:label="item.realName"
:value="item.userId"
v-for="(item, index) in personList"
:key="index"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="control-point" v-if="company != 'longguang'">
@ -676,10 +674,10 @@ export default {
this.$message.error('请输入施工部位！')
return;
}
if(!this.addForm.buildTime){
this.$message.error('请选择施工时间！')
return;
}
// if(!this.addForm.buildTime){
// this.$message.error('请选择施工时间！')
// return;
// }
if(!this.addForm.responsibilityCompanyId){
this.$message.error('请选择责任分包单位！')
return;
@ -697,8 +695,8 @@ export default {
personLiableId,
engineeringTypeId,
engineeringTypeName,
buildStartTime: this.addForm.buildTime[0],
buildEndTime: this.addForm.buildTime[1],
// buildStartTime: this.addForm.buildTime[0],
// buildEndTime: this.addForm.buildTime[1],
planStartTime: this.addForm.planTime[0] ? this.addForm.planTime[0]:'',
planEndTime: this.addForm.planTime[1] ? this.addForm.planTime[1]:'',
// typeDescribeId: this.addForm.typeDescribeId.join(','),

150
src/views/projectFront/dangerousBigProject/detail.vue
View File

@ -13,7 +13,7 @@
</div>
</div>
<div v-permission="{key: 'wdgc_end', menuPath: '/project/dangerousBigProject/parameter'}" class="close-task">
<el-button
<!-- <el-button
type="primary"
size="medium"
v-if="detailData.isEnd == 0"
@ -26,7 +26,7 @@
size="medium"
disabled
>危大工程已结束</el-button
>
> -->
<!-- <span v-else>危大工程已结束</span> -->
</div>
<div class="info-content">
@ -85,7 +85,7 @@
></el-input>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="施工时间："
required
:label-width="formLabelWidth"
@ -101,7 +101,7 @@
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
</el-form-item> -->
<el-form-item
label="计划时间："
@ -120,15 +120,6 @@
</el-date-picker>
</el-form-item>
<el-form-item label="责任人：" :label-width="formLabelWidth">
<el-input
v-model="detailData.personLiable"
:disabled="isDisabled"
placeholder="请输入责任人"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item
label="责任分包单位："
:label-width="formLabelWidth"
@ -156,6 +147,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="责任人：" :label-width="formLabelWidth">
<el-input
v-model="detailData.personLiable"
:disabled="isDisabled"
placeholder="请输入责任人"
autocomplete="off"
></el-input>
</el-form-item>
</el-form>
<!-- <div v-if="COMPANY != 'longguang'" class="qr-box">
<div id="qrCode" ref="qrCodeDiv"></div>
@ -284,7 +283,8 @@
<div class="line"></div>
<div class="info-item">
<div class="box-title">
一般验收
<!-- 一般验收 -->
最终验收
</div>
<div class="plan-detail flex">
<div class="plan-content2">
@ -316,7 +316,7 @@
<div class="plan-content">
验收描述：{{
checkData.length > 0
? checkData[0].acceptanceDescribe
? checkData[0].acceptanceDesc
: "- -"
}}
<div
@ -753,7 +753,7 @@
height="500"
style="width: 100%;"
>
<el-table-column prop="acceptanceDescribe" label="验收描述">
<el-table-column prop="acceptanceDesc" label="验收描述">
</el-table-column>
<el-table-column label="验收类型">
<template slot-scope="scope">
@ -770,15 +770,15 @@
<el-table-column label="图片">
<template slot-scope="scope">
<el-image
v-if="scope.row.imageUrl"
v-if="scope.row.photo"
style="width: 50px; height: 50px;"
:src="fileUrl + scope.row.imageUrl.split(',')[0]"
:src="fileUrl + scope.row.photo.split(',')[0]"
:preview-src-list="scope.row.fileList"
>
</el-image>
</template>
</el-table-column>
<el-table-column prop="createUserName" label="记录人">
<el-table-column prop="acceptanceUserName" label="记录人">
</el-table-column>
<el-table-column prop="createTime" label="记录时间"> </el-table-column>
<el-table-column label="操作" width="80">
@ -830,33 +830,35 @@
</el-table-column>
<el-table-column label="检查人/检查时间" width="180">
<template slot-scope="scope">
<p>{{ scope.row.createUserName }}</p>
<p>{{ scope.row.inspectManName }}</p>
<p>{{ scope.row.createTime }}</p>
</template>
</el-table-column>
<!-- 隐患信息 -->
<el-table-column label="隐患信息" width="300">
<template slot-scope="scope">
<p v-if="scope.row.status != 1">
<el-tag
style="margin-right: 10px"
:type="scope.row.faultLevel == 1 ? 'primary' : 'danger'"
:type="scope.row.urgentLevel == '1' ? 'primary' : scope.row.urgentLevel == '2' ? 'waring' : scope.row.urgentLevel == '3' ? 'danger' : ''"
effect="dark"
size="mini"
>{{ scope.row.faultLevel == 1 ? "一般" : "重大" }}</el-tag
>{{ scope.row.checkContent }}
>{{ scope.row.urgentLevel == '1' ? "一般" : scope.row.urgentLevel == '2' ? "严重" : scope.row.urgentLevel == '3' ? "紧要" : "" }}</el-tag
>{{ scope.row.dangerItemContent }}
</p>
<p v-else>该区域排查无隐患</p>
<p class="table_bottom_txt">
<span style="margin-right: 10px"
<!-- <span style="margin-right: 10px"
><i class="el-icon-picture" style="margin-right: 6px"></i
>{{ scope.row.fileList.length }}</span
>
> -->
<span style="margin-right: 10px"
><i
class="el-icon-location-information"
style="margin-right: 6px"
></i
>{{ scope.row.dutyRegion }}</span
>{{ scope.row.regionName }}</span
>
<el-tag
class="hiddenDangerLevel"
@ -864,11 +866,13 @@
effect="dark"
size="mini"
v-if="scope.row.status != 1"
>{{ scope.row.hiddenDangerLevel }}</el-tag
>{{ scope.row.level }}</el-tag
>
</p>
</template>
</el-table-column>
<!-- 隐患信息 -->
<!-- <el-table-column
label="图片"
@ -882,7 +886,7 @@
</el-image>
</template>
</el-table-column> -->
<el-table-column prop="changeUserName" label="整改人">
<el-table-column prop="changeName" label="整改人">
</el-table-column>
<el-table-column label="隐患详情">
<template slot-scope="scope">
@ -937,13 +941,14 @@
<el-image
v-if="scope.row.imageUrl"
style="width: 50px; height: 50px;"
:src="fileUrl + scope.row.imageUrl.split(',')[0]"
:src="fileUrl + scope.row.imageUrl"
:preview-src-list="scope.row.fileList"
>
<!-- :src="fileUrl + scope.row.imageUrl.split(',')[0]" -->
</el-image>
</template>
</el-table-column>
<el-table-column prop="createUserName" label="记录人">
<el-table-column prop="inspectManName" label="记录人">
</el-table-column>
<el-table-column prop="createTime" label="记录时间"> </el-table-column>
<el-table-column label="操作" width="80">
@ -992,7 +997,8 @@
<el-col :span="12">
<div class="grid-content">
<span class="label">责任区域：</span>
<span class="value">{{ historyDetail.dutyRegion }}</span>
<!-- <span class="value">{{ historyDetail.dutyRegion }}</span> -->
<span class="value">{{ historyDetail.regionName }}</span>
</div>
</el-col>
</el-row>
@ -1000,7 +1006,7 @@
<el-col :span="12">
<div class="grid-content">
<span class="label">检查人：</span>
<span class="value">{{ historyDetail.createUserName }}</span>
<span class="value">{{ historyDetail.inspectManName }}</span>
</div>
</el-col>
<el-col :span="12">
@ -1016,16 +1022,19 @@
<div class="grid-content">
<span class="label">隐患类别：</span>
<span class="value"
>{{ historyDetail.checkItem }}/{{
>
{{historyDetail.urgentLevel === '1' ? '一般' : historyDetail.urgentLevel === '2' ? '严重' : historyDetail.urgentLevel === '3' ? '紧要' : ''}}
<!-- {{ historyDetail.checkItem }}/{{
historyDetail.checkSubitem
}}</span
}} -->
</span
>
</div>
</el-col>
<el-col :span="12">
<div class="grid-content">
<span class="label">隐患明细：</span>
<span class="value">{{ historyDetail.checkContent }}</span>
<span class="value">{{ historyDetail.dangerItemContent }}</span>
</div>
</el-col>
</el-row>
@ -1034,7 +1043,7 @@
<div class="grid-content">
<span class="label">隐患级别：</span>
<span class="value">{{
historyDetail.hiddenDangerLevel
historyDetail.level
}}</span>
</div>
</el-col>
@ -1055,7 +1064,7 @@
<el-col :span="12">
<div class="grid-content">
<span class="label">整改人：</span>
<span class="value">{{ historyDetail.changeUserName }}</span>
<span class="value">{{ historyDetail.changeName }}</span>
</div>
</el-col>
</el-row>
@ -1079,7 +1088,7 @@
<el-col :span="24">
<div class="grid-content">
<span class="label">整改要求：</span>
<span class="value">{{ historyDetail.rectifyRequire }}</span>
<span class="value">{{ historyDetail.remark }}</span>
</div>
</el-col>
</el-row>
@ -1172,11 +1181,16 @@ import {
selectDangerousEngineeringProgressRecordApi,
selectDangerousEngineeringSideStationApi,
selectDangerousEngineeringAcceptanceCheckApi,
selectFinalDangerousEngineeringAcceptanceCheckApi,
selectHiddenDangerInspectRecordApi,
selectFinalHiddenDangerInspectRecordApi,
deleteDangerousEngineeringProgressRecordApi,
deleteDangerousEngineeringSideStationApi,
deleteDangerousEngineeringAcceptanceCheckApi,
deletehiddenDangerInspectRecordApi,
deleteFinlahiddenDangerInspectRecordApi,
deleteFinalDangerousEngineeringAcceptanceCheckApi,
} from "@/assets/js/api/dangerousBigProject";
import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit";
import {
@ -1374,10 +1388,14 @@ export default {
},
// 查询一般验收记录
selectDangerousEngineeringAcceptanceCheck() {
selectDangerousEngineeringAcceptanceCheckApi({
// selectDangerousEngineeringAcceptanceCheckApi({
selectFinalDangerousEngineeringAcceptanceCheckApi({
engineeringId: this.id,
}).then((res) => {
console.log(res.result, "-----一般验收");
console.log(res.result, "-----最终验收");
console.log(res.result, "-----最终验收");
console.log(res.result, "-----最终验收");
console.log(res.result, "-----最终验收");
if (res.code == 200 && res.result) {
res.result.forEach((item) => {
item.fileList = [];
@ -1411,7 +1429,7 @@ export default {
);
},
// 查询隐患记录
selectHiddenDangerInspectRecord(type) {
async selectHiddenDangerInspectRecord(type) {
// type 1.隐患记录 2.排查记录
let data = {
recordType: type,
@ -1420,21 +1438,31 @@ export default {
pageSize: 1000,
engineeringId: this.id,
};
selectHiddenDangerInspectRecordApi(data).then((res) => {
// selectHiddenDangerInspectRecordApi(data).then((res) => {
await selectFinalHiddenDangerInspectRecordApi(data).then((res) => {
console.log(res, type);
if (res.code == 200 && res.result) {
res.result.records.forEach((item) => {
item.fileList = [];
if (item.imageUrl && item.imageUrl.split(",").length > 0) {
item.imageUrl.split(",").forEach((itm) => {
item.fileList.push(this.fileUrl + itm);
});
res.result.page.records.forEach((item) => {
// item.fileList = [];
// if (item.imageUrl && item.imageUrl.split(",").length > 0) {
// item.imageUrl.split(",").forEach((itm) => {
// item.fileList.push(this.fileUrl + itm);
// });
// }
if(item.imageUrl){
let index = item.imageUrl.indexOf("*")
if (index !== -1) {
item.imageUrl = item.imageUrl.substring(0, index);
}
}
});
if (type == 1) {
this.hiddenDangerData = res.result.records;
this.hiddenDangerData = res.result.page.records;
console.log("================hiddenDangerData===================")
console.log(this.hiddenDangerData)
console.log("================hiddenDangerData===================")
} else if (type == 2) {
this.inspectRecordData = res.result.records;
this.inspectRecordData = res.result.page.records;
}
}
});
@ -1465,6 +1493,10 @@ export default {
},
// 删除进度记录
deleteDangerousEngineeringProgressRecord(val) {
if(this.detailData.finalAcceptanceStatus === 2){
this.$message.warning('该项危大工程已闭合，请勿操作')
return
}
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -1492,6 +1524,10 @@ export default {
},
// 删除旁站记录
deleteDangerousEngineeringSideStation(val) {
if(this.detailData.finalAcceptanceStatus === 2){
this.$message.warning('该项危大工程已闭合，请勿操作')
return
}
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -1517,13 +1553,18 @@ export default {
},
// 删除验收记录
deleteDangerousEngineeringAcceptanceCheck(val) {
if(this.detailData.finalAcceptanceStatus === 2){
this.$message.warning('该项危大工程已闭合，请勿操作')
return
}
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteDangerousEngineeringAcceptanceCheckApi({ id: val }).then(
// deleteDangerousEngineeringAcceptanceCheckApi({ id: val }).then(
deleteFinalDangerousEngineeringAcceptanceCheckApi({ id: val }).then(
(res) => {
if (res.code == 200) {
this.$message({
@ -1544,13 +1585,18 @@ export default {
},
// 删除隐患排查记录
deletehiddenDangerInspectRecord(val, type) {
if(this.detailData.finalAcceptanceStatus === 2){
this.$message.warning('该项危大工程已闭合，请勿操作')
return
}
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deletehiddenDangerInspectRecordApi({ id: val }).then((res) => {
// deletehiddenDangerInspectRecordApi({ id: val }).then((res) => {
deleteFinlahiddenDangerInspectRecordApi({ id: val }).then((res) => {
if (res.code == 200) {
this.$message({
type: "success",

57
src/views/projectFront/dangerousBigProject/editPlan.vue
View File

@ -90,7 +90,7 @@
></el-input>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="施工时间："
required
:label-width="formLabelWidth"
@ -106,7 +106,7 @@
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="施工计划" :label-width="formLabelWidth">
<el-input v-model="addForm.people" :disabled="isDisabled" placeholder="请输入施工计划" autocomplete="off"></el-input>
@ -126,27 +126,6 @@
</el-date-picker>
</el-form-item>
<el-form-item
label="责任人："
required
:label-width="formLabelWidth"
>
<!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
<el-select
v-model="addForm.personLiableId"
placeholder="请选择责任人"
disabled
>
<el-option
:label="item.realName"
:value="item.userId"
v-for="(item, index) in personList"
:key="index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="责任分包单位："
required
@ -175,6 +154,26 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="责任人："
required
:label-width="formLabelWidth"
>
<!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
<el-select
v-model="addForm.personLiableId"
placeholder="请选择责任人"
disabled
>
<el-option
:label="item.realName"
:value="item.userId"
v-for="(item, index) in personList"
:key="index"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="control-point" v-if="company != 'longguang'">
@ -963,10 +962,10 @@ export default {
this.$message.error("请输入施工部位！");
return;
}
if (!this.addForm.buildTime) {
this.$message.error("请选择施工时间！");
return;
}
// if (!this.addForm.buildTime) {
// this.$message.error("请选择施工时间！");
// return;
// }
if (!this.addForm.responsibilityCompanyId) {
this.$message.error("请选择责任分包单位！");
return;
@ -992,8 +991,8 @@ export default {
personLiableId,
engineeringTypeId,
engineeringTypeName,
buildStartTime: this.addForm.buildTime[0],
buildEndTime: this.addForm.buildTime[1],
// buildStartTime: this.addForm.buildTime[0],
// buildEndTime: this.addForm.buildTime[1],
planStartTime: this.addForm.planTime[0]
? this.addForm.planTime[0]
: "",

58
src/views/projectFront/dangerousBigProject/index.vue
View File

@ -28,21 +28,12 @@
size="small"
@cell-click="previewDetail"
@selection-change="handleSelectionChange"
:header-cell-style="{'text-align':'center'}"
>
<!-- <el-table-column
type="selection"
align="center"
width="60px"
>
</el-table-column>
<el-table-column
label="序号"
type="index"
align="center"
width="60">
</el-table-column> -->
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
<el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
<el-table-column
<el-table-column align="center"
:label="$t('message.dangerousBigProject.category')"
show-overflow-tooltip
>
@ -67,29 +58,32 @@
</template>
</el-table-column>
<!-- 危大工程 -->
<el-table-column
<el-table-column align="center"
:label="$t('message.dangerousBigProject.dangerProject')"
>
<template slot-scope="scope">
<div class="table-item">
<p class="item-title">{{ scope.row.engineeringName }}</p>
<div style="display: flex">
<el-tag type="danger" effect="dark" size="mini" v-if="scope.row.isOverdue" >超期</el-tag>
<!-- <el-tag type="danger" effect="dark" size="mini">超期</el-tag> -->
<p class="item-title" style="margin-left:5px">{{ scope.row.engineeringName }}</p>
</div>
<!-- <p>{{scope.row.people}}识别于：{{ scope.row.date }}</p> -->
</div>
</template>
</el-table-column>
<!-- 施工部位 -->
<el-table-column
<el-table-column align="center"
prop="constructionLocation"
:label="$t('message.dangerousBigProject.buildPart')"
></el-table-column>
<!-- 施工时间 -->
<el-table-column
<!-- <el-table-column align="center"
:label="$t('message.dangerousBigProject.buildTime')"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="table-item">
<!-- 至 -->
<p v-if="scope.row.buildStartTime">
{{ scope.row.buildStartTime
}}{{ $t('message.dangerousBigProject.to')
@ -97,9 +91,9 @@
</p>
</div>
</template>
</el-table-column>
</el-table-column> -->
<!-- 计划时间 -->
<el-table-column
<el-table-column align="center"
:label="$t('message.dangerousBigProject.planTime')"
show-overflow-tooltip
>
@ -115,12 +109,12 @@
</template>
</el-table-column>
<!-- 责任人 -->
<el-table-column
<el-table-column align="center"
prop="personLiable"
:label="$t('message.dangerousBigProject.dutyPeople')"
></el-table-column>
<!-- 分包单位 -->
<el-table-column
<el-table-column align="center"
prop="responsibilityCompany"
:label="$t('message.dangerousBigProject.subpackageUnit')"
></el-table-column>
@ -178,8 +172,18 @@
</div>
</template>
</el-table-column>
<!-- 操作 -->
<!-- 状态 -->
<el-table-column
:label="$t('message.dangerousBigProject.finalAcceptanceStatus')"
align="center"
>
<template slot-scope="scope">
<span v-if="scope.row.finalAcceptanceStatus === 1" style="color:#DAA520;font-weight:bold;">进行中</span>
<span v-if="scope.row.finalAcceptanceStatus === 2" style="color:#008000;font-weight:bold;">已闭合</span>
</template>
</el-table-column>
<!-- 操作 -->
<el-table-column align="center"
:label="$t('message.dangerousBigProject.operation')"
width="120"
>
@ -519,6 +523,10 @@ export default {
},
methods: {
editRow(index, rows) {
if(rows[index].finalAcceptanceStatus === 2){
this.$message.warning('该项危大工程已闭合，请勿操作')
return
}
// console.log(index,rows[index].id)
this.editId = rows[index].id
this.operateTitle = "编辑"
@ -785,6 +793,10 @@ export default {
this.multipleSelection = val;
},
deleteRow(index, rows) {
if(rows[index].finalAcceptanceStatus === 2){
this.$message.warning('该项危大工程已闭合，请勿操作')
return
}
// console.log(index,rows[index].id)
this.deleteId = rows[index].id
this.deleteDialog = true

13
src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue
View File

@ -372,7 +372,7 @@ export default {
cpsEleRecords: [], // 选修必修人员数组
studyCycle: [], // 表单日期时间范围
searchKeyWord: '', // 搜索关键字
personType: 0, // 人员类型
personType: 1, // 人员类型
userEnterpriseId: '1706588724057112577', // 用户所处企业Id(测试)
projectSn: '', // 项目Sn
@ -429,10 +429,10 @@ export default {
this.getExamSubjectList()
// this.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
this.userEnterpriseId = "1706588724057112577";//测试用
this.personType = 1
// this.getTeamInfoList()
// this.getDepartmentList()
this.loadData() // 查询班组及部门
this.loadData()
},
mounted() {},
watch:{
@ -474,11 +474,11 @@ export default {
listExamSubjectApi(data).then((res) => {
if (res.code == 200) {
this.examSubjectList = res.result
console.log('==========考试科目列表==========',this.listData)
console.log('==========考试科目列表==========',this.examSubjectList)
}
})
},
async loadData(){ // 按顺序加载方法 查询班组及部门
async loadData(){ // 按顺序加载方法
await this.getTeamInfoList()
await this.getDepartmentList()
// await this.getWorkerInfoList()
@ -722,8 +722,7 @@ export default {
if(this.personType ===2) this.$refs.personTree2.filter(newArr);
if(this.personType ===3) this.$refs.personTree3.filter(newArr);
},
async handleOpen() { // 打开弹窗
this.personType = 1
async handleOpen() { // 添加按钮
await this.getExamSubjectList()
// this.getWorkerInfoList()
await this.getLaborPersonList()

1
src/views/projectFront/examSystem/trainRecord/trainRecord.vue
View File

@ -293,6 +293,7 @@ export default {
},
}
</script>
<style lang="less" scoped>
::v-deep .cell{
text-align: center;

2
src/views/projectFront/laborManage/LEDBigScreen/addLED.vue
View File

@ -597,7 +597,7 @@ export default {
num:data.lsPersonTotal,
},
{
name:'劳务工人数',
name:'施工人员人数',
num:data.lwPersonTotal,
},
{