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
Show 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
})
......@@ -64,3 +64,56 @@ export function exportRiskList(inherentId) {
method: 'get',
})
}
//项目列表
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
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="影响因素" prop="influenceFactor">
<el-select v-model="queryParams.influenceFactor" placeholder="请选择影响因素">
<el-option label="全部" value=""></el-option>
<el-option label="人" value="人"></el-option>
<el-option label="机" value="机"></el-option>
<el-option label="料" value="料"></el-option>
<el-option label="法" value="法"></el-option>
<el-option label="环" value="环"></el-option>
</el-select>
</el-form-item>
<el-form-item label="影响因子" prop="influenceSubFactor">
<el-input v-model="queryParams.influenceSubFactor" placeholder="请输入影响因子" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="排序" prop="sortNum">
<el-input v-model="queryParams.sortNum" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system/evaluation:factor:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system/evaluation:factor:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system/evaluation:factor:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
v-hasPermi="['system/evaluation:factor:import']">导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system/evaluation:factor:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="factorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="影响因素" align="center" prop="influenceFactor" />
<el-table-column label="影响因子" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link
:to="'/system/evaluation-items/index/' + scope.row.id+'?factorName='+scope.row.influenceSubFactor"
class="link-type">
<span>{{ scope.row.influenceSubFactor }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sortNum" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system/evaluation:factor:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system/evaluation:factor:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改评估模型信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="影响因素" prop="influenceFactor">
<el-select v-model="form.influenceFactor" placeholder="请选择影响因素">
<el-option label="人" value="人"></el-option>
<el-option label="机" value="机"></el-option>
<el-option label="料" value="料"></el-option>
<el-option label="法" value="法"></el-option>
<el-option label="环" value="环"></el-option>
</el-select>
</el-form-item>
<el-form-item label="影响因子" prop="influenceSubFactor">
<el-input v-model="form.influenceSubFactor" placeholder="请输入影响因子" />
</el-form-item>
<el-form-item label="显示排序" prop="sortNum">
<el-input-number v-model="form.sortNum" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listFactor,
getFactor,
delFactor,
addFactor,
updateFactor
} from "@/api/evaluation/factor";
import {
getToken
} from "@/utils/auth";
export default {
name: "Factor",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 评估模型信息表格数据
factorList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
influenceFactor: null,
influenceSubFactor: null,
sortNum: null,
},
// 用户导入参数
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: {
Authorization: "Bearer " + getToken()
},
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/evaluation/factor/importData"
},
// 表单参数
form: {},
// 表单校验
rules: {}
};
},
created() {
this.getList();
},
methods: {
/** 查询评估模型信息列表 */
getList() {
this.loading = true;
listFactor(this.queryParams).then(response => {
this.factorList = response.rows;
this.total = response.total;
console.log(response.rows);
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
influenceFactor: null,
influenceSubFactor: null,
sortNum: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加评估模型信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getFactor(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改评估模型信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateFactor(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addFactor(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除评估模型信息编号为"' + ids + '"的数据项？').then(function() {
return delFactor(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/evaluation/factor/export', {
...this.queryParams
}, `factor_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "评估因素导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
this.download('system/evaluation/factor/importTemplate', {}, `factor_template_${new Date().getTime()}.xlsx`)
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response
.msg + "</div>", "导入结果", {
dangerouslyUseHTMLString: true
});
this.getList();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
}
}
};
</script>
src/views/evaluation/factor/items.vue 0 → 100644
View file @ 68c97ffb
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="影响因子" prop="influenceSubFactor">
<el-input v-model="queryParams.influenceSubFactor" placeholder="请输入影响因子" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="所属指标项" prop="indicatorBelong">
<el-input v-model="queryParams.indicatorBelong" placeholder="请输入所属指标项" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="指标项值" prop="indicatorItem">
<el-input v-model="queryParams.indicatorItem" placeholder="请输入指标项值" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="指标分值" prop="indicatorScore">
<el-input v-model="queryParams.indicatorScore" placeholder="请输入指标分值" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="是否重大影响" prop="isImportant">
<el-select v-model="queryParams.isImportant" placeholder="请选择是否重大影响" clearable>
<el-option v-for="dict in dict.type.is_important" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="sortNum">
<el-input v-model="queryParams.sortNum" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['evaluation:items:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['evaluation:items:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['evaluation:items:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['evaluation:items:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="itemsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="影响因子" align="center" prop="influenceSubFactor" width="200"
:show-overflow-tooltip="true" />
<el-table-column label="所属指标项" align="center" prop="indicatorBelong" />
<el-table-column label="指标项值" align="center" prop="indicatorItem" />
<el-table-column label="指标分值" align="center" prop="indicatorScore" />
<el-table-column label="是否重大影响" align="center" prop="isImportant">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_important" :value="scope.row.isImportant" />
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sortNum" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['evaluation:items:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['evaluation:items:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改评估选项管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="影响因子" prop="factorId" v-show="false">
<el-input v-model="form.factorId" placeholder="请输入影响因子" />
</el-form-item>
<el-form-item label="影响因子" prop="influenceSubFactor">
<el-input v-model="form.influenceSubFactor" placeholder="请输入影响因子" />
</el-form-item>
<el-form-item label="所属指标项" prop="indicatorBelong">
<el-select v-model="form.indicatorBelong" placeholder="请选择指标项">
<el-option label="指标项一" value="指标项一"></el-option>
<el-option label="指标项二" value="指标项二"></el-option>
<el-option label="指标项三" value="指标项三"></el-option>
<el-option label="指标项四" value="指标项四"></el-option>
<el-option label="其它" value="其它"></el-option>
</el-select>
</el-form-item>
<el-form-item label="指标项值" prop="indicatorItem">
<el-input v-model="form.indicatorItem" placeholder="请输入指标项值" />
</el-form-item>
<el-form-item label="指标分值" prop="indicatorScore">
<el-input v-model="form.indicatorScore" placeholder="请输入指标分值" />
</el-form-item>
<el-form-item label="是否重大影响" prop="isImportant">
<el-select v-model="form.isImportant" placeholder="请选择是否重大影响">
<el-option v-for="dict in dict.type.is_important" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="显示排序" prop="sortNum">
<el-input-number v-model="form.sortNum" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listItems,
getItems,
delItems,
addItems,
updateItems
} from "@/api/evaluation/items";
export default {
name: "Items",
dicts: ['is_important'],
data() {
return {
factorId: null,
factorName: null,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 评估选项管理表格数据
itemsList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
influenceSubFactor: null,
indicatorBelong: null,
indicatorItem: null,
indicatorScore: null,
isImportant: null,
sortNum: null,
},
// 表单参数
form: {},
// 表单校验
rules: {}
};
},
created() {
this.$data.factorId = this.$route.params && this.$route.params.factorId;
this.$data.factorName = this.$route.query && this.$route.query.factorName;
this.queryParams.influenceSubFactor = this.$data.factorName;
this.getList(this.$data.factorId, this.$data.factorName);
},
methods: {
/** 查询评估选项管理列表 */
getList(factorId, factorName) {
this.loading = true;
if (factorId != null && factorId != "") {
//this.queryParams.factorId = factorId;
this.queryParams.influenceSubFactor = factorName;
}
console.log(this.queryParams);
listItems(this.queryParams).then(response => {
this.itemsList = response.rows;
console.log(response.rows)
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
factorId: null,
influenceSubFactor: null,
indicatorBelong: null,
indicatorItem: null,
indicatorScore: null,
isImportant: null,
sortNum: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(this.queryParams.factorId, this.queryParams.influenceSubFactor);
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
if (this.$route.params.factorId != null && this.$route.params.factorId.trim() != '') {
this.form.factorId = this.$route.params.factorId;
this.form.influenceSubFactor = this.$route.query.factorName;
}
this.open = true;
this.title = "添加评估选项管理";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getItems(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改评估选项管理";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateItems(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addItems(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList(this.$data.factorId, this.$data.factorName);
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除评估选项管理编号为"' + ids + '"的数据项？').then(function() {
return delItems(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('evaluation/items/export', {
...this.queryParams
}, `items_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/index.vue
View file @ 68c97ffb
<template>
<div class="app-container home">
<!-- <el-row :gutter="20">
<el-col :sm="24" :lg="24">
<blockquote class="text-warning" style="font-size: 14px">
领取阿里云通用云产品1888优惠券
<br />
<el-link
href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
type="primary"
target="_blank"
>https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
>
<br />
领取腾讯云通用云产品2860优惠券
<br />
<el-link
href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
type="primary"
target="_blank"
>https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
>
<br />
阿里云服务器折扣区
<el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
>>☛☛点我进入☚☚</el-link
>
&nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
<el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
>>☛☛点我进入☚☚</el-link
><br />
<h4 class="text-danger">
云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
</h4>
</blockquote>
<hr />
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>若依后台管理框架</h2>
<p>
一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
</p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
<p>
<el-button
type="primary"
size="mini"
icon="el-icon-cloudy"
plain
@click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
>访问码云</el-button
>
<el-button
size="mini"
icon="el-icon-s-home"
plain
@click="goTarget('http://ruoyi.vip')"
>访问主页</el-button
>
</p>
</el-col>
<el-col :sm="24" :lg="12" style="padding-left: 50px">
<el-row>
<el-col :span="12">
<h2>技术选型</h2>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<h4>后端技术</h4>
<ul>
<li>SpringBoot</li>
<li>Spring Security</li>
<li>JWT</li>
<li>MyBatis</li>
<li>Druid</li>
<li>Fastjson</li>
<li>...</li>
</ul>
</el-col>
<el-col :span="6">
<h4>前端技术</h4>
<ul>
<li>Vue</li>
<li>Vuex</li>
<li>Element-ui</li>
<li>Axios</li>
<li>Sass</li>
<li>Quill</li>
<li>...</li>
</ul>
</el-col>
</el-row>
</el-col>
</el-row>
<el-divider />
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>联系信息</span>
</div>
<div class="body">
<p>
<i class="el-icon-s-promotion"></i> 官网：<el-link
href="http://www.ruoyi.vip"
target="_blank"
>http://www.ruoyi.vip</el-link
>
</p>
<p>
<i class="el-icon-user-solid"></i> QQ群：<s> 满937441 </s> <s> 满887144332 </s>
<s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
<s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s>
<s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s>
<s> 满101046199 </s> <a href="https://jq.qq.com/?_wv=1027&k=tKEt51dz" target="_blank">136919097</a>
</p>
<p>
<i class="el-icon-chat-dot-round"></i> 微信：<a
href="javascript:;"
>/ *若依</a
>
</p>
<p>
<i class="el-icon-money"></i> 支付宝：<a
href="javascript:;"
class="支付宝信息"
>/ *若依</a
>
</p>
<div>
<div id="myChart" :style="{width: '45%', height: '600px'}" style="float: left;"></div>
<div id="myChart1" :style="{width: '45%', height: '600px'}" style="float: left;"></div>
<div id="myChart2" :style="{width: '45%', height: '600px'}" style="float: left;"></div>
<div id="myChart3" :style="{width: '45%', height: '600px'}" style="float: left;"></div>
</div>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v3.8.5 - 2023-01-01">
<ol>
<li>定时任务违规的字符</li>
<li>重置时取消部门选中</li>
<li>新增返回警告消息提示</li>
<li>忽略不必要的属性数据返回</li>
<li>修改参数键名时移除前缓存配置</li>
<li>导入更新用户数据前校验数据权限</li>
<li>兼容Excel下拉框内容过多无法显示的问题</li>
<li>升级echarts到最新版本5.4.0</li>
<li>升级core-js到最新版本3.25.3</li>
<li>升级oshi到最新版本6.4.0</li>
<li>升级kaptcha到最新版2.3.3</li>
<li>升级druid到最新版本1.2.15</li>
<li>升级fastjson到最新版2.0.20</li>
<li>升级pagehelper到最新版1.4.6</li>
<li>优化弹窗内容过多展示不全问题</li>
<li>优化swagger-ui静态资源使用缓存</li>
<li>开启TopNav没有子菜单隐藏侧边栏</li>
<li>删除fuse无效选项maxPatternLength</li>
<li>优化导出对象的子列表为空会出现[]问题</li>
<li>优化编辑头像时透明部分会变成黑色问题</li>
<li>优化小屏幕上修改头像界面布局错位的问题</li>
<li>修复代码生成勾选属性无效问题</li>
<li>修复文件上传组件格式验证问题</li>
<li>修复回显数据字典数组异常问题</li>
<li>修复sheet超出最大行数异常问题</li>
<li>修复Log注解GET请求记录不到参数问题</li>
<li>修复调度日志点击多次数据不变化的问题</li>
<li>修复主题颜色在Drawer组件不会加载问题</li>
<li>修复文件名包含特殊字符的文件无法下载问题</li>
<li>修复table中更多按钮切换主题色未生效修复问题</li>
<li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
<li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
<li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.4 - 2022-09-26">
<ol>
<li>数据逻辑删除不进行唯一验证</li>
<li>Excel注解支持导出对象的子列表方法</li>
<li>Excel注解支持自定义隐藏属性列</li>
<li>Excel注解支持backgroundColor属性设置背景色</li>
<li>支持配置密码最大错误次数/锁定时间</li>
<li>登录日志新增解锁账户功能</li>
<li>通用下载方法新增config配置选项</li>
<li>支持多权限字符匹配角色数据权限</li>
<li>页面内嵌iframe切换tab不刷新数据</li>
<li>操作日志记录支持排除敏感属性字段</li>
<li>修复多文件上传报错出现的异常问题</li>
<li>修复图片预览组件src属性为null值控制台报错问题</li>
<li>升级oshi到最新版本6.2.2</li>
<li>升级fastjson到最新版2.0.14</li>
<li>升级pagehelper到最新版1.4.3</li>
<li>升级core-js到最新版本3.25.2</li>
<li>升级element-ui到最新版本2.15.10</li>
<li>优化任务过期不执行调度</li>
<li>优化字典数据使用store存取</li>
<li>优化修改资料头像被覆盖的问题</li>
<li>优化修改用户登录账号重复验证</li>
<li>优化代码生成同步后值NULL问题</li>
<li>优化定时任务支持执行父类方法</li>
<li>优化用户个人信息接口防止修改部门</li>
<li>优化布局设置使用el-drawer抽屉显示</li>
<li>优化没有权限的用户编辑部门缺少数据</li>
<li>优化日志注解记录限制请求地址的长度</li>
<li>优化excel/scale属性导出单元格数值类型</li>
<li>优化日志操作中重置按钮时重复查询的问题</li>
<li>优化多个相同角色数据导致权限SQL重复问题</li>
<li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.3 - 2022-06-27">
<ol>
<li>新增缓存列表菜单功能</li>
<li>代码生成树表新增(展开/折叠)</li>
<li>Excel注解支持color字体颜色</li>
<li>新增Anonymous匿名访问不鉴权注解</li>
<li>用户头像上传限制只能为图片格式</li>
<li>接口使用泛型使其看到响应属性字段</li>
<li>检查定时任务bean所在包名是否为白名单配置</li>
<li>添加页签openPage支持传递参数</li>
<li>用户缓存信息添加部门ancestors祖级列表</li>
<li>升级element-ui到最新版本2.15.8</li>
<li>升级oshi到最新版本6.1.6</li>
<li>升级druid到最新版本1.2.11</li>
<li>升级fastjson到最新版2.0.8</li>
<li>升级spring-boot到最新版本2.5.14</li>
<li>降级jsencrypt版本兼容IE浏览器</li>
<li>删除多余的salt字段</li>
<li>新增获取不带后缀文件名称方法</li>
<li>新增获取配置文件中的属性值方法</li>
<li>新增内容编码/解码方便插件集成使用</li>
<li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
<li>优化设置分页参数默认值</li>
<li>优化对空字符串参数处理的过滤</li>
<li>优化显示顺序orderNum类型为整型</li>
<li>优化表单构建按钮不显示正则校验</li>
<li>优化字典数据回显样式下拉框显示值</li>
<li>优化R响应成功状态码与全局保持一致</li>
<li>优化druid开启wall过滤器出现的异常问题</li>
<li>优化用户管理左侧树型组件增加选中高亮保持</li>
<li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
<li>优化默认不启用压缩文件缓存防止node_modules过大</li>
<li>修复字典数据显示不全问题</li>
<li>修复操作日志查询类型条件为0时会查到所有数据</li>
<li>修复Excel注解prompt/combo同时使用不生效问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.2 - 2022-04-01">
<ol>
<li>前端支持设置是否需要防止数据重复提交</li>
<li>开启TopNav没有子菜单情况隐藏侧边栏</li>
<li>侧边栏菜单名称过长悬停显示标题</li>
<li>用户访问控制时校验数据权限，防止越权</li>
<li>导出Excel时屏蔽公式，防止CSV注入风险</li>
<li>组件ImagePreview支持多图预览显示</li>
<li>组件ImageUpload支持多图同时选择上传</li>
<li>组件FileUpload支持多文件同时选择上传</li>
<li>服务监控新增运行参数信息显示</li>
<li>定时任务目标字符串过滤特殊字符</li>
<li>定时任务目标字符串验证包名白名单</li>
<li>代码生成列表图片支持预览</li>
<li>代码生成编辑修改打开新页签</li>
<li>代码生成新增Java类型Boolean</li>
<li>代码生成子表支持日期/字典配置</li>
<li>代码生成同步保留必填/类型选项</li>
<li>升级oshi到最新版本6.1.2</li>
<li>升级fastjson到最新版1.2.80</li>
<li>升级pagehelper到最新版1.4.1</li>
<li>升级spring-boot到最新版本2.5.11</li>
<li>升级spring-boot-mybatis到最新版2.2.2</li>
<li>添加遗漏的分页参数合理化属性</li>
<li>修改npm即将过期的注册源地址</li>
<li>修复分页组件请求两次问题</li>
<li>修复通用文件下载接口跨域问题</li>
<li>修复Xss注解字段值为空时的异常问题</li>
<li>修复选项卡点击右键刷新丢失参数问题</li>
<li>修复表单清除元素位置未垂直居中问题</li>
<li>修复服务监控中运行参数显示条件错误</li>
<li>修复导入Excel时字典字段类型为Long转义为空问题</li>
<li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
<li>优化加载字典缓存数据</li>
<li>优化IP地址获取到多个的问题</li>
<li>优化任务队列满时任务拒绝策略</li>
<li>优化文件上传兼容Weblogic环境</li>
<li>优化定时任务默认保存到内存中执行</li>
<li>优化部门修改缩放后出现的错位问题</li>
<li>优化Excel格式化不同类型的日期对象</li>
<li>优化菜单表关键字导致的插件报错问题</li>
<li>优化Oracle用户头像列为空时不显示问题</li>
<li>优化页面若未匹配到字典标签则返回原字典值</li>
<li>优化修复登录失效后多次请求提示多次弹窗问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.1 - 2022-01-01">
<ol>
<li>新增Vue3前端代码生成模板</li>
<li>新增图片预览组件</li>
<li>新增压缩插件实现打包Gzip</li>
<li>自定义xss校验注解实现</li>
<li>自定义文字复制剪贴指令</li>
<li>代码生成预览支持复制内容</li>
<li>路由支持单独配置菜单或角色权限</li>
<li>用户管理部门查询选择节点后分页参数初始</li>
<li>修复用户分配角色属性错误</li>
<li>修复打包后字体图标偶现的乱码问题</li>
<li>修复菜单管理重置表单出现的错误</li>
<li>修复版本差异导致的懒加载报错问题</li>
<li>修复Cron组件中周回显问题</li>
<li>修复定时任务多参数逗号分隔的问题</li>
<li>修复根据ID查询列表可能出现的主键溢出问题</li>
<li>修复tomcat配置参数已过期问题</li>
<li>升级clipboard到最新版本2.0.8</li>
<li>升级oshi到最新版本v5.8.6</li>
<li>升级fastjson到最新版1.2.79</li>
<li>升级spring-boot到最新版本2.5.8</li>
<li>升级log4j2到2.17.1，防止漏洞风险</li>
<li>优化下载解析blob异常提示</li>
<li>优化代码生成字典组重复问题</li>
<li>优化查询用户的角色组&岗位组代码</li>
<li>优化定时任务cron表达式小时设置24</li>
<li>优化用户导入提示溢出则显示滚动条</li>
<li>优化防重复提交标识组合为(key+url+header)</li>
<li>优化分页方法设置成通用方便灵活调用</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.0 - 2021-12-01">
<ol>
<li>新增配套并同步的Vue3前端版本</li>
<li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
<li>优化导出数据/使用通用下载方法</li>
<li>Excel注解支持自定义数据处理器</li>
<li>Excel注解支持导入导出标题信息</li>
<li>Excel导入支持@Excels注解</li>
<li>新增组件data-dict，简化数据字典使用</li>
<li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
<li>生产环境使用路由懒加载提升页面响应速度</li>
<li>修复五级以上菜单出现的404问题</li>
<li>防重提交注解支持配置间隔时间/提示消息</li>
<li>日志注解新增是否保存响应参数</li>
<li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
<li>升级SpringBoot到最新版本2.5.6</li>
<li>升级pagehelper到最新版1.4.0</li>
<li>升级spring-boot-mybatis到最新版2.2.0</li>
<li>升级oshi到最新版本v5.8.2</li>
<li>升级druid到最新版1.2.8</li>
<li>升级velocity到最新版本2.3</li>
<li>升级fastjson到最新版1.2.78</li>
<li>升级axios到最新版本0.24.0</li>
<li>升级dart-sass到版本1.32.13</li>
<li>升级core-js到最新版本3.19.1</li>
<li>升级jsencrypt到最新版本3.2.1</li>
<li>升级js-cookie到最新版本3.0.1</li>
<li>升级file-saver到最新版本2.0.5</li>
<li>升级sass-loader到最新版本10.1.1</li>
<li>升级element-ui到最新版本2.15.6</li>
<li>新增sendGet无参请求方法</li>
<li>禁用el-tag组件的渐变动画</li>
<li>代码生成点击预览重置激活tab</li>
<li>AjaxResult重写put方法，以方便链式调用</li>
<li>优化登录/验证码请求headers不设置token</li>
<li>优化用户个人信息接口防止修改用户名</li>
<li>优化Cron表达式生成器关闭时销毁避免缓存</li>
<li>优化注册成功提示消息类型success</li>
<li>优化aop语法，使用spring自动注入注解</li>
<li>优化记录登录信息，移除不必要的修改</li>
<li>优化mybatis全局默认的执行器</li>
<li>优化Excel导入图片可能出现的异常</li>
<li>修复代码生成模板主子表删除缺少事务</li>
<li>修复日志记录可能出现的转换异常</li>
<li>修复代码生成复选框字典遗漏问题</li>
<li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
<li>修复字符串无法被反转义问题</li>
<li>修复后端主子表代码模板方法名生成错误问题</li>
<li>修复xss过滤后格式出现的异常</li>
<li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.7.0 - 2021-09-13">
<ol>
<li>参数管理支持配置验证码开关</li>
<li>新增是否开启用户注册功能</li>
<li>定时任务支持在线生成cron表达式</li>
<li>菜单管理支持配置路由参数</li>
<li>支持自定义注解实现接口限流</li>
<li>Excel注解支持Image图片导入</li>
<li>自定义弹层溢出滚动样式</li>
<li>自定义可拖动弹窗宽度指令</li>
<li>自定义可拖动弹窗高度指令</li>
<li>修复任意账户越权问题</li>
<li>修改时检查用户数据权限范围</li>
<li>修复保存配置主题颜色失效问题</li>
<li>新增暗色菜单风格主题</li>
<li>菜单&部门新增展开/折叠功能</li>
<li>页签新增关闭左侧&添加图标</li>
<li>顶部菜单排除隐藏的默认路由</li>
<li>顶部菜单同步系统主题样式</li>
<li>跳转路由高亮相对应的菜单栏</li>
<li>代码生成主子表多选行数据</li>
<li>日期范围支持添加多组</li>
<li>升级element-ui到最新版本2.15.5</li>
<li>升级oshi到最新版本v5.8.0</li>
<li>升级commons.io到最新版本v2.11.0</li>
<li>定时任务屏蔽ldap远程调用</li>
<li>定时任务屏蔽http(s)远程调用</li>
<li>补充定时任务表字段注释</li>
<li>定时任务对检查异常进行事务回滚</li>
<li>启用父部门状态排除顶级节点</li>
<li>富文本新增上传文件大小限制</li>
<li>默认首页使用keep-alive缓存</li>
<li>修改代码生成字典回显样式</li>
<li>自定义分页合理化传入参数</li>
<li>修复字典组件值为整形不显示问题</li>
<li>修复定时任务日志执行状态显示</li>
<li>角色&菜单新增字段属性提示信息</li>
<li>修复角色分配用户页面参数类型错误提醒</li>
<li>优化布局设置动画特效</li>
<li>优化异常处理信息</li>
<li>优化错误token导致的解析异常</li>
<li>密码框新增显示切换密码图标</li>
<li>定时任务新增更多操作</li>
<li>更多操作按钮添加权限控制</li>
<li>导入用户样式优化</li>
<li>提取通用方法到基类控制器</li>
<li>优化使用权限工具获取用户信息</li>
<li>优化用户不能删除自己</li>
<li>优化XSS跨站脚本过滤</li>
<li>优化代码生成模板</li>
<li>验证码默认20s超时</li>
<li>BLOB下载时清除URL对象引用</li>
<li>代码生成导入表按创建时间排序</li>
<li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
<li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
<li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.0 - 2021-07-12">
<ol>
<li>角色管理新增分配用户功能</li>
<li>用户管理新增分配角色功能</li>
<li>日志列表支持排序操作</li>
<li>优化参数&字典缓存操作</li>
<li>系统布局配置支持动态标题开关</li>
<li>菜单路由配置支持内链访问</li>
<li>默认访问后端首页新增提示语</li>
<li>富文本默认上传返回url类型</li>
<li>新增自定义弹窗拖拽指令</li>
<li>全局注册常用通用组件</li>
<li>全局挂载字典标签组件</li>
<li>ImageUpload组件支持多图片上传</li>
<li>FileUpload组件支持多文件上传</li>
<li>文件上传组件添加数量限制属性</li>
<li>富文本编辑组件添加类型属性</li>
<li>富文本组件工具栏配置视频</li>
<li>封装通用iframe组件</li>
<li>限制超级管理员不允许操作</li>
<li>用户信息长度校验限制</li>
<li>分页组件新增pagerCount属性</li>
<li>添加bat脚本执行应用</li>
<li>升级oshi到最新版本v5.7.4</li>
<li>升级element-ui到最新版本2.15.2</li>
<li>升级pagehelper到最新版1.3.1</li>
<li>升级commons.io到最新版本v2.10.0</li>
<li>升级commons.fileupload到最新版本v1.4</li>
<li>升级swagger到最新版本v3.0.0</li>
<li>修复关闭confirm提示框控制台报错问题</li>
<li>修复存在的SQL注入漏洞问题</li>
<li>定时任务屏蔽rmi远程调用</li>
<li>修复用户搜索分页变量错误</li>
<li>修复导出角色数据范围翻译缺少仅本人</li>
<li>修复表单构建选择下拉选择控制台报错问题</li>
<li>优化图片工具类读取文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.5.0 - 2021-05-25">
<ol>
<li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
<li>布局设置支持保存&重置配置</li>
<li>修复树表数据显示不全&加载慢问题</li>
<li>新增IE浏览器版本过低提示页面</li>
<li>用户登录后记录最后登录IP&时间</li>
<li>页面导出按钮点击之后添加遮罩</li>
<li>富文本编辑器支持自定义上传地址</li>
<li>富文本编辑组件新增readOnly属性</li>
<li>页签TagsView新增关闭右侧功能</li>
<li>显隐列组件加载初始默认隐藏列</li>
<li>关闭头像上传窗口还原默认图片</li>
<li>个人信息添加手机&邮箱重复验证</li>
<li>代码生成模板导出按钮点击后添加遮罩</li>
<li>代码生成模板树表操作列添加新增按钮</li>
<li>代码生成模板修复主子表字段重名问题</li>
<li>升级fastjson到最新版1.2.76</li>
<li>升级druid到最新版本v1.2.6</li>
<li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
<li>升级oshi到最新版本v5.6.0</li>
<li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
<li>数据监控页默认账户密码防止越权访问</li>
<li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
<li>修正后端导入表权限标识</li>
<li>修正前端操作日志&登录日志权限标识</li>
<li>设置Redis配置HashKey序列化</li>
<li>删除操作日志记录信息</li>
<li>上传媒体类型添加视频格式</li>
<li>修复请求形参未传值记录日志异常问题</li>
<li>优化xss校验json请求条件</li>
<li>树级结构更新子节点使用replaceFirst</li>
<li>优化ExcelUtil空值处理</li>
<li>日志记录过滤BindingResult对象，防止异常</li>
<li>修改主题后mini类型按钮无效问题</li>
<li>优化通用下载完成后删除节点</li>
<li>通用Controller添加响应返回消息</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.4.0 - 2021-02-22">
<ol>
<li>代码生成模板支持主子表</li>
<li>表格右侧工具栏组件支持显隐列</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>
<li>代码生成支持文件上传组件</li>
<li>代码生成日期控件区分范围</li>
<li>代码生成数据库文本类型生成表单文本域</li>
<li>用户手机邮箱&菜单组件修改允许空字符串</li>
<li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
<li>升级druid到最新版本v1.2.4</li>
<li>升级fastjson到最新版1.2.75</li>
<li>升级element-ui到最新版本2.15.0</li>
<li>修复IE11浏览器报错问题</li>
<li>优化多级菜单之间切换无法缓存的问题</li>
<li>修复四级菜单无法显示问题</li>
<li>修正侧边栏静态路由丢失问题</li>
<li>修复角色管理-编辑角色-功能权限显示异常</li>
<li>配置文件新增redis数据库索引属性</li>
<li>权限工具类增加admin判断</li>
<li>角色非自定义权限范围清空选择值</li>
<li>修复导入数据为负浮点数时丢失精度问题</li>
<li>移除path-to-regexp正则匹配插件</li>
<li>修复生成树表代码异常</li>
<li>修改ip字段长度防止ipv6地址长度不够</li>
<li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
<li>登录后push添加catch防止出现检查错误</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.3.0 - 2020-12-14">
<ol>
<li>新增缓存监控功能</li>
<li>支持主题风格配置</li>
<li>修复多级菜单之间切换无法缓存的问题</li>
<li>多级菜单自动配置组件</li>
<li>代码生成预览支持高亮显示</li>
<li>支持Get请求映射Params参数</li>
<li>删除用户和角色解绑关联</li>
<li>去除用户手机邮箱部门必填验证</li>
<li>Excel支持注解align对齐方式</li>
<li>Excel支持导入Boolean型数据</li>
<li>优化头像样式，鼠标移入悬停遮罩</li>
<li>代码生成预览提供滚动机制</li>
<li>代码生成删除多余的数字float类型</li>
<li>修正转换字符串的目标字符集属性</li>
<li>回显数据字典防止空值报错</li>
<li>日志记录增加过滤多文件场景</li>
<li>修改缓存Set方法可能导致嵌套的问题</li>
<li>移除前端一些多余的依赖</li>
<li>防止安全扫描YUI出现的风险提示</li>
<li>修改node-sass为dart-sass</li>
<li>升级SpringBoot到最新版本2.1.18</li>
<li>升级poi到最新版本4.1.2</li>
<li>升级oshi到最新版本v5.3.6</li>
<li>升级bitwalker到最新版本1.21</li>
<li>升级axios到最新版本0.21.0</li>
<li>升级element-ui到最新版本2.14.1</li>
<li>升级vue到最新版本2.6.12</li>
<li>升级vuex到最新版本3.6.0</li>
<li>升级vue-cli到版本4.5.9</li>
<li>升级vue-router到最新版本3.4.9</li>
<li>升级vue-cli到最新版本4.4.6</li>
<li>升级vue-cropper到最新版本0.5.5</li>
<li>升级clipboard到最新版本2.0.6</li>
<li>升级core-js到最新版本3.8.1</li>
<li>升级echarts到最新版本4.9.0</li>
<li>升级file-saver到最新版本2.0.4</li>
<li>升级fuse.js到最新版本6.4.3</li>
<li>升级js-beautify到最新版本1.13.0</li>
<li>升级js-cookie到最新版本2.2.1</li>
<li>升级path-to-regexp到最新版本6.2.0</li>
<li>升级quill到最新版本1.3.7</li>
<li>升级screenfull到最新版本5.0.2</li>
<li>升级sortablejs到最新版本1.10.2</li>
<li>升级vuedraggable到最新版本2.24.3</li>
<li>升级chalk到最新版本4.1.0</li>
<li>升级eslint到最新版本7.15.0</li>
<li>升级eslint-plugin-vue到最新版本7.2.0</li>
<li>升级lint-staged到最新版本10.5.3</li>
<li>升级runjs到最新版本4.4.2</li>
<li>升级sass-loader到最新版本10.1.0</li>
<li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
<li>升级svg-sprite-loader到最新版本5.1.1</li>
<li>升级vue-template-compiler到最新版本2.6.12</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.1 - 2020-11-18">
<ol>
<li>阻止任意文件下载漏洞</li>
<li>代码生成支持上传控件</li>
<li>新增图片上传组件</li>
<li>调整默认首页</li>
<li>升级druid到最新版本v1.2.2</li>
<li>mapperLocations配置支持分隔符</li>
<li>权限信息调整</li>
<li>调整sql默认时间</li>
<li>解决代码生成没有bit类型的问题</li>
<li>升级pagehelper到最新版1.3.0</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.0 - 2020-10-10">
<ol>
<li>升级springboot版本到2.1.17 提升安全性</li>
<li>升级oshi到最新版本v5.2.5</li>
<li>升级druid到最新版本v1.2.1</li>
<li>升级jjwt到版本0.9.1</li>
<li>升级fastjson到最新版1.2.74</li>
<li>修改sass为node-sass，避免el-icon图标乱码</li>
<li>代码生成支持同步数据库</li>
<li>代码生成支持富文本控件</li>
<li>代码生成页面时不忽略remark属性</li>
<li>代码生成添加select必填选项</li>
<li>Excel导出类型NUMERIC支持精度浮点类型</li>
<li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
<li>Excel注解支持自动统计数据总和</li>
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
<li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
<li>允许用户分配到部门父节点</li>
<li>菜单新增是否缓存keep-alive</li>
<li>表格操作列间距调整</li>
<li>限制系统内置参数不允许删除</li>
<li>富文本组件优化，支持自定义高度&图片冲突问题</li>
<li>富文本工具栏样式对齐</li>
<li>导入excel整形值校验优化</li>
<li>修复页签关闭所有时固定标签路由不刷新问题</li>
<li>表单构建布局型组件新增按钮</li>
<li>左侧菜单文字过长显示省略号</li>
<li>修正根节点为子部门时，树状结构显示问题</li>
<li>修正调用目标字符串最大长度</li>
<li>修正菜单提示信息错误</li>
<li>修正定时任务执行一次权限标识</li>
<li>修正数据库字符串类型nvarchar</li>
<li>优化递归子节点</li>
<li>优化数据权限判断</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.1.0 - 2020-08-13">
<ol>
<li>表格工具栏右侧添加刷新&显隐查询组件</li>
<li>后端支持CORS跨域请求</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持自定义路径</li>
<li>代码生成支持复选框</li>
<li>Excel导出导入支持dictType字典类型</li>
<li>Excel支持分割字符串组内容</li>
<li>验证码类型支持（数组计算、字符验证）</li>
<li>升级vue-cli版本到4.4.4</li>
<li>修改 node-sass 为 dart-sass</li>
<li>表单类型为Integer/Long设置整形默认值</li>
<li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
<li>优化防重复提交拦截器</li>
<li>优化上级菜单不能选择自己</li>
<li>修复角色的权限分配后，未实时生效问题</li>
<li>修复在线用户日志记录类型</li>
<li>修复富文本空格和缩进保存后不生效问题</li>
<li>修复在线用户判断逻辑</li>
<li>唯一限制条件只返回单条数据</li>
<li>添加获取当前的环境配置方法</li>
<li>超时登录后页面跳转到首页</li>
<li>全局异常状态汉化拦截处理</li>
<li>HTML过滤器改为将html转义</li>
<li>检查字符支持小数点&降级改成异常提醒</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
</template>
<el-collapse-item title="v3.0.0 - 2020-07-20">
<ol>
<li>单应用调整为多模块项目</li>
<li>升级element-ui版本到2.13.2</li>
<li>删除babel，提高编译速度。</li>
<li>新增菜单默认主类目</li>
<li>编码文件名修改为uuid方式</li>
<li>定时任务cron表达式验证</li>
<li>角色权限修改时已有权限未自动勾选异常修复</li>
<li>防止切换权限用户后登录出现404</li>
<li>Excel支持sort导出排序</li>
<li>创建用户不允许选择超级管理员角色</li>
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
<li>修复代码生成点击多次表修改数据不变化的问题</li>
<li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
<li>修复布局为small者mini用户表单显示错位问题</li>
<li>修复热部署导致的强换异常问题</li>
<li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
<li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
<li>生成domain 如果是浮点型 统一用BigDecimal</li>
<li>定时任务调整label-width，防止部署出现错位</li>
<li>调整表头固定列默认样式</li>
<li>代码生成模板调整，字段为String并且必填则加空串条件</li>
<li>代码生成字典Integer/Long使用parseInt</li>
<li>
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
</li>
<li>修正岗位导出权限注解</li>
<li>禁止加密密文返回前端</li>
<li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
<li>修复首页搜索菜单外链无法点击跳转问题</li>
<li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
<li>用户管理部门分支节点不可检查&显示计数</li>
<li>数据范围过滤属性调整</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<script>
import * as echarts from 'echarts';
import request from "../utils/request";
import axios from "axios";
<el-collapse-item title="v2.3.0 - 2020-06-01">
<ol>
<li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
<li>dev启动默认打开浏览器</li>
<li>vue-cli使用默认source-map</li>
<li>slidebar eslint报错优化</li>
<li>当tags-view滚动关闭右键菜单</li>
<li>字典管理添加缓存读取</li>
<li>参数管理支持缓存操作</li>
<li>支持一级菜单（和主页同级）在main区域显示</li>
<li>限制外链地址必须以http(s)开头</li>
<li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
<li>修改数据源类型优先级，先根据方法，再根据类</li>
<li>支持是否需要设置token属性，自定义返回码消息。</li>
<li>swagger请求前缀加入配置。</li>
<li>登录地点设置内容过长则隐藏显示</li>
<li>修复定时任务执行一次按钮后不提示消息问题</li>
<li>修改上级部门（选择项排除本身和下级）</li>
<li>通用http发送方法增加参数 contentType 编码类型</li>
<li>更换IP地址查询接口</li>
<li>修复页签变量undefined</li>
<li>添加校验部门包含未停用的子部门</li>
<li>修改定时任务详情下次执行时间日期显示错误</li>
<li>角色管理查询设置默认排序字段</li>
<li>swagger添加enable参数控制是否启用</li>
<li>只对json类型请求构建可重复读取inputStream的request</li>
<li>修改代码生成字典字段int类型没有自动选中问题</li>
<li>vuex用户名取值修正</li>
<li>表格树模板去掉多余的)</li>
<li>代码生成序号修正</li>
<li>全屏情况下不调整上外边距</li>
<li>代码生成Date字段添加默认格式</li>
<li>用户管理角色选择权限控制</li>
<li>修复路由懒加载报错问题</li>
<li>模板sql.vm添加菜单状态</li>
<li>设置用户名称不能修改</li>
<li>dialog添加append-to-body属性，防止ie遮罩</li>
<li>菜单区分状态和显示隐藏功能</li>
<li>升级fastjson到最新版1.2.68 修复安全加固</li>
<li>修复代码生成如果选择字典类型缺失逗号问题</li>
<li>登录请求params更换为data，防止暴露url</li>
<li>日志返回时间格式处理</li>
<li>添加handle控制允许拖动的元素</li>
<li>布局设置点击扩大范围</li>
<li>代码生成列属性排序查询</li>
<li>代码生成列支持拖动排序</li>
<li>修复时间格式不支持ios问题</li>
<li>表单构建添加父级class，防止冲突</li>
<li>定时任务并发属性修正</li>
<li>角色禁用&菜单隐藏不查询权限</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
//树状图
export default {
name: 'BingEcharts',
<el-collapse-item title="v2.2.0 - 2020-03-18">
<ol>
<li>系统监控新增定时任务功能</li>
<li>添加一个打包Web工程bat</li>
<li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
<li>修复点击退出登录有时会无提示问题</li>
<li>修复防重复提交注解无效问题</li>
<li>修复通知公告批量删除异常问题</li>
<li>添加菜单时路由地址必填限制</li>
<li>代码生成字段描述可编辑</li>
<li>修复用户修改个人信息导致缓存不过期问题</li>
<li>个人信息创建时间获取正确属性值</li>
<li>操作日志详细显示正确类型</li>
<li>导入表单击行数据时选中对应的复选框</li>
<li>批量替换表前缀逻辑调整</li>
<li>固定重定向路径表达式</li>
<li>升级element-ui版本到2.13.0</li>
<li>操作日志排序调整</li>
<li>修复charts切换侧边栏或者缩放窗口显示bug</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
//找的代码写道mounted里边 相当于初始化函数
mounted() {
request.get("/system/index/getProjectNumByTypeByJoin?statisticsType=city", ).then(res => {
<el-collapse-item title="v2.1.0 - 2020-02-24">
<ol>
<li>新增表单构建</li>
<li>代码生成支持树表结构</li>
<li>新增用户导入</li>
<li>修复动态加载路由页面刷新问题</li>
<li>修复地址开关无效问题</li>
<li>汉化错误提示页面</li>
<li>代码生成已知问题修改</li>
<li>修复多数据源下配置关闭出现异常处理</li>
<li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
<li>修复上传头像控制台出现异常</li>
<li>修改用户管理分页不正确的问题</li>
<li>修复验证码记录提示错误</li>
<li>修复request.js缺少Message引用</li>
<li>修复表格时间为空出现的异常</li>
<li>添加Jackson日期反序列化时区配置</li>
<li>调整根据用户权限加载菜单数据树形结构</li>
<li>调整成功登录不恢复按钮，防止多次点击</li>
<li>修改用户个人资料同步缓存信息</li>
<li>修复页面同时出现el-upload和Editor不显示处理</li>
<li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
<li>配置文件新增redis密码属性</li>
<li>设置mybatis全局的配置文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
// 基于准备好的dom，初始化echarts实例
let myChart = echarts.init(document.getElementById('myChart'))
// 绘制图表
myChart.setOption({
title: {
text: '各省份项目统计',
subtext: '按省份统计',
left: 'center'
},
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c}项 ({d}%)'
},
legend: {
type: 'scroll',
orient: 'vertical',
right: 10,
top: 20,
bottom: 20,
data: res.data.legendData
},
series: [{
name: '省份',
type: 'pie',
radius: '55%',
center: ['40%', '50%'],
data: res.data.seriesData,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}]
})
});
<el-collapse-item title="v2.0.0 - 2019-12-02">
<ol>
<li>新增代码生成</li>
<li>新增@RepeatSubmit注解，防止重复提交</li>
<li>新增菜单主目录添加/删除操作</li>
<li>日志记录过滤特殊对象，防止转换异常</li>
<li>修改代码生成路由脚本错误</li>
<li>用户上传头像实时同步缓存，无需重新登录</li>
<li>调整切换页签后不重新加载数据</li>
<li>添加jsencrypt实现参数的前端加密</li>
<li>系统退出删除用户缓存记录</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.1.0 - 2019-11-11">
<ol>
<li>新增在线用户管理</li>
<li>新增按钮组功能实现（批量删除、导出、清空）</li>
<li>新增查询条件重置按钮</li>
<li>新增Swagger全局Token配置</li>
<li>新增后端参数校验</li>
<li>修复字典管理页面的日期查询异常</li>
<li>修改时间函数命名防止冲突</li>
<li>去除菜单上级校验，默认为顶级</li>
<li>修复用户密码无法修改问题</li>
<li>修复菜单类型为按钮时不显示权限标识</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.0 - 2019-10-08">
<ol>
<li>若依前后端分离系统正式发布</li>
</ol>
</el-collapse-item>
</el-collapse>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>捐赠支持</span>
</div>
<div class="body">
<img
src="http://ruoyi.vip/images/pay.png"
alt="donate"
width="100%"
/>
<span style="display: inline-block; height: 30px; line-height: 30px"
>你可以请作者喝杯咖啡表示鼓励</span
>
</div>
</el-card>
</el-col>
</el-row> -->
</div>
</template>
request.get("/system/index/getProjectNumByTypeByJoin?statisticsType=deptId", ).then(res => {
<script>
export default {
name: "Index",
data() {
return {
// 版本号
version: "3.8.5"
};
},
methods: {
goTarget(href) {
window.open(href, "_blank");
// 基于准备好的dom，初始化echarts实例
let myChart = echarts.init(document.getElementById('myChart1'))
// 绘制图表
myChart.setOption({
title: {
text: '各区域项目统计',
subtext: '按区域统计',
left: 'center'
},
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c}项 ({d}%)'
},
legend: {
type: 'scroll',
orient: 'vertical',
right: 10,
top: 20,
bottom: 20,
data: res.data.legendData
},
series: [{
name: '区域',
type: 'pie',
radius: '55%',
center: ['40%', '50%'],
data: res.data.seriesData,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
};
</script>
}]
})
});
<style scoped lang="scss">
.home {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #eee;
}
hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eee;
request.get("/system/index/getProjectNumByTypeByJoin?statisticsType=deptId", ).then(res => {
// 基于准备好的dom，初始化echarts实例
let myChart = echarts.init(document.getElementById('myChart2'))
// 绘制图表
myChart.setOption({
tooltip: {
trigger: 'axis',
axisPointer: {
// Use axis to trigger tooltip
type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
}
.col-item {
margin-bottom: 20px;
},
legend: {},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'value'
},
yAxis: {
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
},
series: [{
name: 'Direct',
type: 'bar',
stack: 'total',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [320, 302, 301, 334, 390, 330, 320]
},
{
name: 'Mail Ad',
type: 'bar',
stack: 'total',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [120, 132, 101, 134, 90, 230, 210]
},
{
name: 'Affiliate Ad',
type: 'bar',
stack: 'total',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [220, 182, 191, 234, 290, 330, 310]
},
{
name: 'Video Ad',
type: 'bar',
stack: 'total',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [150, 212, 201, 154, 190, 330, 410]
},
{
name: 'Search Engine',
type: 'bar',
stack: 'total',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [820, 832, 901, 934, 1290, 1330, 1320]
}
]
})
});
// request.get("/system/index/getProjectNumByTypeByJoin?statisticsType=deptId", ).then(res => {
ul {
padding: 0;
margin: 0;
}
// // 基于准备好的dom，初始化echarts实例
// let myChart = echarts.init(document.getElementById('myChart1'))
// // 绘制图表
// myChart.setOption({
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
color: #676a6c;
overflow-x: hidden;
// title: {
// text: '车辆类型'
// },
// tooltip: {
// trigger: 'axis',
// formatter: '{a} <br/>{b} : {c}(辆)',
// axisPointer: {
// type: 'shadow'
// }
// },
// legend: {},
// grid: {
// left: '3%',
// right: '4%',
// bottom: '3%',
// containLabel: true
// },
// xAxis: {
// type: 'value',
// boundaryGap: [0, 0.01]
// },
// yAxis: {
// type: 'category',
// data: res.data.name.split(',')
// },
// series: [{
// name: '车数量',
// type: 'bar',
// data: res.data.value.split(',')
// }]
ul {
list-style-type: none;
}
// })
// });
h4 {
margin-top: 0px;
}
// request.get("/system/carbaseinfo/getPie?type=bar", ).then(res => {
h2 {
margin-top: 10px;
font-size: 26px;
font-weight: 100;
}
// // 基于准备好的dom，初始化echarts实例
// let myChart = echarts.init(document.getElementById('myChart2'))
// // 绘制图表
// myChart.setOption({
// tooltip: {
// trigger: 'axis',
// formatter: '{b} : {c}(辆)',
// axisPointer: {
// type: 'shadow'
// }
// },
// xAxis: {
// type: 'category',
// boundaryGap: false,
// data: res.data.name.split(',')
// },
// yAxis: {
// type: 'value'
// },
// series: [
// {
// data: res.data.value.split(','),
// type: 'line',
// areaStyle: {}
// }
// ]
// })
// });
p {
margin-top: 10px;
request.get("/system/index/getProjectNumByTypeByJoin?statisticsType=deptId", ).then(res => {
b {
font-weight: 700;
// 基于准备好的dom，初始化echarts实例
let myChart = echarts.init(document.getElementById('myChart3'))
// 绘制图表
myChart.setOption({
color: ['#80FFA5', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],
title: {
text: 'Gradient Stacked Area Chart'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross',
label: {
backgroundColor: '#6a7985'
}
}
.update-log {
ol {
display: block;
list-style-type: decimal;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0;
margin-inline-end: 0;
padding-inline-start: 40px;
},
legend: {
data: ['Line 1', 'Line 2', 'Line 3', 'Line 4', 'Line 5']
},
toolbox: {
feature: {
saveAsImage: {}
}
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: [
{
type: 'category',
boundaryGap: false,
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
}
],
yAxis: [
{
type: 'value'
}
],
series: [
{
name: 'Line 1',
type: 'line',
stack: 'Total',
smooth: true,
lineStyle: {
width: 0
},
showSymbol: false,
areaStyle: {
opacity: 0.8,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: 'rgb(128, 255, 165)'
},
{
offset: 1,
color: 'rgb(1, 191, 236)'
}
])
},
emphasis: {
focus: 'series'
},
data: [140, 232, 101, 264, 90, 340, 250]
},
{
name: 'Line 2',
type: 'line',
stack: 'Total',
smooth: true,
lineStyle: {
width: 0
},
showSymbol: false,
areaStyle: {
opacity: 0.8,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: 'rgb(0, 221, 255)'
},
{
offset: 1,
color: 'rgb(77, 119, 255)'
}
])
},
emphasis: {
focus: 'series'
},
data: [120, 282, 111, 234, 220, 340, 310]
},
{
name: 'Line 3',
type: 'line',
stack: 'Total',
smooth: true,
lineStyle: {
width: 0
},
showSymbol: false,
areaStyle: {
opacity: 0.8,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: 'rgb(55, 162, 255)'
},
{
offset: 1,
color: 'rgb(116, 21, 219)'
}
])
},
emphasis: {
focus: 'series'
},
data: [320, 132, 201, 334, 190, 130, 220]
},
{
name: 'Line 4',
type: 'line',
stack: 'Total',
smooth: true,
lineStyle: {
width: 0
},
showSymbol: false,
areaStyle: {
opacity: 0.8,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: 'rgb(255, 0, 135)'
},
{
offset: 1,
color: 'rgb(135, 0, 157)'
}
])
},
emphasis: {
focus: 'series'
},
data: [220, 402, 231, 134, 190, 230, 120]
},
{
name: 'Line 5',
type: 'line',
stack: 'Total',
smooth: true,
lineStyle: {
width: 0
},
showSymbol: false,
label: {
show: true,
position: 'top'
},
areaStyle: {
opacity: 0.8,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: 'rgb(255, 191, 0)'
},
{
offset: 1,
color: 'rgb(224, 62, 76)'
}
])
},
emphasis: {
focus: 'series'
},
data: [220, 302, 181, 234, 210, 290, 150]
}
}
</style>
]
})
});
}
}
</script>
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,7 +79,7 @@
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>
......@@ -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,29 +144,37 @@ 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.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
......@@ -150,8 +182,8 @@ export default {
});
}
});
}
}
},
},
};
</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> -->
<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"
......@@ -37,6 +38,14 @@
<!-- <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
<template>
<div class="wrapper">
<el-descriptions :title="InfoList.name" class="margin-top" :column="3" :size="size" border>
<el-descriptions-item label="所属项目">{{
InfoList.projectName
}}</el-descriptions-item>
<el-descriptions-item label="所属楼栋">{{
InfoList.buildingName
}}</el-descriptions-item>
<el-descriptions-item label="所属楼层">{{
InfoList.floorName
}}</el-descriptions-item>
<el-descriptions-item label="所属房间">{{
InfoList.roomName
}}</el-descriptions-item>
<el-descriptions-item label="风险因素">{{
InfoList.factor
}}</el-descriptions-item>
<el-descriptions-item label="风险类型">{{
InfoList.type
}}</el-descriptions-item>
<el-descriptions-item label="存在部位">{{
InfoList.presenceLocation
}}</el-descriptions-item>
<el-descriptions-item label="评估人">{{
InfoList.userName
}}</el-descriptions-item>
<el-descriptions-item label="评估时间">{{
InfoList.createTime
}}</el-descriptions-item>
</el-descriptions>
<el-tabs v-model="activeName" type="border-card" style="margin-top: 10px">
<el-tab-pane label="风险管控信息" name="first">
<el-tabs tab-position="left">
<el-tab-pane label="风险图片">
<template>
<div v-if="InfoList.pictureFile!=null">
<el-carousel style="height: 500px;width:500px;position: relative;left: 34%;">
<el-carousel-item v-for="item in InfoList.pictureFile" :key="item">
<img :src="item.filePath" style="height: 400px; " />
</el-carousel-item>
</el-carousel>
</div>
<div v-else>
<el-empty description="暂无图片"></el-empty>
</div>
</template>
</el-tab-pane>
<el-tab-pane label="已采取的管控措施">
<div class="approveResult">
<div class="approveL">
<span style="font-weight: bold;">技术措施</span>
<p>{{InfoList.measuresProject==null?"暂无":InfoList.measuresProject}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">技术措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresProjectFile!=null">
<div v-for="item in InfoList.measuresProjectFile" :key="item">
<span> <el-link type="primary" icon="el-icon-document"
:href="item.filePath">{{item.fileName}}</el-link></span>
</div>
</div>
<div v-else>
<el-empty description="暂无附件"></el-empty>
</div>
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施</span>
<p>{{InfoList.measuresAdministration==null?"暂无":InfoList.measuresAdministration}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresAdministrationFile!=null">
<div v-for="item in InfoList.measuresAdministrationFile" :key="item">
<span> <el-link type="primary" icon="el-icon-document"
:href="item.filePath">{{item.fileName}}</el-link></span>
</div>
</div>
<div v-else>
<el-empty description="暂无附件"></el-empty>
</div>
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施</span>
<p>{{InfoList.measuresEmergency==null?"暂无":InfoList.measuresEmergency}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresEmergencyFile!=null">
<div v-for="item in InfoList.measuresEmergencyFile" :key="item">
<span> <el-link type="primary" icon="el-icon-document"
:href="item.filePath">{{item.fileName}}</el-link></span>
</div>
</div>
<div v-else>
<el-empty description="暂无附件"></el-empty>
</div>
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任单位:</span><span style="padding-left:30px;">{{InfoList.measuresDeptName==null?"暂无":InfoList.measuresDeptName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人:</span><span style="padding-left:30px;">{{InfoList.measuresUserName==null?"暂无":InfoList.measuresUserName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人联系方式:</span><span style="padding-left:30px;">{{InfoList.measuresUserPhone==null?"暂无":InfoList.measuresUserPhone}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">判断依据:</span><span style="padding-left:30px;">{{InfoList.referenceBasis==null?"暂无":InfoList.referenceBasis}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">风险等级:</span><span style="padding-left:30px;">{{InfoList.level==null?"暂无":InfoList.level}}</span>
</div>
</div>
</el-tab-pane>
</el-tabs>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {
getExistingById
} from "@/api/risk/plan";
export default {
data() {
return {
activeNames: ['1'],
activeName: "first",
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 现有风险清单库表格数据
listList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
inherentId: null,
code: null,
name: null,
type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null,
factor: null,
measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null,
measuresAdministrationFileIds: null,
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
planId: null,
},
// 表单参数
form: {},
// 表单校验
rules: {},
reportList: [],
InfoList: {},
};
},
created() {
},
mounted() {
// console.log(this.$route.params, 'lll')
this.getInfo(this.$route.params.id);
},
methods: {
handleChange(val) {
console.log(val);
},
downList(planId) {
this.download("/system/risk/plan/exportExcel/InherentList/" + planId, {});
},
showDrawCanvas(floorId) {
this.$router.push({
name: "drawCanvas",
params: {
floorId: floorId,
},
});
},
getInfo(id) {
getExistingById(id).then((res) => {
this.InfoList = res.data;
console.log(this.InfoList);
});
},
exportList(id) {
console.log(id, "kkkk");
this.download("system/risk/plan/exportWord/riskNotification/" + id, {});
},
},
// 表单重置
reset() {
this.form = {
id: null,
inherentId: null,
code: null,
name: null,
type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null,
factor: null,
measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null,
measuresAdministrationFileIds: null,
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleSelectionChange() {},
};
</script>
<style lang="scss" scoped>
.wrapper {
height: 100%;
width: 100%;
padding: 10px;
box-sizing: border-box;
display: flex;
flex-direction: column;
}
::v-deep .el-tabs__content {
height: calc(100vh - 334px) !important;
}
.titles {
position: relative;
font-size: 18px;
font-weight: bold;
margin: 10px 0 10px 20px;
color: #666666;
}
.titles::before {
content: "";
width: 8px;
height: 20px;
background: #3f9eff;
position: absolute;
left: -14px;
top: 0;
}
.approveResult {
flex: 1;
width: 100%;
height: calc(100vh - 360px) !important;
overflow-y: auto;
display: flex;
justify-content: space-between;
.approveL {
flex: 3;
width: 100%;
}
.approveR {
flex: 7;
width: 100%;
padding: 0 0 0 30px;
border-left: 1px solid #d7d7d7d7;
}
}
</style>
src/views/risk/plan/index.vue
View file @ 68c97ffb
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" 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="no">
<el-input v-model="queryParams.no" placeholder="请输入任务编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-form-item label="项目名称" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="楼栋ids" prop="buildingIds">
<el-form-item label="楼栋名称" prop="buildingIds">
<el-input v-model="queryParams.buildingIds" placeholder="请输入楼栋ids" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="创建人员id" prop="createUserId">
<el-form-item label="创建人员" prop="createUserId">
<el-input v-model="queryParams.createUserId" placeholder="请输入创建人员id" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
......@@ -22,11 +22,11 @@
<el-input v-model="queryParams.createDeptId" placeholder="请输入创建单位" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="负责人id" prop="leaderUserId">
<el-form-item label="负责人" prop="leaderUserId">
<el-input v-model="queryParams.leaderUserId" placeholder="请输入负责人id" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="执行人员ids" prop="workUserIds">
<el-form-item label="执行人员" prop="workUserIds">
<el-input v-model="queryParams.workUserIds" placeholder="请输入执行人员ids" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
......@@ -59,45 +59,74 @@
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:riskPlan:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:riskPlan:export']">导出</el-button>
</el-col>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center">
<el-table-column type="selection" align="center" :selectable="checkSelect" />
<el-table-column label="序号" align="center" >
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="任务名称" align="center" prop="name" />
<el-table-column label="任务编号" align="center" prop="no" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼栋名称" align="center" prop="buildingNames" />
<el-table-column label="任务名称" align="left" prop="name" width="200px"/>
<!-- <el-table-column label="任务编号" align="center" prop="no" /> -->
<el-table-column label="项目名称" align="left" prop="projectName" width="200px"/>
<el-table-column label="楼栋名称" align="left" prop="buildingNames" width="300px" >
<template slot-scope="scope">
<el-popover
placement="top-start"
title="楼栋名称"
width="200"
trigger="hover"
:content="scope.row.buildingNames">
<span slot="reference">{{ scope.row.buildingNames.length>25?scope.row.buildingNames.substring(0,25)+"...":scope.row.buildingNames}}</span>
</el-popover>
</template>
</el-table-column>
<el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员" align="center" prop="workUserNames" />
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column label="执行人员" align="center" prop="workUserNames" width="120"/>
<el-table-column label="开始时间" align="center" prop="startTime" width="120" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" width="180">
<el-table-column label="结束时间" align="center" prop="endTime" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="状态" align="center" prop="statusName" width="120">
<template slot-scope="scope">
<div>
<div v-if="scope.row.statusName=='项目完成'"><el-tag type="info">项目完成</el-tag></div>
<div v-else-if="scope.row.statusName=='审批任务'"><el-tag >审批任务</el-tag></div>
<div v-else-if="scope.row.statusName=='任务待执行'"><el-tag type="warning">任务待执行</el-tag></div>
<div v-else-if="scope.row.statusName=='验收任务'"><el-tag type="success">验收任务</el-tag></div>
<div v-else><el-tag type="danger">{{scope.row.statusName}}</el-tag></div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<!-- <div v-if="scope.row.statusName=='任务待执行'">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:riskPlan:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:riskPlan:remove']">删除</el-button>
</div> -->
<router-link :to="'/risk/plan/ledgerdata/index/' + scope.row.id" class="link-type">
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
</router-link>
</template>
</el-table-column>
</el-table>
......@@ -107,43 +136,63 @@
<!-- 添加或修改风险计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="创建人员" prop="createUserId">
<el-input v-model="user.nickName" placeholder="请输入创建人员" disabled/>
</el-form-item>
<el-form-item label="创建单位" prop="createDeptId">
<el-input v-model="user.dept.deptName" placeholder="请输入创建单位" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="name">
<el-input v-model="form.name" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="任务编号" prop="no">
<el-input v-model="form.no" placeholder="请输入任务编号" />
<el-form-item label="项目id" prop="projectIdV" v-show="false">
<el-input v-model="form.projectIdV" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
<el-form-item label="关联项目" prop="projectId">
<el-select v-model="form.projectId" size="medium" @change="getBuildingList(form.projectId,'change')" filterable remote
reserve-keyword placeholder="请输入项目关键词" :remote-method="remoteMethod" :loading="loading">
<el-option v-for="item in projectOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="楼栋ids" prop="buildingIds">
<el-input v-model="form.buildingIds" placeholder="请输入楼栋ids" />
<el-form-item label="评估楼栋" prop="buildingIds">
<el-select v-model="form.buildingIds" multiple medium placeholder="请选择评估楼栋">
<el-option v-for="item in buildingOption" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<!-- <el-input v-model="form.buildingIds" placeholder="请输入评估楼栋" /> -->
</el-form-item>
<el-form-item label="创建人员id" prop="createUserId">
<el-input v-model="form.createUserId" placeholder="请输入创建人员id" />
<el-form-item label="评估小组选择" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" @select="handleNodeClick" placeholder="请选择归属部门" />
<!-- <el-input v-model="user.dept.deptName" placeholder="请输评估小组选择" /> -->
</el-form-item>
<el-form-item label="创建单位" prop="createDeptId">
<el-input v-model="form.createDeptId" placeholder="请输入创建单位" />
</el-form-item>
<el-form-item label="负责人id" prop="leaderUserId">
<el-input v-model="form.leaderUserId" placeholder="请输入负责人id" />
<el-form-item label="评估小组组长" prop="leaderUserId">
<!-- <el-input v-model="form.leaderUserId" placeholder="请输入评估小组组长" /> -->
<el-select v-model="form.leaderUserId" placeholder="请选择评估小组组长">
<el-option v-for="item in userOptions" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="执行人员ids" prop="workUserIds">
<el-input v-model="form.workUserIds" placeholder="请输入执行人员ids" />
<el-form-item label="评估小组成员" prop="workUserIds">
<!-- <el-input v-model="form.workUserIds" placeholder="请输入评估小组成员" /> -->
<el-select v-model="form.workUserIds" multiple placeholder="请选择评评估小组成员">
<el-option v-for="item in userOptions" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item label="任务开始时间" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
placeholder="请选择任务开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束时间">
<el-form-item label="任务结束时间" prop="endTime">
<el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择任务结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="删除标志" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -154,18 +203,48 @@
</template>
<script>
import {
listUser,
getUser,
delUser,
addUser,
updateUser,
resetUserPwd,
changeUserStatus,
deptTreeSelect
} from "@/api/system/user";
import {
listPlan,
getPlan,
delPlan,
addPlan,
updatePlan
updatePlan,
getProjectList,
getBuildingList,
getUserListByDeptId,
} from "@/api/risk/plan";
import {
getUserProfile
} from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Plan",
components: {
Treeselect
},
data() {
return {
userOptions: [], //用户列表
projectOptions: [], //项目列表
buildingOption: [], //楼栋列表
user: {
dept:{
deptName:'',
deptId:'',
}
},
// 遮罩层
loading: true,
// 选中数组
......@@ -180,6 +259,8 @@
total: 0,
// 风险计划表格数据
planList: [],
// 部门树选项
deptOptions: undefined,
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -201,15 +282,149 @@
status: null,
},
// 表单参数
form: {},
form: {
projectIdV:'',
deptId: '',
createUserId:'',
createDeptId:'',
},
// 表单校验
rules: {}
rules: {
// createUserId: [{
// required: true,
// message: '请输入创建人姓名',
// trigger: 'blur'
// },
// ],
// createDeptId: [{
// required: true,
// message: '请输入创建单位',
// trigger: 'blur'
// },
// ],
name: [{
required: true,
message: '请输入任务名称',
trigger: 'blur'
},
{
min: 1,
max: 50,
message: '长度在 1 到 50个字符',
trigger: 'blur'
}
],
projectId: [{
required: true,
message: '请输入任务名称',
trigger: 'blur'
},
],
buildingIds: [{
required: true,
message: '请输入任务名称',
trigger: 'change'
},
],
leaderUserId: [{
required: true,
message: '请选择小组负责人',
trigger: 'change'
}],
workUserIds: [{
required: true,
message: '请选择小组成员',
trigger: 'change'
}],
startTime: [{
type: 'string',
required: true,
message: '请选择开始时间',
trigger: 'change'
}],
endTime: [{
type: 'string',
required: true,
message: '请选择结束时间',
trigger: 'change'
}],
}
};
},
watch: {
// 根据名称筛选部门树
deptName(val) {
this.$refs.tree.filter(val);
}
},
created() {
this.getDeptTree();
this.getList();
},
mounted() {
},
methods: {
/**
* 判断select是否可选
*/
checkSelect(row) {
return row.statusName=='任务待执行'
},
getUserListByDeptId(deptId) {
getUserListByDeptId(deptId).then(response => {
this.userOptions = response.data;
});
},
remoteMethod(query) {
if (query !== '') {
this.loading = true;
getProjectList(query).then(response => {
this.loading = false;
this.projectOptions = response.data;
});
} else {
this.projectOptions = [];
}
},
getUser() {
getUserProfile().then(response => {
this.user = response.data;
//console.log(this.user)
this.form.deptId = response.data.deptId;
this.getUserListByDeptId(this.user.dept.deptId);
});
},
getBuildingList(projectId,type) {
console.log("changeme");
if(type=='change'){
this.form.buildingIds=null;
this.form.projectIdV=projectId;
}
getBuildingList(projectId).then(response => {
this.buildingOption = response.data;
});
},
/** 查询风险计划列表 */
getList() {
this.loading = true;
......@@ -219,6 +434,28 @@
this.loading = false;
});
},
/** 查询部门下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data;
});
},
// 筛选节点
filterNode(value, data) {
console.log(" filterNode");
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 节点单击事件
handleNodeClick(data) {
console.log(" handleNodeClick");
// console.log(data);
// this.queryParams.deptId = data.id;
// this.handleQuery();
//更新组长和成员人员列表
this.getUserListByDeptId(data.id);
this.form.deptId=data.id;
},
// 取消按钮
cancel() {
this.open = false;
......@@ -231,11 +468,11 @@
name: null,
no: null,
projectId: null,
buildingIds: null,
buildingIds: [],
createUserId: null,
createDeptId: null,
leaderUserId: null,
workUserIds: null,
workUserIds: [],
startTime: null,
endTime: null,
status: null,
......@@ -266,15 +503,35 @@
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getUser();
this.open = true;
this.title = "添加风险计划";
this.title = "创建任务";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getUser();
const id = row.id || this.ids
getPlan(id).then(response => {
this.form = response.data;
var projectIdV=response.data.projectId;
this.getBuildingList(response.data.projectId,"edit");
//执行人员
var workUserArr=[];
response.data.workUserIds.split(',').forEach(item=>{
workUserArr.push(item*1)
});
this.form.workUserIds = workUserArr;
//楼栋信息
var buildingsArr=[];
response.data.buildingIds.split(',').forEach(item=>{
buildingsArr.push(item*1)
});
this.form.buildingIds = buildingsArr;
this.form.projectId=response.data.projectName;
this.form.projectIdV=projectIdV;
this.open = true;
this.title = "修改风险计划";
});
......@@ -283,7 +540,12 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.buildingIds=this.form.buildingIds.join();
this.form.workUserIds=this.form.workUserIds.join();
if (this.form.id != null) {
this.form.projectId=this.form.projectIdV;
updatePlan(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
......
src/views/risk/plan/inherentdata.vue 0 → 100644
View file @ 68c97ffb
<template>
<div class="wrapper">
<el-descriptions :title="InfoList.name" class="margin-top" :column="3" :size="size" border>
<el-descriptions-item label="所属项目">{{
InfoList.projectName
}}</el-descriptions-item>
<el-descriptions-item label="所属楼栋">{{
InfoList.buildingName
}}</el-descriptions-item>
<el-descriptions-item label="所属楼层">{{
InfoList.floorName
}}</el-descriptions-item>
<el-descriptions-item label="所属房间">{{
InfoList.roomName
}}</el-descriptions-item>
<el-descriptions-item label="风险点类型">{{
InfoList.pointType
}}</el-descriptions-item>
<el-descriptions-item label="是否特种设备">{{
InfoList.specialEquipment?"是":"否"
}}</el-descriptions-item>
<el-descriptions-item label="安全警示标志">{{
InfoList.safetyWarningSigns
}}</el-descriptions-item>
<el-descriptions-item label="风险因素">{{
InfoList.factor
}}</el-descriptions-item>
<el-descriptions-item label="风险类型">{{
InfoList.type
}}</el-descriptions-item>
<el-descriptions-item label="存在部位">{{
InfoList.presenceLocation
}}</el-descriptions-item>
<el-descriptions-item label="评估人">{{
InfoList.userName
}}</el-descriptions-item>
<el-descriptions-item label="评估时间">{{
InfoList.createTime
}}</el-descriptions-item>
</el-descriptions>
<el-tabs v-model="activeName" type="border-card" style="margin-top: 10px">
<el-tab-pane label="风险管控信息" name="first">
<el-tabs tab-position="left">
<el-tab-pane label="风险图片">
<template>
<div v-if="InfoList.pictureFile!=null">
<el-carousel style="height: 500px;width:500px;position: relative;left: 34%;">
<el-carousel-item v-for="item in InfoList.pictureFile" :key="item">
<img :src="item.filePath" style="height: 400px; " />
</el-carousel-item>
</el-carousel>
</div>
<div v-else>
<el-empty description="暂无图片"></el-empty>
</div>
</template>
</el-tab-pane>
<el-tab-pane label="应采取的管控措施">
<div class="approveResult">
<div class="approveL">
<span style="font-weight: bold;">技术措施</span>
<p>{{InfoList.measuresProject==null?"暂无":InfoList.measuresProject}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">技术措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresProjectFile!=null">
<div v-for="item in InfoList.measuresProjectFile" :key="item">
<span> <el-link type="primary" icon="el-icon-document"
:href="item.filePath">{{item.fileName}}</el-link></span>
</div>
</div>
<div v-else>
<el-empty description="暂无附件"></el-empty>
</div>
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施</span>
<p>{{InfoList.measuresAdministration==null?"暂无":InfoList.measuresAdministration}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresAdministrationFile!=null">
<div v-for="item in InfoList.measuresAdministrationFile" :key="item">
<span> <el-link type="primary" icon="el-icon-document"
:href="item.filePath">{{item.fileName}}</el-link></span>
</div>
</div>
<div v-else>
<el-empty description="暂无附件"></el-empty>
</div>
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施</span>
<p>{{InfoList.measuresEmergency==null?"暂无":InfoList.measuresEmergency}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresEmergencyFile!=null">
<div v-for="item in InfoList.measuresEmergencyFile" :key="item">
<span> <el-link type="primary" icon="el-icon-document"
:href="item.filePath">{{item.fileName}}</el-link></span>
</div>
</div>
<div v-else>
<el-empty description="暂无附件"></el-empty>
</div>
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任单位:</span><span>{{InfoList.measuresDeptName==null?"暂无":InfoList.measuresDeptName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人:</span><span>{{InfoList.measuresUserName==null?"暂无":InfoList.measuresUserName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人联系方式:</span><span>{{InfoList.measuresUserPhone==null?"暂无":InfoList.measuresUserPhone}}</span>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="重大危险源管理">
<div>
<span style="font-weight: bold;">是否为重大危险源:</span><span
style="padding-left:30px;">{{InfoList.majorHazardSource?"是":"否"}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">危险源名称:</span><span
style="padding-left:30px;">{{InfoList.hazardSourceName==null?"无":InfoList.hazardSourceName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">重大危险源描述:</span><span
style="padding-left:30px;">{{InfoList.majorHazardSourceDescription==null?"无":InfoList.majorHazardSourceDescription}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">判断依据:</span><span
style="padding-left:30px;">{{InfoList.referenceBasis==null?"无":InfoList.referenceBasis}}</span>
</div>
</el-tab-pane>
</el-tabs>
</el-tab-pane>
<el-tab-pane label="现状风险清单" name="second">
<div class="approveResult">
<div class="approveL">
<el-button type="warning" 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-column label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="风险名称" align="center" prop="name" />
<el-table-column label="所属建筑" align="center" prop="buildingName" />
<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" />
<el-table-column label="准事故类型" align="center" prop="type" />
<el-table-column label="存在部位" align="center" prop="presenceLocation" />
<el-table-column label="操作" align="center" prop="describe">
<template slot-scope="scope">
<div>
<!-- <el-button size="mini" type="text" icon="el-icon-download"
@click="exportList(scope.row.id)">下载风险告知卡</el-button>
<el-button size="mini" type="text" icon="el-icon-view"
@click="showDrawCanvas(scope.row.floorId)">查看四色图</el-button> -->
<router-link :to="'/risk/plan/existingdata/index/' + scope.row.id" class="link-type">
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
</router-link>
</div>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getExsitingList" />
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {
getPlan,
riskListInfo,
riskList,
exportRiskList,
getInherentById,
getExsitingList,
} from "@/api/risk/plan";
export default {
data() {
return {
activeNames: ['1'],
activeName: "first",
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 现有风险清单库表格数据
listList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
inherentId: null,
code: null,
name: null,
type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null,
factor: null,
measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null,
measuresAdministrationFileIds: null,
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
planId: null,
},
// 表单参数
form: {},
// 表单校验
rules: {},
reportList: [],
InfoList: {},
};
},
created() {
if (this.$route.params.id) {
this.queryParams.inherentId = this.$route.params.id;
this.getExsitingList(this.queryParams);
}
},
mounted() {
// console.log(this.$route.params, 'lll')
this.getInfo(this.$route.params.id);
},
methods: {
handleChange(val) {
console.log(val);
},
downList(planId) {
this.download("/system/risk/plan/exportExcel/InherentList/" + planId, {});
},
showDrawCanvas(floorId) {
this.$router.push({
name: "drawCanvas",
params: {
floorId: floorId,
},
});
},
getInfo(id) {
getInherentById(id).then((res) => {
this.InfoList = res.data;
console.log(this.InfoList);
});
},
getExsitingList(id) {
this.loading = true;
getExsitingList(this.queryParams).then((res) => {
console.log("res.rows:" + res.rows);
this.listList = res.rows;
this.total = res.total;
this.loading = false;
});
},
exportList(id) {
console.log(id, "kkkk");
this.download("system/risk/plan/exportWord/riskNotification/" + id, {});
},
},
// 表单重置
reset() {
this.form = {
id: null,
inherentId: null,
code: null,
name: null,
type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null,
factor: null,
measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null,
measuresAdministrationFileIds: null,
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleSelectionChange() {},
};
</script>
<style lang="scss" scoped>
.wrapper {
height: 100%;
width: 100%;
padding: 10px;
box-sizing: border-box;
display: flex;
flex-direction: column;
}
::v-deep .el-tabs__content {
height: calc(100vh - 334px) !important;
}
.titles {
position: relative;
font-size: 18px;
font-weight: bold;
margin: 10px 0 10px 20px;
color: #666666;
}
.titles::before {
content: "";
width: 8px;
height: 20px;
background: #3f9eff;
position: absolute;
left: -14px;
top: 0;
}
.approveResult {
flex: 1;
width: 100%;
height: calc(100vh - 360px) !important;
overflow-y: auto;
display: flex;
justify-content: space-between;
.approveL {
flex: 3;
width: 100%;
}
.approveR {
flex: 7;
width: 100%;
padding: 0 0 0 30px;
border-left: 1px solid #d7d7d7d7;
}
}
</style>
src/views/risk/plan/ledger.vue
View file @ 68c97ffb
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入任务名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="planList"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="任务名称" align="center" prop="name" />
<el-table-column label="任务编号" align="center" prop="no" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼栋名称" align="center" prop="buildingNames" />
<el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="任务名称" align="left" prop="name" width="220px"/>
<!-- <el-table-column label="任务编号" align="center" prop="no" /> -->
<el-table-column label="项目名称" align="left" prop="projectName" width="220px"/>
<el-table-column label="楼栋名称" align="left" prop="buildingNames" width="220px">
<template slot-scope="scope">
<el-popover
placement="top-start"
title="楼栋名称"
width="200"
trigger="hover"
:content="scope.row.buildingNames">
<span slot="reference">{{ scope.row.buildingNames.length>25?scope.row.buildingNames.substring(0,25)+"...":scope.row.buildingNames}}</span>
</el-popover>
</template>
</el-table-column>
<!-- <el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" /> -->
<el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员" align="center" prop="workUserNames" />
<el-table-column
label="开始时间"
align="center"
prop="startTime"
width="180"
>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
label="结束时间"
align="center"
prop="endTime"
width="180"
>
<el-table-column label="结束时间" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column
label="操作"
align="center"
:show-overflow-tooltip="true"
>
<el-table-column label="状态" align="center" prop="statusName" >
<template slot-scope="scope">
<router-link
:to="'/risk/plan/ledgerdata/index/' + scope.row.id"
class="link-type"
>
<el-button size="mini" type="text" icon="el-icon-view"
>详情</el-button
>
<div>
<div v-if="scope.row.statusName=='项目完成'"><el-tag type="info">项目完成</el-tag></div>
<div v-else-if="scope.row.statusName=='审批任务'"><el-tag >审批任务</el-tag></div>
<div v-else-if="scope.row.statusName=='任务待执行'"><el-tag type="warning">任务待执行</el-tag></div>
<div v-else-if="scope.row.statusName=='验收任务'"><el-tag type="success">验收任务</el-tag></div>
<div v-else><el-tag type="danger">{{scope.row.statusName}}</el-tag></div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/risk/plan/ledgerdata/index/' + scope.row.id" class="link-type">
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
</router-link>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import { listPlan, addPlan, updatePlan } from "@/api/risk/plan";
import {
listPlan,
addPlan,
updatePlan
} from "@/api/risk/plan";
export default {
export default {
name: "Plan",
data() {
return {
......@@ -128,6 +108,7 @@ export default {
pageSize: 10,
name: null,
no: null,
isLedger:"ledger",
projectId: null,
buildingIds: null,
createUserId: null,
......@@ -202,5 +183,5 @@ export default {
this.multiple = !selection.length;
},
},
};
};
</script>
src/views/risk/plan/ledgerdata.vue
View file @ 68c97ffb
<template>
<div class="wrapper">
<el-descriptions title="集团安全咨询服务项目">
<el-descriptions-item label="创建人">{{
InfoList.createUserName
}}</el-descriptions-item>
<el-descriptions-item label="创建单位">{{
InfoList.detailsDto.createDeptName
}}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{
InfoList.detailsDto.createTime
<el-descriptions
:title="InfoList.detailsDto.name"
class="margin-top"
:column="3"
:size="size"
border
>
<el-descriptions-item label="所属项目">{{
InfoList.detailsDto.projectName
}}</el-descriptions-item>
<el-descriptions-item label="所属楼栋" >
<!-- {{InfoList.detailsDto.buildingNames}} -->
<template>
<div v-for="(buildingName, index) in InfoList.detailsDto.buildingNames.split(',')" :key="index">
{{buildingName}}
</div>
</template>
</el-descriptions-item>
<el-descriptions-item label="所属单位">{{
InfoList.createDeptId
InfoList.detailsDto.deptName
}}</el-descriptions-item>
<el-descriptions-item label="所属省市">苏州市</el-descriptions-item>
<el-descriptions-item label="项目坐标">{{
InfoList.workUserIds
<el-descriptions-item label="所属省市">{{
InfoList.detailsDto.city
}}</el-descriptions-item>
<el-descriptions-item label="项目负责人">{{
InfoList.detailsDto.createUserName
InfoList.detailsDto.leaderUserName
}}</el-descriptions-item>
<el-descriptions-item label="评估组成员">{{
InfoList.detailsDto.workUserNames
......@@ -26,82 +33,80 @@
<el-descriptions-item label="开始时间">{{
InfoList.startTime
}}</el-descriptions-item>
<el-descriptions-item label="联系地址">{{
InfoList.name
<el-descriptions-item label="结束时间">{{
InfoList.endTime
}}</el-descriptions-item>
<el-descriptions-item label="项目状态">{{
InfoList.status
}}</el-descriptions-item>
<el-descriptions-item label="创建人">{{
InfoList.createUserName
}}</el-descriptions-item>
<el-descriptions-item label="创建单位">{{
InfoList.detailsDto.createDeptName
}}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{
InfoList.detailsDto.createTime
}}</el-descriptions-item>
</el-descriptions>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" type="border-card" style="margin-top: 10px">
<el-tab-pane label="风险评估清单" name="first">
<!-- <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="82px"
>
<div class="approveResult">
<div class="approveL">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="82px">
<el-form-item label="风险源名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入风险源名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.name" placeholder="请输入风险源名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="风险等级" prop="level">
<el-input
v-model="queryParams.level"
placeholder="请输入风险等级"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.level" placeholder="请输入风险等级" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="风险类型" prop="factor">
<el-input
v-model="queryParams.factor"
placeholder="请输入风险因素"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.factor" placeholder="请输入风险因素" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="存在部位" prop="referenceBasis">
<el-input
v-model="queryParams.referenceBasis"
placeholder="请输入参考依据"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.referenceBasis" placeholder="请输入参考依据" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
<el-button
style="margin-bottom: 10px"
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="downList(InfoList.detailsDto.id)"
>导 出</el-button
style="float: right; margin-bottom: 8px"
>导出风险清单</el-button
>
<el-table v-loading="loading" :data="listList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column type="index" width="50" />
<!-- <el-table-column label="id" align="center" prop="id" /> -->
<el-table-column label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="风险名称" align="center" prop="name" />
<el-table-column
label="所属建筑"
align="center"
prop="buildingName"
/>
<el-table-column label="所属楼层" align="center" prop="floorName" />
<el-table-column label="所属房间" align="center" prop="roomName" />
<el-table-column
label="所属楼层"
align="center"
prop="floorName"
/>
<el-table-column
label="所属房间"
align="center"
prop="roomName"
/>
<el-table-column
label="风险等级（系数）"
align="center"
......@@ -131,6 +136,10 @@
@click="showDrawCanvas(scope.row.floorId)"
>查看四色图</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>
</div>
</template>
</el-table-column>
......@@ -143,27 +152,42 @@
:limit.sync="queryParams.pageSize"
@pagination="getRiskList"
/>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="评估结果审核" name="second">
<div class="approveResult">
<div class="approveL">
<div class="titles">审批流程</div>
<el-steps direction="vertical" :active="1">
<el-step title="发起审批" icon="el-icon-success"></el-step>
<el-step title="评估负责人审批" icon="el-icon-success"></el-step>
<el-step title="项目负责人审批" icon="el-icon-success"></el-step>
</el-steps>
</div>
<div class="approveR">
<div class="titles">审批信息</div>
<el-steps direction="vertical" :active="1">
<el-step title="发起审批" icon="el-icon-success"></el-step>
<el-step title="评估负责人审批" icon="el-icon-success"></el-step>
<el-steps direction="vertical" :active="999">
<el-step
title="项目负责人审批"
v-for="approveDto in InfoList.approveListDtos"
:title="approveDto.taskName"
:key="approveDto.taskId"
icon="el-icon-success"
description="这是一段很长很长很长的描述性文字"
></el-step>
>
<template slot="description">
<el-card
class="box-card"
style="line-height: 25px; font-size: 14px; margin: 15px"
>
<span style="display: block"
><b>操作时间: </b>{{ approveDto.startTime }}</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>
</template>
</el-step>
</el-steps>
</div>
</div>
......@@ -177,7 +201,7 @@
<el-table-column label="所属建筑" align="center" prop="name" />
<el-table-column label="所属承租户" align="center" prop="type" />
<el-table-column label="操作" align="center" prop="describe">
<template>
<template slot-scope="scope">
<div>
<el-button size="mini" type="text" icon="el-icon-download"
>下载</el-button
......@@ -198,7 +222,6 @@ import {
riskList,
exportRiskList,
} from "@/api/risk/plan";
export default {
data() {
return {
......@@ -241,6 +264,7 @@ export default {
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
planId: null,
},
// 表单参数
form: {},
......@@ -250,10 +274,15 @@ export default {
InfoList: {},
};
},
created() {
if (this.$route.params.id) {
this.queryParams.planId = this.$route.params.id;
this.getRiskList(this.queryParams);
}
},
mounted() {
// console.log(this.$route.params, 'lll')
this.getInfo(this.$route.params.id);
this.getRiskList(this.$route.params.id);
},
methods: {
downList(planId) {
......@@ -273,9 +302,11 @@ export default {
});
},
getRiskList(id) {
riskList({ planId: id }).then((res) => {
this.loading = false;
this.loading = true;
riskList(this.queryParams).then((res) => {
this.listList = res.rows;
this.total = res.total;
this.loading = false;
});
},
exportList(id) {
......@@ -283,7 +314,7 @@ export default {
this.download("system/risk/plan/exportWord/riskNotification/" + id, {});
},
},
handleClick() {},
// 表单重置
reset() {
this.form = {
......
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