Skip to content

R
rongtong-pc
Commit 683f1fde authored by 陈晓晋's avatar 陈晓晋
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

parents 16f65519 576d00ac
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 144 deletions
src/views/risk/plan/ledgerdata.vue
View file @ 683f1fde
<template> <template>
<div class="wrapper"> <div class="wrapper">
<el-descriptions <el-descriptions :title="InfoList.detailsDto.name" class="margin-top" :column="3" :size="size" border>
:title="InfoList.detailsDto.name"
class="margin-top"
:column="3"
:size="size"
border
>
<el-descriptions-item label="所属项目">{{ <el-descriptions-item label="所属项目">{{
InfoList.detailsDto.projectName InfoList.detailsDto.projectName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="所属楼栋"> <el-descriptions-item label="所属楼栋">
<!-- {{InfoList.detailsDto.buildingNames}} --> <!-- {{InfoList.detailsDto.buildingNames}} -->
<template> <template>
<div <div v-for="(
v-for="(
buildingName, index buildingName, index
) in InfoList.detailsDto.buildingNames.split(',')" ) in InfoList.detailsDto.buildingNames.split(',')" :key="index">
:key="index"
>
{{ buildingName }} {{ buildingName }}
</div> </div>
</template> </template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属单位">{{ <el-descriptions-item label="所属单位">{{
InfoList.detailsDto.deptName InfoList.detailsDto.deptName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="所属省市">{{ <el-descriptions-item label="所属省市">{{
InfoList.detailsDto.city InfoList.detailsDto.city
}}</el-descriptions-item> }}</el-descriptions-item>
...@@ -81,15 +72,8 @@ ...@@ -81,15 +72,8 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> --> </el-form> -->
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini"
type="warning" @click="downList(InfoList.detailsDto.id)" style="float: right; margin-bottom: 8px">导出风险清单</el-button>
plain
icon="el-icon-download"
size="mini"
@click="downList(InfoList.detailsDto.id)"
style="float: right; margin-bottom: 8px"
>导出风险清单</el-button
>
<el-table v-loading="loading" :data="listList"> <el-table v-loading="loading" :data="listList">
<el-table-column label="序号" align="center"> <el-table-column label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -97,117 +81,61 @@ ...@@ -97,117 +81,61 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="风险名称" align="center" prop="name" /> <el-table-column label="风险名称" align="center" prop="name" />
<el-table-column <el-table-column label="所属建筑" align="center" prop="buildingName" />
label="所属建筑" <el-table-column label="所属楼层" align="center" prop="floorName" />
align="center" <el-table-column label="所属房间" align="center" prop="roomName" />
prop="buildingName" <el-table-column label="风险等级（系数）" align="center" prop="level" />
/> <el-table-column label="风险因素" align="center" prop="factor">
<el-table-column
label="所属楼层"
align="center"
prop="floorName"
/>
<el-table-column
label="所属房间"
align="center"
prop="roomName"
/>
<el-table-column
label="风险等级（系数）"
align="center"
prop="level"
/>
<el-table-column label="风险因素" align="center" prop="factor" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover placement="top-start" title="风险因素" width="200" trigger="hover"
placement="top-start" :content="scope.row.factor">
title="风险因素"
width="200"
trigger="hover"
:content="scope.row.factor"
>
<span slot="reference">{{ <span slot="reference">{{
scope.row.factor.length > 10 scope.row.factor.length > 10
? scope.row.factor.substring(0, 10) + "..." ? scope.row.factor.substring(0, 10) + "..."
: scope.row.factor : scope.row.factor
}}</span> }}</span>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="准事故类型" align="center" prop="type"> <el-table-column label="准事故类型" align="center" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover placement="top-start" title="准事故类型" width="200" trigger="hover" :content="scope.row.type">
placement="top-start"
title="准事故类型"
width="200"
trigger="hover"
:content="scope.row.type"
>
<span slot="reference">{{ <span slot="reference">{{
scope.row.type.length > 10 scope.row.type.length > 10
? scope.row.type.substring(0, 10) + "..." ? scope.row.type.substring(0, 10) + "..."
: scope.row.type : scope.row.type
}}</span> }}</span>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="存在部位" align="center" prop="presenceLocation"> <template slot-scope="scope">
label="存在部位" <el-popover placement="top-start" title="存在部位" width="200" trigger="hover"
align="center" :content="scope.row.presenceLocation">
prop="presenceLocation"
> <template slot-scope="scope">
<el-popover
placement="top-start"
title="存在部位"
width="200"
trigger="hover"
:content="scope.row.presenceLocation"
>
<span slot="reference">{{ <span slot="reference">{{
scope.row.presenceLocation.length > 10 scope.row.presenceLocation.length > 10
? scope.row.presenceLocation.substring(0, 10) + "..." ? scope.row.presenceLocation.substring(0, 10) + "..."
: scope.row.presenceLocation : scope.row.presenceLocation
}}</span> }}</span>
</el-popover> </el-popover>
</template> </template>
</el-table-column></el-table-column> </el-table-column></el-table-column>
<el-table-column label="操作" align="center" prop="describe"> <el-table-column label="操作" align="center" prop="describe">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button <el-button size="mini" type="text" icon="el-icon-download"
size="mini" @click="exportList(scope.row.id)">下载风险告知卡</el-button>
type="text" <el-button size="mini" type="text" icon="el-icon-view"
icon="el-icon-download" @click="showDrawCanvas(scope.row.floorId, scope.row.buildingId)">查看四色图</el-button>
@click="exportList(scope.row.id)" <router-link :to="'/risk/plan/inherentdata/index/' + scope.row.id" class="link-type">
>下载风险告知卡</el-button <el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
>
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="showDrawCanvas(scope.row.floorId,scope.row.buildingId)"
>查看四色图</el-button
>
<router-link
:to="'/risk/plan/inherentdata/index/' + scope.row.id"
class="link-type"
>
<el-button size="mini" type="text" icon="el-icon-view"
>详情</el-button
>
</router-link> </router-link>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
v-show="total > 0" :limit.sync="queryParams.pageSize" @pagination="getRiskList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getRiskList"
/>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -216,31 +144,15 @@ ...@@ -216,31 +144,15 @@
<div class="approveL"> <div class="approveL">
<div class="titles">审批流程</div> <div class="titles">审批流程</div>
<el-steps direction="vertical" :active="999"> <el-steps direction="vertical" :active="999">
<el-step <el-step v-for="approveDto in InfoList.approveListDtos" :title="approveDto.taskName"
v-for="approveDto in InfoList.approveListDtos" :key="approveDto.taskId" icon="el-icon-success">
:title="approveDto.taskName"
:key="approveDto.taskId"
icon="el-icon-success"
>
<template slot="description"> <template slot="description">
<el-card <el-card class="box-card" style="line-height: 25px; font-size: 14px; margin: 15px">
class="box-card" <span style="display: block"><b>操作时间: </b>{{ approveDto.startTime }}</span>
style="line-height: 25px; font-size: 14px; margin: 15px" <span style="display: block"><b> 操作人:</b>{{ approveDto.approvalUserName }}</span>
> <span style="display: block"><b>任务节点: </b>{{ approveDto.taskName }}</span>
<span style="display: block" <span style="display: block" v-if="approveDto.taskOpinion != null"><b>审批意见: </b>{{ "" +
><b>操作时间: </b>{{ approveDto.startTime }}</span approveDto.taskOpinion }}</span>
>
<span style="display: block"
><b> 操作人:</b>{{ approveDto.approvalUserName }}</span
>
<span style="display: block"
><b>任务节点: </b>{{ approveDto.taskName }}</span
>
<span
style="display: block"
v-if="approveDto.taskOpinion != null"
><b>审批意见: </b>{{ "" + approveDto.taskOpinion }}</span
>
</el-card> </el-card>
</template> </template>
</el-step> </el-step>
...@@ -253,15 +165,10 @@ ...@@ -253,15 +165,10 @@
<el-table :data="reportList"> <el-table :data="reportList">
<el-table-column label="编号" align="center" prop="id" /> <el-table-column label="编号" align="center" prop="id" />
<el-table-column label="生成时间" align="center" prop="inherentId" /> <el-table-column label="生成时间" align="center" prop="inherentId" />
<el-table-column label="生成人员" align="center" prop="code" />
<el-table-column label="所属建筑" align="center" prop="name" />
<el-table-column label="所属承租户" align="center" prop="type" />
<el-table-column label="操作" align="center" prop="describe"> <el-table-column label="操作" align="center" prop="describe">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button size="mini" type="text" icon="el-icon-download" <el-button size="mini" type="text" icon="el-icon-download" @click="toDown">下载</el-button>
>下载</el-button
>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -326,7 +233,11 @@ export default { ...@@ -326,7 +233,11 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: {}, rules: {},
reportList: [], reportList: [{
id: "FXPGBG202403071748JF",
inherentId: "2024-03-07",
}],
InfoList: {}, InfoList: {},
}; };
}, },
...@@ -341,6 +252,9 @@ export default { ...@@ -341,6 +252,9 @@ export default {
this.getInfo(this.$route.params.id); this.getInfo(this.$route.params.id);
}, },
methods: { methods: {
toDown() {
window.open('http://rongtongpc.censoft.com.cn/dev-api/profile/upload/report/风险评估报告模板.docx');
},
downList(planId) { downList(planId) {
this.download("/system/risk/plan/exportExcel/InherentList/" + planId, {}); this.download("/system/risk/plan/exportExcel/InherentList/" + planId, {});
}, },
...@@ -411,7 +325,7 @@ export default { ...@@ -411,7 +325,7 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
handleSelectionChange() {}, handleSelectionChange() { },
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment