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 
安全管理-项目自检页面修复、中建四新增质安管理安全轴数据

See merge request !123
This commit is contained in:
袁晶琳 2023-03-18 09:09:31 +08:00
commit d8f93c14f8
9 changed files with 306 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

149
src/views/companyAdmin/systemSetup/enterpriseInfo.vue
View File

@ -29,79 +29,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="12">
<el-col :span="6">
<el-form-item :label="'登录页面logo'" prop="loginLogo">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:limit="1"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess"
:file-list="fileList"
:on-remove="handleDelete"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">只能上传一张</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'数据看板logo'" prop="bigScreenLogo">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:limit="1"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess4"
:file-list="fileList4"
:on-remove="handleDelete4"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">只能上传一张</div>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="6">
<el-form-item :label="'登录页面背景'" prop="loginBackgroundImage">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess2"
:file-list="fileList2"
:on-remove="handleDelete2"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">
只能上传一张,建议上传大小为1920 x 562的图片
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'平台内部logo'" prop="platformLogo">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess3"
:file-list="fileList3"
:on-remove="handleDelete3"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">只能上传一张</div>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12"> <el-row :gutter="12">
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="'是否开启缩放'" prop="platformLogo"> <el-form-item :label="'是否开启缩放'" prop="platformLogo">
@ -181,6 +108,80 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="12">
<el-col :span="6">
<el-form-item :label="'登录页面logo'" prop="loginLogo">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:limit="1"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess"
:file-list="fileList"
:on-remove="handleDelete"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">只能上传一张</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'数据看板logo'" prop="bigScreenLogo">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:limit="1"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess4"
:file-list="fileList4"
:on-remove="handleDelete4"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">只能上传一张</div>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="6">
<el-form-item :label="'登录页面背景'" prop="loginBackgroundImage">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess2"
:file-list="fileList2"
:on-remove="handleDelete2"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">
只能上传一张,建议上传大小为1920 x 562的图片
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'平台内部logo'" prop="platformLogo">
<el-upload
:action="$store.state.UPLOADURL"
name="files"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:on-success="handleAvatarSuccess3"
:file-list="fileList3"
:on-remove="handleDelete3"
>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip">只能上传一张</div>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item :label="''" > <!-- <el-form-item :label="''" >
<el-button type="primary" style="width: 200px" @click="submitData">保存</el-button> <el-button type="primary" style="width: 200px" @click="submitData">保存</el-button>
</el-form-item> --> </el-form-item> -->
@ -188,7 +189,7 @@
<el-button <el-button
type="primary" type="primary"
style="width: 200px; margin: 140px 0px 0px 350px; position: absolute" style="width: 11%; margin: 2% 0 0 18%; position: absolute"
@click="submitData" @click="submitData"
>保存</el-button >保存</el-button
> >

292
src/views/projectAdmin/fourEngin/govComp/Col2.vue
View File

