添加风险评估模板 (75013f21) · Commits · 融通安全管理系统 / rongtong-app

src/views/riskProject/add/taskList.vue

+64 −75

Original line number	Diff line number	Diff line
		@@ -121,7 +121,8 @@
		</van-row>
		<van-row gutter="0">
		<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,
		"DT2")
		}}</van-col>
		</van-row>
		<van-row gutter="0">
		@@ -191,38 +192,23 @@
		</div>
		</van-tab>
		<van-tab title="评估报告">
		<div style="height: 1.5rem;
		<a style="height: 1.5rem;
		background-color: #fff;
		border-bottom: 1px solid #97999a;
		display: flex;
		justify-content: space-between;
		line-height: 1.5rem;
		">
		color:#010101;
		" :href="fileUrl()" target="_blank">
		<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>风险评估报告模板.docx</div>
		<div>2019-3-21 10:23 154KB</div>
		</div>
		<div>
		<van-icon name="arrow" size="26px" />
		</div>
		</div>
		<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>
		</a>
		</van-tab>
		</van-tabs>
		</div>
		@@ -452,7 +438,10 @@ export default {
		timestampToTimes(time, type) {
		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 风险清单筛选 */
		changeData(arr) {
		if (Array.isArray(arr)) {

src/views/riskProject/assess/riskBigDetail.vue

+56 −153

Original line number	Diff line number	Diff line
		@@ -33,154 +33,69 @@
		</div>
		</van-grid-item>
		</van-grid>
		<van-steps
		:active="active"
		active-icon="success"
		active-color="#38f"
		style="margin: 0.26rem 0;"
		>
		<van-steps :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-steps>
		<van-tabs
		v-model="active"
		color="#2980f7"
		animated
		:sticky="true"
		offset-top="2.93rem"
		>
		<van-tabs v-model="active" color="#2980f7" animated :sticky="true" offset-top="2.93rem">
		<van-tab title="任务详情">
		<van-form
		:scroll-to-error="true"
		:show-error="false"
		validate-trigger="onSubmit"
		>
		<van-field
		readonly
		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-form :scroll-to-error="true" :show-error="false" validate-trigger="onSubmit">
		<van-field readonly 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
		readonly
		name="projectName"
		:value="form.projectName"
		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
		readonly
		name="buildingNames"
		:value="form.buildingNames"
		label="评估楼栋"
		input-align="right"
		:rules="[{ required: true, message: '评估楼栋不能为空' }]"
		/>
		<van-field readonly name="buildingNames" :value="form.buildingNames" label="评估楼栋" input-align="right"
		:rules="[{ required: true, message: '评估楼栋不能为空' }]" />

		<van-field
		readonly
		name="leaderUserName"
		:value="form.leaderUserName"
		label="项目负责人"
		input-align="right"
		:rules="[{ required: true, message: '事故类型不能为空' }]"
		/>
		<van-field readonly name="leaderUserName" :value="form.leaderUserName" label="项目负责人" 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);
		}
		"
		: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);
		}
		"
		input-align="right"
		:rules="[{ required: true, message: '任务结束时间不能为空' }]"
		/>
		" input-align="right" :rules="[{ required: true, message: '任务结束时间不能为空' }]" />

		<van-field
		clickable
		name="workUserNames"
		:value="form.workUserNames"
		label="执行人员"
		input-align="right"
		:rules="[{ required: true, message: '执行人员不能为空' }]"
		/>
		<van-field clickable name="workUserNames" :value="form.workUserNames" label="执行人员" input-align="right"
		:rules="[{ required: true, message: '执行人员不能为空' }]" />
		</van-form>
		</van-tab>
		<van-tab title="风险清单"> </van-tab>
		<van-tab title="审核记录">
		<div class="journal-wrap">
		<van-cell-group inset>
		<van-steps
		direction="vertical"
		:active="99999"
		v-if="riskLogList.length > 0"
		>
		<van-steps direction="vertical" :active="99999" v-if="riskLogList.length > 0">
		<van-step v-for="(item, index) in riskLogList" :key="index">
		<div class="step-wrap">
		<van-row>
		<van-col span="24"
		><div class="info-title">
		<van-col span="24">
		<div class="info-title">
		{{ timestampToTimes(item.startTime) }}
		</div></van-col
		>
		</div>
		</van-col>
		</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.approvalUserName }}</van-col>
		</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>
		</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.taskResult }}</van-col>
		</van-row>
		<!-- <van-row>
		@@ -199,47 +114,27 @@
		</div>
		</van-tab>
		<van-tab title="风险评估报告">
		<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>
		<div
		style="height: 1.5rem;
		<a style="height: 1.5rem;
		color:#010101;
		background-color: #fff;
		border-bottom: 1px solid #97999a;
		display: flex;
		justify-content: space-between;
		line-height: 1.5rem;
		"
		>
		" :href="fileUrl()" target="_blank">
		<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>风险评估报告模板.docx</div>
		<div>2019-3-21 10:23 154KB</div>
		</div>
		<div>
		<van-icon name="arrow" size="26px" />
		</div>
		</div>
		</a>
		</van-tab>
		</van-tabs>
		</div>
		<div
		style="display: flex;
		<div style="display: flex;
		justify-content: space-around;
		background-color: #fff;
		border-top: 1px solid #e3e3e3;
		@@ -247,12 +142,8 @@
		width: 100%;
		text-align: center;
		position: fixed;
		bottom: 0;"
		>
		<div
		@click="performTasks"
		style="color: #4bced0;font-size: 14px;font-weight: 600;"
		>
		bottom: 0;">
		<div @click="performTasks" style="color: #4bced0;font-size: 14px;font-weight: 600;">
		<div style="font-size: 22px;"><van-icon name="plus" /></div>
		<div>执行任务</div>
		</div>
		@@ -292,6 +183,10 @@ export default {
		this.postList(planId);
		},
		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) {
		return timestampToTime(new Date(time), "DT2", true);
		},
		@@ -363,6 +258,7 @@ export default {
		.cell-wrap {
		position: relative;
		}

		p {
		font-size: 0.4rem;
		font-weight: none;
		@@ -370,31 +266,38 @@ p {
		margin: 0.186667rem 0;
		color: #7f7f7f;
		}

		.van-cell-group--inset {
		margin: 0;
		margin-bottom: 10px;
		padding: 10px;
		font-size: 13px;
		position: relative;

		.van-row {
		margin-bottom: 0.133333rem;
		line-height: 0.64rem;
		}
		}

		.journal-wrap {
		position: relative;
		}

		.supervise-wrap {
		position: relative;
		}

		.info-title {
		color: #2980f7;
		font-weight: none;
		}

		.field-title {
		color: black;
		font-weight: none;
		}

		.more {
		position: absolute;
		bottom: 0.32rem;