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

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-04-30 02:35:31 +08:00
parent a7c12b8a20
commit 51fec5e645
9 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/router/index.js
View File

@ -2379,13 +2379,6 @@ const routes2 = [
component: (resolve) => component: (resolve) =>
require(["@/views/companyAdmin/basicSetup/checkItem.vue"], resolve), require(["@/views/companyAdmin/basicSetup/checkItem.vue"], resolve),
}, },
//安全标准
{
path: "/project/basicSafeSetup/checkItem",
name: "安全管理质量标准",
component: (resolve) =>
require(["@/views/companyAdmin/basicSafeSetup/checkItem.vue"], resolve),
},
//临边防护 //临边防护
{ {
path: "/project/edgeProtection/edgequtManagement", path: "/project/edgeProtection/edgequtManagement",
@ -3276,6 +3269,37 @@ const routes2 = [
}, },
], ],
}, },
{
path: "/companyAdmin/basicSafeSetup/index",
name: "basicSafeSetup",
component: () => import("../views/companyAdmin/basicSafeSetup/index.vue"),
children: [
{
path: "/companyAdmin/basicSafeSetup/checkItem",
name: "checkItem",
component: (resolve) =>
require([
"@/views/companyAdmin/basicSafeSetup/checkItem.vue",
], resolve),
},
{
path: "/companyAdmin/basicSafeSetup/specialCheck",
name: "specialCheck",
component: (resolve) =>
require([
"@/views/companyAdmin/basicSafeSetup/specialCheck.vue",
], resolve),
},
{
path: "/companyAdmin/basicSafeSetup/planTemplate",
name: "planTemplate",
component: (resolve) =>
require([
"@/views/companyAdmin/basicSafeSetup/planTemplate.vue",
], resolve),
},
],
},
{ {
path: "/companyAdmin/progressOfWorks/index", path: "/companyAdmin/progressOfWorks/index",
name: "progressOfWorks", name: "progressOfWorks",

6
src/views/projectFront/safeSame/acceptanceMoudle.vue
View File

@ -337,7 +337,7 @@ export default {
//新增 //新增
addForm() { addForm() {
this.dialogVisible = true this.dialogVisible = true
this.dialogTitle = '新增质量验收' this.dialogTitle = '新增安全验收'
this.dialogdata = { this.dialogdata = {
subsectionId: '', //分部工程id subsectionId: '', //分部工程id
subentryId: '', //分项工程id subentryId: '', //分项工程id
@ -356,7 +356,7 @@ export default {
editData(val) { editData(val) {
console.log('编辑时调用的参数 ：', val) console.log('编辑时调用的参数 ：', val)
this.dialogVisible = true this.dialogVisible = true
this.dialogTitle = '编辑质量验收' this.dialogTitle = '编辑安全验收'
this.dialogdata = JSON.parse(JSON.stringify(val)) this.dialogdata = JSON.parse(JSON.stringify(val))
this.listData.forEach((value) => { this.listData.forEach((value) => {
if (value.id == this.dialogdata.subsectionId) { if (value.id == this.dialogdata.subsectionId) {
@ -395,7 +395,7 @@ export default {
params.projectSn = this.$store.state.projectSn params.projectSn = this.$store.state.projectSn
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
if (this.dialogTitle == '新增质量验收') { if (this.dialogTitle == '新增安全验收') {
addSubdivisionAcceptanceApi(params).then((res) => { addSubdivisionAcceptanceApi(params).then((res) => {
this.$message.success('新增成功') this.$message.success('新增成功')
this.dialogVisible = false this.dialogVisible = false

2
src/views/projectFront/safeSame/criterionModule/qualityProblemBank.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<!-- 质量问题库 --> <!-- 安全问题库 -->
<div class="qualityProblemBank"> <div class="qualityProblemBank">
<vue-scroll style="height: 100%; width: 100%" class="scroll"> <vue-scroll style="height: 100%; width: 100%" class="scroll">
<div class="flex content"> <div class="flex content">

8
src/views/projectFront/safeSame/inspectionLedger.vue
View File

@ -74,7 +74,7 @@
> >
<el-option :label="$t('message.quality.add')" value=""></el-option> <el-option :label="$t('message.quality.add')" value=""></el-option>
<el-option label="排查记录" :value="2"></el-option> <el-option label="排查记录" :value="2"></el-option>
<el-option label="质量问题" :value="1"></el-option> <el-option label="安全问题" :value="1"></el-option>
<!-- <el-option <!-- <el-option
:label="$t('message.quality.recordsOfTheFebruary')" :label="$t('message.quality.recordsOfTheFebruary')"
:value="1" :value="1"
@ -217,7 +217,7 @@
</el-table-column> </el-table-column>
<el-table-column label="检查类型" align="center" prop="recordType"> <el-table-column label="检查类型" align="center" prop="recordType">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.recordType == 1 ? "质量问题" : "排查记录" scope.row.recordType == 1 ? "安全问题" : "排查记录"
}}</template> }}</template>
</el-table-column> </el-table-column>
<!-- 检查结果--> <!-- 检查结果-->
@ -1496,7 +1496,7 @@
class="value" class="value"
style="font-weight: 500; color: #5181f6; cursor: pointer" style="font-weight: 500; color: #5181f6; cursor: pointer"
>{{ >{{
detailData.recordType == 1 ? "质量问题" : "排查记录" detailData.recordType == 1 ? "安全问题" : "排查记录"
}}</span }}</span
> >
</div> </div>
@ -2001,7 +2001,7 @@ export default {
completeRatio: 0, //闭合率 completeRatio: 0, //闭合率
}, },
tableData: [], //列表数据 tableData: [], //列表数据
recordType: 1, //新增数据 1质量问题，2排查记录 recordType: 1, //新增数据 1安全问题，2排查记录
addDialog: false, addDialog: false,
addTitle: addTitle:
this.$t("message.quality.new") + this.$t("message.quality.new") +

8
src/views/projectFront/safeSame/inspectionLedgerag.vue
View File

@ -74,7 +74,7 @@
> >
<el-option :label="$t('message.quality.add')" value=""></el-option> <el-option :label="$t('message.quality.add')" value=""></el-option>
<el-option label="排查记录" :value="2"></el-option> <el-option label="排查记录" :value="2"></el-option>
<el-option label="质量问题" :value="1"></el-option> <el-option label="安全问题" :value="1"></el-option>
<!-- <el-option <!-- <el-option
:label="$t('message.quality.recordsOfTheFebruary')" :label="$t('message.quality.recordsOfTheFebruary')"
:value="1" :value="1"
@ -217,7 +217,7 @@
</el-table-column> </el-table-column>
<el-table-column label="检查类型" align="center" prop="recordType"> <el-table-column label="检查类型" align="center" prop="recordType">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.recordType == 1 ? '质量问题' : '排查记录' scope.row.recordType == 1 ? '安全问题' : '排查记录'
}}</template> }}</template>
</el-table-column> </el-table-column>
<!-- 检查结果--> <!-- 检查结果-->
@ -1496,7 +1496,7 @@
class="value" class="value"
style="font-weight: 500; color: #5181f6; cursor: pointer" style="font-weight: 500; color: #5181f6; cursor: pointer"
>{{ >{{
detailData.recordType == 1 ? '质量问题' : '排查记录' detailData.recordType == 1 ? '安全问题' : '排查记录'
}}</span }}</span
> >
</div> </div>
@ -2000,7 +2000,7 @@
completeRatio: 0,//闭合率 completeRatio: 0,//闭合率
}, },
tableData: [], //列表数据 tableData: [], //列表数据
recordType: 1, //新增数据 1质量问题，2排查记录 recordType: 1, //新增数据 1安全问题，2排查记录
addDialog: false, addDialog: false,
addTitle: addTitle:
this.$t('message.quality.new') + this.$t('message.quality.new') +

14
src/views/projectFront/safeSame/qualityHighlights.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<!-- 质量亮点页面 --> <!-- 安全亮点页面 -->
<div class="panoramaPlan"> <div class="panoramaPlan">
<div class="header-box"> <div class="header-box">
<el-button type="primary" @click="addForm"> 新增 </el-button> <el-button type="primary" @click="addForm"> 新增 </el-button>
@ -89,7 +89,7 @@
> >
<el-form-item label="文件类型" prop="typeId"> <el-form-item label="文件类型" prop="typeId">
<el-select v-model="dialogdata.typeId" placeholder="请选择"> <el-select v-model="dialogdata.typeId" placeholder="请选择">
<el-option :value="1" label="质量"></el-option> <el-option :value="1" label="安全"></el-option>
<el-option :value="2" label="安全"></el-option> <el-option :value="2" label="安全"></el-option>
<el-option :value="3" label="技术"></el-option> <el-option :value="3" label="技术"></el-option>
</el-select> </el-select>
@ -168,7 +168,7 @@ export default {
methods: { methods: {
getStatus(typeId){ getStatus(typeId){
if(typeId===1){ if(typeId===1){
return '质量' return '安全'
}else if(typeId===2){ }else if(typeId===2){
return '安全' return '安全'
}else{ }else{
@ -211,12 +211,12 @@ export default {
//新增 //新增
addForm() { addForm() {
this.dialogVisible = true; this.dialogVisible = true;
this.dialogTitle = "新增质量亮点"; this.dialogTitle = "新增安全亮点";
}, },
//编辑 //编辑
editData(val) { editData(val) {
this.dialogVisible = true; this.dialogVisible = true;
this.dialogTitle = "编辑质量亮点"; this.dialogTitle = "编辑安全亮点";
this.dialogdata = JSON.parse(JSON.stringify(val)); this.dialogdata = JSON.parse(JSON.stringify(val));
this.fileList = val.imageUrl; this.fileList = val.imageUrl;
}, },
@ -250,13 +250,13 @@ export default {
params.projectSn = this.$store.state.projectSn; params.projectSn = this.$store.state.projectSn;
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
if (this.dialogTitle == "新增质量亮点") { if (this.dialogTitle == "新增安全亮点") {
addWindowDisplaytApi(params).then((res) => { addWindowDisplaytApi(params).then((res) => {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.dialogVisible = false; this.dialogVisible = false;
this.getData(); this.getData();
}); });
}else if(this.dialogTitle == "编辑质量亮点"){ }else if(this.dialogTitle == "编辑安全亮点"){
updateWindowDisplayApi(params).then((res) => { updateWindowDisplayApi(params).then((res) => {
this.$message.success("编辑成功"); this.$message.success("编辑成功");
this.dialogVisible = false; this.dialogVisible = false;

2
src/views/projectFront/safeSame/recordsCenter.vue
View File

@ -8,7 +8,7 @@
text-color="#262D47" text-color="#262D47"
active-text-color="#5181F6" active-text-color="#5181F6"
> >
<!-- 质量检查记录 --> <!-- 安全检查记录 -->
<el-menu-item index="1">{{$t("message.personnelPosition.qualityCheckedNode")}}</el-menu-item> <el-menu-item index="1">{{$t("message.personnelPosition.qualityCheckedNode")}}</el-menu-item>
</el-menu> </el-menu>
<inspection v-if="activeIndex == '1'" style="width:100%;height:calc(100% - 49px)"></inspection> <inspection v-if="activeIndex == '1'" style="width:100%;height:calc(100% - 49px)"></inspection>

4
src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
View File

@ -387,7 +387,7 @@
class="value" class="value"
style="font-weight: 500; color: #5584f6; cursor: pointer" style="font-weight: 500; color: #5584f6; cursor: pointer"
>{{ >{{
detailData.recordType == 1 ? '质量问题' : '排查记录' detailData.recordType == 1 ? '安全问题' : '排查记录'
}}</span }}</span
> >
</div> </div>
@ -1040,7 +1040,7 @@ export default {
completeRatio: 0,//闭合率 completeRatio: 0,//闭合率
}, },
tableData: [], //列表数据 tableData: [], //列表数据
recordType: 1, //新增数据 1质量问题，2排查记录 recordType: 1, //新增数据 1安全问题，2排查记录
addDialog: false, addDialog: false,
addTitle: addTitle:
this.$t('message.quality.new') + this.$t('message.quality.new') +

8
src/views/projectFront/safeSame/v2/inspectionRecord.vue
View File

@ -79,7 +79,7 @@
> >
<el-option :label="$t('message.quality.add')" value=""></el-option> <el-option :label="$t('message.quality.add')" value=""></el-option>
<el-option label="排查记录" :value="2"></el-option> <el-option label="排查记录" :value="2"></el-option>
<el-option label="质量问题" :value="1"></el-option> <el-option label="安全问题" :value="1"></el-option>
<!-- <el-option <!-- <el-option
:label="$t('message.quality.recordsOfTheFebruary')" :label="$t('message.quality.recordsOfTheFebruary')"
:value="1" :value="1"
@ -222,7 +222,7 @@
</el-table-column> </el-table-column>
<el-table-column label="检查类型" align="center" prop="recordType"> <el-table-column label="检查类型" align="center" prop="recordType">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.recordType == 1 ? '质量问题' : '排查记录' scope.row.recordType == 1 ? '安全问题' : '排查记录'
}}</template> }}</template>
</el-table-column> </el-table-column>
<!-- 检查结果--> <!-- 检查结果-->
@ -1501,7 +1501,7 @@
class="value" class="value"
style="font-weight: 500; color: #5181f6; cursor: pointer" style="font-weight: 500; color: #5181f6; cursor: pointer"
>{{ >{{
detailData.recordType == 1 ? '质量问题' : '排查记录' detailData.recordType == 1 ? '安全问题' : '排查记录'
}}</span }}</span
> >
</div> </div>
@ -2005,7 +2005,7 @@ export default {
completeRatio: 0,//闭合率 completeRatio: 0,//闭合率
}, },
tableData: [], //列表数据 tableData: [], //列表数据
recordType: 1, //新增数据 1质量问题，2排查记录 recordType: 1, //新增数据 1安全问题，2排查记录
addDialog: false, addDialog: false,
addTitle: addTitle:
this.$t('message.quality.new') + this.$t('message.quality.new') +