@ -2,32 +2,38 @@
<Card title="质安管理时间轴"> <Card title="质安管理时间轴">
<div class="timeline"> <div class="timeline">
<el-timeline> <el-timeline>
<el-timeline-item v-for="(item,index) in contentList" :key="index" :timestamp="item.time" placement="top"> <el-timeline-item
<div class="point"></div><span class="mintit"> 监督巡检 </span> v-for="(item, index) in contentList"
:key="index"
:timestamp="item.time"
placement="top"
>
<div class="point"></div>
<span class="mintit"> 监督巡检 </span>
<div class="contentBox"> <div class="contentBox">
<p> <p>
<span>是否发现问题</span> <span>是否发现问题</span>
<a>{{item.question == 1 ? '是' : '否' }}</a> <a>{{ item.question == 1 ? '是' : '否' }}</a>
</p> </p>
<p> <p>
<span>巡检单位</span> <span>巡检单位</span>
<a>{{item.utils}}</a> <a>{{ item.utils }}</a>
</p> </p>
<p> <p>
<span>监督员</span> <span>监督员</span>
<a>{{item.safe}}</a> <a>{{ item.safe }}</a>
</p> </p>
<p> <p>
<span>抽查类型</span> <span>抽查类型</span>
<a>{{item.type}}</a> <a>{{ item.type }}</a>
</p> </p>
<p> <p>
<span>检查部位</span> <span>检查部位</span>
<a>{{item.position}}</a> <a>{{ item.position }}</a>
</p> </p>
<p> <p>
<span>是否下发整改</span> <span>是否下发整改</span>
<a>{{item.change}}</a> <a>{{ item.change }}</a>
</p> </p>
</div> </div>
</el-timeline-item> </el-timeline-item>
@ -37,169 +43,187 @@
</template> </template>
<script> <script>
import Card from "../components/Card.vue"; import Card from '../components/Card.vue'
export default { export default {
components: { Card }, components: { Card },
data() { data() {
return { return {
contentList: [ contentList: [
{ {
time: "2023-02-23", time: '2023-03-16',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "李文心、王昊", safe: '陈伟斌',
type: "安全", type: '安全',
position: "地下室", position: '地下室',
change: "是" change: '是'
}, },
{ {
time: "2023-02-13", time: '2023-03-02',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩", safe: '王斌',
type: "安全", type: '安全',
position: "基坑", position: '地下室',
change: "是" change: '是'
}, },
{ {
time: "2023-02-10", time: '2023-02-23',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "李文心", safe: '李文心、王昊',
type: "安全", type: '安全',
position: "基坑", position: '地下室',
change: "是" change: '是'
}, },
{ {
time: "2023-01-29", time: '2023-02-13',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "郭光祥", safe: '王章浩',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2023-01-23", time: '2023-02-10',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "卢位昌", safe: '李文心',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2023-1-11", time: '2023-01-29',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王斌", safe: '郭光祥',
type: "质量", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2023-01-03", time: '2023-01-23',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "陈显豪", safe: '卢位昌',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-12-28", time: '2023-1-11',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王斌", safe: '王斌',
type: "安全", type: '质量',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-12-05", time: '2023-01-03',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩、陈伟斌", safe: '陈显豪',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-11-01", time: '2022-12-28',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩、陈伟斌", safe: '王斌',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-10-24", time: '2022-12-05',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩、王斌", safe: '王章浩、陈伟斌',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-10-11", time: '2022-11-01',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "徐军、陈伟斌", safe: '王章浩、陈伟斌',
type: "安全", type: '安全',
position: "人工挖孔桩", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-09-29", time: '2022-10-24',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王斌", safe: '王章浩、王斌',
type: "安全", type: '安全',
position: "人工挖孔桩", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-08-29", time: '2022-10-11',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩", safe: '徐军、陈伟斌',
type: "安全", type: '安全',
position: "基坑", position: '人工挖孔桩',
change: "是" change: '是'
}, },
{ {
time: "2022-08-15", time: '2022-09-29',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩、陈伟斌", safe: '王斌',
type: "安全", type: '安全',
position: "基坑", position: '人工挖孔桩',
change: "是" change: '是'
}, },
{ {
time: "2022-07-19", time: '2022-08-29',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王昊、余锋", safe: '王章浩',
type: "安全", type: '安全',
position: "施工路面", position: '基坑',
change: "是" change: '是'
}, },
{ {
time: "2022-06-20", time: '2022-08-15',
question: 1, question: 1,
utils: "中国建筑第四工程局有限公司", utils: '中国建筑第四工程局有限公司',
safe: "王章浩", safe: '王章浩、陈伟斌',
type: "安全", type: '安全',
position: "基坑", position: '基坑',
change: "是" change: '是'
},
{
time: '2022-07-19',
question: 1,
utils: '中国建筑第四工程局有限公司',
safe: '王昊、余锋',
type: '安全',
position: '施工路面',
change: '是'
},
{
time: '2022-06-20',
question: 1,
utils: '中国建筑第四工程局有限公司',
safe: '王章浩',
type: '安全',
position: '基坑',
change: '是'
} }
] ]
}; }
} }
}; }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@ -209,16 +233,16 @@ export default {
height: 97%; height: 97%;
width: 97%; width: 97%;
overflow: auto; overflow: auto;
.point{ .point {
width: 6px; width: 6px;
height: 6px; height: 6px;
margin-right: 5px; margin-right: 5px;
background-color: #fff; background-color: #fff;
border-radius: 50%; border-radius: 50%;
display: inline-block; display: inline-block;
} }
.mintit{ .mintit {
display: inline-block; display: inline-block;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 16px; font-size: 16px;
@ -226,20 +250,20 @@ export default {
} }
.contentBox { .contentBox {
// background-color: rosybrown; // background-color: rosybrown;
p{ p {
display: flex; display: flex;
justify-content: left; justify-content: left;
align-content: left; align-content: left;
margin-top: 6px; margin-top: 6px;
span { span {
width: 40%; width: 40%;
} }
} }
} }
} }
::v-deep .el-timeline { ::v-deep .el-timeline {
margin: 8px !important; margin: 8px !important;
font-size: 14px; font-size: 14px;
} }
::v-deep .el-timeline-item__tail { ::v-deep .el-timeline-item__tail {
position: absolute; position: absolute;
@ -251,16 +275,16 @@ export default {
color: #fff; color: #fff;
} }
::v-deep .el-timeline { ::v-deep .el-timeline {
margin: 3px; margin: 3px;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 3px; width: 3px;
color: #19394d; color: #19394d;
} }
::v-deep .el-timeline-item__node{ ::v-deep .el-timeline-item__node {
box-shadow: 0px 0px 6px 2px #bddade; box-shadow: 0px 0px 6px 2px #bddade;
} }
::v-deep .el-timeline-item__timestamp{ ::v-deep .el-timeline-item__timestamp {
color: #fff; color: #fff;
} }
</style> </style>

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

@ -317,16 +317,16 @@ export default {
z-index: 99999; z-index: 99999;
} }
.resultImg { .resultImg {
width: 90%; width: 100%;
height: 180%; height: 307%;
margin: -30rem 6rem; margin: -70rem 0rem;
} }
.score { .score {
position: relative; position: relative;
left: 50%; left: 50%;
top: -32%; top: -32%;
width: 55rem; width: 80rem;
height: 55rem; height: 80rem;
border-radius: 50%; border-radius: 50%;
border: 4rem solid #fdcb05; border: 4rem solid #fdcb05;
text-align: center; text-align: center;
@ -338,8 +338,8 @@ export default {
position: absolute; position: absolute;
// display: inline-block; // display: inline-block;
color: #fdcb05; color: #fdcb05;
font-size: 20rem; font-size: 30rem;
margin-top: -22rem; margin-top: -12rem;
margin-left: -28rem; margin-left: -28rem;
} }
} }

