Skip to content

R
rongtong-pc
Commit 68c97ffb 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 swp-develop

parents a8c0b0d6 027b28e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2760 additions and 1429 deletions
.env.production
View file @ 68c97ffb
......@@ -5,4 +5,4 @@ VUE_APP_TITLE = 融通物管安全管理平台
ENV = 'production'
# 融通物管安全管理平台/生产环境
VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = '/dev-api'
src/api/evaluation/factor.js 0 → 100644
View file @ 68c97ffb
import request from '@/utils/request'
// 查询评估模型信息列表
export function listFactor(query) {
return request({
url: '/system/evaluation/factor/list',
method: 'get',
params: query
})
}
// 查询评估模型信息详细
export function getFactor(id) {
return request({
url: '/system/evaluation/factor/' + id,
method: 'get'
})
}
// 新增评估模型信息
export function addFactor(data) {
return request({
url: '/system/evaluation/factor',
method: 'post',
data: data
})
}
// 修改评估模型信息
export function updateFactor(data) {
return request({
url: '/system/evaluation/factor',
method: 'put',
data: data
})
}
// 删除评估模型信息
export function delFactor(id) {
return request({
url: '/system/evaluation/factor/' + id,
method: 'delete'
})
}
src/api/evaluation/items.js 0 → 100644
View file @ 68c97ffb
import request from '@/utils/request'
// 查询评估选项管理列表
export function listItems(query) {
return request({
url: '/evaluation/items/list',
method: 'get',
params: query
})
}
// 查询评估选项管理详细
export function getItems(id) {
return request({
url: '/evaluation/items/' + id,
method: 'get'
})
}
// 新增评估选项管理
export function addItems(data) {
return request({
url: '/evaluation/items',
method: 'post',
data: data
})
}
// 修改评估选项管理
export function updateItems(data) {
return request({
url: '/evaluation/items',
method: 'put',
data: data
})
}
// 删除评估选项管理
export function delItems(id) {
return request({
url: '/evaluation/items/' + id,
method: 'delete'
})
}
src/api/risk/plan.js
View file @ 68c97ffb
......@@ -20,7 +20,7 @@ export function getPlan(id) {
// 新增风险计划
export function addPlan(data) {
return request({
url: '/system/risk/plan',
url: '/app-api/risk/plan',
method: 'post',
data: data
})
......@@ -29,7 +29,7 @@ export function addPlan(data) {
// 修改风险计划
export function updatePlan(data) {
return request({
url: '/system/risk/plan',
url: '/app-api/risk/plan',
method: 'put',
data: data
})
......@@ -63,4 +63,57 @@ export function exportRiskList(inherentId) {
url: '/system/risk/plan/exportWord/riskNotification/'+inherentId,
method: 'get',
})
}
\ No newline at end of file
}
//项目列表
export function getProjectList(projectName) {
return request({
url: '/system/ledger/project/listByQuery/'+projectName,
method: 'get',
})
}
//楼栋列表
export function getBuildingList(projectId) {
return request({
url: '/app-api/risk/plan/building/list/'+projectId,
method: 'get',
})
}
//根据单位id查询用户列表
export function getUserListByDeptId(deptId) {
return request({
url: '/app-api/risk/plan/user/list/'+deptId,
method: 'get',
})
}
//根据固有风险id查看固有风险信息
export function getInherentById(inherentId) {
return request({
url: '/app-api/risk/plan/inherent/details/'+inherentId,
method: 'get',
})
}
//风险现有风险清单
export function getExsitingList(query) {
return request({
url: '/system/risk/existing/list/',
method: 'get',
params: query
})
}
//根据固有风险id查看固有风险信息
export function getExistingById(exsitingId) {
return request({
url: '/app-api/risk/plan/existing/details/'+exsitingId,
method: 'get',
})
}
src/router/index.js
View file @ 68c97ffb
......@@ -134,6 +134,20 @@ export const dynamicRoutes = [
}
]
},
{
path: '/system/evaluation-items',
component: Layout,
hidden: true,
permissions: ['evaluation:items:list'],
children: [
{
path: 'index/:factorId(\\d+)',
component: () => import('@/views/evaluation/factor/items'),
name: 'Data',
meta: { title: '因素数据', activeMenu: '/evaluation/factor' }
}
]
},
{
path: '/risk/plan/ledgerdata',
component: Layout,
......@@ -148,6 +162,34 @@ export const dynamicRoutes = [
}
]
},
{
path: '/risk/plan/inherentdata',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index/:id(\\d+)',
component: () => import('@/views/risk/plan/inherentdata'),
name: 'inherentdata',
meta: { title: '固有风险详情', activeMenu: '/risk/plan/inherentdata' }
}
]
},
{
path: '/risk/plan/existingdata',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index/:id(\\d+)',
component: () => import('@/views/risk/plan/existingdata'),
name: 'existingdata',
meta: { title: '现状风险详情', activeMenu: '/risk/plan/existingdata' }
}
]
},
{
path: '/risk/drawCanvas/index',
component: Layout,
......
src/views/evaluation/factor/index.vue 0 → 100644
View file @ 68c97ffb
This diff is collapsed.
src/views/evaluation/factor/items.vue 0 → 100644
View file @ 68c97ffb
This diff is collapsed.
src/views/index.vue
View file @ 68c97ffb
This diff is collapsed.
src/views/ledger/project/index.vue
View file @ 68c97ffb
......@@ -67,7 +67,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ledger/project:project:add']"
v-hasPermi="['system:ledgerProject:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -78,7 +78,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ledger/project:project:edit']"
v-hasPermi="['system:ledgerProject:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -89,7 +89,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ledger/project:project:remove']"
v-hasPermi="['system:ledgerProject:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -99,7 +99,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ledger/project:project:export']"
v-hasPermi="['system:ledgerProject:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -134,14 +134,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ledger/project:project:edit']"
v-hasPermi="['system:ledgerProject:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ledger/project:project:remove']"
v-hasPermi="['system:ledgerProject:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/ledger/room/index.vue
View file @ 68c97ffb
......@@ -47,7 +47,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:room:add']"
v-hasPermi="['system:ledgerRoom:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -58,7 +58,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:room:edit']"
v-hasPermi="['system:ledgerRoom:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -69,7 +69,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:room:remove']"
v-hasPermi="['system:ledgerRoom:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -79,14 +79,14 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:room:export']"
v-hasPermi="['system:ledgerRoom:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="roomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="60">
<template #default="{ $index }">
......@@ -110,14 +110,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:room:edit']"
v-hasPermi="['system:ledgerRoom:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:room:remove']"
v-hasPermi="['system:ledgerRoom:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/login.vue
View file @ 68c97ffb
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<el-form
ref="loginForm"
:model="loginForm"
:rules="loginRules"
class="login-form"
>
<h3 class="title">融通物管安全管理平台</h3>
<el-form-item prop="username">
<el-input
......@@ -9,7 +14,11 @@
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"
/>
</el-input>
</el-form-item>
<el-form-item prop="password">
......@@ -20,7 +29,11 @@
placeholder="密码"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
<svg-icon
slot="prefix"
icon-class="password"
class="el-input__icon input-icon"
/>
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
......@@ -31,26 +44,36 @@
style="width: 63%"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
<svg-icon
slot="prefix"
icon-class="validCode"
class="el-input__icon input-icon"
/>
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
<img :src="codeUrl" @click="getCode" class="login-code-img" />
</div>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-checkbox
v-model="loginForm.rememberMe"
style="margin: 0px 0px 25px 0px"
>记住密码</el-checkbox
>
<el-form-item style="width: 100%">
<el-button
:loading="loading"
size="medium"
type="primary"
style="width:100%;"
style="width: 100%"
@click.native.prevent="handleLogin"
>
<span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span>
</el-button>
<div style="float: right;" v-if="register">
<router-link class="link-type" :to="'/register'">立即注册</router-link>
<div style="float: right" v-if="register">
<router-link class="link-type" :to="'/register'"
>立即注册</router-link
>
</div>
</el-form-item>
</el-form>
......@@ -64,7 +87,7 @@
<script>
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
import { encrypt, decrypt } from "@/utils/jsencrypt";
export default {
name: "Login",
......@@ -72,36 +95,36 @@ export default {
return {
codeUrl: "",
loginForm: {
username: "admin",
password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""
uuid: "",
},
loginRules: {
username: [
{ required: true, trigger: "blur", message: "请输入您的账号" }
{ required: true, trigger: "blur", message: "请输入您的账号" },
],
password: [
{ required: true, trigger: "blur", message: "请输入您的密码" }
{ required: true, trigger: "blur", message: "请输入您的密码" },
],
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
code: [{ required: true, trigger: "change", message: "请输入验证码" }],
},
loading: false,
// 验证码开关
captchaEnabled: true,
// 注册开关
register: false,
redirect: undefined
redirect: undefined,
};
},
watch: {
$route: {
handler: function(route) {
handler: function (route) {
this.redirect = route.query && route.query.redirect;
},
immediate: true
}
immediate: true,
},
},
created() {
this.getCode();
......@@ -109,8 +132,9 @@ export default {
},
methods: {
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
getCodeImg().then((res) => {
this.captchaEnabled =
res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.img;
this.loginForm.uuid = res.uuid;
......@@ -120,38 +144,46 @@ export default {
getCookie() {
const username = Cookies.get("username");
const password = Cookies.get("password");
const rememberMe = Cookies.get('rememberMe')
const rememberMe = Cookies.get("rememberMe");
this.loginForm = {
username: username === undefined ? this.loginForm.username : username,
password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
password:
password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
};
},
handleLogin() {
this.$refs.loginForm.validate(valid => {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), {
expires: 30,
});
Cookies.set("rememberMe", this.loginForm.rememberMe, {
expires: 30,
});
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove('rememberMe');
Cookies.remove("rememberMe");
}
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
}
});
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
}
});
}
});
}
}
},
},
};
</script>
......
src/views/risk/drawCanvas/index.vue
View file @ 68c97ffb
<template>
<div class="wrap" ref="mapmidbox">
<!-- <div class="north">
<img src="../../assets/imgs/north.png" alt="" />
</div> -->
<grid-layout
id="gridView"
:layout.sync="layout"
:col-num="colNum"
:row-height="30"
:vertical-compact="false"
:use-css-transforms="true"
:prevent-collision="false"
:preventCollision="true"
>
<grid-item
v-for="item in layout"
:static="item.static"
:x="item.x"
:y="item.y"
:w="item.w"
:h="item.h"
:i="item.i"
:key="item.i"
:isDraggable="false"
:isResizable="false"
@resized="resizedEvent"
@moved="movedEvent"
:style="{
backgroundColor: item.c,
border: item.type == 'thorough' ? 'none !important' : '',
}"
<div id="printDiv">
<div class="north" style="margin-right: 20px">
<img src="../../../assets/images/north.png" alt="" />
</div>
<grid-layout
id="gridView"
:layout.sync="layout"
:col-num="colNum"
:row-height="30"
:vertical-compact="false"
:use-css-transforms="true"
:prevent-collision="false"
:preventCollision="true"
>
<span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{
item.name
}}</span>
<!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->
</grid-item>
</grid-layout>
<grid-item
v-for="item in layout"
:static="item.static"
:x="item.x"
:y="item.y"
:w="item.w"
:h="item.h"
:i="item.i"
:key="item.i"
:isDraggable="false"
:isResizable="false"
@resized="resizedEvent"
@moved="movedEvent"
:style="{
backgroundColor: item.c,
border: item.type == 'thorough' ? 'none !important' : '',
}"
>
<span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{
item.name
}}</span>
<!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->
</grid-item>
</grid-layout>
<el-row :gutter="5" style="margin-top: 20px; margin-left: 20px">
<el-col :span="2"> 风险等级图例:</el-col>
<el-col :span="3"> <span class="riskTab type1"></span>重大风险</el-col>
<el-col :span="3"> <span class="riskTab type2"></span>较大风险</el-col>
<el-col :span="3"> <span class="riskTab type3"></span>一般风险</el-col>
<el-col :span="3"> <span class="riskTab type4"></span>较小风险</el-col>
</el-row>
</div>
<el-row style="margin-top: 20px; margin-left: 20px">
<el-button type="primary" @click="getPdf">导 出</el-button>
<el-button @click="cancelDraw">取 消</el-button>
......@@ -121,7 +130,7 @@ export default {
var title = "四色图";
// html2Canvas(document.querySelector('#pdfDom'), { //这是在界面上设置一个id
//只下载id为pdfDom的内容
html2Canvas(document.querySelector("#gridView"), {}).then(function (
html2Canvas(document.querySelector("#printDiv"), {}).then(function (
canvas
) {
console.log(canvas.width, canvas.height);
......@@ -258,7 +267,7 @@ export default {
// }else if (item.score>=0 && item.score <= 6) { //差
// item.position.c = this.colorList[0]
// }
item.position.c = this.colorList[Math.floor(Math.random() * 4)];
item.position.c = item.color;
// }
this.layout.push(item.position);
});
......@@ -399,14 +408,14 @@ export default {
}
.wrap {
/* height: 100vh; */
width: 100%;
width: 105%;
position: relative;
}
.north {
position: absolute;
display: inline-block;
top: 1.5rem;
right: 0.5rem;
right: 5rem;
z-index: 999;
}
.north img {
......
src/views/risk/inherent/index.vue
View file @ 68c97ffb
......@@ -129,7 +129,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['risk:inherent:add']"
v-hasPermi="['system:riskInherent:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -140,7 +140,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['risk:inherent:edit']"
v-hasPermi="['system:riskInherent:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -151,7 +151,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['risk:inherent:remove']"
v-hasPermi="['system:riskInherent:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -161,7 +161,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['risk:inherent:export']"
v-hasPermi="['system:riskInherent:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -179,7 +179,7 @@
<el-table-column label="楼层名称" align="center" prop="floorName" />
<el-table-column label="房间名称" align="center" prop="roomName" />
<el-table-column label="评估人" align="center" prop="userName" />
<el-table-column label="计划id" align="center" prop="planId" />
<!-- <el-table-column label="计划id" align="center" prop="planId" /> -->
<el-table-column label="风险源名称" align="center" prop="name" />
<el-table-column label="风险点类型" align="center" prop="pointType">
<template slot-scope="scope">
......@@ -203,8 +203,8 @@
</template>
</el-table-column>
<el-table-column label="存在部位" align="center" prop="presenceLocation" />
<el-table-column label="工程技术措施" align="center" prop="measuresProject" />
<el-table-column label="应采取的管理措施" align="center" prop="measuresAdministration" />
<!-- <el-table-column label="工程技术措施" align="center" prop="measuresProject" /> -->
<!-- <el-table-column label="应采取的管理措施" align="center" prop="measuresAdministration" /> -->
<el-table-column label="管控责任单位" align="center" prop="measuresDeptName" />
<el-table-column label="管控责任人" align="center" prop="measuresUserName" />
<el-table-column label="应急措施" align="center" prop="measuresEmergency" />
......@@ -215,14 +215,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['risk:inherent:edit']"
v-hasPermi="['system:riskInherent:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['risk:inherent:remove']"
v-hasPermi="['system:riskInherent:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/risk/plan/existingdata.vue 0 → 100644
View file @ 68c97ffb
This diff is collapsed.
src/views/risk/plan/index.vue
View file @ 68c97ffb
This diff is collapsed.
src/views/risk/plan/inherentdata.vue 0 → 100644
View file @ 68c97ffb
This diff is collapsed.
src/views/risk/plan/ledger.vue
View file @ 68c97ffb
This diff is collapsed.
src/views/risk/plan/ledgerdata.vue
View file @ 68c97ffb
This diff is collapsed.
vue.config.js
View file @ 68c97ffb
......@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080`, //服务器地址
target: `http://192.168.4.232:8080`, //服务器地址
// target: `http://192.168.15.230:8081`, //晓晋本地地址
changeOrigin: true,
pathRewrite: {
......
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