Skip to content

R
rongtong-pc
Commit cb4d07f1 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

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

parents dfa102a0 be3410fc
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 74 deletions
.env.development
View file @ cb4d07f1
# 页面标题 # 页面标题
VUE_APP_TITLE = 融通物管安全管理平台 VUE_APP_TITLE = 融通危险源辨识系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 融通物管安全管理平台/开发环境 # 融通危险源辨识系统/开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# 路由懒加载 # 路由懒加载
......
.env.production
View file @ cb4d07f1
# 页面标题 # 页面标题
VUE_APP_TITLE = 融通物管安全管理平台 VUE_APP_TITLE = 融通危险源辨识系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# 融通物管安全管理平台/生产环境 # 融通危险源辨识系统/生产环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
.env.staging
View file @ cb4d07f1
# 页面标题 # 页面标题
VUE_APP_TITLE = 融通物管安全管理平台 VUE_APP_TITLE = 融通危险源辨识系统
NODE_ENV = production NODE_ENV = production
# 测试环境配置 # 测试环境配置
ENV = 'staging' ENV = 'staging'
# 融通物管安全管理平台/测试环境 # 融通危险源辨识系统/测试环境
VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = '/stage-api'
src/api/risk/existing.js
View file @ cb4d07f1
...@@ -8,3 +8,13 @@ export function listList(query) { ...@@ -8,3 +8,13 @@ export function listList(query) {
params: query params: query
}) })
} }
// 查询固有风险台账列表
export function inherentListList(query) {
return request({
url: '/system/risk/plan/inherentList',
method: 'get',
params: query
})
}
src/views/login.vue
View file @ cb4d07f1
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:rules="loginRules" :rules="loginRules"
class="login-form" class="login-form"
> >
<h3 class="title">融通物管安全管理平台</h3> <h3 class="title">融通危险源辨识系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
......
src/views/register.vue
View file @ cb4d07f1
<template> <template>
<div class="register"> <div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"> <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">融通物管安全管理平台</h3> <h3 class="title">融通危险源辨识系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号"> <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" /> <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
......
src/views/risk/existing/index.vue
View file @ cb4d07f1
...@@ -8,6 +8,19 @@ ...@@ -8,6 +8,19 @@
v-show="showSearch" v-show="showSearch"
label-width="90px" label-width="90px"
> >
<el-form-item label="区域公司" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入区域公司"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="风险名称" prop="name"> <el-form-item label="风险名称" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
...@@ -102,98 +115,108 @@ ...@@ -102,98 +115,108 @@
v-loading="loading" v-loading="loading"
:data="inherentList" :data="inherentList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column
type="selection" <el-table-column label="项目信息" align="center" fixed width="500">
width="55" <el-table-column
label="区域公司"
align="center" align="center"
fixed="left" prop="deptName"
width="100"
/> />
<!-- <el-table-column label="序号" align="center"> <el-table-column label="项目名称" align="center" prop="projectName" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <el-popover
</template> placement="top-start"
</el-table-column> --> title="项目名称"
width="200"
trigger="hover"
:content="scope.row.projectName"
>
<span slot="reference">{{
scope.row.projectName.length > 10
? scope.row.projectName.substring(0, 10) + "..."
: scope.row.projectName
}}</span>
</el-popover>
</template>
</el-table-column>
<el-table-column <el-table-column label="所属城市" align="center" prop="city" width="100"/>
label="风险名称" <el-table-column label="项目业态" align="center" prop="businessFormat" width="100"/>
align="center" <el-table-column label="项目类型" align="center" prop="type" width="100"/>
prop="name"
fixed="left"
/>
<el-table-column label="所属建筑" align="center" prop="buildingName">
<template slot-scope="scope">
<el-popover
placement="top-start"
title="所属建筑"
width="200"
trigger="hover"
:content="scope.row.buildingName"
>
<span slot="reference">{{
scope.row.buildingName.length > 10
? scope.row.buildingName.substring(0, 10) + "..."
: scope.row.buildingName
}}</span>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="所属楼层" align="center" prop="floorName" /> <el-table-column label="项目风险清单" align="center">
<el-table-column label="所属房间" align="center" prop="roomName" /> <el-table-column label="固有风险" align="center">
<el-table-column label="风险等级（系数）" align="center" prop="level" /> <el-table-column label="危险源名称" align="center" prop="inherentName" width="100"/>
<el-table-column label="风险因素" align="center" prop="factor"> <el-table-column label="风险等级" align="center" prop="inherentLevel" width="100"/>
<template slot-scope="scope"> </el-table-column>
<el-popover <el-table-column label="现有风险" align="center">
placement="top-start" <el-table-column label="危险源名称" align="center" prop="existingName" width="100"/>
title="风险因素" <el-table-column label="风险等级" align="center" prop="existingLevel" width="100"/>
width="200" </el-table-column>
trigger="hover" <el-table-column label="风险点位置" align="center" prop="presenceLocation" width="100"/>
:content="scope.row.factor" <el-table-column label="可能导致的事故后果" align="center" prop="listType" width="100"/>
> </el-table-column>
<span slot="reference">{{
scope.row.factor.length > 10 <el-table-column label="项目整体风险等级" align="center">
? scope.row.factor.substring(0, 10) + "..." <el-table-column label="固有风险" align="center" prop="inherentProjectLevel" width="100"/>
: scope.row.factor <el-table-column label="现状风险" align="center" prop="existingProjectLevel" width="100"/>
}}</span>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="准事故类型" align="center" prop="type">
<el-table-column label="风险管控" align="center">
<el-table-column label="应采取的管控措施" align="center" prop="inherentMeasuresAdministration" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
placement="top-start" placement="top-start"
title="准事故类型" title="应采取的管控措施"
width="200" width="200"
trigger="hover" trigger="hover"
:content="scope.row.type" :content="scope.row.inherentMeasuresAdministration"
> >
<span slot="reference">{{ <span slot="reference">{{
scope.row.type.length > 10 scope.row.inherentMeasuresAdministration&&scope.row.inherentMeasuresAdministration.length > 10
? scope.row.type.substring(0, 10) + "..." ? scope.row.inherentMeasuresAdministration.substring(0, 10) + "..."
: scope.row.type : scope.row.inherentMeasuresAdministration
}}</span> }}</span>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="存在部位" align="center" prop="presenceLocation"> <el-table-column label="已采取的管控措施" align="center" prop="existingMeasuresAdministration" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
placement="top-start" placement="top-start"
title="存在部位" title="已采取的管控措施"
width="200" width="200"
trigger="hover" trigger="hover"
:content="scope.row.presenceLocation" :content="scope.row.existingMeasuresAdministration"
> >
<span slot="reference">{{ <span slot="reference">{{
scope.row.presenceLocation.length > 10 scope.row.existingMeasuresAdministration&&scope.row.existingMeasuresAdministration.length > 10
? scope.row.presenceLocation.substring(0, 10) + "..." ? scope.row.existingMeasuresAdministration.substring(0, 10) + "..."
: scope.row.presenceLocation : scope.row.existingMeasuresAdministration
}}</span> }}</span>
</el-popover> </el-popover>
</template> </template>
</el-table-column>
<el-table-column label="分级管控" align="center">
<el-table-column label="管控责任单位" align="center" prop="measuresDeptName" width="100"/>
<el-table-column label="管控责任人" align="center" prop="measuresUserName" width="100"/>
<el-table-column label="人员联系方式" align="center" prop="measuresUserPhone" width="100"/>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="重大危险源管理" align="center">
<el-table-column label="是否存在重大危险源" align="center" prop="majorHazardSource" width="100"/>
<el-table-column label="重大危险源名称" align="center" prop="hazardSourceName" width="100"/>
<el-table-column label="重大危险源描述" align="center" prop="majorHazardDescription" width="100"/>
</el-table-column>
<el-table-column label="判定依据" align="center" prop="referenceBasis" width="100"/>
<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>
...@@ -221,7 +244,7 @@ ...@@ -221,7 +244,7 @@
</template> </template>
<script> <script>
import { listList } from "@/api/risk/existing"; import { inherentListList } from "@/api/risk/existing";
export default { export default {
name: "inherent", name: "inherent",
...@@ -272,7 +295,7 @@ export default { ...@@ -272,7 +295,7 @@ export default {
/** 查询固有风险清单库列表 */ /** 查询固有风险清单库列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listList(this.queryParams).then((response) => { inherentListList(this.queryParams).then((response) => {
this.inherentList = response.rows; this.inherentList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
......
vue.config.js
View file @ cb4d07f1
...@@ -8,7 +8,7 @@ function resolve(dir) { ...@@ -8,7 +8,7 @@ function resolve(dir) {
const CompressionPlugin = require("compression-webpack-plugin"); const CompressionPlugin = require("compression-webpack-plugin");
const name = process.env.VUE_APP_TITLE || "融通物管安全管理平台"; // 网页标题 const name = process.env.VUE_APP_TITLE || "融通危险源辨识系统"; // 网页标题
const port = process.env.port || process.env.npm_config_port || 80; // 端口 const port = process.env.port || process.env.npm_config_port || 80; // 端口
......
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