12
src/views/projectFront/highModulus/alarmInfo.vue
View File

@ -24,12 +24,16 @@
> >
</el-table-column> </el-table-column>
<el-table-column prop="alarmType" label="类型" align="center"> <el-table-column prop="alarmType" label="类型" align="center">
<template slot-scope="scope" v-if="scope.row.alarmType === 1"> <template slot-scope="scope">
<span class="color1">{{ getStatus(scope.row.alarmType) }}</span> <span
class="color1"
:class="scope.row.alarmType == 1 ? 'color1' : 'color2'"
>{{ getStatus(scope.row.alarmType) }}</span
>
</template> </template>
<template slot-scope="scope" v-else> <!-- <template slot-scope="scope" v-if="scope.row.alarmType === 2">
<span class="color2">{{ getStatus(scope.row.alarmType) }}</span> <span class="color2">{{ getStatus(scope.row.alarmType) }}</span>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="type" label="报警类型" align="center"> <el-table-column prop="type" label="报警类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">

13
src/views/projectFront/safeManage/v2/checkStandingBook.vue
View File

@ -155,7 +155,8 @@
</el-table-column> </el-table-column>
<!-- 检查人 --> <!-- 检查人 -->
<el-table-column <el-table-column
width="250" width="300"
align="center"
:label=" :label="
$t('message.safeMangeCheck.checked') + $t('message.safeMangeCheck.checked') +
$t('message.safeMangeCheck.people') $t('message.safeMangeCheck.people')
@ -163,12 +164,14 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{ scope.row.createUserName }}</p> <p>{{ scope.row.createUserName }}</p>
<p>{{ scope.row.createEnterpriseName }}</p> <!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
<p class="table_bottom_txt">{{ scope.row.createTime }}</p> <p class="table_bottom_txt">{{ scope.row.createTime }}</p>
</template> </template>
</el-table-column> </el-table-column>
<!-- 隐患信息 --> <!-- 隐患信息 -->
<el-table-column <el-table-column
width="400"
align="center"
:label=" :label="
$t('message.safeMangeCheck.hiddenDanger') + $t('message.safeMangeCheck.hiddenDanger') +
$t('message.safeMangeCheck.info') $t('message.safeMangeCheck.info')
@ -218,14 +221,14 @@
></el-table-column> ></el-table-column>
<!-- 整改人 --> <!-- 整改人 -->
<el-table-column <el-table-column
width="100" width="200"
prop="changeUserName" prop="changeUserName"
align="center" align="center"
:label="$t('message.safeMangeCheck.changePeople')" :label="$t('message.safeMangeCheck.changePeople')"
></el-table-column> ></el-table-column>
<!-- 复查人 --> <!-- 复查人 -->
<el-table-column <el-table-column
width="100" width="200"
prop="reviewUserName" prop="reviewUserName"
align="center" align="center"
:label="$t('message.safeMangeCheck.examinePeople')" :label="$t('message.safeMangeCheck.examinePeople')"
@ -1651,7 +1654,7 @@ export default {
this.searchForm.pageNo = 1 this.searchForm.pageNo = 1
} }
gethiddenDangerInspectRecordApi(this.searchForm).then((result) => { gethiddenDangerInspectRecordApi(this.searchForm).then((result) => {
console.log(result) console.log('表格数据', result)
this.recordList = result.result.records this.recordList = result.result.records
this.pageTotal = result.result.total this.pageTotal = result.result.total
}) })

65
src/views/projectFront/safeManage/v2/inspectionRecord.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<!-- 检查台账 --> <!-- 项目自检记录 -->
<div class="fullHeight"> <div class="fullHeight">
<el-page-header <el-page-header
class="backText" class="backText"
@ -93,7 +93,8 @@
</el-table-column> </el-table-column>
<!-- 检查人 --> <!-- 检查人 -->
<el-table-column <el-table-column
width="250" width="300"
align="center"
:label=" :label="
$t('message.safeMangeCheck.checked') + $t('message.safeMangeCheck.checked') +
$t('message.safeMangeCheck.people') $t('message.safeMangeCheck.people')
@ -101,12 +102,14 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{ scope.row.createUserName }}</p> <p>{{ scope.row.createUserName }}</p>
<p>{{ scope.row.createEnterpriseName }}</p> <!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
<p class="table_bottom_txt">{{ scope.row.createTime }}</p> <p class="table_bottom_txt">{{ scope.row.createTime }}</p>
</template> </template>
</el-table-column> </el-table-column>
<!-- 隐患信息 --> <!-- 隐患信息 -->
<el-table-column <el-table-column
width="400"
align="center"
:label=" :label="
$t('message.safeMangeCheck.hiddenDanger') + $t('message.safeMangeCheck.hiddenDanger') +
$t('message.safeMangeCheck.info') $t('message.safeMangeCheck.info')
@ -156,20 +159,20 @@
></el-table-column> ></el-table-column>
<!-- 整改人 --> <!-- 整改人 -->
<el-table-column <el-table-column
width="100" width="200"
prop="changeUserName" prop="changeUserName"
align="center" align="center"
:label="$t('message.safeMangeCheck.changePeople')" :label="$t('message.safeMangeCheck.changePeople')"
></el-table-column> ></el-table-column>
<!-- 复查人 --> <!-- 复查人 -->
<el-table-column <el-table-column
width="100" width="200"
prop="reviewUserName" prop="reviewUserName"
align="center" align="center"
:label="$t('message.safeMangeCheck.examinePeople')" :label="$t('message.safeMangeCheck.examinePeople')"
></el-table-column> ></el-table-column>
<!-- 检查类型 --> <!-- 检查类型 -->
<el-table-column <!-- <el-table-column
width="200" width="200"
prop="inspectTypeName" prop="inspectTypeName"
align="center" align="center"
@ -177,7 +180,7 @@
$t('message.safeMangeCheck.checked') + $t('message.safeMangeCheck.checked') +
$t('message.safeMangeCheck.type') $t('message.safeMangeCheck.type')
" "
></el-table-column> ></el-table-column> -->
<!-- 操作 --> <!-- 操作 -->
<el-table-column <el-table-column
width="80" width="80"
@ -1075,7 +1078,8 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
itemId: '' itemId: '', //子任务ID
taskId: '' //任务ID
}, },
daterange: [], daterange: [],
// checkType:[], // checkType:[],
@ -1185,26 +1189,27 @@ export default {
this.getPeopleList() this.getPeopleList()
}, },
mounted() { mounted() {
if (this.$route.query.id) { this.searchForm.itemId = this.$route.query.id
// this.searchForm.itemId = this.$route.query.id this.searchForm.taskId = this.$route.query.taskId
} else { this.getStatictisData()
this.getStatictisData()
}
this.loadList() this.loadList()
}, },
// watch: { watch: {
// $route(to, from) { $route(to, from) {
// // console.log('watch') // console.log('watch')
// // console.log(from.path); //从哪来 // console.log(from.path); //从哪来
// if (this.$route.query.id) { if (this.$route.query.id) {
// this.searchForm.itemId = this.$route.query.id this.searchForm.itemId = this.$route.query.id
// } else { } else if (this.$route.query.taskId) {
// this.searchForm.itemId = '' this.searchForm.taskId = this.$route.query.taskId
// this.getStatictisData() } else {
// } this.searchForm.itemId = ''
// this.loadList() this.searchForm.taskId = ''
// } this.getStatictisData()
// }, }
this.loadList()
}
},
methods: { methods: {
//导出 //导出
exportData() { exportData() {
@ -1223,7 +1228,9 @@ export default {
'&pageSize=' + '&pageSize=' +
this.searchForm.pageSize + this.searchForm.pageSize +
'&itemId=' + '&itemId=' +
this.searchForm.itemId this.searchForm.itemId +
'&taskId=' +
this.searchForm.taskId
}, },
//提交 //提交
submitForm() { submitForm() {
@ -1313,7 +1320,9 @@ export default {
recordType: 1, recordType: 1,
rectifyRequire: this.formData.rectifyRequire, rectifyRequire: this.formData.rectifyRequire,
reviewId: this.$store.state.userInfo.userId, reviewId: this.$store.state.userInfo.userId,
status: this.formData.status status: this.formData.status,
taskId: this.searchForm.taskId,
itemId: this.searchForm.itemId
} }
console.log(data) console.log(data)
addHiddenDangerInspectRecordApi(data).then((res) => { addHiddenDangerInspectRecordApi(data).then((res) => {

9
src/views/projectFront/safeManage/v2/projectSelfInspection.vue
View File

@ -59,14 +59,14 @@
align="center" align="center"
></el-table-column> ></el-table-column>
<!-- 检查类型 --> <!-- 检查类型 -->
<el-table-column <!-- <el-table-column
prop="inspectTypeName" prop="inspectTypeName"
:label=" :label="
$t('message.safeMangeCheck.checked') + $t('message.safeMangeCheck.checked') +
$t('message.safeMangeCheck.type') $t('message.safeMangeCheck.type')
" "
align="center" align="center"
></el-table-column> ></el-table-column> -->
<!-- 创建人 --> <!-- 创建人 -->
<el-table-column <el-table-column
prop="createUserName" prop="createUserName"
@ -90,6 +90,7 @@
<!-- 计划检查时间 --> <!-- 计划检查时间 -->
<el-table-column <el-table-column
prop="startTime" prop="startTime"
align="center"
:label=" :label="
$t('message.safeMangeCheck.plan') + $t('message.safeMangeCheck.plan') +
$t('message.safeMangeCheck.checked') + $t('message.safeMangeCheck.checked') +
@ -197,7 +198,7 @@
:rules="addEditFormRules" :rules="addEditFormRules"
> >
<!-- 检查类型 --> <!-- 检查类型 -->
<el-form-item <!-- <el-form-item
:label=" :label="
$t('message.safeMangeCheck.checked') + $t('message.safeMangeCheck.checked') +
$t('message.safeMangeCheck.type') $t('message.safeMangeCheck.type')
@ -216,7 +217,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<!-- 任务名称 --> <!-- 任务名称 -->
<el-form-item <el-form-item
:label=" :label="

7
src/views/projectFront/safeManage/v2/subTasklist.vue
View File

@ -198,7 +198,12 @@ export default {
}, },
detailsPoint(item) { detailsPoint(item) {
// this.$router.push('/project/safeManage/checkStandingBook?id=' + item.id) // this.$router.push('/project/safeManage/checkStandingBook?id=' + item.id)
this.$router.push('/project/safeManage/inspectionRecord?id=' + item.id) this.$router.push(
'/project/safeManage/inspectionRecord?id=' +
item.id +
'&taskId=' +
item.taskId
)
} }
} }
} }