Skip to content

R
rongtong-app
Commit 75013f21 authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files
Options

添加风险评估模板

parent 594e9fa2
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 228 deletions
src/views/riskProject/add/taskList.vue
View file @ 75013f21
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
<div>开始时间:</div> <div>开始时间:</div>
<div> <div>
{{ {{
timestampToTimes(messageList.startTime, "DT2") || timestampToTimes(messageList.startTime, "DT2") ||
messageList.startTime messageList.startTime
}} }}
</div> </div>
</van-grid-item> </van-grid-item>
<van-grid-item> <van-grid-item>
<div>结束时间:</div> <div>结束时间:</div>
<div> <div>
{{ {{
timestampToTimes(messageList.endTime, "DT2") || timestampToTimes(messageList.endTime, "DT2") ||
messageList.endTime messageList.endTime
}} }}
</div> </div>
</van-grid-item> </van-grid-item>
</van-grid> </van-grid>
...@@ -69,14 +69,14 @@ ...@@ -69,14 +69,14 @@
input-align="right" :rules="[{ required: true, message: '评估成员不能为空' }]" /> input-align="right" :rules="[{ required: true, message: '评估成员不能为空' }]" />
<van-field v-model="form.startTime" readonly name="location" label="任务开始时间" input-align="right" :formatter="() => { <van-field v-model="form.startTime" readonly name="location" label="任务开始时间" input-align="right" :formatter="() => {
return timestampToTimes(form.startTime, 'DT2'); return timestampToTimes(form.startTime, 'DT2');
} }
" :rules="[{ required: true, message: '任务开始时间不能为空' }]" /> " :rules="[{ required: true, message: '任务开始时间不能为空' }]" />
<van-field v-model="form.endTime" readonly name="location" label="任务结束时间" :formatter="() => { <van-field v-model="form.endTime" readonly name="location" label="任务结束时间" :formatter="() => {
return timestampToTimes(form.endTime, 'DT2'); return timestampToTimes(form.endTime, 'DT2');
} }
" input-align="right" :rules="[{ required: true, message: '任务结束时间不能为空' }]" /> " input-align="right" :rules="[{ required: true, message: '任务结束时间不能为空' }]" />
</van-form> </van-form>
</van-tab> </van-tab>
<van-tab title="风险清单"> <van-tab title="风险清单">
...@@ -99,21 +99,21 @@ ...@@ -99,21 +99,21 @@
<van-col> <van-col>
<van-image style="vertical-align: middle;margin-right: 15px;margin-left: 10px;" width="58" height="58" <van-image style="vertical-align: middle;margin-right: 15px;margin-left: 10px;" width="58" height="58"
:src="item.level == '重大风险' :src="item.level == '重大风险'
? require('@/assets/imgs/redInherent.png') ? require('@/assets/imgs/redInherent.png')
: item.level == '较大风险' : item.level == '较大风险'
? require('@/assets/imgs/inherentOrange.png') ? require('@/assets/imgs/inherentOrange.png')
: item.level === '一般风险' : item.level === '一般风险'
? require('@/assets/imgs/yellowInherent.png') ? require('@/assets/imgs/yellowInherent.png')
: require('@/assets/imgs/blueInherent.png') : require('@/assets/imgs/blueInherent.png')
" /> " />
<!-- <van-image width="46" height="46" :src="item.avatar" /> --> <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
</van-col> </van-col>
<van-col span="17"> <van-col span="17">
<van-row gutter="0"> <van-row gutter="0">
<van-col span="10" style="font-weight: bold;color:#000;font-size: 16px;">风险名称：</van-col> <van-col span="10" style="font-weight: bold;color:#000;font-size: 16px;">风险名称：</van-col>
<van-col span="14" style="color: #000;font-size: 16px;">{{ <van-col span="14" style="color: #000;font-size: 16px;">{{
item.name item.name
}}</van-col> }}</van-col>
</van-row> </van-row>
<van-row gutter="0"> <van-row gutter="0">
<van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">风险等级：</van-col> <van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">风险等级：</van-col>
...@@ -121,14 +121,15 @@ ...@@ -121,14 +121,15 @@
</van-row> </van-row>
<van-row gutter="0"> <van-row gutter="0">
<van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">上报时间：</van-col> <van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">上报时间：</van-col>
<van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ timestampToTimes(item.createTime, "DT2") <van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ timestampToTimes(item.createTime,
}}</van-col> "DT2")
}}</van-col>
</van-row> </van-row>
<van-row gutter="0"> <van-row gutter="0">
<van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">所属房间：</van-col> <van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">所属房间：</van-col>
<van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ <van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{
item.buildingName + item.floorName + item.roomName item.buildingName + item.floorName + item.roomName
}}</van-col> }}</van-col>
</van-row> </van-row>
</van-col> </van-col>
<van-col span="4" class="list-right"> <van-col span="4" class="list-right">
...@@ -163,13 +164,13 @@ ...@@ -163,13 +164,13 @@
<van-row> <van-row>
<van-col span="7"><span class="field-title">任务节点：</span></van-col> <van-col span="7"><span class="field-title">任务节点：</span></van-col>
<van-col span="17">{{ item.taskName <van-col span="17">{{ item.taskName
}}{{ }}{{
item.taskResult item.taskResult
? item.taskResult == 1 ? item.taskResult == 1
? "（审批通过）" ? "（审批通过）"
: "（审批否决）" : "（审批否决）"
: "" : ""
}}</van-col> }}</van-col>
</van-row> </van-row>
<van-row v-show="item.taskResult"> <van-row v-show="item.taskResult">
<van-col span="7"><span class="field-title">审批意见：</span></van-col> <van-col span="7"><span class="field-title">审批意见：</span></van-col>
...@@ -191,38 +192,23 @@ ...@@ -191,38 +192,23 @@
</div> </div>
</van-tab> </van-tab>
<van-tab title="评估报告"> <van-tab title="评估报告">
<div style="height: 1.5rem; <a style="height: 1.5rem;
background-color: #fff; background-color: #fff;
border-bottom: 1px solid #97999a; border-bottom: 1px solid #97999a;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
line-height: 1.5rem; line-height: 1.5rem;
"> color:#010101;
" :href="fileUrl()" target="_blank">
<div><van-icon name="column" size="26px" /></div> <div><van-icon name="column" size="26px" /></div>
<div style="flex-grow:1;line-height: 0.6rem"> <div style="flex-grow:1;line-height: 0.6rem">
<div>风险评估报告.PDF</div> <div>风险评估报告模板.docx</div>
<div>2019-3-21 10:23 100KB</div> <div>2019-3-21 10:23 154KB</div>
</div> </div>
<div> <div>
<van-icon name="arrow" size="26px" /> <van-icon name="arrow" size="26px" />
</div> </div>
</div> </a>
<div style="height: 1.5rem;
background-color: #fff;
border-bottom: 1px solid #97999a;
display: flex;
justify-content: space-between;
line-height: 1.5rem;
">
<div><van-icon name="column" size="26px" /></div>
<div style="flex-grow:1;line-height: 0.6rem">
<div>风险评估报告.PDF</div>
<div>2019-3-21 10:23 100KB</div>
</div>
<div>
<van-icon name="arrow" size="26px" />
</div>
</div>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
</div> </div>
...@@ -306,19 +292,19 @@ ...@@ -306,19 +292,19 @@
</van-col> </van-col>
<van-col span="14">{{ item.buildingName }}</van-col> <van-col span="14">{{ item.buildingName }}</van-col>
<van-col span="8" :style="{ <van-col span="8" :style="{
color: color:
item.status == 'wait' item.status == 'wait'
? '#F79648' ? '#F79648'
: item.status == 'finish' : item.status == 'finish'
? '#03B615' ? '#03B615'
: '#FF041D' : '#FF041D'
}">{{ }">{{
item.status == "wait" item.status == "wait"
? "待评估" ? "待评估"
: item.status == "finish" : item.status == "finish"
? "已完成" ? "已完成"
: "已退回" : "已退回"
}}</van-col> }}</van-col>
</van-row> </van-row>
<van-row> <van-row>
...@@ -343,10 +329,10 @@ ...@@ -343,10 +329,10 @@
<van-row> <van-row>
<van-button type="info" size="mini" @click=" <van-button type="info" size="mini" @click="
{ {
checkValue = [item.buildingId]; checkValue = [item.buildingId];
approveTask(0); approveTask(0);
} }
">审批否决</van-button> ">审批否决</van-button>
</van-row></van-col> </van-row></van-col>
</van-row> </van-row>
</van-cell-group> </van-cell-group>
...@@ -363,10 +349,10 @@ ...@@ -363,10 +349,10 @@
bottom: 0;"> bottom: 0;">
<div @click=" <div @click="
{ {
checkValue = []; checkValue = [];
isShowAppvoreList = false; isShowAppvoreList = false;
} }
" style="color: #FB6260;font-size: 14px;font-weight: 600;"> " style="color: #FB6260;font-size: 14px;font-weight: 600;">
<div style="font-size: 22px;"><van-icon name="cross" /></div> <div style="font-size: 22px;"><van-icon name="cross" /></div>
<div>返回</div> <div>返回</div>
</div> </div>
...@@ -452,7 +438,10 @@ export default { ...@@ -452,7 +438,10 @@ export default {
timestampToTimes(time, type) { timestampToTimes(time, type) {
return timestampToTime(new Date(time), type, true); return timestampToTime(new Date(time), type, true);
}, },
fileUrl() {
// return window.location.origin + '/dev-api/profile/upload/report/风险评估报告模板.docx'
return 'http://rongtongpc.censoft.com.cn/dev-api/profile/upload/report/风险评估报告模板.docx'
},
/* swp add 风险清单筛选 */ /* swp add 风险清单筛选 */
changeData(arr) { changeData(arr) {
if (Array.isArray(arr)) { if (Array.isArray(arr)) {
......
src/views/riskProject/assess/riskBigDetail.vue
View file @ 75013f21
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<div>开始时间:</div> <div>开始时间:</div>
<div> <div>
{{ {{
timestampToTimes(messageList.startTime) || messageList.startTime timestampToTimes(messageList.startTime) || messageList.startTime
}} }}
</div> </div>
</van-grid-item> </van-grid-item>
<van-grid-item> <van-grid-item>
...@@ -33,154 +33,69 @@ ...@@ -33,154 +33,69 @@
</div> </div>
</van-grid-item> </van-grid-item>
</van-grid> </van-grid>
<van-steps <van-steps :active="active" active-icon="success" active-color="#38f" style="margin: 0.26rem 0;">
:active="active"
active-icon="success"
active-color="#38f"
style="margin: 0.26rem 0;"
>
<van-step>任务发起</van-step> <van-step>任务发起</van-step>
<van-step>风险评估</van-step> <van-step>风险评估</van-step>
<van-step>评估审核</van-step> <van-step>评估审核</van-step>
<van-step>项目完成</van-step> <van-step>项目完成</van-step>
</van-steps> </van-steps>
<van-tabs <van-tabs v-model="active" color="#2980f7" animated :sticky="true" offset-top="2.93rem">
v-model="active"
color="#2980f7"
animated
:sticky="true"
offset-top="2.93rem"
>
<van-tab title="任务详情"> <van-tab title="任务详情">
<van-form <van-form :scroll-to-error="true" :show-error="false" validate-trigger="onSubmit">
:scroll-to-error="true" <van-field readonly name="createUserName" :value="form.createUserName" label="创建人员" input-align="right"
:show-error="false" :rules="[{ required: true, message: '创建人员不能为空' }]" />
validate-trigger="onSubmit" <van-field readonly name="createDeptName" :value="form.createDeptName" label="创建单位" input-align="right"
> :rules="[{ required: true, message: '创建单位不能为空' }]" />
<van-field <van-field readonly name="projectName" :value="form.projectName" label="任务名称" input-align="right"
readonly :rules="[{ required: true, message: '任务名称不能为空' }]" />
name="createUserName"
:value="form.createUserName"
label="创建人员"
input-align="right"
:rules="[{ required: true, message: '创建人员不能为空' }]"
/>
<van-field
readonly
name="createDeptName"
:value="form.createDeptName"
label="创建单位"
input-align="right"
:rules="[{ required: true, message: '创建单位不能为空' }]"
/>
<van-field
readonly
name="projectName"
:value="form.projectName"
label="任务名称"
input-align="right"
:rules="[{ required: true, message: '任务名称不能为空' }]"
/>
<van-field <van-field readonly name="projectName" :value="form.projectName" label="关联项目" input-align="right"
readonly :rules="[{ required: true, message: '关联项目不能为空' }]" />
name="projectName"
:value="form.projectName"
label="关联项目"
input-align="right"
:rules="[{ required: true, message: '关联项目不能为空' }]"
/>
<van-field <van-field readonly name="buildingNames" :value="form.buildingNames" label="评估楼栋" input-align="right"
readonly :rules="[{ required: true, message: '评估楼栋不能为空' }]" />
name="buildingNames"
:value="form.buildingNames"
label="评估楼栋"
input-align="right"
:rules="[{ required: true, message: '评估楼栋不能为空' }]"
/>
<van-field <van-field readonly name="leaderUserName" :value="form.leaderUserName" label="项目负责人" input-align="right"
readonly :rules="[{ required: true, message: '事故类型不能为空' }]" />
name="leaderUserName"
:value="form.leaderUserName"
label="项目负责人"
input-align="right"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/>
<van-field <van-field v-model="form.startTime" readonly name="location" label="任务开始时间" input-align="right" :formatter="() => {
v-model="form.startTime" return timestampToTimes(form.startTime);
readonly }
name="location" " :rules="[{ required: true, message: '任务开始时间不能为空' }]" />
label="任务开始时间"
input-align="right"
:formatter="
() => {
return timestampToTimes(form.startTime);
}
"
:rules="[{ required: true, message: '任务开始时间不能为空' }]"
/>
<van-field <van-field v-model="form.endTime" readonly name="location" label="任务结束时间" :formatter="() => {
v-model="form.endTime" return timestampToTimes(form.endTime);
readonly }
name="location" " input-align="right" :rules="[{ required: true, message: '任务结束时间不能为空' }]" />
label="任务结束时间"
:formatter="
() => {
return timestampToTimes(form.endTime);
}
"
input-align="right"
:rules="[{ required: true, message: '任务结束时间不能为空' }]"
/>
<van-field <van-field clickable name="workUserNames" :value="form.workUserNames" label="执行人员" input-align="right"
clickable :rules="[{ required: true, message: '执行人员不能为空' }]" />
name="workUserNames"
:value="form.workUserNames"
label="执行人员"
input-align="right"
:rules="[{ required: true, message: '执行人员不能为空' }]"
/>
</van-form> </van-form>
</van-tab> </van-tab>
<van-tab title="风险清单"> </van-tab> <van-tab title="风险清单"> </van-tab>
<van-tab title="审核记录"> <van-tab title="审核记录">
<div class="journal-wrap"> <div class="journal-wrap">
<van-cell-group inset> <van-cell-group inset>
<van-steps <van-steps direction="vertical" :active="99999" v-if="riskLogList.length > 0">
direction="vertical"
:active="99999"
v-if="riskLogList.length > 0"
>
<van-step v-for="(item, index) in riskLogList" :key="index"> <van-step v-for="(item, index) in riskLogList" :key="index">
<div class="step-wrap"> <div class="step-wrap">
<van-row> <van-row>
<van-col span="24" <van-col span="24">
><div class="info-title"> <div class="info-title">
{{ timestampToTimes(item.startTime) }} {{ timestampToTimes(item.startTime) }}
</div></van-col </div>
> </van-col>
</van-row> </van-row>
<van-row> <van-row>
<van-col span="7" <van-col span="7"><span class="field-title">操作人：</span></van-col>
><span class="field-title">操作人：</span></van-col
>
<van-col span="17">{{ item.approvalUserName }}</van-col> <van-col span="17">{{ item.approvalUserName }}</van-col>
</van-row> </van-row>
<van-row> <van-row>
<van-col span="7" <van-col span="7"><span class="field-title">审批结果：</span></van-col>
><span class="field-title">审批结果：</span></van-col
>
<van-col span="17">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
</van-row> </van-row>
<van-row> <van-row>
<van-col span="7" <van-col span="7"><span class="field-title">岗位：</span></van-col>
><span class="field-title">岗位：</span></van-col
>
<van-col span="17">{{ item.taskResult }}</van-col> <van-col span="17">{{ item.taskResult }}</van-col>
</van-row> </van-row>
<!-- <van-row> <!-- <van-row>
...@@ -199,47 +114,27 @@ ...@@ -199,47 +114,27 @@
</div> </div>
</van-tab> </van-tab>
<van-tab title="风险评估报告"> <van-tab title="风险评估报告">
<div <a style="height: 1.5rem;
style="height: 1.5rem; color:#010101;
background-color: #fff;
border-bottom: 1px solid #97999a;
display: flex;
justify-content: space-between;
line-height: 1.5rem;
"
>
<div><van-icon name="column" size="26px" /></div>
<div style="flex-grow:1;line-height: 0.6rem">
<div>风险评估报告.PDF</div>
<div>2019-3-21 10:23 100KB</div>
</div>
<div>
<van-icon name="arrow" size="26px" />
</div>
</div>
<div
style="height: 1.5rem;
background-color: #fff; background-color: #fff;
border-bottom: 1px solid #97999a; border-bottom: 1px solid #97999a;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
line-height: 1.5rem; line-height: 1.5rem;
" " :href="fileUrl()" target="_blank">
>
<div><van-icon name="column" size="26px" /></div> <div><van-icon name="column" size="26px" /></div>
<div style="flex-grow:1;line-height: 0.6rem"> <div style="flex-grow:1;line-height: 0.6rem">
<div>风险评估报告.PDF</div> <div>风险评估报告模板.docx</div>
<div>2019-3-21 10:23 100KB</div> <div>2019-3-21 10:23 154KB</div>
</div> </div>
<div> <div>
<van-icon name="arrow" size="26px" /> <van-icon name="arrow" size="26px" />
</div> </div>
</div> </a>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
</div> </div>
<div <div style="display: flex;
style="display: flex;
justify-content: space-around; justify-content: space-around;
background-color: #fff; background-color: #fff;
border-top: 1px solid #e3e3e3; border-top: 1px solid #e3e3e3;
...@@ -247,12 +142,8 @@ ...@@ -247,12 +142,8 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
position: fixed; position: fixed;
bottom: 0;" bottom: 0;">
> <div @click="performTasks" style="color: #4bced0;font-size: 14px;font-weight: 600;">
<div
@click="performTasks"
style="color: #4bced0;font-size: 14px;font-weight: 600;"
>
<div style="font-size: 22px;"><van-icon name="plus" /></div> <div style="font-size: 22px;"><van-icon name="plus" /></div>
<div>执行任务</div> <div>执行任务</div>
</div> </div>
...@@ -292,6 +183,10 @@ export default { ...@@ -292,6 +183,10 @@ export default {
this.postList(planId); this.postList(planId);
}, },
methods: { methods: {
fileUrl() {
// return window.location.origin + '/dev-api/profile/upload/report/风险评估报告模板.docx'
return 'http://rongtongpc.censoft.com.cn/dev-api/profile/upload/report/风险评估报告模板.docx'
},
timestampToTimes(time) { timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true); return timestampToTime(new Date(time), "DT2", true);
}, },
...@@ -363,6 +258,7 @@ export default { ...@@ -363,6 +258,7 @@ export default {
.cell-wrap { .cell-wrap {
position: relative; position: relative;
} }
p { p {
font-size: 0.4rem; font-size: 0.4rem;
font-weight: none; font-weight: none;
...@@ -370,31 +266,38 @@ p { ...@@ -370,31 +266,38 @@ p {
margin: 0.186667rem 0; margin: 0.186667rem 0;
color: #7f7f7f; color: #7f7f7f;
} }
.van-cell-group--inset { .van-cell-group--inset {
margin: 0; margin: 0;
margin-bottom: 10px; margin-bottom: 10px;
padding: 10px; padding: 10px;
font-size: 13px; font-size: 13px;
position: relative; position: relative;
.van-row { .van-row {
margin-bottom: 0.133333rem; margin-bottom: 0.133333rem;
line-height: 0.64rem; line-height: 0.64rem;
} }
} }
.journal-wrap { .journal-wrap {
position: relative; position: relative;
} }
.supervise-wrap { .supervise-wrap {
position: relative; position: relative;
} }
.info-title { .info-title {
color: #2980f7; color: #2980f7;
font-weight: none; font-weight: none;
} }
.field-title { .field-title {
color: black; color: black;
font-weight: none; font-weight: none;
} }
.more { .more {
position: absolute; position: absolute;
bottom: 0.32rem; bottom: 0.32rem;
......
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